Merge branch 'ttf_t024' of https://forge.etsi.org/rep/ITS/TS.ITS into ttf_t024 (a51d60e2) · Commits · ITS - Intelligent Transport Systems / ITS Test Suite

Makefile

+4 −4

Original line number	Diff line number	Diff line
		@@ -26,7 +26,7 @@ $$(foreach I, $$(includes), $$(eval all_includes += $$(if $$(filter /%, $$(I)),
		$$(foreach M, $$(modules), $$(eval $$(call IncludeModule, $$(if $$(filter /%, $$(M)), $$(TOPDIR)/$$(M), $(1)/$$(M)))))
		endef

		all_includes := $(TTCN3_DIR)/include $(TTCN3_DIR)/src $(TOPDIR)/ccsrc/Framework /usr/include/jsoncpp
		all_includes := $(TTCN3_DIR)/include $(TTCN3_DIR)/src /usr/include/jsoncpp
		defines += TITAN_RUNTIME_2 _NO_SOFTLINKS_ $(ATS) AS_USE_SSL
		libs += $(TTCN3_DIR)/lib/libttcn3-rt2-parallel.a -lstdc++fs

		@@ -118,14 +118,14 @@ $(outdir) $(bindir):
		mkdir -p $@

		$(bindir)/$(ATS)$(EXE): $(outdir)/../asn1/libItsAsn.a $(gen_objects) $(cc_objects)
		g++ -g -O0 -o $@ $(LDFLAGS) $(gen_objects) $(cc_objects) $(outdir)/../asn1/libItsAsn.a $(libs)
		g++ -g -O0 -std=c++17 -o $@ $(LDFLAGS) $(gen_objects) $(cc_objects) $(outdir)/../asn1/libItsAsn.a $(libs)

		$(gen_objects) :%.o :%.cc
		g++ -g -O0 -c $(addprefix -D, $(defines)) $(addprefix -I, $(includes)) -o $@ $<
		g++ -g -O0 -std=c++17 -c $(addprefix -D, $(defines)) $(addprefix -I, $(includes)) -o $@ $<

		$(cc_objects) : $(outdir)/%.o : %.cc
		mkdir -p $(dir $@)
		g++ -g -O0 -c $(addprefix -D, $(defines)) $(addprefix -I, $(includes)) -o $@ $<
		g++ -g -O0 -std=c++17 -c $(addprefix -D, $(defines)) $(addprefix -I, $(includes)) -o $@ $<

		#$(gen_sources):
		# $(TTCN3_DIR)/bin/compiler -n -e -L -R -U none -o $(outdir) $(tt_sources)

asn1/Makefile

+53 −59

Original line number	Diff line number	Diff line
		@@ -15,8 +15,6 @@ ASN_FILES = AtsCAM/lib/asn1/CAM_PDU_Descriptions.asn \
		AtsSecurity/lib/asn1/EtsiTs103097Module.asn \
		AtsSecurity/lib/asn1/ieee1609dot2/Ieee1609Dot2.asn \
		AtsSecurity/lib/asn1/ieee1609dot2/Ieee1609Dot2BaseTypes.asn \
		AtsSecurity/lib/asn1/ieee1609dot2/Ieee1609Dot2Crl.asn \
		AtsSecurity/lib/asn1/ieee1609dot2/Ieee1609Dot2CrlBaseTypes.asn \
		AtsIS/lib/asn1/IVIM_PDU_Descriptions.asn \
		AtsIS/lib/asn1/MAPEM_PDU_Descriptions.asn \
		AtsIS/lib/asn1/RTCMEM_PDU_Descriptions.asn \
		@@ -50,26 +48,22 @@ ASN_FILES = AtsCAM/lib/asn1/CAM_PDU_Descriptions.asn \
		AtsPki/lib/asn1/ieee_1609.2.1/Ieee1609Dot2Dot1LaMaInterface.asn \
		AtsPki/lib/asn1/ieee_1609.2.1/Ieee1609Dot2Dot1LaRaInterface.asn \
		AtsPki/lib/asn1/ieee_1609.2.1/Ieee1609Dot2Dot1MaRaInterface.asn \
		AtsPki/lib/asn1/ieee_1609.2.1/Ieee1609Dot2Dot1Protocol.asn

		# ../build/asn1/ISO_TS_19091/ISO-TS-19091-addgrp-C-2018-patched.asn \
		# ../build/asn1/ISO_TS_19091/AddGrpC.asn \
		# ../build/asn1/ISO_TS_19091/AddGrpC_noCircular.asn \
		# ../build/asn1/ISO_TS_19091/DSRC.asn \
		# ../build/asn1/ISO_TS_19091/DSRC_REGION_noCircular.asn \
		# ../build/asn1/ISO_TS_19091/REGION.asn \

		# AtsPki/lib/asn1/EtsiTs102941BaseTypes.asn \
		# AtsPki/lib/asn1/EtsiTs102941MessagesCa.asn \
		# AtsPki/lib/asn1/EtsiTs102941TrustLists.asn \
		# AtsPki/lib/asn1/EtsiTs102941TypesAuthorization.asn \
		# AtsPki/lib/asn1/EtsiTs102941TypesAuthorizationValidation.asn \
		# AtsPki/lib/asn1/EtsiTs102941TypesCaManagement.asn \
		# AtsPki/lib/asn1/EtsiTs102941TypesEnrolment.asn \
		# AtsPki/lib/asn1/EtsiTs102941TypesLinkCertificate.asn \
		AtsPki/lib/asn1/ieee_1609.2.1/Ieee1609Dot2Dot1Protocol.asn \
		AtsMBR/lib/asn1/EtsiTs103759Core.asn \
		AtsMBR/lib/asn1/EtsiTs103759BaseTypes.asn \
		AtsMBR/lib/asn1/EtsiTs103759AsrAppAgnostic.asn \
		AtsMBR/lib/asn1/EtsiTs103759AsrCam.asn \
		AtsMBR/lib/asn1/EtsiTs103759AsrDenm.asn \
		AtsMBR/lib/asn1/EtsiTs103759CommonObservations.asn \
		AtsMBR/lib/asn1/SaeJ3287AsrBsm.asn \
		AtsMBR/lib/asn1/ieee1609.2/Ieee1609Dot2BaseTypes.asn \
		AtsMBR/lib/asn1/ieee1609.2/Ieee1609Dot2.asn \
		AtsMBR/lib/asn1/ieee1609.2/Ieee1609Dot2CrlBaseTypes.asn \
		AtsMBR/lib/asn1/ieee1609.2/Ieee1609Dot2Crl.asn \


		# PDUs
		PDU = CAM DENM MAPEM SPATEM SREM SSEM IVIM RTCMEM EtsiTs103097Data EtsiTs103097Certificate
		PDU = CAM DENM MAPEM SPATEM SREM SSEM IVIM RTCMEM EtsiTs103097Data EtsiTs103097Certificate EtsiTs103759Data
		#EtsiTs102941Data

		#patches

ccsrc/Protocols/GeoNetworking/geonetworking_layer.cc

+944 −940

Original line number	Diff line number	Diff line
		@@ -352,7 +352,7 @@ void geonetworking_layer::receive_data(OCTETSTRING &data, params &p_params) {
		}
		}

		// By default incoming beacons are filtered by the test adapter
		if (_device_mode == 0) { // By default incoming beacons are filtered by the test adapter
		if (htst.ischosen(LibItsGeoNetworking__TypesAndValues::HeaderTST::ALT_beaconHdr)) {
		loggers::get_instance().log_msg("geonetworking_layer::receive_data: Pass beaconing filtering: ", sopv->gnAddr().mid());
		if (_pass_beacon_table.empty()) { // Discard beacon
		@@ -365,6 +365,10 @@ void geonetworking_layer::receive_data(OCTETSTRING &data, params &p_params) {
		} // else, continue
		}
		} // else, continue
		} else { // Manage Forwarding
		// Checks

		}
		} else {
		// Inavlid GeoNetworking payload, discard it
		loggers::get_instance().warning("geonetworking_layer::receive_data: Failed to decode payload, discard it");

scripts/devenv.bash.debian

+5 −3

Original line number	Diff line number	Diff line
		@@ -57,11 +57,13 @@ then
		export TTCN3_LICENSE_FILE=${TTCN3_DIR}/etc/license/license.dat
		export PATH_DEV_TTCN=${HOME}/dev/ttcn3
		# ITS support
		export PATH_DEV_ITS=${HOME}/dev/etsi_its
		export PATH_DEV_ITS=${HOME}/dev/TS.ITS
		# Emergency Communication support
		export PATH_DEV_EMCOM=${HOME}/dev/etsi_emcom
		export PATH_DEV_EMCOM=${HOME}/dev/NG112
		# Mobile-Edge Computing support
		export PATH_DEV_MEC=${HOME}/dev/etsi_mec
		export PATH_DEV_MEC=${HOME}/dev/gs032p3-ttcn-test-suite
		# CDM/CISE support
		export PATH_DEV_MEC=${HOME}/dev/cise
		# Validation folder
		export VALIDATION_DIR=${HOME}
		fi

scripts/devenv.bash.ubuntu

+20 −22

Original line number	Diff line number	Diff line
		@@ -2,12 +2,14 @@

		# Turn on debug mode
		#set -vx
		#set -e

		set -e

		# Colors and Prompt
		#export PS1="\w\$ "
		#export PS1="\D{%Y-%m-%d %H:%M:%S} \w\n\$ "

		export TERM=xterm
		export EDITOR=emacs
		set -o emacs

		@@ -26,24 +28,24 @@ export HOME_INC=${HOME}/include
		export PATH=${HOME_BIN}:${PATH}

		# Update LD_LIBRARY_PATH environment variable
		if [ -z "${LD_LIBRARY_PATH}" ]
		if [ "${LD_LIBRARY_PATH}" == "" ]
		then
		export LD_LIBRARY_PATH=${HOME_LIB}:/usr/local/lib:${HOME}/dev/etsi_its/lib
		export LD_LIBRARY_PATH=${HOME_LIB}:/usr/local/lib
		else
		export LD_LIBRARY_PATH=${HOME_LIB}:/usr/local/lib:${HOME}/dev/etsi_its/lib:${LD_LIBRARY_PATH}
		export LD_LIBRARY_PATH=${HOME_LIB}:/usr/local/lib:${LD_LIBRARY_PATH}
		fi


		# Add JAVA support
		#export JAVA_VERSION=1.8.0_92
		#export JAVA_JDK=jdk${JAVA_VERSION}
		#if [ -d "${HOME_FRAMEWORKS}/${JAVA_JDK}" ]
		#then
		# export JAVA_HOME=${HOME_FRAMEWORKS}/${JAVA_JDK}/bin
		#else
		# unset JAVA_VERSION
		# unset JAVA_JDK
		#fi
		export JAVA_VERSION=1.8.0_92
		export JAVA_JDK=jdk${JAVA_VERSION}
		if [ -d "${HOME_FRAMEWORKS}/${JAVA_JDK}" ]
		then
		export JAVA_HOME=${HOME_FRAMEWORKS}/${JAVA_JDK}/bin
		else
		unset JAVA_VERSION
		unset JAVA_JDK
		fi

		# Add TITAN support
		export TOP=${HOME_FRAMEWORKS}/titan/titan.core
		@@ -57,19 +59,15 @@ then
		export TTCN3_LICENSE_FILE=${TTCN3_DIR}/etc/license/license.dat
		export PATH_DEV_TTCN=${HOME}/dev/ttcn3
		# ITS support
		export PATH_DEV_ITS=${HOME}/dev/etsi_its
		export PATH_DEV_ITS=${HOME}/dev/TS.ITS
		# Emergency Communication support
		export PATH_DEV_EMCOM=${HOME}/dev/etsi_emcom
		export PATH_DEV_EMCOM=${HOME}/dev/NG112
		# Mobile-Edge Computing support
		export PATH_DEV_MEC=${HOME}/dev/etsi_mec
		export PATH_DEV_MEC=${HOME}/dev/gs032p3-ttcn-test-suite
		# CDM/CISE support
		export PATH_DEV_MEC=${HOME}/dev/cise
		# Validation folder
		export VALIDATION_DIR=${HOME}
		fi

		export BROWSER=netsurf

		export OPENSSL_DIR=/usr/local

		export LSAN_OPTIONS=verbosity=1:log_threads=1