From 79de90bdc6c1bee23523fef395d10ccb323095d8 Mon Sep 17 00:00:00 2001 From: emanuel Date: Tue, 4 Jan 2022 16:58:02 +0000 Subject: [PATCH] TPM recv neighbour ID --- src/facilities.c | 12 ++++++++---- src/tpm.c | 2 +- src/tpm.h | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/facilities.c b/src/facilities.c index 54a9a15..fedafdb 100644 --- a/src/facilities.c +++ b/src/facilities.c @@ -135,9 +135,9 @@ static int transport_indication(facilities_t *facilities, void* responder, void* // Get permisisons uint8_t* ssp = NULL; uint16_t ssp_len; - if (tpi->choice.btp.gn.permissions) { - ssp = tpi->choice.btp.gn.permissions->ssp.buf; - ssp_len = tpi->choice.btp.gn.permissions->ssp.size; + if (tpi->choice.btp.gn.securityPermissions) { + ssp = tpi->choice.btp.gn.securityPermissions->ssp.buf; + ssp_len = tpi->choice.btp.gn.securityPermissions->ssp.size; } // Manage message @@ -202,7 +202,11 @@ static int transport_indication(facilities_t *facilities, void* responder, void* break; case 7011: - tpm_recv(facilities, its_msg); + tpm_recv( + facilities, + its_msg, + tpi->choice.btp.gn.securityNeighbour ? tpi->choice.btp.gn.securityNeighbour->buf : NULL + ); break; default: diff --git a/src/tpm.c b/src/tpm.c index 63736ea..a57401b 100644 --- a/src/tpm.c +++ b/src/tpm.c @@ -249,7 +249,7 @@ static void veh_handle_recv(tolling_s* tolling, TollReply_t* rep) { tolling->active = false; } -int tpm_recv(void* fc, TPM_t* tpm_rx) { +int tpm_recv(void* fc, TPM_t* tpm_rx, uint8_t* neighbour) { int rv = 0; facilities_t* facilities = (facilities_t*) fc; diff --git a/src/tpm.h b/src/tpm.h index 0a7846e..e33bf64 100644 --- a/src/tpm.h +++ b/src/tpm.h @@ -23,4 +23,4 @@ typedef struct tolling { } tolling_s; int tpm_pay(void* fc); -int tpm_recv(void* fc, TPM_t* tpm_rx); +int tpm_recv(void* fc, TPM_t* tpm_rx, uint8_t* neighbour);