diff --git a/src/cam.c b/src/cam.c index 051b702..abfd1e3 100644 --- a/src/cam.c +++ b/src/cam.c @@ -704,7 +704,7 @@ int lightship_check() { for (int i = 0; i < lightship->protected_zones.pz_len; ++i) { uint64_t expiry; if (lightship->protected_zones.pz[i]->expiryTime) { - asn_INTEGER2ulong(lightship->protected_zones.pz[i]->expiryTime, (unsigned long long*) &expiry); + asn_INTEGER2ulong(lightship->protected_zones.pz[i]->expiryTime, &expiry); if (now >= expiry) { ASN_STRUCT_FREE(asn_DEF_EI1_ProtectedCommunicationZone, lightship->protected_zones.pz[i]); for (int j = i; j < lightship->protected_zones.pz_len - 1; ++j) { diff --git a/src/config.c b/src/config.c index 51d87fb..381cf98 100644 --- a/src/config.c +++ b/src/config.c @@ -554,15 +554,15 @@ int facilities_config() { epv.space.type = *mrep->data->choice.attributes.gpsType; epv.time.type = *mrep->data->choice.attributes.clockType; - asn_INTEGER2ulong(mrep->data->choice.attributes.clock, (unsigned long long*) &epv.time.clock); - asn_INTEGER2ulong(mrep->data->choice.attributes.clockOffset,(unsigned long long*) &epv.time.offset); + asn_INTEGER2ulong(mrep->data->choice.attributes.clock, &epv.time.clock); + asn_INTEGER2ulong(mrep->data->choice.attributes.clockOffset, &epv.time.offset); if (etsi_its_cfg->facilities.mcm.activate) { epv.trajectory.len = mrep->data->choice.attributes.trajectory->list.count; for (int i = 0; i < mrep->data->choice.attributes.trajectory->list.count; ++i) { epv.trajectory.path[i].latitude = mrep->data->choice.attributes.trajectory->list.array[i]->latitude; epv.trajectory.path[i].longitude = mrep->data->choice.attributes.trajectory->list.array[i]->longitude; - asn_INTEGER2ulong(&mrep->data->choice.attributes.trajectory->list.array[i]->timestamp, (unsigned long long*) &epv.trajectory.path[i].timestamp); + asn_INTEGER2ulong(&mrep->data->choice.attributes.trajectory->list.array[i]->timestamp, &epv.trajectory.path[i].timestamp); } } } else { diff --git a/src/denm.c b/src/denm.c index be33573..b28c1bc 100644 --- a/src/denm.c +++ b/src/denm.c @@ -73,8 +73,8 @@ static enum EVENT_CHECK_R event_check(EI1_DENM_t *denm, uint8_t* ssp, uint32_t s den_t* den = &facilities.den; uint64_t e_detection_time, e_reference_time; - asn_INTEGER2ulong((INTEGER_t*) &denm->denm.management.detectionTime, (unsigned long long*) &e_detection_time); - asn_INTEGER2ulong((INTEGER_t*) &denm->denm.management.referenceTime, (unsigned long long*) &e_reference_time); + asn_INTEGER2ulong((INTEGER_t*) &denm->denm.management.detectionTime, &e_detection_time); + asn_INTEGER2ulong((INTEGER_t*) &denm->denm.management.referenceTime, &e_reference_time); if (e_detection_time > e_reference_time) { return EVENT_INVALID; @@ -161,8 +161,8 @@ static int event_add(EI1_DENM_t *denm, uint64_t* id) { uint64_t now = itss_time_get(); uint64_t e_detection_time, e_reference_time; - asn_INTEGER2ulong((INTEGER_t*) &denm->denm.management.detectionTime, (unsigned long long*) &e_detection_time); - asn_INTEGER2ulong((INTEGER_t*) &denm->denm.management.referenceTime, (unsigned long long*) &e_reference_time); + asn_INTEGER2ulong((INTEGER_t*) &denm->denm.management.detectionTime, &e_detection_time); + asn_INTEGER2ulong((INTEGER_t*) &denm->denm.management.referenceTime, &e_reference_time); uint32_t e_validity_duration; if (denm->denm.management.validityDuration != NULL) { @@ -232,8 +232,8 @@ static int event_update(EI1_DENM_t *denm, uint64_t* id) { uint64_t now = itss_time_get(); uint64_t e_detection_time, e_reference_time; - asn_INTEGER2ulong((INTEGER_t*) &denm->denm.management.detectionTime, (unsigned long long*) &e_detection_time); - asn_INTEGER2ulong((INTEGER_t*) &denm->denm.management.referenceTime, (unsigned long long*) &e_reference_time); + asn_INTEGER2ulong((INTEGER_t*) &denm->denm.management.detectionTime, &e_detection_time); + asn_INTEGER2ulong((INTEGER_t*) &denm->denm.management.referenceTime, &e_reference_time); uint8_t state = EVENT_ACTIVE; if (denm->denm.management.termination != NULL) { diff --git a/src/facilities.c b/src/facilities.c index 7f7a436..0b2d5ee 100644 --- a/src/facilities.c +++ b/src/facilities.c @@ -294,13 +294,13 @@ static int management_indication(void *responder, uint8_t *msg, uint32_t msg_len for (int i = 0; i < mi->choice.attributes.trajectory->list.count; ++i) { epv.trajectory.path[i].latitude = mi->choice.attributes.trajectory->list.array[i]->latitude; epv.trajectory.path[i].longitude = mi->choice.attributes.trajectory->list.array[i]->longitude; - asn_INTEGER2ulong(&mi->choice.attributes.trajectory->list.array[i]->timestamp, (unsigned long long *)&epv.trajectory.path[i].timestamp); + asn_INTEGER2ulong(&mi->choice.attributes.trajectory->list.array[i]->timestamp, &epv.trajectory.path[i].timestamp); } } itss_trajectory_unlock(); itss_time_lock(); - asn_INTEGER2ulong(&mi->choice.attributes.clock, (unsigned long long *)&epv.time.clock); + asn_INTEGER2ulong(&mi->choice.attributes.clock, &epv.time.clock); itss_time_unlock(); } diff --git a/src/infrastructure.c b/src/infrastructure.c index 90d5b2f..c6870eb 100644 --- a/src/infrastructure.c +++ b/src/infrastructure.c @@ -74,19 +74,19 @@ static enum SERVICE_EVAL_R service_check(enum SERVICE_TYPE type, void* its_msg, if (!ivim->ivi.mandatory.timeStamp) { timestamp = now; } else { - asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.timeStamp, (unsigned long long*) ×tamp); + asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.timeStamp, ×tamp); } if (!ivim->ivi.mandatory.validFrom) { valid_from = now; } else { - asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.validFrom, (unsigned long long*) &valid_from); + asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.validFrom, &valid_from); } if (!ivim->ivi.mandatory.validTo) { valid_to = valid_from + infrastructure->default_service_duration; } else { - asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.validTo, (unsigned long long*) &valid_to); + asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.validTo, &valid_to); } if (now >= valid_to) { @@ -267,19 +267,19 @@ static int service_add(enum SERVICE_TYPE type, void* its_msg, uint64_t* id) { if (!ivim->ivi.mandatory.timeStamp) { timestamp = now; } else { - asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.timeStamp, (unsigned long long*) ×tamp); + asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.timeStamp, ×tamp); } if (!ivim->ivi.mandatory.validFrom) { valid_from = now; } else { - asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.validFrom, (unsigned long long*) &valid_from); + asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.validFrom, &valid_from); } if (!ivim->ivi.mandatory.validTo) { valid_to = valid_from + infrastructure->default_service_duration; } else { - asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.validTo, (unsigned long long*) &valid_to); + asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.validTo, &valid_to); } pthread_mutex_lock(&infrastructure->lock); @@ -355,19 +355,19 @@ static int service_update(enum SERVICE_TYPE type, void* its_msg, uint64_t* id) { if (!ivim->ivi.mandatory.timeStamp) { timestamp = now; } else { - asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.timeStamp,(unsigned long long*) ×tamp); + asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.timeStamp, ×tamp); } if (!ivim->ivi.mandatory.validFrom) { valid_from = now; } else { - asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.validFrom, (unsigned long long*) &valid_from); + asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.validFrom, &valid_from); } if (!ivim->ivi.mandatory.validTo) { valid_to = valid_from + infrastructure->default_service_duration; } else { - asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.validTo,(unsigned long long*) &valid_to); + asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.validTo, &valid_to); } uint8_t state; diff --git a/src/requests.c b/src/requests.c index c0bb15e..45c77b4 100644 --- a/src/requests.c +++ b/src/requests.c @@ -326,13 +326,13 @@ int facilities_request_single_message(void *responder, EIS_FacilitiesMessageRequ if (!((EI1_IVIM_t *)its_msg)->ivi.mandatory.validFrom) { valid_from = itss_time_get(); } else { - asn_INTEGER2ulong((INTEGER_t *)((EI1_IVIM_t *)its_msg)->ivi.mandatory.validFrom, (unsigned long long *)&valid_from); + asn_INTEGER2ulong((INTEGER_t *)((EI1_IVIM_t *)its_msg)->ivi.mandatory.validFrom, &valid_from); } if (!((EI1_IVIM_t *)its_msg)->ivi.mandatory.validTo) { valid_to = valid_from + facilities.infrastructure.default_service_duration; } else { - asn_INTEGER2ulong((INTEGER_t *)((EI1_IVIM_t *)its_msg)->ivi.mandatory.validTo, (unsigned long long *)&valid_to); + asn_INTEGER2ulong((INTEGER_t *)((EI1_IVIM_t *)its_msg)->ivi.mandatory.validTo, &valid_to); } transmission_start = valid_from; diff --git a/src/tpm.c b/src/tpm.c index cad2d54..1b8c37f 100644 --- a/src/tpm.c +++ b/src/tpm.c @@ -593,11 +593,11 @@ static int rsu_handle_recv(EI1_TPM_t* tpm_rx, void** security_socket, uint8_t* n case TOLLING_PROTOCOL_GN_DPKI: log_info("[tolling] received toll %s.request | client: %lld (certificate id: 0x%02x%02x%02x) nonce: %lld", tts(type_rx->present), - (long long) client_id, + client_id, neighbour ? neighbour[5] : 0, neighbour ? neighbour[6] : 0, neighbour ? neighbour[7] : 0, - (long long) nonce + nonce ); break; case TOLLING_PROTOCOL_TLS: @@ -605,8 +605,8 @@ static int rsu_handle_recv(EI1_TPM_t* tpm_rx, void** security_socket, uint8_t* n case TOLLING_PROTOCOL_TLS_SHS: log_info("[tolling] received toll %s.request | client: %lld nonce: %lld", tts(type_rx->present), - (long long) client_id, - (long long) nonce + client_id, + nonce ); break; } @@ -1219,11 +1219,11 @@ static int veh_handle_recv(tolling_t* tolling, EI1_TPM_t* tpm_rx, void** securit switch (type_rx->present) { case EI1_TollingType_PR_entry: - log_info("[tolling] received entry.reply | client: %lld nonce: %lld accepted: %s", (long long) tolling->station.obu.client_id, tolling->station.obu.nonce, accepted ? "yes" : "no"); + log_info("[tolling] received entry.reply | client: %lld nonce: %lld accepted: %s", tolling->station.obu.client_id, tolling->station.obu.nonce, accepted ? "yes" : "no"); break; case EI1_TollingType_PR_exit: - log_info("[tolling] received exit.reply | client: %lld nonce: %lld accepted: %s", (long long) tolling->station.obu.client_id, tolling->station.obu.nonce, accepted ? "yes" : "no"); + log_info("[tolling] received exit.reply | client: %lld nonce: %lld accepted: %s", tolling->station.obu.client_id, tolling->station.obu.nonce, accepted ? "yes" : "no"); tolling->station.obu.toll_type = -1; tolling->station.obu.active = false; ASN_STRUCT_FREE(asn_DEF_EI1_TPM, tolling->station.obu.entry_proof); @@ -1231,7 +1231,7 @@ static int veh_handle_recv(tolling_t* tolling, EI1_TPM_t* tpm_rx, void** securit break; case EI1_TollingType_PR_single: - log_info("[tolling] received single.reply | client: %lld nonce: %lld accepted: %s", (long long) tolling->station.obu.client_id, tolling->station.obu.nonce, accepted ? "yes" : "no"); + log_info("[tolling] received single.reply | client: %lld nonce: %lld accepted: %s", tolling->station.obu.client_id, tolling->station.obu.nonce, accepted ? "yes" : "no"); tolling->station.obu.toll_type = -1; tolling->station.obu.active = false; break; diff --git a/src/vcm.c b/src/vcm.c index e20b0f8..b0dc9a4 100644 --- a/src/vcm.c +++ b/src/vcm.c @@ -459,7 +459,7 @@ static int vcm_check_handle_request(EI1_VCM_t* vcm, mc_neighbour_s* neighbour) { itss_st_t* trj = calloc(stdt->list.count/2 + 1, sizeof(itss_st_t)); trj[0].latitude = vcm->vcm.currentPosition.latitude; trj[0].longitude = vcm->vcm.currentPosition.longitude; - asn_INTEGER2ulong(&vcm->vcm.currentPosition.timestamp, (unsigned long long*) &trj[0].timestamp); + asn_INTEGER2ulong(&vcm->vcm.currentPosition.timestamp, &trj[0].timestamp); int h = 0; for (h = 1; h < stdt->list.count/2; ++h) { trj[h].latitude = trj[h-1].latitude + stdt->list.array[h-1]->deltaLatitude; @@ -895,7 +895,7 @@ static int intersection_detected(EI1_VCM_t* vcm, mc_neighbour_s* neighbour) { pt->affectingStations.list.size = n_intneigh*sizeof(void*); pt->affectingStations.list.array = malloc(n_intneigh * sizeof(void*)); for (int i = 0; i < n_intneigh; ++i) { - pt->affectingStations.list.array[i] = malloc(sizeof(long long)); + pt->affectingStations.list.array[i] = malloc(sizeof(long)); *pt->affectingStations.list.array[i] = intneigh[i]->station_id; #ifndef NDEBUG wr += sprintf(buffer + wr, " %d", intneigh[i]->station_id); @@ -945,7 +945,7 @@ static void intersection_check(EI1_VCM_t* vcm, mc_neighbour_s* neighbour) { trajectoryB[0].latitude = vcm->vcm.currentPosition.latitude; trajectoryB[0].longitude = vcm->vcm.currentPosition.longitude; - asn_INTEGER2ulong(&vcm->vcm.currentPosition.timestamp, (unsigned long long*) &trajectoryB[0].timestamp); + asn_INTEGER2ulong(&vcm->vcm.currentPosition.timestamp, &trajectoryB[0].timestamp); ++trajectoryB_len; for (int i = 1; i < mvc->plannedTrajectory.list.count && i < TRAJECTORY_MAX_LEN; ++i) { trajectoryB[i].latitude = mvc->plannedTrajectory.list.array[i]->deltaLatitude + trajectoryB[i-1].latitude;