diff --git a/ccsrc/Protocols/Pcap/pcap_linux_layer.cc b/ccsrc/Protocols/Pcap/pcap_linux_layer.cc index 07312dfa53690bd98c18c67afddd50e2d21feb5b..1b375961e0bb9aaceca6fd691fb1dcb9ee75aecd 100644 --- a/ccsrc/Protocols/Pcap/pcap_linux_layer.cc +++ b/ccsrc/Protocols/Pcap/pcap_linux_layer.cc @@ -63,8 +63,8 @@ pcap_layer::pcap_layer(const std::string& p_type, const std::string& param) loggers::get_instance().log("pcap_layer::pcap_layer: Device %s Network address: %d", nic.c_str(), net); } } - // Open the device - _device = pcap_open_live(nic.c_str(), 65536, 1, 100, error_buffer); // TODO Replace hard coded values by pcap_layer:: + // Open the device in promiscuous mode + _device = pcap_open_live(nic.c_str(), 65535, 1, 100, error_buffer); // TODO Replace hard coded values by pcap_layer:: if (_device == NULL) { loggers::get_instance().error("pcap_layer::pcap_layer: Failed to open device %s", nic.c_str()); return; diff --git a/etc/AtsPki/AtsPki_Idnomic.cfg_ b/etc/AtsPki/AtsPki_Idnomic.cfg_ index d73bf6d4122187bd0f93557299f84b28b51a615f..728259546988eb1766c89b32d1dda46f994c5126 100644 --- a/etc/AtsPki/AtsPki_Idnomic.cfg_ +++ b/etc/AtsPki/AtsPki_Idnomic.cfg_ @@ -4,7 +4,7 @@ # Enable Security support LibItsGeoNetworking_Pics.PICS_GN_SECURITY := true # Root path to access certificate stored in files, identified by certficate ID -LibItsSecurity_Pixits.PX_CERTIFICATE_POOL_PATH := "/home/vagrant/tmp" +LibItsSecurity_Pixits.PX_CERTIFICATE_POOL_PATH := "/home/yann/tmp" # Configuration sub-directory to access certificate stored in files LibItsSecurity_Pixits.PX_IUT_SEC_CONFIG_NAME := "asn1c_cert" @@ -78,7 +78,7 @@ system.httpTlmPort.params := "HTTP(codecs=http_its:http_etsi_ieee1609dot2_codec) [EXECUTE] # The EnrolmentResponse message shall be sent by the EA to the ITS-S across the interface at reference point S3 in response to a received EnrolmentRequest message -ItsPki_TestCases.TC_SECPKI_EA_ENR_RCV_01_BV +#ItsPki_TestCases.TC_SECPKI_EA_ENR_RCV_01_BV # Check that EA doesn't accept Enrolment rekeying request when enrolment is not permitted by signing certificate (not containing an item of type PsidSsp) #ItsPki_TestCases.TC_SECPKI_EA_ENR_RCV_02_BI_01 @@ -191,7 +191,7 @@ ItsPki_TestCases.TC_SECPKI_EA_ENR_RCV_01_BV #ItsPki_TestCases.TC_RCA_CRLGEN_02_BV # Check that the TLM generates the ECTL when new RootCA is about to be added -#ItsPki_TestCases.TC_TLM_ECTLGEN_01_BV +ItsPki_TestCases.TC_TLM_ECTLGEN_01_BV [MAIN_CONTROLLER] # The options herein control the behavior of MC. diff --git a/scripts/ivim_generate_makefile.bash b/scripts/ivim_generate_makefile.bash new file mode 100755 index 0000000000000000000000000000000000000000..c8af24e68b557856dd683f7295a7c80a56b2a953 --- /dev/null +++ b/scripts/ivim_generate_makefile.bash @@ -0,0 +1,253 @@ +#!/bin/bash +#set -e +set -vx + +function f_exit { + cd ${CURPWD} + + unset TTCN_FILES + unset CC_FILES + unset CFG_FILES + unset EXECUTABLE + echo $1 + exit $2 +} + +function f_usage { + echo "build.bash: This script import from External Disk the " + echo "Optional arguments:" + echo " prof: Generate a makefile including profiling options (e.g. ./build.bash prof)" + exit 0 +} + +clear + +if [ "$1" == "help" ] +then + f_usage +fi + +ATS_NAME=Ivim + +#CURPWD=`pwd` +if [ ! "${PWD##*/}" == "objs" ] +then + cd ../objs + if [ ! $? == 0 ] + then + echo "Please move to PROJECT/obj directory" + exit 1 + fi +fi +# Remove everything +rm -fr ../objs/*.hh +rm -fr ../objs/*.cc +rm -fr ../objs/*.log +rm -fr ../objs/*.o +rm -fr ../objs/Makefile + +# Remove useless files +find .. -type f -name "*~" -exec rm {} \; +find .. -type f -name "*.bak" -exec rm {} \; +find .. -type f -name "*.log" -exec rm {} \; + +# Build XSD files if any and put them in objs directory +if [ -d ../xsd ] +then + XSD_FILES=`find ../xsd -name '*.xsd'` + + if [ "${OSTYPE}" == "cygwin" ] + then + xsd2ttcn.exe ${XSD_FILES} + else + xsd2ttcn ${XSD_FILES} + fi + if [ "$?" != "0" ] + then + f_exit "Failed to generate XSD source code" 2 + fi +fi +# Build ASN.1 files if any and put them in objs directory +ASN1_PATH=${PATH_DEV_ITS}/ttcn/LibIts/asn1 +if [ -d ${ASN1_PATH} ] +then + ASN1_FILES=`find ${ASN1_PATH} -name '*.asn*'` + + if [ "${OSTYPE}" == "cygwin" ] + then + asn1_compiler.exe -e ${ASN1_FILES} + else + asn1_compiler -e ${ASN1_FILES} + fi + if [ "$?" != "0" ] + then + f_exit "Failed to generate ASN.1 source code" 3 + fi +fi + +REFERENCES="LibCommon LibIts/Common LibIts/BTP LibIts/GeoNetworking LibIts/Ipv6OverGeoNetworking LibIts/Security LibIts/CAM LibIts/DENM LibIts/IVIM LibIts/MapemSpatem LibIts/SremSsem LibIts/Http LibIts/Pki" +for i in ${REFERENCES} +do + # TTCN code + for j in `find ${PATH_DEV_ITS}/src/$i/ttcn -type f -name "*.ttcn"`; + do + ln -sf $j ../ttcn/`basename $j` + done + # Include source code + files=`find ${PATH_DEV_ITS}/src/$i/include -type f` + if [ "${files}" != " " ] + then + for j in ${files}; + do + ln -sf $j ../include/`basename $j` + done + fi + # CC source code + files=`find ${PATH_DEV_ITS}/src/$i/src -type f` + if [ "${files}" != " " ] + then + for j in ${files}; + do + ln -sf $j ../src/`basename $j` + done + fi +done + +# Generate the list of the TTCN-3 files +TTCN_FILES=`find .. -name '*.ttcn*'` + +# Start ATS generation - Step 1 +if [ "${OSTYPE}" == "cygwin" ] +then + rm ../bin/*.exe ../lib/*.dll + compiler.exe -d -e -f -g -j -l -L -n -t -R -U none -x -X ${TTCN_FILES} ${ASN1_FILES} 2>&1 3>&1 | tee build.log + if [ "$?" == "1" ] + then + f_exit "Failed to compile ATS" 4 + fi +else + compiler -d -e -f -g -l -L -n -t -R -U none -x -X ${TTCN_FILES} ${ASN1_FILES} 2>&1 3>&1 | tee build.log + if [ "$?" == "1" ] + then + f_exit "Failed to generate ATS source code" 6 + fi +fi + +# Sart ATS generation - Step 2 +# Create working variables +CC_FILES=`find ../src -name '*.c*'` +FWK_FILES=`find ${PATH_DEV_ITS}/framework/ -name '*.c*'` +CFG_FILES=`find ../etc -name '*.cfg'` + +# Sart ATS generation - Step 3 +if [ "${OSTYPE}" == "cygwin" ] +then + ttcn3_makefilegen.exe -d -f -g -m -R -U none -e Ats${ATS_NAME} ${TTCN_FILES} ${ASN1_FILES} ${CC_FILES} ${FWK_FILES} ${CFG_FILES} | tee --append build.log + if [ "$?" == "1" ] + then + f_exit "Failed to compile ATS" 5 + fi +else + ttcn3_makefilegen -d -f -g -m -R -U none -e Ats${ATS_NAME} ${TTCN_FILES} ${ASN1_FILES} ${CC_FILES} ${FWK_FILES} ${CFG_FILES} | tee --append build.log + if [ "$?" == "1" ] + then + f_exit "Failed to generate ATS source code" 7 + fi +fi + +# Remove port skeletons to use src/ +for i in `ls ../include/*.hh` +do + if [ -f ./`basename $i` ] + then + rm ./`basename $i` + fi +done +for i in `ls ../src/*.cc` +do + if [ -f ./`basename $i` ] + then + rm ./`basename $i` + fi +done + +# Check if Makefile was generated +if [ ! -f ./Makefile ] +then + f_exit "Failed to generate ATS source code" 8 +fi + +# Patch ATS generated files +#./bin/patch.bash 2>&1 3>&1 | tee --append build.log +# Add compiler/linker options +if [ "$1" == "prof" ] +then + if [ "${OSTYPE}" == "cygwin" ] + then + CXXFLAGS_DEBUG_MODE='s/-Wall/-pg -Wall -std=c++11 -fPIC -DAS_USE_SSL -D_XOPEN_SOURCE=700 -pthreads -fstack-check -fstack-protector -fsanitize=leak -fsanitize=address -fno-omit-frame-pointer/g' + else + CXXFLAGS_DEBUG_MODE='s/-Wall/-pg -Wall -std=c++11 -fPIC -DAS_USE_SSL -pthreads -fstack-check -fstack-protector -fsanitize=leak -fsanitize=address -fno-omit-frame-pointer/g' + fi + LDFLAGS_DEBUG_MODE='s/LDFLAGS = /LDFLAGS = -pg -pthread -fPIC -fstack-check -fstack-protector -fsanitize=leak -fsanitize=address -fno-omit-frame-pointer/g' +else + if [ "${OSTYPE}" == "cygwin" ] + then + CXXFLAGS_DEBUG_MODE='s/-Wall/-ggdb -O0 -Wall -std=c++11 -fPIC -DAS_USE_SSL -D_XOPEN_SOURCE=700 -pthread -fstack-check -fstack-protector -fsanitize=leak -fsanitize=address -fno-omit-frame-pointer/g' + else + CXXFLAGS_DEBUG_MODE='s/-Wall/-ggdb -O0 -Wall -std=c++11 -fPIC -DAS_USE_SSL -pthread -fstack-check -fstack-protector -fsanitize=leak -fsanitize=address -fno-omit-frame-pointer/g' + fi + LDFLAGS_DEBUG_MODE='s/LDFLAGS = /LDFLAGS = -g -pthread -fPIC -fstack-check -fstack-protector -fsanitize=leak -fsanitize=address -fno-omit-frame-pointer/g' +fi +ADD_INCLUDE='/CPPFLAGS = /a\\CPPFLAGS += -I/usr/local/share -I$(PATH_DEV_ITS)/include -I$(PATH_DEV_ITS)/include/asn1 -I$(PATH_DEV_ITS)/framework/include -I../include -I../../LibIts/Common/include -I../../LibIts/BTP/include -I../../LibIts/CAM/include -I../../LibIts/DENM/include -I$(HOME_INC) -I.' +ADD_LIBRARIES='s/LINUX_LIBS = -lxml2/LINUX_LIBS = -lrt -lxml2 -lssl -lstdc++fs -lpcap -L$(PATH_DEV_ITS)\/lib -lItsAsn /g' +sed --in-place "${CXXFLAGS_DEBUG_MODE}" ./Makefile +sed --in-place "${LDFLAGS_DEBUG_MODE}" ./Makefile +sed --in-place "${ADD_INCLUDE}" ./Makefile +sed --in-place "${ADD_LIBRARIES}" ./Makefile +# Update COMPILER_FLAGS +COMPILER_FLAGS='s/COMPILER_FLAGS = /COMPILER_FLAGS = -e /g' +sed --in-place "${COMPILER_FLAGS}" ./Makefile +# Update clean clause +CLEAN_LINE='s/$(RM) $(EXECUTABLE)/$(RM) ..\/bin\/$(EXECUTABLE) ..\/src\/*.o/g' +sed --in-place "${CLEAN_LINE}" ./Makefile +# Move binary file command +EXECUTABLE=MyExample +MV_CMD='s/all: $(TARGET) ;/all: $(TARGET) ; @if [ -f ..\/objs\/$(EXECUTABLE) ]; then mv ..\/objs\/$(EXECUTABLE) ..\/bin; fi ;/g' +sed --in-place "${MV_CMD}" ./Makefile +# Add run command +ADD_HOST='/PLATFORM = /aHOST=127.0.0.1' +ADD_PORT='/PLATFORM = /aPORT=12000' +sed --in-place "${ADD_PORT}" ./Makefile +sed --in-place "${ADD_HOST}" ./Makefile +ADD_RUN_LINE_1='$arun: all' +ADD_RUN_LINE_2='$a\\t@sudo LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) $(PWD)/../bin/$(EXECUTABLE) $(HOST) $(PORT)' +sed --in-place "${ADD_RUN_LINE_1}" ./Makefile +sed --in-place "${ADD_RUN_LINE_2}" ./Makefile +ADD_RUN_LINE_1='$arun_d: all' +ADD_RUN_LINE_2='$a\\t@gdb --args $(PWD)/../bin/$(EXECUTABLE) $(HOST) $(PORT)' +sed --in-place "${ADD_RUN_LINE_1}" ./Makefile +sed --in-place "${ADD_RUN_LINE_2}" ./Makefile +ADD_RUN_LINE_1='$arun_v: all' +ADD_RUN_LINE_2='$a\\t@sudo LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) valgrind -v --tool=memcheck --leak-check=yes --show-reachable=yes --track-fds=yes --run-cxx-freeres=yes $(PWD)/../bin/$(EXECUTABLE) $(HOST) $(PORT)' +sed --in-place "${ADD_RUN_LINE_1}" ./Makefile +sed --in-place "${ADD_RUN_LINE_2}" ./Makefile +# Add Doxygen entry +ADD_RUN_LINE_1='$agendoc:' +ADD_RUN_LINE_2='$a\\tdoxygen ../docs/o2.cfg' +ADD_RUN_LINE_3='$a\\tmandb ../docs/man' +sed --in-place "${ADD_RUN_LINE_1}" ./Makefile +sed --in-place "${ADD_RUN_LINE_2}" ./Makefile +sed --in-place "${ADD_RUN_LINE_3}" ./Makefile + +# Build all +make all 2>&1 3>&1 | tee --append build.log +if [ "$?" != "0" ] +then + f_exit "Failed to generate ATS source code" 9 +fi +../bin/Ats${ATS_NAME} -v +#if [ "$?" != "0" ] +#then +# f_exit "Failed to executte binary file Ats${ATS_NAME}" 10 +#fi +f_exit "Build done successfully" 0 diff --git a/scripts/mapemstatem_generate_makefile.bash b/scripts/mapemstatem_generate_makefile.bash new file mode 100755 index 0000000000000000000000000000000000000000..a8bb8c009d9910f0639bef228d9f4a123227725e --- /dev/null +++ b/scripts/mapemstatem_generate_makefile.bash @@ -0,0 +1,253 @@ +#!/bin/bash +#set -e +set -vx + +function f_exit { + cd ${CURPWD} + + unset TTCN_FILES + unset CC_FILES + unset CFG_FILES + unset EXECUTABLE + echo $1 + exit $2 +} + +function f_usage { + echo "build.bash: This script import from External Disk the " + echo "Optional arguments:" + echo " prof: Generate a makefile including profiling options (e.g. ./build.bash prof)" + exit 0 +} + +clear + +if [ "$1" == "help" ] +then + f_usage +fi + +ATS_NAME=MapemSpatem + +#CURPWD=`pwd` +if [ ! "${PWD##*/}" == "objs" ] +then + cd ../objs + if [ ! $? == 0 ] + then + echo "Please move to PROJECT/obj directory" + exit 1 + fi +fi +# Remove everything +rm -fr ../objs/*.hh +rm -fr ../objs/*.cc +rm -fr ../objs/*.log +rm -fr ../objs/*.o +rm -fr ../objs/Makefile + +# Remove useless files +find .. -type f -name "*~" -exec rm {} \; +find .. -type f -name "*.bak" -exec rm {} \; +find .. -type f -name "*.log" -exec rm {} \; + +# Build XSD files if any and put them in objs directory +if [ -d ../xsd ] +then + XSD_FILES=`find ../xsd -name '*.xsd'` + + if [ "${OSTYPE}" == "cygwin" ] + then + xsd2ttcn.exe ${XSD_FILES} + else + xsd2ttcn ${XSD_FILES} + fi + if [ "$?" != "0" ] + then + f_exit "Failed to generate XSD source code" 2 + fi +fi +# Build ASN.1 files if any and put them in objs directory +ASN1_PATH=${PATH_DEV_ITS}/ttcn/LibIts/asn1 +if [ -d ${ASN1_PATH} ] +then + ASN1_FILES=`find ${ASN1_PATH} -name '*.asn*'` + + if [ "${OSTYPE}" == "cygwin" ] + then + asn1_compiler.exe -e ${ASN1_FILES} + else + asn1_compiler -e ${ASN1_FILES} + fi + if [ "$?" != "0" ] + then + f_exit "Failed to generate ASN.1 source code" 3 + fi +fi + +REFERENCES="LibCommon LibIts/Common LibIts/BTP LibIts/GeoNetworking LibIts/Ipv6OverGeoNetworking LibIts/Security LibIts/CAM LibIts/DENM LibIts/IVIM LibIts/MapemSpatem LibIts/SremSsem LibIts/Http LibIts/Pki" +for i in ${REFERENCES} +do + # TTCN code + for j in `find ${PATH_DEV_ITS}/src/$i/ttcn -type f -name "*.ttcn"`; + do + ln -sf $j ../ttcn/`basename $j` + done + # Include source code + files=`find ${PATH_DEV_ITS}/src/$i/include -type f` + if [ "${files}" != " " ] + then + for j in ${files}; + do + ln -sf $j ../include/`basename $j` + done + fi + # CC source code + files=`find ${PATH_DEV_ITS}/src/$i/src -type f` + if [ "${files}" != " " ] + then + for j in ${files}; + do + ln -sf $j ../src/`basename $j` + done + fi +done + +# Generate the list of the TTCN-3 files +TTCN_FILES=`find .. -name '*.ttcn*'` + +# Start ATS generation - Step 1 +if [ "${OSTYPE}" == "cygwin" ] +then + rm ../bin/*.exe ../lib/*.dll + compiler.exe -d -e -f -g -j -l -L -n -t -R -U none -x -X ${TTCN_FILES} ${ASN1_FILES} 2>&1 3>&1 | tee build.log + if [ "$?" == "1" ] + then + f_exit "Failed to compile ATS" 4 + fi +else + compiler -d -e -f -g -l -L -n -t -R -U none -x -X ${TTCN_FILES} ${ASN1_FILES} 2>&1 3>&1 | tee build.log + if [ "$?" == "1" ] + then + f_exit "Failed to generate ATS source code" 6 + fi +fi + +# Sart ATS generation - Step 2 +# Create working variables +CC_FILES=`find ../src -name '*.c*'` +FWK_FILES=`find ${PATH_DEV_ITS}/framework/ -name '*.c*'` +CFG_FILES=`find ../etc -name '*.cfg'` + +# Sart ATS generation - Step 3 +if [ "${OSTYPE}" == "cygwin" ] +then + ttcn3_makefilegen.exe -d -f -g -m -R -U none -e Ats${ATS_NAME} ${TTCN_FILES} ${ASN1_FILES} ${CC_FILES} ${FWK_FILES} ${CFG_FILES} | tee --append build.log + if [ "$?" == "1" ] + then + f_exit "Failed to compile ATS" 5 + fi +else + ttcn3_makefilegen -d -f -g -m -R -U none -e Ats${ATS_NAME} ${TTCN_FILES} ${ASN1_FILES} ${CC_FILES} ${FWK_FILES} ${CFG_FILES} | tee --append build.log + if [ "$?" == "1" ] + then + f_exit "Failed to generate ATS source code" 7 + fi +fi + +# Remove port skeletons to use src/ +for i in `ls ../include/*.hh` +do + if [ -f ./`basename $i` ] + then + rm ./`basename $i` + fi +done +for i in `ls ../src/*.cc` +do + if [ -f ./`basename $i` ] + then + rm ./`basename $i` + fi +done + +# Check if Makefile was generated +if [ ! -f ./Makefile ] +then + f_exit "Failed to generate ATS source code" 8 +fi + +# Patch ATS generated files +#./bin/patch.bash 2>&1 3>&1 | tee --append build.log +# Add compiler/linker options +if [ "$1" == "prof" ] +then + if [ "${OSTYPE}" == "cygwin" ] + then + CXXFLAGS_DEBUG_MODE='s/-Wall/-pg -Wall -std=c++11 -fPIC -DAS_USE_SSL -D_XOPEN_SOURCE=700 -pthreads -fstack-check -fstack-protector -fsanitize=leak -fsanitize=address -fno-omit-frame-pointer/g' + else + CXXFLAGS_DEBUG_MODE='s/-Wall/-pg -Wall -std=c++11 -fPIC -DAS_USE_SSL -pthreads -fstack-check -fstack-protector -fsanitize=leak -fsanitize=address -fno-omit-frame-pointer/g' + fi + LDFLAGS_DEBUG_MODE='s/LDFLAGS = /LDFLAGS = -pg -pthread -fPIC -fstack-check -fstack-protector -fsanitize=leak -fsanitize=address -fno-omit-frame-pointer/g' +else + if [ "${OSTYPE}" == "cygwin" ] + then + CXXFLAGS_DEBUG_MODE='s/-Wall/-ggdb -O0 -Wall -std=c++11 -fPIC -DAS_USE_SSL -D_XOPEN_SOURCE=700 -pthread -fstack-check -fstack-protector -fsanitize=leak -fsanitize=address -fno-omit-frame-pointer/g' + else + CXXFLAGS_DEBUG_MODE='s/-Wall/-ggdb -O0 -Wall -std=c++11 -fPIC -DAS_USE_SSL -pthread -fstack-check -fstack-protector -fsanitize=leak -fsanitize=address -fno-omit-frame-pointer/g' + fi + LDFLAGS_DEBUG_MODE='s/LDFLAGS = /LDFLAGS = -g -pthread -fPIC -fstack-check -fstack-protector -fsanitize=leak -fsanitize=address -fno-omit-frame-pointer/g' +fi +ADD_INCLUDE='/CPPFLAGS = /a\\CPPFLAGS += -I/usr/local/share -I$(PATH_DEV_ITS)/include -I$(PATH_DEV_ITS)/include/asn1 -I$(PATH_DEV_ITS)/framework/include -I../include -I../../LibIts/Common/include -I../../LibIts/BTP/include -I../../LibIts/CAM/include -I../../LibIts/DENM/include -I$(HOME_INC) -I.' +ADD_LIBRARIES='s/LINUX_LIBS = -lxml2/LINUX_LIBS = -lrt -lxml2 -lssl -lstdc++fs -lpcap -L$(PATH_DEV_ITS)\/lib -lItsAsn /g' +sed --in-place "${CXXFLAGS_DEBUG_MODE}" ./Makefile +sed --in-place "${LDFLAGS_DEBUG_MODE}" ./Makefile +sed --in-place "${ADD_INCLUDE}" ./Makefile +sed --in-place "${ADD_LIBRARIES}" ./Makefile +# Update COMPILER_FLAGS +COMPILER_FLAGS='s/COMPILER_FLAGS = /COMPILER_FLAGS = -e /g' +sed --in-place "${COMPILER_FLAGS}" ./Makefile +# Update clean clause +CLEAN_LINE='s/$(RM) $(EXECUTABLE)/$(RM) ..\/bin\/$(EXECUTABLE) ..\/src\/*.o/g' +sed --in-place "${CLEAN_LINE}" ./Makefile +# Move binary file command +EXECUTABLE=MyExample +MV_CMD='s/all: $(TARGET) ;/all: $(TARGET) ; @if [ -f ..\/objs\/$(EXECUTABLE) ]; then mv ..\/objs\/$(EXECUTABLE) ..\/bin; fi ;/g' +sed --in-place "${MV_CMD}" ./Makefile +# Add run command +ADD_HOST='/PLATFORM = /aHOST=127.0.0.1' +ADD_PORT='/PLATFORM = /aPORT=12000' +sed --in-place "${ADD_PORT}" ./Makefile +sed --in-place "${ADD_HOST}" ./Makefile +ADD_RUN_LINE_1='$arun: all' +ADD_RUN_LINE_2='$a\\t@sudo LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) $(PWD)/../bin/$(EXECUTABLE) $(HOST) $(PORT)' +sed --in-place "${ADD_RUN_LINE_1}" ./Makefile +sed --in-place "${ADD_RUN_LINE_2}" ./Makefile +ADD_RUN_LINE_1='$arun_d: all' +ADD_RUN_LINE_2='$a\\t@gdb --args $(PWD)/../bin/$(EXECUTABLE) $(HOST) $(PORT)' +sed --in-place "${ADD_RUN_LINE_1}" ./Makefile +sed --in-place "${ADD_RUN_LINE_2}" ./Makefile +ADD_RUN_LINE_1='$arun_v: all' +ADD_RUN_LINE_2='$a\\t@sudo LD_LIBRARY_PATH=$(LD_LIBRARY_PATH) valgrind -v --tool=memcheck --leak-check=yes --show-reachable=yes --track-fds=yes --run-cxx-freeres=yes $(PWD)/../bin/$(EXECUTABLE) $(HOST) $(PORT)' +sed --in-place "${ADD_RUN_LINE_1}" ./Makefile +sed --in-place "${ADD_RUN_LINE_2}" ./Makefile +# Add Doxygen entry +ADD_RUN_LINE_1='$agendoc:' +ADD_RUN_LINE_2='$a\\tdoxygen ../docs/o2.cfg' +ADD_RUN_LINE_3='$a\\tmandb ../docs/man' +sed --in-place "${ADD_RUN_LINE_1}" ./Makefile +sed --in-place "${ADD_RUN_LINE_2}" ./Makefile +sed --in-place "${ADD_RUN_LINE_3}" ./Makefile + +# Build all +make all 2>&1 3>&1 | tee --append build.log +if [ "$?" != "0" ] +then + f_exit "Failed to generate ATS source code" 9 +fi +../bin/Ats${ATS_NAME} -v +#if [ "$?" != "0" ] +#then +# f_exit "Failed to executte binary file Ats${ATS_NAME}" 10 +#fi +f_exit "Build done successfully" 0 diff --git a/ttcn/AtsPki/ItsPki_TestCases.ttcn b/ttcn/AtsPki/ItsPki_TestCases.ttcn index 1273b9b80e051bb0c790f440049eab22611c86b5..c4ee24f3d3a0b417bf0d2789267fb603fcd43069 100644 --- a/ttcn/AtsPki/ItsPki_TestCases.ttcn +++ b/ttcn/AtsPki/ItsPki_TestCases.ttcn @@ -9127,13 +9127,14 @@ module ItsPki_TestCases { mw_signedData( -, mw_toBeSignedData( mw_signedDataPayload ), - mw_signerIdentifier_digest + mw_signerIdentifier_certificate(mw_etsiTs103097Certificate(mw_issuerIdentifier_self)) ))))))) -> value v_response { - var ToBeSignedRcaCtl v_to_be_signed_tlm_ectl; + var ToBeSignedTlmCtl v_to_be_signed_tlm_ectl; tc_ac.stop; - if (f_verify_rca_ctl_response_message(v_response.response.body.binary_body.ieee1609dot2_data, true, v_to_be_signed_tlm_ectl) == false) { + // FIXME Can not verify signature, to be checked + if (f_verify_tlm_ectl_response_message(v_response.response.body.binary_body.ieee1609dot2_data, false, v_to_be_signed_tlm_ectl) == false) { log("*** " & testcasename() & ": FAIL: Failed to verify RCA message ***"); f_selfOrClientSyncAndVerdictTestBody(c_tbDone, e_error); } else { diff --git a/ttcn/LibIts b/ttcn/LibIts index 4b09f4e418e6e62ce9be0a9a44a5c1c9805585d9..9fd3f291599a06ba28b36128afe7dff953310fb8 160000 --- a/ttcn/LibIts +++ b/ttcn/LibIts @@ -1 +1 @@ -Subproject commit 4b09f4e418e6e62ce9be0a9a44a5c1c9805585d9 +Subproject commit 9fd3f291599a06ba28b36128afe7dff953310fb8