From fe25d9a850af2323fe685cae4eb29f75efa8553c Mon Sep 17 00:00:00 2001
From: emanuel <vieira.e@ua.pt>
Date: Thu, 1 Dec 2022 13:43:38 +0000
Subject: [PATCH] Prefix ASN includes with it2s-asn/

---
 src/cam.c            |  8 +++----
 src/cam.h            |  4 ++--
 src/config.c         | 12 +++++-----
 src/cpm.c            |  8 +++----
 src/cpm.h            |  2 +-
 src/denm.h           |  2 +-
 src/facilities.c     | 34 +++++++++++++--------------
 src/indications.c    |  4 ++--
 src/indications.h    |  2 +-
 src/infrastructure.c |  2 +-
 src/infrastructure.h |  2 +-
 src/requests.c       |  6 ++---
 src/requests.h       |  4 ++--
 src/saem.c           | 13 ++++------
 src/saem.h           |  2 +-
 src/tpm.c            |  8 +++----
 src/tpm.h            |  4 ++--
 src/vcm.c            | 56 +++++++++++++++++++++++++++++++-------------
 src/vcm.h            |  2 +-
 test/tester.c        | 12 +++++-----
 20 files changed, 103 insertions(+), 84 deletions(-)

diff --git a/src/cam.c b/src/cam.c
index ce582bb..7a16a9a 100644
--- a/src/cam.c
+++ b/src/cam.c
@@ -1,10 +1,10 @@
 #include "cam.h"
 #include "facilities.h"
 
-#include <itss-transport/TransportRequest.h>
-#include <itss-facilities/FacilitiesIndication.h>
-#include <itss-management/ManagementRequest.h>
-#include <camv2/CAM.h>
+#include <it2s-asn/itss-transport/TransportRequest.h>
+#include <it2s-asn/itss-facilities/FacilitiesIndication.h>
+#include <it2s-asn/itss-management/ManagementRequest.h>
+#include <it2s-asn/camv2/CAM.h>
 
 #include <sys/mman.h>
 #include <stdint.h>
diff --git a/src/cam.h b/src/cam.h
index da46fd8..2777d31 100644
--- a/src/cam.h
+++ b/src/cam.h
@@ -6,8 +6,8 @@
 #include <pthread.h>
 #include <stdbool.h>
 
-#include <camv2/CAM.h>
-#include <itss-transport/BTPPacketIndication.h>
+#include <it2s-asn/camv2/CAM.h>
+#include <it2s-asn/itss-transport/BTPPacketIndication.h>
 
 #include <it2s-tender/epv.h>
 
diff --git a/src/config.c b/src/config.c
index 3c1121e..dc71f0d 100644
--- a/src/config.c
+++ b/src/config.c
@@ -9,16 +9,16 @@
 #include <it2s-config.h>
 #include <dirent.h>
 #include <sys/time.h>
-#include <camv2/ProtectedCommunicationZone.h>
-#include <tpm/TollingPaymentInfo.h>
+#include <it2s-asn/camv2/ProtectedCommunicationZone.h>
+#include <it2s-asn/tpm/TollingPaymentInfo.h>
 #include <zmq.h>
 
 #include <it2s-tender/packet.h>
 
-#include <itss-management/ManagementRequest.h>
-#include <itss-management/ManagementReply.h>
-#include <itss-security/SecurityRequest.h>
-#include <itss-security/SecurityReply.h>
+#include <it2s-asn/itss-management/ManagementRequest.h>
+#include <it2s-asn/itss-management/ManagementReply.h>
+#include <it2s-asn/itss-security/SecurityRequest.h>
+#include <it2s-asn/itss-security/SecurityReply.h>
 
 static int fetch_target_address(char** addresses, uint16_t addresses_len) {
     int index = -1;
diff --git a/src/cpm.c b/src/cpm.c
index 6e94048..e71702b 100644
--- a/src/cpm.c
+++ b/src/cpm.c
@@ -1,15 +1,13 @@
 #include "cpm.h"
 #include "facilities.h"
 
-#include <cpm/CPM.h>
-#include <cpm/INTEGER.h>
-#include <cpm/asn_application.h>
-#include <itss-transport/TransportRequest.h>
+#include <it2s-asn/cpm/CPM.h>
+#include <it2s-asn/itss-transport/TransportRequest.h>
 #include <it2s-config.h>
 #include <math.h>
 #include <signal.h>
 #include <unistd.h>
-#include <itss-facilities/FacilitiesIndication.h>
+#include <it2s-asn/itss-facilities/FacilitiesIndication.h>
 
 #include <arpa/inet.h>
 #include <stdbool.h>
diff --git a/src/cpm.h b/src/cpm.h
index 4201c1f..fcd78f9 100644
--- a/src/cpm.h
+++ b/src/cpm.h
@@ -5,7 +5,7 @@
 #include <arpa/inet.h>
 #include <stdbool.h>
 
-#include <cpm/CPM.h>
+#include <it2s-asn/cpm/CPM.h>
 #include <termios.h>
 #include <unistd.h>
 #include <time.h>
diff --git a/src/denm.h b/src/denm.h
index b41d102..d817d53 100644
--- a/src/denm.h
+++ b/src/denm.h
@@ -2,7 +2,7 @@
 #define FACILITIES_DENM_H
 
 #include <stdint.h>
-#include <denmv2/DENM.h>
+#include <it2s-asn/denmv2/DENM.h>
 #include <pthread.h>
 #include <stdbool.h>
 
diff --git a/src/facilities.c b/src/facilities.c
index b68c327..3892021 100644
--- a/src/facilities.c
+++ b/src/facilities.c
@@ -10,24 +10,24 @@
 #include "tpm.h"
 #include "vcm.h"
 
-#include <itss-networking/NetworkingIndication.h>
-#include <itss-transport/TransportRequest.h>
-#include <itss-transport/TransportIndication.h>
-#include <itss-facilities/FacilitiesIndication.h>
-#include <itss-facilities/FacilitiesRequest.h>
-#include <itss-facilities/FacilitiesReply.h>
-#include <itss-security/SecurityIndication.h>
-#include <itss-security/SecurityResponse.h>
-#include <itss-management/ManagementIndication.h>
-#include <itss-management/ManagementRequest.h>
-#include <itss-security/SecurityRequest.h>
-#include <itss-security/SecurityReply.h>
+#include <it2s-asn/itss-networking/NetworkingIndication.h>
+#include <it2s-asn/itss-transport/TransportRequest.h>
+#include <it2s-asn/itss-transport/TransportIndication.h>
+#include <it2s-asn/itss-facilities/FacilitiesIndication.h>
+#include <it2s-asn/itss-facilities/FacilitiesRequest.h>
+#include <it2s-asn/itss-facilities/FacilitiesReply.h>
+#include <it2s-asn/itss-security/SecurityIndication.h>
+#include <it2s-asn/itss-security/SecurityResponse.h>
+#include <it2s-asn/itss-management/ManagementIndication.h>
+#include <it2s-asn/itss-management/ManagementRequest.h>
+#include <it2s-asn/itss-security/SecurityRequest.h>
+#include <it2s-asn/itss-security/SecurityReply.h>
 
-#include <camv2/CAM.h>
-#include <denmv2/DENM.h>
-#include <ivim/IVIM.h>
-#include <cpm/CPM.h>
-#include <saem/SAEM.h>
+#include <it2s-asn/camv2/CAM.h>
+#include <it2s-asn/denmv2/DENM.h>
+#include <it2s-asn/ivim/IVIM.h>
+#include <it2s-asn/cpm/CPM.h>
+#include <it2s-asn/saem/SAEM.h>
 
 #include <zmq.h>
 #include <stdbool.h>
diff --git a/src/indications.c b/src/indications.c
index 34d5165..642d3a3 100644
--- a/src/indications.c
+++ b/src/indications.c
@@ -1,7 +1,7 @@
 #include "indications.h"
 
-#include <itss-security/SecurityRequest.h>
-#include <itss-security/SecurityReply.h>
+#include <it2s-asn/itss-security/SecurityRequest.h>
+#include <it2s-asn/itss-security/SecurityReply.h>
 
 #include <it2s-tender/packet.h>
 
diff --git a/src/indications.h b/src/indications.h
index 6b88ea5..11e0420 100644
--- a/src/indications.h
+++ b/src/indications.h
@@ -1,6 +1,6 @@
 #pragma once
 
 #include "facilities.h"
-#include <itss-transport/TransportIndication.h>
+#include <it2s-asn/itss-transport/TransportIndication.h>
 
 int transport_data_indication(TransportDataIndication_t* tpi, void** security_socket);
diff --git a/src/infrastructure.c b/src/infrastructure.c
index f9bff78..01c8d01 100644
--- a/src/infrastructure.c
+++ b/src/infrastructure.c
@@ -6,7 +6,7 @@
 #include <it2s-tender/space.h>
 #include <it2s-tender/time.h>
 
-#include <ivim/ISO14823Code.h>
+#include <it2s-asn/ivim/ISO14823Code.h>
 
 const ivi_diid_ssp_bm_t DIID_SSP_BM_MAP[] = {
     {"Vienna Convention Code for road sign",                               IVI_DIID_ViennaCodeConvention,                                               0x800000},
diff --git a/src/infrastructure.h b/src/infrastructure.h
index b3f7e24..b75f069 100644
--- a/src/infrastructure.h
+++ b/src/infrastructure.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <stdint.h>
-#include <ivim/IVIM.h>
+#include <it2s-asn/ivim/IVIM.h>
 #include <pthread.h>
 #include <stdbool.h>
 #include <it2s-tender/epv.h>
diff --git a/src/requests.c b/src/requests.c
index 0be350d..151b9f3 100644
--- a/src/requests.c
+++ b/src/requests.c
@@ -5,11 +5,11 @@
 #include "requests.h"
 #include "cpm.h"
 
-#include <itss-facilities/FacilitiesReply.h>
-#include <itss-transport/TransportRequest.h>
+#include <it2s-asn/itss-facilities/FacilitiesReply.h>
+#include <it2s-asn/itss-transport/TransportRequest.h>
 
 #include <zmq.h>
-#include <cpm/CPM.h>
+#include <it2s-asn/cpm/CPM.h>
 
 #include <it2s-tender/time.h>
 #include <it2s-tender/recorder.h>
diff --git a/src/requests.h b/src/requests.h
index e4f8a31..0ff372d 100644
--- a/src/requests.h
+++ b/src/requests.h
@@ -2,8 +2,8 @@
 #define FACILITIES_REQUESTS
 
 #include "facilities.h"
-#include <itss-facilities/FacilitiesRequest.h>
-#include <itss-transport/TransportIndication.h>
+#include <it2s-asn/itss-facilities/FacilitiesRequest.h>
+#include <it2s-asn/itss-transport/TransportIndication.h>
 
 int facilities_request_result_accepted(void* responder);
 int facilities_request_result_rejected(void* responder);
diff --git a/src/saem.c b/src/saem.c
index 8d2e204..d9b6d41 100644
--- a/src/saem.c
+++ b/src/saem.c
@@ -8,14 +8,11 @@
 #include <it2s-tender/space.h>
 #include <it2s-tender/recorder.h>
 #include <it2s-tender/packet.h>
-#include <itss-transport/TransportRequest.h>
-#include <itss-security/SecurityRequest.h>
-#include <itss-security/SecurityReply.h>
-#include <saem/asn_application.h>
-#include <saem/per_decoder.h>
-#include <saem/per_encoder.h>
-#include <tpm/TollingPaymentInfo.h>
-#include <saem/SAEM.h>
+#include <it2s-asn/itss-transport/TransportRequest.h>
+#include <it2s-asn/itss-security/SecurityRequest.h>
+#include <it2s-asn/itss-security/SecurityReply.h>
+#include <it2s-asn/tpm/TollingPaymentInfo.h>
+#include <it2s-asn/saem/SAEM.h>
 #include <zmq.h>
 
 
diff --git a/src/saem.h b/src/saem.h
index 8f3fe8e..7c627fb 100644
--- a/src/saem.h
+++ b/src/saem.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <saem/SAEM.h>
+#include <it2s-asn/saem/SAEM.h>
 #include <stdint.h>
 
 #define MAX_ANNOUNCEMENTS_LEN 32
diff --git a/src/tpm.c b/src/tpm.c
index 0e0280a..8976c76 100644
--- a/src/tpm.c
+++ b/src/tpm.c
@@ -2,11 +2,11 @@
 #include "facilities.h"
 
 #include <it2s-tender/constants.h>
-#include <itss-security/SecurityRequest.h>
-#include <itss-security/SecurityReply.h>
-#include <itss-facilities/FacilitiesIndication.h>
+#include <it2s-asn/itss-security/SecurityRequest.h>
+#include <it2s-asn/itss-security/SecurityReply.h>
+#include <it2s-asn/itss-facilities/FacilitiesIndication.h>
 #include <it2s-tender/time.h>
-#include <itss-transport/TransportRequest.h>
+#include <it2s-asn/itss-transport/TransportRequest.h>
 #include <it2s-tender/space.h>
 #include <it2s-tender/geodesy.h>
 #include <it2s-tender/recorder.h>
diff --git a/src/tpm.h b/src/tpm.h
index 37ad9f1..5bb24ad 100644
--- a/src/tpm.h
+++ b/src/tpm.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <tpm/TPM.h>
-#include <tpm/TollingPaymentInfo.h>
+#include <it2s-asn/tpm/TPM.h>
+#include <it2s-asn/tpm/TollingPaymentInfo.h>
 #include <it2s-tender/time.h>
 #include <it2s-tender/queue.h>
 #include <stdbool.h>
diff --git a/src/vcm.c b/src/vcm.c
index 9dd6b3f..959cefd 100644
--- a/src/vcm.c
+++ b/src/vcm.c
@@ -7,10 +7,10 @@
 #include <it2s-tender/geodesy.h>
 #include <it2s-tender/recorder.h>
 #include <it2s-tender/packet.h>
-#include <itss-transport/TransportRequest.h>
-#include <itss-facilities/FacilitiesIndication.h>
-#include <itss-management/ManagementRequest.h>
-#include <vcm/VCM.h>
+#include <it2s-asn/itss-transport/TransportRequest.h>
+#include <it2s-asn/itss-facilities/FacilitiesIndication.h>
+#include <it2s-asn/itss-management/ManagementRequest.h>
+#include <it2s-asn/vcm/VCM.h>
 
 static int do_paths_intersect(
         itss_st_t* tA, int tA_len, uint16_t vA_length, uint16_t vA_width, 
@@ -88,9 +88,15 @@ static void vcm_reject(VCM_t* vcm, mc_neighbour_s* neighbour) {
         vcm_rep->vcm.chain->link.buf = malloc(32);
         vcm_rep->vcm.chain->link.size = 32;
         memcpy(vcm_rep->vcm.chain->link.buf, coordination->chain.link, 32);
-        vcm_rep->vcm.chain->area = calloc(1, sizeof(OCTET_STRING_t));
-        vcm_rep->vcm.chain->area->buf = malloc(4);
-        vcm_rep->vcm.chain->area->size = 4;
+        vcm->vcm.chain->area = calloc(1, sizeof(struct area*));
+        vcm->vcm.chain->area->list.count = 1;
+        vcm->vcm.chain->area->list.size = 1 * sizeof(OCTET_STRING_t*);
+        vcm->vcm.chain->area->list.array = malloc(1 * sizeof(OCTET_STRING_t*));
+        for (int q = 0; q < 1; ++q) {
+            vcm->vcm.chain->area->list.array[q] = calloc(1, sizeof(OCTET_STRING_t));
+            vcm->vcm.chain->area->list.array[q]->buf = malloc(4);
+            vcm->vcm.chain->area->list.array[q]->size = 4;
+        }
     }
 
     vcm_rep->vcm.maneuverContainer.present = ManeuverContainer_PR_vehicle;
@@ -325,9 +331,15 @@ static int vcm_check_handle_request(VCM_t* vcm, mc_neighbour_s* neighbour) {
         vcm_rep->vcm.chain->link.buf = malloc(32);
         vcm_rep->vcm.chain->link.size = 32;
         memcpy(vcm_rep->vcm.chain->link.buf, coordination->chain.link, 32);
-        vcm_rep->vcm.chain->area = calloc(1, sizeof(OCTET_STRING_t));
-        vcm_rep->vcm.chain->area->buf = malloc(4);
-        vcm_rep->vcm.chain->area->size = 4;
+        vcm->vcm.chain->area = calloc(1, sizeof(struct area*));
+        vcm->vcm.chain->area->list.count = 1;
+        vcm->vcm.chain->area->list.size = 1 * sizeof(OCTET_STRING_t*);
+        vcm->vcm.chain->area->list.array = malloc(1 * sizeof(OCTET_STRING_t*));
+        for (int q = 0; q < 1; ++q) {
+            vcm->vcm.chain->area->list.array[q] = calloc(1, sizeof(OCTET_STRING_t));
+            vcm->vcm.chain->area->list.array[q]->buf = malloc(4);
+            vcm->vcm.chain->area->list.array[q]->size = 4;
+        }
     }
 
     vcm_rep->vcm.maneuverContainer.present = ManeuverContainer_PR_vehicle;
@@ -591,9 +603,15 @@ static int intersection_detected(VCM_t* vcm, mc_neighbour_s* neighbour) {
         vcm_req->vcm.chain->link.buf = malloc(32);
         vcm_req->vcm.chain->link.size = 32;
         memcpy(vcm_req->vcm.chain->link.buf, coordination->chain.link, 32);
-        vcm_req->vcm.chain->area = calloc(1, sizeof(OCTET_STRING_t));
-        vcm_req->vcm.chain->area->buf = malloc(4);
-        vcm_req->vcm.chain->area->size = 4;
+        vcm->vcm.chain->area = calloc(1, sizeof(struct area*));
+        vcm->vcm.chain->area->list.count = 1;
+        vcm->vcm.chain->area->list.size = 1 * sizeof(OCTET_STRING_t*);
+        vcm->vcm.chain->area->list.array = malloc(1 * sizeof(OCTET_STRING_t*));
+        for (int q = 0; q < 1; ++q) {
+            vcm->vcm.chain->area->list.array[q] = calloc(1, sizeof(OCTET_STRING_t));
+            vcm->vcm.chain->area->list.array[q]->buf = malloc(4);
+            vcm->vcm.chain->area->list.array[q]->size = 4;
+        }
     }
 
     vcm_req->vcm.maneuverContainer.present = ManeuverContainer_PR_vehicle;
@@ -959,9 +977,15 @@ static int mk_vcm(uint8_t* vcm_uper, uint16_t* vcm_uper_len) {
         vcm->vcm.chain->link.buf = malloc(32);
         vcm->vcm.chain->link.size = 32;
         memcpy(vcm->vcm.chain->link.buf, coordination->chain.link, 32);
-        vcm->vcm.chain->area = calloc(1, sizeof(OCTET_STRING_t));
-        vcm->vcm.chain->area->buf = malloc(4);
-        vcm->vcm.chain->area->size = 4;
+        vcm->vcm.chain->area = calloc(1, sizeof(struct area*));
+        vcm->vcm.chain->area->list.count = 1;
+        vcm->vcm.chain->area->list.size = 1 * sizeof(OCTET_STRING_t*);
+        vcm->vcm.chain->area->list.array = malloc(1 * sizeof(OCTET_STRING_t*));
+        for (int q = 0; q < 1; ++q) {
+            vcm->vcm.chain->area->list.array[q] = calloc(1, sizeof(OCTET_STRING_t));
+            vcm->vcm.chain->area->list.array[q]->buf = malloc(4);
+            vcm->vcm.chain->area->list.array[q]->size = 4;
+        }
     }
 
     if (facilities.station_type == StationType_roadSideUnit) {
diff --git a/src/vcm.h b/src/vcm.h
index 4bde28f..cd370bb 100644
--- a/src/vcm.h
+++ b/src/vcm.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <stdbool.h>
-#include <vcm/VCM.h>
+#include <it2s-asn/vcm/VCM.h>
 
 #include <it2s-tender/geodesy.h>
 #include <it2s-tender/epv.h>
diff --git a/test/tester.c b/test/tester.c
index e0ea1cd..fcc44c1 100644
--- a/test/tester.c
+++ b/test/tester.c
@@ -1,9 +1,9 @@
-#include <itss-transport/TransportRequest.h>
-#include <itss-transport/TransportIndication.h>
-#include <itss-facilities/FacilitiesIndication.h>
-#include <itss-facilities/FacilitiesRequest.h>
-#include <itss-management/ManagementRequest.h>
-#include <itss-management/ManagementReply.h>
+#include <it2s-asn/itss-transport/TransportRequest.h>
+#include <it2s-asn/itss-transport/TransportIndication.h>
+#include <it2s-asn/itss-facilities/FacilitiesIndication.h>
+#include <it2s-asn/itss-facilities/FacilitiesRequest.h>
+#include <it2s-asn/itss-management/ManagementRequest.h>
+#include <it2s-asn/itss-management/ManagementReply.h>
 
 #include <pthread.h>
 #include <zmq.h>