TiagoRG
/
it2s-itss-facilities
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove port from TLS tolling

This commit is contained in:
emanuel 2022-04-19 17:52:50 +01:00
parent 1563f488cf
commit 946fe7ab8c
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/facilities.c
View File

@ -226,7 +226,7 @@ static int transport_indication(facilities_t *facilities, void* responder, void*
case 7011: case 7011:
if (facilities->tolling.enabled) { if (facilities->tolling.enabled) {
tpm_recv(facilities, its_msg, security_socket, neighbour_cert, NULL, 0); tpm_recv(facilities, its_msg, security_socket, neighbour_cert, NULL);
} }
break; break;
@ -323,7 +323,7 @@ static int transport_indication(facilities_t *facilities, void* responder, void*
goto cleanup; goto cleanup;
} }
if (!dec.code) { if (!dec.code) {
tpm_recv(facilities, its_msg, security_socket, NULL, tpi->choice.tcp.sourceAddress->buf, tpi->choice.tcp.sourcePort); tpm_recv(facilities, its_msg, security_socket, NULL, tpi->choice.tcp.sourceAddress->buf);
} }
} }
} }

4
src/saem.c
View File

@ -389,13 +389,13 @@ void *sa_service(void *fc) {
switch (facilities->tolling.protocol) { switch (facilities->tolling.protocol) {
case TOLLING_PROTOCOL_SIMPLE: case TOLLING_PROTOCOL_SIMPLE:
tpm_pay(facilities, info, security_socket, bulletin->to_consume[a]->certificate_id, NULL, 0); tpm_pay(facilities, info, security_socket, bulletin->to_consume[a]->certificate_id, NULL);
++bulletin->to_consume[a]->n_trigger; ++bulletin->to_consume[a]->n_trigger;
bulletin->to_consume[a]->t_trigger = now; bulletin->to_consume[a]->t_trigger = now;
break; break;
case TOLLING_PROTOCOL_TLS: case TOLLING_PROTOCOL_TLS:
tpm_pay(facilities, info, security_socket, NULL, bulletin->to_consume[a]->endpoint.ipv6_addr, bulletin->to_consume[a]->endpoint.port); tpm_pay(facilities, info, security_socket, NULL, bulletin->to_consume[a]->endpoint.ipv6_addr);
++bulletin->to_consume[a]->n_trigger; ++bulletin->to_consume[a]->n_trigger;
bulletin->to_consume[a]->t_trigger = now; bulletin->to_consume[a]->t_trigger = now;
break; break;

14
src/tpm.c
View File

@ -29,7 +29,7 @@ int tpm_is_inside_zone(void* fc, tolling_info_s* ti) {
return 0; return 0;
} }
int tpm_pay(void* fc, tolling_info_s* info, void* security_socket, uint8_t* neighbour, uint8_t* dst_addr, uint16_t dst_port) { int tpm_pay(void* fc, tolling_info_s* info, void* security_socket, uint8_t* neighbour, uint8_t* dst_addr) {
int rv = 0; int rv = 0;
facilities_t* facilities = (facilities_t*) fc; facilities_t* facilities = (facilities_t*) fc;
@ -212,7 +212,7 @@ int tpm_pay(void* fc, tolling_info_s* info, void* security_socket, uint8_t* neig
tcp->destinationAddress->buf = malloc(16); tcp->destinationAddress->buf = malloc(16);
tcp->destinationAddress->size = 16; tcp->destinationAddress->size = 16;
memcpy(tcp->destinationAddress->buf, dst_addr, 16); memcpy(tcp->destinationAddress->buf, dst_addr, 16);
tcp->destinationPort = dst_port; tcp->destinationPort = 7011;
tcp->sourcePort = 7011; tcp->sourcePort = 7011;
tcp->data.buf = malloc(srep->data->choice.tlsSend.data.size); tcp->data.buf = malloc(srep->data->choice.tlsSend.data.size);
@ -273,7 +273,7 @@ cleanup:
return rv; return rv;
} }
static void rsu_handle_recv(facilities_t* facilities, TPM_t* tpm_rx, void* security_socket, uint8_t* neighbour, uint8_t* dst_addr, uint16_t dst_port) { static void rsu_handle_recv(facilities_t* facilities, TPM_t* tpm_rx, void* security_socket, uint8_t* neighbour, uint8_t* src_addr) {
TollRequest_t* req = &tpm_rx->tpm.tollingFlow.choice.request; TollRequest_t* req = &tpm_rx->tpm.tollingFlow.choice.request;
tolling_s* tolling = &facilities->tolling; tolling_s* tolling = &facilities->tolling;
@ -520,8 +520,8 @@ static void rsu_handle_recv(facilities_t* facilities, TPM_t* tpm_rx, void* secur
tcp->destinationAddress = calloc(1, sizeof(OCTET_STRING_t)); tcp->destinationAddress = calloc(1, sizeof(OCTET_STRING_t));
tcp->destinationAddress->buf = malloc(16); tcp->destinationAddress->buf = malloc(16);
tcp->destinationAddress->size = 16; tcp->destinationAddress->size = 16;
memcpy(tcp->destinationAddress->buf, dst_addr, 16); memcpy(tcp->destinationAddress->buf, src_addr, 16);
tcp->destinationPort = dst_port; tcp->destinationPort = 7011;
tcp->sourcePort = 7011; tcp->sourcePort = 7011;
tcp->data.buf = malloc(srep->data->choice.tlsSend.data.size); tcp->data.buf = malloc(srep->data->choice.tlsSend.data.size);
@ -664,7 +664,7 @@ cleanup:
ASN_STRUCT_FREE(asn_DEF_SecurityReply, srep); ASN_STRUCT_FREE(asn_DEF_SecurityReply, srep);
} }
int tpm_recv(void* fc, TPM_t* tpm_rx, void* security_socket, uint8_t* neighbour, uint8_t* src_addr, uint16_t src_port) { int tpm_recv(void* fc, TPM_t* tpm_rx, void* security_socket, uint8_t* neighbour, uint8_t* src_addr) {
int rv = 0; int rv = 0;
facilities_t* facilities = (facilities_t*) fc; facilities_t* facilities = (facilities_t*) fc;
@ -681,7 +681,7 @@ int tpm_recv(void* fc, TPM_t* tpm_rx, void* security_socket, uint8_t* neighbour,
syslog_debug("[facilities] [tolling] received TPM.request, ignoring"); syslog_debug("[facilities] [tolling] received TPM.request, ignoring");
goto cleanup; goto cleanup;
} }
rsu_handle_recv(facilities, tpm_rx, security_socket, neighbour, src_addr, src_port); rsu_handle_recv(facilities, tpm_rx, security_socket, neighbour, src_addr);
break; break;
case TollingFlow_PR_reply: case TollingFlow_PR_reply:

4
src/tpm.h
View File

@ -50,8 +50,8 @@ typedef struct tolling {
*/ */
int tolling_init(tolling_s* tolling, void* zmq_ctx, char* security_address); int tolling_init(tolling_s* tolling, void* zmq_ctx, char* security_address);
int tpm_pay(void* fc, tolling_info_s* info, void* security_socket, uint8_t* neighbour, uint8_t* src_addr, uint16_t src_port); int tpm_pay(void* fc, tolling_info_s* info, void* security_socket, uint8_t* neighbour, uint8_t* dst_addr);
int tpm_recv(void* fc, TPM_t* tpm_rx, void* security_socket, uint8_t* neighbour, uint8_t* src_addr, uint16_t src_port); int tpm_recv(void* fc, TPM_t* tpm_rx, void* security_socket, uint8_t* neighbour, uint8_t* src_addr);
int tpm_is_inside_zone(void* fc, tolling_info_s* ti); int tpm_is_inside_zone(void* fc, tolling_info_s* ti);
tolling_info_s* tolling_info_new(it2s_tender_epv_t* epv, TollingPaymentInfo_t* tpi); tolling_info_s* tolling_info_new(it2s_tender_epv_t* epv, TollingPaymentInfo_t* tpi);