diff --git a/.gitignore b/.gitignore old mode 100755 new mode 100644 index 7dcc3813e8ee3085b2e5c9a8756a8f8fc721ec11..2f4b25a3f83eda7e044cb407a0c73682df04eddd --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,5 @@ data/v3/temp/ data/v3/xer/ /bin/ *.user -.vc \ No newline at end of file +.vc +config.mk \ No newline at end of file diff --git a/.gitmodules b/.gitmodules index 22c623a4e29bec7ea5da28c7557e85d255fd3e7a..295054f73caaca321bd29f80b1586185744ae946 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,8 +1,14 @@ [submodule "TTF0002_ttcn/LibIts"] path = ttcn/LibIts url = ../../LIBS/LibIts.git - branch = TTF0002 + branch = cygwin [submodule "TTF0002_ttcn/LibCommon"] path = ttcn/LibCommon url = ../../LIBS/LibCommon.git - branch = v1.4.0 + branch = cygwin +[submodule "ttcn/modules/titan.TestPorts.HTTPmsg"] + path = ttcn/modules/titan.TestPorts.HTTPmsg/module + url = https://github.com/eclipse/titan.TestPorts.HTTPmsg.git +[submodule "ttcn/modules/titan.TestPorts.Common_Components.Abstract_Socket"] + path = ttcn/modules/titan.TestPorts.Common_Components.Abstract_Socket/module + url = https://github.com/eclipse/titan.TestPorts.Common_Components.Abstract_Socket.git diff --git a/Makefile b/Makefile new file mode 100644 index 0000000000000000000000000000000000000000..c11ef81d12d280ab02092a92709fb8313383800a --- /dev/null +++ b/Makefile @@ -0,0 +1,135 @@ +-include config.mk + +ifeq (,$(ATS)) + $(error ATS shall be defined) +endif + +ifeq (,$(TOPDIR)) + TOPDIR := . +endif + +ifeq (,$(TTCN3_DIR)) + $(error TTCN3_DIR shall be defined in config.mk) +endif +first: all + +define IncludeModule +undefine sources +undefine modules +undefine includes +include $(1)/module.mk +$$(foreach S, $$(sources), $$(eval all_sources += $(1)/$$(S))) +$$(foreach I, $$(includes), $$(eval all_includes += $(1)/$$(I))) +$$(foreach M, $$(modules), $$(eval $$(call IncludeModule, $$(if $$(filter /%, $$(M)), $$(M), $(1)/$$(M))))) +endef + +all_includes := $(TTCN3_DIR)/include $(TTCN3_DIR)/src $(TOPDIR)/ccsrc/Framework /usr/include/jsoncpp +defines += TITAN_RUNTIME_2 _NO_SOFTLINKS_ $(ATS) +libs += $(TTCN3_DIR)/lib/libttcn3-rt2-parallel.a -lstdc++fs + +ifeq (Windows_NT,$(OS)) +# Silence linker warnings. +LDFLAGS += -Wl,--enable-auto-import,--enable-runtime-pseudo-reloc +defines += WIN32 +libs += $(patsubst %, -L%/lib, $(OPENSSL_DIR)) +all_includes += $(addsuffix /include, $(OPENSSL_DIR)) +libs += $(WPCAP_DLL_PATH) +else +defines += LINUX +libs += -lpcap -lrt -lpthread +endif + +libs += -lssl -lcrypto -lxml2 -ljsoncpp + +$(eval $(call IncludeModule, $(TOPDIR)/ttcn/$(ATS))) + +outdir := $(TOPDIR)/build/$(ATS) +bindir := $(TOPDIR)/bin + +sources := $(sort $(all_sources)) +includes := $(outdir) $(outdir)/.. $(outdir)/../asn1 $(all_includes) $(NPCAP_INCLUDE) + +ifeq (Windows_NT,$(OS)) + EXE=.exe +endif + +ttcn_sources := $(filter %.ttcn , $(sources)) +ttcn3_sources := $(filter %.ttcn3, $(sources)) +asn_sources := $(filter %.asn, $(sources)) +asn1_sources := $(filter %.asn1, $(sources)) + +tt_sources := $(ttcn_sources) $(ttcn3_sources) $(asn_sources) $(asn1_sources) +cc_sources := $(filter %.cc, $(sources)) + +gen_ttcn_sources := $(addprefix $(outdir)/, $(notdir $(patsubst %.ttcn, %.cc, $(ttcn_sources)))) +gen_ttcn_headers := $(addprefix $(outdir)/, $(notdir $(patsubst %.ttcn, %.hh, $(ttcn_sources)))) +gen_ttcn3_sources := $(addprefix $(outdir)/, $(notdir $(patsubst %.ttcn3, %.cc, $(ttcn3_sources)))) +gen_ttcn3_headers := $(addprefix $(outdir)/, $(notdir $(patsubst %.ttcn3, %.hh, $(ttcn3_sources)))) +gen_asn_sources := $(addprefix $(outdir)/, $(notdir $(patsubst %.asn, %.cc, $(asn_sources)))) +gen_asn_headers := $(addprefix $(outdir)/, $(notdir $(patsubst %.asn, %.hh, $(asn_sources)))) +gen_asn1_sources := $(addprefix $(outdir)/, $(notdir $(patsubst %.asn1, %.cc, $(asn1_sources)))) +gen_asn1_headers := $(addprefix $(outdir)/, $(notdir $(patsubst %.asn1, %.hh, $(asn1_sources)))) + +gen_sources := $(gen_ttcn_sources) $(gen_ttcn3_sources) $(gen_asn_sources) $(gen_asn1_sources) +gen_headers := $(gen_ttcn_headers) $(gen_ttcn3_headers) $(gen_asn_headers) $(gen_asn1_headers) + +gen_objects := $(patsubst %.cc, %.o, $(gen_sources)) +cc_objects := $(patsubst %.cc, $(outdir)/%.o, $(cc_sources)) + +.PHONY: all FORCE echo + +all: $(bindir) $(outdir) $(bindir)/$(ATS)$(EXE) + +echo_sources: + @echo -e "$(addsuffix \n,$(all_sources))" + +echo: echo_sources + @echo -e "sources:\n $(addsuffix \n, $(sources))" + @echo -e "gen_sources:\n $(addsuffix \n, $(gen_sources))" + @echo -e "gen_objects:\n $(addsuffix \n, $(gen_objects))" + @echo -e "cc_objects:\n $(addsuffix \n, $(cc_objects))" + @echo -e "includes:\n $(addsuffix \n, $(includes))" + @echo -e "defines: $(addsuffix \n, $(defines))" + +clean: + rm -f $(outdir)/$(ATS)$(EXE) $(gen_objects) $(gen_sources) $(gen_headers) $(cc_objects) $(outdir)/.generate $(outdir)/../libItsAsn.so +# rm -f $(outdir)/asn1/*.so $(outdir)/asn1/*.o $(outdir)/asn1/*.c $(outdir)/asn1/*.h $(outdir)/asn1/Makefile.am.libasncodec + +regen: force_regen $(outdir)/.generate +force_regen: + rm -f $(outdir)/.generate + +$(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) + +$(gen_objects) :%.o :%.cc + g++ -g -O0 -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 $@ $< + +#$(gen_sources): +# $(TTCN3_DIR)/bin/compiler -n -e -L -R -U none -o $(outdir) $(tt_sources) + +$(gen_sources): $(outdir)/.generate + +$(outdir)/.generate: Makefile $(tt_sources) + $(TTCN3_DIR)/bin/compiler -d -e -f -g -l -L -R -U none -x -X -o $(outdir) $(tt_sources) + touch $@ + +$(bindir)/libItsAsn.so: $(outdir)/asn1/libItsAsn.so + cp -f $< $@ + +$(outdir)/../asn1/libItsAsn.a: FORCE + mkdir -p $(outdir)/../asn1 + $(MAKE) -C $(outdir)/../asn1 -f ../../asn1/Makefile + +$(foreach S, $(ttcn_sources), $(eval $(outdir)/$(notdir $(patsubst %.ttcn, %.cc, $(S))): $(S))) +$(foreach S, $(ttcn3_sources), $(eval $(outdir)/$(notdir $(patsubst %.ttcn3, %.cc, $(S))): $(S))) +$(foreach S, $(asn_sources), $(eval $(outdir)/$(notdir $(patsubst %.asn, %.cc, $(S))): $(S))) +$(foreach S, $(asn1_sources), $(eval $(outdir)/$(notdir $(patsubst %.asn1, %.cc, $(S))): $(S))) + diff --git a/README.md b/README.md index 0cce9b5aa485625d79074af5caf5487f58aae827..425442ffab8ad949a26c8693947b3ec5e70d6033 100644 --- a/README.md +++ b/README.md @@ -170,6 +170,7 @@ Procedure: libpcap-dev libgcrypt-dev libncurses5-dev + libjsoncpp-dev libssl-dev libtool-bin libtool @@ -208,7 +209,7 @@ Procedure: - Clone the ETSI ITS protocols project into $HOME/dev folder ```sh -$ git clone +$ git clone git clone --recurse-submodules -b TTF0002_Its --single-branch https://forge.etsi.org/gitlab/ITS/ITS.git ./TTF0002_Its ``` - Update your default environment with the content of the script $HOME/dev/TTF0002_Its/scripts/devenv.bash.ubuntu @@ -249,11 +250,15 @@ Pre-requisites: - Your are logged as 'etsi' or 'vagrant' user - Procedure using TITAN command line (only): - Open several SSH session (PuTTY...) - - Change to the directory ~/dev/TTF0002_Its/src/AtsCAM/objs + - Change to the directory ~/dev/TTF0002_Its/ + - Modify the file config.mk according to your system: + - On Linux, comment all the lines using the '#' character + - On Windows, update the path accordingly - Build the test suite AtsCAM using the following command: ```sh -$ ../bin/cam_generate_makefile.bash +$ export ATS=AtsCAM # The Abstract Test Suite you wnat to build, such as AtsDENM, AtsSecurity... +$ make ... ``` @@ -264,11 +269,12 @@ $ ../bin/cam_generate_makefile.bash - To run the test suitem, execute the following command: ```sh -$ ../bin/run-all.bash +$ cd ~/dev/TTF0002_Its/scripts +$ ../run_all.bash ... ``` -- The log files are located in ../logs folder. You can edit them using any editor or using the Eclipse TITAN log plugins +- The log files are located in ../logs/AtsCAM folder for this example. You can edit them using any editor or using the Eclipse TITAN log plugins ## How to generate ITS test certificates @@ -291,8 +297,8 @@ To build the tool, run the 'make' command in each of the following folders: After applying the previous clause, change to the folder '~/dev/TTF0002_Its/data/v3' and execute 'make' command: ``` -cd ~/dev/TTF0002_Its/data/v3 -make +$ cd ~/dev/TTF0002_Its/data/v3 +$ make ``` The certificates will be located in the folder '~/dev/TTF0002_Its/data/v3/certificates'. diff --git a/asn1/Makefile b/asn1/Makefile old mode 100755 new mode 100644 index 2f253a00abf6f6e7d406300ebe185bb8a20b5942..f4f0811b49e1f67d793ac65463cd6a683fe9efda --- a/asn1/Makefile +++ b/asn1/Makefile @@ -6,13 +6,13 @@ ########################################################## # The name of the library -ASN_LIBRARY = libItsAsn.so +ASN_LIBRARY = libItsAsn.a # ASN.1 files to be included in the library ASN_FILES = CAM/CAM_PDU_Descriptions.asn \ DENM/DENM_PDU_Descriptions.asn \ IS/ETSI_TS_103301/IVIM_PDU_Descriptions.asn \ IS/ETSI_TS_103301/MAPEM_PDU_Descriptions.asn \ - IS/ETSI_TS_103301/RTCM_PDU_Descriptions.asn \ + IS/ETSI_TS_103301/RTCMEM_PDU_Descriptions.asn \ IS/ETSI_TS_103301/SPATEM_PDU_Descriptions.asn \ IS/ETSI_TS_103301/SREM_PDU_Descriptions.asn \ IS/ETSI_TS_103301/SSEM_PDU_Descriptions.asn \ @@ -21,16 +21,18 @@ ASN_FILES = CAM/CAM_PDU_Descriptions.asn \ IS/ISO_TS_14906/EfcDsrcApplication.asn \ IS/ISO_TS_14906/EfcDsrcGeneric.asn \ IS/ISO_TS_17419/CITSapplMgmtIDs.asn \ - IS/ISO_TS_19091/original/AddGrpC.asn \ - IS/ISO_TS_19091/original/DSRC.asn \ - IS/ISO_TS_19091/original/REGION.asn \ + IS/ISO_TS_19091/AddGrpC.asn \ + IS/ISO_TS_19091/AddGrpC_noCircular.asn \ + IS/ISO_TS_19091/DSRC.asn \ + IS/ISO_TS_19091/DSRC_REGION_noCircular.asn \ + IS/ISO_TS_19091/REGION.asn \ IS/ISO_TS_19321/IVI.asn \ IS/ISO_TS_24534-3/ElectronicRegistrationIdentificationVehicleDataModule.asn \ ITS-Container/ITS_Container.asn \ Security/1609Dot2/IEEE1609dot2.asn \ Security/1609Dot2/IEEE1609dot2BaseTypes.asn \ Security/TS102921/EtsiTs102941BaseTypes.asn \ - Security/TS102921/EtsiTs102941MessagesCA.asn \ + Security/TS102921/EtsiTs102941MessagesCa.asn \ Security/TS102921/EtsiTs102941TrustLists.asn \ Security/TS102921/EtsiTs102941TypesAuthorization.asn \ Security/TS102921/EtsiTs102941TypesAuthorizationValidation.asn \ @@ -50,12 +52,12 @@ ASN1C:=asn1c #ASN1C_PATH = ifneq (, $(ASN1C_PATH)) -OS=$(shell uname) -ifneq ("CYGWIN_NT-6.1", $(OS)) -ASN1C:=$(ASN1C_PATH)/asn1c/asn1c -S $(ASN1C_PATH)/skeletons -else -ASN1C:=$(ASN1C_PATH)/asn1c/asn1c.exe -S $(ASN1C_PATH)/skeletons -endif +# OS=$(shell uname) + ifneq (Windows_NT,$(OS)) + ASN1C:=$(ASN1C_PATH)/asn1c/asn1c -S $(ASN1C_PATH)/skeletons + else + ASN1C:=$(ASN1C_PATH)/asn1c/asn1c.exe -S $(ASN1C_PATH)/skeletons + endif endif ifeq (,$(ASN_DIR)) @@ -98,17 +100,18 @@ ASN_CONVERTER_SOURCES := \ CONVERTER_OBJS=${ASN_CONVERTER_SOURCES:.c=.o} CFLAGS += $(ASN_MODULE_CFLAGS) -DPDU=CAM -DASN_PDU_COLLECTION -fPIC -I. -all: Makefile $(CONVERTER) +all: Makefile $(ASN_LIBRARY) $(LIB_MAKEFILE): $(addprefix $(ASN_DIR)/, $(ASN_FILES)) - $(ASN1C) -gen-PER -gen-OER $(addprefix -pdu=,$(PDU)) -fcompound-names $^ + $(ASN1C) -no-gen-example $(addprefix -pdu=,$(PDU)) -fcompound-names $^ -for n in $(PATCHES); do git apply "$(SCRIPT_DIR)/$$n"; done $(CONVERTER): $(ASN_LIBRARY) $(CONVERTER_OBJS) $(CC) $(CFLAGS) -o $@ $(CONVERTER_OBJS) $(ASN_LIBRARY) $(LIBS) $(ASN_LIBRARY): ${ASN_MODULE_SRCS:.c=.o} - $(CC) $(CFLAGS) -o $@ $^ -shared $(LDFLAGS) $(LIBS) + ar rcs $@ $^ +# $(CC) $(CFLAGS) -o $@ $^ -shared $(LDFLAGS) $(LIBS) .SUFFIXES: .SUFFIXES: .c .o diff --git a/asn1/PsidGroupPermissions.c.diff b/asn1/PsidGroupPermissions.c.diff old mode 100755 new mode 100644 diff --git a/ccsrc/Asn1c/module.mk b/ccsrc/Asn1c/module.mk new file mode 100644 index 0000000000000000000000000000000000000000..d15673be1afa116ccd6f0375dda6cbfdf0b163e5 --- /dev/null +++ b/ccsrc/Asn1c/module.mk @@ -0,0 +1,3 @@ +sources := asn1_recode_per.cc +includes := . + diff --git a/ccsrc/EncDec/module.mk b/ccsrc/EncDec/module.mk new file mode 100644 index 0000000000000000000000000000000000000000..1450b621cc80942e933299250049b8869be0ef84 --- /dev/null +++ b/ccsrc/EncDec/module.mk @@ -0,0 +1,65 @@ +sources := \ + LibItsGeoNetworking_Encdec.cc \ + LibItsIpv6OverGeoNetworking_Encdec.cc \ + LibItsSecurity_Encdec.cc \ + LibItsBtp_Encdec.cc \ +# LibItsBtp_Encdec.cc \ +# LibItsHttp_Encdec.cc \ +# LibItsMapemSpatem_Encdec.cc \ +# LibItsPki_Encdec.cc \ +# LibItsSremSsem_Encdec.cc + +ifeq (AtsCAM, $(ATS)) +sources += LibItsCam_Encdec.cc +endif + +ifeq (AtsDENM, $(ATS)) +sources += LibItsDenm_Encdec.cc +endif + +ifeq (AtsIVIM, $(ATS)) +sources += LibItsIvim_Encdec.cc +endif + +ifeq (AtsRSUsSimulator, $(ATS)) +sources += \ + LibItsCam_Encdec.cc \ + LibItsDenm_Encdec.cc \ + LibItsHttp_Encdec.cc \ + LibItsMapemSpatem_Encdec.cc \ + LibItsSremSsem_Encdec.cc \ + LibItsRtcmem_Encdec.cc \ + LibItsIvim_Encdec.cc \ + LibItsPki_Encdec.cc + +endif + +ifeq (AtsSecurity, $(ATS)) +sources += \ + LibItsCam_Encdec.cc \ + LibItsDenm_Encdec.cc +endif + +ifeq (AtsSremSsem, $(ATS)) +sources += LibItsSremSsem_Encdec.cc +endif + +ifeq (AtsMapemSpatem, $(ATS)) +sources += LibItsMapemSpatem_Encdec.cc +endif + +ifeq (AtsRtcmem, $(ATS)) +sources += LibItsRtcmem_Encdec.cc +endif + +ifeq (AtsPki, $(ATS)) +sources := \ + LibItsGeoNetworking_Encdec.cc \ + LibItsIpv6OverGeoNetworking_Encdec.cc \ + LibItsSecurity_Encdec.cc \ + LibItsPki_Encdec.cc \ + LibItsHttp_Encdec.cc +endif + +# LibItsPki_Encdec.cc +# LibItsEvcsn_Encdec.cc \ diff --git a/ccsrc/Externals/LibItsSecurity_externals.cc b/ccsrc/Externals/LibItsSecurity_externals.cc index b32ec8328d6229f03e4195c7e60414b78dadfaf6..8ccfedb31c1a1b848f497bd314c0bf10e4d092fe 100644 --- a/ccsrc/Externals/LibItsSecurity_externals.cc +++ b/ccsrc/Externals/LibItsSecurity_externals.cc @@ -20,6 +20,8 @@ #include "security_services.hh" +#include "geospacial.hh" + #include #include @@ -28,8 +30,10 @@ namespace LibItsSecurity__Functions { + static geospacial g; + // FIXME Unify code with security_services - + /** * \fn OCTETSTRING fx_hashWithSha256(const OCTETSTRING& p__toBeHashedData); * \brief Produces a 256-bit (32-bytes) hash value @@ -1452,7 +1456,7 @@ namespace LibItsSecurity__Functions return TRUE; } - // group geodesic + // group geospacial /* * \brief Check that given polygon doesn't have neither self-intersections nor holes. * \param p_region Polygonal Region diff --git a/ccsrc/Externals/module.mk b/ccsrc/Externals/module.mk new file mode 100644 index 0000000000000000000000000000000000000000..72506e0ee08133aa464b8b6fc06bee6b9d8c00d9 --- /dev/null +++ b/ccsrc/Externals/module.mk @@ -0,0 +1,9 @@ +sources := LibItsCommon_externals.cc \ + LibItsGeoNetworking_externals.cc \ + LibItsIpv6OverGeoNetworking_externals.cc \ + LibItsSecurity_externals.cc + +ifeq (AtsRSUsSimulator, $(ATS)) +sources += AtsRSUsSimulator_externals.cc +endif +# LibItsDcc_externals.cc \ diff --git a/ccsrc/Framework/module.mk b/ccsrc/Framework/module.mk new file mode 100644 index 0000000000000000000000000000000000000000..2f478741d6913605132e944a6553cfa3b54f25ec --- /dev/null +++ b/ccsrc/Framework/module.mk @@ -0,0 +1,6 @@ +sources := src/base_time.cc \ + src/codec_stack_builder.cc \ + src/converter.cc \ + src/layer_factory.cc \ + src/params.cc +includes += . \ No newline at end of file diff --git a/ccsrc/Ports/LibIts_ports/AdapterControlPort.cc b/ccsrc/Ports/LibIts_ports/AdapterControlPort.cc deleted file mode 100644 index abb3384927dd96dca2a5e9874d745ba2e55dd8d6..0000000000000000000000000000000000000000 --- a/ccsrc/Ports/LibIts_ports/AdapterControlPort.cc +++ /dev/null @@ -1,32 +0,0 @@ -#include "AdapterControlPort.hh" - -#ifdef _NO_SOFTLINKS_ -/* to be used when built without generating softlinks to the working directory */ -//#include "CALM_ports/AdapterControlPort_CALM.partC" -#include "CAM_ports/AdapterControlPort_CAM.partC" -#include "DENM_ports/AdapterControlPort_DENM.partC" -#include "GN_ports/AdapterControlPort_GN.partC" -#include "IVIM_ports/AdapterControlPort_IVIM.partC" -#include "MapemSpatem_ports/AdapterControlPort_MapemSpatem.partC" -#include "SremSsem_ports/AdapterControlPort_SremSsem.partC" -#include "Rtcmem_ports/AdapterControlPort_Rtcmem.partC" -//#include "V2G_ports/AdapterControlPort_V2G.partC" - -#else //_NO_SOFTLINKS_ - -#include "AdapterControlPort_CAM.partC" -#include "AdapterControlPort_DENM.partC" -#include "AdapterControlPort_IVIM.partC" -#include "AdapterControlPort_MapemSpatem.partC" -#include "AdapterControlPort_SremSsem.partC" -#include "AdapterControlPort_Rtcmem.partC" -#include "AdapterControlPort_GN.partC" -/* -#include "AdapterControlPort_IVIM.partC" -#include "AdapterControlPort_MapemSpatem.partC" -#include "AdapterControlPort_SremSsem.partC" -#include "AdapterControlPort_Evcsn.partC" -*/ -//#include "AdapterControlPort_V2G.partC" - -#endif //_NO_SOFTLINKS_ diff --git a/ccsrc/Ports/LibIts_ports/AdapterControlPort.hh b/ccsrc/Ports/LibIts_ports/AdapterControlPort.hh index 62b03ca2a01fb82c14e6bcf949d2c622e5860e00..398ae312f42d34ebbcd0c88322601d567c90d4da 100644 --- a/ccsrc/Ports/LibIts_ports/AdapterControlPort.hh +++ b/ccsrc/Ports/LibIts_ports/AdapterControlPort.hh @@ -1,29 +1,60 @@ -#ifndef AdapterControlPort_HH -#define AdapterControlPort_HH //#include "TRI_mapper_API.hh" #ifdef _NO_SOFTLINKS_ /* to be used when built without generating softlinks to the working directory */ //#include "CALM_ports/AdapterControlPort_CALM.partH" -#include "CAM_ports/AdapterControlPort_CAM.partH" -#include "DENM_ports/AdapterControlPort_DENM.partH" -#include "GN_ports/AdapterControlPort_GN.partH" -#include "IVIM_ports/AdapterControlPort_IVIM.partH" -#include "MapemSpatem_ports/AdapterControlPort_MapemSpatem.partH" -#include "SremSsem_ports/AdapterControlPort_SremSsem.partH" -#include "Rtcmem_ports/AdapterControlPort_Rtcmem.partH" -//#include "V2G_ports/AdapterControlPort_V2G.partH" +#ifdef LibItsCam__TestSystem_HH +#include "CAM_ports/AdapterControlPort_CAM.hh" +#endif +#ifdef LibItsDenm__TestSystem_HH +#include "DENM_ports/AdapterControlPort_DENM.hh" +#endif +#ifdef LibItsGeoNetworking__TestSystem_HH +#include "GN_ports/AdapterControlPort_GN.hh" +#endif +#ifdef LibItsIvim__TestSystem_HH +#include "IVIM_ports/AdapterControlPort_IVIM.hh" +#endif +#ifdef LibItsMapemSpatem__TestSystem_HH +#include "MapemSpatem_ports/AdapterControlPort_MapemSpatem.hh" +#endif +#ifdef LibItsSremSsem__TestSystem_HH +#include "SremSsem_ports/AdapterControlPort_SremSsem.hh" +#endif +#ifdef LibItsRtcmem__TestSystem_HH +#include "Rtcmem_ports/AdapterControlPort_Rtcmem.hh" +#endif +#ifdef LibItsV2G__TestSystem_HH +#include "V2G_ports/AdapterControlPort_V2G.hh" +#endif +//#ifdef LibItsPki__TestSystem_HH +//#include "Pki_ports/AdapterControlPort_Pki.hh" +//#endif #else //_NO_SOFTLINKS_ -#include "AdapterControlPort_CAM.partH" -#include "AdapterControlPort_DENM.partH" -#include "AdapterControlPort_IVIM.partH" -#include "AdapterControlPort_MapemSpatem.partH" -#include "AdapterControlPort_SremSsem.partH" -#include "AdapterControlPort_Rtcmem.partH" -#include "AdapterControlPort_GN.partH" +#ifdef LibItsCam__TestSystem_HH +#include "AdapterControlPort_CAM.hh" +#endif +#ifdef LibItsDenm__TestSystem_HH +#include "AdapterControlPort_DENM.hh" +#endif +#ifdef LibItsIvim__TestSystem_HH +#include "AdapterControlPort_IVIM.hh" +#endif +#ifdef LibItsMapemSpatem__TestSystem_HH +#include "AdapterControlPort_MapemSpatem.hh" +#endif +#ifdef LibItsSremSsem__TestSystem_HH +#include "AdapterControlPort_SremSsem.hh" +#endif +#ifdef LibItsRtcmem__TestSystem_HH +#include "AdapterControlPort_Rtcmem.hh" +#endif +#ifdef LibItsGeoNetworking__TestSystem_HH +#include "AdapterControlPort_GN.hh" +#endif /* #include "AdapterControlPort_IVIM.partH" #include "AdapterControlPort_MapemSpatem.partH" @@ -32,4 +63,3 @@ */ //#include "AdapterControlPort_V2G.partH" #endif //_NO_SOFTLINKS_ -#endif diff --git a/ccsrc/Ports/LibIts_ports/BTP_ports/UpperTesterPort_BTP.partC b/ccsrc/Ports/LibIts_ports/BTP_ports/UpperTesterPort_BTP.cc similarity index 97% rename from ccsrc/Ports/LibIts_ports/BTP_ports/UpperTesterPort_BTP.partC rename to ccsrc/Ports/LibIts_ports/BTP_ports/UpperTesterPort_BTP.cc index b03dbf249c4b7f42666cc76c61c4aeae24d3c6d5..3c1d16e737791493f462268ce46c4d75f9f3ae93 100644 --- a/ccsrc/Ports/LibIts_ports/BTP_ports/UpperTesterPort_BTP.partC +++ b/ccsrc/Ports/LibIts_ports/BTP_ports/UpperTesterPort_BTP.cc @@ -1,3 +1,4 @@ +#include "UpperTesterPort_BTP.hh" //============================================================================= namespace LibItsBtp__TestSystem { diff --git a/ccsrc/Ports/LibIts_ports/BTP_ports/UpperTesterPort_BTP.partH b/ccsrc/Ports/LibIts_ports/BTP_ports/UpperTesterPort_BTP.hh similarity index 93% rename from ccsrc/Ports/LibIts_ports/BTP_ports/UpperTesterPort_BTP.partH rename to ccsrc/Ports/LibIts_ports/BTP_ports/UpperTesterPort_BTP.hh index bb36e5703a5296766e1e8e8e323b05c8dca13b93..262ed9c5772e055891c24e0ccdc297d25b74d781 100644 --- a/ccsrc/Ports/LibIts_ports/BTP_ports/UpperTesterPort_BTP.partH +++ b/ccsrc/Ports/LibIts_ports/BTP_ports/UpperTesterPort_BTP.hh @@ -1,4 +1,6 @@ //============================================================================= +#ifndef UpperTesterPort_BTP_HH +#define UpperTesterPort_BTP_HH #include "LibItsBtp_TestSystem.hh" namespace LibItsBtp__TestSystem { @@ -30,3 +32,4 @@ protected: }; } /* end of namespace */ +#endif diff --git a/ccsrc/Ports/LibIts_ports/BTP_ports/module.mk b/ccsrc/Ports/LibIts_ports/BTP_ports/module.mk new file mode 100644 index 0000000000000000000000000000000000000000..c34bd790297080370672d7fb0a150e0f34422bc2 --- /dev/null +++ b/ccsrc/Ports/LibIts_ports/BTP_ports/module.mk @@ -0,0 +1,3 @@ +sources := BtpPort.cc UpperTesterPort_BTP.cc +includes := . + diff --git a/ccsrc/Ports/LibIts_ports/CAM_ports/AdapterControlPort_CAM.partC b/ccsrc/Ports/LibIts_ports/CAM_ports/AdapterControlPort_CAM.cc similarity index 98% rename from ccsrc/Ports/LibIts_ports/CAM_ports/AdapterControlPort_CAM.partC rename to ccsrc/Ports/LibIts_ports/CAM_ports/AdapterControlPort_CAM.cc index 4d0894f9ac9cdde2ed51cd7a2c806448ff3cc491..4652caefad135f5d92cc741835352f88bc0dd43a 100644 --- a/ccsrc/Ports/LibIts_ports/CAM_ports/AdapterControlPort_CAM.partC +++ b/ccsrc/Ports/LibIts_ports/CAM_ports/AdapterControlPort_CAM.cc @@ -4,6 +4,7 @@ #include "registration.hh" #include "cam_layer.hh" +#include "AdapterControlPort_CAM.hh" //============================================================================= namespace LibItsCam__TestSystem { diff --git a/ccsrc/Ports/LibIts_ports/CAM_ports/AdapterControlPort_CAM.partH b/ccsrc/Ports/LibIts_ports/CAM_ports/AdapterControlPort_CAM.hh similarity index 93% rename from ccsrc/Ports/LibIts_ports/CAM_ports/AdapterControlPort_CAM.partH rename to ccsrc/Ports/LibIts_ports/CAM_ports/AdapterControlPort_CAM.hh index 48eb47946ff5726070d01133e5cf585fe64674e3..94cdb840c10a9a1ac79b9f59b2e216241686dccb 100644 --- a/ccsrc/Ports/LibIts_ports/CAM_ports/AdapterControlPort_CAM.partH +++ b/ccsrc/Ports/LibIts_ports/CAM_ports/AdapterControlPort_CAM.hh @@ -1,3 +1,5 @@ +#ifndef AdapterControlPort_CAM_HH +#define AdapterControlPort_CAM_HH //============================================================================= #include "LibItsCam_TestSystem.hh" @@ -32,3 +34,4 @@ protected: }; } // end of namespace +#endif \ No newline at end of file diff --git a/ccsrc/Ports/LibIts_ports/CAM_ports/UpperTesterPort_CAM.partC b/ccsrc/Ports/LibIts_ports/CAM_ports/UpperTesterPort_CAM.cc similarity index 99% rename from ccsrc/Ports/LibIts_ports/CAM_ports/UpperTesterPort_CAM.partC rename to ccsrc/Ports/LibIts_ports/CAM_ports/UpperTesterPort_CAM.cc index 1135ab347a268442fd240e59be7553f8d7a821d4..586100c466df24288adb61c7ee4a4aebd528caa2 100644 --- a/ccsrc/Ports/LibIts_ports/CAM_ports/UpperTesterPort_CAM.partC +++ b/ccsrc/Ports/LibIts_ports/CAM_ports/UpperTesterPort_CAM.cc @@ -1,6 +1,7 @@ #include "uppertester_cam_layer_factory.hh" #include "loggers.hh" +#include "UpperTesterPort_CAM.hh" //============================================================================= namespace LibItsCam__TestSystem { diff --git a/ccsrc/Ports/LibIts_ports/CAM_ports/UpperTesterPort_CAM.partH b/ccsrc/Ports/LibIts_ports/CAM_ports/UpperTesterPort_CAM.hh similarity index 95% rename from ccsrc/Ports/LibIts_ports/CAM_ports/UpperTesterPort_CAM.partH rename to ccsrc/Ports/LibIts_ports/CAM_ports/UpperTesterPort_CAM.hh index 7f79fc3926a8610170f7b8b5ed9c711001b07fa1..c8263bb8ac503946af43477eb50ae640ed70b34a 100644 --- a/ccsrc/Ports/LibIts_ports/CAM_ports/UpperTesterPort_CAM.partH +++ b/ccsrc/Ports/LibIts_ports/CAM_ports/UpperTesterPort_CAM.hh @@ -1,3 +1,6 @@ +#ifndef UpperTesterPort_CAM_HH +#define UpperTesterPort_CAM_HH + #include "layer.hh" #include "params.hh" @@ -47,3 +50,4 @@ namespace LibItsCam__TestSystem { }; } /* end of namespace */ +#endif diff --git a/ccsrc/Ports/LibIts_ports/CAM_ports/module.mk b/ccsrc/Ports/LibIts_ports/CAM_ports/module.mk new file mode 100644 index 0000000000000000000000000000000000000000..45ed2a02d69214e3289c085eacb9af7f43e674ae --- /dev/null +++ b/ccsrc/Ports/LibIts_ports/CAM_ports/module.mk @@ -0,0 +1,3 @@ +sources := AdapterControlPort_CAM.cc CamPort.cc UpperTesterPort_CAM.cc +includes := . + diff --git a/ccsrc/Ports/LibIts_ports/DCC_ports/UpperTesterPort_DCC.partC b/ccsrc/Ports/LibIts_ports/DCC_ports/UpperTesterPort_DCC.cc similarity index 97% rename from ccsrc/Ports/LibIts_ports/DCC_ports/UpperTesterPort_DCC.partC rename to ccsrc/Ports/LibIts_ports/DCC_ports/UpperTesterPort_DCC.cc index 495c120448ecfc24ee736ebd4f9afe939d15ead9..0120e10f7edf1087d70246c39e1893f14bd9e6bc 100644 --- a/ccsrc/Ports/LibIts_ports/DCC_ports/UpperTesterPort_DCC.partC +++ b/ccsrc/Ports/LibIts_ports/DCC_ports/UpperTesterPort_DCC.cc @@ -1,3 +1,4 @@ +#include "UpperTesterPort_DCC.hh" //============================================================================= namespace LibItsDcc__TestSystem { diff --git a/ccsrc/Ports/LibIts_ports/DCC_ports/UpperTesterPort_DCC.partH b/ccsrc/Ports/LibIts_ports/DCC_ports/UpperTesterPort_DCC.hh similarity index 93% rename from ccsrc/Ports/LibIts_ports/DCC_ports/UpperTesterPort_DCC.partH rename to ccsrc/Ports/LibIts_ports/DCC_ports/UpperTesterPort_DCC.hh index 47642b8121da8eb53d625197d2cc4a61df5fe540..ad25eb2e2fb11ba1f0ae20613d73ecd743b0017b 100644 --- a/ccsrc/Ports/LibIts_ports/DCC_ports/UpperTesterPort_DCC.partH +++ b/ccsrc/Ports/LibIts_ports/DCC_ports/UpperTesterPort_DCC.hh @@ -1,4 +1,7 @@ //============================================================================= +#ifndef UpperTesterPort_DCC_HH +#define UpperTesterPort_DCC_HH + #include "LibItsDcc_TestSystem.hh" namespace LibItsDcc__TestSystem { @@ -30,3 +33,4 @@ protected: }; } /* end of namespace */ +#endif diff --git a/ccsrc/Ports/LibIts_ports/DENM_ports/AdapterControlPort_DENM.partC b/ccsrc/Ports/LibIts_ports/DENM_ports/AdapterControlPort_DENM.cc similarity index 98% rename from ccsrc/Ports/LibIts_ports/DENM_ports/AdapterControlPort_DENM.partC rename to ccsrc/Ports/LibIts_ports/DENM_ports/AdapterControlPort_DENM.cc index 57e2d42d3624d1151df0a02f6d1fa02c7390e883..5dc9f30967f80b22a6c4081e35c4da0233c2a5f9 100644 --- a/ccsrc/Ports/LibIts_ports/DENM_ports/AdapterControlPort_DENM.partC +++ b/ccsrc/Ports/LibIts_ports/DENM_ports/AdapterControlPort_DENM.cc @@ -4,7 +4,7 @@ #include "registration.hh" #include "denm_layer.hh" - +#include "AdapterControlPort_DENM.hh" //============================================================================= namespace LibItsDenm__TestSystem { diff --git a/ccsrc/Ports/LibIts_ports/DENM_ports/AdapterControlPort_DENM.partH b/ccsrc/Ports/LibIts_ports/DENM_ports/AdapterControlPort_DENM.hh similarity index 92% rename from ccsrc/Ports/LibIts_ports/DENM_ports/AdapterControlPort_DENM.partH rename to ccsrc/Ports/LibIts_ports/DENM_ports/AdapterControlPort_DENM.hh index d45b1d31ef5da417b5b272a96dcd8b25ae9b325f..de6df3e39227a5fe657b9568eb3ff4aa5c40f3cb 100644 --- a/ccsrc/Ports/LibIts_ports/DENM_ports/AdapterControlPort_DENM.partH +++ b/ccsrc/Ports/LibIts_ports/DENM_ports/AdapterControlPort_DENM.hh @@ -1,4 +1,7 @@ //============================================================================= +#ifndef AdapterControlPort_DENM_HH +#define AdapterControlPort_DENM_HH + #include "LibItsDenm_TestSystem.hh" namespace LibItsDenm__TestSystem { @@ -32,3 +35,4 @@ protected: }; } // end of namespace +#endif diff --git a/ccsrc/Ports/LibIts_ports/DENM_ports/UpperTesterPort_DENM.partC b/ccsrc/Ports/LibIts_ports/DENM_ports/UpperTesterPort_DENM.cc similarity index 99% rename from ccsrc/Ports/LibIts_ports/DENM_ports/UpperTesterPort_DENM.partC rename to ccsrc/Ports/LibIts_ports/DENM_ports/UpperTesterPort_DENM.cc index f275352f1e6aeefd23ba72b6a9a8a478d62ad7f3..e3c69fa9dce09fb4c6813400473c86263ad8f132 100644 --- a/ccsrc/Ports/LibIts_ports/DENM_ports/UpperTesterPort_DENM.partC +++ b/ccsrc/Ports/LibIts_ports/DENM_ports/UpperTesterPort_DENM.cc @@ -1,7 +1,7 @@ #include "uppertester_denm_layer_factory.hh" #include "loggers.hh" - +#include "UpperTesterPort_DENM.hh" //============================================================================= namespace LibItsDenm__TestSystem { diff --git a/ccsrc/Ports/LibIts_ports/DENM_ports/UpperTesterPort_DENM.partH b/ccsrc/Ports/LibIts_ports/DENM_ports/UpperTesterPort_DENM.hh similarity index 95% rename from ccsrc/Ports/LibIts_ports/DENM_ports/UpperTesterPort_DENM.partH rename to ccsrc/Ports/LibIts_ports/DENM_ports/UpperTesterPort_DENM.hh index e63c78fa23a1755278e57e96cdd70677c54a0f5e..1c8c7d609dab978aa78843fd06322076dafa674c 100644 --- a/ccsrc/Ports/LibIts_ports/DENM_ports/UpperTesterPort_DENM.partH +++ b/ccsrc/Ports/LibIts_ports/DENM_ports/UpperTesterPort_DENM.hh @@ -1,3 +1,6 @@ +#ifndef UpperTesterPort_DENM_HH +#define UpperTesterPort_DENM_HH + #include "layer.hh" #include "params.hh" @@ -49,3 +52,4 @@ namespace LibItsDenm__TestSystem { }; } /* end of namespace */ +#endif diff --git a/ccsrc/Ports/LibIts_ports/DENM_ports/module.mk b/ccsrc/Ports/LibIts_ports/DENM_ports/module.mk new file mode 100644 index 0000000000000000000000000000000000000000..4cb04ae0d1932448029f6def26baf6ab242655cc --- /dev/null +++ b/ccsrc/Ports/LibIts_ports/DENM_ports/module.mk @@ -0,0 +1,3 @@ +sources := AdapterControlPort_DENM.cc DenmPort.cc UpperTesterPort_DENM.cc +includes := . + diff --git a/ccsrc/Ports/LibIts_ports/EVCSN_ports/AdapterControlPort_EVCSN.partC b/ccsrc/Ports/LibIts_ports/EVCSN_ports/AdapterControlPort_EVCSN.cc similarity index 97% rename from ccsrc/Ports/LibIts_ports/EVCSN_ports/AdapterControlPort_EVCSN.partC rename to ccsrc/Ports/LibIts_ports/EVCSN_ports/AdapterControlPort_EVCSN.cc index 5cd06e2ee8e0e3686c583be2f8e9ed111ac013d2..944b66c075f83359eec38d3fb57f2256a3597aa0 100644 --- a/ccsrc/Ports/LibIts_ports/EVCSN_ports/AdapterControlPort_EVCSN.partC +++ b/ccsrc/Ports/LibIts_ports/EVCSN_ports/AdapterControlPort_EVCSN.cc @@ -1,3 +1,4 @@ +#include "AdapterControlPort_EVCSN.hh" //============================================================================= namespace LibItsEvcsn__TestSystem { diff --git a/ccsrc/Ports/LibIts_ports/EVCSN_ports/AdapterControlPort_EVCSN.partH b/ccsrc/Ports/LibIts_ports/EVCSN_ports/AdapterControlPort_EVCSN.hh similarity index 92% rename from ccsrc/Ports/LibIts_ports/EVCSN_ports/AdapterControlPort_EVCSN.partH rename to ccsrc/Ports/LibIts_ports/EVCSN_ports/AdapterControlPort_EVCSN.hh index fe2439d3336a2ecf311c12f982e4f7a40aaf850a..e6b0b0f62130d494e81d047aba871de66644df45 100644 --- a/ccsrc/Ports/LibIts_ports/EVCSN_ports/AdapterControlPort_EVCSN.partH +++ b/ccsrc/Ports/LibIts_ports/EVCSN_ports/AdapterControlPort_EVCSN.hh @@ -1,3 +1,6 @@ +#ifndef AdapterControlPort_EVCSN_HH +#define AdapterControlPort_EVCSN_HH + //============================================================================= #include "LibItsEvcsn_TestSystem.hh" @@ -32,3 +35,4 @@ protected: }; } // end of namespace +#endif diff --git a/ccsrc/Ports/LibIts_ports/EVCSN_ports/UpperTesterPort_EVCSN.partC b/ccsrc/Ports/LibIts_ports/EVCSN_ports/UpperTesterPort_EVCSN.cc similarity index 97% rename from ccsrc/Ports/LibIts_ports/EVCSN_ports/UpperTesterPort_EVCSN.partC rename to ccsrc/Ports/LibIts_ports/EVCSN_ports/UpperTesterPort_EVCSN.cc index 5cfe979dc47833dfd06c8859489c08b4f087d410..e0b46068a3494d5da04ffd49bd8700cd3d8c9431 100644 --- a/ccsrc/Ports/LibIts_ports/EVCSN_ports/UpperTesterPort_EVCSN.partC +++ b/ccsrc/Ports/LibIts_ports/EVCSN_ports/UpperTesterPort_EVCSN.cc @@ -1,3 +1,4 @@ +#include "UpperTesterPort_EVCSN.hh" //============================================================================= namespace LibItsEvcsn__TestSystem { diff --git a/ccsrc/Ports/LibIts_ports/EVCSN_ports/UpperTesterPort_EVCSN.partH b/ccsrc/Ports/LibIts_ports/EVCSN_ports/UpperTesterPort_EVCSN.hh similarity index 94% rename from ccsrc/Ports/LibIts_ports/EVCSN_ports/UpperTesterPort_EVCSN.partH rename to ccsrc/Ports/LibIts_ports/EVCSN_ports/UpperTesterPort_EVCSN.hh index c5f66bc7ac93a143ff46c70dc89d3fc468093873..179e02249390d31ec652723db86aac10a97ee453 100644 --- a/ccsrc/Ports/LibIts_ports/EVCSN_ports/UpperTesterPort_EVCSN.partH +++ b/ccsrc/Ports/LibIts_ports/EVCSN_ports/UpperTesterPort_EVCSN.hh @@ -1,3 +1,6 @@ +#ifndef UpperTesterPort_EVCSN_HH +#define UpperTesterPort_EVCSN_HH + //============================================================================= #include "LibItsEvcsn_TestSystem.hh" namespace LibItsEvcsn__TestSystem { @@ -37,3 +40,4 @@ protected: }; } /* end of namespace */ +#endif diff --git a/ccsrc/Ports/LibIts_ports/GN_ports/AdapterControlPort_GN.partC b/ccsrc/Ports/LibIts_ports/GN_ports/AdapterControlPort_GN.cc similarity index 99% rename from ccsrc/Ports/LibIts_ports/GN_ports/AdapterControlPort_GN.partC rename to ccsrc/Ports/LibIts_ports/GN_ports/AdapterControlPort_GN.cc index 518bef4477d8f052f5fcb4c01abc2220ec1cfb9e..a376fbdff0766e6147336069dcd81e0c2ec1e2e1 100644 --- a/ccsrc/Ports/LibIts_ports/GN_ports/AdapterControlPort_GN.partC +++ b/ccsrc/Ports/LibIts_ports/GN_ports/AdapterControlPort_GN.cc @@ -4,7 +4,7 @@ #include "registration.hh" #include "geonetworking_layer.hh" - +#include "AdapterControlPort_GN.hh" //============================================================================= namespace LibItsGeoNetworking__TestSystem { diff --git a/ccsrc/Ports/LibIts_ports/GN_ports/AdapterControlPort_GN.partH b/ccsrc/Ports/LibIts_ports/GN_ports/AdapterControlPort_GN.hh similarity index 94% rename from ccsrc/Ports/LibIts_ports/GN_ports/AdapterControlPort_GN.partH rename to ccsrc/Ports/LibIts_ports/GN_ports/AdapterControlPort_GN.hh index 8ad020285afe55f6ba1d36ed9418369bb10e2eba..ca98bd2a250f3c4bd9a2e026ef168e430f19785d 100644 --- a/ccsrc/Ports/LibIts_ports/GN_ports/AdapterControlPort_GN.partH +++ b/ccsrc/Ports/LibIts_ports/GN_ports/AdapterControlPort_GN.hh @@ -1,3 +1,6 @@ +#ifndef AdapterControlPort_GN_HH +#define AdapterControlPort_GN_HH + //============================================================================= #include "LibItsGeoNetworking_TestSystem.hh" @@ -40,3 +43,4 @@ protected: }; } /* end of namespace */ +#endif diff --git a/ccsrc/Ports/LibIts_ports/GN_ports/UpperTesterPort_GN.partC b/ccsrc/Ports/LibIts_ports/GN_ports/UpperTesterPort_GN.cc similarity index 99% rename from ccsrc/Ports/LibIts_ports/GN_ports/UpperTesterPort_GN.partC rename to ccsrc/Ports/LibIts_ports/GN_ports/UpperTesterPort_GN.cc index f0b2e1c4d27e38873934b63cc4a0de95568ca7f9..a55e8b249f65e984ca02f48661d10805f33aca12 100644 --- a/ccsrc/Ports/LibIts_ports/GN_ports/UpperTesterPort_GN.partC +++ b/ccsrc/Ports/LibIts_ports/GN_ports/UpperTesterPort_GN.cc @@ -1,7 +1,7 @@ #include "uppertester_geonetworking_factory.hh" #include "loggers.hh" - +#include "UpperTesterPort_GN.hh" //============================================================================= namespace LibItsGeoNetworking__TestSystem { diff --git a/ccsrc/Ports/LibIts_ports/GN_ports/UpperTesterPort_GN.partH b/ccsrc/Ports/LibIts_ports/GN_ports/UpperTesterPort_GN.hh similarity index 95% rename from ccsrc/Ports/LibIts_ports/GN_ports/UpperTesterPort_GN.partH rename to ccsrc/Ports/LibIts_ports/GN_ports/UpperTesterPort_GN.hh index 212dd564ac1c5aa0536ed6d256b070ea501d552d..783780fff243e832f0f13cbca3edd393da1f6363 100644 --- a/ccsrc/Ports/LibIts_ports/GN_ports/UpperTesterPort_GN.partH +++ b/ccsrc/Ports/LibIts_ports/GN_ports/UpperTesterPort_GN.hh @@ -1,3 +1,5 @@ +#ifndef UpperTesterPort_GN_HH +#define UpperTesterPort_GN_HH #include "layer.hh" #include "params.hh" @@ -44,3 +46,4 @@ namespace LibItsGeoNetworking__TestSystem { }; } /* end of namespace */ +#endif diff --git a/ccsrc/Ports/LibIts_ports/GN_ports/module.mk b/ccsrc/Ports/LibIts_ports/GN_ports/module.mk new file mode 100644 index 0000000000000000000000000000000000000000..b135587f4c8f7eaa91a5dc3a40edfe2d9d8d066d --- /dev/null +++ b/ccsrc/Ports/LibIts_ports/GN_ports/module.mk @@ -0,0 +1,3 @@ +sources := AdapterControlPort_GN.cc GeoNetworkingPort.cc UpperTesterPort_GN.cc +includes := . + diff --git a/ccsrc/Ports/LibIts_ports/Http_ports/module.mk b/ccsrc/Ports/LibIts_ports/Http_ports/module.mk new file mode 100644 index 0000000000000000000000000000000000000000..ac4f8ac5142a335ac5ac398774950fdb2e1cddb3 --- /dev/null +++ b/ccsrc/Ports/LibIts_ports/Http_ports/module.mk @@ -0,0 +1,3 @@ +sources := HttpPort.cc +includes := . + diff --git a/ccsrc/Ports/LibIts_ports/IPv6oGN_ports/module.mk b/ccsrc/Ports/LibIts_ports/IPv6oGN_ports/module.mk new file mode 100644 index 0000000000000000000000000000000000000000..507dcc447a478ac4637e99425415cf7525d146b6 --- /dev/null +++ b/ccsrc/Ports/LibIts_ports/IPv6oGN_ports/module.mk @@ -0,0 +1,3 @@ +sources := IPv6OverGeoNetworkingPort.cc +includes := . + diff --git a/ccsrc/Ports/LibIts_ports/IVIM_ports/AdapterControlPort_IVIM.partC b/ccsrc/Ports/LibIts_ports/IVIM_ports/AdapterControlPort_IVIM.cc similarity index 98% rename from ccsrc/Ports/LibIts_ports/IVIM_ports/AdapterControlPort_IVIM.partC rename to ccsrc/Ports/LibIts_ports/IVIM_ports/AdapterControlPort_IVIM.cc index e3b499aa7b1e4f7d9e0566c7149b6791b7e4a544..11f9b9e2ffcceb8eaf6b1c76ff1d3d2c159ee86e 100644 --- a/ccsrc/Ports/LibIts_ports/IVIM_ports/AdapterControlPort_IVIM.partC +++ b/ccsrc/Ports/LibIts_ports/IVIM_ports/AdapterControlPort_IVIM.cc @@ -4,6 +4,7 @@ #include "ivim_layer.hh" //============================================================================= +#include "AdapterControlPort_IVIM.hh" namespace LibItsIvim__TestSystem { AdapterControlPort::AdapterControlPort(const char *par_port_name) diff --git a/ccsrc/Ports/LibIts_ports/IVIM_ports/AdapterControlPort_IVIM.partH b/ccsrc/Ports/LibIts_ports/IVIM_ports/AdapterControlPort_IVIM.hh similarity index 92% rename from ccsrc/Ports/LibIts_ports/IVIM_ports/AdapterControlPort_IVIM.partH rename to ccsrc/Ports/LibIts_ports/IVIM_ports/AdapterControlPort_IVIM.hh index 5487cfbf05c05a476bdd6c44fd4eafe1d91c4e0d..361f63968f409286effebf7085f219196d0c032f 100644 --- a/ccsrc/Ports/LibIts_ports/IVIM_ports/AdapterControlPort_IVIM.partH +++ b/ccsrc/Ports/LibIts_ports/IVIM_ports/AdapterControlPort_IVIM.hh @@ -1,4 +1,7 @@ //============================================================================= +#ifndef AdapterControlPort_IVIM_HH +#define AdapterControlPort_IVIM_HH + #include "LibItsIvim_TestSystem.hh" namespace LibItsIvim__TestSystem { @@ -32,3 +35,4 @@ protected: }; } // end of namespace +#endif diff --git a/ccsrc/Ports/LibIts_ports/IVIM_ports/UpperTesterPort_IVIM.partC b/ccsrc/Ports/LibIts_ports/IVIM_ports/UpperTesterPort_IVIM.cc similarity index 99% rename from ccsrc/Ports/LibIts_ports/IVIM_ports/UpperTesterPort_IVIM.partC rename to ccsrc/Ports/LibIts_ports/IVIM_ports/UpperTesterPort_IVIM.cc index 1e3fa248f2eb62c75971732cf1a77a6cd5300e5c..9f09f07db120098db12e7fa98db8bd8c6b8fd91a 100644 --- a/ccsrc/Ports/LibIts_ports/IVIM_ports/UpperTesterPort_IVIM.partC +++ b/ccsrc/Ports/LibIts_ports/IVIM_ports/UpperTesterPort_IVIM.cc @@ -1,7 +1,7 @@ #include "uppertester_ivim_factory.hh" #include "loggers.hh" - +#include "UpperTesterPort_IVIM.hh" //============================================================================= namespace LibItsIvim__TestSystem { diff --git a/ccsrc/Ports/LibIts_ports/IVIM_ports/UpperTesterPort_IVIM.partH b/ccsrc/Ports/LibIts_ports/IVIM_ports/UpperTesterPort_IVIM.hh similarity index 92% rename from ccsrc/Ports/LibIts_ports/IVIM_ports/UpperTesterPort_IVIM.partH rename to ccsrc/Ports/LibIts_ports/IVIM_ports/UpperTesterPort_IVIM.hh index f5b9dad2c517dcc89b357b4a99d03429aa5949d4..864d143a2c11f77c16e6e25fbb0e6e05453f8222 100644 --- a/ccsrc/Ports/LibIts_ports/IVIM_ports/UpperTesterPort_IVIM.partH +++ b/ccsrc/Ports/LibIts_ports/IVIM_ports/UpperTesterPort_IVIM.hh @@ -1,4 +1,10 @@ //============================================================================= +#ifndef UpperTesterPort_IVIM_HH +#define UpperTesterPort_IVIM_HH + +#include "layer.hh" +#include "params.hh" + #include "LibItsIvim_TestSystem.hh" namespace LibItsIvim__TestSystem { @@ -42,3 +48,4 @@ protected: }; } /* end of namespace */ +#endif \ No newline at end of file diff --git a/ccsrc/Ports/LibIts_ports/IVIM_ports/module.mk b/ccsrc/Ports/LibIts_ports/IVIM_ports/module.mk new file mode 100644 index 0000000000000000000000000000000000000000..de5f67150f176033c4c7e20c979c4b741d5b43f1 --- /dev/null +++ b/ccsrc/Ports/LibIts_ports/IVIM_ports/module.mk @@ -0,0 +1,3 @@ +sources := AdapterControlPort_IVIM.cc IvimPort.cc UpperTesterPort_IVIM.cc +includes := . + diff --git a/ccsrc/Ports/LibIts_ports/MapemSpatem_ports/AdapterControlPort_MapemSpatem.partC b/ccsrc/Ports/LibIts_ports/MapemSpatem_ports/AdapterControlPort_MapemSpatem.cc similarity index 98% rename from ccsrc/Ports/LibIts_ports/MapemSpatem_ports/AdapterControlPort_MapemSpatem.partC rename to ccsrc/Ports/LibIts_ports/MapemSpatem_ports/AdapterControlPort_MapemSpatem.cc index 01fa602a3e148509f3e46c19585a1235367e8046..841a4fe25b03ccffc12aec3b3690222160556acb 100644 --- a/ccsrc/Ports/LibIts_ports/MapemSpatem_ports/AdapterControlPort_MapemSpatem.partC +++ b/ccsrc/Ports/LibIts_ports/MapemSpatem_ports/AdapterControlPort_MapemSpatem.cc @@ -4,6 +4,7 @@ #include "mapem_spatem_layer.hh" //============================================================================= +#include "AdapterControlPort_MapemSpatem.hh" namespace LibItsMapemSpatem__TestSystem { AdapterControlPort::AdapterControlPort(const char *par_port_name) diff --git a/ccsrc/Ports/LibIts_ports/MapemSpatem_ports/AdapterControlPort_MapemSpatem.partH b/ccsrc/Ports/LibIts_ports/MapemSpatem_ports/AdapterControlPort_MapemSpatem.hh similarity index 90% rename from ccsrc/Ports/LibIts_ports/MapemSpatem_ports/AdapterControlPort_MapemSpatem.partH rename to ccsrc/Ports/LibIts_ports/MapemSpatem_ports/AdapterControlPort_MapemSpatem.hh index c16e6b5b8378b88f31ad909b9050ea094abe5a12..dcb15719099c006e62764ba672d062eb1470c838 100644 --- a/ccsrc/Ports/LibIts_ports/MapemSpatem_ports/AdapterControlPort_MapemSpatem.partH +++ b/ccsrc/Ports/LibIts_ports/MapemSpatem_ports/AdapterControlPort_MapemSpatem.hh @@ -1,4 +1,7 @@ //============================================================================= +#ifndef AdapterControlPort_MapemSpatem_HH +#define AdapterControlPort_MapemSpatem_HH + #include "LibItsMapemSpatem_TestSystem.hh" namespace LibItsMapemSpatem__TestSystem { @@ -30,3 +33,4 @@ protected: }; } // end of namespace +#endif diff --git a/ccsrc/Ports/LibIts_ports/MapemSpatem_ports/UpperTesterPort_MapemSpatem.partC b/ccsrc/Ports/LibIts_ports/MapemSpatem_ports/UpperTesterPort_MapemSpatem.cc similarity index 99% rename from ccsrc/Ports/LibIts_ports/MapemSpatem_ports/UpperTesterPort_MapemSpatem.partC rename to ccsrc/Ports/LibIts_ports/MapemSpatem_ports/UpperTesterPort_MapemSpatem.cc index a48e6f6fd9688b0a0f9a7169ef8c187dad8ab4ec..a2a8536754bd90b61e75b00bbec485767a2f3107 100644 --- a/ccsrc/Ports/LibIts_ports/MapemSpatem_ports/UpperTesterPort_MapemSpatem.partC +++ b/ccsrc/Ports/LibIts_ports/MapemSpatem_ports/UpperTesterPort_MapemSpatem.cc @@ -1,7 +1,7 @@ #include "uppertester_mapem_spatem_factory.hh" #include "loggers.hh" - +#include "UpperTesterPort_MapemSpatem.hh" //============================================================================= namespace LibItsMapemSpatem__TestSystem { diff --git a/ccsrc/Ports/LibIts_ports/MapemSpatem_ports/UpperTesterPort_MapemSpatem.partH b/ccsrc/Ports/LibIts_ports/MapemSpatem_ports/UpperTesterPort_MapemSpatem.hh similarity index 90% rename from ccsrc/Ports/LibIts_ports/MapemSpatem_ports/UpperTesterPort_MapemSpatem.partH rename to ccsrc/Ports/LibIts_ports/MapemSpatem_ports/UpperTesterPort_MapemSpatem.hh index dd49c6bb102fd0224d0dfaabcf221bdcda44d8f7..f34907cb0f7a633d3c677e96d236a600d4e661b1 100644 --- a/ccsrc/Ports/LibIts_ports/MapemSpatem_ports/UpperTesterPort_MapemSpatem.partH +++ b/ccsrc/Ports/LibIts_ports/MapemSpatem_ports/UpperTesterPort_MapemSpatem.hh @@ -1,5 +1,12 @@ //============================================================================= +#ifndef UpperTesterPort_MapemSpatem_HH +#define UpperTesterPort_MapemSpatem_HH + #include "LibItsMapemSpatem_TestSystem.hh" + +#include "layer.hh" +#include "params.hh" + namespace LibItsMapemSpatem__TestSystem { class UpperTesterPort : public UpperTesterPort_BASE { @@ -37,3 +44,4 @@ protected: }; } /* end of namespace */ +#endif diff --git a/ccsrc/Ports/LibIts_ports/MapemSpatem_ports/module.mk b/ccsrc/Ports/LibIts_ports/MapemSpatem_ports/module.mk new file mode 100644 index 0000000000000000000000000000000000000000..5a934dc21c9ff64253c257da291da1b9a21bfb4a --- /dev/null +++ b/ccsrc/Ports/LibIts_ports/MapemSpatem_ports/module.mk @@ -0,0 +1,3 @@ +sources := AdapterControlPort_MapemSpatem.cc MapemSpatemPort.cc UpperTesterPort_MapemSpatem.cc +includes := . + diff --git a/ccsrc/Ports/LibIts_ports/Pki_ports/AdapterControlPort_Pki.partC b/ccsrc/Ports/LibIts_ports/Pki_ports/AdapterControlPort_Pki.cc similarity index 98% rename from ccsrc/Ports/LibIts_ports/Pki_ports/AdapterControlPort_Pki.partC rename to ccsrc/Ports/LibIts_ports/Pki_ports/AdapterControlPort_Pki.cc index 25b5c90a1774f0b29bdcb0838f995be208e8b208..9e1be0ba2d01c038afadde6a3737793483eae09f 100644 --- a/ccsrc/Ports/LibIts_ports/Pki_ports/AdapterControlPort_Pki.partC +++ b/ccsrc/Ports/LibIts_ports/Pki_ports/AdapterControlPort_Pki.cc @@ -3,8 +3,7 @@ #include "loggers.hh" #include "registration.hh" -//#include "pki_layer.hh" - +#include "AdapterControlPort_Pki.hh" //============================================================================= namespace LibItsPki__TestSystem { diff --git a/ccsrc/Ports/LibIts_ports/Pki_ports/AdapterControlPort_Pki.partH b/ccsrc/Ports/LibIts_ports/Pki_ports/AdapterControlPort_Pki.hh similarity index 92% rename from ccsrc/Ports/LibIts_ports/Pki_ports/AdapterControlPort_Pki.partH rename to ccsrc/Ports/LibIts_ports/Pki_ports/AdapterControlPort_Pki.hh index fb816f733e31fa142756b764a5a43327f1a07fd2..51a2cb0280cbb6f75f8b928de617eeafdb6f24d3 100644 --- a/ccsrc/Ports/LibIts_ports/Pki_ports/AdapterControlPort_Pki.partH +++ b/ccsrc/Ports/LibIts_ports/Pki_ports/AdapterControlPort_Pki.hh @@ -1,4 +1,7 @@ //============================================================================= +#ifndef AdapterControlPort_Pki_HH +#define AdapterControlPort_Pki_HH + #include "LibItsPki_TestSystem.hh" #include "params.hh" @@ -34,3 +37,4 @@ protected: }; } /* end of namespace */ +#endif \ No newline at end of file diff --git a/ccsrc/Ports/LibIts_ports/Pki_ports/UpperTesterPkiPort.cc b/ccsrc/Ports/LibIts_ports/Pki_ports/UpperTesterPkiPort.cc index 120e8e4c43c48083d2a6958033262793e0c36df8..cea0be98ac5d8fa46b0798696b46703a84e202b2 100644 --- a/ccsrc/Ports/LibIts_ports/Pki_ports/UpperTesterPkiPort.cc +++ b/ccsrc/Ports/LibIts_ports/Pki_ports/UpperTesterPkiPort.cc @@ -1,6 +1,6 @@ #include -#include "LibItsPki_TestSystem.hh" +#include "UpperTesterPkiPort.hh" #include "loggers.hh" diff --git a/ccsrc/Ports/LibIts_ports/Pki_ports/UpperTesterPort_Pki.partC b/ccsrc/Ports/LibIts_ports/Pki_ports/UpperTesterPort_Pki.partC deleted file mode 100644 index 4f677d8a39850c92fbd6a1705de5177cc924b021..0000000000000000000000000000000000000000 --- a/ccsrc/Ports/LibIts_ports/Pki_ports/UpperTesterPort_Pki.partC +++ /dev/null @@ -1,119 +0,0 @@ -#include "uppertester_pki_layer_factory.hh" - -#include "loggers.hh" - -//============================================================================= -namespace LibItsPki__TestSystem { - - UpperTesterPort::UpperTesterPort(const char *par_port_name) - : UpperTesterPort_BASE(par_port_name), _cfg_params(), _layer_params(), _layer(NULL), _time_key("UpperTesterPort_Pki::outgoing_send") - { - loggers::get_instance().log("UpperTesterPort_Pki::UpperTesterPort_Pki"); - } - - UpperTesterPort::~UpperTesterPort() - { - if (_layer != NULL) { - delete _layer; - } - } - - void UpperTesterPort::set_parameter(const char * parameter_name, const char * parameter_value) - { - loggers::get_instance().log("UpperTesterPort_Pki::set_parameter: %s=%s", parameter_name, parameter_value); - _cfg_params.insert(std::pair(std::string(parameter_name), std::string(parameter_value))); - _cfg_params.log(); - } - - /*void UpperTesterPort::Handle_Fd_Event(int fd, boolean is_readable, - boolean is_writable, boolean is_error) {}*/ - - void UpperTesterPort::Handle_Fd_Event_Error(int /*fd*/) - { - - } - - void UpperTesterPort::Handle_Fd_Event_Writable(int /*fd*/) - { - - } - - void UpperTesterPort::Handle_Fd_Event_Readable(int /*fd*/) - { - - } - - /*void UpperTesterPort::Handle_Timeout(double time_since_last_call) {}*/ - - void UpperTesterPort::user_map(const char * system_port) - { - loggers::get_instance().log(">>> UpperTesterPort_Pki::user_map: %s", system_port); - // Build layer stack - params::iterator it = _cfg_params.find(std::string("params")); - if (it != _cfg_params.end()) { - loggers::get_instance().log("UpperTesterPort_Pki::user_map: %s", it->second.c_str()); - _layer = layer_stack_builder::get_instance()->create_layer_stack(it->second.c_str()); - if (static_cast(_layer) == NULL) { - loggers::get_instance().error("UpperTesterPort_Pki::user_map: Invalid stack configuration: %s", it->second.c_str()); - } - static_cast(_layer)->add_upper_port(this); - } else { - loggers::get_instance().error("UpperTesterPort_Pki::user_map: No layers defined in configuration file"); - } - } - - void UpperTesterPort::user_unmap(const char * system_port) - { - loggers::get_instance().log(">>> UpperTesterPort_Pki::user_unmap: %s", system_port); - if (_layer != NULL) { - delete _layer; - _layer = NULL; - } - - } - - void UpperTesterPort::user_start() - { - - } - - void UpperTesterPort::user_stop() - { - - } - - void UpperTesterPort::outgoing_send(const LibItsPki__TypesAndValues::UtPkiInitialize& send_par) - { - loggers::get_instance().log_msg(">>> UppertesterPort::outgoing_send: ", send_par); - - float duration; - loggers::get_instance().set_start_time(_time_key); - static_cast(_layer)->sendMsg(send_par, _layer_params); - loggers::get_instance().set_stop_time(_time_key, duration); - } - - void UpperTesterPort::outgoing_send(const LibItsPki__TypesAndValues::UtPkiTrigger& send_par) - { - loggers::get_instance().log_msg(">>> UppertesterPort::outgoing_send: ", send_par); - - float duration; - loggers::get_instance().set_start_time(_time_key); - static_cast(_layer)->sendMsg(send_par, _layer_params); - loggers::get_instance().set_stop_time(_time_key, duration); - } - - void UpperTesterPort::receiveMsg (const Base_Type& p_ind, const params& p_params) { - loggers::get_instance().log_msg(">>> UpperTesterPort_Pki::receive_msg: ", p_ind); - // Sanity check - if (!p_ind.is_bound()) { - return; - } - - if (std::string(p_ind.get_descriptor()->name).compare("@LibItsPki_TypesAndValues.UtPkiResults") == 0) { // TODO To be refined - incoming_message(static_cast(p_ind)); - } else { - loggers::get_instance().warning("UpperTesterPort_Pki::receive_msg: Message not processed: %s", p_ind.get_descriptor()->name); - } - } - -} /* end of namespace */ diff --git a/ccsrc/Ports/LibIts_ports/Pki_ports/UpperTesterPort_Pki.partH b/ccsrc/Ports/LibIts_ports/Pki_ports/UpperTesterPort_Pki.partH deleted file mode 100644 index e6f4ad507bbf4584d84f62bbec47e93244fcef51..0000000000000000000000000000000000000000 --- a/ccsrc/Ports/LibIts_ports/Pki_ports/UpperTesterPort_Pki.partH +++ /dev/null @@ -1,43 +0,0 @@ -#include "layer.hh" -#include "params.hh" - -//============================================================================= -#include "LibItsPki_TestSystem.hh" -namespace LibItsPki__TestSystem { - - class UpperTesterPort : public UpperTesterPort_BASE { - params _cfg_params; - params _layer_params; - layer* _layer; - std::string _time_key; - - public: - UpperTesterPort(const char *par_port_name = NULL); - ~UpperTesterPort(); - - void set_parameter(const char *parameter_name, - const char *parameter_value); - - void receiveMsg (const Base_Type&, const params&); - - private: - /* void Handle_Fd_Event(int fd, boolean is_readable, - boolean is_writable, boolean is_error); */ - void Handle_Fd_Event_Error(int fd); - void Handle_Fd_Event_Writable(int fd); - void Handle_Fd_Event_Readable(int fd); - /* void Handle_Timeout(double time_since_last_call); */ - protected: - void user_map(const char *system_port); - void user_unmap(const char *system_port); - - void user_start(); - void user_stop(); - - void outgoing_send(const LibItsPki__TypesAndValues::UtPkiInitialize& send_par); - - void outgoing_send(const LibItsPki__TypesAndValues::UtPkiTrigger& send_par); - - }; - -} /* end of namespace */ diff --git a/ccsrc/Ports/LibIts_ports/Pki_ports/module.mk b/ccsrc/Ports/LibIts_ports/Pki_ports/module.mk new file mode 100644 index 0000000000000000000000000000000000000000..1897e76b0402c01137b6cc869a0cb9c484ea2694 --- /dev/null +++ b/ccsrc/Ports/LibIts_ports/Pki_ports/module.mk @@ -0,0 +1,3 @@ +sources := UpperTesterPkiPort.cc +includes := . + diff --git a/ccsrc/Ports/LibIts_ports/RSUsSimulator_ports/module.mk b/ccsrc/Ports/LibIts_ports/RSUsSimulator_ports/module.mk new file mode 100644 index 0000000000000000000000000000000000000000..2361270f17b9f261a9e2b7e2b559f8b67a99a814 --- /dev/null +++ b/ccsrc/Ports/LibIts_ports/RSUsSimulator_ports/module.mk @@ -0,0 +1,3 @@ +sources := ConfigRsuSimulatorCodec.cc ConfigRsuSimulatorLayer.cc ConfigRsuSimulatorPort.cc +includes := . + diff --git a/ccsrc/Ports/LibIts_ports/Rtcmem_ports/AdapterControlPort_Rtcmem.partC b/ccsrc/Ports/LibIts_ports/Rtcmem_ports/AdapterControlPort_Rtcmem.cc similarity index 98% rename from ccsrc/Ports/LibIts_ports/Rtcmem_ports/AdapterControlPort_Rtcmem.partC rename to ccsrc/Ports/LibIts_ports/Rtcmem_ports/AdapterControlPort_Rtcmem.cc index d11e87a1a633dec01a0f1538d6185782335735c5..d6ccfd8fee6d06cd341efc32fd73198030875ace 100644 --- a/ccsrc/Ports/LibIts_ports/Rtcmem_ports/AdapterControlPort_Rtcmem.partC +++ b/ccsrc/Ports/LibIts_ports/Rtcmem_ports/AdapterControlPort_Rtcmem.cc @@ -3,6 +3,7 @@ #include "RtcmemLayer.hh" +#include "AdapterControlPort_Rtcmem.hh" //============================================================================= namespace LibItsRtcmem__TestSystem { diff --git a/ccsrc/Ports/LibIts_ports/Rtcmem_ports/AdapterControlPort_Rtcmem.partH b/ccsrc/Ports/LibIts_ports/Rtcmem_ports/AdapterControlPort_Rtcmem.hh similarity index 91% rename from ccsrc/Ports/LibIts_ports/Rtcmem_ports/AdapterControlPort_Rtcmem.partH rename to ccsrc/Ports/LibIts_ports/Rtcmem_ports/AdapterControlPort_Rtcmem.hh index cfdbf02cfc705712c80b86a4d1da57bcdb9a8bb7..55375a79b6d3069b213d4fa8e62f58698e6fdbfb 100644 --- a/ccsrc/Ports/LibIts_ports/Rtcmem_ports/AdapterControlPort_Rtcmem.partH +++ b/ccsrc/Ports/LibIts_ports/Rtcmem_ports/AdapterControlPort_Rtcmem.hh @@ -1,3 +1,6 @@ +#ifndef AdapterControlPort_Rtcmem_HH +#define AdapterControlPort_Rtcmem_HH + //============================================================================= #include "LibItsRtcmem_TestSystem.hh" @@ -30,3 +33,5 @@ protected: }; } // end of namespace + +#endif diff --git a/ccsrc/Ports/LibIts_ports/Rtcmem_ports/UpperTesterPort_Rtcmem.partC b/ccsrc/Ports/LibIts_ports/Rtcmem_ports/UpperTesterPort_Rtcmem.cc similarity index 99% rename from ccsrc/Ports/LibIts_ports/Rtcmem_ports/UpperTesterPort_Rtcmem.partC rename to ccsrc/Ports/LibIts_ports/Rtcmem_ports/UpperTesterPort_Rtcmem.cc index b78670c4e0e2e9e80a452d6b544f1f54445492df..1ccf722a45977651c96b84067947161be498a75b 100644 --- a/ccsrc/Ports/LibIts_ports/Rtcmem_ports/UpperTesterPort_Rtcmem.partC +++ b/ccsrc/Ports/LibIts_ports/Rtcmem_ports/UpperTesterPort_Rtcmem.cc @@ -1,7 +1,7 @@ #include "UpperTesterRtcmemFactory.hh" #include "loggers.hh" - +#include "UpperTesterPort_Rtcmem.hh" //============================================================================= namespace LibItsRtcmem__TestSystem { diff --git a/ccsrc/Ports/LibIts_ports/Rtcmem_ports/UpperTesterPort_Rtcmem.partH b/ccsrc/Ports/LibIts_ports/Rtcmem_ports/UpperTesterPort_Rtcmem.hh similarity index 91% rename from ccsrc/Ports/LibIts_ports/Rtcmem_ports/UpperTesterPort_Rtcmem.partH rename to ccsrc/Ports/LibIts_ports/Rtcmem_ports/UpperTesterPort_Rtcmem.hh index c1ea5dfee6398b353eed010af77601730adb0356..2e6165751cee43c8b6625c1ecdb83c60db494e45 100644 --- a/ccsrc/Ports/LibIts_ports/Rtcmem_ports/UpperTesterPort_Rtcmem.partH +++ b/ccsrc/Ports/LibIts_ports/Rtcmem_ports/UpperTesterPort_Rtcmem.hh @@ -1,3 +1,9 @@ +#ifndef UpperTesterPort_Rtcmem_HH +#define UpperTesterPort_Rtcmem_HH + +#include "layer.hh" +#include "params.hh" + //============================================================================= #include "LibItsRtcmem_TestSystem.hh" namespace LibItsRtcmem__TestSystem { @@ -42,3 +48,5 @@ protected: }; } /* end of namespace */ + +#endif diff --git a/ccsrc/Ports/LibIts_ports/Rtcmem_ports/module.mk b/ccsrc/Ports/LibIts_ports/Rtcmem_ports/module.mk new file mode 100644 index 0000000000000000000000000000000000000000..238ffc662dc93371318171261903fa7d4902d15e --- /dev/null +++ b/ccsrc/Ports/LibIts_ports/Rtcmem_ports/module.mk @@ -0,0 +1,3 @@ +sources := AdapterControlPort_Rtcmem.cc RtcmemPort.cc UpperTesterPort_Rtcmem.cc +includes := . + diff --git a/ccsrc/Ports/LibIts_ports/SremSsem_ports/AdapterControlPort_SremSsem.partC b/ccsrc/Ports/LibIts_ports/SremSsem_ports/AdapterControlPort_SremSsem.cc similarity index 98% rename from ccsrc/Ports/LibIts_ports/SremSsem_ports/AdapterControlPort_SremSsem.partC rename to ccsrc/Ports/LibIts_ports/SremSsem_ports/AdapterControlPort_SremSsem.cc index 21b921850bee6a477834633d4dac9ce7a3447101..b9199aee7e7a53354ccf2a98e391ee1a0b7f7ac7 100644 --- a/ccsrc/Ports/LibIts_ports/SremSsem_ports/AdapterControlPort_SremSsem.partC +++ b/ccsrc/Ports/LibIts_ports/SremSsem_ports/AdapterControlPort_SremSsem.cc @@ -4,6 +4,7 @@ #include "SremSsemLayer.hh" //============================================================================= +#include "AdapterControlPort_SremSsem.hh" namespace LibItsSremSsem__TestSystem { AdapterControlPort::AdapterControlPort(const char *par_port_name) diff --git a/ccsrc/Ports/LibIts_ports/SremSsem_ports/AdapterControlPort_SremSsem.partH b/ccsrc/Ports/LibIts_ports/SremSsem_ports/AdapterControlPort_SremSsem.hh similarity index 91% rename from ccsrc/Ports/LibIts_ports/SremSsem_ports/AdapterControlPort_SremSsem.partH rename to ccsrc/Ports/LibIts_ports/SremSsem_ports/AdapterControlPort_SremSsem.hh index 6433630a8bdc15f4410c65df2382b5c415196a1d..557d56dcefcde16171b56451c749d9ccc5212433 100644 --- a/ccsrc/Ports/LibIts_ports/SremSsem_ports/AdapterControlPort_SremSsem.partH +++ b/ccsrc/Ports/LibIts_ports/SremSsem_ports/AdapterControlPort_SremSsem.hh @@ -1,4 +1,7 @@ //============================================================================= +#ifndef AdapterControlPort_SremSsem_HH +#define AdapterControlPort_SremSsem_HH + #include "LibItsSremSsem_TestSystem.hh" namespace LibItsSremSsem__TestSystem { @@ -30,3 +33,4 @@ protected: }; } // end of namespace +#endif diff --git a/ccsrc/Ports/LibIts_ports/SremSsem_ports/UpperTesterPort_SremSsem.partC b/ccsrc/Ports/LibIts_ports/SremSsem_ports/UpperTesterPort_SremSsem.cc similarity index 99% rename from ccsrc/Ports/LibIts_ports/SremSsem_ports/UpperTesterPort_SremSsem.partC rename to ccsrc/Ports/LibIts_ports/SremSsem_ports/UpperTesterPort_SremSsem.cc index 09db58b5696b6935e0ecc6fe13a22a337b9898c1..cd012fc6dba405718c25b51a1164b4e5d5946fa7 100644 --- a/ccsrc/Ports/LibIts_ports/SremSsem_ports/UpperTesterPort_SremSsem.partC +++ b/ccsrc/Ports/LibIts_ports/SremSsem_ports/UpperTesterPort_SremSsem.cc @@ -1,7 +1,7 @@ #include "UpperTesterSremSsemFactory.hh" #include "loggers.hh" - +#include "UpperTesterPort_SremSsem.hh" //============================================================================= namespace LibItsSremSsem__TestSystem { diff --git a/ccsrc/Ports/LibIts_ports/SremSsem_ports/UpperTesterPort_SremSsem.partH b/ccsrc/Ports/LibIts_ports/SremSsem_ports/UpperTesterPort_SremSsem.hh similarity index 91% rename from ccsrc/Ports/LibIts_ports/SremSsem_ports/UpperTesterPort_SremSsem.partH rename to ccsrc/Ports/LibIts_ports/SremSsem_ports/UpperTesterPort_SremSsem.hh index 46a2378c05548c76e91b3bd811f8be52955fe6b2..319e7189ab2461648633b30a4d337a30d811d46e 100644 --- a/ccsrc/Ports/LibIts_ports/SremSsem_ports/UpperTesterPort_SremSsem.partH +++ b/ccsrc/Ports/LibIts_ports/SremSsem_ports/UpperTesterPort_SremSsem.hh @@ -1,5 +1,12 @@ //============================================================================= +#ifndef UpperTesterPort_SremSsem_HH +#define UpperTesterPort_SremSsem_HH + #include "LibItsSremSsem_TestSystem.hh" + +#include "layer.hh" +#include "params.hh" + namespace LibItsSremSsem__TestSystem { class UpperTesterPort : public UpperTesterPort_BASE { @@ -42,3 +49,4 @@ protected: }; } /* end of namespace */ +#endif diff --git a/ccsrc/Ports/LibIts_ports/SremSsem_ports/module.mk b/ccsrc/Ports/LibIts_ports/SremSsem_ports/module.mk new file mode 100644 index 0000000000000000000000000000000000000000..b337391b512d962f316e4a729b38f5e0162e08b6 --- /dev/null +++ b/ccsrc/Ports/LibIts_ports/SremSsem_ports/module.mk @@ -0,0 +1,3 @@ +sources := AdapterControlPort_SremSsem.cc SremSsemPort.cc UpperTesterPort_SremSsem.cc +includes := . + diff --git a/ccsrc/Ports/LibIts_ports/UpperTesterPort.cc b/ccsrc/Ports/LibIts_ports/UpperTesterPort.cc deleted file mode 100644 index 2f478bc1aa32f6637f38285f0c3a161d2c74a492..0000000000000000000000000000000000000000 --- a/ccsrc/Ports/LibIts_ports/UpperTesterPort.cc +++ /dev/null @@ -1,35 +0,0 @@ -#include "UpperTesterPort.hh" - -#ifdef _NO_SOFTLINKS_ -/* to be used when built without generating softlinks to the working directory */ -#include "BTP_ports/UpperTesterPort_BTP.partC" -#include "CAM_ports/UpperTesterPort_CAM.partC" -#include "DENM_ports/UpperTesterPort_DENM.partC" -#include "GN_ports/UpperTesterPort_GN.partC" -#include "IVIM_ports/UpperTesterPort_IVIM.partC" -#include "MapemSpatem_ports/UpperTesterPort_MapemSpatem.partC" -#include "SremSsem_ports/UpperTesterPort_SremSsem.partC" -#include "Rtcmem_ports/UpperTesterPort_Rtcmem.partC" -//#include "Pki_ports/UpperTesterPort_Pki.partC" -//#include "V2G_ports/UpperTesterPort_V2G.partC" - -#else //_NO_SOFTLINKS_ - -#include "UpperTesterPort_BTP.partC" -#include "UpperTesterPort_CAM.partC" -#include "UpperTesterPort_DENM.partC" -#include "UpperTesterPort_IVIM.partC" -#include "UpperTesterPort_MapemSpatem.partC" -#include "UpperTesterPort_SremSsem.partC" -#include "UpperTesterPort_Rtcmem.partC" -#include "UpperTesterPort_GN.partC" -//#include "UpperTesterPort_Pki.partC" -/* -#include "UpperTesterPort_IVIM.partC" -//#include "UpperTesterPort_MapSpat.partC" -#include "UpperTesterPort_MapemSpatem.partC" -#include "UpperTesterPort_SremSsem.partC" -#include "UpperTesterPort_Evcsn.partC" -//#include "UpperTesterPort_V2G.partC" -*/ -#endif //_NO_SOFTLINKS_ diff --git a/ccsrc/Ports/LibIts_ports/UpperTesterPort.hh b/ccsrc/Ports/LibIts_ports/UpperTesterPort.hh index 1a0558ceb568a943b32b73ad2eb838daa9a41ff8..00cfd0457ee9188bd87fa3b2bb1a63a56f4a87b2 100644 --- a/ccsrc/Ports/LibIts_ports/UpperTesterPort.hh +++ b/ccsrc/Ports/LibIts_ports/UpperTesterPort.hh @@ -1,41 +1,153 @@ #ifndef UpperTesterPort_HH #define UpperTesterPort_HH -#include "LibItsCommon_TypesAndValues.hh" -//#include "TRI_mapper_API.hh" -//#include "TTCN_EncDec.hh" #ifdef _NO_SOFTLINKS_ /* to be used when built without generating softlinks to the working directory */ -#include "BTP_ports/UpperTesterPort_BTP.partH" -#include "CAM_ports/UpperTesterPort_CAM.partH" -#include "DENM_ports/UpperTesterPort_DENM.partH" -#include "GN_ports/UpperTesterPort_GN.partH" -#include "IVIM_ports/UpperTesterPort_IVIM.partH" -#include "MapemSpatem_ports/UpperTesterPort_MapemSpatem.partH" -#include "SremSsem_ports/UpperTesterPort_SremSsem.partH" -#include "Rtcmem_ports/UpperTesterPort_Rtcmem.partH" -//#include "Pki_ports/UpperTesterPort_Pki.partH" -//#include "V2G_ports/UpperTesterPort_V2G.partH" + +#ifdef AtsGeoNetworking + #include "GN_ports/UpperTesterPort_GN.hh" +#endif + +#ifdef AtsBTP + #include "GN_ports/UpperTesterPort_GN.hh" + #include "BTP_ports/UpperTesterPort_BTP.hh" +#endif + +#ifdef AtsCAM + #include "GN_ports/UpperTesterPort_GN.hh" + #include "BTP_ports/UpperTesterPort_BTP.hh" + #include "CAM_ports/UpperTesterPort_CAM.hh" +#endif + +#ifdef AtsDENM + #include "GN_ports/UpperTesterPort_GN.hh" + #include "BTP_ports/UpperTesterPort_BTP.hh" + #include "DENM_ports/UpperTesterPort_DENM.hh" +#endif + +#ifdef AtsSecurity + #include "GN_ports/UpperTesterPort_GN.hh" + #include "BTP_ports/UpperTesterPort_BTP.hh" + #include "CAM_ports/UpperTesterPort_CAM.hh" + #include "DENM_ports/UpperTesterPort_DENM.hh" +#endif + +#ifdef AtsPki + #include "GN_ports/UpperTesterPort_GN.hh" +#ifndef LibItsGeoNetworking__TestSystem_HH + #include "Pki_ports/UpperTesterPkiPort.hh" +#endif +// #include "BTP_ports/UpperTesterPort_BTP.hh" +// #include "CAM_ports/UpperTesterPort_CAM.hh" +#endif + +#ifdef AtsSremSsem + #include "GN_ports/UpperTesterPort_GN.hh" + #include "BTP_ports/UpperTesterPort_BTP.hh" + #include "SremSsem_ports/UpperTesterPort_SremSsem.hh" +#endif + +#ifdef AtsIVIM + #include "GN_ports/UpperTesterPort_GN.hh" + #include "BTP_ports/UpperTesterPort_BTP.hh" + #include "IVIM_ports/UpperTesterPort_IVIM.hh" +#endif + +#ifdef AtsMapemSpatem + #include "GN_ports/UpperTesterPort_GN.hh" + #include "BTP_ports/UpperTesterPort_BTP.hh" + #include "MapemSpatem_ports/UpperTesterPort_MapemSpatem.hh" +#endif + +#ifdef AtsRtcmem + #include "GN_ports/UpperTesterPort_GN.hh" + #include "BTP_ports/UpperTesterPort_BTP.hh" + #include "Rtcmem_ports/UpperTesterPort_Rtcmem.hh" +#endif + +#ifdef AtsRSUsSimulator // This is not an Abstract Test Suit, but an helper tool to simulate basic RSU/OBU functionalities + #include "GN_ports/UpperTesterPort_GN.hh" + #include "BTP_ports/UpperTesterPort_BTP.hh" + #include "CAM_ports/UpperTesterPort_CAM.hh" + #include "DENM_ports/UpperTesterPort_DENM.hh" + #include "IVIM_ports/UpperTesterPort_IVIM.hh" + #include "MapemSpatem_ports/UpperTesterPort_MapemSpatem.hh" + #include "SremSsem_ports/UpperTesterPort_SremSsem.hh" + #include "Rtcmem_ports/UpperTesterPort_Rtcmem.hh" +#endif #else //_NO_SOFTLINKS_ -#include "UpperTesterPort_BTP.partH" -#include "UpperTesterPort_CAM.partH" -#include "UpperTesterPort_DENM.partH" -#include "UpperTesterPort_IVIM.partH" -#include "UpperTesterPort_MapemSpatem.partH" -#include "UpperTesterPort_SremSsem.partH" -#include "UpperTesterPort_GN.partH" -#include "UpperTesterPort_Rtcmem.partH" -//#include "UpperTesterPort_Pki.partH" -/* -#include "UpperTesterPort_IVIM.partH" -//#include "UpperTesterPort_MapSpat.partH" -#include "UpperTesterPort_MapemSpatem.partH" -#include "UpperTesterPort_SremSsem.partH" -#include "UpperTesterPort_Evcsn.partH" -//#include "UpperTesterPort_V2G.partH" -*/ +#ifdef AtsGeoNetworking + #include "UpperTesterPort_GN.hh" +#endif + +#ifdef AtsBTP + #include "UpperTesterPort_GN.hh" + #include "UpperTesterPort_BTP.hh" +#endif + +#ifdef AtsCAM + #include "UpperTesterPort_GN.hh" + #include "UpperTesterPort_BTP.hh" + #include "UpperTesterPort_CAM.hh" +#endif + +#ifdef AtsDENM + #include "UpperTesterPort_GN.hh" + #include "UpperTesterPort_BTP.hh" + #include "UpperTesterPort_DENM.hh" +#endif + +#ifdef AtsSecurity + #include "UpperTesterPort_GN.hh" + #include "UpperTesterPort_BTP.hh" + #include "UpperTesterPort_CAM.hh" + #include "UpperTesterPort_DENM.hh" +#endif + +#ifdef AtsPki + #include "UpperTesterPort_GN.hh" + #include "UpperTesterPort_BTP.hh" + #include "UpperTesterPort_CAM.hh" + #include "UpperTesterPort_DENM.hh" +#endif + +#ifdef AtsIVIM + #include "UpperTesterPort_GN.hh" + #include "UpperTesterPort_BTP.hh" + #include "UpperTesterPort_IVIM.hh" +#endif + +#ifdef AtsMapemSpatem + #include "UpperTesterPort_GN.hh" + #include "UpperTesterPort_BTP.hh" + #include "UpperTesterPort_MapemSpatem.hh" +#endif + +#ifdef AtsSremSsem + #include "UpperTesterPort_GN.hh" + #include "UpperTesterPort_BTP.hh" + #include "UpperTesterPort_SremSsem.hh" +#endif + +#ifdef AtsRtcmem + #include "UpperTesterPort_GN.hh" + #include "UpperTesterPort_BTP.hh" + #include "UpperTesterPort_Rtcmem.hh" +#endif + +#ifdef AtsRSUsSimulator // This is not an Abstract Test Suit, but an helper tool to simulate basic RSU/OBU functionalities + #include "UpperTesterPort_GN.hh" + #include "UpperTesterPort_BTP.hh" + #include "UpperTesterPort_CAM.hh" + #include "UpperTesterPort_DENM.hh" + #include "UpperTesterPort_IVIM.hh" + #include "UpperTesterPort_MapemSpatem.hh" + #include "UpperTesterPort_SremSsem.hh" + #include "UpperTesterPort_Rtcmem.hh" +#endif + #endif//_NO_SOFTLINKS_ #endif diff --git a/ccsrc/Ports/LibIts_ports/V2G_ports/AdapterControlPort_V2G.partC b/ccsrc/Ports/LibIts_ports/V2G_ports/AdapterControlPort_V2G.cc similarity index 96% rename from ccsrc/Ports/LibIts_ports/V2G_ports/AdapterControlPort_V2G.partC rename to ccsrc/Ports/LibIts_ports/V2G_ports/AdapterControlPort_V2G.cc index 253b90b4730a9957de2d5827665b91acef1f1241..ed94475eff0070f7e463f6ca692c1b32039a31e2 100644 --- a/ccsrc/Ports/LibIts_ports/V2G_ports/AdapterControlPort_V2G.partC +++ b/ccsrc/Ports/LibIts_ports/V2G_ports/AdapterControlPort_V2G.cc @@ -1,4 +1,5 @@ //============================================================================= +#include "AdapterControlPort_V2G.hh" namespace LibItsV2G__TestSystem { AdapterControlPort::AdapterControlPort(const char *par_port_name) diff --git a/ccsrc/Ports/LibIts_ports/V2G_ports/AdapterControlPort_V2G.partH b/ccsrc/Ports/LibIts_ports/V2G_ports/AdapterControlPort_V2G.hh similarity index 92% rename from ccsrc/Ports/LibIts_ports/V2G_ports/AdapterControlPort_V2G.partH rename to ccsrc/Ports/LibIts_ports/V2G_ports/AdapterControlPort_V2G.hh index 09fa126963d4105893242b4f9b9160d209557c97..787c87e5da0be6d4949e57cfcdb1eedfd0f46f39 100644 --- a/ccsrc/Ports/LibIts_ports/V2G_ports/AdapterControlPort_V2G.partH +++ b/ccsrc/Ports/LibIts_ports/V2G_ports/AdapterControlPort_V2G.hh @@ -1,4 +1,7 @@ //============================================================================= +#ifndef AdapterControlPort_V2G_HH +#define AdapterControlPort_V2G_HH + #include "LibItsV2G_TestSystem.hh" namespace LibItsV2G__TestSystem { @@ -28,3 +31,4 @@ protected: }; } /* end of namespace */ +#endif diff --git a/ccsrc/Ports/LibIts_ports/V2G_ports/UpperTesterPort_V2G.partC b/ccsrc/Ports/LibIts_ports/V2G_ports/UpperTesterPort_V2G.cc similarity index 97% rename from ccsrc/Ports/LibIts_ports/V2G_ports/UpperTesterPort_V2G.partC rename to ccsrc/Ports/LibIts_ports/V2G_ports/UpperTesterPort_V2G.cc index 5968bbc277c7e8be3a6e80e7dc10aab75c5ce97f..d7a09144b873129785e12707c10388f677b15ae2 100644 --- a/ccsrc/Ports/LibIts_ports/V2G_ports/UpperTesterPort_V2G.partC +++ b/ccsrc/Ports/LibIts_ports/V2G_ports/UpperTesterPort_V2G.cc @@ -1,4 +1,5 @@ //============================================================================= +#include "UpperTesterPort_V2G.hh" namespace LibItsV2G__TestSystem { UpperTesterPort::UpperTesterPort(const char *par_port_name) diff --git a/ccsrc/Ports/LibIts_ports/V2G_ports/UpperTesterPort_V2G.partH b/ccsrc/Ports/LibIts_ports/V2G_ports/UpperTesterPort_V2G.hh similarity index 93% rename from ccsrc/Ports/LibIts_ports/V2G_ports/UpperTesterPort_V2G.partH rename to ccsrc/Ports/LibIts_ports/V2G_ports/UpperTesterPort_V2G.hh index 0ceb2167c1ff58bf03c992ef56a9df77ac173402..8d52be3c154e01b36c12db9e0353ddb5d30a0418 100644 --- a/ccsrc/Ports/LibIts_ports/V2G_ports/UpperTesterPort_V2G.partH +++ b/ccsrc/Ports/LibIts_ports/V2G_ports/UpperTesterPort_V2G.hh @@ -1,4 +1,7 @@ //============================================================================= +#ifndef UpperTesterPort_V2G_HH +#define UpperTesterPort_V2G_HH + #include "LibItsV2G_TestSystem.hh" namespace LibItsV2G__TestSystem { @@ -33,3 +36,5 @@ protected: } /* end of namespace */ + +#endif diff --git a/ccsrc/Ports/LibIts_ports/module.mk b/ccsrc/Ports/LibIts_ports/module.mk new file mode 100644 index 0000000000000000000000000000000000000000..bff5c86df1ddc7e0ead6de89633e69f84ee82674 --- /dev/null +++ b/ccsrc/Ports/LibIts_ports/module.mk @@ -0,0 +1 @@ +includes := . \ No newline at end of file diff --git a/ccsrc/Protocols/BTP/module.mk b/ccsrc/Protocols/BTP/module.mk new file mode 100644 index 0000000000000000000000000000000000000000..b2a669340d7a9fe1e81403f50b5ab465d1df9085 --- /dev/null +++ b/ccsrc/Protocols/BTP/module.mk @@ -0,0 +1,2 @@ +sources := btp_codec.cc btp_layer.cc +includes := . \ No newline at end of file diff --git a/ccsrc/Protocols/CAM/module.mk b/ccsrc/Protocols/CAM/module.mk new file mode 100644 index 0000000000000000000000000000000000000000..0a2ec4c64d3fbef547a4dc66cbe8b980615cba3f --- /dev/null +++ b/ccsrc/Protocols/CAM/module.mk @@ -0,0 +1,2 @@ +sources := cam_codec.cc cam_layer.cc cam_pdu_codec.cc +includes := . \ No newline at end of file diff --git a/ccsrc/Protocols/Commsignia/module.mk b/ccsrc/Protocols/Commsignia/module.mk new file mode 100644 index 0000000000000000000000000000000000000000..2aa25d8e524d3f8a5acdb746015f91b0c2fb8e34 --- /dev/null +++ b/ccsrc/Protocols/Commsignia/module.mk @@ -0,0 +1,3 @@ +sources := commsignia_layer.cc +includes := . + diff --git a/ccsrc/Protocols/DENM/module.mk b/ccsrc/Protocols/DENM/module.mk new file mode 100644 index 0000000000000000000000000000000000000000..b33d283ff2ef7f93c8b330045d91f76ecb37c1b5 --- /dev/null +++ b/ccsrc/Protocols/DENM/module.mk @@ -0,0 +1,4 @@ +sources := denm_codec.cc denm_layer.cc denm_pdu_codec.cc + +includes := . + diff --git a/ccsrc/Protocols/ETH/module.mk b/ccsrc/Protocols/ETH/module.mk new file mode 100644 index 0000000000000000000000000000000000000000..e81733a3181d060340ef98168c6c0ff6f2d77755 --- /dev/null +++ b/ccsrc/Protocols/ETH/module.mk @@ -0,0 +1,3 @@ +sources := ethernet_layer.cc +includes := . + diff --git a/ccsrc/Protocols/GeoNetworking/module.mk b/ccsrc/Protocols/GeoNetworking/module.mk new file mode 100644 index 0000000000000000000000000000000000000000..889d69c296fc478f7529507208dfc609653e33f5 --- /dev/null +++ b/ccsrc/Protocols/GeoNetworking/module.mk @@ -0,0 +1,3 @@ +sources := geonetworking_codec.cc geonetworking_layer.cc location_table.cc +includes := . + diff --git a/ccsrc/Protocols/Http/module.mk b/ccsrc/Protocols/Http/module.mk new file mode 100644 index 0000000000000000000000000000000000000000..12304eb0fb337dcd2ae01a6ec3c4c0b0de9483e9 --- /dev/null +++ b/ccsrc/Protocols/Http/module.mk @@ -0,0 +1,3 @@ +sources := http_codec.cc http_layer.cc +includes := . + diff --git a/ccsrc/Protocols/IVIM/module.mk b/ccsrc/Protocols/IVIM/module.mk new file mode 100644 index 0000000000000000000000000000000000000000..625c70ea20fba44ca73161c4ed957f62c81fc241 --- /dev/null +++ b/ccsrc/Protocols/IVIM/module.mk @@ -0,0 +1,3 @@ +sources := ivim_codec.cc ivim_layer.cc ivim_pdu_codec.cc +includes := . + diff --git a/ccsrc/Protocols/MapemSpatem/module.mk b/ccsrc/Protocols/MapemSpatem/module.mk new file mode 100644 index 0000000000000000000000000000000000000000..3efd2de129ce7098210822b6c63c13e4c3097b8d --- /dev/null +++ b/ccsrc/Protocols/MapemSpatem/module.mk @@ -0,0 +1,3 @@ +sources := mapem_codec.cc mapem_pdu_codec.cc mapem_spatem_layer.cc spatem_codec.cc spatem_pdu_codec.cc +includes := . + diff --git a/ccsrc/Protocols/Pcap/module.mk b/ccsrc/Protocols/Pcap/module.mk new file mode 100644 index 0000000000000000000000000000000000000000..0f6495fd1f97d7dc021967cfb0ba521696060c50 --- /dev/null +++ b/ccsrc/Protocols/Pcap/module.mk @@ -0,0 +1,3 @@ +sources := pcap_cygwin_layer.cc pcap_layer.cc pcap_linux_layer.cc pcap_offline_layer.cc +includes := . + diff --git a/ccsrc/Protocols/Qualcomm/module.mk b/ccsrc/Protocols/Qualcomm/module.mk new file mode 100644 index 0000000000000000000000000000000000000000..c2fcfbe7067c92e20f91026156e51358dabd1555 --- /dev/null +++ b/ccsrc/Protocols/Qualcomm/module.mk @@ -0,0 +1,3 @@ +sources := qualcomm_layer.cc +includes := . + diff --git a/ccsrc/Protocols/RawSocket/module.mk b/ccsrc/Protocols/RawSocket/module.mk new file mode 100644 index 0000000000000000000000000000000000000000..b8dee6571bcf786732058c20585f5580807fab65 --- /dev/null +++ b/ccsrc/Protocols/RawSocket/module.mk @@ -0,0 +1,3 @@ +sources := raw_socket_layer.cc +includes := . + diff --git a/ccsrc/Protocols/Rtcmem/module.mk b/ccsrc/Protocols/Rtcmem/module.mk new file mode 100644 index 0000000000000000000000000000000000000000..a934c165fa3baac54fbbc4a0c022f157516efb0b --- /dev/null +++ b/ccsrc/Protocols/Rtcmem/module.mk @@ -0,0 +1,3 @@ +sources := RtcmemCodec.cc RtcmemLayer.cc +includes := . + diff --git a/ccsrc/Protocols/Security/module.mk b/ccsrc/Protocols/Security/module.mk new file mode 100644 index 0000000000000000000000000000000000000000..6f7311f54800ad95114d9bfcbd38b269d6ee8a2d --- /dev/null +++ b/ccsrc/Protocols/Security/module.mk @@ -0,0 +1,36 @@ +sources := certificates_loader.cc \ + etsi_ts102941_base_types_public_keys.cc \ + etsi_ts102941_data_codec.cc \ + etsi_ts102941_data_content_codec.cc \ + etsi_ts102941_types_authorization_inner_request.cc \ + etsi_ts102941_types_authorization_inner_response.cc \ + etsi_ts102941_types_authorization_shared_at_request.cc \ + etsi_ts102941_types_authorization_validation_request.cc \ + etsi_ts102941_types_authorization_validation_response.cc \ + etsi_ts102941_types_enrolment_inner_request.cc \ + etsi_ts102941_types_enrolment_inner_response.cc \ + etsi_ts103097_certificate_codec.cc \ + etsi_ts103097_data_codec.cc \ + etsi_ts103097_tobesigned_certificate_codec.cc \ + etsi_ts103097_tobesigned_data_codec.cc \ + hmac.cc \ + ieee_1609dot2_base_types_public_encryption_key.cc \ + ieee_1609dot2_base_types_public_verification_key.cc \ + security_cache.cc \ + security_db.cc \ + security_db_record.cc \ + security_ecc.cc \ + security_services.cc \ + sha256.cc \ + sha384.cc + +ifeq (AtsPki, $(ATS)) +sources += http_etsi_ieee1609dot2_codec.cc +endif + +ifeq (AtsRSUsSimulator, $(ATS)) +sources += http_etsi_ieee1609dot2_codec.cc +endif + +includes := . + diff --git a/ccsrc/Protocols/Security/security_ecc.cc b/ccsrc/Protocols/Security/security_ecc.cc index e7eb5e836f8cabda437e8cb582a2dbac413b5300..c2fa2afe9190385f777489690c63a24c3a286236 100644 --- a/ccsrc/Protocols/Security/security_ecc.cc +++ b/ccsrc/Protocols/Security/security_ecc.cc @@ -20,6 +20,15 @@ #include "loggers.hh" +#if OPENSSL_VERSION_NUMBER >= 0x10101000L +#define EC_POINT_get_affine_coordinates_GFp EC_POINT_get_affine_coordinates +#define EC_POINT_get_affine_coordinates_GF2m EC_POINT_get_affine_coordinates +#define EC_POINT_set_affine_coordinates_GFp EC_POINT_set_affine_coordinates +#define EC_POINT_set_affine_coordinates_GF2m EC_POINT_set_affine_coordinates +#define EC_POINT_set_compressed_coordinates_GFp EC_POINT_set_compressed_coordinates +#define EC_POINT_set_compressed_coordinates_GF2m EC_POINT_set_compressed_coordinates +#endif + security_ecc::security_ecc(const ec_elliptic_curves p_elliptic_curve): _elliptic_curve(p_elliptic_curve), _encryption_algotithm(encryption_algotithm::aes_128_ccm), _ec_key(nullptr), _ec_group(nullptr), _bn_ctx(nullptr), _pri_key(), _pub_key_x(), _pub_key_y(), _pub_key_compressed(), _pub_key_compressed_mode{ecc_compressed_mode::compressed_y_0}, _secret_key(), _enc_key_x(), _enc_key_y(), _sym_key(), _nonce(), _tag() { loggers::get_instance().log(">>> security_ecc::security_ecc: %d", static_cast(p_elliptic_curve)); diff --git a/ccsrc/Protocols/SremSsem/module.mk b/ccsrc/Protocols/SremSsem/module.mk new file mode 100644 index 0000000000000000000000000000000000000000..b43f0e026e1ca4fe2a00c8b2756013cf1c26ad74 --- /dev/null +++ b/ccsrc/Protocols/SremSsem/module.mk @@ -0,0 +1,3 @@ +sources := SremCodec.cc SremSsemLayer.cc SsemCodec.cc +includes := . + diff --git a/ccsrc/Protocols/Tcp/module.mk b/ccsrc/Protocols/Tcp/module.mk new file mode 100644 index 0000000000000000000000000000000000000000..0b8478fdc5709b858cd7d36b73918af4f49fb849 --- /dev/null +++ b/ccsrc/Protocols/Tcp/module.mk @@ -0,0 +1,3 @@ +sources := tcp_layer.cc +includes := . + diff --git a/ccsrc/Protocols/UDP/module.mk b/ccsrc/Protocols/UDP/module.mk new file mode 100644 index 0000000000000000000000000000000000000000..b57564e5efa1cefe985a012f2f1e79c856132650 --- /dev/null +++ b/ccsrc/Protocols/UDP/module.mk @@ -0,0 +1,4 @@ +#sources := udp_layer.cc udp_pcap_layer.cc +sources := udp_layer.cc +includes := . + diff --git a/ccsrc/Protocols/UpperTester/UpperTesterRtcmemCodec.cc b/ccsrc/Protocols/UpperTester/UpperTesterRtcmemCodec.cc index 6b1882e876715ec166aa28ddd33552abd632953e..e40bc2a255fa8d1d2d1b13edd289a10358785041 100644 --- a/ccsrc/Protocols/UpperTester/UpperTesterRtcmemCodec.cc +++ b/ccsrc/Protocols/UpperTester/UpperTesterRtcmemCodec.cc @@ -4,10 +4,7 @@ #include "UpperTesterRtcmemCodec.hh" #include "loggers.hh" -#include "uppertester_types.hh" - #include "RtcmemCodec.hh" -#include "SsemCodec.hh" template class OPTIONAL; class TTCN_EncDec; diff --git a/ccsrc/Protocols/UpperTester/UpperTesterRtcmemLayer.cc b/ccsrc/Protocols/UpperTester/UpperTesterRtcmemLayer.cc index f458d4a4772475090350be871809332502191eff..8552fa2cfb838265b82132e760fdbac4c84da43f 100644 --- a/ccsrc/Protocols/UpperTester/UpperTesterRtcmemLayer.cc +++ b/ccsrc/Protocols/UpperTester/UpperTesterRtcmemLayer.cc @@ -1,6 +1,7 @@ #include "UpperTesterRtcmemFactory.hh" -#include "uppertester_types.hh" +#include "LibItsRtcmem_TypesAndValues.hh" +#include "LibItsRtcmem_TestSystem.hh" #include "loggers.hh" diff --git a/ccsrc/Protocols/UpperTester/UpperTesterSremSsemCodec.cc b/ccsrc/Protocols/UpperTester/UpperTesterSremSsemCodec.cc index 8b1790955bc8a51a6c73071b46b35526422defc4..c2a8a24e10b73530f1f68da0fd603e2b836e0316 100644 --- a/ccsrc/Protocols/UpperTester/UpperTesterSremSsemCodec.cc +++ b/ccsrc/Protocols/UpperTester/UpperTesterSremSsemCodec.cc @@ -4,7 +4,8 @@ #include "UpperTesterSremSsemCodec.hh" #include "loggers.hh" -#include "uppertester_types.hh" +#include "LibItsSremSsem_TypesAndValues.hh" +#include "LibItsSremSsem_TestSystem.hh" #include "SremCodec.hh" #include "SsemCodec.hh" diff --git a/ccsrc/Protocols/UpperTester/UpperTesterSremSsemLayer.cc b/ccsrc/Protocols/UpperTester/UpperTesterSremSsemLayer.cc index 73e49fe3a44f6674f1ca2482d42f928825049bcb..c4ef84f33a7a489a6257b14d7939a1b24a76e908 100644 --- a/ccsrc/Protocols/UpperTester/UpperTesterSremSsemLayer.cc +++ b/ccsrc/Protocols/UpperTester/UpperTesterSremSsemLayer.cc @@ -1,6 +1,7 @@ #include "UpperTesterSremSsemFactory.hh" -#include "uppertester_types.hh" +#include "LibItsSremSsem_TypesAndValues.hh" +#include "LibItsSremSsem_TestSystem.hh" #include "loggers.hh" diff --git a/ccsrc/Protocols/UpperTester/module.mk b/ccsrc/Protocols/UpperTester/module.mk new file mode 100644 index 0000000000000000000000000000000000000000..f52860a322c3b0091c9bd554395f7c86c57e681e --- /dev/null +++ b/ccsrc/Protocols/UpperTester/module.mk @@ -0,0 +1,49 @@ +#to be added globally +sources += uppertester_geonetworking_codec.cc uppertester_geonetworking_layer.cc + +ifeq (AtsCAM, $(ATS)) +sources += uppertester_cam_codec.cc uppertester_cam_layer.cc +endif +#ifeq (AtsGeoNetworking, $(ATS)) +#sources += uppertester_geonetworking_codec.cc uppertester_geonetworking_layer.cc +#endif +ifeq (AtsIVIM, $(ATS)) +sources += uppertester_ivim_codec.cc uppertester_ivim_layer.cc +endif +ifeq (AtsMapemSpatem, $(ATS)) +sources += uppertester_mapem_spatem_codec.cc uppertester_mapem_spatem_layer.cc +endif +ifeq (AtsPki, $(ATS)) +sources += uppertester_pki_codec.cc uppertester_pki_layer.cc +endif +ifeq (AtsSremSsem, $(ATS)) +sources += UpperTesterSremSsemCodec.cc UpperTesterSremSsemLayer.cc +endif +ifeq (AtsRtcmem, $(ATS)) +sources += UpperTesterRtcmemCodec.cc UpperTesterRtcmemLayer.cc +endif +ifeq (AtsDENM, $(ATS)) +sources += uppertester_denm_codec.cc uppertester_denm_layer.cc +endif + +ifeq (AtsSecurity, $(ATS)) +sources += uppertester_cam_codec.cc uppertester_cam_layer.cc \ + uppertester_denm_codec.cc uppertester_denm_layer.cc \ + +endif + +ifeq (AtsRSUsSimulator, $(ATS)) +sources += uppertester_cam_codec.cc uppertester_cam_layer.cc \ + uppertester_denm_codec.cc uppertester_denm_layer.cc \ + uppertester_ivim_codec.cc uppertester_ivim_layer.cc \ + UpperTesterSremSsemCodec.cc UpperTesterSremSsemLayer.cc \ + uppertester_mapem_spatem_codec.cc uppertester_mapem_spatem_layer.cc \ + UpperTesterRtcmemCodec.cc UpperTesterRtcmemLayer.cc \ + uppertester_pki_codec.cc uppertester_pki_layer.cc \ + +endif + + +includes := . + +modules += ../UDP diff --git a/ccsrc/Protocols/UpperTester/uppertester_cam_codec.cc b/ccsrc/Protocols/UpperTester/uppertester_cam_codec.cc index 8b5f88c0561b4cf5bb07ba56211b2ae4c15d9bef..588c52aafad3b54c5e12bfcbe69560a8c12806fa 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_cam_codec.cc +++ b/ccsrc/Protocols/UpperTester/uppertester_cam_codec.cc @@ -4,7 +4,8 @@ #include "uppertester_cam_codec.hh" #include "loggers.hh" -#include "uppertester_types.hh" +#include "LibItsCam_TypesAndValues.hh" +#include "LibItsCam_TestSystem.hh" #include "cam_codec.hh" diff --git a/ccsrc/Protocols/UpperTester/uppertester_cam_layer.cc b/ccsrc/Protocols/UpperTester/uppertester_cam_layer.cc index 41c81508843f87f4daa697f3673d05e5e6b66a38..3fba152b7e1614c73acfb4e1b65f74f8df1804f5 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_cam_layer.cc +++ b/ccsrc/Protocols/UpperTester/uppertester_cam_layer.cc @@ -1,6 +1,7 @@ #include "uppertester_cam_layer_factory.hh" -#include "uppertester_types.hh" +#include "LibItsCam_TypesAndValues.hh" +#include "LibItsCam_TestSystem.hh" #include "loggers.hh" diff --git a/ccsrc/Protocols/UpperTester/uppertester_denm_codec.cc b/ccsrc/Protocols/UpperTester/uppertester_denm_codec.cc index 134ad4d4b1d8484a29792fb34d2cd30f15150b5e..f6afe32a38c4fc34d1632e94465a5ded77b0b3b0 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_denm_codec.cc +++ b/ccsrc/Protocols/UpperTester/uppertester_denm_codec.cc @@ -4,7 +4,8 @@ #include "uppertester_denm_codec.hh" #include "loggers.hh" -#include "uppertester_types.hh" +#include "LibItsDenm_TypesAndValues.hh" +#include "LibItsDenm_TestSystem.hh" #include "denm_codec.hh" diff --git a/ccsrc/Protocols/UpperTester/uppertester_denm_layer.cc b/ccsrc/Protocols/UpperTester/uppertester_denm_layer.cc index f9dab3ce648e1d8a2a02350532e62860bd25d428..bf0226c3ebae1826515534c9f90147b599b99606 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_denm_layer.cc +++ b/ccsrc/Protocols/UpperTester/uppertester_denm_layer.cc @@ -1,6 +1,7 @@ #include "uppertester_denm_layer_factory.hh" -#include "uppertester_types.hh" +#include "LibItsDenm_TypesAndValues.hh" +#include "LibItsDenm_TestSystem.hh" #include "loggers.hh" diff --git a/ccsrc/Protocols/UpperTester/uppertester_geonetworking_codec.cc b/ccsrc/Protocols/UpperTester/uppertester_geonetworking_codec.cc index 75762fd25b3ddf19bd76aa9aeee1074d324988ba..4af49b64466baee296f7738c816594320667948c 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_geonetworking_codec.cc +++ b/ccsrc/Protocols/UpperTester/uppertester_geonetworking_codec.cc @@ -4,7 +4,8 @@ #include "uppertester_geonetworking_codec.hh" #include "loggers.hh" -#include "uppertester_types.hh" +#include "LibItsGeoNetworking_TypesAndValues.hh" +#include "LibItsGeoNetworking_TestSystem.hh" template class OPTIONAL; class TTCN_EncDec; diff --git a/ccsrc/Protocols/UpperTester/uppertester_geonetworking_layer.cc b/ccsrc/Protocols/UpperTester/uppertester_geonetworking_layer.cc index 29d5739be3d398caecb5f2bff53ad82504d723bc..2e829dbbd941b44ffac2450a7bbe6b74928b4f86 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_geonetworking_layer.cc +++ b/ccsrc/Protocols/UpperTester/uppertester_geonetworking_layer.cc @@ -1,6 +1,7 @@ #include "uppertester_geonetworking_factory.hh" -#include "uppertester_types.hh" +#include "LibItsGeoNetworking_TypesAndValues.hh" +#include "LibItsGeoNetworking_TestSystem.hh" #include "loggers.hh" diff --git a/ccsrc/Protocols/UpperTester/uppertester_ivim_codec.cc b/ccsrc/Protocols/UpperTester/uppertester_ivim_codec.cc index 2f66e1d550542e0dd020271933eedca75cc6fa96..3f2ec7676562b4ec6d21846365eafef7465edfe6 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_ivim_codec.cc +++ b/ccsrc/Protocols/UpperTester/uppertester_ivim_codec.cc @@ -4,7 +4,8 @@ #include "uppertester_ivim_codec.hh" #include "loggers.hh" -#include "uppertester_types.hh" +#include "LibItsIvim_TypesAndValues.hh" +#include "LibItsIvim_TestSystem.hh" #include "ivim_codec.hh" diff --git a/ccsrc/Protocols/UpperTester/uppertester_ivim_layer.cc b/ccsrc/Protocols/UpperTester/uppertester_ivim_layer.cc index 7c61aed61f44dfc011e7a659163899b2b92cce6b..bdfaa3a02a98c1f72d77d64edb1f167c5a2296b2 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_ivim_layer.cc +++ b/ccsrc/Protocols/UpperTester/uppertester_ivim_layer.cc @@ -1,6 +1,7 @@ #include "uppertester_ivim_factory.hh" -#include "uppertester_types.hh" +#include "LibItsIvim_TypesAndValues.hh" +#include "LibItsIvim_TestSystem.hh" #include "loggers.hh" diff --git a/ccsrc/Protocols/UpperTester/uppertester_mapem_spatem_codec.cc b/ccsrc/Protocols/UpperTester/uppertester_mapem_spatem_codec.cc index ecaa1ffaea01cc3393195f9128bfad6fd2cc7b50..4038a9600d29543f2d36c8392bafb42fcb3d106f 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_mapem_spatem_codec.cc +++ b/ccsrc/Protocols/UpperTester/uppertester_mapem_spatem_codec.cc @@ -4,7 +4,8 @@ #include "uppertester_mapem_spatem_codec.hh" #include "loggers.hh" -#include "uppertester_types.hh" +#include "LibItsMapemSpatem_TypesAndValues.hh" +#include "LibItsMapemSpatem_TestSystem.hh" #include "mapem_codec.hh" #include "spatem_codec.hh" diff --git a/ccsrc/Protocols/UpperTester/uppertester_mapem_spatem_layer.cc b/ccsrc/Protocols/UpperTester/uppertester_mapem_spatem_layer.cc index 7e6da9ed87aa75a148741d4c7da5f323bc18cd92..9e6f8f4adb49b2a673a67956f8e708276352298c 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_mapem_spatem_layer.cc +++ b/ccsrc/Protocols/UpperTester/uppertester_mapem_spatem_layer.cc @@ -1,6 +1,7 @@ #include "uppertester_mapem_spatem_factory.hh" -#include "uppertester_types.hh" +#include "LibItsMapemSpatem_TypesAndValues.hh" +#include "LibItsMapemSpatem_TestSystem.hh" #include "loggers.hh" diff --git a/ccsrc/Protocols/UpperTester/uppertester_pki_codec.cc b/ccsrc/Protocols/UpperTester/uppertester_pki_codec.cc index 44223f60a188bc80c4e65e0bbb966fdbb4cbf90b..d0dab4415c42386f78a498b05dfa67b3987a2467 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_pki_codec.cc +++ b/ccsrc/Protocols/UpperTester/uppertester_pki_codec.cc @@ -4,7 +4,8 @@ #include "uppertester_pki_codec.hh" #include "loggers.hh" -#include "uppertester_types.hh" +#include "LibItsPki_TypesAndValues.hh" +#include "LibItsPki_TestSystem.hh" //#include "pki_codec.hh" diff --git a/ccsrc/Protocols/UpperTester/uppertester_pki_layer.cc b/ccsrc/Protocols/UpperTester/uppertester_pki_layer.cc index ab207763dbf9c64340f75f3b5e3df37e3d20cc2e..e32e40d486b10f631b25209dcb7220b33056efea 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_pki_layer.cc +++ b/ccsrc/Protocols/UpperTester/uppertester_pki_layer.cc @@ -1,6 +1,7 @@ #include "uppertester_pki_layer_factory.hh" -#include "uppertester_types.hh" +#include "LibItsPki_TypesAndValues.hh" +#include "LibItsPki_TestSystem.hh" #include "loggers.hh" diff --git a/ccsrc/Protocols/UpperTester/uppertester_types.hh b/ccsrc/Protocols/UpperTester/uppertester_types.hh deleted file mode 100644 index 08bc8f6bcee5874abdffbdcc85502dd4cad7fb05..0000000000000000000000000000000000000000 --- a/ccsrc/Protocols/UpperTester/uppertester_types.hh +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef UpperTesterTYPES_H -#define UpperTesterTYPES_H - -using namespace std; // Required for isnan() -#include "LibItsGeoNetworking_TypesAndValues.hh" -#include "LibItsGeoNetworking_TestSystem.hh" - -#include "LibItsDenm_TypesAndValues.hh" -#include "LibItsDenm_TestSystem.hh" - -#include "LibItsCam_TypesAndValues.hh" -#include "LibItsCam_TestSystem.hh" - -#include "LibItsIvim_TypesAndValues.hh" -#include "LibItsIvim_TestSystem.hh" - -#include "LibItsMapemSpatem_TypesAndValues.hh" -#include "LibItsMapemSpatem_TestSystem.hh" - -#include "LibItsSremSsem_TypesAndValues.hh" -#include "LibItsSremSsem_TestSystem.hh" - -#include "LibItsRtcmem_TypesAndValues.hh" -#include "LibItsRtcmem_TestSystem.hh" - -#include "LibItsPki_TypesAndValues.hh" -#include "LibItsPki_TestSystem.hh" - -#endif diff --git a/ccsrc/geospacial/geospacial.cc b/ccsrc/geospacial/geospacial.cc new file mode 100644 index 0000000000000000000000000000000000000000..f7043b210c22b0bd659927a83b807df5d8272628 --- /dev/null +++ b/ccsrc/geospacial/geospacial.cc @@ -0,0 +1,200 @@ +#include "geospacial.hh" + +coordinates::coordinates() { + latitude = .0; + longitude = .0; + altitude = .0; +} + +coordinates::coordinates(const double p_latitude, const double p_longitude, const double p_altitude) { + latitude = p_latitude; + longitude = p_longitude; + altitude = p_altitude; +} + +const bool coordinates::is_valid_coordinates() const { + if (latitude > -90.0L && latitude < 90.L && longitude > -180.0L && longitude < 180L) { + return true; + } else if (latitude > -HALFPI && latitude < HALFPI && longitude > -PI && longitude < PI) { + return true; + } + return false; +} + +const double coordinates::distance_less_than_1km(const coordinates& p) const { // this position has origin + double a = HALFPI - latitude; + double b = HALFPI - p.latitude; + double c = sqrt(a * a + b * b - 2 * a * b * cos(p.longitude - longitude)); + return (double)(R * c); +} + +const double coordinates::distance(const coordinates& p) const { // this position has origin + double dlon = p.longitude - longitude; + double dlat = p.latitude - latitude; + double s1 = sin(dlat / 2); + double s2 = sin(dlon /2 ); + double a = (s1 * s1) + cos(latitude) * cos(p.latitude) * (s2 * s2); + double c = 2 * asin(std::min((double)1.0L, sqrt(a))); + return (double)(R * c); +} + +point::point() { + x = .0; + y = .0; + z = .0; +} + +point::point(const double p_x, const double p_y, const double p_z) { + x = p_x; + y = p_y; + z = p_z; +} + +int geospacial::load_countries_map(const std::string& p_file) { + std::ifstream ifs; + ifs.open(p_file); + if (ifs.fail()) { + ifs.close(); + return -1; + } + + Json::CharReaderBuilder builder; + builder["collectComments"] = true; + JSONCPP_STRING errs; + Json::Value root; + if (!parseFromStream(builder, ifs, &root, &errs)) { + std::cerr << errs << std::endl; + ifs.close(); + return -1; + } + // Get the value of the member of root named 'encoding', return a 'null' value if there is no such member. + const Json::Value plugins = root["features"]; + for (Json::Value::const_iterator it = plugins.begin() ; it != plugins.end() ; it++ ) { + const Json::Value v = *it; + Json::Value::Members m = v.getMemberNames(); + std::string key; + std::vector coord; + for (std::vector::const_iterator i = m.cbegin(); i != m.cend(); ++i) { + if (std::string(*i).compare("properties") == 0) { + key = process_properties(v[*i]); + } else if (std::string(*i).compare("geometry") == 0) { + coord = process_geometry(v[*i]); + } + } + std::pair>::iterator, bool> ret = _countries.insert(std::pair>(key, coord)); + if (ret.second == false) { + // Element already exist, add update it + //std::cerr << "element already existed: " << key << " - " << coord.size() << std::endl; + _countries[key].insert(_countries[key].end(), coord.begin(), coord.end()); + } + } // End of 'for' statement + ifs.close(); + + return 0; +} + +const int geospacial::is_in_country(const std::string& p_country, const coordinates& p_position) { + if (_countries.size() == 0) { + return -1; + } + std::map>::const_iterator it = _countries.find(p_country); + if (it == _countries.cend()) { + return -1; + } + + point p = wgs84_to_point(p_position.latitude, p_position.longitude); + for (auto ik = it->second.cbegin(); ik != it->second.cend(); ++ik) { + if (is_inside_polygon(*ik, p) == 0) { + return 0; + } + } // End of 'for' statement + + return -1; +} + +const std::string geospacial::process_properties(const Json::Value p_properties) { + return p_properties["iso_n3"].asString(); +} + +const std::vector geospacial::process_geometry(const Json::Value p_geometry) { + std::vector ar; + for (Json::Value::const_iterator it = p_geometry["coordinates"].begin() ; it != p_geometry["coordinates"].end() ; it++ ) { + std::vector polygons = extract_polygons(*it); + ar.insert(ar.end(), polygons.begin(), polygons.end()); + } + + return ar; +} + +const std::vector geospacial::extract_polygons(const Json::Value p_polygon) { + std::vector l; + Json::Value::const_iterator it = p_polygon.begin(); + Json::Value::const_iterator ik = static_cast(*it).begin(); + if (static_cast(*ik).isArray()) { + l = extract_polygons(*it); + } else if (static_cast(*ik).isDouble()) { + polygon p; + for ( ; it != p_polygon.end() ; it++ ) { + ik = static_cast(*it).begin(); + coordinates c( + static_cast(*++ik).asDouble(), // latitude + static_cast(*ik).asDouble(), // longitude + .0 + ); + p.push_back(std::make_tuple(c, wgs84_to_point(c.latitude, c.longitude))); + } // End of 'for' statement + l.push_back(p); + } else { + std::cerr << "extract_polygons: wrong type" << std::endl; + } + + return l; +} + +const point geospacial::wgs84_to_point(const double p_latitude, const double p_longitude) const { + double latitude_rad = p_latitude * PI / 180.0L; + double longitude_rad = p_longitude * PI / 180.0L; + return point( + (double)(R * cos(latitude_rad) * cos(longitude_rad)), + (double)(R * cos(latitude_rad) * sin(longitude_rad)), + (double)(R * sin(latitude_rad)) + ); +} + +const int geospacial::is_inside_polygon(const polygon& p_polygon, const point& q) const { + int i; + double angle = .0L; + point p1; + point p2; + int n = p_polygon.size(); + + for (i = 0; i < n; i++) { + //std::clog << "is_inside_polygon: Processing vertex " << i << " -> " << (i + 1) % n << std::endl; + point p = std::get<1>(p_polygon[i]); + point pnext = std::get<1>(p_polygon[(i + 1) % n]); + p1.x = p.x - q.x; + p1.y = p.y - q.y; + p2.x = pnext.x - q.x; + p2.y = pnext.y - q.y; + angle += CalcAngleSum_2d(p1, p2); + //std::clog << "is_inside_polygon: New angle " << angle << std::endl; + } + //std::clog << "is_inside_polygon: Final angle " << fabs(angle) << std::endl; + + if (fabs(angle) < PI) + return -1; + else + return 0; +} + +const double geospacial::CalcAngleSum_2d(const point& p1, const point& p2) const { + double theta1 = atan2(p1.y, p1.x); + double theta2 = atan2(p2.y, p2.x); + double dtheta = theta2 - theta1; + while (dtheta > PI) + dtheta -= TWOPI; + while (dtheta < -PI) + dtheta += TWOPI; + + return(dtheta); +} diff --git a/ccsrc/geospacial/geospacial.hh b/ccsrc/geospacial/geospacial.hh new file mode 100644 index 0000000000000000000000000000000000000000..d06456206bbd277a3b2ad914aa3cb7b30d0d94a9 --- /dev/null +++ b/ccsrc/geospacial/geospacial.hh @@ -0,0 +1,61 @@ +#pragma once + +#include +#include +#include +#include +#include +#include +#include + +#include + +#include + +#define EPSILON 0.0000001 +#define MODULUS(p) (sqrt(p.x * p.x + p.y * p.y + p.z * p.z)) +#define PI 3.1415926535897932384626435 +#define HALFPI 1.5707963267948966192313216916398 +#define TWOPI 6.283185307179586476925287 +//#define RTOD 57.2957795 +#define R 6378140.0 // Radius of the earth in meters + +class coordinates { +public: + double latitude; + double longitude; + double altitude; +public: + coordinates(); + coordinates(const double p_latitude, const double p_longitude, const double p_altitude); + virtual ~coordinates() { }; + inline const coordinates to_radian() const { return coordinates(latitude * PI / 180, longitude * PI / 180, altitude); }; + const bool is_valid_coordinates() const;; + const double distance_less_than_1km(const coordinates& p) const; // this position has origin + const double distance(const coordinates& p) const; // this position has origin +}; + +class point { +public: + double x, y, z; +public: + point(); + point(const double p_x, const double p_y, const double p_z); +}; + +typedef std::vector> polygon; + +class geospacial { + std::map> _countries; + const point wgs84_to_point(const double p_latitude, const double p_longitude) const; + const std::string process_properties(const Json::Value p_properties); + const std::vector process_geometry(const Json::Value p_geometry); + const std::vector extract_polygons(const Json::Value p_polygon); + const double CalcAngleSum_2d(const point& p1, const point& p2) const; + const int is_inside_polygon(const polygon& p_polygon, const point& q) const; +public: + geospacial() { }; + virtual ~geospacial() { }; + int load_countries_map(const std::string& p_file); + const int is_in_country(const std::string& p_country, const coordinates& p_position); +}; diff --git a/ccsrc/geospacial/module.mk b/ccsrc/geospacial/module.mk new file mode 100644 index 0000000000000000000000000000000000000000..5a05a64ea7ec63fc5aefc47ed400c0a673eba024 --- /dev/null +++ b/ccsrc/geospacial/module.mk @@ -0,0 +1,3 @@ +sources := geospacial.cc +includes := . + diff --git a/ccsrc/loggers/module.mk b/ccsrc/loggers/module.mk new file mode 100644 index 0000000000000000000000000000000000000000..c735f82e1383ff9c6f5adb160aad284a11784f6d --- /dev/null +++ b/ccsrc/loggers/module.mk @@ -0,0 +1,3 @@ +sources := loggers.cc +includes := . + diff --git a/config.mk b/config.mk new file mode 100644 index 0000000000000000000000000000000000000000..37da98c2f334cc7789b77089d788687f7ed8248a --- /dev/null +++ b/config.mk @@ -0,0 +1,3 @@ +TTCN3_DIR := /cygdrive/c/Tools/Titan +WPCAP_DLL_PATH := /cygdrive/c/windows/system32/npcap/wpcap.dll +NPCAP_INCLUDE := /cygdrive/c/PROGRA~1/Npcap/sdk/include diff --git a/data/v3/profiles/CERT_IUT_A_B33_AT.xml b/data/v3/profiles/CERT_IUT_A_B33_AT.xml index f44fffba4bbc73465e3bfb0d355fa8a81e1b1e16..ed467553c52ec2642847ea8cbc142a4a436b7612 100644 --- a/data/v3/profiles/CERT_IUT_A_B33_AT.xml +++ b/data/v3/profiles/CERT_IUT_A_B33_AT.xml @@ -1,6 +1,6 @@ 3 - + diff --git a/data/v3/profiles/CERT_IUT_CAM_BO_02_AT.xml b/data/v3/profiles/CERT_IUT_CAM_BO_02_AT.xml index 66d6f7d07ff4820a2849fca0319090ea92251d17..569f390052d1b3ad46721f8ea1c34a1766ce687a 100644 --- a/data/v3/profiles/CERT_IUT_CAM_BO_02_AT.xml +++ b/data/v3/profiles/CERT_IUT_CAM_BO_02_AT.xml @@ -17,7 +17,7 @@ - 01 BF FF + 01 BF FC diff --git a/data/v3/profiles/CERT_IUT_CAM_BO_03_AT.xml b/data/v3/profiles/CERT_IUT_CAM_BO_03_AT.xml index af470fbe25e1f6f3bc3b0b1689a43aba31833523..dc08eddfdf7a5135311bf20c5893e45e9ce671a8 100644 --- a/data/v3/profiles/CERT_IUT_CAM_BO_03_AT.xml +++ b/data/v3/profiles/CERT_IUT_CAM_BO_03_AT.xml @@ -17,7 +17,7 @@ - 01 DF FF + 01 DF FC diff --git a/data/v3/profiles/CERT_IUT_C_AT.xml b/data/v3/profiles/CERT_IUT_C_AT.xml index eaf058e46d3e80852ebee75dd059e4e75a1e3e36..b6cac15bb6112d7bc671583d654ff1b0e1a97d8a 100644 --- a/data/v3/profiles/CERT_IUT_C_AT.xml +++ b/data/v3/profiles/CERT_IUT_C_AT.xml @@ -20,7 +20,7 @@ - 01 FF FF + 01 FF FC 01 FF FF FF diff --git a/data/v3/profiles/CERT_IUT_C_RCA.xml b/data/v3/profiles/CERT_IUT_C_RCA.xml index d708d3eded87d7cf648baed5a555b5488e11d378..d536970340be92c288728ff049416b57523831c5 100644 --- a/data/v3/profiles/CERT_IUT_C_RCA.xml +++ b/data/v3/profiles/CERT_IUT_C_RCA.xml @@ -28,6 +28,8 @@ + + 01 FE/FF 01 diff --git a/data/v3/profiles/CERT_TS_CAM_BO_02_AT.xml b/data/v3/profiles/CERT_TS_CAM_BO_02_AT.xml index 2d0da6a015891cfb564982e832a126d6b70e32cd..84c91a033bf703008e0360cecdf9e05028ff37c8 100644 --- a/data/v3/profiles/CERT_TS_CAM_BO_02_AT.xml +++ b/data/v3/profiles/CERT_TS_CAM_BO_02_AT.xml @@ -18,7 +18,7 @@ - 01 BF FF + 01 BF FC diff --git a/data/v3/profiles/CERT_TS_CAM_BO_03_AT.xml b/data/v3/profiles/CERT_TS_CAM_BO_03_AT.xml index 07c047d77a756939004a26b709201c2d012b280c..ae2db8dbdd7750e730858e3ac44a56aa81d244f1 100644 --- a/data/v3/profiles/CERT_TS_CAM_BO_03_AT.xml +++ b/data/v3/profiles/CERT_TS_CAM_BO_03_AT.xml @@ -17,7 +17,7 @@ - 01 DF FF + 01 DF FC diff --git a/docker/Dockerfile.stfubuntu b/docker/Dockerfile.stfubuntu index 0fd4d017975b66e65cc68889bd0454cc6d900f20..02b408e8ef418ca8c4e073b9770d1186b0d5a48d 100644 --- a/docker/Dockerfile.stfubuntu +++ b/docker/Dockerfile.stfubuntu @@ -37,6 +37,7 @@ RUN echo "docker-STF-dev" > /etc/hostname \ libffi-dev \ libglib2.0-dev \ libgcrypt-dev \ + libjsoncpp-dev \ libncurses5-dev \ libpcap-dev \ libqt5svg5-dev \ diff --git a/docker/home/etc/init.d/20-eclipse.sh b/docker/home/etc/init.d/20-eclipse.sh index 7df8bd5c8dd32fc9d3c3c7929b4b916299479e37..1d8ac948d7abab1ea1515d84b1867dcd55d7c5e4 100755 --- a/docker/home/etc/init.d/20-eclipse.sh +++ b/docker/home/etc/init.d/20-eclipse.sh @@ -1,9 +1,13 @@ #!/bin/bash +ECLIPSE_URL='https://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/2020-06/R/eclipse-jee-2020-06-R-linux-gtk-x86_64.tar.gz&r=1' +TITAN_URL='https://www.eclipse.org/downloads/download.php?file=/titan/TITAN_Designer_and_Executor_Plugin_7.1.0.zip&r=1' + #set -e set -vx echo -e "*****************************\n* Install eclipse\n*****************************\n" + mkdir -p ${HOME}/frameworks cd ${HOME}/frameworks || exit 1 wget --progress=dot:mega 'http://www.mirrorservice.org/sites/download.eclipse.org/eclipseMirror/technology/epp/downloads/release/2020-06/R/eclipse-cpp-2020-06-R-linux-gtk-x86_64.tar.gz' -Oeclipse-cpp-2020-06-R-linux-gtk-x86_64.tar.gz || exit 1 @@ -13,8 +17,8 @@ rm -f ./eclipse-cpp-2020-06-R-linux-gtk-x86_64.tar.gz if wget --progress=dot:mega 'https://mirrors.dotsrc.org/eclipse//titan/TITAN_Designer_and_Executor_Plugin_7.1.0.zip' -OTITAN_Designer_and_Executor_plugin.zip; then eclipse/eclipse -noSplash -application org.eclipse.equinox.p2.director \ - -destination ${HOME}/frameworks/eclipse \ - -repository jar:file://${HOME}/frameworks/TITAN_Designer_and_Executor_plugin.zip!/ \ + -destination /home/etsi/frameworks/eclipse \ + -repository 'jar:file:///home/etsi/frameworks/TITAN_Designer_and_Executor_plugin.zip!/' \ -installIU TITAN_Designer.feature.group,TITAN_Executor.feature.group,TITAN_Log_Viewer.feature.group,Titan_external_dependencies.feature.group,Titanium.feature.group,Titanium_external_dependencies.feature.group rm -f TITAN_Designer_and_Executor_plugin.zip fi diff --git a/docker/home/etc/init.d/40-ttf002.sh b/docker/home/etc/init.d/40-ttf002.sh index bfe9ea33d49a02d2947ea3a99967bea0c8185a28..7edf522d6867c54fdc4d3c526a18ce52f924326a 100755 --- a/docker/home/etc/init.d/40-ttf002.sh +++ b/docker/home/etc/init.d/40-ttf002.sh @@ -21,10 +21,6 @@ cd ${HOME}/dev/Workspace/TTF0002 ln -s ../../TTF0002_Its/testdata ln -s ../../TTF0002_Its/data -echo -e "*****************************\n* Make ASN.1 sources\n*****************************\n" -cd ${HOME}/dev/Workspace/TTF0002/bin/asn1 -make -f ../../../../TTF0002_Its/asn1/Makefile - echo -e "*****************************\n* Make Certificate generator \n*****************************\n" # make V3 certificate generators cd ${HOME}/dev/TTF0002_Its/tools/itscertgen/asn1certgen diff --git a/docker/home/etc/init.d/50-ats.sh b/docker/home/etc/init.d/50-ats.sh index efdb42c9cf4c978584e5d83fd7fe4d6f495c40ee..5bf6791c550779d3430e11601aff4cdd09880930 100755 --- a/docker/home/etc/init.d/50-ats.sh +++ b/docker/home/etc/init.d/50-ats.sh @@ -8,17 +8,14 @@ echo -e "*****************************\n* Change user in cfg files\n************ cd ${HOME}/dev/TTF0002_Its/scripts || exit 1 ./update_user_name.sh || exit 1 -echo -e "*****************************\n* Install test suites\n*****************************\n" -./update_its_project.bash || exit 1 echo -e "*****************************\n* Build test suites\n*****************************\n" -cd ${HOME}/dev/etsi_its/src +cd ${HOME}/dev/TTF0002_Its ATS_LIST="AtsCAM AtsDENM AtsGeoNetworking AtsPki AtsSecurity AtsIVIM AtsMapemSpatem AtsSremSsem AtsRtcmem AtsRSUsSimulator" for i in ${ATS_LIST} do - cd $i/objs - ../bin/*_generate_makefile.bash - cd ../.. + export ATS=$i + make done cd ${HOME} diff --git a/etc/AtsMapemSpatem/AtsMapemSpatem.cfg b/etc/AtsMapemSpatem/AtsMapemSpatem.cfg index a69d34074666e2714a90ea21f462daebf6feb1b4..9400200cf32eb2c770e96742bb58c1d6d52a5f2c 100644 --- a/etc/AtsMapemSpatem/AtsMapemSpatem.cfg +++ b/etc/AtsMapemSpatem/AtsMapemSpatem.cfg @@ -11,7 +11,7 @@ LibItsMapemSpatem_Pics.PICS_IS_IUT_SECURED := false # In this section you can specify the name of the log file and the classes of events # you want to log into the file or display on console (standard error). -LogFile := "../logs/%e.%h-%r.%s" +LogFile := "../logs/AtsMapemSpatem/%e.%h-%r.%s" FileMask := LOG_ALL | USER | DEBUG | MATCHING ConsoleMask := LOG_ALL | USER | DEBUG | MATCHING #FileMask := ERROR | USER | MATCHING | EXECUTOR_RUNTIME | VERDICTOP diff --git a/etc/AtsRSUsSimulator/AtsRSUSimulator.cfg b/etc/AtsRSUsSimulator/AtsRSUSimulator.cfg index 9dd8ba97ab261d37f0b20939413f5beace86d976..9db19d5b583a14139b1ae57ce63a1acb2e097de4 100644 --- a/etc/AtsRSUsSimulator/AtsRSUSimulator.cfg +++ b/etc/AtsRSUsSimulator/AtsRSUSimulator.cfg @@ -65,12 +65,12 @@ ItsRSUsSimulator_Pics.PICS_SEND_RTCMEM_INDICATION := true # Enable Security support LibItsGeoNetworking_Pics.PICS_GN_SECURITY := false # Root path to access certificate stored in files, identified by certficate ID -LibItsSecurity_Pixits.PX_CERTIFICATE_POOL_PATH := "/home/yann/tmp" +LibItsSecurity_Pixits.PX_CERTIFICATE_POOL_PATH := "data/v3/certificates" # Configuration sub-directory to access certificate stored in files -LibItsSecurity_Pixits.PX_IUT_SEC_CONFIG_NAME := "asn1c_cert" +LibItsSecurity_Pixits.PX_IUT_SEC_CONFIG_NAME := "" LibItsHttp_Pics.PICS_HEADER_CONTENT_TYPE := "application/x-its-request" -LibItsHttp_Pics.PICS_HEADER_HOST := "192.168.42.252" +LibItsHttp_Pics.PICS_HEADER_HOST := "127.0.0.1" LibItsPki_Pics.PICS_HTTP_POST_URI := "/ea/enrolment" LibItsPki_Pics.PICS_MULTIPLE_END_POINT := false @@ -89,7 +89,7 @@ LibItsPki_Pics.PICS_IUT_AA_CERTIFICATE_ID := "CERT_TS_A_AA" [LOGGING] # In this section you can specify the name of the log file and the classes of events # you want to log into the file or display on console (standard error). -LogFile := "../logs/%e.%h-%r.%s" +LogFile := "../logs/AtsRSUsSimulator/%e.%h-%r.%s" FileMask := LOG_ALL | USER | DEBUG | MATCHING ConsoleMask := LOG_ALL | USER | DEBUG | MATCHING #FileMask := ERROR | WARNING | USER | MATCHING | EXECUTOR_RUNTIME | VERDICTOP diff --git a/scripts/autointerop_generate_makefile.bash b/scripts/autointerop_generate_makefile.bash deleted file mode 100755 index 930b377db8c789b89f1d23dcf7c1d9a9afcfe01b..0000000000000000000000000000000000000000 --- a/scripts/autointerop_generate_makefile.bash +++ /dev/null @@ -1,251 +0,0 @@ -#!/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=AutoInterop - -#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 -D_XOPEN_SOURCE=700 -pthreads -fstack-check -fstack-protector -fsanitize=leak -fsanitize=address -fno-omit-frame-pointer/g' # -DASN_DISABLE_OER_SUPPORT - else - CXXFLAGS_DEBUG_MODE='s/-Wall/-pg -Wall -std=c++11 -fPIC -pthreads -fstack-check -fstack-protector -fsanitize=leak -fsanitize=address -fno-omit-frame-pointer/g' # -DASN_DISABLE_OER_SUPPORT - 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 -D_XOPEN_SOURCE=700 -pthread -fstack-check -fstack-protector -fsanitize=leak -fsanitize=address -fno-omit-frame-pointer/g' # -DASN_DISABLE_OER_SUPPORT - else - CXXFLAGS_DEBUG_MODE='s/-Wall/-ggdb -O0 -Wall -std=c++11 -fPIC -pthread -fstack-check -fstack-protector -fsanitize=leak -fsanitize=address -fno-omit-frame-pointer/g' # -DASN_DISABLE_OER_SUPPORT - 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 -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' -sed --in-place "${ADD_RUN_LINE_1}" ./Makefile -sed --in-place "${ADD_RUN_LINE_2}" ./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 execute binary file Ats${ATS_NAME}" 10 -fi -f_exit "Build done successfully" 0 diff --git a/scripts/btp_generate_makefile.bash b/scripts/btp_generate_makefile.bash deleted file mode 100755 index 797172d7f1aa31dce7e121e02658de1b44a05fec..0000000000000000000000000000000000000000 --- a/scripts/btp_generate_makefile.bash +++ /dev/null @@ -1,253 +0,0 @@ -#!/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=BTP - -#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/Rtcmem 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 execute binary file Ats${ATS_NAME}" 10 -#fi -f_exit "Build done successfully" 0 diff --git a/scripts/cam_generate_makefile.bash b/scripts/cam_generate_makefile.bash deleted file mode 100755 index 3204cbfd1adc4012ba7f29b566985d74671082d9..0000000000000000000000000000000000000000 --- a/scripts/cam_generate_makefile.bash +++ /dev/null @@ -1,253 +0,0 @@ -#!/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=CAM - -#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/Rtcmem 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 execute binary file Ats${ATS_NAME}" 10 -#fi -f_exit "Build done successfully" 0 diff --git a/scripts/denm_generate_makefile.bash b/scripts/denm_generate_makefile.bash deleted file mode 100755 index e83fcf291f6e8ad73876f2cbb2fcfa6926848c2b..0000000000000000000000000000000000000000 --- a/scripts/denm_generate_makefile.bash +++ /dev/null @@ -1,253 +0,0 @@ -#!/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=DENM - -#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/Rtcmem 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 execute binary file Ats${ATS_NAME}" 10 -#fi -f_exit "Build done successfully" 0 diff --git a/scripts/gencert_generate_makefile.bash b/scripts/gencert_generate_makefile.bash deleted file mode 100755 index 9fcdd4a83dcde3c0be740f63d13ec97b4b9dd596..0000000000000000000000000000000000000000 --- a/scripts/gencert_generate_makefile.bash +++ /dev/null @@ -1,253 +0,0 @@ -#!/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=GenCat - -#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 execute binary file Ats${ATS_NAME}" 10 -fi -f_exit "Build done successfully" 0 diff --git a/scripts/geonw_generate_makefile.bash b/scripts/geonw_generate_makefile.bash deleted file mode 100755 index 48074390f5941c7c96c1f8f01fdb121d6d2f4f91..0000000000000000000000000000000000000000 --- a/scripts/geonw_generate_makefile.bash +++ /dev/null @@ -1,253 +0,0 @@ -#!/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=GeoNetworking - -#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/Rtcmem 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 execute binary file Ats${ATS_NAME}" 10 -#fi -f_exit "Build done successfully" 0 diff --git a/scripts/ivim_generate_makefile.bash b/scripts/ivim_generate_makefile.bash deleted file mode 100755 index 96d324500a112f481cb1272156d12dc2dc072fb4..0000000000000000000000000000000000000000 --- a/scripts/ivim_generate_makefile.bash +++ /dev/null @@ -1,253 +0,0 @@ -#!/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/Rtcmem 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 execute 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 deleted file mode 100755 index 2365e279ee454e8e4737fd7a98027be8a031ffce..0000000000000000000000000000000000000000 --- a/scripts/mapemstatem_generate_makefile.bash +++ /dev/null @@ -1,253 +0,0 @@ -#!/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/Rtcmem 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 execute binary file Ats${ATS_NAME}" 10 -#fi -f_exit "Build done successfully" 0 diff --git a/scripts/merge_its_project.bash b/scripts/merge_its_project.bash deleted file mode 100755 index 9dc9de114f743746d8db2af197f92d178d910d62..0000000000000000000000000000000000000000 --- a/scripts/merge_its_project.bash +++ /dev/null @@ -1,275 +0,0 @@ -#!/bin/bash - -# Debug mode -#set -vx -#set -e - -# Usage: sudo ./merge_ite_project.bash -# TODO Use git clone in temporary directory - -OLDPWD=`pwd` - -# Storing path -DEST_DIR=~/tmp -if [ ! -d ${DEST_DIR} ] -then - exit -1 -else - DEST_DIR=${DEST_DIR}/to_be_merged - if [ -d ${DEST_DIR} ] - then - rm -f ${DEST_DIR}/* - else - mkdir ${DEST_DIR} - fi -fi -chmod 775 ${DEST_DIR} -# Execution path -RUN_PATH="${0%/*}" -SRC_ITS_PATH=~/dev/TTF0002_Its -if [ "${PATH_DEV_ITS}" == "" ] -then - PATH_DEV_ITS=~/dev/etsi_its -fi - -# Update ETSI Framework files -echo 'Merging ETSI Framework files' -FWK_SRC_PATH=${SRC_ITS_PATH}/ccsrc -FWK_DST_PATH=${PATH_DEV_ITS}/framework -FWK_DIR_LIST_HH=`find ${FWK_SRC_PATH}/Protocols/ -name "*.h*" -type f` -for i in ${FWK_DIR_LIST_HH} -do - BN=`basename $i` - if [ "${BN}" != "BTPPort.hh" ] - then - s1=`sha256sum -b $i | cut -d' ' -f1` - s2=`sha256sum -b ${FWK_DST_PATH}/include/${BN} | cut -d' ' -f1` - if [ ${s1} != ${s2} ] - then - cp ${FWK_DST_PATH}/include/${BN} ${DEST_DIR} - if [ -f ${FWK_DST_PATH}/include/${BN}~ ] - then - rm ${FWK_DST_PATH}/include/${BN}~ - fi - fi - fi -done -FWK_DIR_LIST_CC=`find ${FWK_SRC_PATH}/Protocols/ -name "*.c*" -type f` -for i in ${FWK_DIR_LIST_CC} -do - BN=`basename $i` - if [ ${BN} != BTPPort.cc ] - then - s1=`sha256sum -b $i | cut -d' ' -f1` - s2=`sha256sum -b ${FWK_DST_PATH}/src/${BN} | cut -d' ' -f1` - if [ ${s1} != ${s2} ] - then - cp ${FWK_DST_PATH}/src/${BN} ${DEST_DIR} - if [ -f ${FWK_DST_PATH}/src/${BN}~ ] - then - rm ${FWK_DST_PATH}/src/${BN}~ - fi - fi - fi -done -FWK_DIR_LIST_Y=`find ${FWK_SRC_PATH}/Protocols/ -name "*.y" -type f` -for i in ${FWK_DIR_LIST_Y} -do - BN=`basename $i` - s1=`sha256sum -b $i | cut -d' ' -f1` - s2=`sha256sum -b ${FWK_DST_PATH}/src/${BN} | cut -d' ' -f1` - if [ "${s1}" != "${s2}" ] - then - cp ${FWK_DST_PATH}/src/${BN} ${DEST_DIR} - if [ -f ${FWK_DST_PATH}/src/${BN}~ ] - then - rm ${FWK_DST_PATH}/src/${BN}~ - fi - fi -done -FWK_DIR_LIST_L=`find ${FWK_SRC_PATH}/Protocols/ -name "*.l" -type f` -for i in ${FWK_DIR_LIST_L} -do - BN=`basename $i` - s1=`sha256sum -b $i | cut -d' ' -f1` - s2=`sha256sum -b ${FWK_DST_PATH}/src/${BN} | cut -d' ' -f1` - if [ "${s1}" != "${s2}" ] - then - cp ${FWK_DST_PATH}/src/${BN} ${DEST_DIR} - if [ -f ${FWK_DST_PATH}/src/${BN}~ ] - then - rm ${FWK_DST_PATH}/src/${BN}~ - fi - fi -done -FWK_DIR_LIST_HH=`find ${FWK_SRC_PATH}/Framework/ -name "*.h*" -type f` -FWK_DIR_LIST_CC=`find ${FWK_SRC_PATH}/Framework/ -name "*.c*" -type f` -for i in ${FWK_DIR_LIST_HH} -do - BN=`basename $i` - s1=`sha256sum -b $i | cut -d' ' -f1` - s2=`sha256sum -b ${FWK_DST_PATH}/include/${BN} | cut -d' ' -f1` - if [ ${s1} != ${s2} ] - then - cp ${FWK_DST_PATH}/include/${BN} ${DEST_DIR} - if [ -f ${FWK_DST_PATH}/include/${BN}~ ] - then - rm ${FWK_DST_PATH}/include/${BN}~ - fi - fi -done -for i in ${FWK_DIR_LIST_CC} -do - BN=`basename $i` - s1=`sha256sum -b $i | cut -d' ' -f1` - s2=`sha256sum -b ${FWK_DST_PATH}/src/${BN} | cut -d' ' -f1` - if [ ${s1} != ${s2} ] - then - cp ${FWK_DST_PATH}/src/${BN} ${DEST_DIR} - if [ -f ${FWK_DST_PATH}/src/${BN}~ ] - then - rm ${FWK_DST_PATH}/src/${BN}~ - fi - fi -done -FWK_DIR_LIST_HH=`find ${FWK_SRC_PATH}/loggers/ -name "*.h*" -type f` -for i in ${FWK_DIR_LIST_HH} -do - BN=`basename $i` - s1=`sha256sum -b $i | cut -d' ' -f1` - s2=`sha256sum -b ${FWK_DST_PATH}/include/${BN} | cut -d' ' -f1` - if [ ${s1} != ${s2} ] - then - cp ${FWK_DST_PATH}/include/${BN} ${DEST_DIR} - if [ -f ${FWK_DST_PATH}/include/${BN}~ ] - then - rm ${FWK_DST_PATH}/include/${BN}~ - fi - fi -done -FWK_DIR_LIST_CC=`find ${FWK_SRC_PATH}/loggers/ -name "*.c*" -type f` -for i in ${FWK_DIR_LIST_CC} -do - BN=`basename $i` - s1=`sha256sum -b $i | cut -d' ' -f1` - s2=`sha256sum -b ${FWK_DST_PATH}/src/${BN} | cut -d' ' -f1` - if [ ${s1} != ${s2} ] - then - cp ${FWK_DST_PATH}/src/${BN} ${DEST_DIR} - if [ -f ${FWK_DST_PATH}/src/${BN}~ ] - then - rm ${FWK_DST_PATH}/src/${BN}~ - fi - fi -done -# Update ATS TTCN-3 files -echo 'Update TTCN-3 files' -TTCN_3_ORG_PATH=${SRC_ITS_PATH}/ttcn -TTCN_3_DST_PATH=${PATH_DEV_ITS}/src -TTCN_3_ATS_LIST='AtsAutoInterop AtsCAM AtsDENM AtsBTP AtsGeoNetworking AtsSecurity AtsPki AtsIVIM AtsMapemSpatem AtsSremSsem AtsRtcmem AtsRSUsSimulator LibCommon' -for i in ${TTCN_3_ATS_LIST} -do - LIST_TTCN_FILES=`find ${TTCN_3_ORG_PATH}/$i -name "*.ttcn" -type f` - for j in ${LIST_TTCN_FILES} - do - BN=`basename $j` - s1=`sha256sum -b $j | cut -d' ' -f1` - s2=`sha256sum -b ${TTCN_3_DST_PATH}/$i/ttcn/${BN} | cut -d' ' -f1` - if [ ${s1} != ${s2} ] - then - cp ${TTCN_3_DST_PATH}/$i/ttcn/${BN} ${DEST_DIR} - fi - done - # Other files - if [ -f ${SRC_ITS_PATH}/docs/$i/o2.cfg ] - then - s1=`sha256sum -b ${PATH_DEV_ITS}/src/$i/docs/o2.cfg | cut -d' ' -f1` - s2=`sha256sum -b ${SRC_ITS_PATH}/docs/$i/o2.cfg | cut -d' ' -f1` - if [ ${s1} != ${s2} ] - then - mkdir -p ${DEST_DIR}/docs/$i - cp ${PATH_DEV_ITS}/src/$i/docs/o2.cfg ${DEST_DIR}/docs/$i - fi - fi - for k in `ls *.cfg` - do - if [ -f ${SRC_ITS_PATH}/etc/$i/$k ] - then - s1=`sha256sum -b ${PATH_DEV_ITS}/src/$i/etc/$k | cut -d' ' -f1` - s2=`sha256sum -b ${SRC_ITS_PATH}/etc/$i/$k | cut -d' ' -f1` - if [ ${s1} != ${s2} ] - then - mkdir -p ${DEST_DIR}/etc/$i - cp ${PATH_DEV_ITS}/src/$i/etc/$k ${DEST_DIR}/etc/$i - fi - fi - done - for k in `ls *.cfg_` - do - if [ -f ${SRC_ITS_PATH}/etc/$i/$k ] - then - s1=`sha256sum -b ${PATH_DEV_ITS}/src/$i/etc/$k | cut -d' ' -f1` - s2=`sha256sum -b ${SRC_ITS_PATH}/etc/$i/$k | cut -d' ' -f1` - if [ ${s1} != ${s2} ] - then - mkdir -p ${DEST_DIR}/etc/$i - cp ${PATH_DEV_ITS}/src/$i/etc/$k ${DEST_DIR}/etc/$i - fi - fi - done -done - -TTCN_3_LIB_LIST='BTP CAM Common DENM GeoNetworking Http Ipv6OverGeoNetworking IVIM MapemSpatem Pki Rtcmem Security SremSsem' -for i in ${TTCN_3_LIB_LIST} -do - LIST_TTCN_FILES=`find ${TTCN_3_ORG_PATH}/LibIts/ttcn/$i -name "*.ttcn" -type f` - for j in ${LIST_TTCN_FILES} - do - BN=`basename $j` - s1=`sha256sum -b $j | cut -d' ' -f1` - s2=`sha256sum -b ${TTCN_3_DST_PATH}/LibIts/$i/ttcn/${BN} | cut -d' ' -f1` - if [ ${s1} != ${s2} ] - then - cp ${TTCN_3_DST_PATH}/LibIts/$i/ttcn/${BN} ${DEST_DIR} - rm ${TTCN_3_DST_PATH}/LibIts/$i/ttcn/${BN}~ - fi - done - # FWK_DIR_LIST_HH=`find ${FWK_SRC_PATH}/src/LibIts/$i/include -name "*.h*" -type f` - # FWK_DIR_LIST_CC=`find ${FWK_SRC_PATH}/src/LibIts/$i/src -name "*.c*" -type f` - # for j in ${FWK_DIR_LIST_HH} - # do - # BN=`basename $j` - # s1=`sha256sum -b $j | cut -d' ' -f1` - # s2=`sha256sum -b ${PATH_DEV_ITS}/src/LibIts/$i/include/${BN} | cut -d' ' -f1` - # if [ ${s1} != ${s2} ] - # then - # cp ${PATH_DEV_ITS}/src/LibIts/$i/include/${BN} ${DEST_DIR} - # rm ${PATH_DEV_ITS}/src/LibIts/$i/include/${BN}~ - # fi - # done - # for j in ${FWK_DIR_LIST_CC} - # do - # BN=`basename $j` - # s1=`sha256sum -b $j | cut -d' ' -f1` - # s2=`sha256sum -b ${PATH_DEV_ITS}/src/LibIts/$i/src/${BN} | cut -d' ' -f1` - # if [ ${s1} != ${s2} ] - # then - # cp ${PATH_DEV_ITS}/src/LibIts/$i/src/${BN} ${DEST_DIR} - # rm ${PATH_DEV_ITS}/src/LibIts/$i/src/${BN}~ - # fi - # done -done - - -LIST_FILES=`find ${PATH_DEV_ITS} -name "*~" -type f` -for i in ${LIST_FILES} -do - BN=$i - BN=${BN:: -1} # Remove the last character - cp ${BN} ${DEST_DIR} - rm $i -done - -chmod -R 664 ${DEST_DIR}/* -exit 0 - diff --git a/scripts/pki_generate_makefile.bash b/scripts/pki_generate_makefile.bash deleted file mode 100755 index 57f41b7e3f63d04655e773fbf64b6637443a4a34..0000000000000000000000000000000000000000 --- a/scripts/pki_generate_makefile.bash +++ /dev/null @@ -1,253 +0,0 @@ -#!/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=Pki - -#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/Rtcmem 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 execute binary file Ats${ATS_NAME}" 10 -#fi -f_exit "Build done successfully" 0 diff --git a/scripts/rsusimulator_generate_makefile.bash b/scripts/rsusimulator_generate_makefile.bash deleted file mode 100755 index f26ac02e22c47a7c212150e9aed483bc65ad3493..0000000000000000000000000000000000000000 --- a/scripts/rsusimulator_generate_makefile.bash +++ /dev/null @@ -1,253 +0,0 @@ -#!/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=RsuSimulator - -#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/Rtcmem 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=12001' -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 execute binary file Ats${ATS_NAME}" 10 -fi -f_exit "Build done successfully" 0 diff --git a/scripts/rtcmem_generate_makefile.bash b/scripts/rtcmem_generate_makefile.bash deleted file mode 100755 index 55d5126f68da32f0cd67512a7210bb950be422a7..0000000000000000000000000000000000000000 --- a/scripts/rtcmem_generate_makefile.bash +++ /dev/null @@ -1,253 +0,0 @@ -#!/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=Rtcmem - -#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/Rtcmem 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 execute binary file Ats${ATS_NAME}" 10 -#fi -f_exit "Build done successfully" 0 diff --git a/scripts/run_all.bash b/scripts/run_all.bash index 62e48902af474523e82b583ef3db75dddf3731e0..6f831e6ac2105e63724b3918c62455b2dff9bbfa 100755 --- a/scripts/run_all.bash +++ b/scripts/run_all.bash @@ -4,6 +4,12 @@ clear +if [ -z $ATS ] +then + echo "ATS shall be defined" + exit 1 +fi + if ! [[ $1 =~ "^[0-9]+$" ]] then COUNTER=$1 @@ -12,22 +18,22 @@ else fi CURPWD=`pwd` -if [ ! "${PWD##*/}" == "objs" ] +if [ ! "${PWD##*/}" == "scripts" ] then - cd ../objs + cd ../scripts if [ ! $? == 0 ] then - echo "Please move to PROJECT/obj directory" + echo "Please move to PROJECT/scripts directory" exit 1 fi fi -rm ../logs/merged.*.log +rm ../bin/S1/logs/merged.*.log for i in $(seq 1 1 $COUNTER) do - ../bin/run_mtc.bash & - ../bin/run_ptcs.bash $2 + ./run_mtc.bash & + ./run_ptcs.bash dup=$(ps -ef | grep "$0" | grep -v grep | wc -l) while [ ${dup} -eq 3 ] @@ -37,7 +43,7 @@ do done sleep 1 - mv ../logs/merged.log ../logs/merged.`date +'%Y%m%d%S'`.log + mv ../logs/$ATS/merged.log ../logs/$ATS/merged.`date +'%Y%m%d%S'`.log done exit 0 diff --git a/scripts/run_mtc.bash b/scripts/run_mtc.bash index a4932c24103634b54ee5343fbea8162d1e841680..0559a9eaa0bd77cbbbdbd85f61678d8367e14861 100755 --- a/scripts/run_mtc.bash +++ b/scripts/run_mtc.bash @@ -1,20 +1,27 @@ #!/bin/bash -#set -evx +#set -e +#set -vx clear +if [ -z $ATS ] +then + echo "ATS shall be defined" + exit 1 +fi + CURPWD=`pwd` -if [ ! "${PWD##*/}" == "objs" ] +if [ ! "${PWD##*/}" == "scripts" ] then - cd ../objs + cd ../scripts if [ ! $? == 0 ] then - echo "Please move to PROJECT/obj directory" + echo "Please move to PROJECT/scripts directory" exit 1 fi fi -TITAN_LOG_DIR=../logs +TITAN_LOG_DIR=../logs/$ATS if [ ! -d ${TITAN_LOG_DIR} ] then mkdir ${TITAN_LOG_DIR} @@ -22,33 +29,20 @@ else rm -f ${TITAN_LOG_DIR}/*.log fi -CFG_FILES=`find ../etc -name '*.cfg'` -#LOG_FILES=`find ${TITAN_LOG_DIR} -name '*.log'` -#mv ${LOG_FILES} ../logs - -#if [ "${OSTYPE}" == "cygwin" ] -#then -# # Remove dll -# rm ./*.dll -# ## Copy the new ones -# cp ~/lib/libhelper.dll . -# cp ~/lib/libconverter.dll . -# cp ~/lib/liblogger.dll . -# cp ~/lib/libttcn3_tri.dll . -# cp ~/lib/libcomm.dll . -#fi +CFG_FILES=`find ../etc/$ATS -name '*.cfg'` echo "> cmtc: to create the MTC server" echo "> smtc [module_name[[.control]|.testcase_name|.*]: when MyExample is connected, run the TCs in [EXECUTE] section" echo "> emtc: Terminate MTC." mctr ${CFG_FILES} +sudo chown -R `whoami` ${TITAN_LOG_DIR} LOG_FILES=`find ${TITAN_LOG_DIR} -name '*.log'` if [ "${TITAN_LOG_DIR}" != "" ] then ttcn3_logmerge -o ${TITAN_LOG_DIR}/merged.log ${LOG_FILES} ttcn3_logformat -o ${TITAN_LOG_DIR}/merged_formated.log ${TITAN_LOG_DIR}/merged.log - mv ${TITAN_LOG_DIR}/merged_formated.log ${TITAN_LOG_DIR}/merged.log + mv ${TITAN_LOG_DIR}/merged_formated.log ${TITAN_LOG_DIR}/merged.log echo "log files were merged into ${TITAN_LOG_DIR}/merged.log" fi diff --git a/scripts/run_ptcs.bash b/scripts/run_ptcs.bash index 869220b927916d4fb61ae17656659a0d9c1a8f6a..1c097d445d09ed82c6c8e934e7e57c03fe142474 100755 --- a/scripts/run_ptcs.bash +++ b/scripts/run_ptcs.bash @@ -4,13 +4,19 @@ clear +if [ -z $ATS ] +then + echo "ATS shall be defined" + exit 1 +fi + CURPWD=`pwd` -if [ ! "${PWD##*/}" == "objs" ] +if [ ! "${PWD##*/}" == "scripts" ] then - cd ../objs + cd ../scripts if [ ! $? == 0 ] then - echo "Please move to PROJECT/obj directory" + echo "Please move to PROJECT/scripts directory" exit 1 fi fi @@ -19,20 +25,12 @@ if [ -f ./core ] then rm -f ./core fi -if [ "$1" == "d" ] -then - make run_d -elif [ "$1" == "v" ] + +if [ "$ATS" == "AtsRSUsSimulator" ] then - make run_v + sudo LD_LIBRARY_PATH=$LD_LIBRARY_PATH ../bin/$ATS 127.0.0.1 12001 else - make run + sudo LD_LIBRARY_PATH=$LD_LIBRARY_PATH ../bin/$ATS 127.0.0.1 12000 fi -#if [ "${OSTYPE}" == "cygwin" ] -#then -# ../bin/SIPmsg.exe 127.0.0.1 12000 -#else -# ../bin/SIPmsg 127.0.0.1 12000 -#fi cd ${CURPWD} diff --git a/scripts/security_generate_makefile.bash b/scripts/security_generate_makefile.bash deleted file mode 100755 index 9dc4169fbd7b06b57ff4c740784a4a3bcf5b2548..0000000000000000000000000000000000000000 --- a/scripts/security_generate_makefile.bash +++ /dev/null @@ -1,253 +0,0 @@ -#!/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=Security - -#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/Rtcmem 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 -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 -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 execute binary file Ats${ATS_NAME}" 10 -#fi -f_exit "Build done successfully" 0 diff --git a/scripts/sremssem_generate_makefile.bash b/scripts/sremssem_generate_makefile.bash deleted file mode 100755 index b88973e62bd19a87bd0c6abe6011eb416d80178b..0000000000000000000000000000000000000000 --- a/scripts/sremssem_generate_makefile.bash +++ /dev/null @@ -1,253 +0,0 @@ -#!/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=SremSsem - -#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/Rtcmem 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 execute binary file Ats${ATS_NAME}" 10 -#fi -f_exit "Build done successfully" 0 diff --git a/scripts/testcodec_generate_makefile.bash b/scripts/testcodec_generate_makefile.bash deleted file mode 100755 index 30db991939800010f0f525ef62034949e0220da4..0000000000000000000000000000000000000000 --- a/scripts/testcodec_generate_makefile.bash +++ /dev/null @@ -1,253 +0,0 @@ -#!/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=TestCodec - -#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' # -DASN_DISABLE_OER_SUPPORT - 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' # -DASN_DISABLE_OER_SUPPORT - 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' # -DASN_DISABLE_OER_SUPPORT - 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' # -DASN_DISABLE_OER_SUPPORT - 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 execute binary file Ats${ATS_NAME}" 10 -fi -f_exit "Build done successfully" 0 diff --git a/scripts/update_its_project.bash b/scripts/update_its_project.bash deleted file mode 100755 index 6785876968cbbceccce35d494ffeda1defdbc7bc..0000000000000000000000000000000000000000 --- a/scripts/update_its_project.bash +++ /dev/null @@ -1,412 +0,0 @@ -#!/bin/bash - -# Debug mode -#set -e -#set -vx - -# Usage: sudo ./update_project.bash -# TODO Use git clone in temporary directory - -OLDPWD=`pwd` - -# Execution path -RUN_PATH="${0%/*}" - -if [ "${VALIDATION_DIR}" == "" ] -then - VALIDATION_DIR=${HOME} -fi - -CHOWN_USER_GROUP=${USER}:${USER} -SRC_ITS_PATH=${HOME}/dev/TTF0002_Its - -if [ "${PATH_DEV_ITS}" == "" ] -then - PATH_DEV_ITS=${HOME}/dev/etsi_its -fi -echo ${PATH_DEV_ITS} - -if [ -d ${PATH_DEV_ITS} ] -then - if [ -f ${HOME}/tmp/etsi_its.tar.bz2 ] - then - mv ${HOME}/tmp/etsi_its.tar.bz2 ${HOME}/tmp/etsi_its.tar.`date +'%Y%m%d'`.bz2 - fi - find ${PATH_DEV_ITS} -name "*.o" -exec rm {} \; - tar jhcvf ${HOME}/tmp/etsi_its.tar.bz2 ${PATH_DEV_ITS} - rm -fr ${PATH_DEV_ITS} -fi - -# Check if target directory exist -if [ ! -d ${PATH_DEV_ITS} ] -then - mkdir -p ${PATH_DEV_ITS}/asn1/ ${PATH_DEV_ITS}/ttcn/LibIts/asn1/ ${PATH_DEV_ITS}/include ${PATH_DEV_ITS}/bin ${PATH_DEV_ITS}/lib ${PATH_DEV_ITS}/objs ${PATH_DEV_ITS}/src ${PATH_DEV_ITS}/docs -fi - -# Update ASN.1 files -echo 'Updating ASN.1 files' -ASN1_SRC_PATH=${SRC_ITS_PATH}/ttcn/LibIts/asn1 -ASN1_DST_PATH=${PATH_DEV_ITS}/ttcn/LibIts/asn1 -NB_DEL=`echo ${ASN1_SRC_PATH} | awk -F"/" '{print NF + 1}'` -#ASN1_DIR_LIST=`find ${ASN1_SRC_PATH} -type d -not -path "*/.svn*" | cut -sd / -f${NB_DEL}-` -ASN1_DIR_LIST="CAM DENM EVCSN EV-RSR IS ITS-Container Security" -for i in ${ASN1_DIR_LIST} -do - ASN1_SUBDIR_LIST=`find $ASN1_SRC_PATH/$i -type d | cut -sd / -f${NB_DEL}-` - for j in ${ASN1_SUBDIR_LIST} - do - if [ ! -d ${ASN1_DST_PATH}/$j ] - then - mkdir ${ASN1_DST_PATH}/$j - chmod 775 ${ASN1_DST_PATH}/$j - fi - for k in `ls ${ASN1_SRC_PATH}/$j/*.asn` - do - cp $k ${ASN1_DST_PATH}/$j - done - 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' -FWK_SRC_PATH=${SRC_ITS_PATH}/testdata -FWK_DST_PATH=${PATH_DEV_ITS} -if [ -d ${FWK_SRC_PATH} ] -then - cp -Rp ${FWK_SRC_PATH} ${FWK_DST_PATH} -fi - -# Update ETSI Framework files -echo 'Updating ETSI Framework files' -FWK_SRC_PATH=${SRC_ITS_PATH}/ccsrc -FWK_DST_PATH=${PATH_DEV_ITS}/framework -mkdir -p ${FWK_DST_PATH}/src ${FWK_DST_PATH}/include -chmod -R 775 ${FWK_DST_PATH} -# Create link to TITAN Abstract_Socket -ln -sf $TOP/../titan.TestPorts.Common_Components.Abstract_Socket/src/Abstract_Socket.cc ${FWK_DST_PATH}/src/Abstract_Socket.cc -ln -sf $TOP/../titan.TestPorts.Common_Components.Abstract_Socket/src/Abstract_Socket.hh ${FWK_DST_PATH}/include/Abstract_Socket.hh -FWK_DIR_LIST_HH=`find ${FWK_SRC_PATH}/Protocols/ -name "*.h*" -type f` -FWK_DIR_LIST_THH=`find ${FWK_SRC_PATH}/Protocols/ -name "*.t.h*" -type f` -FWK_DIR_LIST_CC=`find ${FWK_SRC_PATH}/Protocols/ -name "*.c*" -type f` -FWK_DIR_LIST_L=`find ${FWK_SRC_PATH}/Protocols/ -name "*.l" -type f` -FWK_DIR_LIST_Y=`find ${FWK_SRC_PATH}/Protocols/ -name "*.y" -type f` -for i in ${FWK_DIR_LIST_HH} -do - if [ `basename $i` != BTPPort.hh ] - then - cp $i ${FWK_DST_PATH}/include - fi -done -for i in ${FWK_DIR_LIST_THH} -do - if [ `basename $i` != BTPPort.hh ] - then - cp $i ${FWK_DST_PATH}/include - fi -done -for i in ${FWK_DIR_LIST_CC} -do - if [ `basename $i` != BTPPort.cc ] - then - cp $i ${FWK_DST_PATH}/src - fi -done -if [ "${FWK_DIR_LIST_L}" != "" ] -then - for i in ${FWK_DIR_LIST_L} - do - cp $i ${FWK_DST_PATH}/src - done -fi -if [ "${FWK_DIR_LIST_Y}" != "" ] -then - for i in ${FWK_DIR_LIST_Y} - do - cp $i ${FWK_DST_PATH}/src - done -fi -FWK_DIR_LIST_HH=`find ${FWK_SRC_PATH}/Framework/ -name "*.h*" -type f` -FWK_DIR_LIST_CC=`find ${FWK_SRC_PATH}/Framework/ -name "*.c*" -type f` -for i in ${FWK_DIR_LIST_HH} -do - cp $i ${FWK_DST_PATH}/include -done -for i in ${FWK_DIR_LIST_CC} -do - cp $i ${FWK_DST_PATH}/src -done -FWK_DIR_LIST_HH=`find ${FWK_SRC_PATH}/loggers/ -name "*.h*" -type f` -FWK_DIR_LIST_CC=`find ${FWK_SRC_PATH}/loggers/ -name "*.c*" -type f` -for i in ${FWK_DIR_LIST_HH} -do - cp $i ${FWK_DST_PATH}/include -done -for i in ${FWK_DIR_LIST_CC} -do - cp $i ${FWK_DST_PATH}/src -done -FWK_DIR_LIST_HH=`find ${FWK_SRC_PATH}/Asn1c/ -name "*.h*" -type f` -FWK_DIR_LIST_CC=`find ${FWK_SRC_PATH}/Asn1c/ -name "*.c*" -type f` -for i in ${FWK_DIR_LIST_HH} -do - cp $i ${FWK_DST_PATH}/include -done -for i in ${FWK_DIR_LIST_CC} -do - cp $i ${FWK_DST_PATH}/src -done - -# Update ATS TTCN-3 files -echo 'Update TTCN-3 files' -TTCN_3_ORG_PATH=${SRC_ITS_PATH}/ttcn -TTCN_3_DST_PATH=${PATH_DEV_ITS}/src -CC_SRC_PATH=${SRC_ITS_PATH}/ccsrc -TTCN_3_ATS_LIST='AtsAutoInterop AtsCAM AtsDENM AtsBTP AtsGeoNetworking AtsSecurity AtsRSUsSimulator LibCommon/ttcn AtsGenCert AtsPki AtsIVIM AtsSremSsem AtsRtcmem AtsMapemSpatem' -for i in ${TTCN_3_ATS_LIST} -do - if [ ! -d ${TTCN_3_DST_PATH}/$i ] - then - mkdir -p ${TTCN_3_DST_PATH}/$i/bin ${TTCN_3_DST_PATH}/$i/lib ${TTCN_3_DST_PATH}/$i/src ${TTCN_3_DST_PATH}/$i/include ${TTCN_3_DST_PATH}/$i/ttcn ${TTCN_3_DST_PATH}/$i/objs ${TTCN_3_DST_PATH}/$i/etc ${TTCN_3_DST_PATH}/$i/docs - chmod -R 775 ${TTCN_3_DST_PATH}/$i - fi - cp ${TTCN_3_ORG_PATH}/$i/*.ttcn ${TTCN_3_DST_PATH}/$i/ttcn - cp ${TTCN_3_ORG_PATH}/../etc/$i/*.cfg ${TTCN_3_DST_PATH}/$i/etc - cp ${TTCN_3_ORG_PATH}/../etc/$i/*.cfg_ ${TTCN_3_DST_PATH}/$i/etc - cp ${TTCN_3_ORG_PATH}/../docs/$i/o2.cfg ${TTCN_3_DST_PATH}/$i/docs -done - -# Update libraries & CC files -TTCN_3_LIB_LIST='Common BTP CAM DENM GeoNetworking Ipv6OverGeoNetworking Security MapemSpatem IVIM SremSsem Rtcmem AtsRSUsSimulator Http Pki' -for i in ${TTCN_3_LIB_LIST} -do - if [ ! -d ${TTCN_3_DST_PATH}/LibIts/$i ] - then - mkdir -p ${TTCN_3_DST_PATH}/LibIts/$i/docs ${TTCN_3_DST_PATH}/LibIts/$i/src ${TTCN_3_DST_PATH}/LibIts/$i/include ${TTCN_3_DST_PATH}/LibIts/$i/ttcn - fi - cp ${TTCN_3_ORG_PATH}/LibIts/ttcn/$i/*.ttcn ${TTCN_3_DST_PATH}/LibIts/$i/ttcn - # Update CC files - if [ "$i" == "Common" ] - then - cp ${CC_SRC_PATH}/Externals/LibItsCommon_externals.cc ${TTCN_3_DST_PATH}/LibIts/$i/src - cp ${CC_SRC_PATH}/Ports/LibIts_ports/*.cc ${TTCN_3_DST_PATH}/LibIts/$i/src - cp ${CC_SRC_PATH}/Ports/LibIts_ports/*.hh ${TTCN_3_DST_PATH}/LibIts/$i/include - elif [ "$i" == "BTP" ] - then - cp ${CC_SRC_PATH}/EncDec/LibItsBtp_Encdec.cc ${TTCN_3_DST_PATH}/LibIts/$i/src - cp ${CC_SRC_PATH}/Ports/LibIts_ports/BTP_ports/*.cc ${TTCN_3_DST_PATH}/LibIts/$i/src - cp ${CC_SRC_PATH}/Ports/LibIts_ports/BTP_ports/*.hh ${TTCN_3_DST_PATH}/LibIts/$i/include - cp ${CC_SRC_PATH}/Ports/LibIts_ports/BTP_ports/*.partC ${TTCN_3_DST_PATH}/LibIts/$i/src - cp ${CC_SRC_PATH}/Ports/LibIts_ports/BTP_ports/*.partH ${TTCN_3_DST_PATH}/LibIts/$i/include - elif [ "$i" == "CAM" ] - then - cp ${CC_SRC_PATH}/EncDec/LibItsCam_Encdec.cc ${TTCN_3_DST_PATH}/LibIts/$i/src - cp ${CC_SRC_PATH}/Ports/LibIts_ports/CAM_ports/*.cc ${TTCN_3_DST_PATH}/LibIts/$i/src - cp ${CC_SRC_PATH}/Ports/LibIts_ports/CAM_ports/*.hh ${TTCN_3_DST_PATH}/LibIts/$i/include - cp ${CC_SRC_PATH}/Ports/LibIts_ports/CAM_ports/*.partC ${TTCN_3_DST_PATH}/LibIts/$i/src - cp ${CC_SRC_PATH}/Ports/LibIts_ports/CAM_ports/*.partH ${TTCN_3_DST_PATH}/LibIts/$i/include - elif [ "$i" == "DENM" ] - then - cp ${CC_SRC_PATH}/EncDec/LibItsDenm_Encdec.cc ${TTCN_3_DST_PATH}/LibIts/$i/src - cp ${CC_SRC_PATH}/Ports/LibIts_ports/DENM_ports/*.cc ${TTCN_3_DST_PATH}/LibIts/$i/src - cp ${CC_SRC_PATH}/Ports/LibIts_ports/DENM_ports/*.hh ${TTCN_3_DST_PATH}/LibIts/$i/include - cp ${CC_SRC_PATH}/Ports/LibIts_ports/DENM_ports/*.partC ${TTCN_3_DST_PATH}/LibIts/$i/src - cp ${CC_SRC_PATH}/Ports/LibIts_ports/DENM_ports/*.partH ${TTCN_3_DST_PATH}/LibIts/$i/include - elif [ "$i" == "GeoNetworking" ] - then - cp ${CC_SRC_PATH}/EncDec/LibItsGeoNetworking_Encdec.cc ${TTCN_3_DST_PATH}/LibIts/$i/src - cp ${CC_SRC_PATH}/Externals/LibItsGeoNetworking_externals.cc ${TTCN_3_DST_PATH}/LibIts/$i/src - cp ${CC_SRC_PATH}/Ports/LibIts_ports/GN_ports/*.cc ${TTCN_3_DST_PATH}/LibIts/$i/src - cp ${CC_SRC_PATH}/Ports/LibIts_ports/GN_ports/*.hh ${TTCN_3_DST_PATH}/LibIts/$i/include - cp ${CC_SRC_PATH}/Ports/LibIts_ports/GN_ports/*.partC ${TTCN_3_DST_PATH}/LibIts/$i/src - cp ${CC_SRC_PATH}/Ports/LibIts_ports/GN_ports/*.partH ${TTCN_3_DST_PATH}/LibIts/$i/include - elif [ "$i" == "Ipv6OverGeoNetworking" ] - then - cp ${CC_SRC_PATH}/EncDec/LibItsIpv6OverGeoNetworking_Encdec.cc ${TTCN_3_DST_PATH}/LibIts/$i/src - cp ${CC_SRC_PATH}/Externals/LibItsIpv6OverGeoNetworking_externals.cc ${TTCN_3_DST_PATH}/LibIts/$i/src - cp ${CC_SRC_PATH}/Ports/LibIts_ports/IPv6oGN_ports/*.cc ${TTCN_3_DST_PATH}/LibIts/$i/src - cp ${CC_SRC_PATH}/Ports/LibIts_ports/IPv6oGN_ports/*.hh ${TTCN_3_DST_PATH}/LibIts/$i/include - cp ${CC_SRC_PATH}/Ports/LibIts_ports/*.hh ${TTCN_3_DST_PATH}/LibIts/$i/include - elif [ "$i" == "Security" ] - then - cp ${CC_SRC_PATH}/EncDec/LibItsSecurity_Encdec.cc ${TTCN_3_DST_PATH}/LibIts/$i/src - cp ${CC_SRC_PATH}/Externals/LibItsSecurity_externals.cc ${TTCN_3_DST_PATH}/LibIts/$i/src - elif [ "$i" == "Http" ] - then - cp ${CC_SRC_PATH}/EncDec/LibItsHttp_Encdec.cc ${TTCN_3_DST_PATH}/LibIts/$i/src - cp ${CC_SRC_PATH}/Ports/LibIts_ports/Http_ports/*.cc ${TTCN_3_DST_PATH}/LibIts/$i/src - cp ${CC_SRC_PATH}/Ports/LibIts_ports/Http_ports/*.hh ${TTCN_3_DST_PATH}/LibIts/$i/include - elif [ "$i" == "Pki" ] - then - cp ${CC_SRC_PATH}/EncDec/LibItsPki_Encdec.cc ${TTCN_3_DST_PATH}/LibIts/$i/src -# cp ${CC_SRC_PATH}/EncDec/LibItsSecurity_Encdec.cc ${TTCN_3_DST_PATH}/LibIts/$i/src -# cp ${CC_SRC_PATH}/Externals/LibItsSecurity_externals.cc ${TTCN_3_DST_PATH}/LibIts/$i/src - cp ${CC_SRC_PATH}/Ports/LibIts_ports/Pki_ports/*.cc ${TTCN_3_DST_PATH}/LibIts/$i/src - cp ${CC_SRC_PATH}/Ports/LibIts_ports/Pki_ports/*.hh ${TTCN_3_DST_PATH}/LibIts/$i/include - cp ${CC_SRC_PATH}/Ports/LibIts_ports/Pki_ports/*.partC ${TTCN_3_DST_PATH}/LibIts/$i/src - cp ${CC_SRC_PATH}/Ports/LibIts_ports/Pki_ports/*.partH ${TTCN_3_DST_PATH}/LibIts/$i/include - elif [ "$i" == "MapemSpatem" ] - then - cp ${CC_SRC_PATH}/EncDec/LibItsMapemSpatem_Encdec.cc ${TTCN_3_DST_PATH}/LibIts/$i/src - cp ${CC_SRC_PATH}/Ports/LibIts_ports/MapemSpatem_ports/*.cc ${TTCN_3_DST_PATH}/LibIts/$i/src - cp ${CC_SRC_PATH}/Ports/LibIts_ports/MapemSpatem_ports/*.hh ${TTCN_3_DST_PATH}/LibIts/$i/include - cp ${CC_SRC_PATH}/Ports/LibIts_ports/MapemSpatem_ports/*.partC ${TTCN_3_DST_PATH}/LibIts/$i/src - cp ${CC_SRC_PATH}/Ports/LibIts_ports/MapemSpatem_ports/*.partH ${TTCN_3_DST_PATH}/LibIts/$i/include - elif [ "$i" == "IVIM" ] - then - cp ${CC_SRC_PATH}/EncDec/LibItsIvim_Encdec.cc ${TTCN_3_DST_PATH}/LibIts/$i/src - cp ${CC_SRC_PATH}/Ports/LibIts_ports/IVIM_ports/*.cc ${TTCN_3_DST_PATH}/LibIts/$i/src - cp ${CC_SRC_PATH}/Ports/LibIts_ports/IVIM_ports/*.hh ${TTCN_3_DST_PATH}/LibIts/$i/include - cp ${CC_SRC_PATH}/Ports/LibIts_ports/IVIM_ports/*.partC ${TTCN_3_DST_PATH}/LibIts/$i/src - cp ${CC_SRC_PATH}/Ports/LibIts_ports/IVIM_ports/*.partH ${TTCN_3_DST_PATH}/LibIts/$i/include - elif [ "$i" == "SremSsem" ] - then - cp ${CC_SRC_PATH}/EncDec/LibItsSremSsem_Encdec.cc ${TTCN_3_DST_PATH}/LibIts/$i/src - cp ${CC_SRC_PATH}/Ports/LibIts_ports/SremSsem_ports/*.cc ${TTCN_3_DST_PATH}/LibIts/$i/src - cp ${CC_SRC_PATH}/Ports/LibIts_ports/SremSsem_ports/*.hh ${TTCN_3_DST_PATH}/LibIts/$i/include - cp ${CC_SRC_PATH}/Ports/LibIts_ports/SremSsem_ports/*.partC ${TTCN_3_DST_PATH}/LibIts/$i/src - cp ${CC_SRC_PATH}/Ports/LibIts_ports/SremSsem_ports/*.partH ${TTCN_3_DST_PATH}/LibIts/$i/include - elif [ "$i" == "Rtcmem" ] - then - cp ${CC_SRC_PATH}/EncDec/LibItsRtcmem_Encdec.cc ${TTCN_3_DST_PATH}/LibIts/$i/src - cp ${CC_SRC_PATH}/Ports/LibIts_ports/Rtcmem_ports/*.cc ${TTCN_3_DST_PATH}/LibIts/$i/src - cp ${CC_SRC_PATH}/Ports/LibIts_ports/Rtcmem_ports/*.hh ${TTCN_3_DST_PATH}/LibIts/$i/include - cp ${CC_SRC_PATH}/Ports/LibIts_ports/Rtcmem_ports/*.partC ${TTCN_3_DST_PATH}/LibIts/$i/src - cp ${CC_SRC_PATH}/Ports/LibIts_ports/Rtcmem_ports/*.partH ${TTCN_3_DST_PATH}/LibIts/$i/include - elif [ "$i" == "AtsRSUsSimulator" ] - then - cp ${CC_SRC_PATH}/Externals/AtsRSUsSimulator_externals.cc ${TTCN_3_DST_PATH}/$i/src - cp ${CC_SRC_PATH}/Ports/LibIts_ports/RSUsSimulator_ports/*.cc ${TTCN_3_DST_PATH}/$i/src - cp ${CC_SRC_PATH}/Ports/LibIts_ports/RSUsSimulator_ports/*.hh ${TTCN_3_DST_PATH}/$i/include - fi -done - -# Generate Bison parsers is any -cd ${FWK_DST_PATH}/src -if [ "${FWK_DIR_LIST_Y}" != "" ] -then - for i in ${FWK_DIR_LIST_Y} - do - BASE_NAME=$(basename "$i" .y) - bison ${BASE_NAME}.y --defines=../include/${BASE_NAME}.h -o${BASE_NAME}.c - done -fi -if [ "${FWK_DIR_LIST_L}" != "" ] -then - for i in ${FWK_DIR_LIST_L} - do - BASE_NAME=$(basename "$i" .l) - lex -o${BASE_NAME}_flex.c ${BASE_NAME}.l - done -fi -cd - - -# Apply patches -PATH_PATCHES=`pwd` -if [ -d ${PATH_PATCHES} ] -then - # Patch ASN1C Makefile - # Update GeoNetworking - cp ${PATH_PATCHES}/geonw_generate_makefile.bash ${PATH_DEV_ITS}/src/AtsGeoNetworking/bin - cp ${PATH_PATCHES}/run_mtc.bash ${PATH_DEV_ITS}/src/AtsGeoNetworking/bin - cp ${PATH_PATCHES}/run_ptcs.bash ${PATH_DEV_ITS}/src/AtsGeoNetworking/bin - cp ${PATH_PATCHES}/run_all.bash ${PATH_DEV_ITS}/src/AtsGeoNetworking/bin - # Update BTP - cp ${PATH_PATCHES}/btp_generate_makefile.bash ${PATH_DEV_ITS}/src/AtsBTP/bin - ${RUN_PATH}/etsi_its_patches/asn1c_patch.bash ${ASN1_DST_PATH}/../Makefile - # Update CAM - cp ${PATH_PATCHES}/cam_generate_makefile.bash ${PATH_DEV_ITS}/src/AtsCAM/bin - cp ${PATH_PATCHES}/run_mtc.bash ${PATH_DEV_ITS}/src/AtsCAM/bin - cp ${PATH_PATCHES}/run_ptcs.bash ${PATH_DEV_ITS}/src/AtsCAM/bin - cp ${PATH_PATCHES}/run_all.bash ${PATH_DEV_ITS}/src/AtsCAM/bin - # Update DENM - cp ${PATH_PATCHES}/denm_generate_makefile.bash ${PATH_DEV_ITS}/src/AtsDENM/bin - cp ${PATH_PATCHES}/run_mtc.bash ${PATH_DEV_ITS}/src/AtsDENM/bin - cp ${PATH_PATCHES}/run_ptcs.bash ${PATH_DEV_ITS}/src/AtsDENM/bin - cp ${PATH_PATCHES}/run_all.bash ${PATH_DEV_ITS}/src/AtsDENM/bin - # Update IVIM - cp ${PATH_PATCHES}/ivim_generate_makefile.bash ${PATH_DEV_ITS}/src/AtsIVIM/bin - cp ${PATH_PATCHES}/run_mtc.bash ${PATH_DEV_ITS}/src/AtsIVIM/bin - cp ${PATH_PATCHES}/run_ptcs.bash ${PATH_DEV_ITS}/src/AtsIVIM/bin - cp ${PATH_PATCHES}/run_all.bash ${PATH_DEV_ITS}/src/AtsIVIM/bin - # Update MAPEM/SPATEM - cp ${PATH_PATCHES}/mapemstatem_generate_makefile.bash ${PATH_DEV_ITS}/src/AtsMapemSpatem/bin - cp ${PATH_PATCHES}/run_mtc.bash ${PATH_DEV_ITS}/src/AtsMapemSpatem/bin - cp ${PATH_PATCHES}/run_ptcs.bash ${PATH_DEV_ITS}/src/AtsMapemSpatem/bin - cp ${PATH_PATCHES}/run_all.bash ${PATH_DEV_ITS}/src/AtsMapemSpatem/bin - # Update SREM/SSEM - cp ${PATH_PATCHES}/sremssem_generate_makefile.bash ${PATH_DEV_ITS}/src/AtsSremSsem/bin - cp ${PATH_PATCHES}/run_mtc.bash ${PATH_DEV_ITS}/src/AtsSremSsem/bin - cp ${PATH_PATCHES}/run_ptcs.bash ${PATH_DEV_ITS}/src/AtsSremSsem/bin - cp ${PATH_PATCHES}/run_all.bash ${PATH_DEV_ITS}/src/AtsSremSsem/bin - # Update RTCMEM - cp ${PATH_PATCHES}/rtcmem_generate_makefile.bash ${PATH_DEV_ITS}/src/AtsRtcmem/bin - cp ${PATH_PATCHES}/run_mtc.bash ${PATH_DEV_ITS}/src/AtsRtcmem/bin - cp ${PATH_PATCHES}/run_ptcs.bash ${PATH_DEV_ITS}/src/AtsRtcmem/bin - cp ${PATH_PATCHES}/run_all.bash ${PATH_DEV_ITS}/src/AtsRtcmem/bin - # Update RSUsSimulator - cp ${PATH_PATCHES}/rsusimulator_generate_makefile.bash ${PATH_DEV_ITS}/src/AtsRSUsSimulator/bin - cp ${PATH_PATCHES}/run_mtc.bash ${PATH_DEV_ITS}/src/AtsRSUsSimulator/bin - cp ${PATH_PATCHES}/run_ptcs.bash ${PATH_DEV_ITS}/src/AtsRSUsSimulator/bin - cp ${PATH_PATCHES}/run_all.bash ${PATH_DEV_ITS}/src/AtsRSUsSimulator/bin - # Update AutoInterop - cp ${CC_SRC_PATH}/Ports/LibIts_ports/AutoInterop_ports/*.cc ${TTCN_3_DST_PATH}/AtsAutoInterop/src - cp ${CC_SRC_PATH}/Ports/LibIts_ports/AutoInterop_ports/*.hh ${TTCN_3_DST_PATH}/AtsAutoInterop/include - cp ${PATH_PATCHES}/autointerop_generate_makefile.bash ${PATH_DEV_ITS}/src/AtsAutoInterop/bin - cp ${PATH_PATCHES}/run_mtc.bash ${PATH_DEV_ITS}/src/AtsAutoInterop/bin - cp ${PATH_PATCHES}/run_ptcs.bash ${PATH_DEV_ITS}/src/AtsAutoInterop/bin - cp ${PATH_PATCHES}/run_all.bash ${PATH_DEV_ITS}/src/AtsAutoInterop/bin - # Update Security - cp ${PATH_PATCHES}/security_generate_makefile.bash ${PATH_DEV_ITS}/src/AtsSecurity/bin - cp ${PATH_PATCHES}/run_mtc.bash ${PATH_DEV_ITS}/src/AtsSecurity/bin - cp ${PATH_PATCHES}/run_ptcs.bash ${PATH_DEV_ITS}/src/AtsSecurity/bin - cp ${PATH_PATCHES}/run_all.bash ${PATH_DEV_ITS}/src/AtsSecurity/bin - # Update GenCert - cp ${PATH_PATCHES}/gencert_generate_makefile.bash ${PATH_DEV_ITS}/src/AtsGenCert/bin - cp ${PATH_PATCHES}/run_mtc.bash ${PATH_DEV_ITS}/src/AtsGenCert/bin - cp ${PATH_PATCHES}/run_ptcs.bash ${PATH_DEV_ITS}/src/AtsGenCert/bin - cp ${PATH_PATCHES}/run_all.bash ${PATH_DEV_ITS}/src/AtsGenCert/bin - # Update Pki - cp ${PATH_PATCHES}/pki_generate_makefile.bash ${PATH_DEV_ITS}/src/AtsPki/bin - cp ${PATH_PATCHES}/run_mtc.bash ${PATH_DEV_ITS}/src/AtsPki/bin - cp ${PATH_PATCHES}/run_ptcs.bash ${PATH_DEV_ITS}/src/AtsPki/bin - cp ${PATH_PATCHES}/run_all.bash ${PATH_DEV_ITS}/src/AtsPki/bin -fi - -# Set rights -find ${PATH_DEV_ITS} -type f -exec chmod 664 {} \; -find ${PATH_DEV_ITS} -name "*.bash" -type f -exec chmod 775 {} \; -find ${PATH_DEV_ITS} -type d -exec chmod 775 {} \; -chown -R ${CHOWN_USER_GROUP} ${PATH_DEV_ITS} - -# Build libAsn1 -mkdir ${PATH_DEV_ITS}/bin/asn1 -cd ${PATH_DEV_ITS}/bin/asn1 -make CC=gcc -f ${PATH_DEV_ITS}/asn1/Makefile -# Remove useless ASN.1 files -rm -fr ${PATH_DEV_ITS}/ttcn/LibIts/asn1/IS/ISO_TS_19091/original -rm -f ${PATH_DEV_ITS}/ttcn/LibIts/asn1/Security/TS102921/EtsiTs102941MessagesItss.asn -rm -f ${PATH_DEV_ITS}/ttcn/LibIts/asn1/Security/TS102921/EtsiTs102941MessagesItss-OptionalPrivacy.asn - -cd - -if [ ! -d ${PATH_DEV_ITS}/include/asn1 ] -then - mkdir ${PATH_DEV_ITS}/include/asn1 -else - for i in `find ${PATH_DEV_ITS}/include/asn1 -name "*.h"`; - do - rm $i - done -fi -for i in `find ${PATH_DEV_ITS}/bin/asn1 -name "*.h"` -do - cp $i ${PATH_DEV_ITS}/include/asn1 -done -ln -sf ${PATH_DEV_ITS}/bin/asn1/libItsAsn.so ${PATH_DEV_ITS}/lib/libItsAsn.so -ls -ltr ${PATH_DEV_ITS}/lib -echo ${LD_LIBRARY_PATH} -#cp ${HOME}/frameworks/asn1c/skeletons/ANY.h ${PATH_DEV_ITS}/include/asn1 -cd ${OLDPWD} - -exit 0 diff --git a/tools/itscertgen/asn1certgen/asn1certgen.c b/tools/itscertgen/asn1certgen/asn1certgen.c index cc96ca73a442be231e0b1522ddd8e361b7276a3c..3e47689c1321263b9226c669e8fa87a957b065cd 100644 --- a/tools/itscertgen/asn1certgen/asn1certgen.c +++ b/tools/itscertgen/asn1certgen/asn1certgen.c @@ -43,6 +43,7 @@ static const char _sha384_emptyString[] = { EtsiTs103097Certificate_t * _cert = NULL; EtsiTs103097Certificate_t * _issuer = NULL; +int _tbsHashType = 0; char _tbsHash[512]; // has space for issuer hash + signer hash int _tbsHashLength = 0; @@ -135,7 +136,6 @@ static asn_enc_rval_t ToBeSignedCertificate_oer_encoder(const asn_TYPE_descripto asn_app_consume_bytes_f *cb, void *app_key) { asn_enc_rval_t rc; - ToBeSignedCertificate_t * tbs = (ToBeSignedCertificate_t*)sptr; overrun_encoder_key *a = (overrun_encoder_key*)app_key; const char * oer = ((const char*)a->buffer) + a->computed_size; rc = SEQUENCE_encode_oer(td, constraints, sptr, cb, app_key); @@ -146,12 +146,11 @@ static asn_enc_rval_t ToBeSignedCertificate_oer_encoder(const asn_TYPE_descripto fprintf(stderr, "DEBUG: ToBeSigned OER[%zu]=%s\n", rc.encoded, hex); } // calculate hash - if (tbs->verifyKeyIndicator.present == VerificationKeyIndicator_PR_verificationKey && - tbs->verifyKeyIndicator.choice.verificationKey.present == PublicVerificationKey_PR_ecdsaBrainpoolP384r1) { + if (_signerHashLength == sha384_hash_size) { _tbsHashLength = 48; sha384_calculate(_tbsHash, (const char*)oer, rc.encoded); } - else{ + else { _tbsHashLength = 32; sha256_calculate(_tbsHash, (const char*)oer, rc.encoded); } @@ -180,6 +179,13 @@ static ecc_curve_id _pk_type_to_hashid[] = { sha_384 //Signature_PR_ecdsaBrainpoolP384r1Signature }; +static size_t _pk_type_to_hashsize[] = { + 0, + sha256_hash_size, //Signature_PR_ecdsaNistP256Signature, + sha256_hash_size, //Signature_PR_ecdsaBrainpoolP256r1Signature, + sha384_hash_size //Signature_PR_ecdsaBrainpoolP384r1Signature +}; + static asn_enc_rval_t Signature_oer_encoder(const asn_TYPE_descriptor_t *td, const asn_oer_constraints_t *constraints, const void *sptr, asn_app_consume_bytes_f *cb, void *app_key) @@ -434,6 +440,12 @@ int main(int argc, char ** argv) fprintf(stderr, "%s: signer verification indicator type is unknown\n", _signerName); return -1; } + _tbsHashType = hashType; + + if (signer->signature && signer->signature->choice.ecdsaNistP256Signature.rSig.present != EccP256CurvePoint_PR_x_only) { + char* pTypePtr = buf + rc_d.consumed - 1 - (2 * _pk_type_to_hashsize[hashType]); + *pTypePtr = 0x80; + } switch (hashType){ case PublicVerificationKey_PR_ecdsaBrainpoolP256r1: @@ -474,6 +486,9 @@ int main(int argc, char ** argv) fprintf(stderr, "%s: signer verification indicator type is unknown\n", _signerName); return -1; } + + _tbsHashType = hashType; + switch (hashType) { case PublicVerificationKey_PR_ecdsaBrainpoolP256r1: case PublicVerificationKey_PR_ecdsaNistP256: diff --git a/ttcn/AtsCAM/Makefile b/ttcn/AtsCAM/Makefile new file mode 100644 index 0000000000000000000000000000000000000000..ff67e0c1f0bc3438f03f421210818cfa9ebc9450 --- /dev/null +++ b/ttcn/AtsCAM/Makefile @@ -0,0 +1,2 @@ +all clean echo: + $(MAKE) -C ../.. ATS=AtsCAM $@ \ No newline at end of file diff --git a/ttcn/AtsCAM/module.mk b/ttcn/AtsCAM/module.mk new file mode 100644 index 0000000000000000000000000000000000000000..0337741c5371de2af1d9d5bb2b0b32a57c68f37e --- /dev/null +++ b/ttcn/AtsCAM/module.mk @@ -0,0 +1,41 @@ +suite := AtsCAM + +sources := ItsCam_TestCases.ttcn \ + ItsCam_TestControl.ttcn \ + ItsCam_TpFunctions.ttcn + +modules := ../LibCommon \ + ../LibIts \ + ../LibIts/asn1/CAM \ + ../LibIts/asn1/IS \ + ../LibIts/asn1/Security \ + ../LibIts/ttcn/CAM \ + ../LibIts/ttcn/Security \ + ../LibIts/ttcn/GeoNetworking \ + ../LibIts/ttcn/Ipv6OverGeoNetworking \ + ../LibIts/ttcn/BTP \ + ../../ccsrc/Ports/LibIts_ports \ + ../../ccsrc/Ports/LibIts_ports/CAM_ports \ + ../../ccsrc/Ports/LibIts_ports/GN_ports \ + ../../ccsrc/Ports/LibIts_ports/IPv6oGN_ports \ + ../../ccsrc/Ports/LibIts_ports/BTP_ports \ + ../../ccsrc/EncDec \ + ../../ccsrc/Framework \ + ../../ccsrc/Externals \ + ../../ccsrc/loggers \ + ../../ccsrc/Asn1c \ + ../../ccsrc/Protocols/CAM \ + ../../ccsrc/Protocols/GeoNetworking \ + ../../ccsrc/Protocols/BTP \ + ../../ccsrc/Protocols/ETH \ + ../../ccsrc/Protocols/Pcap \ + ../../ccsrc/Protocols/UpperTester \ + ../../ccsrc/Protocols/Security \ + ../../ccsrc/geospacial \ +# ../../ccsrc/Protocols/UDP \ +# ../../ccsrc/Protocols/Http \ +# ../../ccsrc/Protocols/DENM \ +# ../../ccsrc/Protocols/IVIM \ +# ../../ccsrc/Protocols/MapemSpatem \ +# ../../ccsrc/Protocols/SremSsem \ + diff --git a/ttcn/AtsDENM/module.mk b/ttcn/AtsDENM/module.mk new file mode 100644 index 0000000000000000000000000000000000000000..133cde8194fd5830f43ea33a4b71c62ba5dfa85f --- /dev/null +++ b/ttcn/AtsDENM/module.mk @@ -0,0 +1,36 @@ +sources := ItsDenm_TestCases.ttcn \ + ItsDenm_TestControl.ttcn \ + ItsDenm_TpFunctions.ttcn + +modules := ../LibCommon \ + ../LibIts \ + ../LibIts/asn1/DENM \ + ../LibIts/asn1/IS \ + ../LibIts/asn1/Security \ + ../LibIts/ttcn/DENM \ + ../LibIts/ttcn/Security \ + ../LibIts/ttcn/GeoNetworking \ + ../LibIts/ttcn/Ipv6OverGeoNetworking \ + ../LibIts/ttcn/BTP \ + ../../ccsrc/Ports/LibIts_ports \ + ../../ccsrc/Ports/LibIts_ports/DENM_ports \ + ../../ccsrc/Ports/LibIts_ports/GN_ports \ + ../../ccsrc/Ports/LibIts_ports/IPv6oGN_ports \ + ../../ccsrc/Ports/LibIts_ports/BTP_ports \ + ../../ccsrc/EncDec \ + ../../ccsrc/Framework \ + ../../ccsrc/Externals \ + ../../ccsrc/loggers \ + ../../ccsrc/Asn1c \ + ../../ccsrc/Protocols/DENM \ + ../../ccsrc/Protocols/GeoNetworking \ + ../../ccsrc/Protocols/BTP \ + ../../ccsrc/Protocols/ETH \ + ../../ccsrc/Protocols/Pcap \ + ../../ccsrc/Protocols/UpperTester \ + ../../ccsrc/Protocols/Security \ +# ../../ccsrc/Protocols/Http \ +# ../../ccsrc/Protocols/DENM \ +# ../../ccsrc/Protocols/IVIM \ +# ../../ccsrc/Protocols/MapemSpatem \ +# ../../ccsrc/Protocols/SremSsem \ diff --git a/ttcn/AtsGeoNetworking/module.mk b/ttcn/AtsGeoNetworking/module.mk new file mode 100644 index 0000000000000000000000000000000000000000..e790ab26c8f0c876778d42783a83f3aae1878bcc --- /dev/null +++ b/ttcn/AtsGeoNetworking/module.mk @@ -0,0 +1,28 @@ +sources := \ + ItsGeoNetworking_TestCases.ttcn \ + ItsGeoNetworking_TestControl.ttcn \ + ItsGeoNetworking_TpFunctions.ttcn + +modules := ../LibCommon \ + ../LibIts \ + ../LibIts/ttcn/GeoNetworking \ + ../LibIts/ttcn/Ipv6OverGeoNetworking \ + ../LibIts/ttcn/Security \ + ../../ccsrc/Ports/LibIts_ports \ + ../../ccsrc/Ports/LibIts_ports/GN_ports \ + ../../ccsrc/Ports/LibIts_ports/IPv6oGN_ports \ + ../../ccsrc/EncDec \ + ../../ccsrc/Framework \ + ../../ccsrc/Externals \ + ../../ccsrc/loggers \ + ../../ccsrc/Asn1c \ + ../../ccsrc/Protocols/GeoNetworking \ + ../../ccsrc/Protocols/UpperTester \ + ../../ccsrc/Protocols/Security \ +# ../../ccsrc/Protocols/BTP \ +# ../../ccsrc/Protocols/Pcap \ +# ../../ccsrc/Protocols/Http \ +# ../../ccsrc/Protocols/DENM \ +# ../../ccsrc/Protocols/IVIM \ +# ../../ccsrc/Protocols/MapemSpatem \ +# ../../ccsrc/Protocols/SremSsem \ diff --git a/ttcn/AtsIVIM/Makefile b/ttcn/AtsIVIM/Makefile new file mode 100644 index 0000000000000000000000000000000000000000..e007d8976170c9f50b294fa22288341c8486fcaa --- /dev/null +++ b/ttcn/AtsIVIM/Makefile @@ -0,0 +1,2 @@ +all clean echo: + $(MAKE) -C ../.. ATS=AtsIVIM $@ diff --git a/ttcn/AtsIVIM/module.mk b/ttcn/AtsIVIM/module.mk new file mode 100644 index 0000000000000000000000000000000000000000..5d831b479c28d8f84e2852cb724acdaceb3bef37 --- /dev/null +++ b/ttcn/AtsIVIM/module.mk @@ -0,0 +1,39 @@ +suite := AtsIVIM + +sources := ItsIvim_TestCases.ttcn \ + ItsIvim_TestControl.ttcn \ + ItsIvim_TpFunctions.ttcn + +modules := ../LibCommon \ + ../LibIts \ + ../LibIts/asn1/CAM \ + ../LibIts/asn1/IS \ + ../LibIts/asn1/Security \ + ../LibIts/ttcn/IVIM \ + ../LibIts/ttcn/Security \ + ../LibIts/ttcn/GeoNetworking \ + ../LibIts/ttcn/Ipv6OverGeoNetworking \ + ../LibIts/ttcn/BTP \ + ../../ccsrc/Ports/LibIts_ports \ + ../../ccsrc/Ports/LibIts_ports/IVIM_ports \ + ../../ccsrc/Ports/LibIts_ports/GN_ports \ + ../../ccsrc/Ports/LibIts_ports/IPv6oGN_ports \ + ../../ccsrc/Ports/LibIts_ports/BTP_ports \ + ../../ccsrc/EncDec \ + ../../ccsrc/Framework \ + ../../ccsrc/Externals \ + ../../ccsrc/loggers \ + ../../ccsrc/Asn1c \ + ../../ccsrc/Protocols/IVIM \ + ../../ccsrc/Protocols/GeoNetworking \ + ../../ccsrc/Protocols/BTP \ + ../../ccsrc/Protocols/ETH \ + ../../ccsrc/Protocols/Pcap \ + ../../ccsrc/Protocols/UpperTester \ + ../../ccsrc/Protocols/Security \ +# ../../ccsrc/Protocols/UDP \ +# ../../ccsrc/Protocols/Http \ +# ../../ccsrc/Protocols/DENM \ +# ../../ccsrc/Protocols/IVIM \ +# ../../ccsrc/Protocols/MapemSpatem \ + diff --git a/ttcn/AtsMapemSpatem/module.mk b/ttcn/AtsMapemSpatem/module.mk new file mode 100644 index 0000000000000000000000000000000000000000..3fec29b69a96dbc902acdb182e961e1cc20c2934 --- /dev/null +++ b/ttcn/AtsMapemSpatem/module.mk @@ -0,0 +1,41 @@ +suite := AtsMapemSpatem + +sources := \ + ItsMapem_TestCases.ttcn \ + ItsMapem_TpFunctions.ttcn \ + ItsMapemSpatem_TestControl.ttcn \ + ItsSpatem_TestCases.ttcn \ + ItsSpatem_TpFunctions.ttcn + +modules := ../LibCommon \ + ../LibIts \ + ../LibIts/asn1/CAM \ + ../LibIts/asn1/IS \ + ../LibIts/asn1/Security \ + ../LibIts/ttcn/MapemSpatem \ + ../LibIts/ttcn/Security \ + ../LibIts/ttcn/GeoNetworking \ + ../LibIts/ttcn/Ipv6OverGeoNetworking \ + ../LibIts/ttcn/BTP \ + ../../ccsrc/Ports/LibIts_ports \ + ../../ccsrc/Ports/LibIts_ports/MapemSpatem_ports \ + ../../ccsrc/Ports/LibIts_ports/GN_ports \ + ../../ccsrc/Ports/LibIts_ports/IPv6oGN_ports \ + ../../ccsrc/Ports/LibIts_ports/BTP_ports \ + ../../ccsrc/EncDec \ + ../../ccsrc/Framework \ + ../../ccsrc/Externals \ + ../../ccsrc/loggers \ + ../../ccsrc/Asn1c \ + ../../ccsrc/Protocols/MapemSpatem \ + ../../ccsrc/Protocols/GeoNetworking \ + ../../ccsrc/Protocols/BTP \ + ../../ccsrc/Protocols/ETH \ + ../../ccsrc/Protocols/Pcap \ + ../../ccsrc/Protocols/UpperTester \ + ../../ccsrc/Protocols/Security \ +# ../../ccsrc/Protocols/UDP \ +# ../../ccsrc/Protocols/Http \ +# ../../ccsrc/Protocols/DENM \ +# ../../ccsrc/Protocols/IVIM \ + diff --git a/ttcn/AtsPki/module.mk b/ttcn/AtsPki/module.mk new file mode 100755 index 0000000000000000000000000000000000000000..da5716b9f018b9be3437ff7f24d64dfbe2fc61f2 --- /dev/null +++ b/ttcn/AtsPki/module.mk @@ -0,0 +1,48 @@ +suite := AtsPki + +sources := ItsPki_Pixits.ttcn \ + ItsPki_TestCases.ttcn \ + ItsPki_TestControl.ttcn + +modules := ../LibCommon \ + ../LibIts \ + ../LibIts/asn1/CAM \ + ../LibIts/asn1/DENM \ + ../LibIts/asn1/IS \ + ../LibIts/asn1/Security \ + ../LibIts/ttcn/Security \ + ../LibIts/ttcn/Pki \ + ../LibIts/ttcn/HTTP \ + ../LibIts/ttcn/GeoNetworking \ + ../LibIts/ttcn/Ipv6OverGeoNetworking \ + ../../ccsrc/Ports/LibIts_ports \ + ../../ccsrc/Ports/LibIts_ports/Http_ports \ + ../../ccsrc/Ports/LibIts_ports/Pki_ports \ + ../../ccsrc/Ports/LibIts_ports/GN_ports \ + ../../ccsrc/Ports/LibIts_ports/IPv6oGN_ports \ + ../../ccsrc/EncDec \ + ../../ccsrc/Framework \ + ../../ccsrc/Externals \ + ../../ccsrc/loggers \ + ../../ccsrc/Asn1c \ + ../../ccsrc/Protocols/UpperTester \ + ../../ccsrc/Protocols/Http \ + ../../ccsrc/Protocols/Security \ + ../../ccsrc/Protocols/GeoNetworking \ + ../modules/titan.TestPorts.HTTPmsg + +# ../LibIts/ttcn/CAM \ +# ../LibIts/ttcn/DENM \ +# ../LibIts/ttcn/BTP \ +# ../../ccsrc/Ports/LibIts_ports/CAM_ports \ +# ../../ccsrc/Protocols/Pcap \ +# ../../ccsrc/Protocols/ETH \ +# ../../ccsrc/Protocols/BTP \ +# ../../ccsrc/Protocols/CAM \ +# ../../ccsrc/Protocols/DENM \ +# ../../ccsrc/Protocols/IVIM \ +# ../../ccsrc/Protocols/MapemSpatem \ +# ../../ccsrc/Protocols/SremSsem \ + +#includes := \ +# ../../ccsrc/Ports/LibIts_ports/BTP_ports \ No newline at end of file diff --git a/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_TestSystem.ttcn b/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_TestSystem.ttcn index 2e30e85aed14044bb27e24e9ebba9b009970260a..ae9937770e11f335c31d4149556aef3ae45e1102 100644 --- a/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_TestSystem.ttcn +++ b/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_TestSystem.ttcn @@ -1,3 +1,5 @@ +/**dfvdfgd +*/ module ItsRSUsSimulator_TestSystem { // LibIts diff --git a/ttcn/AtsRSUsSimulator/Makefile b/ttcn/AtsRSUsSimulator/Makefile new file mode 100644 index 0000000000000000000000000000000000000000..f91ea34ef9cb3abee956b34e404cb42bcec5f548 --- /dev/null +++ b/ttcn/AtsRSUsSimulator/Makefile @@ -0,0 +1,2 @@ +all clean echo: + $(MAKE) -C ../.. ATS=AtsRSUsSimulator $@ \ No newline at end of file diff --git a/ttcn/AtsRSUsSimulator/module.mk b/ttcn/AtsRSUsSimulator/module.mk new file mode 100644 index 0000000000000000000000000000000000000000..0ee54d37b16394733198192131adc385fff9ff8d --- /dev/null +++ b/ttcn/AtsRSUsSimulator/module.mk @@ -0,0 +1,65 @@ +sources := \ + ItsRSUsSimulator_Functions.ttcn \ + ItsRSUsSimulator_Pics.ttcn \ + ItsRSUsSimulator_PicsInitConsts.ttcn \ + ItsRSUsSimulator_Pixits.ttcn \ + ItsRSUsSimulator_Templates.ttcn \ + ItsRSUsSimulator_TestCases.ttcn \ + ItsRSUsSimulator_TestControl.ttcn \ + ItsRSUsSimulator_TestSystem.ttcn \ + ItsRSUsSimulator_TypesAndValues.ttcn + +modules := ../LibCommon \ + ../LibIts \ + ../LibIts/asn1/CAM \ + ../LibIts/asn1/DENM \ + ../LibIts/asn1/Security \ + ../LibIts/asn1/IS \ + ../LibIts/ttcn/BTP \ + ../LibIts/ttcn/CAM \ + ../LibIts/ttcn/DENM \ + ../LibIts/ttcn/IVIM \ + ../LibIts/ttcn/MapemSpatem \ + ../LibIts/ttcn/SremSsem \ + ../LibIts/ttcn/Rtcmem \ + ../LibIts/ttcn/Pki \ + ../LibIts/ttcn/Security \ + ../LibIts/ttcn/GeoNetworking \ + ../LibIts/ttcn/Ipv6OverGeoNetworking \ + ../LibIts/ttcn/Http \ + ../../ccsrc/Ports/LibIts_ports \ + ../../ccsrc/Ports/LibIts_ports/CAM_ports \ + ../../ccsrc/Ports/LibIts_ports/DENM_ports \ + ../../ccsrc/Ports/LibIts_ports/GN_ports \ + ../../ccsrc/Ports/LibIts_ports/IPv6oGN_ports \ + ../../ccsrc/Ports/LibIts_ports/BTP_ports \ + ../../ccsrc/Ports/LibIts_ports/Http_ports \ + ../../ccsrc/Ports/LibIts_ports/IVIM_ports \ + ../../ccsrc/Ports/LibIts_ports/MapemSpatem_ports \ + ../../ccsrc/Ports/LibIts_ports/SremSsem_ports \ + ../../ccsrc/Ports/LibIts_ports/Rtcmem_ports \ + ../../ccsrc/Ports/LibIts_ports/Pki_ports \ + ../../ccsrc/Ports/LibIts_ports/RSUsSimulator_ports \ + ../../ccsrc/EncDec \ + ../../ccsrc/Framework \ + ../../ccsrc/Externals \ + ../../ccsrc/loggers \ + ../../ccsrc/Asn1c \ + ../../ccsrc/Protocols/CAM \ + ../../ccsrc/Protocols/DENM \ + ../../ccsrc/Protocols/GeoNetworking \ + ../../ccsrc/Protocols/BTP \ + ../../ccsrc/Protocols/Pcap \ + ../../ccsrc/Protocols/ETH \ + ../../ccsrc/Protocols/UpperTester \ + ../../ccsrc/Protocols/Security \ + ../../ccsrc/Protocols/Http \ + ../../ccsrc/Protocols/DENM \ + ../../ccsrc/Protocols/IVIM \ + ../../ccsrc/Protocols/MapemSpatem \ + ../../ccsrc/Protocols/Rtcmem \ + ../../ccsrc/Protocols/SremSsem \ + + + + diff --git a/ttcn/AtsRtcmem/Makefile b/ttcn/AtsRtcmem/Makefile new file mode 100644 index 0000000000000000000000000000000000000000..6aff436fb1198ebf38922bc9239a0f9d298e7319 --- /dev/null +++ b/ttcn/AtsRtcmem/Makefile @@ -0,0 +1,2 @@ +all clean echo: + $(MAKE) -C ../.. ATS=AtsRtcmem $@ diff --git a/ttcn/AtsRtcmem/module.mk b/ttcn/AtsRtcmem/module.mk new file mode 100644 index 0000000000000000000000000000000000000000..a1cb32b4dfc6ea949e46842313870bb2646d6740 --- /dev/null +++ b/ttcn/AtsRtcmem/module.mk @@ -0,0 +1,38 @@ +suite := AtsRtcmem + +sources := \ + ItsRtcmem_TestCases.ttcn \ + ItsRtcmem_TestControl.ttcn \ + ItsRtcmem_TpFunctions.ttcn + +modules := ../LibCommon \ + ../LibIts \ + ../LibIts/asn1/CAM \ + ../LibIts/asn1/IS \ + ../LibIts/asn1/Security \ + ../LibIts/ttcn/Rtcmem \ + ../LibIts/ttcn/Security \ + ../LibIts/ttcn/GeoNetworking \ + ../LibIts/ttcn/Ipv6OverGeoNetworking \ + ../LibIts/ttcn/BTP \ + ../../ccsrc/Ports/LibIts_ports \ + ../../ccsrc/Ports/LibIts_ports/Rtcmem_ports \ + ../../ccsrc/Ports/LibIts_ports/GN_ports \ + ../../ccsrc/Ports/LibIts_ports/IPv6oGN_ports \ + ../../ccsrc/Ports/LibIts_ports/BTP_ports \ + ../../ccsrc/EncDec \ + ../../ccsrc/Framework \ + ../../ccsrc/Externals \ + ../../ccsrc/loggers \ + ../../ccsrc/Asn1c \ + ../../ccsrc/Protocols/Rtcmem \ + ../../ccsrc/Protocols/GeoNetworking \ + ../../ccsrc/Protocols/BTP \ + ../../ccsrc/Protocols/Pcap \ + ../../ccsrc/Protocols/UpperTester \ + ../../ccsrc/Protocols/Security \ +# ../../ccsrc/Protocols/UDP \ +# ../../ccsrc/Protocols/Http \ +# ../../ccsrc/Protocols/DENM \ +# ../../ccsrc/Protocols/IVIM \ + diff --git a/ttcn/AtsSecurity/module.mk b/ttcn/AtsSecurity/module.mk new file mode 100644 index 0000000000000000000000000000000000000000..6d09bf27cf8177aeba404279dddc86f2bef5a50c --- /dev/null +++ b/ttcn/AtsSecurity/module.mk @@ -0,0 +1,44 @@ +suite := AtsSecurity + +sources := ItsSecurity_Functions.ttcn \ + ItsSecurity_Templates.ttcn \ + ItsSecurity_TestCases.ttcn \ + ItsSecurity_TestControl.ttcn \ + ItsSecurity_TestSystem.ttcn +# ItsSecurity_Pics.ttcn \ + +modules := ../LibCommon \ + ../LibIts \ + ../LibIts/asn1/CAM \ + ../LibIts/asn1/DENM \ + ../LibIts/asn1/IS \ + ../LibIts/asn1/Security \ + ../LibIts/ttcn/CAM \ + ../LibIts/ttcn/DENM \ + ../LibIts/ttcn/Security \ + ../LibIts/ttcn/GeoNetworking \ + ../LibIts/ttcn/Ipv6OverGeoNetworking \ + ../LibIts/ttcn/BTP \ + ../../ccsrc/Ports/LibIts_ports \ + ../../ccsrc/Ports/LibIts_ports/CAM_ports \ + ../../ccsrc/Ports/LibIts_ports/DENM_ports \ + ../../ccsrc/Ports/LibIts_ports/GN_ports \ + ../../ccsrc/Ports/LibIts_ports/IPv6oGN_ports \ + ../../ccsrc/Ports/LibIts_ports/BTP_ports \ + ../../ccsrc/EncDec \ + ../../ccsrc/Framework \ + ../../ccsrc/Externals \ + ../../ccsrc/loggers \ + ../../ccsrc/Asn1c \ + ../../ccsrc/Protocols/UpperTester \ + ../../ccsrc/Protocols/Pcap \ + ../../ccsrc/Protocols/ETH \ + ../../ccsrc/Protocols/GeoNetworking \ + ../../ccsrc/Protocols/BTP \ + ../../ccsrc/Protocols/Security \ + ../../ccsrc/Protocols/CAM \ + ../../ccsrc/Protocols/DENM \ +# ../../ccsrc/Protocols/Http \ +# ../../ccsrc/Protocols/IVIM \ +# ../../ccsrc/Protocols/MapemSpatem \ +# ../../ccsrc/Protocols/SremSsem \ diff --git a/ttcn/AtsSremSsem/module.mk b/ttcn/AtsSremSsem/module.mk new file mode 100644 index 0000000000000000000000000000000000000000..d774e832706f3f5fddbdeefea119c20d73652cf0 --- /dev/null +++ b/ttcn/AtsSremSsem/module.mk @@ -0,0 +1,42 @@ +suite := AtsSremSsem + +sources := \ + ItsSrem_TestCases.ttcn \ + ItsSrem_TpFunctions.ttcn \ + ItsSremSsem_TestControl.ttcn \ + ItsSsem_TestCases.ttcn \ + ItsSsem_TpFunctions.ttcn + +modules := ../LibCommon \ + ../LibIts \ + ../LibIts/asn1/CAM \ + ../LibIts/asn1/IS \ + ../LibIts/asn1/Security \ + ../LibIts/ttcn/SremSsem \ + ../LibIts/ttcn/Security \ + ../LibIts/ttcn/GeoNetworking \ + ../LibIts/ttcn/Ipv6OverGeoNetworking \ + ../LibIts/ttcn/BTP \ + ../../ccsrc/Ports/LibIts_ports \ + ../../ccsrc/Ports/LibIts_ports/SremSsem_ports \ + ../../ccsrc/Ports/LibIts_ports/GN_ports \ + ../../ccsrc/Ports/LibIts_ports/IPv6oGN_ports \ + ../../ccsrc/Ports/LibIts_ports/BTP_ports \ + ../../ccsrc/EncDec \ + ../../ccsrc/Framework \ + ../../ccsrc/Externals \ + ../../ccsrc/loggers \ + ../../ccsrc/Asn1c \ + ../../ccsrc/Protocols/SremSsem \ + ../../ccsrc/Protocols/GeoNetworking \ + ../../ccsrc/Protocols/BTP \ + ../../ccsrc/Protocols/ETH \ + ../../ccsrc/Protocols/Pcap \ + ../../ccsrc/Protocols/UpperTester \ + ../../ccsrc/Protocols/Security \ +# ../../ccsrc/Protocols/UDP \ +# ../../ccsrc/Protocols/Http \ +# ../../ccsrc/Protocols/DENM \ +# ../../ccsrc/Protocols/IVIM \ +# ../../ccsrc/Protocols/MapemSpatem \ + diff --git a/ttcn/LibCommon b/ttcn/LibCommon index 1c35e012cb65152abd1ab432a82d23a755c1276e..fa2b5c7d9d2a170e4d876d82ed5e865d925837a7 160000 --- a/ttcn/LibCommon +++ b/ttcn/LibCommon @@ -1 +1 @@ -Subproject commit 1c35e012cb65152abd1ab432a82d23a755c1276e +Subproject commit fa2b5c7d9d2a170e4d876d82ed5e865d925837a7 diff --git a/ttcn/LibIts b/ttcn/LibIts index 6923d0bb14bcf3bf4dd32d830a9989820fddb0ee..ec30313a90a101f519e9c41c5225981c3c3f02da 160000 --- a/ttcn/LibIts +++ b/ttcn/LibIts @@ -1 +1 @@ -Subproject commit 6923d0bb14bcf3bf4dd32d830a9989820fddb0ee +Subproject commit ec30313a90a101f519e9c41c5225981c3c3f02da diff --git a/ttcn/modules/titan.TestPorts.Common_Components.Abstract_Socket/module b/ttcn/modules/titan.TestPorts.Common_Components.Abstract_Socket/module new file mode 160000 index 0000000000000000000000000000000000000000..bd41994ab31af385c0b87a8074bf9f768c28c514 --- /dev/null +++ b/ttcn/modules/titan.TestPorts.Common_Components.Abstract_Socket/module @@ -0,0 +1 @@ +Subproject commit bd41994ab31af385c0b87a8074bf9f768c28c514 diff --git a/ttcn/modules/titan.TestPorts.Common_Components.Abstract_Socket/module.mk b/ttcn/modules/titan.TestPorts.Common_Components.Abstract_Socket/module.mk new file mode 100755 index 0000000000000000000000000000000000000000..9b0b530e68349c8056d17bf0cfc676adf70adcb8 --- /dev/null +++ b/ttcn/modules/titan.TestPorts.Common_Components.Abstract_Socket/module.mk @@ -0,0 +1,2 @@ +sources := module/src/Abstract_Socket.cc +includes := module/src \ No newline at end of file diff --git a/ttcn/modules/titan.TestPorts.HTTPmsg/module b/ttcn/modules/titan.TestPorts.HTTPmsg/module new file mode 160000 index 0000000000000000000000000000000000000000..9a0dfdecfd33cf083890aa537015de718f960642 --- /dev/null +++ b/ttcn/modules/titan.TestPorts.HTTPmsg/module @@ -0,0 +1 @@ +Subproject commit 9a0dfdecfd33cf083890aa537015de718f960642 diff --git a/ttcn/modules/titan.TestPorts.HTTPmsg/module.mk b/ttcn/modules/titan.TestPorts.HTTPmsg/module.mk new file mode 100755 index 0000000000000000000000000000000000000000..f8df57abc8b77d674486cea82c53e0f4615625f0 --- /dev/null +++ b/ttcn/modules/titan.TestPorts.HTTPmsg/module.mk @@ -0,0 +1,9 @@ +sources := module/src/HTTPmsg_MessageLen.ttcn \ + module/src/HTTPmsg_MessageLen_Function.cc \ + module/src/HTTPmsg_PortType.ttcn \ + module/src/HTTPmsg_PT.cc \ + module/src/HTTPmsg_PT.hh \ + module/src/HTTPmsg_Types.ttcn +includes := module/src + +modules := ../titan.TestPorts.Common_Components.Abstract_Socket diff --git a/vagrant/provisioner.bash b/vagrant/provisioner.bash index db25adf3fb623da1e96b4b77ffdd873431bbe142..d2825beaeb6eb1e9c7b33fba6757ea12c2551ce8 100755 --- a/vagrant/provisioner.bash +++ b/vagrant/provisioner.bash @@ -9,7 +9,7 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y sudo DEBIAN_FRONTEND=noninteractive apt-get install software-properties-common -y sudo DEBIAN_FRONTEND=noninteractive add-apt-repository ppa:linuxuprising/java -y sudo DEBIAN_FRONTEND=noninteractive apt-get update -sudo DEBIAN_FRONTEND=noninteractive apt-get --allow-unauthenticated install emacs openjdk-11-jre gcc-8 g++-8 git subversion lsof ntp gdb make cmake flex bison autoconf doxygen graphviz libtool libncurses5-dev expect libssl-dev libgcrypt-dev libxml2-dev xutils-dev tcpdump libpcap-dev libwireshark-dev wget tree unzip sshpass kubuntu-desktop valgrind qt5-default qttools5-dev qtmultimedia5-dev libqt5svg5-dev vim tzdata dos2unix xsltproc -y +sudo DEBIAN_FRONTEND=noninteractive apt-get --allow-unauthenticated install emacs openjdk-11-jre gcc-8 g++-8 git subversion lsof ntp gdb make cmake flex bison autoconf doxygen graphviz libtool libncurses5-dev expect libssl-dev libgcrypt-dev libxml2-dev libedit2 libedit-dev xutils-dev libjsoncpp-dev tcpdump libpcap-dev libwireshark-dev wget tree unzip sshpass kubuntu-desktop valgrind qt5-default qttools5-dev qtmultimedia5-dev libqt5svg5-dev vim tzdata dos2unix xsltproc -y # Install java #sudo DEBIAN_FRONTEND=noninteractive apt-get install oracle-java9-installer oracle-java9-set-default -y #sudo DEBIAN_FRONTEND=noninteractive apt-get --allow-unauthenticated install oracle-java10-installer oracle-java10-set-default -y @@ -142,11 +142,8 @@ cp /home/etsi/dev/TTF0002_Its/data/v3/asn1c_cert.tar.bz2 /home/etsi/tmp cd /home/etsi/tmp tar xvjf ./asn1c_cert.tar.bz2 cd /home/etsi/dev/TTF0002_Its/scripts -./update_its_project.bash -#ln -sf ~/dev/etsi_its/lib/libItsAsn.so ~/lib/libItsAsn.so -cd ${HOME}/dev/etsi_its/src/TestCodec/objs -../bin/testcodec_generate_makefile.bash -../bin/run_all.bash +export ATS=AtsCAM +make cd ${OLD_PWD}