From 77dac09f06f4e98b879fc09008b1f45fc7a2f1e3 Mon Sep 17 00:00:00 2001 From: emanuel Date: Mon, 23 May 2022 17:22:06 +0100 Subject: [PATCH] Cast ull asn integer args --- src/cam.c | 2 +- src/config.c | 6 +++--- src/denm.c | 12 ++++++------ src/facilities.c | 4 ++-- src/infrastructure.c | 18 +++++++++--------- src/pcm.c | 4 ++-- src/requests.c | 4 ++-- src/tpm.c | 8 ++++---- 8 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/cam.c b/src/cam.c index c2c13fb..c0ea3dd 100644 --- a/src/cam.c +++ b/src/cam.c @@ -426,7 +426,7 @@ int lightship_check(lightship_t* lightship, it2s_tender_epv_t* epv) { 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, &expiry); + asn_INTEGER2ulong(lightship->protected_zones.pz[i]->expiryTime, (unsigned long long*) &expiry); if (now >= expiry) { ASN_STRUCT_FREE(asn_DEF_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 0aed976..c9f5169 100644 --- a/src/config.c +++ b/src/config.c @@ -471,15 +471,15 @@ int facilities_config(void* facilities_s) { facilities->epv.space.type = *mrep->data->choice.attributes.gpsType; facilities->epv.time.type = *mrep->data->choice.attributes.clockType; - asn_INTEGER2ulong(mrep->data->choice.attributes.clock, &facilities->epv.time.clock); - asn_INTEGER2ulong(mrep->data->choice.attributes.clockOffset, &facilities->epv.time.offset); + asn_INTEGER2ulong(mrep->data->choice.attributes.clock, (unsigned long long*) &facilities->epv.time.clock); + asn_INTEGER2ulong(mrep->data->choice.attributes.clockOffset,(unsigned long long*) &facilities->epv.time.offset); if (config->facilities.dcm.activate) { facilities->epv.trajectory.len = mrep->data->choice.attributes.trajectory->list.count; for (int i = 0; i < mrep->data->choice.attributes.trajectory->list.count; ++i) { facilities->epv.trajectory.path[i].latitude = mrep->data->choice.attributes.trajectory->list.array[i]->latitude; facilities->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, &facilities->epv.trajectory.path[i].timestamp); + asn_INTEGER2ulong(&mrep->data->choice.attributes.trajectory->list.array[i]->timestamp, (unsigned long long*) &facilities->epv.trajectory.path[i].timestamp); } } } else { diff --git a/src/denm.c b/src/denm.c index 6585e97..a0b193c 100644 --- a/src/denm.c +++ b/src/denm.c @@ -73,8 +73,8 @@ static enum EVENT_CHECK_R event_check(den_t *den, DENM_t *denm, it2s_tender_epv_ int rv = 0; uint64_t e_detection_time, 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); + 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); if (e_detection_time > e_reference_time) { return EVENT_INVALID; @@ -160,8 +160,8 @@ static int event_add(den_t *den, DENM_t *denm, it2s_tender_epv_t* epv, uint64_t* uint64_t now = it2s_tender_get_clock(epv); uint64_t e_detection_time, 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); + 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); uint32_t e_validity_duration; if (denm->denm.management.validityDuration != NULL) { @@ -230,8 +230,8 @@ static int event_update(den_t *den, DENM_t *denm, it2s_tender_epv_t* epv, uint64 uint64_t now = it2s_tender_get_clock(epv); uint64_t e_detection_time, 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); + 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); uint8_t state = EVENT_ACTIVE; if (denm->denm.management.termination != NULL) { diff --git a/src/facilities.c b/src/facilities.c index e164936..2d56228 100644 --- a/src/facilities.c +++ b/src/facilities.c @@ -644,13 +644,13 @@ static int management_indication(facilities_t* facilities, void* responder, uint for (int i = 0; i < mi->choice.attributes.trajectory->list.count; ++i) { facilities->epv.trajectory.path[i].latitude = mi->choice.attributes.trajectory->list.array[i]->latitude; facilities->epv.trajectory.path[i].longitude = mi->choice.attributes.trajectory->list.array[i]->longitude; - asn_INTEGER2ulong(&mi->choice.attributes.trajectory->list.array[i]->timestamp, &facilities->epv.trajectory.path[i].timestamp); + asn_INTEGER2ulong(&mi->choice.attributes.trajectory->list.array[i]->timestamp, (unsigned long long*) &facilities->epv.trajectory.path[i].timestamp); } } it2s_tender_unlock_trajectory(&facilities->epv); it2s_tender_lock_time(&facilities->epv); - asn_INTEGER2ulong(&mi->choice.attributes.clock, &facilities->epv.time.clock); + asn_INTEGER2ulong(&mi->choice.attributes.clock, (unsigned long long*) &facilities->epv.time.clock); it2s_tender_unlock_time(&facilities->epv); } diff --git a/src/infrastructure.c b/src/infrastructure.c index 7f586ec..8bcc520 100644 --- a/src/infrastructure.c +++ b/src/infrastructure.c @@ -78,19 +78,19 @@ static enum SERVICE_EVAL_R service_check(infrastructure_t* infrastructure, enum if (!ivim->ivi.mandatory.timeStamp) { timestamp = now; } else { - asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.timeStamp, ×tamp); + asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.timeStamp, (unsigned long long*) ×tamp); } if (!ivim->ivi.mandatory.validFrom) { valid_from = now; } else { - asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.validFrom, &valid_from); + asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.validFrom, (unsigned long long*) &valid_from); } if (!ivim->ivi.mandatory.validTo) { valid_to = valid_from + infrastructure->default_service_duration; } else { - asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.validTo, &valid_to); + asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.validTo, (unsigned long long*) &valid_to); } if (now >= valid_to) { @@ -269,19 +269,19 @@ static int service_add(infrastructure_t* infrastructure, enum SERVICE_TYPE type, if (!ivim->ivi.mandatory.timeStamp) { timestamp = now; } else { - asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.timeStamp, ×tamp); + asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.timeStamp, (unsigned long long*) ×tamp); } if (!ivim->ivi.mandatory.validFrom) { valid_from = now; } else { - asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.validFrom, &valid_from); + asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.validFrom, (unsigned long long*) &valid_from); } if (!ivim->ivi.mandatory.validTo) { valid_to = valid_from + infrastructure->default_service_duration; } else { - asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.validTo, &valid_to); + asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.validTo, (unsigned long long*) &valid_to); } pthread_mutex_lock(&infrastructure->lock); @@ -355,19 +355,19 @@ static int service_update(infrastructure_t* infrastructure, enum SERVICE_TYPE ty if (!ivim->ivi.mandatory.timeStamp) { timestamp = now; } else { - asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.timeStamp, ×tamp); + asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.timeStamp,(unsigned long long*) ×tamp); } if (!ivim->ivi.mandatory.validFrom) { valid_from = now; } else { - asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.validFrom, &valid_from); + asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.validFrom, (unsigned long long*) &valid_from); } if (!ivim->ivi.mandatory.validTo) { valid_to = valid_from + infrastructure->default_service_duration; } else { - asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.validTo, &valid_to); + asn_INTEGER2ulong((INTEGER_t*) ivim->ivi.mandatory.validTo,(unsigned long long*) &valid_to); } uint8_t state; diff --git a/src/pcm.c b/src/pcm.c index ca80e32..84e72d9 100644 --- a/src/pcm.c +++ b/src/pcm.c @@ -494,12 +494,12 @@ int pcm_check(void* fc, PCM_t* pcm) { trajectoryB[0].latitude = pcm->pcm.currentPosition.latitude; trajectoryB[0].longitude = pcm->pcm.currentPosition.longitude; - asn_INTEGER2ulong(&pcm->pcm.currentPosition.timestamp, &trajectoryB[0].timestamp); + asn_INTEGER2ulong(&pcm->pcm.currentPosition.timestamp, (unsigned long long*) &trajectoryB[0].timestamp); ++trajectoryB_len; for (int i = 0; i < mvc->plannedTrajectory.list.count && i < TRAJECTORY_MAX_LEN; ++i) { trajectoryB[i+1].latitude = mvc->plannedTrajectory.list.array[i]->latitude; trajectoryB[i+1].longitude = mvc->plannedTrajectory.list.array[i]->longitude; - asn_INTEGER2ulong(&mvc->plannedTrajectory.list.array[i]->timestamp, &trajectoryB[i+1].timestamp); + asn_INTEGER2ulong(&mvc->plannedTrajectory.list.array[i]->timestamp, (unsigned long long*) &trajectoryB[i+1].timestamp); ++trajectoryB_len; } diff --git a/src/requests.c b/src/requests.c index b86365b..bb8f71f 100644 --- a/src/requests.c +++ b/src/requests.c @@ -235,13 +235,13 @@ int facilities_request_single_message(facilities_t* facilities, void* responder, if (!((IVIM_t*) its_msg)->ivi.mandatory.validFrom) { valid_from = it2s_tender_get_clock(&facilities->epv);; } else { - asn_INTEGER2ulong((INTEGER_t*) ((IVIM_t*) its_msg)->ivi.mandatory.validFrom, &valid_from); + asn_INTEGER2ulong((INTEGER_t*) ((IVIM_t*) its_msg)->ivi.mandatory.validFrom, (unsigned long long*) &valid_from); } if (!((IVIM_t*) its_msg)->ivi.mandatory.validTo) { valid_to = valid_from + facilities->infrastructure->default_service_duration; } else { - asn_INTEGER2ulong((INTEGER_t*) ((IVIM_t*) its_msg)->ivi.mandatory.validTo, &valid_to); + asn_INTEGER2ulong((INTEGER_t*) ((IVIM_t*) its_msg)->ivi.mandatory.validTo, (unsigned long long*) &valid_to); } transmission_start = valid_from; diff --git a/src/tpm.c b/src/tpm.c index db23778..a6a51a3 100644 --- a/src/tpm.c +++ b/src/tpm.c @@ -182,7 +182,7 @@ int tpm_pay(void* fc, tolling_info_s* info, void* security_socket, uint8_t* neig buf[0] = 4; asn_enc_rval_t enc = oer_encode_to_buffer(&asn_DEF_SecurityRequest, NULL, sreq, buf+1, buf_len-1); - syslog_debug("[facilities] [tolling]-> SecurityRequest.tlsSend ->[security]"); + syslog_debug("[facilities] [tolling]-> SecurityRequest.tlsSend ->[security] | size:%ldB", enc.encoded); zmq_send(security_socket, buf, enc.encoded+1, 0); int rc = zmq_recv(security_socket, buf, buf_len, 0); if (rc == -1) { @@ -190,7 +190,7 @@ int tpm_pay(void* fc, tolling_info_s* info, void* security_socket, uint8_t* neig rv = 1; goto cleanup; } - syslog_debug("[facilities] [tolling]<- SecurityReply.tlsSend <-[security]"); + syslog_debug("[facilities] [tolling]<- SecurityReply.tlsSend <-[security] | size:%dB", rc); SecurityReply_t* srep = NULL; asn_dec_rval_t dec = oer_decode(NULL, &asn_DEF_SecurityReply, (void**) &srep, buf, buf_len); @@ -513,14 +513,14 @@ static void rsu_handle_recv(facilities_t* facilities, TPM_t* tpm_rx, void* secur buf[0] = 4; asn_enc_rval_t enc = oer_encode_to_buffer(&asn_DEF_SecurityRequest, NULL, sreq, buf+1, buf_len-1); - syslog_debug("[facilities] [tolling]-> SecurityRequest.tlsSend ->[security]"); + syslog_debug("[facilities] [tolling]-> SecurityRequest.tlsSend ->[security] | size:%ldB", enc.encoded); zmq_send(security_socket, buf, enc.encoded+1, 0); int rc = zmq_recv(security_socket, buf, buf_len, 0); if (rc == -1) { syslog_err("[facilities] [tolling]-> SecurityRequest.tlsSend ->[security] "); goto cleanup; } - syslog_debug("[facilities] [tolling]<- SecurityReply.tlsSend <-[security]"); + syslog_debug("[facilities] [tolling]<- SecurityReply.tlsSend <-[security] | size:%dB", rc); asn_dec_rval_t dec = oer_decode(NULL, &asn_DEF_SecurityReply, (void**) &srep, buf, buf_len);