Prefix ASN includes with it2s-asn/
This commit is contained in:
parent
4f3657494a
commit
fe25d9a850
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
||||
|
|
|
|||
12
src/config.c
12
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;
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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},
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
13
src/saem.c
13
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>
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#pragma once
|
||||
|
||||
#include <saem/SAEM.h>
|
||||
#include <it2s-asn/saem/SAEM.h>
|
||||
#include <stdint.h>
|
||||
|
||||
#define MAX_ANNOUNCEMENTS_LEN 32
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
56
src/vcm.c
56
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) {
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
Loading…
Reference in New Issue