From f879385e8be9d6cd4afdcb75464ad922c33b150d Mon Sep 17 00:00:00 2001 From: Denis Filatov Date: Mon, 6 Jul 2020 09:54:58 +0200 Subject: [PATCH 01/35] prepare for modulization --- .gitmodules | 4 +- .../Ports/LibIts_ports/AdapterControlPort.cc | 30 ------- .../Ports/LibIts_ports/AdapterControlPort.hh | 52 +++++++++---- ...rPort_BTP.partC => UpperTesterPort_BTP.cc} | 1 + ...rPort_BTP.partH => UpperTesterPort_BTP.hh} | 3 + ...rt_CAM.partC => AdapterControlPort_CAM.cc} | 1 + ...rt_CAM.partH => AdapterControlPort_CAM.hh} | 3 + ...rPort_CAM.partC => UpperTesterPort_CAM.cc} | 1 + ...rPort_CAM.partH => UpperTesterPort_CAM.hh} | 4 + ...rPort_DCC.partC => UpperTesterPort_DCC.cc} | 1 + ...rPort_DCC.partH => UpperTesterPort_DCC.hh} | 4 + ..._DENM.partC => AdapterControlPort_DENM.cc} | 2 +- ..._DENM.partH => AdapterControlPort_DENM.hh} | 4 + ...ort_DENM.partC => UpperTesterPort_DENM.cc} | 2 +- ...ort_DENM.partH => UpperTesterPort_DENM.hh} | 4 + ...VCSN.partC => AdapterControlPort_EVCSN.cc} | 1 + ...VCSN.partH => AdapterControlPort_EVCSN.hh} | 4 + ...t_EVCSN.partC => UpperTesterPort_EVCSN.cc} | 1 + ...t_EVCSN.partH => UpperTesterPort_EVCSN.hh} | 4 + ...Port_GN.partC => AdapterControlPort_GN.cc} | 2 +- ...Port_GN.partH => AdapterControlPort_GN.hh} | 4 + ...terPort_GN.partC => UpperTesterPort_GN.cc} | 2 +- ...terPort_GN.partH => UpperTesterPort_GN.hh} | 3 + ..._IVIM.partC => AdapterControlPort_IVIM.cc} | 1 + ..._IVIM.partH => AdapterControlPort_IVIM.hh} | 4 + ...ort_IVIM.partC => UpperTesterPort_IVIM.cc} | 2 +- ...ort_IVIM.partH => UpperTesterPort_IVIM.hh} | 4 + ...artC => AdapterControlPort_MapemSpatem.cc} | 1 + ...artH => AdapterControlPort_MapemSpatem.hh} | 4 + ...m.partC => UpperTesterPort_MapemSpatem.cc} | 2 +- ...m.partH => UpperTesterPort_MapemSpatem.hh} | 4 + ...rt_Pki.partC => AdapterControlPort_Pki.cc} | 2 +- ...rt_Pki.partH => AdapterControlPort_Pki.hh} | 4 + ...rPort_Pki.partC => UpperTesterPort_Pki.cc} | 2 +- ...rPort_Pki.partH => UpperTesterPort_Pki.hh} | 4 + ...m.partC => AdapterControlPort_SremSsem.cc} | 1 + ...m.partH => AdapterControlPort_SremSsem.hh} | 4 + ...Ssem.partC => UpperTesterPort_SremSsem.cc} | 2 +- ...Ssem.partH => UpperTesterPort_SremSsem.hh} | 4 + ccsrc/Ports/LibIts_ports/UpperTesterPort.cc | 33 -------- ccsrc/Ports/LibIts_ports/UpperTesterPort.hh | 78 +++++++++++++------ ...rt_V2G.partC => AdapterControlPort_V2G.cc} | 1 + ...rt_V2G.partH => AdapterControlPort_V2G.hh} | 4 + ...rPort_V2G.partC => UpperTesterPort_V2G.cc} | 1 + ...rPort_V2G.partH => UpperTesterPort_V2G.hh} | 5 ++ .../UpperTester/UpperTesterSremSsemCodec.cc | 3 +- .../UpperTester/UpperTesterSremSsemLayer.cc | 3 +- .../UpperTester/uppertester_cam_codec.cc | 3 +- .../UpperTester/uppertester_cam_layer.cc | 3 +- .../UpperTester/uppertester_denm_codec.cc | 3 +- .../UpperTester/uppertester_denm_layer.cc | 3 +- .../uppertester_geonetworking_codec.cc | 3 +- .../uppertester_geonetworking_layer.cc | 3 +- .../UpperTester/uppertester_ivim_codec.cc | 3 +- .../UpperTester/uppertester_ivim_layer.cc | 3 +- .../uppertester_mapem_spatem_codec.cc | 3 +- .../uppertester_mapem_spatem_layer.cc | 3 +- .../UpperTester/uppertester_pki_codec.cc | 3 +- .../UpperTester/uppertester_pki_layer.cc | 3 +- .../UpperTester/uppertester_types.hh | 26 ------- ttcn/LibCommon | 2 +- ttcn/LibIts | 2 +- 62 files changed, 223 insertions(+), 153 deletions(-) delete mode 100644 ccsrc/Ports/LibIts_ports/AdapterControlPort.cc rename ccsrc/Ports/LibIts_ports/BTP_ports/{UpperTesterPort_BTP.partC => UpperTesterPort_BTP.cc} (97%) rename ccsrc/Ports/LibIts_ports/BTP_ports/{UpperTesterPort_BTP.partH => UpperTesterPort_BTP.hh} (93%) rename ccsrc/Ports/LibIts_ports/CAM_ports/{AdapterControlPort_CAM.partC => AdapterControlPort_CAM.cc} (98%) rename ccsrc/Ports/LibIts_ports/CAM_ports/{AdapterControlPort_CAM.partH => AdapterControlPort_CAM.hh} (93%) rename ccsrc/Ports/LibIts_ports/CAM_ports/{UpperTesterPort_CAM.partC => UpperTesterPort_CAM.cc} (99%) rename ccsrc/Ports/LibIts_ports/CAM_ports/{UpperTesterPort_CAM.partH => UpperTesterPort_CAM.hh} (95%) rename ccsrc/Ports/LibIts_ports/DCC_ports/{UpperTesterPort_DCC.partC => UpperTesterPort_DCC.cc} (97%) rename ccsrc/Ports/LibIts_ports/DCC_ports/{UpperTesterPort_DCC.partH => UpperTesterPort_DCC.hh} (93%) rename ccsrc/Ports/LibIts_ports/DENM_ports/{AdapterControlPort_DENM.partC => AdapterControlPort_DENM.cc} (98%) rename ccsrc/Ports/LibIts_ports/DENM_ports/{AdapterControlPort_DENM.partH => AdapterControlPort_DENM.hh} (92%) rename ccsrc/Ports/LibIts_ports/DENM_ports/{UpperTesterPort_DENM.partC => UpperTesterPort_DENM.cc} (99%) rename ccsrc/Ports/LibIts_ports/DENM_ports/{UpperTesterPort_DENM.partH => UpperTesterPort_DENM.hh} (95%) rename ccsrc/Ports/LibIts_ports/EVCSN_ports/{AdapterControlPort_EVCSN.partC => AdapterControlPort_EVCSN.cc} (97%) rename ccsrc/Ports/LibIts_ports/EVCSN_ports/{AdapterControlPort_EVCSN.partH => AdapterControlPort_EVCSN.hh} (92%) rename ccsrc/Ports/LibIts_ports/EVCSN_ports/{UpperTesterPort_EVCSN.partC => UpperTesterPort_EVCSN.cc} (97%) rename ccsrc/Ports/LibIts_ports/EVCSN_ports/{UpperTesterPort_EVCSN.partH => UpperTesterPort_EVCSN.hh} (94%) rename ccsrc/Ports/LibIts_ports/GN_ports/{AdapterControlPort_GN.partC => AdapterControlPort_GN.cc} (99%) rename ccsrc/Ports/LibIts_ports/GN_ports/{AdapterControlPort_GN.partH => AdapterControlPort_GN.hh} (94%) rename ccsrc/Ports/LibIts_ports/GN_ports/{UpperTesterPort_GN.partC => UpperTesterPort_GN.cc} (99%) rename ccsrc/Ports/LibIts_ports/GN_ports/{UpperTesterPort_GN.partH => UpperTesterPort_GN.hh} (95%) rename ccsrc/Ports/LibIts_ports/IVIM_ports/{AdapterControlPort_IVIM.partC => AdapterControlPort_IVIM.cc} (97%) rename ccsrc/Ports/LibIts_ports/IVIM_ports/{AdapterControlPort_IVIM.partH => AdapterControlPort_IVIM.hh} (92%) rename ccsrc/Ports/LibIts_ports/IVIM_ports/{UpperTesterPort_IVIM.partC => UpperTesterPort_IVIM.cc} (99%) rename ccsrc/Ports/LibIts_ports/IVIM_ports/{UpperTesterPort_IVIM.partH => UpperTesterPort_IVIM.hh} (94%) rename ccsrc/Ports/LibIts_ports/MapemSpatem_ports/{AdapterControlPort_MapemSpatem.partC => AdapterControlPort_MapemSpatem.cc} (96%) rename ccsrc/Ports/LibIts_ports/MapemSpatem_ports/{AdapterControlPort_MapemSpatem.partH => AdapterControlPort_MapemSpatem.hh} (90%) rename ccsrc/Ports/LibIts_ports/MapemSpatem_ports/{UpperTesterPort_MapemSpatem.partC => UpperTesterPort_MapemSpatem.cc} (99%) rename ccsrc/Ports/LibIts_ports/MapemSpatem_ports/{UpperTesterPort_MapemSpatem.partH => UpperTesterPort_MapemSpatem.hh} (93%) rename ccsrc/Ports/LibIts_ports/Pki_ports/{AdapterControlPort_Pki.partC => AdapterControlPort_Pki.cc} (98%) rename ccsrc/Ports/LibIts_ports/Pki_ports/{AdapterControlPort_Pki.partH => AdapterControlPort_Pki.hh} (92%) rename ccsrc/Ports/LibIts_ports/Pki_ports/{UpperTesterPort_Pki.partC => UpperTesterPort_Pki.cc} (99%) rename ccsrc/Ports/LibIts_ports/Pki_ports/{UpperTesterPort_Pki.partH => UpperTesterPort_Pki.hh} (94%) rename ccsrc/Ports/LibIts_ports/SremSsem_ports/{AdapterControlPort_SremSsem.partC => AdapterControlPort_SremSsem.cc} (96%) rename ccsrc/Ports/LibIts_ports/SremSsem_ports/{AdapterControlPort_SremSsem.partH => AdapterControlPort_SremSsem.hh} (91%) rename ccsrc/Ports/LibIts_ports/SremSsem_ports/{UpperTesterPort_SremSsem.partC => UpperTesterPort_SremSsem.cc} (99%) rename ccsrc/Ports/LibIts_ports/SremSsem_ports/{UpperTesterPort_SremSsem.partH => UpperTesterPort_SremSsem.hh} (93%) delete mode 100644 ccsrc/Ports/LibIts_ports/UpperTesterPort.cc rename ccsrc/Ports/LibIts_ports/V2G_ports/{AdapterControlPort_V2G.partC => AdapterControlPort_V2G.cc} (96%) rename ccsrc/Ports/LibIts_ports/V2G_ports/{AdapterControlPort_V2G.partH => AdapterControlPort_V2G.hh} (92%) rename ccsrc/Ports/LibIts_ports/V2G_ports/{UpperTesterPort_V2G.partC => UpperTesterPort_V2G.cc} (97%) rename ccsrc/Ports/LibIts_ports/V2G_ports/{UpperTesterPort_V2G.partH => UpperTesterPort_V2G.hh} (93%) delete mode 100644 ccsrc/Protocols/UpperTester/uppertester_types.hh diff --git a/.gitmodules b/.gitmodules index 22c623a4e..b3b1d777d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,8 +1,8 @@ [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 diff --git a/ccsrc/Ports/LibIts_ports/AdapterControlPort.cc b/ccsrc/Ports/LibIts_ports/AdapterControlPort.cc deleted file mode 100644 index 2e0be2427..000000000 --- a/ccsrc/Ports/LibIts_ports/AdapterControlPort.cc +++ /dev/null @@ -1,30 +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 "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_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 38a51fe6e..20199df8a 100644 --- a/ccsrc/Ports/LibIts_ports/AdapterControlPort.hh +++ b/ccsrc/Ports/LibIts_ports/AdapterControlPort.hh @@ -6,22 +6,48 @@ #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 "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 LibItsV2G__TestSystem_HH +#include "V2G_ports/AdapterControlPort_V2G.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_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 LibItsGeoNetworking__TestSystem_HH +#include "AdapterControlPort_GN.hh" +#endif /* #include "AdapterControlPort_IVIM.partH" #include "AdapterControlPort_MapemSpatem.partH" 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 b03dbf249..3c1d16e73 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 bb36e5703..262ed9c57 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/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 4d0894f9a..4652caefa 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 48eb47946..94cdb840c 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 1135ab347..586100c46 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 7f79fc392..c8263bb8a 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/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 495c12044..0120e10f7 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 47642b812..ad25eb2e2 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 57e2d42d3..5dc9f3096 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 d45b1d31e..de6df3e39 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 f275352f1..e3c69fa9d 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 e63c78fa2..1c8c7d609 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/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 5cd06e2ee..944b66c07 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 fe2439d33..e6b0b0f62 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 5cfe979dc..e0b46068a 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 c5f66bc7a..179e02249 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 518bef447..a376fbdff 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 8ad020285..ca98bd2a2 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 f0b2e1c4d..a55e8b249 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 212dd564a..783780fff 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/IVIM_ports/AdapterControlPort_IVIM.partC b/ccsrc/Ports/LibIts_ports/IVIM_ports/AdapterControlPort_IVIM.cc similarity index 97% rename from ccsrc/Ports/LibIts_ports/IVIM_ports/AdapterControlPort_IVIM.partC rename to ccsrc/Ports/LibIts_ports/IVIM_ports/AdapterControlPort_IVIM.cc index 5f5ccccf5..63a2e7c56 100644 --- a/ccsrc/Ports/LibIts_ports/IVIM_ports/AdapterControlPort_IVIM.partC +++ b/ccsrc/Ports/LibIts_ports/IVIM_ports/AdapterControlPort_IVIM.cc @@ -1,4 +1,5 @@ //============================================================================= +#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 5487cfbf0..361f63968 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 091e3c917..aef55b178 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 94% rename from ccsrc/Ports/LibIts_ports/IVIM_ports/UpperTesterPort_IVIM.partH rename to ccsrc/Ports/LibIts_ports/IVIM_ports/UpperTesterPort_IVIM.hh index f5b9dad2c..09a06dcaa 100644 --- a/ccsrc/Ports/LibIts_ports/IVIM_ports/UpperTesterPort_IVIM.partH +++ b/ccsrc/Ports/LibIts_ports/IVIM_ports/UpperTesterPort_IVIM.hh @@ -1,4 +1,7 @@ //============================================================================= +#ifndef UpperTesterPort_IVIM_HH +#define UpperTesterPort_IVIM_HH + #include "LibItsIvim_TestSystem.hh" namespace LibItsIvim__TestSystem { @@ -42,3 +45,4 @@ protected: }; } /* end of namespace */ +#endif \ No newline at end of file diff --git a/ccsrc/Ports/LibIts_ports/MapemSpatem_ports/AdapterControlPort_MapemSpatem.partC b/ccsrc/Ports/LibIts_ports/MapemSpatem_ports/AdapterControlPort_MapemSpatem.cc similarity index 96% rename from ccsrc/Ports/LibIts_ports/MapemSpatem_ports/AdapterControlPort_MapemSpatem.partC rename to ccsrc/Ports/LibIts_ports/MapemSpatem_ports/AdapterControlPort_MapemSpatem.cc index 3374389eb..6a64cf935 100644 --- a/ccsrc/Ports/LibIts_ports/MapemSpatem_ports/AdapterControlPort_MapemSpatem.partC +++ b/ccsrc/Ports/LibIts_ports/MapemSpatem_ports/AdapterControlPort_MapemSpatem.cc @@ -1,4 +1,5 @@ //============================================================================= +#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 c16e6b5b8..dcb157190 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 496e4c354..2ce1c21f7 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 93% rename from ccsrc/Ports/LibIts_ports/MapemSpatem_ports/UpperTesterPort_MapemSpatem.partH rename to ccsrc/Ports/LibIts_ports/MapemSpatem_ports/UpperTesterPort_MapemSpatem.hh index dd49c6bb1..79ce869c2 100644 --- a/ccsrc/Ports/LibIts_ports/MapemSpatem_ports/UpperTesterPort_MapemSpatem.partH +++ b/ccsrc/Ports/LibIts_ports/MapemSpatem_ports/UpperTesterPort_MapemSpatem.hh @@ -1,4 +1,7 @@ //============================================================================= +#ifndef UpperTesterPort_MapemSpatem_HH +#define UpperTesterPort_MapemSpatem_HH + #include "LibItsMapemSpatem_TestSystem.hh" namespace LibItsMapemSpatem__TestSystem { @@ -37,3 +40,4 @@ protected: }; } /* end of namespace */ +#endif 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 90a1ddd1b..ede583426 100644 --- a/ccsrc/Ports/LibIts_ports/Pki_ports/AdapterControlPort_Pki.partC +++ b/ccsrc/Ports/LibIts_ports/Pki_ports/AdapterControlPort_Pki.cc @@ -4,7 +4,7 @@ #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 fb816f733..51a2cb028 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/UpperTesterPort_Pki.partC b/ccsrc/Ports/LibIts_ports/Pki_ports/UpperTesterPort_Pki.cc similarity index 99% rename from ccsrc/Ports/LibIts_ports/Pki_ports/UpperTesterPort_Pki.partC rename to ccsrc/Ports/LibIts_ports/Pki_ports/UpperTesterPort_Pki.cc index 4f677d8a3..93062e48a 100644 --- a/ccsrc/Ports/LibIts_ports/Pki_ports/UpperTesterPort_Pki.partC +++ b/ccsrc/Ports/LibIts_ports/Pki_ports/UpperTesterPort_Pki.cc @@ -1,7 +1,7 @@ #include "uppertester_pki_layer_factory.hh" #include "loggers.hh" - +#include "UpperTesterPort_Pki.hh" //============================================================================= namespace LibItsPki__TestSystem { diff --git a/ccsrc/Ports/LibIts_ports/Pki_ports/UpperTesterPort_Pki.partH b/ccsrc/Ports/LibIts_ports/Pki_ports/UpperTesterPort_Pki.hh similarity index 94% rename from ccsrc/Ports/LibIts_ports/Pki_ports/UpperTesterPort_Pki.partH rename to ccsrc/Ports/LibIts_ports/Pki_ports/UpperTesterPort_Pki.hh index e6f4ad507..720549998 100644 --- a/ccsrc/Ports/LibIts_ports/Pki_ports/UpperTesterPort_Pki.partH +++ b/ccsrc/Ports/LibIts_ports/Pki_ports/UpperTesterPort_Pki.hh @@ -1,3 +1,6 @@ +#ifndef UpperTesterPort_Pki_HH +#define UpperTesterPort_Pki_HH + #include "layer.hh" #include "params.hh" @@ -41,3 +44,4 @@ namespace LibItsPki__TestSystem { }; } /* end of namespace */ +#endif diff --git a/ccsrc/Ports/LibIts_ports/SremSsem_ports/AdapterControlPort_SremSsem.partC b/ccsrc/Ports/LibIts_ports/SremSsem_ports/AdapterControlPort_SremSsem.cc similarity index 96% rename from ccsrc/Ports/LibIts_ports/SremSsem_ports/AdapterControlPort_SremSsem.partC rename to ccsrc/Ports/LibIts_ports/SremSsem_ports/AdapterControlPort_SremSsem.cc index 8c4a975fb..a08f92752 100644 --- a/ccsrc/Ports/LibIts_ports/SremSsem_ports/AdapterControlPort_SremSsem.partC +++ b/ccsrc/Ports/LibIts_ports/SremSsem_ports/AdapterControlPort_SremSsem.cc @@ -1,4 +1,5 @@ //============================================================================= +#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 6433630a8..557d56dce 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 e26280a0c..088d2afd0 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 93% rename from ccsrc/Ports/LibIts_ports/SremSsem_ports/UpperTesterPort_SremSsem.partH rename to ccsrc/Ports/LibIts_ports/SremSsem_ports/UpperTesterPort_SremSsem.hh index 415e887bf..b76464521 100644 --- a/ccsrc/Ports/LibIts_ports/SremSsem_ports/UpperTesterPort_SremSsem.partH +++ b/ccsrc/Ports/LibIts_ports/SremSsem_ports/UpperTesterPort_SremSsem.hh @@ -1,4 +1,7 @@ //============================================================================= +#ifndef UpperTesterPort_SremSsem_HH +#define UpperTesterPort_SremSsem_HH + #include "LibItsSremSsem_TestSystem.hh" namespace LibItsSremSsem__TestSystem { @@ -40,3 +43,4 @@ protected: }; } /* end of namespace */ +#endif diff --git a/ccsrc/Ports/LibIts_ports/UpperTesterPort.cc b/ccsrc/Ports/LibIts_ports/UpperTesterPort.cc deleted file mode 100644 index ef2948622..000000000 --- a/ccsrc/Ports/LibIts_ports/UpperTesterPort.cc +++ /dev/null @@ -1,33 +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 "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_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 a06eaeda3..beed6498d 100644 --- a/ccsrc/Ports/LibIts_ports/UpperTesterPort.hh +++ b/ccsrc/Ports/LibIts_ports/UpperTesterPort.hh @@ -1,38 +1,68 @@ #ifndef UpperTesterPort_HH #define UpperTesterPort_HH -#include "LibItsCommon_TypesAndValues.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 "Pki_ports/UpperTesterPort_Pki.partH" -//#include "V2G_ports/UpperTesterPort_V2G.partH" +#ifdef LibItsBtp__TestSystem_HH +#include "BTP_ports/UpperTesterPort_BTP.hh" +#endif +#ifdef LibItsCam__TestSystem_HH +#include "CAM_ports/UpperTesterPort_CAM.hh" +#endif +#ifdef LibItsDenm__TestSystem_HH +#include "DENM_ports/UpperTesterPort_DENM.hh" +#endif +#ifdef LibItsGeoNetworking__TestSystem_HH +#include "GN_ports/UpperTesterPort_GN.hh" +#endif +#ifdef LibItsIvim__TestSystem_HH +#include "IVIM_ports/UpperTesterPort_IVIM.hh" +#endif +#ifdef LibItsMapemSpatem__TestSystem_HH +#include "MapemSpatem_ports/UpperTesterPort_MapemSpatem.hh" +#endif +#ifdef LibItsSremSsem__TestSystem_HH +#include "SremSsem_ports/UpperTesterPort_SremSsem.hh" +#endif +#ifdef LibItsPki__TestSystem_HH +#include "Pki_ports/UpperTesterPort_Pki.hh" +#endif +#ifdef LibItsV2G__TestSystem_HH +#include "V2G_ports/UpperTesterPort_V2G.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_Pki.partH" +#ifdef LibItsBtp__TestSystem_HH +#include "UpperTesterPort_BTP.hh" +#endif +#ifdef LibItsCam__TestSystem_HH +#include "UpperTesterPort_CAM.hh" +#endif +#ifdef LibItsDenm__TestSystem_HH +#include "UpperTesterPort_DENM.hh" +#endif +#ifdef LibItsIvim__TestSystem_HH +#include "UpperTesterPort_IVIM.hh" +#endif +#ifdef LibItsMapemSpatem__TestSystem_HH +#include "UpperTesterPort_MapemSpatem.hh" +#endif +#ifdef LibItsSremSsem__TestSystem_HH +#include "UpperTesterPort_SremSsem.hh" +#endif +#ifdef LibItsGeoNetworking__TestSystem_HH +#include "UpperTesterPort_GN.hh" +#endif +#ifdef LibItsPki__TestSystem_HH +#include "UpperTesterPort_Pki.hh" +#endif /* -#include "UpperTesterPort_IVIM.partH" -//#include "UpperTesterPort_MapSpat.partH" -#include "UpperTesterPort_MapemSpatem.partH" -#include "UpperTesterPort_SremSsem.partH" -#include "UpperTesterPort_Evcsn.partH" -//#include "UpperTesterPort_V2G.partH" +#include "UpperTesterPort_Evcsn.hh" +//#include "UpperTesterPort_V2G.hh" */ #endif//_NO_SOFTLINKS_ 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 253b90b47..ed94475ef 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 09fa12696..787c87e5d 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 5968bbc27..d7a09144b 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 0ceb2167c..8d52be3c1 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/Protocols/UpperTester/UpperTesterSremSsemCodec.cc b/ccsrc/Protocols/UpperTester/UpperTesterSremSsemCodec.cc index 822d667ad..7c0aa0525 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 926c3d05b..3c10ef5c2 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/uppertester_cam_codec.cc b/ccsrc/Protocols/UpperTester/uppertester_cam_codec.cc index 5afca3929..a5235a4bd 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 06506d9cb..102fe2c84 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 2c32471dd..020e9e64e 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 2cabff7c8..2d5ed1bf6 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 314ce9190..86ac6b4c6 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 29d5739be..2e829dbbd 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 806d3a395..28cc4cd65 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 6173a6182..8fbeaf4ed 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 7d0b5f41a..7e0937034 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 84fd9fed3..1794d9217 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 8461d424b..af816d7c4 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 40e9ca788..2c805413e 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 988dfd59c..000000000 --- a/ccsrc/Protocols/UpperTester/uppertester_types.hh +++ /dev/null @@ -1,26 +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 "LibItsPki_TypesAndValues.hh" -#include "LibItsPki_TestSystem.hh" - -#endif diff --git a/ttcn/LibCommon b/ttcn/LibCommon index 1c35e012c..3b25225c1 160000 --- a/ttcn/LibCommon +++ b/ttcn/LibCommon @@ -1 +1 @@ -Subproject commit 1c35e012cb65152abd1ab432a82d23a755c1276e +Subproject commit 3b25225c1ac8c33b6657c2204a5c76bdfa8a398b diff --git a/ttcn/LibIts b/ttcn/LibIts index 8fb375870..925bd8a42 160000 --- a/ttcn/LibIts +++ b/ttcn/LibIts @@ -1 +1 @@ -Subproject commit 8fb3758701b5268c91b21bf87a1f68ae4387a108 +Subproject commit 925bd8a42bd74ba0897537bd64db702acbdc7173 -- GitLab From ca32ab3259dd9e6399335c0ffc736986803963c7 Mon Sep 17 00:00:00 2001 From: Denis Filatov Date: Mon, 6 Jul 2020 09:56:46 +0200 Subject: [PATCH 02/35] modules build tree --- asn1/Makefile | 30 +++++++++--------- ccsrc/Asn1c/module.mk | 3 ++ ccsrc/EncDec/module.mk | 20 ++++++++++++ ccsrc/Externals/module.mk | 8 +++++ ccsrc/Framework/module.mk | 6 ++++ ccsrc/Ports/LibIts_ports/BTP_ports/module.mk | 3 ++ ccsrc/Ports/LibIts_ports/CAM_ports/module.mk | 3 ++ ccsrc/Ports/LibIts_ports/GN_ports/module.mk | 3 ++ .../LibIts_ports/IPv6oGN_ports/module.mk | 3 ++ ccsrc/Ports/LibIts_ports/module.mk | 1 + ccsrc/Protocols/BTP/module.mk | 2 ++ ccsrc/Protocols/CAM/module.mk | 2 ++ ccsrc/Protocols/Commsignia/module.mk | 3 ++ ccsrc/Protocols/DENM/module.mk | 4 +++ ccsrc/Protocols/ETH/module.mk | 3 ++ ccsrc/Protocols/GeoNetworking/module.mk | 3 ++ ccsrc/Protocols/Http/module.mk | 3 ++ ccsrc/Protocols/IVIM/module.mk | 3 ++ ccsrc/Protocols/MapemSpatem/module.mk | 3 ++ ccsrc/Protocols/Pcap/module.mk | 3 ++ ccsrc/Protocols/Qualcomm/module.mk | 3 ++ ccsrc/Protocols/RawSocket/module.mk | 3 ++ ccsrc/Protocols/Security/module.mk | 29 +++++++++++++++++ ccsrc/Protocols/SremSsem/module.mk | 3 ++ ccsrc/Protocols/Tcp/module.mk | 3 ++ ccsrc/Protocols/UDP/module.mk | 3 ++ ccsrc/Protocols/UpperTester/module.mk | 28 +++++++++++++++++ ccsrc/loggers/module.mk | 3 ++ ttcn/AtsCAM/Makefile | 2 ++ ttcn/AtsCAM/module.mk | 31 +++++++++++++++++++ 30 files changed, 203 insertions(+), 14 deletions(-) create mode 100644 ccsrc/Asn1c/module.mk create mode 100755 ccsrc/EncDec/module.mk create mode 100644 ccsrc/Externals/module.mk create mode 100755 ccsrc/Framework/module.mk create mode 100644 ccsrc/Ports/LibIts_ports/BTP_ports/module.mk create mode 100644 ccsrc/Ports/LibIts_ports/CAM_ports/module.mk create mode 100644 ccsrc/Ports/LibIts_ports/GN_ports/module.mk create mode 100644 ccsrc/Ports/LibIts_ports/IPv6oGN_ports/module.mk create mode 100755 ccsrc/Ports/LibIts_ports/module.mk create mode 100644 ccsrc/Protocols/BTP/module.mk create mode 100755 ccsrc/Protocols/CAM/module.mk create mode 100644 ccsrc/Protocols/Commsignia/module.mk create mode 100644 ccsrc/Protocols/DENM/module.mk create mode 100644 ccsrc/Protocols/ETH/module.mk create mode 100644 ccsrc/Protocols/GeoNetworking/module.mk create mode 100644 ccsrc/Protocols/Http/module.mk create mode 100644 ccsrc/Protocols/IVIM/module.mk create mode 100644 ccsrc/Protocols/MapemSpatem/module.mk create mode 100644 ccsrc/Protocols/Pcap/module.mk create mode 100644 ccsrc/Protocols/Qualcomm/module.mk create mode 100644 ccsrc/Protocols/RawSocket/module.mk create mode 100644 ccsrc/Protocols/Security/module.mk create mode 100644 ccsrc/Protocols/SremSsem/module.mk create mode 100644 ccsrc/Protocols/Tcp/module.mk create mode 100644 ccsrc/Protocols/UDP/module.mk create mode 100644 ccsrc/Protocols/UpperTester/module.mk create mode 100644 ccsrc/loggers/module.mk create mode 100755 ttcn/AtsCAM/Makefile create mode 100755 ttcn/AtsCAM/module.mk diff --git a/asn1/Makefile b/asn1/Makefile index 89b8977d9..8bc3204db 100755 --- a/asn1/Makefile +++ b/asn1/Makefile @@ -8,11 +8,11 @@ # The name of the library ASN_LIBRARY = libItsAsn.so # ASN.1 files to be included in the library -ASN_FILES = CAM/CAM.asn \ - DENM/DENM.asn \ +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 \ @@ -20,9 +20,11 @@ ASN_FILES = CAM/CAM.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 \ @@ -49,12 +51,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 (,$(windir)) + 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)) @@ -97,10 +99,10 @@ 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) diff --git a/ccsrc/Asn1c/module.mk b/ccsrc/Asn1c/module.mk new file mode 100644 index 000000000..d15673be1 --- /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 100755 index 000000000..03c454302 --- /dev/null +++ b/ccsrc/EncDec/module.mk @@ -0,0 +1,20 @@ +sources := LibItsBtp_Encdec.cc \ + LibItsCam_Encdec.cc \ + LibItsGeoNetworking_Encdec.cc \ + LibItsSecurity_Encdec.cc \ + LibItsIpv6OverGeoNetworking_Encdec.cc \ +# LibItsHttp_Encdec.cc \ +# LibItsMapemSpatem_Encdec.cc \ +# LibItsPki_Encdec.cc \ +# LibItsSremSsem_Encdec.cc + +ifeq (DENM, %(ATS)) +sources += LibItsDenm_Encdec.cc +endif + +ifeq (IVIM, %(ATS)) +sources += LibItsIvim_Encdec.cc +endif + + +# LibItsEvcsn_Encdec.cc \ diff --git a/ccsrc/Externals/module.mk b/ccsrc/Externals/module.mk new file mode 100644 index 000000000..eb7fb0784 --- /dev/null +++ b/ccsrc/Externals/module.mk @@ -0,0 +1,8 @@ +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 100755 index 000000000..2f478741d --- /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/BTP_ports/module.mk b/ccsrc/Ports/LibIts_ports/BTP_ports/module.mk new file mode 100644 index 000000000..c34bd7902 --- /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/module.mk b/ccsrc/Ports/LibIts_ports/CAM_ports/module.mk new file mode 100644 index 000000000..45ed2a02d --- /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/GN_ports/module.mk b/ccsrc/Ports/LibIts_ports/GN_ports/module.mk new file mode 100644 index 000000000..b135587f4 --- /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/IPv6oGN_ports/module.mk b/ccsrc/Ports/LibIts_ports/IPv6oGN_ports/module.mk new file mode 100644 index 000000000..507dcc447 --- /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/module.mk b/ccsrc/Ports/LibIts_ports/module.mk new file mode 100755 index 000000000..bff5c86df --- /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 000000000..b2a669340 --- /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 100755 index 000000000..0a2ec4c64 --- /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 000000000..2aa25d8e5 --- /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 000000000..b33d283ff --- /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 000000000..e81733a31 --- /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 000000000..889d69c29 --- /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 000000000..12304eb0f --- /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 000000000..e4b8d9247 --- /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 000000000..3efd2de12 --- /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 000000000..0f6495fd1 --- /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 000000000..c2fcfbe70 --- /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 000000000..b8dee6571 --- /dev/null +++ b/ccsrc/Protocols/RawSocket/module.mk @@ -0,0 +1,3 @@ +sources := raw_socket_layer.cc +includes := . + diff --git a/ccsrc/Protocols/Security/module.mk b/ccsrc/Protocols/Security/module.mk new file mode 100644 index 000000000..48c03544b --- /dev/null +++ b/ccsrc/Protocols/Security/module.mk @@ -0,0 +1,29 @@ +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 \ + http_etsi_ieee1609dot2_codec.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 + +includes := . + diff --git a/ccsrc/Protocols/SremSsem/module.mk b/ccsrc/Protocols/SremSsem/module.mk new file mode 100644 index 000000000..b43f0e026 --- /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 000000000..0b8478fdc --- /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 000000000..f2ee4337e --- /dev/null +++ b/ccsrc/Protocols/UDP/module.mk @@ -0,0 +1,3 @@ +sources := udp_layer.cc udp_pcap_layer.cc +includes := . + diff --git a/ccsrc/Protocols/UpperTester/module.mk b/ccsrc/Protocols/UpperTester/module.mk new file mode 100644 index 000000000..46b9c31e4 --- /dev/null +++ b/ccsrc/Protocols/UpperTester/module.mk @@ -0,0 +1,28 @@ +#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 (AtsDENM, $(ATS)) +sources += uppertester_denm_codec.cc uppertester_denm_layer.cc +endif + + +includes := . + diff --git a/ccsrc/loggers/module.mk b/ccsrc/loggers/module.mk new file mode 100644 index 000000000..c735f82e1 --- /dev/null +++ b/ccsrc/loggers/module.mk @@ -0,0 +1,3 @@ +sources := loggers.cc +includes := . + diff --git a/ttcn/AtsCAM/Makefile b/ttcn/AtsCAM/Makefile new file mode 100755 index 000000000..ff67e0c1f --- /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 100755 index 000000000..631c76d16 --- /dev/null +++ b/ttcn/AtsCAM/module.mk @@ -0,0 +1,31 @@ +suite := AtsCAM + +sources := ItsCam_TestCases.ttcn \ + ItsCam_TestControl.ttcn \ + ItsCam_TpFunctions.ttcn + +modules := ../LibIts \ + ../LibIts/ttcn/CAM \ + ../LibIts/asn1/CAM \ + ../LibCommon \ + ../../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/Pcap \ + ../../ccsrc/Protocols/UpperTester \ + ../../ccsrc/Protocols/Security \ +# ../../ccsrc/Protocols/Http \ +# ../../ccsrc/Protocols/DENM \ +# ../../ccsrc/Protocols/IVIM \ +# ../../ccsrc/Protocols/MapemSpatem \ +# ../../ccsrc/Protocols/SremSsem \ -- GitLab From 8be4e1a1bc42db4177be1364868725f8fc717737 Mon Sep 17 00:00:00 2001 From: Denis Filatov Date: Mon, 6 Jul 2020 11:00:58 +0200 Subject: [PATCH 03/35] module build tree --- Makefile | 106 ++++++++++++++++++++++++++++++++++++++++++ ttcn/AtsCAM/module.mk | 4 +- ttcn/LibCommon | 2 +- 3 files changed, 109 insertions(+), 3 deletions(-) create mode 100755 Makefile diff --git a/Makefile b/Makefile new file mode 100755 index 000000000..8979d5c02 --- /dev/null +++ b/Makefile @@ -0,0 +1,106 @@ + +ifeq (,$(ATS)) + $(error ATS shall be defined) +endif + +ifeq (,$(TOPDIR)) + TOPDIR := . +endif + +#ifeq (,$(TTCN3_DIR)) + TTCN3_DIR := /cygdrive/c/Tools/Titan +#endif + +ifeq (,$(OPENSSL_DIR)) + OPENSSL_DIR := C:/Tools/OpenSSL/Win64 +endif + +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, $(1)/$$(M)))) +endef + +all_includes := $(TTCN3_DIR)/include $(TTCN3_DIR)/src $(TOPDIR)/ccsrc/Framework +defines := TITAN_RUNTIME_2 _NO_SOFTLINKS_ +libs := -L$(TTCN3_DIR)/lib -lttcn3-rt2-parallel -lxml2 -lstdc++fs + +#ifneq (,$(windir)) +# Silence linker warnings. +#LDFLAGS += -Wl,--enable-auto-import,--enable-runtime-pseudo-reloc +defines += WIN32 +libs += -L $(OPENSSL_DIR)/lib +all_includes += $(OPENSSL_DIR)/include +libs += /cygdrive/c/windows/system32/npcap/wpcap.dll +#endif +libs += -lssl -lcrypto + +$(eval $(call IncludeModule, $(TOPDIR)/ttcn/$(ATS))) + +outdir := $(TOPDIR)/build + +sources := $(sort $(all_sources)) +includes := $(outdir) $(outdir)/asn1 $(all_includes) /cygdrive/c/PROGRA~1/Npcap/sdk/include + +EXE=.exe +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_ttcn3_sources := $(addprefix $(outdir)/, $(notdir $(patsubst %.ttcn3, %.cc, $(ttcn3_sources)))) +gen_asn_sources := $(addprefix $(outdir)/, $(notdir $(patsubst %.asn, %.cc, $(asn_sources)))) +gen_asn1_sources := $(addprefix $(outdir)/, $(notdir $(patsubst %.asn1, %.cc, $(asn1_sources)))) + +gen_sources := $(gen_ttcn_sources) $(gen_ttcn3_sources) $(gen_asn_sources) $(gen_asn1_sources) + +gen_objects := $(patsubst %.cc, %.o, $(gen_sources)) +cc_objects := $(patsubst %.cc, $(outdir)/%.o, $(cc_sources)) + +define GenerateSource +$(outdir)/$(notdir $(patsubst %.ttcn %.asn %.ttcn3 %.asn1, %.cc, $1)): $1 +endef + +.PHONY: all FORCE echo + +all: $(outdir) $(outdir)/$(ATS)$(EXE) + +echo: + @echo -e "all_sources:\n $(addsuffix \n, $(all_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))" + +$(outdir): + mkdir -p $@ + +$(outdir)/$(ATS)$(EXE): $(outdir)/asn1/libItsAsn.so $(gen_objects) $(cc_objects) + g++ -g -O0 -o $@ $(LDFLAGS) $(gen_objects) $(cc_objects) $(outdir)/asn1/libItsAsn.so $(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): $(outdir)/.generate + +$(outdir)/.generate: Makefile $(tt_sources) + $(TTCN3_DIR)/bin/compiler -w -e -L -R -U none -o $(outdir) $(tt_sources) + touch $@ + +$(outdir)/asn1/libItsAsn.so: FORCE + mkdir -p $(outdir)/asn1 + $(MAKE) -C $(outdir)/asn1 -f ../../asn1/Makefile ASN1C_PATH=../../../../asn1c diff --git a/ttcn/AtsCAM/module.mk b/ttcn/AtsCAM/module.mk index 631c76d16..cd7416d97 100755 --- a/ttcn/AtsCAM/module.mk +++ b/ttcn/AtsCAM/module.mk @@ -4,10 +4,10 @@ sources := ItsCam_TestCases.ttcn \ ItsCam_TestControl.ttcn \ ItsCam_TpFunctions.ttcn -modules := ../LibIts \ +modules := ../LibCommon \ + ../LibIts \ ../LibIts/ttcn/CAM \ ../LibIts/asn1/CAM \ - ../LibCommon \ ../../ccsrc/Ports/LibIts_ports \ ../../ccsrc/Ports/LibIts_ports/CAM_ports \ ../../ccsrc/Ports/LibIts_ports/GN_ports \ diff --git a/ttcn/LibCommon b/ttcn/LibCommon index 3b25225c1..fa2b5c7d9 160000 --- a/ttcn/LibCommon +++ b/ttcn/LibCommon @@ -1 +1 @@ -Subproject commit 3b25225c1ac8c33b6657c2204a5c76bdfa8a398b +Subproject commit fa2b5c7d9d2a170e4d876d82ed5e865d925837a7 -- GitLab From c6ba2c43818452ac7e07925bd721cd349f1fa1f9 Mon Sep 17 00:00:00 2001 From: Denis Filatov Date: Wed, 8 Jul 2020 17:35:18 +0200 Subject: [PATCH 04/35] adapt for openssl 1.1.1 --- ccsrc/Protocols/Security/security_ecc.cc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ccsrc/Protocols/Security/security_ecc.cc b/ccsrc/Protocols/Security/security_ecc.cc index 333e91763..432ac4d91 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)); -- GitLab From f2c782d7d867e72c504f2fa42d201106a9bce342 Mon Sep 17 00:00:00 2001 From: Denis Filatov Date: Wed, 8 Jul 2020 17:41:12 +0200 Subject: [PATCH 05/35] update module contents --- Makefile | 58 ++++++--- ccsrc/EncDec/module.mk | 26 +++- ccsrc/Externals/module.mk | 3 +- .../Ports/LibIts_ports/AdapterControlPort.hh | 3 - ccsrc/Ports/LibIts_ports/DENM_ports/module.mk | 3 + ccsrc/Ports/LibIts_ports/Http_ports/module.mk | 3 + .../IVIM_ports/UpperTesterPort_IVIM.hh | 3 + ccsrc/Ports/LibIts_ports/IVIM_ports/module.mk | 3 + .../UpperTesterPort_MapemSpatem.hh | 4 + .../LibIts_ports/MapemSpatem_ports/module.mk | 3 + .../Pki_ports/UpperTesterPkiPort.cc | 2 +- .../Pki_ports/UpperTesterPkiPort.hh | 4 + .../Pki_ports/UpperTesterPort_Pki.cc | 119 ------------------ .../Pki_ports/UpperTesterPort_Pki.hh | 47 ------- ccsrc/Ports/LibIts_ports/Pki_ports/module.mk | 3 + .../RSUsSimulator_ports/module.mk | 3 + .../UpperTesterPort_SremSsem.hh | 4 + .../LibIts_ports/SremSsem_ports/module.mk | 3 + ccsrc/Ports/LibIts_ports/UpperTesterPort.hh | 68 ++++++---- ccsrc/Protocols/Security/module.mk | 9 +- ccsrc/Protocols/UpperTester/module.mk | 10 ++ etc/AtsRSUsSimulator/AtsRSUSimulator.cfg | 13 +- ttcn/AtsCAM/module.mk | 4 + ttcn/AtsGeoNetworking/module.mk | 28 +++++ .../ItsRSUsSimulator_TestSystem.ttcn | 2 + ttcn/AtsRSUsSimulator/module.mk | 58 +++++++++ ttcn/LibIts | 2 +- 27 files changed, 262 insertions(+), 226 deletions(-) create mode 100644 ccsrc/Ports/LibIts_ports/DENM_ports/module.mk create mode 100644 ccsrc/Ports/LibIts_ports/Http_ports/module.mk create mode 100644 ccsrc/Ports/LibIts_ports/IVIM_ports/module.mk create mode 100644 ccsrc/Ports/LibIts_ports/MapemSpatem_ports/module.mk delete mode 100644 ccsrc/Ports/LibIts_ports/Pki_ports/UpperTesterPort_Pki.cc delete mode 100644 ccsrc/Ports/LibIts_ports/Pki_ports/UpperTesterPort_Pki.hh create mode 100644 ccsrc/Ports/LibIts_ports/Pki_ports/module.mk create mode 100644 ccsrc/Ports/LibIts_ports/RSUsSimulator_ports/module.mk create mode 100644 ccsrc/Ports/LibIts_ports/SremSsem_ports/module.mk create mode 100755 ttcn/AtsGeoNetworking/module.mk create mode 100644 ttcn/AtsRSUsSimulator/module.mk diff --git a/Makefile b/Makefile index 8979d5c02..389bce3c0 100755 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ - + ifeq (,$(ATS)) $(error ATS shall be defined) endif @@ -11,9 +11,9 @@ endif TTCN3_DIR := /cygdrive/c/Tools/Titan #endif -ifeq (,$(OPENSSL_DIR)) - OPENSSL_DIR := C:/Tools/OpenSSL/Win64 -endif +#ifeq (,$(OPENSSL_DIR)) +# OPENSSL_DIR := C:/Tools/OpenSSL/Win64 +#endif define IncludeModule undefine sources @@ -27,14 +27,14 @@ endef all_includes := $(TTCN3_DIR)/include $(TTCN3_DIR)/src $(TOPDIR)/ccsrc/Framework defines := TITAN_RUNTIME_2 _NO_SOFTLINKS_ -libs := -L$(TTCN3_DIR)/lib -lttcn3-rt2-parallel -lxml2 -lstdc++fs +libs := $(TTCN3_DIR)/lib/libttcn3-rt2-parallel.a -lxml2 -lstdc++fs #ifneq (,$(windir)) # Silence linker warnings. -#LDFLAGS += -Wl,--enable-auto-import,--enable-runtime-pseudo-reloc +LDFLAGS += -Wl,--enable-auto-import,--enable-runtime-pseudo-reloc defines += WIN32 -libs += -L $(OPENSSL_DIR)/lib -all_includes += $(OPENSSL_DIR)/include +libs += $(patsubst %, -L%/lib, $(OPENSSL_DIR)) +all_includes += $(addsuffix /include, $(OPENSSL_DIR)) libs += /cygdrive/c/windows/system32/npcap/wpcap.dll #endif libs += -lssl -lcrypto @@ -55,26 +55,29 @@ 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_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_asn_sources := $(addprefix $(outdir)/, $(notdir $(patsubst %.asn, %.cc, $(asn_sources)))) -gen_asn1_sources := $(addprefix $(outdir)/, $(notdir $(patsubst %.asn1, %.cc, $(asn1_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)) -define GenerateSource -$(outdir)/$(notdir $(patsubst %.ttcn %.asn %.ttcn3 %.asn1, %.cc, $1)): $1 -endef - .PHONY: all FORCE echo all: $(outdir) $(outdir)/$(ATS)$(EXE) -echo: - @echo -e "all_sources:\n $(addsuffix \n, $(all_sources))" +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))" @@ -82,6 +85,14 @@ echo: @echo -e "includes:\n $(addsuffix \n, $(includes))" @echo -e "defines: $(addsuffix \n, $(defines))" +clean: + rm -f $(outdir)/$(ATS)$(EXE) $(outdir)/*.o $(outdir)/*.cc $(outdir)/*.hh $(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): mkdir -p $@ @@ -98,9 +109,18 @@ $(cc_objects) : $(outdir)/%.o : %.cc $(gen_sources): $(outdir)/.generate $(outdir)/.generate: Makefile $(tt_sources) - $(TTCN3_DIR)/bin/compiler -w -e -L -R -U none -o $(outdir) $(tt_sources) + $(TTCN3_DIR)/bin/compiler -n -e -L -R -U none -o $(outdir) $(tt_sources) touch $@ +$(outdir)/libItsAsn.so: $(outdir)/asn1/libItsAsn.so + ln asn1/libItsAsn.so $@ + $(outdir)/asn1/libItsAsn.so: FORCE mkdir -p $(outdir)/asn1 - $(MAKE) -C $(outdir)/asn1 -f ../../asn1/Makefile ASN1C_PATH=../../../../asn1c + $(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/ccsrc/EncDec/module.mk b/ccsrc/EncDec/module.mk index 03c454302..d185a833b 100755 --- a/ccsrc/EncDec/module.mk +++ b/ccsrc/EncDec/module.mk @@ -1,20 +1,36 @@ -sources := LibItsBtp_Encdec.cc \ - LibItsCam_Encdec.cc \ +sources := \ LibItsGeoNetworking_Encdec.cc \ - LibItsSecurity_Encdec.cc \ LibItsIpv6OverGeoNetworking_Encdec.cc \ + LibItsSecurity_Encdec.cc \ +# LibItsBtp_Encdec.cc \ # LibItsHttp_Encdec.cc \ # LibItsMapemSpatem_Encdec.cc \ # LibItsPki_Encdec.cc \ # LibItsSremSsem_Encdec.cc -ifeq (DENM, %(ATS)) +ifeq (AtsCAM, $(ATS)) +sources += LibItsCam_Encdec.cc +endif + +ifeq (AtsDENM, $(ATS)) sources += LibItsDenm_Encdec.cc endif -ifeq (IVIM, %(ATS)) +ifeq (AtsIVIM, $(ATS)) sources += LibItsIvim_Encdec.cc endif +ifeq (AtsRSUsSimulator, $(ATS)) +sources += LibItsBtp_Encdec.cc \ + LibItsCam_Encdec.cc \ + LibItsDenm_Encdec.cc \ + LibItsHttp_Encdec.cc \ + LibItsMapemSpatem_Encdec.cc \ + LibItsSremSsem_Encdec.cc \ + LibItsIvim_Encdec.cc \ + LibItsPki_Encdec.cc + +endif +# LibItsPki_Encdec.cc # LibItsEvcsn_Encdec.cc \ diff --git a/ccsrc/Externals/module.mk b/ccsrc/Externals/module.mk index eb7fb0784..72506e0ee 100644 --- a/ccsrc/Externals/module.mk +++ b/ccsrc/Externals/module.mk @@ -2,7 +2,8 @@ sources := LibItsCommon_externals.cc \ LibItsGeoNetworking_externals.cc \ LibItsIpv6OverGeoNetworking_externals.cc \ LibItsSecurity_externals.cc -ifeq (AtsRSUsSimulator, %(ATS)) + +ifeq (AtsRSUsSimulator, $(ATS)) sources += AtsRSUsSimulator_externals.cc endif # LibItsDcc_externals.cc \ diff --git a/ccsrc/Ports/LibIts_ports/AdapterControlPort.hh b/ccsrc/Ports/LibIts_ports/AdapterControlPort.hh index 20199df8a..31740cc6b 100644 --- a/ccsrc/Ports/LibIts_ports/AdapterControlPort.hh +++ b/ccsrc/Ports/LibIts_ports/AdapterControlPort.hh @@ -1,5 +1,3 @@ -#ifndef AdapterControlPort_HH -#define AdapterControlPort_HH //#include "TRI_mapper_API.hh" @@ -56,4 +54,3 @@ */ //#include "AdapterControlPort_V2G.partH" #endif //_NO_SOFTLINKS_ -#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 000000000..4cb04ae0d --- /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/Http_ports/module.mk b/ccsrc/Ports/LibIts_ports/Http_ports/module.mk new file mode 100644 index 000000000..ac4f8ac51 --- /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/IVIM_ports/UpperTesterPort_IVIM.hh b/ccsrc/Ports/LibIts_ports/IVIM_ports/UpperTesterPort_IVIM.hh index 09a06dcaa..864d143a2 100644 --- a/ccsrc/Ports/LibIts_ports/IVIM_ports/UpperTesterPort_IVIM.hh +++ b/ccsrc/Ports/LibIts_ports/IVIM_ports/UpperTesterPort_IVIM.hh @@ -2,6 +2,9 @@ #ifndef UpperTesterPort_IVIM_HH #define UpperTesterPort_IVIM_HH +#include "layer.hh" +#include "params.hh" + #include "LibItsIvim_TestSystem.hh" namespace LibItsIvim__TestSystem { 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 000000000..de5f67150 --- /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/UpperTesterPort_MapemSpatem.hh b/ccsrc/Ports/LibIts_ports/MapemSpatem_ports/UpperTesterPort_MapemSpatem.hh index 79ce869c2..f34907cb0 100644 --- a/ccsrc/Ports/LibIts_ports/MapemSpatem_ports/UpperTesterPort_MapemSpatem.hh +++ b/ccsrc/Ports/LibIts_ports/MapemSpatem_ports/UpperTesterPort_MapemSpatem.hh @@ -3,6 +3,10 @@ #define UpperTesterPort_MapemSpatem_HH #include "LibItsMapemSpatem_TestSystem.hh" + +#include "layer.hh" +#include "params.hh" + namespace LibItsMapemSpatem__TestSystem { class UpperTesterPort : public UpperTesterPort_BASE { 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 000000000..5a934dc21 --- /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/UpperTesterPkiPort.cc b/ccsrc/Ports/LibIts_ports/Pki_ports/UpperTesterPkiPort.cc index 120e8e4c4..cea0be98a 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/UpperTesterPkiPort.hh b/ccsrc/Ports/LibIts_ports/Pki_ports/UpperTesterPkiPort.hh index 5159a6ef8..065a14f87 100644 --- a/ccsrc/Ports/LibIts_ports/Pki_ports/UpperTesterPkiPort.hh +++ b/ccsrc/Ports/LibIts_ports/Pki_ports/UpperTesterPkiPort.hh @@ -1,3 +1,6 @@ +#ifndef UpperTesterPkiPort_HH +#define UpperTesterPkiPort_HH + //============================================================================= #include "LibItsPki_TestSystem.hh" @@ -42,3 +45,4 @@ namespace LibItsPki__TestSystem { }; } /* end of namespace */ +#endif diff --git a/ccsrc/Ports/LibIts_ports/Pki_ports/UpperTesterPort_Pki.cc b/ccsrc/Ports/LibIts_ports/Pki_ports/UpperTesterPort_Pki.cc deleted file mode 100644 index 93062e48a..000000000 --- a/ccsrc/Ports/LibIts_ports/Pki_ports/UpperTesterPort_Pki.cc +++ /dev/null @@ -1,119 +0,0 @@ -#include "uppertester_pki_layer_factory.hh" - -#include "loggers.hh" -#include "UpperTesterPort_Pki.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.hh b/ccsrc/Ports/LibIts_ports/Pki_ports/UpperTesterPort_Pki.hh deleted file mode 100644 index 720549998..000000000 --- a/ccsrc/Ports/LibIts_ports/Pki_ports/UpperTesterPort_Pki.hh +++ /dev/null @@ -1,47 +0,0 @@ -#ifndef UpperTesterPort_Pki_HH -#define UpperTesterPort_Pki_HH - -#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 */ -#endif 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 000000000..1897e76b0 --- /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 000000000..2361270f1 --- /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/SremSsem_ports/UpperTesterPort_SremSsem.hh b/ccsrc/Ports/LibIts_ports/SremSsem_ports/UpperTesterPort_SremSsem.hh index b76464521..507554d00 100644 --- a/ccsrc/Ports/LibIts_ports/SremSsem_ports/UpperTesterPort_SremSsem.hh +++ b/ccsrc/Ports/LibIts_ports/SremSsem_ports/UpperTesterPort_SremSsem.hh @@ -3,6 +3,10 @@ #define UpperTesterPort_SremSsem_HH #include "LibItsSremSsem_TestSystem.hh" + +#include "layer.hh" +#include "params.hh" + namespace LibItsSremSsem__TestSystem { class UpperTesterPort : public UpperTesterPort_BASE { 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 000000000..b337391b5 --- /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.hh b/ccsrc/Ports/LibIts_ports/UpperTesterPort.hh index beed6498d..1b3369cb1 100644 --- a/ccsrc/Ports/LibIts_ports/UpperTesterPort.hh +++ b/ccsrc/Ports/LibIts_ports/UpperTesterPort.hh @@ -6,58 +6,74 @@ //#include "TTCN_EncDec.hh" #ifdef _NO_SOFTLINKS_ /* to be used when built without generating softlinks to the working directory */ -#ifdef LibItsBtp__TestSystem_HH -#include "BTP_ports/UpperTesterPort_BTP.hh" +#if defined(LibItsGeoNetworking__TestSystem_HH) + #ifndef UpperTesterPort_GN_HH + #include "GN_ports/UpperTesterPort_GN.hh" + #define UTP_STOP + #endif #endif -#ifdef LibItsCam__TestSystem_HH + +#if !defined(UTP_STOP) && defined(LibItsBtp__TestSystem_HH) + #ifndef UpperTesterPort_BTP_HH + #include "BTP_ports/UpperTesterPort_BTP.hh" + #define UTP_STOP + #endif +#endif + +#if !defined(UTP_STOP) && defined(LibItsCam__TestSystem_HH) #include "CAM_ports/UpperTesterPort_CAM.hh" #endif -#ifdef LibItsDenm__TestSystem_HH +#if !defined(UTP_STOP) && defined(LibItsDenm__TestSystem_HH) #include "DENM_ports/UpperTesterPort_DENM.hh" #endif -#ifdef LibItsGeoNetworking__TestSystem_HH -#include "GN_ports/UpperTesterPort_GN.hh" -#endif -#ifdef LibItsIvim__TestSystem_HH +#if !defined(UTP_STOP) && defined(LibItsIvim__TestSystem_HH) #include "IVIM_ports/UpperTesterPort_IVIM.hh" #endif -#ifdef LibItsMapemSpatem__TestSystem_HH +#if !defined(UTP_STOP) && defined(LibItsMapemSpatem__TestSystem_HH) #include "MapemSpatem_ports/UpperTesterPort_MapemSpatem.hh" #endif -#ifdef LibItsSremSsem__TestSystem_HH +#if !defined(UTP_STOP) && defined(LibItsSremSsem__TestSystem_HH) #include "SremSsem_ports/UpperTesterPort_SremSsem.hh" #endif -#ifdef LibItsPki__TestSystem_HH -#include "Pki_ports/UpperTesterPort_Pki.hh" +#if !defined(UTP_STOP) && defined(LibItsPki__TestSystem_HH) +#include "Pki_ports/UpperTesterPkiPort.hh" #endif -#ifdef LibItsV2G__TestSystem_HH +#if !defined(UTP_STOP) && defined(LibItsV2G__TestSystem_HH) #include "V2G_ports/UpperTesterPort_V2G.hh" #endif #else //_NO_SOFTLINKS_ -#ifdef LibItsBtp__TestSystem_HH -#include "UpperTesterPort_BTP.hh" +#if defined(LibItsGeoNetworking__TestSystem_HH) + #ifndef UpperTesterPort_GN_HH + #include "UpperTesterPort_GN.hh" + #define UTP_STOP + #endif +#endif + +#if !defined(UTP_STOP) && defined(LibItsBtp__TestSystem_HH) + #ifndef UpperTesterPort_BTP_HH + #include "UpperTesterPort_BTP.hh" + #define UTP_STOP + #endif #endif -#ifdef LibItsCam__TestSystem_HH + +#if !defined(UTP_STOP) && defined(LibItsCam__TestSystem_HH) #include "UpperTesterPort_CAM.hh" #endif -#ifdef LibItsDenm__TestSystem_HH +#if !defined(UTP_STOP) && defined(LibItsDenm__TestSystem_HH) #include "UpperTesterPort_DENM.hh" #endif -#ifdef LibItsIvim__TestSystem_HH +#if !defined(UTP_STOP) && defined(LibItsIvim__TestSystem_HH) #include "UpperTesterPort_IVIM.hh" #endif -#ifdef LibItsMapemSpatem__TestSystem_HH +#if !defined(UTP_STOP) && defined(LibItsMapemSpatem__TestSystem_HH) #include "UpperTesterPort_MapemSpatem.hh" #endif -#ifdef LibItsSremSsem__TestSystem_HH +#if !defined(UTP_STOP) && defined(LibItsSremSsem__TestSystem_HH) #include "UpperTesterPort_SremSsem.hh" #endif -#ifdef LibItsGeoNetworking__TestSystem_HH -#include "UpperTesterPort_GN.hh" -#endif -#ifdef LibItsPki__TestSystem_HH +#if !defined(UTP_STOP) && defined(LibItsPki__TestSystem_HH) #include "UpperTesterPort_Pki.hh" #endif /* @@ -66,4 +82,8 @@ */ #endif//_NO_SOFTLINKS_ +#ifdef UTP_STOP +#undef UTP_STOP +#endif + #endif diff --git a/ccsrc/Protocols/Security/module.mk b/ccsrc/Protocols/Security/module.mk index 48c03544b..6f7311f54 100644 --- a/ccsrc/Protocols/Security/module.mk +++ b/ccsrc/Protocols/Security/module.mk @@ -14,7 +14,6 @@ sources := certificates_loader.cc \ etsi_ts103097_tobesigned_certificate_codec.cc \ etsi_ts103097_tobesigned_data_codec.cc \ hmac.cc \ - http_etsi_ieee1609dot2_codec.cc \ ieee_1609dot2_base_types_public_encryption_key.cc \ ieee_1609dot2_base_types_public_verification_key.cc \ security_cache.cc \ @@ -25,5 +24,13 @@ sources := certificates_loader.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/UpperTester/module.mk b/ccsrc/Protocols/UpperTester/module.mk index 46b9c31e4..66ac2a5b8 100644 --- a/ccsrc/Protocols/UpperTester/module.mk +++ b/ccsrc/Protocols/UpperTester/module.mk @@ -23,6 +23,16 @@ ifeq (AtsDENM, $(ATS)) sources += 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 \ + uppertester_pki_codec.cc uppertester_pki_layer.cc \ + +endif + includes := . diff --git a/etc/AtsRSUsSimulator/AtsRSUSimulator.cfg b/etc/AtsRSUsSimulator/AtsRSUSimulator.cfg index 9860913f4..f7d242e69 100644 --- a/etc/AtsRSUsSimulator/AtsRSUSimulator.cfg +++ b/etc/AtsRSUsSimulator/AtsRSUSimulator.cfg @@ -57,12 +57,12 @@ ItsRSUsSimulator_Pics.PICS_SEND_DENM_INDICATION := true # Enable Security support LibItsGeoNetworking_Pics.PICS_GN_SECURITY := true # Root path to access certificate stored in files, identified by certficate ID -LibItsSecurity_Pixits.PX_CERTIFICATE_POOL_PATH := "/home/vagrant/tmp" +LibItsSecurity_Pixits.PX_CERTIFICATE_POOL_PATH := "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 @@ -163,7 +163,10 @@ LogEventTypes:= Yes # its_aid=36: CAM # its_aid=37: DENM # its_aid=141: GeoMet -system.geoNetworkingPort.params := "GN(ll_address=4C5E0C14D2EB,latitude=43551050,longitude=10298730,its_aid=36,secured_mode=1,certificate=CERT_IUT_A_AT,sec_db_path=/home/vagrant/tmp/asn1c_cert)/ETH(mac_src=080027128a53)/PCAP(mac_src=080027128a53,nic=eth1,filter=and ether proto 0x8947)" +system.geoNetworkingPort.params := " + GN(ll_address=4C5E0C14D2EB,latitude=43551050,longitude=10298730,its_aid=36,secured_mode=1,certificate=CERT_IUT_A_AT,sec_db_path=data/certificates)/ + ETH(mac_src=00E04C68A545)/ + PCAP(mac_src=00E04C68A545,nic=10,filter=and ether proto 0x8947)" # Commsignia #system.geoNetworkingPort.params := "GN(ll_address=4C5E0C14D2EB,latitude=43551050,longitude=10298730,its_aid=37,secured_mode=0,encrypted_mode=0,certificate=CERT_IUT_A_AT,peer_certificate=CERT_TS_A_AT,sec_db_path=/home/vagrant/tmp/asn1c_cert)/COMMSIGNIA(xport_mode=LTE-V2X,mac_src=080027F44E7D,interface_id=2,target_host=192.168.0.54)/UDP(dst_ip=192.168.0.54,src_port=9091,dst_port=7946)" # Qualcom @@ -171,7 +174,7 @@ system.geoNetworkingPort.params := "GN(ll_address=4C5E0C14D2EB,latitude=43551050 #system.httpPort.params := "HTTP(codecs=http_its:http_etsi_ieee1609dot2_codec)/TCP(debug=1,server=192.168.42.25,port=80)" #system.httpPort.params := "HTTP(codecs=http_its:http_etsi_ieee1609dot2_codec)/TCP(debug=1,server=192.168.1.25,port=80)" -system.httpPort.params := "HTTP(codecs=http_its:http_etsi_ieee1609dot2_codec)/TCP(debug=1,server=192.168.1.39,port=8080)" +system.httpPort.params := "HTTP(codecs=http_its:http_etsi_ieee1609dot2_codec)/TCP(debug=1,server=127.0.0.1,port=8080)" # Config port based on UDP #system.cfPort.params := "CF(ut=cam)/UDP(src_port=12345,reuse_incoming_source_adddress=1)" diff --git a/ttcn/AtsCAM/module.mk b/ttcn/AtsCAM/module.mk index cd7416d97..9e4124245 100755 --- a/ttcn/AtsCAM/module.mk +++ b/ttcn/AtsCAM/module.mk @@ -8,6 +8,10 @@ modules := ../LibCommon \ ../LibIts \ ../LibIts/ttcn/CAM \ ../LibIts/asn1/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 \ diff --git a/ttcn/AtsGeoNetworking/module.mk b/ttcn/AtsGeoNetworking/module.mk new file mode 100755 index 000000000..e790ab26c --- /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/AtsRSUsSimulator/ItsRSUsSimulator_TestSystem.ttcn b/ttcn/AtsRSUsSimulator/ItsRSUsSimulator_TestSystem.ttcn index 4f4e485ad..ce7ba5c6f 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/module.mk b/ttcn/AtsRSUsSimulator/module.mk new file mode 100644 index 000000000..cffcfe808 --- /dev/null +++ b/ttcn/AtsRSUsSimulator/module.mk @@ -0,0 +1,58 @@ +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/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/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/UpperTester \ + ../../ccsrc/Protocols/Security \ + ../../ccsrc/Protocols/Http \ + ../../ccsrc/Protocols/DENM \ + ../../ccsrc/Protocols/IVIM \ + ../../ccsrc/Protocols/MapemSpatem \ + ../../ccsrc/Protocols/SremSsem \ + diff --git a/ttcn/LibIts b/ttcn/LibIts index 925bd8a42..977316492 160000 --- a/ttcn/LibIts +++ b/ttcn/LibIts @@ -1 +1 @@ -Subproject commit 925bd8a42bd74ba0897537bd64db702acbdc7173 +Subproject commit 977316492cee1172d48e2f17798ad4de1456771d -- GitLab From 9969745f3b30bddb7969a9c6a2b77027cd8ec9a9 Mon Sep 17 00:00:00 2001 From: Denis Filatov Date: Fri, 10 Jul 2020 11:33:54 +0200 Subject: [PATCH 06/35] use underscores for ASN1 module names --- ttcn/LibIts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ttcn/LibIts b/ttcn/LibIts index 977316492..8ad720955 160000 --- a/ttcn/LibIts +++ b/ttcn/LibIts @@ -1 +1 @@ -Subproject commit 977316492cee1172d48e2f17798ad4de1456771d +Subproject commit 8ad720955d9ff4d1ba9a254a87f2d0e6c3578015 -- GitLab From a8bb90f2ddde7018fdcc8f8fd5d90a5f82d33771 Mon Sep 17 00:00:00 2001 From: Denis Filatov Date: Tue, 11 Aug 2020 14:18:52 +0200 Subject: [PATCH 07/35] module.mk for AtsDENM, AtsGN, etc --- Makefile | 11 ++++--- ccsrc/EncDec/module.mk | 15 +++++++--- docker/home/etc/init.d/20-eclipse.sh | 16 +++++++---- ttcn/AtsCAM/module.mk | 4 ++- ttcn/AtsDENM/module.mk | 35 ++++++++++++++++++++++ ttcn/AtsRSUsSimulator/Makefile | 2 ++ ttcn/AtsSecurity/module.mk | 43 ++++++++++++++++++++++++++++ 7 files changed, 111 insertions(+), 15 deletions(-) create mode 100755 ttcn/AtsDENM/module.mk create mode 100755 ttcn/AtsRSUsSimulator/Makefile create mode 100755 ttcn/AtsSecurity/module.mk diff --git a/Makefile b/Makefile index 389bce3c0..4456f12d9 100755 --- a/Makefile +++ b/Makefile @@ -106,11 +106,14 @@ $(cc_objects) : $(outdir)/%.o : %.cc mkdir -p $(dir $@) g++ -g -O0 -c $(addprefix -D, $(defines)) $(addprefix -I, $(includes)) -o $@ $< -$(gen_sources): $(outdir)/.generate - -$(outdir)/.generate: Makefile $(tt_sources) +$(gen_sources): $(TTCN3_DIR)/bin/compiler -n -e -L -R -U none -o $(outdir) $(tt_sources) - touch $@ + +#$(gen_sources): $(outdir)/.generate + +#$(outdir)/.generate: Makefile $(tt_sources) +# $(TTCN3_DIR)/bin/compiler -n -e -L -R -U none -o $(outdir) $(tt_sources) +# touch $@ $(outdir)/libItsAsn.so: $(outdir)/asn1/libItsAsn.so ln asn1/libItsAsn.so $@ diff --git a/ccsrc/EncDec/module.mk b/ccsrc/EncDec/module.mk index d185a833b..a1ecb69cd 100755 --- a/ccsrc/EncDec/module.mk +++ b/ccsrc/EncDec/module.mk @@ -9,19 +9,26 @@ sources := \ # LibItsSremSsem_Encdec.cc ifeq (AtsCAM, $(ATS)) -sources += LibItsCam_Encdec.cc +sources += \ + LibItsBtp_Encdec.cc \ + LibItsCam_Encdec.cc endif ifeq (AtsDENM, $(ATS)) -sources += LibItsDenm_Encdec.cc +sources += \ + LibItsBtp_Encdec.cc \ + LibItsDenm_Encdec.cc endif ifeq (AtsIVIM, $(ATS)) -sources += LibItsIvim_Encdec.cc +sources += \ + LibItsBtp_Encdec.cc \ + LibItsIvim_Encdec.cc endif ifeq (AtsRSUsSimulator, $(ATS)) -sources += LibItsBtp_Encdec.cc \ +sources += \ + LibItsBtp_Encdec.cc \ LibItsCam_Encdec.cc \ LibItsDenm_Encdec.cc \ LibItsHttp_Encdec.cc \ diff --git a/docker/home/etc/init.d/20-eclipse.sh b/docker/home/etc/init.d/20-eclipse.sh index 0f95364e3..742442dae 100755 --- a/docker/home/etc/init.d/20-eclipse.sh +++ b/docker/home/etc/init.d/20-eclipse.sh @@ -1,20 +1,24 @@ #!/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 'https://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/helios/SR2/eclipse-cpp-helios-SR2-linux-gtk-x86_64.tar.gz' -Oeclipse-cpp-helios-SR2-linux-gtk-x86_64.tar.gz || exit 1 -tar -zxvf ./eclipse-cpp-helios-SR2-linux-gtk-x86_64.tar.gz || exit 1 +wget --progress=dot:mega "${ECLIPE_URL}" -Oeclipse.tar.gz || exit 1 +tar -zxvf ./eclipse.tar.gz || exit 1 ln -sf ${HOME}/frameworks/eclipse/eclipse ${HOME}/bin/eclipse -rm -f ./eclipse-cpp-helios-SR2-linux-gtk-x86_64.tar.gz +rm -f ./eclipse.tar.gz -if wget --progress=dot:mega 'https://www.eclipse.org/downloads/download.php?file=/titan/TITAN_Designer_and_Executor_plugin-6.4.pl0.zip&r=1' -OTITAN_Designer_and_Executor_plugin.zip; then +if wget --progress=dot:mega "${TITAL_URL}" -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/ttcn/AtsCAM/module.mk b/ttcn/AtsCAM/module.mk index 9e4124245..feec81739 100755 --- a/ttcn/AtsCAM/module.mk +++ b/ttcn/AtsCAM/module.mk @@ -6,8 +6,10 @@ sources := ItsCam_TestCases.ttcn \ modules := ../LibCommon \ ../LibIts \ - ../LibIts/ttcn/CAM \ ../LibIts/asn1/CAM \ + ../LibIts/asn1/IS \ + ../LibIts/asn1/Security \ + ../LibIts/ttcn/CAM \ ../LibIts/ttcn/Security \ ../LibIts/ttcn/GeoNetworking \ ../LibIts/ttcn/Ipv6OverGeoNetworking \ diff --git a/ttcn/AtsDENM/module.mk b/ttcn/AtsDENM/module.mk new file mode 100755 index 000000000..04f37deaa --- /dev/null +++ b/ttcn/AtsDENM/module.mk @@ -0,0 +1,35 @@ +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/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/AtsRSUsSimulator/Makefile b/ttcn/AtsRSUsSimulator/Makefile new file mode 100755 index 000000000..f91ea34ef --- /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/AtsSecurity/module.mk b/ttcn/AtsSecurity/module.mk new file mode 100755 index 000000000..66c7861e9 --- /dev/null +++ b/ttcn/AtsSecurity/module.mk @@ -0,0 +1,43 @@ +suite := AtsSecurity + +sources := ItsSecurity_Functions.ttcn \ + ItsSecurity_Pics.ttcn \ + ItsSecurity_Templates.ttcn \ + ItsSecurity_TestCases.ttcn \ + ItsSecurity_TestControl.ttcn \ + ItsSecurity_TestSystem.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/GeoNetworking \ + ../../ccsrc/Protocols/BTP \ + ../../ccsrc/Protocols/Pcap \ + ../../ccsrc/Protocols/UpperTester \ + ../../ccsrc/Protocols/Security \ +# ../../ccsrc/Protocols/CAM \ +# ../../ccsrc/Protocols/Http \ +# ../../ccsrc/Protocols/DENM \ +# ../../ccsrc/Protocols/IVIM \ +# ../../ccsrc/Protocols/MapemSpatem \ +# ../../ccsrc/Protocols/SremSsem \ -- GitLab From a15a7d1945b6b19c5301738405216449d6d3f641 Mon Sep 17 00:00:00 2001 From: Denis Filatov Date: Tue, 25 Aug 2020 12:30:27 +0200 Subject: [PATCH 08/35] AtsSecurity compilation tree --- Makefile | 2 +- ccsrc/EncDec/module.mk | 12 ++-- ccsrc/Ports/LibIts_ports/UpperTesterPort.hh | 64 ++++++++++++++++++++- ccsrc/Protocols/UDP/module.mk | 3 +- ccsrc/Protocols/UpperTester/module.mk | 7 +++ ttcn/AtsCAM/module.mk | 2 + ttcn/AtsSecurity/module.mk | 4 +- 7 files changed, 83 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 4456f12d9..22a5b2122 100755 --- a/Makefile +++ b/Makefile @@ -26,7 +26,7 @@ $$(foreach M, $$(modules), $$(eval $$(call IncludeModule, $(1)/$$(M)))) endef all_includes := $(TTCN3_DIR)/include $(TTCN3_DIR)/src $(TOPDIR)/ccsrc/Framework -defines := TITAN_RUNTIME_2 _NO_SOFTLINKS_ +defines := TITAN_RUNTIME_2 _NO_SOFTLINKS_ $(ATS) libs := $(TTCN3_DIR)/lib/libttcn3-rt2-parallel.a -lxml2 -lstdc++fs #ifneq (,$(windir)) diff --git a/ccsrc/EncDec/module.mk b/ccsrc/EncDec/module.mk index a1ecb69cd..1c64c34cb 100755 --- a/ccsrc/EncDec/module.mk +++ b/ccsrc/EncDec/module.mk @@ -2,6 +2,7 @@ sources := \ LibItsGeoNetworking_Encdec.cc \ LibItsIpv6OverGeoNetworking_Encdec.cc \ LibItsSecurity_Encdec.cc \ + LibItsBtp_Encdec.cc \ # LibItsBtp_Encdec.cc \ # LibItsHttp_Encdec.cc \ # LibItsMapemSpatem_Encdec.cc \ @@ -10,25 +11,21 @@ sources := \ ifeq (AtsCAM, $(ATS)) sources += \ - LibItsBtp_Encdec.cc \ LibItsCam_Encdec.cc endif ifeq (AtsDENM, $(ATS)) sources += \ - LibItsBtp_Encdec.cc \ LibItsDenm_Encdec.cc endif ifeq (AtsIVIM, $(ATS)) sources += \ - LibItsBtp_Encdec.cc \ LibItsIvim_Encdec.cc endif ifeq (AtsRSUsSimulator, $(ATS)) sources += \ - LibItsBtp_Encdec.cc \ LibItsCam_Encdec.cc \ LibItsDenm_Encdec.cc \ LibItsHttp_Encdec.cc \ @@ -39,5 +36,12 @@ sources += \ endif +ifeq (AtsSecurity, $(ATS)) +sources += \ + LibItsCam_Encdec.cc \ + LibItsDenm_Encdec.cc +endif + + # LibItsPki_Encdec.cc # LibItsEvcsn_Encdec.cc \ diff --git a/ccsrc/Ports/LibIts_ports/UpperTesterPort.hh b/ccsrc/Ports/LibIts_ports/UpperTesterPort.hh index 1b3369cb1..91de214b0 100644 --- a/ccsrc/Ports/LibIts_ports/UpperTesterPort.hh +++ b/ccsrc/Ports/LibIts_ports/UpperTesterPort.hh @@ -5,6 +5,36 @@ //#include "TRI_mapper_API.hh" //#include "TTCN_EncDec.hh" #ifdef _NO_SOFTLINKS_ + +#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 + +#if 0 /* to be used when built without generating softlinks to the working directory */ #if defined(LibItsGeoNetworking__TestSystem_HH) #ifndef UpperTesterPort_GN_HH @@ -42,8 +72,35 @@ #include "V2G_ports/UpperTesterPort_V2G.hh" #endif +#endif // IF 0 + #else //_NO_SOFTLINKS_ +#if (ATS == AtsGeoNetworking) + #include "UpperTesterPort_GN.hh" +#endif + +#if (ATS == AtsBTP) + #include "UpperTesterPort_BTP.hh" +#endif + +#if (ATS == AtsCAM) + #include "UpperTesterPort_GN.hh" + #include "UpperTesterPort_CAM.hh" +#endif + +#if (ATS == AtsDENM) + #include "UpperTesterPort_GN.hh" + #include "UpperTesterPort_DENM.hh" +#endif + +#if (ATS == AtsSecurity) + #include "UpperTesterPort_GN.hh" + #include "UpperTesterPort_CAM.hh" + #include "UpperTesterPort_DENM.hh" +#endif + +#if 0 #if defined(LibItsGeoNetworking__TestSystem_HH) #ifndef UpperTesterPort_GN_HH #include "UpperTesterPort_GN.hh" @@ -80,10 +137,11 @@ #include "UpperTesterPort_Evcsn.hh" //#include "UpperTesterPort_V2G.hh" */ +#endif // IF 0 #endif//_NO_SOFTLINKS_ -#ifdef UTP_STOP -#undef UTP_STOP -#endif +//#ifdef UTP_STOP +//#undef UTP_STOP +//#endif #endif diff --git a/ccsrc/Protocols/UDP/module.mk b/ccsrc/Protocols/UDP/module.mk index f2ee4337e..b57564e5e 100644 --- a/ccsrc/Protocols/UDP/module.mk +++ b/ccsrc/Protocols/UDP/module.mk @@ -1,3 +1,4 @@ -sources := udp_layer.cc udp_pcap_layer.cc +#sources := udp_layer.cc udp_pcap_layer.cc +sources := udp_layer.cc includes := . diff --git a/ccsrc/Protocols/UpperTester/module.mk b/ccsrc/Protocols/UpperTester/module.mk index 66ac2a5b8..a7ff3bc78 100644 --- a/ccsrc/Protocols/UpperTester/module.mk +++ b/ccsrc/Protocols/UpperTester/module.mk @@ -23,6 +23,12 @@ 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 \ @@ -36,3 +42,4 @@ endif includes := . +modules += ../UDP diff --git a/ttcn/AtsCAM/module.mk b/ttcn/AtsCAM/module.mk index feec81739..bbd916429 100755 --- a/ttcn/AtsCAM/module.mk +++ b/ttcn/AtsCAM/module.mk @@ -30,8 +30,10 @@ modules := ../LibCommon \ ../../ccsrc/Protocols/Pcap \ ../../ccsrc/Protocols/UpperTester \ ../../ccsrc/Protocols/Security \ +# ../../ccsrc/Protocols/UDP \ # ../../ccsrc/Protocols/Http \ # ../../ccsrc/Protocols/DENM \ # ../../ccsrc/Protocols/IVIM \ # ../../ccsrc/Protocols/MapemSpatem \ # ../../ccsrc/Protocols/SremSsem \ + diff --git a/ttcn/AtsSecurity/module.mk b/ttcn/AtsSecurity/module.mk index 66c7861e9..3c413a8d4 100755 --- a/ttcn/AtsSecurity/module.mk +++ b/ttcn/AtsSecurity/module.mk @@ -35,9 +35,9 @@ modules := ../LibCommon \ ../../ccsrc/Protocols/Pcap \ ../../ccsrc/Protocols/UpperTester \ ../../ccsrc/Protocols/Security \ -# ../../ccsrc/Protocols/CAM \ + ../../ccsrc/Protocols/CAM \ + ../../ccsrc/Protocols/DENM \ # ../../ccsrc/Protocols/Http \ -# ../../ccsrc/Protocols/DENM \ # ../../ccsrc/Protocols/IVIM \ # ../../ccsrc/Protocols/MapemSpatem \ # ../../ccsrc/Protocols/SremSsem \ -- GitLab From 18ee746b8a6dd22b24bb513f940e96eece6c3b01 Mon Sep 17 00:00:00 2001 From: Denis Filatov Date: Thu, 3 Sep 2020 08:57:26 +0200 Subject: [PATCH 09/35] fix CAM SSP in cert profiles --- data/v3/profiles/CERT_IUT_A_B33_AT.xml | 2 +- data/v3/profiles/CERT_IUT_CAM_BO_02_AT.xml | 2 +- data/v3/profiles/CERT_IUT_CAM_BO_03_AT.xml | 2 +- data/v3/profiles/CERT_IUT_C_AT.xml | 2 +- data/v3/profiles/CERT_IUT_C_RCA.xml | 2 ++ data/v3/profiles/CERT_TS_CAM_BO_02_AT.xml | 2 +- data/v3/profiles/CERT_TS_CAM_BO_03_AT.xml | 2 +- 7 files changed, 8 insertions(+), 6 deletions(-) diff --git a/data/v3/profiles/CERT_IUT_A_B33_AT.xml b/data/v3/profiles/CERT_IUT_A_B33_AT.xml index f44fffba4..ed467553c 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 66d6f7d07..569f39005 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 af470fbe2..dc08eddfd 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 eaf058e46..b6cac15bb 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 48c81ae81..a7d942cf0 100644 --- a/data/v3/profiles/CERT_IUT_C_RCA.xml +++ b/data/v3/profiles/CERT_IUT_C_RCA.xml @@ -27,6 +27,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 2d0da6a01..84c91a033 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 07c047d77..ae2db8dbd 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 -- GitLab From c67e6e00c540a40f441b69c9de07e8f8d3c31b4a Mon Sep 17 00:00:00 2001 From: Denis Filatov Date: Thu, 3 Sep 2020 08:59:12 +0200 Subject: [PATCH 10/35] fix hash calculation in asn1certgen --- tools/itscertgen/asn1certgen/asn1certgen.c | 23 ++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/tools/itscertgen/asn1certgen/asn1certgen.c b/tools/itscertgen/asn1certgen/asn1certgen.c index cc96ca73a..3e47689c1 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: -- GitLab From 47bd95b8406185a182bdacde8839ee7803aec96d Mon Sep 17 00:00:00 2001 From: Denis Filatov Date: Thu, 3 Sep 2020 08:59:46 +0200 Subject: [PATCH 11/35] add ETH in AtsSecurity --- ttcn/AtsSecurity/module.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ttcn/AtsSecurity/module.mk b/ttcn/AtsSecurity/module.mk index 3c413a8d4..21f6b79e3 100755 --- a/ttcn/AtsSecurity/module.mk +++ b/ttcn/AtsSecurity/module.mk @@ -30,10 +30,11 @@ modules := ../LibCommon \ ../../ccsrc/Externals \ ../../ccsrc/loggers \ ../../ccsrc/Asn1c \ + ../../ccsrc/Protocols/UpperTester \ + ../../ccsrc/Protocols/Pcap \ + ../../ccsrc/Protocols/ETH \ ../../ccsrc/Protocols/GeoNetworking \ ../../ccsrc/Protocols/BTP \ - ../../ccsrc/Protocols/Pcap \ - ../../ccsrc/Protocols/UpperTester \ ../../ccsrc/Protocols/Security \ ../../ccsrc/Protocols/CAM \ ../../ccsrc/Protocols/DENM \ -- GitLab From 83e076c1df47aaf852c178536bdd6190cc328dc0 Mon Sep 17 00:00:00 2001 From: Denis Filatov Date: Thu, 3 Sep 2020 09:51:57 +0200 Subject: [PATCH 12/35] fix ttcn compilation rule --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 22a5b2122..343d09563 100755 --- a/Makefile +++ b/Makefile @@ -106,14 +106,14 @@ $(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): +# $(TTCN3_DIR)/bin/compiler -n -e -L -R -U none -o $(outdir) $(tt_sources) -#$(gen_sources): $(outdir)/.generate +$(gen_sources): $(outdir)/.generate -#$(outdir)/.generate: Makefile $(tt_sources) -# $(TTCN3_DIR)/bin/compiler -n -e -L -R -U none -o $(outdir) $(tt_sources) -# touch $@ +$(outdir)/.generate: Makefile $(tt_sources) + $(TTCN3_DIR)/bin/compiler -n -e -L -R -U none -o $(outdir) $(tt_sources) + touch $@ $(outdir)/libItsAsn.so: $(outdir)/asn1/libItsAsn.so ln asn1/libItsAsn.so $@ -- GitLab From f5d569d59dfe219909bc3bfb3de0cc5921022a16 Mon Sep 17 00:00:00 2001 From: Denis Filatov Date: Fri, 11 Sep 2020 12:50:15 +0200 Subject: [PATCH 13/35] static version of libItsAsn.a --- Makefile | 19 ++++++++++--------- asn1/Makefile | 5 +++-- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 343d09563..4c9f0c923 100755 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ endef all_includes := $(TTCN3_DIR)/include $(TTCN3_DIR)/src $(TOPDIR)/ccsrc/Framework defines := TITAN_RUNTIME_2 _NO_SOFTLINKS_ $(ATS) -libs := $(TTCN3_DIR)/lib/libttcn3-rt2-parallel.a -lxml2 -lstdc++fs +libs := $(TTCN3_DIR)/lib/libttcn3-rt2-parallel.a -lstdc++fs #ifneq (,$(windir)) # Silence linker warnings. @@ -37,11 +37,12 @@ libs += $(patsubst %, -L%/lib, $(OPENSSL_DIR)) all_includes += $(addsuffix /include, $(OPENSSL_DIR)) libs += /cygdrive/c/windows/system32/npcap/wpcap.dll #endif -libs += -lssl -lcrypto +libs += -lssl -lcrypto -lxml2 $(eval $(call IncludeModule, $(TOPDIR)/ttcn/$(ATS))) outdir := $(TOPDIR)/build +bindir := $(TOPDIR)/bin sources := $(sort $(all_sources)) includes := $(outdir) $(outdir)/asn1 $(all_includes) /cygdrive/c/PROGRA~1/Npcap/sdk/include @@ -72,7 +73,7 @@ cc_objects := $(patsubst %.cc, $(outdir)/%.o, $(cc_sources)) .PHONY: all FORCE echo -all: $(outdir) $(outdir)/$(ATS)$(EXE) +all: $(bindir) $(outdir) $(bindir)/$(ATS)$(EXE) echo_sources: @echo -e "$(addsuffix \n,$(all_sources))" @@ -93,11 +94,11 @@ regen: force_regen $(outdir)/.generate force_regen: rm -f $(outdir)/.generate -$(outdir): +$(outdir) $(bindir): mkdir -p $@ -$(outdir)/$(ATS)$(EXE): $(outdir)/asn1/libItsAsn.so $(gen_objects) $(cc_objects) - g++ -g -O0 -o $@ $(LDFLAGS) $(gen_objects) $(cc_objects) $(outdir)/asn1/libItsAsn.so $(libs) +$(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 $@ $< @@ -115,10 +116,10 @@ $(outdir)/.generate: Makefile $(tt_sources) $(TTCN3_DIR)/bin/compiler -n -e -L -R -U none -o $(outdir) $(tt_sources) touch $@ -$(outdir)/libItsAsn.so: $(outdir)/asn1/libItsAsn.so - ln asn1/libItsAsn.so $@ +$(bindir)/libItsAsn.so: $(outdir)/asn1/libItsAsn.so + cp -f $< $@ -$(outdir)/asn1/libItsAsn.so: FORCE +$(outdir)/asn1/libItsAsn.a: FORCE mkdir -p $(outdir)/asn1 $(MAKE) -C $(outdir)/asn1 -f ../../asn1/Makefile diff --git a/asn1/Makefile b/asn1/Makefile index 8e1778802..d71b1636a 100755 --- a/asn1/Makefile +++ b/asn1/Makefile @@ -6,7 +6,7 @@ ########################################################## # 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 \ @@ -110,7 +110,8 @@ $(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 -- GitLab From 43f48d948da5000342988016e3f67e22372a698a Mon Sep 17 00:00:00 2001 From: Denis Filatov Date: Fri, 16 Oct 2020 15:46:55 +0200 Subject: [PATCH 14/35] linux compilation with new build tree --- .gitignore | 0 Makefile | 264 +++++++++++++++-------------- asn1/Makefile | 2 +- asn1/PsidGroupPermissions.c.diff | 0 ccsrc/EncDec/module.mk | 0 ccsrc/Framework/module.mk | 0 ccsrc/Ports/LibIts_ports/module.mk | 0 ccsrc/Protocols/CAM/module.mk | 0 ttcn/AtsCAM/Makefile | 0 ttcn/AtsCAM/module.mk | 0 ttcn/AtsDENM/module.mk | 0 ttcn/AtsGeoNetworking/module.mk | 0 ttcn/AtsRSUsSimulator/Makefile | 0 ttcn/AtsSecurity/module.mk | 0 ttcn/LibIts | 2 +- 15 files changed, 136 insertions(+), 132 deletions(-) mode change 100755 => 100644 .gitignore mode change 100755 => 100644 Makefile mode change 100755 => 100644 asn1/Makefile mode change 100755 => 100644 asn1/PsidGroupPermissions.c.diff mode change 100755 => 100644 ccsrc/EncDec/module.mk mode change 100755 => 100644 ccsrc/Framework/module.mk mode change 100755 => 100644 ccsrc/Ports/LibIts_ports/module.mk mode change 100755 => 100644 ccsrc/Protocols/CAM/module.mk mode change 100755 => 100644 ttcn/AtsCAM/Makefile mode change 100755 => 100644 ttcn/AtsCAM/module.mk mode change 100755 => 100644 ttcn/AtsDENM/module.mk mode change 100755 => 100644 ttcn/AtsGeoNetworking/module.mk mode change 100755 => 100644 ttcn/AtsRSUsSimulator/Makefile mode change 100755 => 100644 ttcn/AtsSecurity/module.mk diff --git a/.gitignore b/.gitignore old mode 100755 new mode 100644 diff --git a/Makefile b/Makefile old mode 100755 new mode 100644 index 4c9f0c923..b4e394d6f --- a/Makefile +++ b/Makefile @@ -1,130 +1,134 @@ - -ifeq (,$(ATS)) - $(error ATS shall be defined) -endif - -ifeq (,$(TOPDIR)) - TOPDIR := . -endif - -#ifeq (,$(TTCN3_DIR)) - TTCN3_DIR := /cygdrive/c/Tools/Titan -#endif - -#ifeq (,$(OPENSSL_DIR)) -# OPENSSL_DIR := C:/Tools/OpenSSL/Win64 -#endif - -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, $(1)/$$(M)))) -endef - -all_includes := $(TTCN3_DIR)/include $(TTCN3_DIR)/src $(TOPDIR)/ccsrc/Framework -defines := TITAN_RUNTIME_2 _NO_SOFTLINKS_ $(ATS) -libs := $(TTCN3_DIR)/lib/libttcn3-rt2-parallel.a -lstdc++fs - -#ifneq (,$(windir)) -# 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 += /cygdrive/c/windows/system32/npcap/wpcap.dll -#endif -libs += -lssl -lcrypto -lxml2 - -$(eval $(call IncludeModule, $(TOPDIR)/ttcn/$(ATS))) - -outdir := $(TOPDIR)/build -bindir := $(TOPDIR)/bin - -sources := $(sort $(all_sources)) -includes := $(outdir) $(outdir)/asn1 $(all_includes) /cygdrive/c/PROGRA~1/Npcap/sdk/include - -EXE=.exe -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) $(outdir)/*.o $(outdir)/*.cc $(outdir)/*.hh $(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 -n -e -L -R -U none -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))) - + +ifeq (,$(ATS)) + $(error ATS shall be defined) +endif + +ifeq (,$(TOPDIR)) + TOPDIR := . +endif + +ifeq (,$(TTCN3_DIR)) + TTCN3_DIR := /cygdrive/c/Tools/Titan +endif + +#ifeq (,$(OPENSSL_DIR)) +# OPENSSL_DIR := C:/Tools/OpenSSL/Win64 +#endif + +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, $(1)/$$(M)))) +endef + +all_includes := $(TTCN3_DIR)/include $(TTCN3_DIR)/src $(TOPDIR)/ccsrc/Framework +defines := TITAN_RUNTIME_2 _NO_SOFTLINKS_ $(ATS) +libs := $(TTCN3_DIR)/lib/libttcn3-rt2-parallel.a -lstdc++fs + +ifneq (,$(windir)) +# 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 += /cygdrive/c/windows/system32/npcap/wpcap.dll +else +defines += LINUX +libs += -lpcap -lrt -lpthread +endif + +libs += -lssl -lcrypto -lxml2 + +$(eval $(call IncludeModule, $(TOPDIR)/ttcn/$(ATS))) + +outdir := $(TOPDIR)/build +bindir := $(TOPDIR)/bin + +sources := $(sort $(all_sources)) +includes := $(outdir) $(outdir)/asn1 $(all_includes) /cygdrive/c/PROGRA~1/Npcap/sdk/include + +EXE=.exe +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) $(outdir)/*.o $(outdir)/*.cc $(outdir)/*.hh $(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 -n -e -L -R -U none -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/asn1/Makefile b/asn1/Makefile old mode 100755 new mode 100644 index d71b1636a..7d025b085 --- a/asn1/Makefile +++ b/asn1/Makefile @@ -32,7 +32,7 @@ ASN_FILES = CAM/CAM_PDU_Descriptions.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 \ diff --git a/asn1/PsidGroupPermissions.c.diff b/asn1/PsidGroupPermissions.c.diff old mode 100755 new mode 100644 diff --git a/ccsrc/EncDec/module.mk b/ccsrc/EncDec/module.mk old mode 100755 new mode 100644 diff --git a/ccsrc/Framework/module.mk b/ccsrc/Framework/module.mk old mode 100755 new mode 100644 diff --git a/ccsrc/Ports/LibIts_ports/module.mk b/ccsrc/Ports/LibIts_ports/module.mk old mode 100755 new mode 100644 diff --git a/ccsrc/Protocols/CAM/module.mk b/ccsrc/Protocols/CAM/module.mk old mode 100755 new mode 100644 diff --git a/ttcn/AtsCAM/Makefile b/ttcn/AtsCAM/Makefile old mode 100755 new mode 100644 diff --git a/ttcn/AtsCAM/module.mk b/ttcn/AtsCAM/module.mk old mode 100755 new mode 100644 diff --git a/ttcn/AtsDENM/module.mk b/ttcn/AtsDENM/module.mk old mode 100755 new mode 100644 diff --git a/ttcn/AtsGeoNetworking/module.mk b/ttcn/AtsGeoNetworking/module.mk old mode 100755 new mode 100644 diff --git a/ttcn/AtsRSUsSimulator/Makefile b/ttcn/AtsRSUsSimulator/Makefile old mode 100755 new mode 100644 diff --git a/ttcn/AtsSecurity/module.mk b/ttcn/AtsSecurity/module.mk old mode 100755 new mode 100644 diff --git a/ttcn/LibIts b/ttcn/LibIts index fb38271bf..5df941adb 160000 --- a/ttcn/LibIts +++ b/ttcn/LibIts @@ -1 +1 @@ -Subproject commit fb38271bfa76075f725a6a9378a410e03778d4b7 +Subproject commit 5df941adb88aa38af399db78eec1757352c5f04c -- GitLab From 52a2ddb106a9cd2c0745f3a73725f5bfe1ccd0da Mon Sep 17 00:00:00 2001 From: Denis Filatov Date: Tue, 5 Jan 2021 16:39:57 +0100 Subject: [PATCH 15/35] add IS related certificates --- data/v3/profiles/CERT_IUT_A_AA.xml | 3 +- data/v3/profiles/CERT_IUT_A_B3_AA.xml | 3 +- data/v3/profiles/CERT_IUT_A_B_AA.xml | 3 +- data/v3/profiles/CERT_IUT_A_N_AA.xml | 3 +- data/v3/profiles/CERT_IUT_A_RCA.xml | 3 +- data/v3/profiles/CERT_IUT_C3_AA.xml | 3 +- data/v3/profiles/CERT_IUT_CA_AA.xml | 3 +- data/v3/profiles/CERT_IUT_CC_AA.xml | 3 +- data/v3/profiles/CERT_IUT_C_RCA.xml | 3 +- data/v3/profiles/CERT_IUT_IVI_SSP_1_AT.xml | 36 +++++++++++++++++++ .../CERT_IUT_IVI_SSP_ISO14823_1_AT.xml | 36 +++++++++++++++++++ .../CERT_IUT_IVI_SSP_ISO14823_2_AT.xml | 36 +++++++++++++++++++ .../CERT_IUT_IVI_SSP_ISO14823_3_AT.xml | 36 +++++++++++++++++++ .../CERT_IUT_IVI_SSP_ISO14823_4_AT.xml | 36 +++++++++++++++++++ .../CERT_IUT_IVI_SSP_ISO14823_5_AT.xml | 36 +++++++++++++++++++ .../CERT_IUT_IVI_SSP_ISO14823_6_AT.xml | 36 +++++++++++++++++++ data/v3/profiles/CERT_IUT_IVI_SSP_LC_AT.xml | 36 +++++++++++++++++++ data/v3/profiles/CERT_IUT_IVI_SSP_LS_AT.xml | 36 +++++++++++++++++++ data/v3/profiles/CERT_IUT_IVI_SSP_NEG_AT.xml | 36 +++++++++++++++++++ data/v3/profiles/CERT_IUT_IVI_SSP_NONE_AT.xml | 36 +++++++++++++++++++ data/v3/profiles/CERT_IUT_IVI_SSP_RCC_AT.xml | 36 +++++++++++++++++++ .../profiles/CERT_IUT_IVI_SSP_SAEJ2540_AT.xml | 36 +++++++++++++++++++ data/v3/profiles/CERT_IUT_IVI_SSP_TC_AT.xml | 36 +++++++++++++++++++ .../CERT_IUT_IVI_SSP_VIENNACONV_AT.xml | 36 +++++++++++++++++++ data/v3/profiles/CERT_IUT_MAP_SSP_1_AT.xml | 36 +++++++++++++++++++ data/v3/profiles/CERT_IUT_MAP_SSP_2_AT.xml | 36 +++++++++++++++++++ data/v3/profiles/CERT_IUT_MAP_SSP_NONE_AT.xml | 36 +++++++++++++++++++ .../v3/profiles/CERT_IUT_RTCM_SSP_NONE_AT.xml | 35 ++++++++++++++++++ data/v3/profiles/CERT_IUT_SPAT_SSP_ALL_AT.xml | 36 +++++++++++++++++++ .../v3/profiles/CERT_IUT_SPAT_SSP_NONE_AT.xml | 36 +++++++++++++++++++ data/v3/profiles/CERT_IUT_SRM_SSP_01.xml | 35 ++++++++++++++++++ data/v3/profiles/CERT_IUT_SRM_SSP_02.xml | 35 ++++++++++++++++++ data/v3/profiles/CERT_IUT_SRM_SSP_03.xml | 35 ++++++++++++++++++ data/v3/profiles/CERT_IUT_SRM_SSP_04.xml | 35 ++++++++++++++++++ data/v3/profiles/CERT_IUT_SRM_SSP_05.xml | 35 ++++++++++++++++++ data/v3/profiles/CERT_IUT_SRM_SSP_06.xml | 35 ++++++++++++++++++ data/v3/profiles/CERT_IUT_SRM_SSP_07.xml | 35 ++++++++++++++++++ data/v3/profiles/CERT_IUT_SRM_SSP_08.xml | 35 ++++++++++++++++++ data/v3/profiles/CERT_IUT_SRM_SSP_09.xml | 35 ++++++++++++++++++ data/v3/profiles/CERT_IUT_SRM_SSP_10.xml | 35 ++++++++++++++++++ data/v3/profiles/CERT_IUT_SRM_SSP_11.xml | 35 ++++++++++++++++++ data/v3/profiles/CERT_IUT_SRM_SSP_12.xml | 35 ++++++++++++++++++ data/v3/profiles/CERT_IUT_SRM_SSP_13.xml | 35 ++++++++++++++++++ data/v3/profiles/CERT_IUT_SRM_SSP_14.xml | 35 ++++++++++++++++++ data/v3/profiles/CERT_IUT_SRM_SSP_15.xml | 35 ++++++++++++++++++ data/v3/profiles/CERT_IUT_SRM_SSP_16.xml | 35 ++++++++++++++++++ data/v3/profiles/CERT_IUT_SRM_SSP_17.xml | 35 ++++++++++++++++++ data/v3/profiles/CERT_IUT_SRM_SSP_18.xml | 35 ++++++++++++++++++ data/v3/profiles/CERT_IUT_SRM_SSP_NONE_AT.xml | 35 ++++++++++++++++++ .../profiles/CERT_IUT_SRM_SSP_REQ_NONE_AT.xml | 35 ++++++++++++++++++ data/v3/profiles/CERT_IUT_SSM_SSP_AT.xml | 35 ++++++++++++++++++ .../CERT_TS_AA_AUTHVAL_RCV_02_BI_01.xml | 3 +- .../CERT_TS_AA_AUTHVAL_RCV_02_BI_02.xml | 3 +- .../CERT_TS_AA_AUTHVAL_RCV_02_BI_03.xml | 3 +- data/v3/profiles/CERT_TS_A_AA.xml | 3 +- data/v3/profiles/CERT_TS_A_AA_B.xml | 3 +- data/v3/profiles/CERT_TS_A_EA.xml | 3 +- .../CERT_TS_A_EA_AA_AUTHVAL_RCV_02_BI_01.xml | 3 +- .../CERT_TS_A_EA_AA_AUTHVAL_RCV_02_BI_02.xml | 3 +- .../CERT_TS_A_EA_AA_AUTHVAL_RCV_02_BI_03.xml | 3 +- tools/itscertgen/asn1certgen/asn1certgen.xslt | 23 +++++++++--- 61 files changed, 1544 insertions(+), 23 deletions(-) create mode 100755 data/v3/profiles/CERT_IUT_IVI_SSP_1_AT.xml create mode 100755 data/v3/profiles/CERT_IUT_IVI_SSP_ISO14823_1_AT.xml create mode 100755 data/v3/profiles/CERT_IUT_IVI_SSP_ISO14823_2_AT.xml create mode 100755 data/v3/profiles/CERT_IUT_IVI_SSP_ISO14823_3_AT.xml create mode 100755 data/v3/profiles/CERT_IUT_IVI_SSP_ISO14823_4_AT.xml create mode 100755 data/v3/profiles/CERT_IUT_IVI_SSP_ISO14823_5_AT.xml create mode 100755 data/v3/profiles/CERT_IUT_IVI_SSP_ISO14823_6_AT.xml create mode 100755 data/v3/profiles/CERT_IUT_IVI_SSP_LC_AT.xml create mode 100755 data/v3/profiles/CERT_IUT_IVI_SSP_LS_AT.xml create mode 100755 data/v3/profiles/CERT_IUT_IVI_SSP_NEG_AT.xml create mode 100755 data/v3/profiles/CERT_IUT_IVI_SSP_NONE_AT.xml create mode 100755 data/v3/profiles/CERT_IUT_IVI_SSP_RCC_AT.xml create mode 100755 data/v3/profiles/CERT_IUT_IVI_SSP_SAEJ2540_AT.xml create mode 100755 data/v3/profiles/CERT_IUT_IVI_SSP_TC_AT.xml create mode 100755 data/v3/profiles/CERT_IUT_IVI_SSP_VIENNACONV_AT.xml create mode 100755 data/v3/profiles/CERT_IUT_MAP_SSP_1_AT.xml create mode 100755 data/v3/profiles/CERT_IUT_MAP_SSP_2_AT.xml create mode 100755 data/v3/profiles/CERT_IUT_MAP_SSP_NONE_AT.xml create mode 100755 data/v3/profiles/CERT_IUT_RTCM_SSP_NONE_AT.xml create mode 100755 data/v3/profiles/CERT_IUT_SPAT_SSP_ALL_AT.xml create mode 100755 data/v3/profiles/CERT_IUT_SPAT_SSP_NONE_AT.xml create mode 100755 data/v3/profiles/CERT_IUT_SRM_SSP_01.xml create mode 100755 data/v3/profiles/CERT_IUT_SRM_SSP_02.xml create mode 100755 data/v3/profiles/CERT_IUT_SRM_SSP_03.xml create mode 100755 data/v3/profiles/CERT_IUT_SRM_SSP_04.xml create mode 100755 data/v3/profiles/CERT_IUT_SRM_SSP_05.xml create mode 100755 data/v3/profiles/CERT_IUT_SRM_SSP_06.xml create mode 100755 data/v3/profiles/CERT_IUT_SRM_SSP_07.xml create mode 100755 data/v3/profiles/CERT_IUT_SRM_SSP_08.xml create mode 100755 data/v3/profiles/CERT_IUT_SRM_SSP_09.xml create mode 100755 data/v3/profiles/CERT_IUT_SRM_SSP_10.xml create mode 100755 data/v3/profiles/CERT_IUT_SRM_SSP_11.xml create mode 100755 data/v3/profiles/CERT_IUT_SRM_SSP_12.xml create mode 100755 data/v3/profiles/CERT_IUT_SRM_SSP_13.xml create mode 100755 data/v3/profiles/CERT_IUT_SRM_SSP_14.xml create mode 100755 data/v3/profiles/CERT_IUT_SRM_SSP_15.xml create mode 100755 data/v3/profiles/CERT_IUT_SRM_SSP_16.xml create mode 100755 data/v3/profiles/CERT_IUT_SRM_SSP_17.xml create mode 100755 data/v3/profiles/CERT_IUT_SRM_SSP_18.xml create mode 100755 data/v3/profiles/CERT_IUT_SRM_SSP_NONE_AT.xml create mode 100755 data/v3/profiles/CERT_IUT_SRM_SSP_REQ_NONE_AT.xml create mode 100755 data/v3/profiles/CERT_IUT_SSM_SSP_AT.xml diff --git a/data/v3/profiles/CERT_IUT_A_AA.xml b/data/v3/profiles/CERT_IUT_A_AA.xml index 4e6aa2831..cb1e4a601 100644 --- a/data/v3/profiles/CERT_IUT_A_AA.xml +++ b/data/v3/profiles/CERT_IUT_A_AA.xml @@ -26,7 +26,8 @@ - + + diff --git a/data/v3/profiles/CERT_IUT_A_B3_AA.xml b/data/v3/profiles/CERT_IUT_A_B3_AA.xml index 7d2b35d2f..deb8ec6d6 100644 --- a/data/v3/profiles/CERT_IUT_A_B3_AA.xml +++ b/data/v3/profiles/CERT_IUT_A_B3_AA.xml @@ -26,7 +26,8 @@ - + + diff --git a/data/v3/profiles/CERT_IUT_A_B_AA.xml b/data/v3/profiles/CERT_IUT_A_B_AA.xml index dd01d97da..16792b08d 100644 --- a/data/v3/profiles/CERT_IUT_A_B_AA.xml +++ b/data/v3/profiles/CERT_IUT_A_B_AA.xml @@ -26,7 +26,8 @@ - + + diff --git a/data/v3/profiles/CERT_IUT_A_N_AA.xml b/data/v3/profiles/CERT_IUT_A_N_AA.xml index 8466612b9..29d016bc3 100644 --- a/data/v3/profiles/CERT_IUT_A_N_AA.xml +++ b/data/v3/profiles/CERT_IUT_A_N_AA.xml @@ -26,7 +26,8 @@ - + + diff --git a/data/v3/profiles/CERT_IUT_A_RCA.xml b/data/v3/profiles/CERT_IUT_A_RCA.xml index ac29f21c2..bbd4d0533 100644 --- a/data/v3/profiles/CERT_IUT_A_RCA.xml +++ b/data/v3/profiles/CERT_IUT_A_RCA.xml @@ -19,7 +19,8 @@ - + + diff --git a/data/v3/profiles/CERT_IUT_C3_AA.xml b/data/v3/profiles/CERT_IUT_C3_AA.xml index bcb9803ce..aa69a710c 100644 --- a/data/v3/profiles/CERT_IUT_C3_AA.xml +++ b/data/v3/profiles/CERT_IUT_C3_AA.xml @@ -25,7 +25,8 @@ - + + diff --git a/data/v3/profiles/CERT_IUT_CA_AA.xml b/data/v3/profiles/CERT_IUT_CA_AA.xml index b7cd6df79..a30ab2fc0 100644 --- a/data/v3/profiles/CERT_IUT_CA_AA.xml +++ b/data/v3/profiles/CERT_IUT_CA_AA.xml @@ -25,7 +25,8 @@ - + + diff --git a/data/v3/profiles/CERT_IUT_CC_AA.xml b/data/v3/profiles/CERT_IUT_CC_AA.xml index f65a75a20..a5a13fcb0 100644 --- a/data/v3/profiles/CERT_IUT_CC_AA.xml +++ b/data/v3/profiles/CERT_IUT_CC_AA.xml @@ -25,7 +25,8 @@ - + + diff --git a/data/v3/profiles/CERT_IUT_C_RCA.xml b/data/v3/profiles/CERT_IUT_C_RCA.xml index a7d942cf0..d53697034 100644 --- a/data/v3/profiles/CERT_IUT_C_RCA.xml +++ b/data/v3/profiles/CERT_IUT_C_RCA.xml @@ -25,7 +25,8 @@ - + + diff --git a/data/v3/profiles/CERT_IUT_IVI_SSP_1_AT.xml b/data/v3/profiles/CERT_IUT_IVI_SSP_1_AT.xml new file mode 100755 index 000000000..40c50b70d --- /dev/null +++ b/data/v3/profiles/CERT_IUT_IVI_SSP_1_AT.xml @@ -0,0 +1,36 @@ + + + 3 + + + + + + + + + + + + > + + + + + + + + + 01 FF FC + 01 00 + 01 00 00 00 00 00 00 + + + + + + + + + + diff --git a/data/v3/profiles/CERT_IUT_IVI_SSP_ISO14823_1_AT.xml b/data/v3/profiles/CERT_IUT_IVI_SSP_ISO14823_1_AT.xml new file mode 100755 index 000000000..4a1632cc6 --- /dev/null +++ b/data/v3/profiles/CERT_IUT_IVI_SSP_ISO14823_1_AT.xml @@ -0,0 +1,36 @@ + + + 3 + + + + + + + + + + + + > + + + + + + + + + 01 FF FC + 01 00 + 01 00 00 00 00 40 00 + + + + + + + + + + diff --git a/data/v3/profiles/CERT_IUT_IVI_SSP_ISO14823_2_AT.xml b/data/v3/profiles/CERT_IUT_IVI_SSP_ISO14823_2_AT.xml new file mode 100755 index 000000000..cece9709c --- /dev/null +++ b/data/v3/profiles/CERT_IUT_IVI_SSP_ISO14823_2_AT.xml @@ -0,0 +1,36 @@ + + + 3 + + + + + + + + + + + + > + + + + + + + + + 01 FF FC + 01 00 + 01 00 00 00 00 20 00 + + + + + + + + + + diff --git a/data/v3/profiles/CERT_IUT_IVI_SSP_ISO14823_3_AT.xml b/data/v3/profiles/CERT_IUT_IVI_SSP_ISO14823_3_AT.xml new file mode 100755 index 000000000..a492d4da9 --- /dev/null +++ b/data/v3/profiles/CERT_IUT_IVI_SSP_ISO14823_3_AT.xml @@ -0,0 +1,36 @@ + + + 3 + + + + + + + + + + + + > + + + + + + + + + 01 FF FC + 01 00 + 01 00 00 00 00 10 00 + + + + + + + + + + diff --git a/data/v3/profiles/CERT_IUT_IVI_SSP_ISO14823_4_AT.xml b/data/v3/profiles/CERT_IUT_IVI_SSP_ISO14823_4_AT.xml new file mode 100755 index 000000000..471f68c40 --- /dev/null +++ b/data/v3/profiles/CERT_IUT_IVI_SSP_ISO14823_4_AT.xml @@ -0,0 +1,36 @@ + + + 3 + + + + + + + + + + + + > + + + + + + + + + 01 FF FC + 01 00 + 01 00 00 00 00 08 00 + + + + + + + + + + diff --git a/data/v3/profiles/CERT_IUT_IVI_SSP_ISO14823_5_AT.xml b/data/v3/profiles/CERT_IUT_IVI_SSP_ISO14823_5_AT.xml new file mode 100755 index 000000000..70a95f82e --- /dev/null +++ b/data/v3/profiles/CERT_IUT_IVI_SSP_ISO14823_5_AT.xml @@ -0,0 +1,36 @@ + + + 3 + + + + + + + + + + + + > + + + + + + + + + 01 FF FC + 01 00 + 01 00 00 00 00 04 00 + + + + + + + + + + diff --git a/data/v3/profiles/CERT_IUT_IVI_SSP_ISO14823_6_AT.xml b/data/v3/profiles/CERT_IUT_IVI_SSP_ISO14823_6_AT.xml new file mode 100755 index 000000000..b36061064 --- /dev/null +++ b/data/v3/profiles/CERT_IUT_IVI_SSP_ISO14823_6_AT.xml @@ -0,0 +1,36 @@ + + + 3 + + + + + + + + + + + + > + + + + + + + + + 01 FF FC + 01 00 + 01 00 00 00 00 02 00 + + + + + + + + + + diff --git a/data/v3/profiles/CERT_IUT_IVI_SSP_LC_AT.xml b/data/v3/profiles/CERT_IUT_IVI_SSP_LC_AT.xml new file mode 100755 index 000000000..7001a8e51 --- /dev/null +++ b/data/v3/profiles/CERT_IUT_IVI_SSP_LC_AT.xml @@ -0,0 +1,36 @@ + + + 3 + + + + + + + + + + + + > + + + + + + + + + 01 FF FC + 01 00 + 01 00 00 00 00 FF 10 + + + + + + + + + + diff --git a/data/v3/profiles/CERT_IUT_IVI_SSP_LS_AT.xml b/data/v3/profiles/CERT_IUT_IVI_SSP_LS_AT.xml new file mode 100755 index 000000000..ed62ef99d --- /dev/null +++ b/data/v3/profiles/CERT_IUT_IVI_SSP_LS_AT.xml @@ -0,0 +1,36 @@ + + + 3 + + + + + + + + + + + + > + + + + + + + + + 01 FF FC + 01 00 + 01 00 00 00 00 FF 80 + + + + + + + + + + diff --git a/data/v3/profiles/CERT_IUT_IVI_SSP_NEG_AT.xml b/data/v3/profiles/CERT_IUT_IVI_SSP_NEG_AT.xml new file mode 100755 index 000000000..686575806 --- /dev/null +++ b/data/v3/profiles/CERT_IUT_IVI_SSP_NEG_AT.xml @@ -0,0 +1,36 @@ + + + 3 + + + + + + + + + + + + > + + + + + + + + + 01 FF FC + 01 00 + 01 00 00 00 00 FF 08 + + + + + + + + + + diff --git a/data/v3/profiles/CERT_IUT_IVI_SSP_NONE_AT.xml b/data/v3/profiles/CERT_IUT_IVI_SSP_NONE_AT.xml new file mode 100755 index 000000000..40c50b70d --- /dev/null +++ b/data/v3/profiles/CERT_IUT_IVI_SSP_NONE_AT.xml @@ -0,0 +1,36 @@ + + + 3 + + + + + + + + + + + + > + + + + + + + + + 01 FF FC + 01 00 + 01 00 00 00 00 00 00 + + + + + + + + + + diff --git a/data/v3/profiles/CERT_IUT_IVI_SSP_RCC_AT.xml b/data/v3/profiles/CERT_IUT_IVI_SSP_RCC_AT.xml new file mode 100755 index 000000000..cf372f500 --- /dev/null +++ b/data/v3/profiles/CERT_IUT_IVI_SSP_RCC_AT.xml @@ -0,0 +1,36 @@ + + + 3 + + + + + + + + + + + + > + + + + + + + + + 01 FF FC + 01 00 + 01 00 00 00 00 FF 40 + + + + + + + + + + diff --git a/data/v3/profiles/CERT_IUT_IVI_SSP_SAEJ2540_AT.xml b/data/v3/profiles/CERT_IUT_IVI_SSP_SAEJ2540_AT.xml new file mode 100755 index 000000000..a84952f67 --- /dev/null +++ b/data/v3/profiles/CERT_IUT_IVI_SSP_SAEJ2540_AT.xml @@ -0,0 +1,36 @@ + + + 3 + + + + + + + + + + + + > + + + + + + + + + 01 FF FC + 01 00 + 01 00 00 00 00 01 00 + + + + + + + + + + diff --git a/data/v3/profiles/CERT_IUT_IVI_SSP_TC_AT.xml b/data/v3/profiles/CERT_IUT_IVI_SSP_TC_AT.xml new file mode 100755 index 000000000..53ee0a110 --- /dev/null +++ b/data/v3/profiles/CERT_IUT_IVI_SSP_TC_AT.xml @@ -0,0 +1,36 @@ + + + 3 + + + + + + + + + + + + > + + + + + + + + + 01 FF FC + 01 00 + 01 00 00 00 00 FF 20 + + + + + + + + + + diff --git a/data/v3/profiles/CERT_IUT_IVI_SSP_VIENNACONV_AT.xml b/data/v3/profiles/CERT_IUT_IVI_SSP_VIENNACONV_AT.xml new file mode 100755 index 000000000..f34ba09e0 --- /dev/null +++ b/data/v3/profiles/CERT_IUT_IVI_SSP_VIENNACONV_AT.xml @@ -0,0 +1,36 @@ + + + 3 + + + + + + + + + + + + > + + + + + + + + + 01 FF FC + 01 00 + 01 00 00 00 00 80 00 + + + + + + + + + + diff --git a/data/v3/profiles/CERT_IUT_MAP_SSP_1_AT.xml b/data/v3/profiles/CERT_IUT_MAP_SSP_1_AT.xml new file mode 100755 index 000000000..a98980891 --- /dev/null +++ b/data/v3/profiles/CERT_IUT_MAP_SSP_1_AT.xml @@ -0,0 +1,36 @@ + + + 3 + + + + + + + + + + + + > + + + + + + + + + 01 FF FC + 01 E0 + 01 80 + + + + + + + + + + diff --git a/data/v3/profiles/CERT_IUT_MAP_SSP_2_AT.xml b/data/v3/profiles/CERT_IUT_MAP_SSP_2_AT.xml new file mode 100755 index 000000000..560ed5296 --- /dev/null +++ b/data/v3/profiles/CERT_IUT_MAP_SSP_2_AT.xml @@ -0,0 +1,36 @@ + + + 3 + + + + + + + + + + + + > + + + + + + + + + 01 FF FC + 01 E0 + 01 40 + + + + + + + + + + diff --git a/data/v3/profiles/CERT_IUT_MAP_SSP_NONE_AT.xml b/data/v3/profiles/CERT_IUT_MAP_SSP_NONE_AT.xml new file mode 100755 index 000000000..d313391e9 --- /dev/null +++ b/data/v3/profiles/CERT_IUT_MAP_SSP_NONE_AT.xml @@ -0,0 +1,36 @@ + + + 3 + + + + + + + + + + + + > + + + + + + + + + 01 FF FC + 01 E0 + 01 00 + + + + + + + + + + diff --git a/data/v3/profiles/CERT_IUT_RTCM_SSP_NONE_AT.xml b/data/v3/profiles/CERT_IUT_RTCM_SSP_NONE_AT.xml new file mode 100755 index 000000000..e44b477c6 --- /dev/null +++ b/data/v3/profiles/CERT_IUT_RTCM_SSP_NONE_AT.xml @@ -0,0 +1,35 @@ + + + 3 + + + + + + + + + + + + > + + + + + + + + + 01 FF FC + 01 + + + + + + + + + + diff --git a/data/v3/profiles/CERT_IUT_SPAT_SSP_ALL_AT.xml b/data/v3/profiles/CERT_IUT_SPAT_SSP_ALL_AT.xml new file mode 100755 index 000000000..fc8c86870 --- /dev/null +++ b/data/v3/profiles/CERT_IUT_SPAT_SSP_ALL_AT.xml @@ -0,0 +1,36 @@ + + + 3 + + + + + + + + + + + + > + + + + + + + + + 01 FF FC + 01 E0 + 01 C0 + + + + + + + + + + diff --git a/data/v3/profiles/CERT_IUT_SPAT_SSP_NONE_AT.xml b/data/v3/profiles/CERT_IUT_SPAT_SSP_NONE_AT.xml new file mode 100755 index 000000000..3dec79740 --- /dev/null +++ b/data/v3/profiles/CERT_IUT_SPAT_SSP_NONE_AT.xml @@ -0,0 +1,36 @@ + + + 3 + + + + + + + + + + + + > + + + + + + + + + 01 FF FC + 01 00 + 01 C0 + + + + + + + + + + diff --git a/data/v3/profiles/CERT_IUT_SRM_SSP_01.xml b/data/v3/profiles/CERT_IUT_SRM_SSP_01.xml new file mode 100755 index 000000000..eb4205823 --- /dev/null +++ b/data/v3/profiles/CERT_IUT_SRM_SSP_01.xml @@ -0,0 +1,35 @@ + + + 3 + + + + + + + + + + + + > + + + + + + + + + 01 FF FC + 02 C0 00 00 + + + + + + + + + + diff --git a/data/v3/profiles/CERT_IUT_SRM_SSP_02.xml b/data/v3/profiles/CERT_IUT_SRM_SSP_02.xml new file mode 100755 index 000000000..c765447c2 --- /dev/null +++ b/data/v3/profiles/CERT_IUT_SRM_SSP_02.xml @@ -0,0 +1,35 @@ + + + 3 + + + + + + + + + + + + > + + + + + + + + + 01 FF FC + 02 A0 00 00 + + + + + + + + + + diff --git a/data/v3/profiles/CERT_IUT_SRM_SSP_03.xml b/data/v3/profiles/CERT_IUT_SRM_SSP_03.xml new file mode 100755 index 000000000..140a004b2 --- /dev/null +++ b/data/v3/profiles/CERT_IUT_SRM_SSP_03.xml @@ -0,0 +1,35 @@ + + + 3 + + + + + + + + + + + + > + + + + + + + + + 01 FF FC + 02 90 00 00 + + + + + + + + + + diff --git a/data/v3/profiles/CERT_IUT_SRM_SSP_04.xml b/data/v3/profiles/CERT_IUT_SRM_SSP_04.xml new file mode 100755 index 000000000..d946bc573 --- /dev/null +++ b/data/v3/profiles/CERT_IUT_SRM_SSP_04.xml @@ -0,0 +1,35 @@ + + + 3 + + + + + + + + + + + + > + + + + + + + + + 01 FF FC + 02 88 00 00 + + + + + + + + + + diff --git a/data/v3/profiles/CERT_IUT_SRM_SSP_05.xml b/data/v3/profiles/CERT_IUT_SRM_SSP_05.xml new file mode 100755 index 000000000..f8fa5b502 --- /dev/null +++ b/data/v3/profiles/CERT_IUT_SRM_SSP_05.xml @@ -0,0 +1,35 @@ + + + 3 + + + + + + + + + + + + > + + + + + + + + + 01 FF FC + 02 84 00 00 + + + + + + + + + + diff --git a/data/v3/profiles/CERT_IUT_SRM_SSP_06.xml b/data/v3/profiles/CERT_IUT_SRM_SSP_06.xml new file mode 100755 index 000000000..cfa0c9a6f --- /dev/null +++ b/data/v3/profiles/CERT_IUT_SRM_SSP_06.xml @@ -0,0 +1,35 @@ + + + 3 + + + + + + + + + + + + > + + + + + + + + + 01 FF FC + 02 82 00 00 + + + + + + + + + + diff --git a/data/v3/profiles/CERT_IUT_SRM_SSP_07.xml b/data/v3/profiles/CERT_IUT_SRM_SSP_07.xml new file mode 100755 index 000000000..08f6e1d42 --- /dev/null +++ b/data/v3/profiles/CERT_IUT_SRM_SSP_07.xml @@ -0,0 +1,35 @@ + + + 3 + + + + + + + + + + + + > + + + + + + + + + 01 FF FC + 02 81 00 00 + + + + + + + + + + diff --git a/data/v3/profiles/CERT_IUT_SRM_SSP_08.xml b/data/v3/profiles/CERT_IUT_SRM_SSP_08.xml new file mode 100755 index 000000000..c98f6c08c --- /dev/null +++ b/data/v3/profiles/CERT_IUT_SRM_SSP_08.xml @@ -0,0 +1,35 @@ + + + 3 + + + + + + + + + + + + > + + + + + + + + + 01 FF FC + 02 80 80 00 + + + + + + + + + + diff --git a/data/v3/profiles/CERT_IUT_SRM_SSP_09.xml b/data/v3/profiles/CERT_IUT_SRM_SSP_09.xml new file mode 100755 index 000000000..6e35cc43d --- /dev/null +++ b/data/v3/profiles/CERT_IUT_SRM_SSP_09.xml @@ -0,0 +1,35 @@ + + + 3 + + + + + + + + + + + + > + + + + + + + + + 01 FF FC + 02 80 40 00 + + + + + + + + + + diff --git a/data/v3/profiles/CERT_IUT_SRM_SSP_10.xml b/data/v3/profiles/CERT_IUT_SRM_SSP_10.xml new file mode 100755 index 000000000..460cbd673 --- /dev/null +++ b/data/v3/profiles/CERT_IUT_SRM_SSP_10.xml @@ -0,0 +1,35 @@ + + + 3 + + + + + + + + + + + + > + + + + + + + + + 01 FF FC + 02 80 20 00 + + + + + + + + + + diff --git a/data/v3/profiles/CERT_IUT_SRM_SSP_11.xml b/data/v3/profiles/CERT_IUT_SRM_SSP_11.xml new file mode 100755 index 000000000..9d3eae327 --- /dev/null +++ b/data/v3/profiles/CERT_IUT_SRM_SSP_11.xml @@ -0,0 +1,35 @@ + + + 3 + + + + + + + + + + + + > + + + + + + + + + 01 FF FC + 02 80 10 00 + + + + + + + + + + diff --git a/data/v3/profiles/CERT_IUT_SRM_SSP_12.xml b/data/v3/profiles/CERT_IUT_SRM_SSP_12.xml new file mode 100755 index 000000000..658c4418c --- /dev/null +++ b/data/v3/profiles/CERT_IUT_SRM_SSP_12.xml @@ -0,0 +1,35 @@ + + + 3 + + + + + + + + + + + + > + + + + + + + + + 01 FF FC + 02 80 08 00 + + + + + + + + + + diff --git a/data/v3/profiles/CERT_IUT_SRM_SSP_13.xml b/data/v3/profiles/CERT_IUT_SRM_SSP_13.xml new file mode 100755 index 000000000..f4072940f --- /dev/null +++ b/data/v3/profiles/CERT_IUT_SRM_SSP_13.xml @@ -0,0 +1,35 @@ + + + 3 + + + + + + + + + + + + > + + + + + + + + + 01 FF FC + 02 80 04 00 + + + + + + + + + + diff --git a/data/v3/profiles/CERT_IUT_SRM_SSP_14.xml b/data/v3/profiles/CERT_IUT_SRM_SSP_14.xml new file mode 100755 index 000000000..17dc971fd --- /dev/null +++ b/data/v3/profiles/CERT_IUT_SRM_SSP_14.xml @@ -0,0 +1,35 @@ + + + 3 + + + + + + + + + + + + > + + + + + + + + + 01 FF FC + 02 80 02 00 + + + + + + + + + + diff --git a/data/v3/profiles/CERT_IUT_SRM_SSP_15.xml b/data/v3/profiles/CERT_IUT_SRM_SSP_15.xml new file mode 100755 index 000000000..d1329ee8f --- /dev/null +++ b/data/v3/profiles/CERT_IUT_SRM_SSP_15.xml @@ -0,0 +1,35 @@ + + + 3 + + + + + + + + + + + + > + + + + + + + + + 01 FF FC + 02 80 01 00 + + + + + + + + + + diff --git a/data/v3/profiles/CERT_IUT_SRM_SSP_16.xml b/data/v3/profiles/CERT_IUT_SRM_SSP_16.xml new file mode 100755 index 000000000..858d2d67e --- /dev/null +++ b/data/v3/profiles/CERT_IUT_SRM_SSP_16.xml @@ -0,0 +1,35 @@ + + + 3 + + + + + + + + + + + + > + + + + + + + + + 01 FF FC + 02 80 00 80 + + + + + + + + + + diff --git a/data/v3/profiles/CERT_IUT_SRM_SSP_17.xml b/data/v3/profiles/CERT_IUT_SRM_SSP_17.xml new file mode 100755 index 000000000..06076d223 --- /dev/null +++ b/data/v3/profiles/CERT_IUT_SRM_SSP_17.xml @@ -0,0 +1,35 @@ + + + 3 + + + + + + + + + + + + > + + + + + + + + + 01 FF FC + 02 80 00 40 + + + + + + + + + + diff --git a/data/v3/profiles/CERT_IUT_SRM_SSP_18.xml b/data/v3/profiles/CERT_IUT_SRM_SSP_18.xml new file mode 100755 index 000000000..4121c3000 --- /dev/null +++ b/data/v3/profiles/CERT_IUT_SRM_SSP_18.xml @@ -0,0 +1,35 @@ + + + 3 + + + + + + + + + + + + > + + + + + + + + + 01 FF FC + 02 80 00 20 + + + + + + + + + + diff --git a/data/v3/profiles/CERT_IUT_SRM_SSP_NONE_AT.xml b/data/v3/profiles/CERT_IUT_SRM_SSP_NONE_AT.xml new file mode 100755 index 000000000..bfc7d8217 --- /dev/null +++ b/data/v3/profiles/CERT_IUT_SRM_SSP_NONE_AT.xml @@ -0,0 +1,35 @@ + + + 3 + + + + + + + + + + + + > + + + + + + + + + 01 FF FC + 02 00 00 00 + + + + + + + + + + diff --git a/data/v3/profiles/CERT_IUT_SRM_SSP_REQ_NONE_AT.xml b/data/v3/profiles/CERT_IUT_SRM_SSP_REQ_NONE_AT.xml new file mode 100755 index 000000000..de2088827 --- /dev/null +++ b/data/v3/profiles/CERT_IUT_SRM_SSP_REQ_NONE_AT.xml @@ -0,0 +1,35 @@ + + + 3 + + + + + + + + + + + + > + + + + + + + + + 01 FF FC + 02 80 00 00 + + + + + + + + + + diff --git a/data/v3/profiles/CERT_IUT_SSM_SSP_AT.xml b/data/v3/profiles/CERT_IUT_SSM_SSP_AT.xml new file mode 100755 index 000000000..a6995c909 --- /dev/null +++ b/data/v3/profiles/CERT_IUT_SSM_SSP_AT.xml @@ -0,0 +1,35 @@ + + + 3 + + + + + + + + + + + + > + + + + + + + + + 01 FF FC + 01 + + + + + + + + + + diff --git a/data/v3/profiles/CERT_TS_AA_AUTHVAL_RCV_02_BI_01.xml b/data/v3/profiles/CERT_TS_AA_AUTHVAL_RCV_02_BI_01.xml index 1693d9d75..b2582dd4d 100644 --- a/data/v3/profiles/CERT_TS_AA_AUTHVAL_RCV_02_BI_01.xml +++ b/data/v3/profiles/CERT_TS_AA_AUTHVAL_RCV_02_BI_01.xml @@ -26,7 +26,8 @@ - + + diff --git a/data/v3/profiles/CERT_TS_AA_AUTHVAL_RCV_02_BI_02.xml b/data/v3/profiles/CERT_TS_AA_AUTHVAL_RCV_02_BI_02.xml index c9d785d2f..7c47bcfb4 100644 --- a/data/v3/profiles/CERT_TS_AA_AUTHVAL_RCV_02_BI_02.xml +++ b/data/v3/profiles/CERT_TS_AA_AUTHVAL_RCV_02_BI_02.xml @@ -26,7 +26,8 @@ - + + diff --git a/data/v3/profiles/CERT_TS_AA_AUTHVAL_RCV_02_BI_03.xml b/data/v3/profiles/CERT_TS_AA_AUTHVAL_RCV_02_BI_03.xml index 264f9c8f7..1b3419864 100644 --- a/data/v3/profiles/CERT_TS_AA_AUTHVAL_RCV_02_BI_03.xml +++ b/data/v3/profiles/CERT_TS_AA_AUTHVAL_RCV_02_BI_03.xml @@ -26,7 +26,8 @@ - + + diff --git a/data/v3/profiles/CERT_TS_A_AA.xml b/data/v3/profiles/CERT_TS_A_AA.xml index 4e6aa2831..cb1e4a601 100644 --- a/data/v3/profiles/CERT_TS_A_AA.xml +++ b/data/v3/profiles/CERT_TS_A_AA.xml @@ -26,7 +26,8 @@ - + + diff --git a/data/v3/profiles/CERT_TS_A_AA_B.xml b/data/v3/profiles/CERT_TS_A_AA_B.xml index dd01d97da..16792b08d 100644 --- a/data/v3/profiles/CERT_TS_A_AA_B.xml +++ b/data/v3/profiles/CERT_TS_A_AA_B.xml @@ -26,7 +26,8 @@ - + + diff --git a/data/v3/profiles/CERT_TS_A_EA.xml b/data/v3/profiles/CERT_TS_A_EA.xml index 9cc50dbda..5a781e8a4 100644 --- a/data/v3/profiles/CERT_TS_A_EA.xml +++ b/data/v3/profiles/CERT_TS_A_EA.xml @@ -26,7 +26,8 @@ - + + 01 C0 diff --git a/data/v3/profiles/CERT_TS_A_EA_AA_AUTHVAL_RCV_02_BI_01.xml b/data/v3/profiles/CERT_TS_A_EA_AA_AUTHVAL_RCV_02_BI_01.xml index de208c2d2..802585d02 100644 --- a/data/v3/profiles/CERT_TS_A_EA_AA_AUTHVAL_RCV_02_BI_01.xml +++ b/data/v3/profiles/CERT_TS_A_EA_AA_AUTHVAL_RCV_02_BI_01.xml @@ -26,7 +26,8 @@ - + + 01 C0 diff --git a/data/v3/profiles/CERT_TS_A_EA_AA_AUTHVAL_RCV_02_BI_02.xml b/data/v3/profiles/CERT_TS_A_EA_AA_AUTHVAL_RCV_02_BI_02.xml index 29db49e7b..5a71c29d8 100644 --- a/data/v3/profiles/CERT_TS_A_EA_AA_AUTHVAL_RCV_02_BI_02.xml +++ b/data/v3/profiles/CERT_TS_A_EA_AA_AUTHVAL_RCV_02_BI_02.xml @@ -26,7 +26,8 @@ - + + 01 C0 diff --git a/data/v3/profiles/CERT_TS_A_EA_AA_AUTHVAL_RCV_02_BI_03.xml b/data/v3/profiles/CERT_TS_A_EA_AA_AUTHVAL_RCV_02_BI_03.xml index 101da4536..a165dd022 100644 --- a/data/v3/profiles/CERT_TS_A_EA_AA_AUTHVAL_RCV_02_BI_03.xml +++ b/data/v3/profiles/CERT_TS_A_EA_AA_AUTHVAL_RCV_02_BI_03.xml @@ -26,7 +26,8 @@ - + + 01 40 diff --git a/tools/itscertgen/asn1certgen/asn1certgen.xslt b/tools/itscertgen/asn1certgen/asn1certgen.xslt index 87e933cd2..3c93881e2 100644 --- a/tools/itscertgen/asn1certgen/asn1certgen.xslt +++ b/tools/itscertgen/asn1certgen/asn1certgen.xslt @@ -27,11 +27,16 @@ - + + + + + + @@ -220,7 +225,9 @@ 01 E0 01 C0 01 00 00 00 FF F8 - 01 FF FF E0 + 01 FF FF E0 + 01 + 01 01 FE @@ -247,7 +254,9 @@ FF 1F FF 3F FF 00 00 00 00 07 - FF 00 00 1F + FF 00 00 1F + FF + FF FF 01 @@ -266,7 +275,9 @@ - + + + @@ -301,7 +312,9 @@ - + + + -- GitLab From 24a0b4cab2709b996c961626067011304fa0101f Mon Sep 17 00:00:00 2001 From: Denis Filatov Date: Thu, 28 Jan 2021 14:47:55 +0100 Subject: [PATCH 16/35] AtsMapemSpatem and AtsRtcmem --- Makefile | 10 ++--- asn1/Makefile | 4 +- ccsrc/EncDec/module.mk | 24 ++++++++--- .../Ports/LibIts_ports/AdapterControlPort.hh | 6 +++ ...mem.partC => AdapterControlPort_Rtcmem.cc} | 1 + ...mem.partH => AdapterControlPort_Rtcmem.hh} | 7 ++++ ...Rtcmem.partC => UpperTesterPort_Rtcmem.cc} | 2 +- ...Rtcmem.partH => UpperTesterPort_Rtcmem.hh} | 5 +++ .../Ports/LibIts_ports/Rtcmem_ports/module.mk | 3 ++ ccsrc/Ports/LibIts_ports/UpperTesterPort.hh | 36 ++++++++++++++++ ttcn/AtsMapemSpatem/module.mk | 40 ++++++++++++++++++ ttcn/AtsRtcmem/module.mk | 38 +++++++++++++++++ ttcn/AtsSremSsem/module.mk | 41 +++++++++++++++++++ 13 files changed, 203 insertions(+), 14 deletions(-) rename ccsrc/Ports/LibIts_ports/Rtcmem_ports/{AdapterControlPort_Rtcmem.partC => AdapterControlPort_Rtcmem.cc} (98%) rename ccsrc/Ports/LibIts_ports/Rtcmem_ports/{AdapterControlPort_Rtcmem.partH => AdapterControlPort_Rtcmem.hh} (88%) rename ccsrc/Ports/LibIts_ports/Rtcmem_ports/{UpperTesterPort_Rtcmem.partC => UpperTesterPort_Rtcmem.cc} (99%) rename ccsrc/Ports/LibIts_ports/Rtcmem_ports/{UpperTesterPort_Rtcmem.partH => UpperTesterPort_Rtcmem.hh} (94%) create mode 100755 ccsrc/Ports/LibIts_ports/Rtcmem_ports/module.mk create mode 100755 ttcn/AtsMapemSpatem/module.mk create mode 100755 ttcn/AtsRtcmem/module.mk create mode 100755 ttcn/AtsSremSsem/module.mk diff --git a/Makefile b/Makefile index b4e394d6f..eaa1cba04 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ all_includes := $(TTCN3_DIR)/include $(TTCN3_DIR)/src $(TOPDIR)/ccsrc/Framework defines := TITAN_RUNTIME_2 _NO_SOFTLINKS_ $(ATS) libs := $(TTCN3_DIR)/lib/libttcn3-rt2-parallel.a -lstdc++fs -ifneq (,$(windir)) +ifeq (Windows_NT,$(OS)) # Silence linker warnings. LDFLAGS += -Wl,--enable-auto-import,--enable-runtime-pseudo-reloc defines += WIN32 @@ -91,8 +91,8 @@ echo: echo_sources @echo -e "defines: $(addsuffix \n, $(defines))" clean: - rm -f $(outdir)/$(ATS)$(EXE) $(outdir)/*.o $(outdir)/*.cc $(outdir)/*.hh $(outdir)/.generate $(outdir)/libItsAsn.so - rm -f $(outdir)/asn1/*.so $(outdir)/asn1/*.o $(outdir)/asn1/*.c $(outdir)/asn1/*.h $(outdir)/asn1/Makefile.am.libasncodec + rm -f $(outdir)/$(ATS)$(EXE) $(gen_objects) $(gen_sources) $(gen_headers) $(cc_objects) $(outdir)/$(ATS)/.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: @@ -114,9 +114,9 @@ $(cc_objects) : $(outdir)/%.o : %.cc #$(gen_sources): # $(TTCN3_DIR)/bin/compiler -n -e -L -R -U none -o $(outdir) $(tt_sources) -$(gen_sources): $(outdir)/.generate +$(gen_sources): $(outdir)/.generate-$(ATS) -$(outdir)/.generate: Makefile $(tt_sources) +$(outdir)/.generate-$(ATS): Makefile $(tt_sources) $(TTCN3_DIR)/bin/compiler -n -e -L -R -U none -o $(outdir) $(tt_sources) touch $@ diff --git a/asn1/Makefile b/asn1/Makefile index 7d025b085..f4f0811b4 100644 --- a/asn1/Makefile +++ b/asn1/Makefile @@ -52,8 +52,8 @@ ASN1C:=asn1c #ASN1C_PATH = ifneq (, $(ASN1C_PATH)) - OS=$(shell uname) - ifneq (,$(windir)) +# 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 diff --git a/ccsrc/EncDec/module.mk b/ccsrc/EncDec/module.mk index 1c64c34cb..c1d2ca470 100644 --- a/ccsrc/EncDec/module.mk +++ b/ccsrc/EncDec/module.mk @@ -10,18 +10,15 @@ sources := \ # LibItsSremSsem_Encdec.cc ifeq (AtsCAM, $(ATS)) -sources += \ - LibItsCam_Encdec.cc +sources += LibItsCam_Encdec.cc endif ifeq (AtsDENM, $(ATS)) -sources += \ - LibItsDenm_Encdec.cc +sources += LibItsDenm_Encdec.cc endif ifeq (AtsIVIM, $(ATS)) -sources += \ - LibItsIvim_Encdec.cc +sources += LibItsIvim_Encdec.cc endif ifeq (AtsRSUsSimulator, $(ATS)) @@ -42,6 +39,21 @@ sources += \ 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 += LibItsPki_Encdec.cc +endif # LibItsPki_Encdec.cc # LibItsEvcsn_Encdec.cc \ diff --git a/ccsrc/Ports/LibIts_ports/AdapterControlPort.hh b/ccsrc/Ports/LibIts_ports/AdapterControlPort.hh index 31740cc6b..3844c5d90 100644 --- a/ccsrc/Ports/LibIts_ports/AdapterControlPort.hh +++ b/ccsrc/Ports/LibIts_ports/AdapterControlPort.hh @@ -22,6 +22,9 @@ #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 @@ -43,6 +46,9 @@ #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 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 d11e87a1a..d6ccfd8fe 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 88% rename from ccsrc/Ports/LibIts_ports/Rtcmem_ports/AdapterControlPort_Rtcmem.partH rename to ccsrc/Ports/LibIts_ports/Rtcmem_ports/AdapterControlPort_Rtcmem.hh index cfdbf02cf..6aaf43652 100644 --- a/ccsrc/Ports/LibIts_ports/Rtcmem_ports/AdapterControlPort_Rtcmem.partH +++ b/ccsrc/Ports/LibIts_ports/Rtcmem_ports/AdapterControlPort_Rtcmem.hh @@ -1,3 +1,8 @@ +#ifndef AdapterControlPort_Rtcmem_HH +#define AdapterControlPort_Rtcmem_HH + +#include "LibItsSremSsem_TestSystem.hh" + //============================================================================= #include "LibItsRtcmem_TestSystem.hh" @@ -30,3 +35,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 b78670c4e..1ccf722a4 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 94% rename from ccsrc/Ports/LibIts_ports/Rtcmem_ports/UpperTesterPort_Rtcmem.partH rename to ccsrc/Ports/LibIts_ports/Rtcmem_ports/UpperTesterPort_Rtcmem.hh index c1ea5dfee..3d6399db5 100644 --- a/ccsrc/Ports/LibIts_ports/Rtcmem_ports/UpperTesterPort_Rtcmem.partH +++ b/ccsrc/Ports/LibIts_ports/Rtcmem_ports/UpperTesterPort_Rtcmem.hh @@ -1,3 +1,6 @@ +#ifndef UpperTesterPort_Rtcmem_HH +#define UpperTesterPort_Rtcmem_HH + //============================================================================= #include "LibItsRtcmem_TestSystem.hh" namespace LibItsRtcmem__TestSystem { @@ -42,3 +45,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 100755 index 000000000..ad956e965 --- /dev/null +++ b/ccsrc/Ports/LibIts_ports/Rtcmem_ports/module.mk @@ -0,0 +1,3 @@ +sources := AdapterControlPort_Rtcmem.cc AdapterControlPort_Rtcmem.hh RtcmemPort.cc RtcmemPort.hh UpperTesterPort_Rtcmem.cc UpperTesterPort_Rtcmem.hh +includes := . + diff --git a/ccsrc/Ports/LibIts_ports/UpperTesterPort.hh b/ccsrc/Ports/LibIts_ports/UpperTesterPort.hh index f8839984b..92b61337d 100644 --- a/ccsrc/Ports/LibIts_ports/UpperTesterPort.hh +++ b/ccsrc/Ports/LibIts_ports/UpperTesterPort.hh @@ -32,6 +32,24 @@ #include "DENM_ports/UpperTesterPort_DENM.hh" #endif +#ifdef AtsSremSsem + #include "GN_ports/UpperTesterPort_GN.hh" + #include "BTP_ports/UpperTesterPort_BTP.hh" + #include "SremSsem_ports/UpperTesterPort_SremSsem.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 + #else //_NO_SOFTLINKS_ #ifdef AtsGeoNetworking @@ -62,6 +80,24 @@ #include "UpperTesterPort_DENM.hh" #endif +#ifdef AtsSremSsem + #include "UpperTesterPort_GN.hh" + #include "UpperTesterPort_BTP.hh" + #include "UpperTesterPort_SremSsem.hh" +#endif + +#ifdef AtsMapemSpatem + #include "UpperTesterPort_GN.hh" + #include "UpperTesterPort_BTP.hh" + #include "UpperTesterPort_MapemSpatem.hh" +#endif + +#ifdef AtsRtcmem + #include "UpperTesterPort_GN.hh" + #include "UpperTesterPort_BTP.hh" + #include "UpperTesterPort_Rtcmem.hh" +#endif + #endif//_NO_SOFTLINKS_ #endif diff --git a/ttcn/AtsMapemSpatem/module.mk b/ttcn/AtsMapemSpatem/module.mk new file mode 100755 index 000000000..8bae2202f --- /dev/null +++ b/ttcn/AtsMapemSpatem/module.mk @@ -0,0 +1,40 @@ +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/Pcap \ + ../../ccsrc/Protocols/UpperTester \ + ../../ccsrc/Protocols/Security \ +# ../../ccsrc/Protocols/UDP \ +# ../../ccsrc/Protocols/Http \ +# ../../ccsrc/Protocols/DENM \ +# ../../ccsrc/Protocols/IVIM \ + diff --git a/ttcn/AtsRtcmem/module.mk b/ttcn/AtsRtcmem/module.mk new file mode 100755 index 000000000..a1cb32b4d --- /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/AtsSremSsem/module.mk b/ttcn/AtsSremSsem/module.mk new file mode 100755 index 000000000..6aea7ba02 --- /dev/null +++ b/ttcn/AtsSremSsem/module.mk @@ -0,0 +1,41 @@ +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/Pcap \ + ../../ccsrc/Protocols/UpperTester \ + ../../ccsrc/Protocols/Security \ +# ../../ccsrc/Protocols/UDP \ +# ../../ccsrc/Protocols/Http \ +# ../../ccsrc/Protocols/DENM \ +# ../../ccsrc/Protocols/IVIM \ +# ../../ccsrc/Protocols/MapemSpatem \ + -- GitLab From 690cf35d28456b5784f8650e1aaf3ea1d0404722 Mon Sep 17 00:00:00 2001 From: Denis Filatov Date: Thu, 28 Jan 2021 20:48:11 +0100 Subject: [PATCH 17/35] use config.mk for local configuration --- .gitignore | 3 ++- Makefile | 29 ++++++++++++++++------------- config.mk | 3 +++ 3 files changed, 21 insertions(+), 14 deletions(-) create mode 100755 config.mk diff --git a/.gitignore b/.gitignore index 7dcc3813e..2f4b25a3f 100644 --- 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/Makefile b/Makefile index eaa1cba04..f97ddd120 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,4 @@ +-include config.mk ifeq (,$(ATS)) $(error ATS shall be defined) @@ -8,12 +9,14 @@ ifeq (,$(TOPDIR)) endif ifeq (,$(TTCN3_DIR)) - TTCN3_DIR := /cygdrive/c/Tools/Titan + $(error TTCN3_DIR shall be defined in config.mk) endif -#ifeq (,$(OPENSSL_DIR)) -# OPENSSL_DIR := C:/Tools/OpenSSL/Win64 -#endif +ifeq (Windows_NT,$(OS)) +ifeq (,$(OPENSSL_DIR)) + $(error OPENSSL_DIR shall be defined in config.mk) +endif +endif define IncludeModule undefine sources @@ -26,8 +29,8 @@ $$(foreach M, $$(modules), $$(eval $$(call IncludeModule, $(1)/$$(M)))) endef all_includes := $(TTCN3_DIR)/include $(TTCN3_DIR)/src $(TOPDIR)/ccsrc/Framework -defines := TITAN_RUNTIME_2 _NO_SOFTLINKS_ $(ATS) -libs := $(TTCN3_DIR)/lib/libttcn3-rt2-parallel.a -lstdc++fs +defines += TITAN_RUNTIME_2 _NO_SOFTLINKS_ $(ATS) +libs += $(TTCN3_DIR)/lib/libttcn3-rt2-parallel.a -lstdc++fs ifeq (Windows_NT,$(OS)) # Silence linker warnings. @@ -35,7 +38,7 @@ LDFLAGS += -Wl,--enable-auto-import,--enable-runtime-pseudo-reloc defines += WIN32 libs += $(patsubst %, -L%/lib, $(OPENSSL_DIR)) all_includes += $(addsuffix /include, $(OPENSSL_DIR)) -libs += /cygdrive/c/windows/system32/npcap/wpcap.dll +libs += $(WPCAP_DLL_PATH) else defines += LINUX libs += -lpcap -lrt -lpthread @@ -45,11 +48,11 @@ libs += -lssl -lcrypto -lxml2 $(eval $(call IncludeModule, $(TOPDIR)/ttcn/$(ATS))) -outdir := $(TOPDIR)/build +outdir := $(TOPDIR)/build/$(ATS) bindir := $(TOPDIR)/bin sources := $(sort $(all_sources)) -includes := $(outdir) $(outdir)/asn1 $(all_includes) /cygdrive/c/PROGRA~1/Npcap/sdk/include +includes := $(outdir) $(outdir)/../asn1 $(all_includes) $(NPCAP_INCLUDE) EXE=.exe ttcn_sources := $(filter %.ttcn , $(sources)) @@ -101,7 +104,7 @@ force_regen: $(outdir) $(bindir): mkdir -p $@ -$(bindir)/$(ATS)$(EXE): $(outdir)/asn1/libItsAsn.a $(gen_objects) $(cc_objects) +$(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 @@ -123,9 +126,9 @@ $(outdir)/.generate-$(ATS): Makefile $(tt_sources) $(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 +$(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))) diff --git a/config.mk b/config.mk new file mode 100755 index 000000000..dc71f9285 --- /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 \ No newline at end of file -- GitLab From 7ad6a3387b54b10388585c1956416970072e57e6 Mon Sep 17 00:00:00 2001 From: Denis Filatov Date: Thu, 28 Jan 2021 21:27:13 +0100 Subject: [PATCH 18/35] use build dir per ATS --- Makefile | 16 +++++----------- config.mk | 2 +- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index f97ddd120..6ca305c61 100644 --- a/Makefile +++ b/Makefile @@ -12,12 +12,6 @@ ifeq (,$(TTCN3_DIR)) $(error TTCN3_DIR shall be defined in config.mk) endif -ifeq (Windows_NT,$(OS)) -ifeq (,$(OPENSSL_DIR)) - $(error OPENSSL_DIR shall be defined in config.mk) -endif -endif - define IncludeModule undefine sources undefine modules @@ -52,7 +46,7 @@ outdir := $(TOPDIR)/build/$(ATS) bindir := $(TOPDIR)/bin sources := $(sort $(all_sources)) -includes := $(outdir) $(outdir)/../asn1 $(all_includes) $(NPCAP_INCLUDE) +includes := $(outdir) $(outdir)/.. $(outdir)/../asn1 $(all_includes) $(NPCAP_INCLUDE) EXE=.exe ttcn_sources := $(filter %.ttcn , $(sources)) @@ -94,7 +88,7 @@ echo: echo_sources @echo -e "defines: $(addsuffix \n, $(defines))" clean: - rm -f $(outdir)/$(ATS)$(EXE) $(gen_objects) $(gen_sources) $(gen_headers) $(cc_objects) $(outdir)/$(ATS)/.generate $(outdir)/libItsAsn.so + 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 @@ -105,7 +99,7 @@ $(outdir) $(bindir): mkdir -p $@ $(bindir)/$(ATS)$(EXE): $(outdir)/../asn1/libItsAsn.a $(gen_objects) $(cc_objects) - g++ -g -O0 -o $@ $(LDFLAGS) $(gen_objects) $(cc_objects) $(outdir)/asn1/libItsAsn.a $(libs) + g++ -g -O0 -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 $@ $< @@ -117,9 +111,9 @@ $(cc_objects) : $(outdir)/%.o : %.cc #$(gen_sources): # $(TTCN3_DIR)/bin/compiler -n -e -L -R -U none -o $(outdir) $(tt_sources) -$(gen_sources): $(outdir)/.generate-$(ATS) +$(gen_sources): $(outdir)/.generate -$(outdir)/.generate-$(ATS): Makefile $(tt_sources) +$(outdir)/.generate: Makefile $(tt_sources) $(TTCN3_DIR)/bin/compiler -n -e -L -R -U none -o $(outdir) $(tt_sources) touch $@ diff --git a/config.mk b/config.mk index dc71f9285..0632aa22f 100755 --- a/config.mk +++ b/config.mk @@ -1,3 +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 \ No newline at end of file +NPCAP_INCLUDE := /cygdrive/c/PROGRA~1/Npcap/sdk/include -- GitLab From 73bc9ea1d279893b572582b3aa6b77aa80659c05 Mon Sep 17 00:00:00 2001 From: Yann Garcia Date: Fri, 29 Jan 2021 15:49:58 +0100 Subject: [PATCH 19/35] Add AtsIVIM & AtsRtcmem --- Makefile | 7 +- .../Rtcmem_ports/AdapterControlPort_Rtcmem.hh | 2 - .../Rtcmem_ports/UpperTesterPort_Rtcmem.hh | 3 + .../Ports/LibIts_ports/Rtcmem_ports/module.mk | 2 +- ccsrc/Ports/LibIts_ports/UpperTesterPort.hh | 38 +- ccsrc/Protocols/IVIM/module.mk | 2 +- ccsrc/Protocols/Rtcmem/module.mk | 3 + ccsrc/Protocols/UpperTester/module.mk | 4 + scripts/autointerop_generate_makefile.bash | 251 ----------- scripts/btp_generate_makefile.bash | 253 ----------- scripts/cam_generate_makefile.bash | 253 ----------- scripts/denm_generate_makefile.bash | 253 ----------- scripts/gencert_generate_makefile.bash | 253 ----------- scripts/geonw_generate_makefile.bash | 253 ----------- scripts/ivim_generate_makefile.bash | 253 ----------- scripts/mapemstatem_generate_makefile.bash | 253 ----------- scripts/merge_its_project.bash | 275 ------------ scripts/pki_generate_makefile.bash | 253 ----------- scripts/rsusimulator_generate_makefile.bash | 253 ----------- scripts/rtcmem_generate_makefile.bash | 253 ----------- scripts/security_generate_makefile.bash | 253 ----------- scripts/sremssem_generate_makefile.bash | 253 ----------- scripts/testcodec_generate_makefile.bash | 253 ----------- scripts/update_its_project.bash | 412 ------------------ ttcn/AtsIVIM/Makefile | 2 + ttcn/AtsIVIM/module.mk | 38 ++ ttcn/AtsRSUsSimulator/module.mk | 1 + ttcn/AtsRtcmem/Makefile | 2 + ttcn/AtsRtcmem/module.mk | 0 29 files changed, 96 insertions(+), 4235 deletions(-) create mode 100644 ccsrc/Protocols/Rtcmem/module.mk delete mode 100755 scripts/autointerop_generate_makefile.bash delete mode 100755 scripts/btp_generate_makefile.bash delete mode 100755 scripts/cam_generate_makefile.bash delete mode 100755 scripts/denm_generate_makefile.bash delete mode 100755 scripts/gencert_generate_makefile.bash delete mode 100755 scripts/geonw_generate_makefile.bash delete mode 100755 scripts/ivim_generate_makefile.bash delete mode 100755 scripts/mapemstatem_generate_makefile.bash delete mode 100755 scripts/merge_its_project.bash delete mode 100755 scripts/pki_generate_makefile.bash delete mode 100755 scripts/rsusimulator_generate_makefile.bash delete mode 100755 scripts/rtcmem_generate_makefile.bash delete mode 100755 scripts/security_generate_makefile.bash delete mode 100755 scripts/sremssem_generate_makefile.bash delete mode 100755 scripts/testcodec_generate_makefile.bash delete mode 100755 scripts/update_its_project.bash create mode 100644 ttcn/AtsIVIM/Makefile create mode 100644 ttcn/AtsIVIM/module.mk create mode 100644 ttcn/AtsRtcmem/Makefile mode change 100755 => 100644 ttcn/AtsRtcmem/module.mk diff --git a/Makefile b/Makefile index 6ca305c61..48121d227 100644 --- a/Makefile +++ b/Makefile @@ -48,7 +48,10 @@ bindir := $(TOPDIR)/bin sources := $(sort $(all_sources)) includes := $(outdir) $(outdir)/.. $(outdir)/../asn1 $(all_includes) $(NPCAP_INCLUDE) -EXE=.exe +ifeq (Windows_NT,$(OS)) + EXE=.exe +endif + ttcn_sources := $(filter %.ttcn , $(sources)) ttcn3_sources := $(filter %.ttcn3, $(sources)) asn_sources := $(filter %.asn, $(sources)) @@ -114,7 +117,7 @@ $(cc_objects) : $(outdir)/%.o : %.cc $(gen_sources): $(outdir)/.generate $(outdir)/.generate: Makefile $(tt_sources) - $(TTCN3_DIR)/bin/compiler -n -e -L -R -U none -o $(outdir) $(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 diff --git a/ccsrc/Ports/LibIts_ports/Rtcmem_ports/AdapterControlPort_Rtcmem.hh b/ccsrc/Ports/LibIts_ports/Rtcmem_ports/AdapterControlPort_Rtcmem.hh index 6aaf43652..55375a79b 100644 --- a/ccsrc/Ports/LibIts_ports/Rtcmem_ports/AdapterControlPort_Rtcmem.hh +++ b/ccsrc/Ports/LibIts_ports/Rtcmem_ports/AdapterControlPort_Rtcmem.hh @@ -1,8 +1,6 @@ #ifndef AdapterControlPort_Rtcmem_HH #define AdapterControlPort_Rtcmem_HH -#include "LibItsSremSsem_TestSystem.hh" - //============================================================================= #include "LibItsRtcmem_TestSystem.hh" diff --git a/ccsrc/Ports/LibIts_ports/Rtcmem_ports/UpperTesterPort_Rtcmem.hh b/ccsrc/Ports/LibIts_ports/Rtcmem_ports/UpperTesterPort_Rtcmem.hh index 3d6399db5..2e6165751 100644 --- a/ccsrc/Ports/LibIts_ports/Rtcmem_ports/UpperTesterPort_Rtcmem.hh +++ b/ccsrc/Ports/LibIts_ports/Rtcmem_ports/UpperTesterPort_Rtcmem.hh @@ -1,6 +1,9 @@ #ifndef UpperTesterPort_Rtcmem_HH #define UpperTesterPort_Rtcmem_HH +#include "layer.hh" +#include "params.hh" + //============================================================================= #include "LibItsRtcmem_TestSystem.hh" namespace LibItsRtcmem__TestSystem { diff --git a/ccsrc/Ports/LibIts_ports/Rtcmem_ports/module.mk b/ccsrc/Ports/LibIts_ports/Rtcmem_ports/module.mk index ad956e965..238ffc662 100755 --- a/ccsrc/Ports/LibIts_ports/Rtcmem_ports/module.mk +++ b/ccsrc/Ports/LibIts_ports/Rtcmem_ports/module.mk @@ -1,3 +1,3 @@ -sources := AdapterControlPort_Rtcmem.cc AdapterControlPort_Rtcmem.hh RtcmemPort.cc RtcmemPort.hh UpperTesterPort_Rtcmem.cc UpperTesterPort_Rtcmem.hh +sources := AdapterControlPort_Rtcmem.cc RtcmemPort.cc UpperTesterPort_Rtcmem.cc includes := . diff --git a/ccsrc/Ports/LibIts_ports/UpperTesterPort.hh b/ccsrc/Ports/LibIts_ports/UpperTesterPort.hh index 92b61337d..7423ff3d5 100644 --- a/ccsrc/Ports/LibIts_ports/UpperTesterPort.hh +++ b/ccsrc/Ports/LibIts_ports/UpperTesterPort.hh @@ -38,6 +38,12 @@ #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" @@ -50,6 +56,17 @@ #include "Rtcmem_ports/UpperTesterPort_Rtcmem.hh" #endif +#ifdef AtsRSUsSimulator // Thsi 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_ #ifdef AtsGeoNetworking @@ -80,10 +97,10 @@ #include "UpperTesterPort_DENM.hh" #endif -#ifdef AtsSremSsem +#ifdef AtsIvim #include "UpperTesterPort_GN.hh" #include "UpperTesterPort_BTP.hh" - #include "UpperTesterPort_SremSsem.hh" + #include "UpperTesterPort_IVIM.hh" #endif #ifdef AtsMapemSpatem @@ -92,12 +109,29 @@ #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 // Thsi 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/Protocols/IVIM/module.mk b/ccsrc/Protocols/IVIM/module.mk index e4b8d9247..625c70ea2 100644 --- a/ccsrc/Protocols/IVIM/module.mk +++ b/ccsrc/Protocols/IVIM/module.mk @@ -1,3 +1,3 @@ -sources := ivim_codec.cc ivim_layer.cc ivim_pdu_codec.cc +sources := ivim_codec.cc ivim_layer.cc ivim_pdu_codec.cc includes := . diff --git a/ccsrc/Protocols/Rtcmem/module.mk b/ccsrc/Protocols/Rtcmem/module.mk new file mode 100644 index 000000000..a934c165f --- /dev/null +++ b/ccsrc/Protocols/Rtcmem/module.mk @@ -0,0 +1,3 @@ +sources := RtcmemCodec.cc RtcmemLayer.cc +includes := . + diff --git a/ccsrc/Protocols/UpperTester/module.mk b/ccsrc/Protocols/UpperTester/module.mk index a7ff3bc78..f52860a32 100644 --- a/ccsrc/Protocols/UpperTester/module.mk +++ b/ccsrc/Protocols/UpperTester/module.mk @@ -19,6 +19,9 @@ 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 @@ -35,6 +38,7 @@ sources += uppertester_cam_codec.cc uppertester_cam_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 diff --git a/scripts/autointerop_generate_makefile.bash b/scripts/autointerop_generate_makefile.bash deleted file mode 100755 index 930b377db..000000000 --- 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 797172d7f..000000000 --- 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 3204cbfd1..000000000 --- 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 e83fcf291..000000000 --- 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 9fcdd4a83..000000000 --- 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 48074390f..000000000 --- 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 96d324500..000000000 --- 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 2365e279e..000000000 --- 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 9dc9de114..000000000 --- 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 57f41b7e3..000000000 --- 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 f26ac02e2..000000000 --- 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 55d5126f6..000000000 --- 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/security_generate_makefile.bash b/scripts/security_generate_makefile.bash deleted file mode 100755 index 9dc4169fb..000000000 --- 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 b88973e62..000000000 --- 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 30db99193..000000000 --- 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 678587696..000000000 --- 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/ttcn/AtsIVIM/Makefile b/ttcn/AtsIVIM/Makefile new file mode 100644 index 000000000..e007d8976 --- /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 000000000..f9d3f5e0c --- /dev/null +++ b/ttcn/AtsIVIM/module.mk @@ -0,0 +1,38 @@ +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/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/AtsRSUsSimulator/module.mk b/ttcn/AtsRSUsSimulator/module.mk index cffcfe808..b56430e22 100644 --- a/ttcn/AtsRSUsSimulator/module.mk +++ b/ttcn/AtsRSUsSimulator/module.mk @@ -21,6 +21,7 @@ modules := ../LibCommon \ ../LibIts/ttcn/IVIM \ ../LibIts/ttcn/MapemSpatem \ ../LibIts/ttcn/SremSsem \ + ../LibIts/ttcn/Rtcmem \ ../LibIts/ttcn/Pki \ ../LibIts/ttcn/Security \ ../LibIts/ttcn/GeoNetworking \ diff --git a/ttcn/AtsRtcmem/Makefile b/ttcn/AtsRtcmem/Makefile new file mode 100644 index 000000000..6aff436fb --- /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 old mode 100755 new mode 100644 -- GitLab From 7f5277c0dd0ede696e2fff90bbd44fd61a20af6c Mon Sep 17 00:00:00 2001 From: Yann Garcia Date: Fri, 29 Jan 2021 15:54:17 +0100 Subject: [PATCH 20/35] Remove +x right on module.mk files --- ccsrc/Ports/LibIts_ports/Rtcmem_ports/module.mk | 0 ttcn/AtsMapemSpatem/module.mk | 0 ttcn/AtsSremSsem/module.mk | 0 3 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 ccsrc/Ports/LibIts_ports/Rtcmem_ports/module.mk mode change 100755 => 100644 ttcn/AtsMapemSpatem/module.mk mode change 100755 => 100644 ttcn/AtsSremSsem/module.mk diff --git a/ccsrc/Ports/LibIts_ports/Rtcmem_ports/module.mk b/ccsrc/Ports/LibIts_ports/Rtcmem_ports/module.mk old mode 100755 new mode 100644 diff --git a/ttcn/AtsMapemSpatem/module.mk b/ttcn/AtsMapemSpatem/module.mk old mode 100755 new mode 100644 diff --git a/ttcn/AtsSremSsem/module.mk b/ttcn/AtsSremSsem/module.mk old mode 100755 new mode 100644 -- GitLab From 023ebd5fff72d422770d24c272408f4ed846e0b8 Mon Sep 17 00:00:00 2001 From: Yann Garcia Date: Fri, 29 Jan 2021 16:59:06 +0100 Subject: [PATCH 21/35] Wrong typo for AtsIVIM --- ccsrc/Ports/LibIts_ports/UpperTesterPort.hh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ccsrc/Ports/LibIts_ports/UpperTesterPort.hh b/ccsrc/Ports/LibIts_ports/UpperTesterPort.hh index 7423ff3d5..6864eff17 100644 --- a/ccsrc/Ports/LibIts_ports/UpperTesterPort.hh +++ b/ccsrc/Ports/LibIts_ports/UpperTesterPort.hh @@ -38,7 +38,7 @@ #include "SremSsem_ports/UpperTesterPort_SremSsem.hh" #endif -#ifdef AtsIvim +#ifdef AtsIVIM #include "GN_ports/UpperTesterPort_GN.hh" #include "BTP_ports/UpperTesterPort_BTP.hh" #include "IVIM_ports/UpperTesterPort_IVIM.hh" @@ -97,7 +97,7 @@ #include "UpperTesterPort_DENM.hh" #endif -#ifdef AtsIvim +#ifdef AtsIVIM #include "UpperTesterPort_GN.hh" #include "UpperTesterPort_BTP.hh" #include "UpperTesterPort_IVIM.hh" -- GitLab From fce182a69ee4f6f4d727836bcde030685b95b6e5 Mon Sep 17 00:00:00 2001 From: Yann Garcia Date: Fri, 29 Jan 2021 17:17:53 +0100 Subject: [PATCH 22/35] AtsRtcmem --- ccsrc/Protocols/UpperTester/UpperTesterRtcmemCodec.cc | 3 --- ccsrc/Protocols/UpperTester/UpperTesterRtcmemLayer.cc | 3 ++- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ccsrc/Protocols/UpperTester/UpperTesterRtcmemCodec.cc b/ccsrc/Protocols/UpperTester/UpperTesterRtcmemCodec.cc index 6b1882e87..e40bc2a25 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 f458d4a47..8552fa2cf 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" -- GitLab From 4c7ac43174a80a99e6de3827586754405e45c2e6 Mon Sep 17 00:00:00 2001 From: Yann Garcia Date: Fri, 29 Jan 2021 18:07:23 +0100 Subject: [PATCH 23/35] AtsRSUsSimulator --- ccsrc/EncDec/module.mk | 1 + ccsrc/Ports/LibIts_ports/UpperTesterPort.hh | 4 ++-- ttcn/AtsRSUsSimulator/module.mk | 5 +++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ccsrc/EncDec/module.mk b/ccsrc/EncDec/module.mk index c1d2ca470..518b3df02 100644 --- a/ccsrc/EncDec/module.mk +++ b/ccsrc/EncDec/module.mk @@ -28,6 +28,7 @@ sources += \ LibItsHttp_Encdec.cc \ LibItsMapemSpatem_Encdec.cc \ LibItsSremSsem_Encdec.cc \ + LibItsRtcmem_Encdec.cc \ LibItsIvim_Encdec.cc \ LibItsPki_Encdec.cc diff --git a/ccsrc/Ports/LibIts_ports/UpperTesterPort.hh b/ccsrc/Ports/LibIts_ports/UpperTesterPort.hh index 6864eff17..9b9a3d4fb 100644 --- a/ccsrc/Ports/LibIts_ports/UpperTesterPort.hh +++ b/ccsrc/Ports/LibIts_ports/UpperTesterPort.hh @@ -56,7 +56,7 @@ #include "Rtcmem_ports/UpperTesterPort_Rtcmem.hh" #endif -#ifdef AtsRSUsSimulator // Thsi is not an Abstract Test Suit, but an helper tool to simulate basic RSU/OBU functionalities +#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" @@ -121,7 +121,7 @@ #include "UpperTesterPort_Rtcmem.hh" #endif -#ifdef AtsRSUsSimulator // Thsi is not an Abstract Test Suit, but an helper tool to simulate basic RSU/OBU functionalities +#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" diff --git a/ttcn/AtsRSUsSimulator/module.mk b/ttcn/AtsRSUsSimulator/module.mk index b56430e22..1c982503f 100644 --- a/ttcn/AtsRSUsSimulator/module.mk +++ b/ttcn/AtsRSUsSimulator/module.mk @@ -37,6 +37,7 @@ modules := ../LibCommon \ ../../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 \ @@ -55,5 +56,9 @@ modules := ../LibCommon \ ../../ccsrc/Protocols/DENM \ ../../ccsrc/Protocols/IVIM \ ../../ccsrc/Protocols/MapemSpatem \ + ../../ccsrc/Protocols/Rtcmem \ ../../ccsrc/Protocols/SremSsem \ + + + -- GitLab From 755e6f21fc0317a68e8a11edbc8db6a24733b124 Mon Sep 17 00:00:00 2001 From: Yann Garcia Date: Fri, 29 Jan 2021 19:15:35 +0100 Subject: [PATCH 24/35] Setup run scripts --- config.mk | 6 ++-- etc/AtsMapemSpatem/AtsMapemSpatem.cfg | 2 +- etc/AtsRSUsSimulator/AtsRSUSimulator.cfg | 2 +- scripts/run_all.bash | 20 ++++++++----- scripts/run_mtc.bash | 36 ++++++++++-------------- scripts/run_ptcs.bash | 30 +++++++++----------- ttcn/AtsCAM/module.mk | 1 + ttcn/AtsDENM/module.mk | 1 + ttcn/AtsIVIM/module.mk | 1 + ttcn/AtsMapemSpatem/module.mk | 1 + ttcn/AtsRSUsSimulator/module.mk | 1 + ttcn/AtsSremSsem/module.mk | 1 + 12 files changed, 53 insertions(+), 49 deletions(-) mode change 100755 => 100644 config.mk diff --git a/config.mk b/config.mk old mode 100755 new mode 100644 index 0632aa22f..690bd2b23 --- a/config.mk +++ b/config.mk @@ -1,3 +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 +#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/etc/AtsMapemSpatem/AtsMapemSpatem.cfg b/etc/AtsMapemSpatem/AtsMapemSpatem.cfg index a69d34074..9400200cf 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 77af2ce59..9db19d5b5 100644 --- a/etc/AtsRSUsSimulator/AtsRSUSimulator.cfg +++ b/etc/AtsRSUsSimulator/AtsRSUSimulator.cfg @@ -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/run_all.bash b/scripts/run_all.bash index 62e48902a..42aebbc74 100755 --- a/scripts/run_all.bash +++ b/scripts/run_all.bash @@ -1,9 +1,15 @@ #!/bin/bash #set -e -#set -vx +set -vx 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 + ../bin/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 ../$ATS/logs/merged.log ../$ATS/logs/merged.`date +'%Y%m%d%S'`.log done exit 0 diff --git a/scripts/run_mtc.bash b/scripts/run_mtc.bash index a4932c241..9715a76df 100755 --- a/scripts/run_mtc.bash +++ b/scripts/run_mtc.bash @@ -1,20 +1,28 @@ #!/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,21 +30,7 @@ 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" @@ -48,7 +42,7 @@ 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 869220b92..9e69a065e 100755 --- a/scripts/run_ptcs.bash +++ b/scripts/run_ptcs.bash @@ -1,16 +1,22 @@ #!/bin/bash #set -e -#set -vx +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 @@ -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/ttcn/AtsCAM/module.mk b/ttcn/AtsCAM/module.mk index bbd916429..16395d72c 100644 --- a/ttcn/AtsCAM/module.mk +++ b/ttcn/AtsCAM/module.mk @@ -27,6 +27,7 @@ modules := ../LibCommon \ ../../ccsrc/Protocols/CAM \ ../../ccsrc/Protocols/GeoNetworking \ ../../ccsrc/Protocols/BTP \ + ../../ccsrc/Protocols/ETH \ ../../ccsrc/Protocols/Pcap \ ../../ccsrc/Protocols/UpperTester \ ../../ccsrc/Protocols/Security \ diff --git a/ttcn/AtsDENM/module.mk b/ttcn/AtsDENM/module.mk index 04f37deaa..133cde819 100644 --- a/ttcn/AtsDENM/module.mk +++ b/ttcn/AtsDENM/module.mk @@ -25,6 +25,7 @@ modules := ../LibCommon \ ../../ccsrc/Protocols/DENM \ ../../ccsrc/Protocols/GeoNetworking \ ../../ccsrc/Protocols/BTP \ + ../../ccsrc/Protocols/ETH \ ../../ccsrc/Protocols/Pcap \ ../../ccsrc/Protocols/UpperTester \ ../../ccsrc/Protocols/Security \ diff --git a/ttcn/AtsIVIM/module.mk b/ttcn/AtsIVIM/module.mk index f9d3f5e0c..5d831b479 100644 --- a/ttcn/AtsIVIM/module.mk +++ b/ttcn/AtsIVIM/module.mk @@ -27,6 +27,7 @@ modules := ../LibCommon \ ../../ccsrc/Protocols/IVIM \ ../../ccsrc/Protocols/GeoNetworking \ ../../ccsrc/Protocols/BTP \ + ../../ccsrc/Protocols/ETH \ ../../ccsrc/Protocols/Pcap \ ../../ccsrc/Protocols/UpperTester \ ../../ccsrc/Protocols/Security \ diff --git a/ttcn/AtsMapemSpatem/module.mk b/ttcn/AtsMapemSpatem/module.mk index 8bae2202f..3fec29b69 100644 --- a/ttcn/AtsMapemSpatem/module.mk +++ b/ttcn/AtsMapemSpatem/module.mk @@ -30,6 +30,7 @@ modules := ../LibCommon \ ../../ccsrc/Protocols/MapemSpatem \ ../../ccsrc/Protocols/GeoNetworking \ ../../ccsrc/Protocols/BTP \ + ../../ccsrc/Protocols/ETH \ ../../ccsrc/Protocols/Pcap \ ../../ccsrc/Protocols/UpperTester \ ../../ccsrc/Protocols/Security \ diff --git a/ttcn/AtsRSUsSimulator/module.mk b/ttcn/AtsRSUsSimulator/module.mk index 1c982503f..0ee54d37b 100644 --- a/ttcn/AtsRSUsSimulator/module.mk +++ b/ttcn/AtsRSUsSimulator/module.mk @@ -50,6 +50,7 @@ modules := ../LibCommon \ ../../ccsrc/Protocols/GeoNetworking \ ../../ccsrc/Protocols/BTP \ ../../ccsrc/Protocols/Pcap \ + ../../ccsrc/Protocols/ETH \ ../../ccsrc/Protocols/UpperTester \ ../../ccsrc/Protocols/Security \ ../../ccsrc/Protocols/Http \ diff --git a/ttcn/AtsSremSsem/module.mk b/ttcn/AtsSremSsem/module.mk index 6aea7ba02..d774e8327 100644 --- a/ttcn/AtsSremSsem/module.mk +++ b/ttcn/AtsSremSsem/module.mk @@ -30,6 +30,7 @@ modules := ../LibCommon \ ../../ccsrc/Protocols/SremSsem \ ../../ccsrc/Protocols/GeoNetworking \ ../../ccsrc/Protocols/BTP \ + ../../ccsrc/Protocols/ETH \ ../../ccsrc/Protocols/Pcap \ ../../ccsrc/Protocols/UpperTester \ ../../ccsrc/Protocols/Security \ -- GitLab From 4c396d034d21c05bceb3f7f1e39a6a25425b7178 Mon Sep 17 00:00:00 2001 From: Yann Garcia Date: Sat, 30 Jan 2021 11:58:32 +0100 Subject: [PATCH 25/35] Setup run scripts --- scripts/run_all.bash | 8 ++++---- scripts/run_mtc.bash | 4 ++-- scripts/run_ptcs.bash | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/run_all.bash b/scripts/run_all.bash index 42aebbc74..6f831e6ac 100755 --- a/scripts/run_all.bash +++ b/scripts/run_all.bash @@ -1,6 +1,6 @@ #!/bin/bash #set -e -set -vx +#set -vx clear @@ -32,8 +32,8 @@ rm ../bin/S1/logs/merged.*.log for i in $(seq 1 1 $COUNTER) do - ../bin/run_mtc.bash & - ../bin/run_ptcs.bash + ./run_mtc.bash & + ./run_ptcs.bash dup=$(ps -ef | grep "$0" | grep -v grep | wc -l) while [ ${dup} -eq 3 ] @@ -43,7 +43,7 @@ do done sleep 1 - mv ../$ATS/logs/merged.log ../$ATS/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 9715a76df..0559a9eaa 100755 --- a/scripts/run_mtc.bash +++ b/scripts/run_mtc.bash @@ -1,7 +1,6 @@ #!/bin/bash #set -e - -set -vx +#set -vx clear @@ -37,6 +36,7 @@ echo "> smtc [module_name[[.control]|.testcase_name|.*]: when MyExample is conne 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 diff --git a/scripts/run_ptcs.bash b/scripts/run_ptcs.bash index 9e69a065e..1c097d445 100755 --- a/scripts/run_ptcs.bash +++ b/scripts/run_ptcs.bash @@ -1,6 +1,6 @@ #!/bin/bash #set -e -set -vx +#set -vx clear -- GitLab From 6964f9b05711fce65ef8b09d3c79f7329dc8017e Mon Sep 17 00:00:00 2001 From: Yann Garcia Date: Sat, 30 Jan 2021 16:52:23 +0100 Subject: [PATCH 26/35] Update README.md --- README.md | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 0cce9b5aa..425442ffa 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'. -- GitLab From a40ff960125a0982f6546781c9b45aa79c178cee Mon Sep 17 00:00:00 2001 From: Yann Garcia Date: Sat, 30 Jan 2021 16:54:41 +0100 Subject: [PATCH 27/35] Update Dockerfile.stfubuntu --- docker/Dockerfile.stfubuntu | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/Dockerfile.stfubuntu b/docker/Dockerfile.stfubuntu index 0fd4d0179..02b408e8e 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 \ -- GitLab From 4f37866d09b7c9497a0fd87a4699673b9573fb16 Mon Sep 17 00:00:00 2001 From: Yann Garcia Date: Sat, 30 Jan 2021 16:56:29 +0100 Subject: [PATCH 28/35] Update 50-ats.sh --- docker/home/etc/init.d/50-ats.sh | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/docker/home/etc/init.d/50-ats.sh b/docker/home/etc/init.d/50-ats.sh index efdb42c9c..5bf6791c5 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} -- GitLab From 91d2adce45b883a2aed5b8a0731b012d7425a0a7 Mon Sep 17 00:00:00 2001 From: Yann Garcia Date: Sat, 30 Jan 2021 16:57:56 +0100 Subject: [PATCH 29/35] Update 40-ttf002.sh --- docker/home/etc/init.d/40-ttf002.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docker/home/etc/init.d/40-ttf002.sh b/docker/home/etc/init.d/40-ttf002.sh index bfe9ea33d..7edf522d6 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 -- GitLab From 91c5e53f78de23cdd51e5a62a84ceb2465963560 Mon Sep 17 00:00:00 2001 From: Yann Garcia Date: Sat, 30 Jan 2021 17:00:08 +0100 Subject: [PATCH 30/35] Update provisioner.bash --- vagrant/provisioner.bash | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/vagrant/provisioner.bash b/vagrant/provisioner.bash index db25adf3f..c8cdfd4f8 100755 --- a/vagrant/provisioner.bash +++ b/vagrant/provisioner.bash @@ -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} -- GitLab From 160b5af0298c3fcf10adc5adfbb49b62c0766e79 Mon Sep 17 00:00:00 2001 From: garciay Date: Sat, 30 Jan 2021 17:02:08 +0100 Subject: [PATCH 31/35] Remove ^M characters --- config.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config.mk b/config.mk index 690bd2b23..37da98c2f 100644 --- a/config.mk +++ b/config.mk @@ -1,3 +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 +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 -- GitLab From 6ce8090615bb18820ddd3df6aa516f67611f65bf Mon Sep 17 00:00:00 2001 From: Denis Filatov Date: Tue, 2 Feb 2021 10:27:55 +0100 Subject: [PATCH 32/35] AtsPki support in cygwin --- .gitmodules | 6 ++++++ Makefile | 3 ++- ccsrc/EncDec/module.mk | 7 ++++++- ccsrc/Ports/LibIts_ports/AdapterControlPort.hh | 3 +++ ccsrc/Ports/LibIts_ports/UpperTesterPort.hh | 16 ++++++++++++++++ ttcn/AtsSecurity/module.mk | 2 +- .../module | 1 + .../module.mk | 2 ++ ttcn/modules/titan.TestPorts.HTTPmsg/module | 1 + ttcn/modules/titan.TestPorts.HTTPmsg/module.mk | 9 +++++++++ 10 files changed, 47 insertions(+), 3 deletions(-) create mode 160000 ttcn/modules/titan.TestPorts.Common_Components.Abstract_Socket/module create mode 100755 ttcn/modules/titan.TestPorts.Common_Components.Abstract_Socket/module.mk create mode 160000 ttcn/modules/titan.TestPorts.HTTPmsg/module create mode 100755 ttcn/modules/titan.TestPorts.HTTPmsg/module.mk diff --git a/.gitmodules b/.gitmodules index b3b1d777d..295054f73 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,3 +6,9 @@ path = ttcn/LibCommon url = ../../LIBS/LibCommon.git 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 index 6ca305c61..d73c5accc 100644 --- a/Makefile +++ b/Makefile @@ -11,6 +11,7 @@ endif ifeq (,$(TTCN3_DIR)) $(error TTCN3_DIR shall be defined in config.mk) endif +first: all define IncludeModule undefine sources @@ -19,7 +20,7 @@ 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, $(1)/$$(M)))) +$$(foreach M, $$(modules), $$(eval $$(call IncludeModule, $$(if $$(filter /%, $$(M)), $$(M), $(1)/$$(M))))) endef all_includes := $(TTCN3_DIR)/include $(TTCN3_DIR)/src $(TOPDIR)/ccsrc/Framework diff --git a/ccsrc/EncDec/module.mk b/ccsrc/EncDec/module.mk index c1d2ca470..cf68e8f4a 100644 --- a/ccsrc/EncDec/module.mk +++ b/ccsrc/EncDec/module.mk @@ -52,7 +52,12 @@ sources += LibItsRtcmem_Encdec.cc endif ifeq (AtsPki, $(ATS)) -sources += LibItsPki_Encdec.cc +sources := \ + LibItsGeoNetworking_Encdec.cc \ + LibItsIpv6OverGeoNetworking_Encdec.cc \ + LibItsSecurity_Encdec.cc \ + LibItsPki_Encdec.cc \ + LibItsHttp_Encdec.cc endif # LibItsPki_Encdec.cc diff --git a/ccsrc/Ports/LibIts_ports/AdapterControlPort.hh b/ccsrc/Ports/LibIts_ports/AdapterControlPort.hh index 3844c5d90..398ae312f 100644 --- a/ccsrc/Ports/LibIts_ports/AdapterControlPort.hh +++ b/ccsrc/Ports/LibIts_ports/AdapterControlPort.hh @@ -28,6 +28,9 @@ #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_ diff --git a/ccsrc/Ports/LibIts_ports/UpperTesterPort.hh b/ccsrc/Ports/LibIts_ports/UpperTesterPort.hh index 92b61337d..bf0d8503a 100644 --- a/ccsrc/Ports/LibIts_ports/UpperTesterPort.hh +++ b/ccsrc/Ports/LibIts_ports/UpperTesterPort.hh @@ -32,6 +32,15 @@ #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" @@ -80,6 +89,13 @@ #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 AtsSremSsem #include "UpperTesterPort_GN.hh" #include "UpperTesterPort_BTP.hh" diff --git a/ttcn/AtsSecurity/module.mk b/ttcn/AtsSecurity/module.mk index 21f6b79e3..6d09bf27c 100644 --- a/ttcn/AtsSecurity/module.mk +++ b/ttcn/AtsSecurity/module.mk @@ -1,11 +1,11 @@ suite := AtsSecurity sources := ItsSecurity_Functions.ttcn \ - ItsSecurity_Pics.ttcn \ ItsSecurity_Templates.ttcn \ ItsSecurity_TestCases.ttcn \ ItsSecurity_TestControl.ttcn \ ItsSecurity_TestSystem.ttcn +# ItsSecurity_Pics.ttcn \ modules := ../LibCommon \ ../LibIts \ 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 000000000..bd41994ab --- /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 000000000..9b0b530e6 --- /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 000000000..9a0dfdecf --- /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 000000000..f8df57abc --- /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 -- GitLab From 42bd2407f621c74636c8591f9f8fa857086d1b08 Mon Sep 17 00:00:00 2001 From: Yann Garcia Date: Sun, 7 Feb 2021 14:09:03 +0100 Subject: [PATCH 33/35] Update provisioner.bash --- vagrant/provisioner.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vagrant/provisioner.bash b/vagrant/provisioner.bash index c8cdfd4f8..561d1a7f9 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 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 -- GitLab From 85c2947d434b24b8c68723ac9ded758ae0f56e7f Mon Sep 17 00:00:00 2001 From: Yann Garcia Date: Sat, 13 Feb 2021 15:40:41 +0100 Subject: [PATCH 34/35] Update provisioner.bash --- vagrant/provisioner.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vagrant/provisioner.bash b/vagrant/provisioner.bash index 561d1a7f9..d2825beae 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 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 +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 -- GitLab From 6318bbd42fe1b47cbe879fa92a70c161362b7aec Mon Sep 17 00:00:00 2001 From: Yann Garcia Date: Wed, 17 Feb 2021 08:31:52 +0100 Subject: [PATCH 35/35] Add Geospacial support --- Makefile | 4 +- ccsrc/Externals/LibItsSecurity_externals.cc | 8 +- ccsrc/geospacial/geospacial.cc | 200 ++++++++++++++++++++ ccsrc/geospacial/geospacial.hh | 61 ++++++ ccsrc/geospacial/module.mk | 3 + ttcn/AtsCAM/module.mk | 1 + ttcn/LibIts | 2 +- 7 files changed, 274 insertions(+), 5 deletions(-) create mode 100644 ccsrc/geospacial/geospacial.cc create mode 100644 ccsrc/geospacial/geospacial.hh create mode 100644 ccsrc/geospacial/module.mk diff --git a/Makefile b/Makefile index cc3a9bc88..c11ef81d1 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ $$(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 +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 @@ -39,7 +39,7 @@ defines += LINUX libs += -lpcap -lrt -lpthread endif -libs += -lssl -lcrypto -lxml2 +libs += -lssl -lcrypto -lxml2 -ljsoncpp $(eval $(call IncludeModule, $(TOPDIR)/ttcn/$(ATS))) diff --git a/ccsrc/Externals/LibItsSecurity_externals.cc b/ccsrc/Externals/LibItsSecurity_externals.cc index b32ec8328..8ccfedb31 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/geospacial/geospacial.cc b/ccsrc/geospacial/geospacial.cc new file mode 100644 index 000000000..f7043b210 --- /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 000000000..d06456206 --- /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 000000000..5a05a64ea --- /dev/null +++ b/ccsrc/geospacial/module.mk @@ -0,0 +1,3 @@ +sources := geospacial.cc +includes := . + diff --git a/ttcn/AtsCAM/module.mk b/ttcn/AtsCAM/module.mk index 16395d72c..0337741c5 100644 --- a/ttcn/AtsCAM/module.mk +++ b/ttcn/AtsCAM/module.mk @@ -31,6 +31,7 @@ modules := ../LibCommon \ ../../ccsrc/Protocols/Pcap \ ../../ccsrc/Protocols/UpperTester \ ../../ccsrc/Protocols/Security \ + ../../ccsrc/geospacial \ # ../../ccsrc/Protocols/UDP \ # ../../ccsrc/Protocols/Http \ # ../../ccsrc/Protocols/DENM \ diff --git a/ttcn/LibIts b/ttcn/LibIts index 4682888ad..ec30313a9 160000 --- a/ttcn/LibIts +++ b/ttcn/LibIts @@ -1 +1 @@ -Subproject commit 4682888ad6ef018ca1869c5e0cb5e2473b56d842 +Subproject commit ec30313a90a101f519e9c41c5225981c3c3f02da -- GitLab