fixed vars with the same name
This commit is contained in:
parent
f2a7b4ad10
commit
9466f7e920
12
src/evm.c
12
src/evm.c
|
|
@ -156,7 +156,7 @@ int evrsrm_recv(EV_RSR_t *evrsr_request) {
|
||||||
tr_oer[0] = 4; // Facilities
|
tr_oer[0] = 4; // Facilities
|
||||||
fi_oer[0] = 4;
|
fi_oer[0] = 4;
|
||||||
if (!(evrsr_request->messageBody.present == EV_RSR_MessageBody_PR_preReservationRequestMessage ||
|
if (!(evrsr_request->messageBody.present == EV_RSR_MessageBody_PR_preReservationRequestMessage ||
|
||||||
evrsr_request->messageBody.present == EV_RSR_MessageBody_PR_reservationRequestMessage)) {
|
evrsr_request->messageBody.present == EV_RSR_MessageBody_PR_reservationRequestMessage)) {
|
||||||
rv = 1;
|
rv = 1;
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
}
|
}
|
||||||
|
|
@ -196,7 +196,7 @@ int evrsrm_recv(EV_RSR_t *evrsr_request) {
|
||||||
itss_queue_send(facilities.tx_queue, tr_oer, enc.encoded + 1, ITSS_TRANSPORT, id, "TR.packet.btp");
|
itss_queue_send(facilities.tx_queue, tr_oer, enc.encoded + 1, ITSS_TRANSPORT, id, "TR.packet.btp");
|
||||||
|
|
||||||
itss_queue_send(facilities.tx_queue, fi_oer, enc_fdi.encoded + 1, ITSS_APPLICATIONS, id, "FI.message");
|
itss_queue_send(facilities.tx_queue, fi_oer, enc_fdi.encoded + 1, ITSS_APPLICATIONS, id, "FI.message");
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
log_debug("[ev] evrsrm_recv done");
|
log_debug("[ev] evrsrm_recv done");
|
||||||
return rv;
|
return rv;
|
||||||
|
|
@ -213,9 +213,9 @@ static int evrsrm_pre_reservation_response(uint8_t *evrsrm_oer, uint32_t *evrsrm
|
||||||
evrsr_response->messageBody.present = EV_RSR_MessageBody_PR_preReservationResponseMessage;
|
evrsr_response->messageBody.present = EV_RSR_MessageBody_PR_preReservationResponseMessage;
|
||||||
|
|
||||||
PreReservationResponseMessage_t response = evrsr_response->messageBody.choice.preReservationResponseMessage;
|
PreReservationResponseMessage_t response = evrsr_response->messageBody.choice.preReservationResponseMessage;
|
||||||
char *pre_reservation_id = calloc(1, sizeof(char) * 10);
|
char *pre_reservation_id_s = calloc(1, sizeof(char) * 10);
|
||||||
sprintf(pre_reservation_id, "%d", pre_reservation_id);
|
sprintf(pre_reservation_id_s, "%d", pre_reservation_id);
|
||||||
response.preReservation_ID = *create_utf8_from_string(pre_reservation_id, strlen(pre_reservation_id));
|
response.preReservation_ID = *create_utf8_from_string(pre_reservation_id_s, strlen(pre_reservation_id_s));
|
||||||
|
|
||||||
response.availabilityStatus = 0;
|
response.availabilityStatus = 0;
|
||||||
|
|
||||||
|
|
@ -235,7 +235,7 @@ static int evrsrm_pre_reservation_response(uint8_t *evrsrm_oer, uint32_t *evrsrm
|
||||||
pre_reservation_id++;
|
pre_reservation_id++;
|
||||||
cleanup:
|
cleanup:
|
||||||
ASN_STRUCT_FREE(asn_DEF_EV_RSR, evrsr_response);
|
ASN_STRUCT_FREE(asn_DEF_EV_RSR, evrsr_response);
|
||||||
return rv;
|
return rv;
|
||||||
}
|
}
|
||||||
|
|
||||||
int evcsnm_check(EvcsnPdu_t *evcsnm) {
|
int evcsnm_check(EvcsnPdu_t *evcsnm) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue