Merge branch 'STF525' of https://forge.etsi.org/gitlab/ITS/ITS into STF525

.jenkins.sh

@@ -9,9 +9,9 @@ cd $(dirname $0)
 
 run_dir=`pwd`
 
-cd docker
+cd docker/v2
 
-./v2/build.sh
-./v2/run.sh
+./build.sh
+./run.sh
 #./build-container.sh
 #./run-container.sh $run_dir

README.md

@@ -253,7 +253,7 @@ $ cmake ../wireshark-for-ITS
 
 - Add specific compiler options to the file epan/dissectors/CMakeFiles/dissectors.dir/flags.make:
     - Find the variable C_FLAGS
-    - Append at the end the following compiler options: "-Wno-unused-const-variable -Wno-unused-function "
+    - Append at the end the following compiler options: " -Wno-unused-const-variable -Wno-unused-function -Wunused-const-variable"
 - Build Wireshark/tshark executing the following command
 
 ```sh

asn1/Makefile

@@ -91,7 +91,7 @@ all: Makefile $(CONVERTER)
 
 $(LIB_MAKEFILE): $(addprefix $(ASN_DIR)/, $(ASN_FILES))
 	$(ASN1C) -gen-PER -gen-OER $(addprefix -pdu=,$(PDU)) -fcompound-names $^
-	-for n in $(PATCHES); do patch -i "$(SCRIPT_DIR)/$$n"; done
+	-for n in $(PATCHES); do git apply "$(SCRIPT_DIR)/$$n"; done
 
 $(CONVERTER): $(ASN_LIBRARY) $(CONVERTER_OBJS) 
 	$(CC) $(CFLAGS) -o $@ $(CONVERTER_OBJS) $(ASN_LIBRARY) $(LIBS)

ccsrc/Protocols/Security/security_services.cc

@@ -22,7 +22,7 @@ using namespace std; // Required for isnan()
 
 security_services * security_services::instance = nullptr;
 
-security_services::security_services() : _setup_done{false}, _ec_keys_enc(nullptr), _security_cache(new security_cache), _security_db(nullptr), _last_generation_time(0), _unknown_certificate(), _latitude(0), _longitude(0), _elevation(0) {
+security_services::security_services() : _setup_done{false}, _ec_keys_enc(nullptr), _security_cache(new security_cache), _security_db(nullptr), _last_generation_time(0), _unknown_certificate(0, nullptr), _latitude(0), _longitude(0), _elevation(0) {
   loggers::get_instance().log(">>> security_services::security_services");
 } // End of ctor
 

etc/AtsRSUsSimulator/AtsRSUSimulator.cfg

@@ -123,7 +123,7 @@ LogEventTypes:= Yes
 #     save_mode   : Set to 1 to save sent packet, 0 otherwise
 
 # Single GeoNetworking component port
-system.geoNetworkingPort.params := "GN(ll_address=4C5E0C14D2EB,latitude=43551050,longitude=10298730,its_aid=37,secured_mode=1,encrypted_mode=0,certificate=CERT_IUT_F_AT,peer_certificate=CERT_TS_F_AT,sec_db_path=/home/vagrant/tmp/asn1c_cert)/ETH(mac_src=080027500f9b)/PCAP(mac_src=080027500f9b,nic=eth2,filter=and ether proto 0x8947)"
+system.geoNetworkingPort.params := "GN(ll_address=4C5E0C14D2EB,latitude=43551050,longitude=10298730,its_aid=37,secured_mode=1,encrypted_mode=0,certificate=CERT_IUT_A_AT,peer_certificate=CERT_TS_A_AT,sec_db_path=/home/vagrant/tmp/asn1c_cert)/ETH(mac_src=080027500f9b)/PCAP(mac_src=080027500f9b,nic=eth2,filter=and ether proto 0x8947)"
 
 # Config port based on UDP
 system.cfPort.params := "CF(ut=cam)/UDP(dst_ip=192.168.2.2)"

scripts/update_its_project.bash

@@ -61,6 +61,7 @@ do
     done
 done
 cp ${SRC_ITS_PATH}/asn1/Makefile ${PATH_DEV_ITS}/asn1
+cp ${SRC_ITS_PATH}/asn1/*.c.diff ${PATH_DEV_ITS}/asn1
 
 # Update testdata
 echo 'Updating testdata'