From 02fa652da88059e8fdf9d1d587ba65c0ddaad87f Mon Sep 17 00:00:00 2001 From: garciay Date: Wed, 29 Apr 2026 12:26:03 +0200 Subject: [PATCH 1/4] Use of built-in TITAN ASN.1 codec; Renaming some of layers/codecs --- Makefile | 98 ++- README.md | 3 +- TS.ITS.TTF_T05x.code-workspace | 3 + TS.ITS.tpd | 24 +- ccsrc/Asn1c/asn1_recoder.cc | 51 -- ccsrc/Asn1c/asn1_recoder.hh | 29 - ccsrc/Asn1c/module.mk | 3 - ccsrc/Asn1c/oer_codec.hh | 42 - ccsrc/Asn1c/per_codec.hh | 80 -- ccsrc/EncDec/LibItsAvm_Encdec.cc | 86 +- ccsrc/EncDec/LibItsCam_Encdec.cc | 42 +- ccsrc/EncDec/LibItsCps_Encdec.cc | 42 +- ccsrc/EncDec/LibItsDenm_Encdec.cc | 42 +- ccsrc/EncDec/LibItsIvim_Encdec.cc | 34 +- ccsrc/EncDec/LibItsMapemSpatem_Encdec.cc | 68 +- ccsrc/EncDec/LibItsMbr_Encdec.cc | 60 +- ccsrc/EncDec/LibItsPim_Encdec.cc | 42 +- ccsrc/EncDec/LibItsPki_Encdec.cc | 824 +++++++++--------- ccsrc/EncDec/LibItsRtcmem_Encdec.cc | 42 +- ccsrc/EncDec/LibItsSaem_Encdec.cc | 42 +- ccsrc/EncDec/LibItsSecurity_Encdec.cc | 206 ++--- ccsrc/EncDec/LibItsSremSsem_Encdec.cc | 88 +- ccsrc/EncDec/LibItsVru_Encdec.cc | 42 +- .../ConfigRsuSimulatorCodec.cc | 10 +- .../ConfigRsuSimulatorCodec.hh | 4 +- .../ConfigRsuSimulatorLayer.cc | 238 ++--- .../ConfigRsuSimulatorLayer.hh | 60 +- .../Rtcmem_ports/AdapterControlPort_Rtcmem.cc | 4 +- .../LibIts_ports/Rtcmem_ports/RtcmemPort.cc | 8 +- .../AdapterControlPort_SremSsem.cc | 4 +- .../SremSsem_ports/SremSsemPort.cc | 10 +- ccsrc/Ports/LibIts_ports/UpperTesterPort.hh | 4 +- ccsrc/Protocols/AVM/avm_pdu_codec.cc | 28 - ccsrc/Protocols/AVM/avm_pdu_codec.hh | 31 - ccsrc/Protocols/AVM/mim_codec.cc | 33 +- ccsrc/Protocols/AVM/mim_codec.hh | 8 +- ccsrc/Protocols/AVM/module.mk | 2 +- ccsrc/Protocols/AVM/mvm_codec.cc | 34 +- ccsrc/Protocols/AVM/mvm_codec.hh | 9 +- ccsrc/Protocols/AVM_layers/avm_layer.cc | 28 +- ccsrc/Protocols/AVM_layers/avm_layer.hh | 4 +- ccsrc/Protocols/BTP/btp_codec.cc | 12 +- ccsrc/Protocols/BTP/btp_codec.hh | 4 +- ccsrc/Protocols/BTP_layers/btp_layer.cc | 18 +- ccsrc/Protocols/BTP_layers/btp_layer.hh | 4 +- ccsrc/Protocols/CAM/cam_codec.cc | 34 +- ccsrc/Protocols/CAM/cam_codec.hh | 9 +- ccsrc/Protocols/CAM/cam_pdu_codec.cc | 16 - ccsrc/Protocols/CAM/cam_pdu_codec.hh | 19 - ccsrc/Protocols/CAM/module.mk | 2 +- ccsrc/Protocols/CAM_layers/cam_layer.cc | 18 +- ccsrc/Protocols/CAM_layers/cam_layer.hh | 4 +- ccsrc/Protocols/CPS/cps_codec.cc | 35 +- ccsrc/Protocols/CPS/cps_codec.hh | 8 +- ccsrc/Protocols/CPS/cps_pdu_codec.cc | 16 - ccsrc/Protocols/CPS/cps_pdu_codec.hh | 19 - ccsrc/Protocols/CPS/module.mk | 2 +- ccsrc/Protocols/CPS_layers/cps_layer.cc | 16 +- ccsrc/Protocols/CPS_layers/cps_layer.hh | 4 +- .../Protocols/Commsignia/commsignia_layer.cc | 4 +- .../Protocols/Commsignia/commsignia_layer.hh | 4 +- ccsrc/Protocols/DENM/denm_codec.cc | 27 +- ccsrc/Protocols/DENM/denm_codec.hh | 8 +- ccsrc/Protocols/DENM/denm_pdu_codec.cc | 16 - ccsrc/Protocols/DENM/denm_pdu_codec.hh | 22 - ccsrc/Protocols/DENM/module.mk | 2 +- ccsrc/Protocols/DENM_layers/denm_layer.cc | 18 +- ccsrc/Protocols/DENM_layers/denm_layer.hh | 4 +- .../GeoNetworking/geonetworking_codec.cc | 40 +- .../GeoNetworking/geonetworking_codec.hh | 4 +- .../GeoNetworking/geonetworking_layer.cc | 74 +- .../GeoNetworking/geonetworking_layer.hh | 16 +- ccsrc/Protocols/IVIM/ivim_codec.cc | 35 +- ccsrc/Protocols/IVIM/ivim_codec.hh | 8 +- ccsrc/Protocols/IVIM/ivim_pdu_codec.cc | 16 - ccsrc/Protocols/IVIM/ivim_pdu_codec.hh | 17 - ccsrc/Protocols/IVIM/module.mk | 2 +- ccsrc/Protocols/IVIM_layers/ivim_layer.cc | 18 +- ccsrc/Protocols/IVIM_layers/ivim_layer.hh | 4 +- ccsrc/Protocols/LTE/lte_layer.cc | 16 +- ccsrc/Protocols/LTE/lte_layer.hh | 4 +- ccsrc/Protocols/LTE/lte_udp_layer.cc | 8 +- ccsrc/Protocols/LTE/lte_udp_layer.hh | 2 +- ccsrc/Protocols/LTE/uu_amqp.cc | 4 +- ccsrc/Protocols/LTE/uu_amqp.hh | 2 +- ccsrc/Protocols/LTE/uu_mqtt.cc | 4 +- ccsrc/Protocols/LTE/uu_mqtt.hh | 2 +- ccsrc/Protocols/LTE/uu_raw.cc | 4 +- ccsrc/Protocols/LTE/uu_raw.hh | 2 +- ccsrc/Protocols/MapemSpatem/mapem_codec.cc | 33 +- ccsrc/Protocols/MapemSpatem/mapem_codec.hh | 9 +- .../Protocols/MapemSpatem/mapem_pdu_codec.cc | 16 - .../Protocols/MapemSpatem/mapem_pdu_codec.hh | 14 - ccsrc/Protocols/MapemSpatem/module.mk | 2 +- ccsrc/Protocols/MapemSpatem/spatem_codec.cc | 33 +- ccsrc/Protocols/MapemSpatem/spatem_codec.hh | 9 +- .../Protocols/MapemSpatem/spatem_pdu_codec.cc | 16 - .../Protocols/MapemSpatem/spatem_pdu_codec.hh | 14 - .../MapemSpatem_layers/mapem_spatem_layer.cc | 24 +- .../MapemSpatem_layers/mapem_spatem_layer.hh | 4 +- ccsrc/Protocols/PIM/module.mk | 2 +- ccsrc/Protocols/PIM/pim_codec.cc | 33 +- ccsrc/Protocols/PIM/pim_codec.hh | 12 +- ccsrc/Protocols/PIM/pim_pdu_codec.cc | 16 - ccsrc/Protocols/PIM/pim_pdu_codec.hh | 19 - ccsrc/Protocols/PIM_layers/pim_layer.cc | 18 +- ccsrc/Protocols/PIM_layers/pim_layer.hh | 4 +- ccsrc/Protocols/Qualcomm/qualcomm_layer.cc | 20 +- ccsrc/Protocols/Qualcomm/qualcomm_layer.hh | 4 +- ccsrc/Protocols/Rtcmem/RtcmemCodec.cc | 39 - ccsrc/Protocols/Rtcmem/RtcmemCodec.hh | 28 - ccsrc/Protocols/Rtcmem/module.mk | 2 +- ccsrc/Protocols/Rtcmem/rtcmem_codec.cc | 30 + ccsrc/Protocols/Rtcmem/rtcmem_codec.hh | 23 + .../{RtcmemTypes.hh => rtcmem_types.hh} | 0 ccsrc/Protocols/Rtcmem_layers/module.mk | 2 +- .../{RtcmemLayer.cc => rtcmem_layer.cc} | 48 +- .../{RtcmemLayer.hh => rtcmem_layer.hh} | 20 +- ...ayerFactory.hh => rtcmem_layer_factory.hh} | 14 +- ccsrc/Protocols/SAEM/module.mk | 2 +- ccsrc/Protocols/SAEM/saem_codec.cc | 34 +- ccsrc/Protocols/SAEM/saem_codec.hh | 8 +- ccsrc/Protocols/SAEM/saem_pdu_codec.cc | 16 - ccsrc/Protocols/SAEM/saem_pdu_codec.hh | 19 - ccsrc/Protocols/SAEM_layers/saem_layer.cc | 18 +- ccsrc/Protocols/SAEM_layers/saem_layer.hh | 4 +- .../etsi_ts103097_certificate_codec.cc | 9 +- .../etsi_ts103097_certificate_codec.hh | 13 - .../Security/etsi_ts103097_data_codec.cc | 9 +- .../Security/etsi_ts103097_data_codec.hh | 14 - ...i_ts103097_tobesigned_certificate_codec.cc | 22 +- ...i_ts103097_tobesigned_certificate_codec.hh | 14 - .../etsi_ts103097_tobesigned_data_codec.cc | 21 +- .../etsi_ts103097_tobesigned_data_codec.hh | 14 - ccsrc/Protocols/SremSsem/SremCodec.cc | 39 - ccsrc/Protocols/SremSsem/SremCodec.hh | 28 - ccsrc/Protocols/SremSsem/SsemCodec.cc | 39 - ccsrc/Protocols/SremSsem/SsemCodec.hh | 28 - ccsrc/Protocols/SremSsem/module.mk | 2 +- ccsrc/Protocols/SremSsem/srem_codec.cc | 30 + ccsrc/Protocols/SremSsem/srem_codec.hh | 23 + .../{SremSsemTypes.hh => srem_ssem_types.hh} | 0 ccsrc/Protocols/SremSsem/ssem_codec.cc | 30 + ccsrc/Protocols/SremSsem/ssem_codec.hh | 24 + ccsrc/Protocols/SremSsem_layers/module.mk | 2 +- .../{SremSsemLayer.cc => srem_ssem_layer.cc} | 64 +- .../{SremSsemLayer.hh => srem_ssem_layer.hh} | 20 +- ...rFactory.hh => srem_ssem_layer_factory.hh} | 14 +- .../{SremSsemTypes.hh => srem_ssem_types.hh} | 0 .../UpperTester/UpperTesterRtcmemCodec.cc | 36 +- .../UpperTester/UpperTesterRtcmemCodec.hh | 10 +- .../UpperTester/UpperTesterSremSsemCodec.cc | 52 +- .../UpperTester/UpperTesterSremSsemCodec.hh | 12 +- .../UpperTester/UpperTesterSremSsemLayer.cc | 12 +- .../UpperTester/uppertester_avm_codec.cc | 42 +- .../UpperTester/uppertester_avm_codec.hh | 12 +- .../UpperTester/uppertester_avm_layer.cc | 12 +- .../UpperTester/uppertester_avm_layer.hh | 4 +- .../UpperTester/uppertester_cam_codec.cc | 42 +- .../UpperTester/uppertester_cam_codec.hh | 12 +- .../UpperTester/uppertester_cam_layer.cc | 12 +- .../UpperTester/uppertester_cam_layer.hh | 4 +- .../UpperTester/uppertester_cps_codec.cc | 46 +- .../UpperTester/uppertester_cps_codec.hh | 16 +- .../UpperTester/uppertester_cps_layer.cc | 12 +- .../UpperTester/uppertester_cps_layer.hh | 4 +- .../UpperTester/uppertester_denm_codec.cc | 32 +- .../UpperTester/uppertester_denm_codec.hh | 10 +- .../uppertester_geonetworking_codec.cc | 50 +- .../uppertester_geonetworking_codec.hh | 12 +- .../uppertester_geonetworking_layer.cc | 12 +- .../uppertester_geonetworking_layer.hh | 4 +- .../UpperTester/uppertester_ivim_codec.cc | 32 +- .../UpperTester/uppertester_ivim_codec.hh | 10 +- .../UpperTester/uppertester_ivim_layer.cc | 12 +- .../UpperTester/uppertester_ivim_layer.hh | 4 +- .../uppertester_mapem_spatem_codec.cc | 40 +- .../uppertester_mapem_spatem_codec.hh | 12 +- .../UpperTester/uppertester_mbr_codec.cc | 28 +- .../UpperTester/uppertester_mbr_codec.hh | 10 +- .../UpperTester/uppertester_mbr_layer.cc | 12 +- .../UpperTester/uppertester_mbr_layer.hh | 4 +- .../UpperTester/uppertester_pim_codec.cc | 40 +- .../UpperTester/uppertester_pim_codec.hh | 12 +- .../UpperTester/uppertester_pim_layer.cc | 12 +- .../UpperTester/uppertester_pim_layer.hh | 4 +- .../UpperTester/uppertester_pki_codec.cc | 30 +- .../UpperTester/uppertester_pki_codec.hh | 10 +- .../UpperTester/uppertester_pki_layer.cc | 12 +- .../UpperTester/uppertester_pki_layer.hh | 4 +- .../UpperTester/uppertester_saem_codec.cc | 40 +- .../UpperTester/uppertester_saem_codec.hh | 12 +- .../UpperTester/uppertester_saem_layer.cc | 12 +- .../UpperTester/uppertester_saem_layer.hh | 4 +- .../UpperTester/uppertester_vru_codec.cc | 38 +- .../UpperTester/uppertester_vru_codec.hh | 14 +- .../UpperTester/uppertester_vru_layer.cc | 12 +- .../UpperTester/uppertester_vru_layer.hh | 4 +- ccsrc/Protocols/VRU/module.mk | 2 +- ccsrc/Protocols/VRU/vru_codec.cc | 35 +- ccsrc/Protocols/VRU/vru_codec.hh | 8 +- ccsrc/Protocols/VRU/vru_pdu_codec.cc | 16 - ccsrc/Protocols/VRU/vru_pdu_codec.hh | 19 - ccsrc/Protocols/VRU_layers/vru_layer.cc | 18 +- ccsrc/Protocols/VRU_layers/vru_layer.hh | 4 +- config.mk | 6 +- etc/AtsCAM/AtsCAM.cfg | 2 +- install.sh | 2 + libasn1.mk | 129 --- titan-test-system-framework | 2 +- ttcn/AtsCPS | 2 +- ttcn/AtsMBR | 2 +- ttcn/AtsPIM | 2 +- ttcn/AtsPki | 2 +- ttcn/AtsSAEM | 2 +- ttcn/AtsSecurity | 2 +- 216 files changed, 2308 insertions(+), 3038 deletions(-) delete mode 100644 ccsrc/Asn1c/asn1_recoder.cc delete mode 100644 ccsrc/Asn1c/asn1_recoder.hh delete mode 100644 ccsrc/Asn1c/module.mk delete mode 100644 ccsrc/Asn1c/oer_codec.hh delete mode 100644 ccsrc/Asn1c/per_codec.hh delete mode 100644 ccsrc/Protocols/AVM/avm_pdu_codec.cc delete mode 100644 ccsrc/Protocols/AVM/avm_pdu_codec.hh delete mode 100644 ccsrc/Protocols/CAM/cam_pdu_codec.cc delete mode 100644 ccsrc/Protocols/CAM/cam_pdu_codec.hh delete mode 100644 ccsrc/Protocols/CPS/cps_pdu_codec.cc delete mode 100644 ccsrc/Protocols/CPS/cps_pdu_codec.hh delete mode 100644 ccsrc/Protocols/DENM/denm_pdu_codec.cc delete mode 100644 ccsrc/Protocols/DENM/denm_pdu_codec.hh delete mode 100644 ccsrc/Protocols/IVIM/ivim_pdu_codec.cc delete mode 100644 ccsrc/Protocols/IVIM/ivim_pdu_codec.hh delete mode 100644 ccsrc/Protocols/MapemSpatem/mapem_pdu_codec.cc delete mode 100644 ccsrc/Protocols/MapemSpatem/mapem_pdu_codec.hh delete mode 100644 ccsrc/Protocols/MapemSpatem/spatem_pdu_codec.cc delete mode 100644 ccsrc/Protocols/MapemSpatem/spatem_pdu_codec.hh delete mode 100644 ccsrc/Protocols/PIM/pim_pdu_codec.cc delete mode 100644 ccsrc/Protocols/PIM/pim_pdu_codec.hh delete mode 100644 ccsrc/Protocols/Rtcmem/RtcmemCodec.cc delete mode 100644 ccsrc/Protocols/Rtcmem/RtcmemCodec.hh create mode 100644 ccsrc/Protocols/Rtcmem/rtcmem_codec.cc create mode 100644 ccsrc/Protocols/Rtcmem/rtcmem_codec.hh rename ccsrc/Protocols/Rtcmem/{RtcmemTypes.hh => rtcmem_types.hh} (100%) rename ccsrc/Protocols/Rtcmem_layers/{RtcmemLayer.cc => rtcmem_layer.cc} (66%) rename ccsrc/Protocols/Rtcmem_layers/{RtcmemLayer.hh => rtcmem_layer.hh} (60%) rename ccsrc/Protocols/Rtcmem_layers/{RtcmemLayerFactory.hh => rtcmem_layer_factory.hh} (64%) delete mode 100644 ccsrc/Protocols/SAEM/saem_pdu_codec.cc delete mode 100644 ccsrc/Protocols/SAEM/saem_pdu_codec.hh delete mode 100644 ccsrc/Protocols/SremSsem/SremCodec.cc delete mode 100644 ccsrc/Protocols/SremSsem/SremCodec.hh delete mode 100644 ccsrc/Protocols/SremSsem/SsemCodec.cc delete mode 100644 ccsrc/Protocols/SremSsem/SsemCodec.hh create mode 100644 ccsrc/Protocols/SremSsem/srem_codec.cc create mode 100644 ccsrc/Protocols/SremSsem/srem_codec.hh rename ccsrc/Protocols/SremSsem/{SremSsemTypes.hh => srem_ssem_types.hh} (100%) create mode 100644 ccsrc/Protocols/SremSsem/ssem_codec.cc create mode 100644 ccsrc/Protocols/SremSsem/ssem_codec.hh rename ccsrc/Protocols/SremSsem_layers/{SremSsemLayer.cc => srem_ssem_layer.cc} (71%) rename ccsrc/Protocols/SremSsem_layers/{SremSsemLayer.hh => srem_ssem_layer.hh} (68%) rename ccsrc/Protocols/SremSsem_layers/{SremSsemLayerFactory.hh => srem_ssem_layer_factory.hh} (63%) rename ccsrc/Protocols/SremSsem_layers/{SremSsemTypes.hh => srem_ssem_types.hh} (100%) delete mode 100644 ccsrc/Protocols/VRU/vru_pdu_codec.cc delete mode 100644 ccsrc/Protocols/VRU/vru_pdu_codec.hh delete mode 100644 libasn1.mk diff --git a/Makefile b/Makefile index c4af7f9..c59e48d 100644 --- a/Makefile +++ b/Makefile @@ -12,20 +12,14 @@ ifeq (,$(TOPDIR)) TOPDIR := . endif -ifeq (,$(TTCN3_DIR)) - $(error TTCN3_DIR shall be defined in config.mk) +ifeq (,$(TOP_DIR)) + TOP_DIR := . endif -ifeq (,$(ASN1C)) - ifneq (,$(ASN1C_PATH)) - ASN1C := $(ASN1C_PATH)/asn1c/.libs/asn1c -S $(ASN1C_PATH)/skeletons - else - ASN1C := asn1c - endif +ifeq (,$(TTCN3_DIR)) + $(error TTCN3_DIR shall be defined in config.mk) endif -export ASN1C_PATH - first: all define IncludeModule @@ -56,8 +50,8 @@ endif libs += -lssl -lcrypto -lxml2 -ljsoncpp -lzip -bindir := $(TOPDIR)/bin outdir := $(TOPDIR)/build/$(ATS) +bindir := $(TOPDIR)/bin $(eval $(call IncludeModule, $(TOPDIR)/ttcn/$(ATS))) @@ -93,9 +87,9 @@ cc_objects := $(patsubst %.cc, $(outdir)/%.o, $(cc_sources)) outbin = $(bindir)/$(ATS)$(SUB_ATS)$(EXE) -.PHONY: all FORCE echo postamble +.PHONY: all FORCE echo -all: $(bindir) $(outdir) $(outbin) postamble +all: $(bindir) $(outdir) $(outbin) echo_sources: @echo -e "$(addsuffix \n,$(all_sources))" @@ -109,8 +103,7 @@ echo: echo_sources @echo -e "defines: $(addsuffix \n, $(defines))" clean: - rm -f $(outbin) $(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 + rm -f $(outbin) $(gen_objects) $(gen_sources) $(gen_headers) $(cc_objects) $(outdir)/.generate regen: force_regen $(outdir)/.generate force_regen: @@ -128,18 +121,18 @@ t3d: all @echo -e "TTCN-3 doc generation done..." @echo -e "Output file is located here: $(outdir)/t3d.out" -$(outdir) $(outdir)/asn1 $(bindir): +$(outdir) $(outdir)/asn1 $(bindir): $(TOP_DIR)/./build/asn1/ISO_TS_17419/CITSapplMgmtIDs.asn $(TOP_DIR)/./build/asn1/ISO_TS_17419/CITSapplMgmtIDs.asn $(TOP_DIR)/./build/asn1/ISO_TS_19091/ISO-TS-19091-addgrp-C-2018-patched.asn $(TOP_DIR)/./build/asn1/ISO_TS_17419/CITSdataDictionary1.asn $(TOP_DIR)/./build/asn1/ISO_TS_17419/CITSdataDictionary2.asn mkdir -p $@ -$(outbin): $(outdir)/asn1/libItsAsn.a $(gen_objects) $(cc_objects) - g++ -g -O0 -std=c++17 -o $@ $(LDFLAGS) $(gen_objects) $(cc_objects) $(outdir)/asn1/libItsAsn.a $(libs) +$(outbin): $(gen_objects) $(cc_objects) + g++ -g -O0 -std=c++17 -o $@ $(LDFLAGS) $(gen_objects) $(cc_objects) $(libs) $(gen_objects) :%.o :%.cc - g++ -g -O0 -std=c++17 -c $(addprefix -D, $(defines)) $(addprefix -I, $(includes)) -o $@ $< + g++ -g -O0 -std=c++17 -Wno-long-long -flarge-source-files -Wmisleading-indentation -fPIC -c $(addprefix -D, $(defines)) $(addprefix -I, $(includes)) -o $@ $< $(cc_objects) : $(outdir)/%.o : %.cc mkdir -p $(dir $@) - g++ -g -O0 -std=c++17 -c $(addprefix -D, $(defines)) $(addprefix -I, $(includes)) -o $@ $< + g++ -g -O0 -std=c++17 -Wno-long-long -flarge-source-files -Wmisleading-indentation -fPIC -c $(addprefix -D, $(defines)) $(addprefix -I, $(includes)) -o $@ $< #$(gen_sources): # $(TTCN3_DIR)/bin/compiler -n -e -L -R -U none -o $(outdir) $(tt_sources) @@ -150,25 +143,58 @@ $(outdir)/.generate: Makefile $(tt_sources) $(TTCN3_DIR)/bin/compiler $(TTCN3_COMPILER_OPTIONS) -o $(outdir) $(tt_sources) touch $@ -$(bindir)/libItsAsn.so: $(outdir)/asn1/libItsAsn.so - cp -f $< $@ - -$(outdir)/asn1/libItsAsn.a: $(asn_sources) $(asn1_sources) libasn1.mk Makefile - mkdir -p $(outdir)/asn1 - echo TOP_DIR := ../../.. >$(outdir)/asn1/Makefile - echo ASN_PDU := $(pdu) >>$(outdir)/asn1/Makefile - echo ASN_FILES := \\ >>$(outdir)/asn1/Makefile - for n in $(asn_sources) $(asn1_sources); do echo " $$n \\"; done >>$(outdir)/asn1/Makefile - echo >>$(outdir)/asn1/Makefile - cat libasn1.mk >>$(outdir)/asn1/Makefile - $(MAKE) -C $(outdir)/asn1 - touch $@ - $(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))) -$(asn_sources) $(asn1_sources): +#$(asn_sources) $(asn1_sources): + +$(TOP_DIR)/./build/asn1/ISO_TS_14816/AVIAEINumberingAndDataStructures.asn: + mkdir -p "$(dir $@)" + curl 'https://standards.iso.org/iso/14816/ISO14816%20ASN.1%20repository/ISO14816_AVIAEINumberingAndDataStructures.asn' | \ + sed -e 's/IssuerIdentifier/AVIAEIIssuerIdentifier/g' > "$@" + +#$(TOP_DIR)/./build/asn1/ISO_TS_14906/EfcDsrcApplication.asn: +# mkdir -p "$(dir $@)" +# curl -o "$@" 'https://standards.iso.org/iso/14906/ed-3/en/ISO14906(2018)EfcDsrcApplicationv6.asn' + +#$(TOP_DIR)/./build/asn1/ISO_TS_14906/EfcDsrcGeneric.asn: +# mkdir -p "$(dir $@) +# curl -o "$@" 'https://standards.iso.org/iso/14906/ed-3/en/ISO14906(2018)EfcDsrcGenericv7.asn' + +#$(TOP_DIR)/./build/asn1/ISO_TS_ISO17573_3/EfcDataDictionary.asn: +# mkdir -p "$(dir $@) +# curl -o "$@" 'https://standards.iso.org/iso/17573/-3/ed-1/en/ISO17573-3(2023)EfcDataDictionaryV1.3.asn' + +$(TOP_DIR)/./build/asn1/ISO_TS_17419/CITSapplMgmtIDs.asn: + mkdir -p "$(dir $@)" + curl -o "$@" 'https://standards.iso.org/iso/ts/17419/TS%2017419%20ASN.1%20repository/TS17419_2014_CITSapplMgmtIDs.asn' + +$(TOP_DIR)/./build/asn1/ISO_TS_19091/ISO-TS-19091-addgrp-C-2018-patched.asn: + mkdir -p "$(dir $@)" + curl 'https://standards.iso.org/iso/ts/19091/ed-2/en/ISO-TS-19091-addgrp-C-2018.asn' | \ + sed -e 's/\bHeadingConfidence\b/HeadingConfidenceDSRC/g' \ + -e 's/\bSpeedConfidence\b/SpeedConfidenceDSRC/g' \ + -e 's/\bHeading\b/HeadingDSRC/g' > "$@" + +$(TOP_DIR)/./build/asn1/ISO_TS_17419/CITSdataDictionary1.asn: + mkdir -p "$(dir $@)" + curl -o "$@" 'https://standards.iso.org/iso/17419/ed-1/en/17419.1.asn' + +$(TOP_DIR)/./build/asn1/ISO_TS_17419/CITSdataDictionary2.asn: + mkdir -p "$(dir $@)" + curl -o "$@" 'https://standards.iso.org/iso/17419/ed-1/en/17419.2.asn' + +#$(TOP_DIR)/./build/asn1/ISO_TS_19321/IVI.asn: +# mkdir -p "$(dir $@)" +# curl -o "$@" 'https://standards.iso.org/iso/ts/19321/ed-3/en/ISO_CD%20TS%2019321%20ed.3%20-%20id.82956%20Approval%20ISO19321IVIv3.1.asn' + +#$(TOP_DIR)/./build/asn1/ISO_TS_19321/IVI-IS.asn: +# mkdir -p "$(dir $@)" +# curl -o "$@" 'https://standards.iso.org/iso/ts/19321/ed-3/en/ISO_CD%20TS%2019321%20ed.3%20-%20id.82956%20Approval%20ISO19321IVI-IS.asn' + +#$(TOP_DIR)/build/asn1/ISO_TS_24534-3/ElectronicRegistrationIdentificationVehicleDataModule.asn: +# mkdir -p "$(dir $@)" +# curl -o "$@" 'https://standards.iso.org/iso/24534/-3/ISO%2024534-3%20ASN.1%20repository/ISO24534-3_ElectronicRegistrationIdentificationVehicleDataModule_ForBallot.asn' -postamble: diff --git a/README.md b/README.md index 4f6263e..80cd800 100644 --- a/README.md +++ b/README.md @@ -289,13 +289,12 @@ Procedure: - $HOME/dev - $HOME/lib - In $HOME/frameworks, build the following package: - - asn1c, according the procedure specified [here](https://github.com/fillabs/asn1c.git) - TITAN, according the procedure specified [here](https://github.com/eclipse/titan.core) - Clone the ETSI ITS protocols project into $HOME/dev folder ```sh -$ git clone --recurse-submodules --branch=TTF_T036 https://forge.etsi.org/gitlab/ITS/TS.ITS.git TS.ITS.TTF_T036 +$ git clone --recurse-submodules --branch=TTF_T05x https://forge.etsi.org/gitlab/ITS/TS.ITS.git TS.ITS.TTF_T05x ``` - Execute the script install.sh diff --git a/TS.ITS.TTF_T05x.code-workspace b/TS.ITS.TTF_T05x.code-workspace index 4713868..d1804e5 100644 --- a/TS.ITS.TTF_T05x.code-workspace +++ b/TS.ITS.TTF_T05x.code-workspace @@ -5,6 +5,9 @@ }, { "path": "../../frameworks/titan/titan.core" + }, + { + "path": "../TS.ITS.TTF_T036" } ] } \ No newline at end of file diff --git a/TS.ITS.tpd b/TS.ITS.tpd index 3685372..6b16223 100644 --- a/TS.ITS.tpd +++ b/TS.ITS.tpd @@ -1078,8 +1078,8 @@ - - + + @@ -1096,8 +1096,8 @@ - - + + @@ -1522,10 +1522,10 @@ - - - - + + + + @@ -1583,10 +1583,10 @@ - - - - + + + + diff --git a/ccsrc/Asn1c/asn1_recoder.cc b/ccsrc/Asn1c/asn1_recoder.cc deleted file mode 100644 index ea532a9..0000000 --- a/ccsrc/Asn1c/asn1_recoder.cc +++ /dev/null @@ -1,51 +0,0 @@ -#include - -#include "asn1_recoder.hh" - -#include - -extern "C" { -static int asn1c_collect_encoded_data(const void *buffer, size_t size, void *application_specific_key) { - TTCN_Buffer *tb = (TTCN_Buffer *)application_specific_key; - tb->put_s(size, (unsigned char *)buffer); - return 0; -} -} - -int asn1_recoder::recode(const asn_TYPE_descriptor_s &td, int from, int to, TTCN_Buffer &buf) { - int rc = -1; - void * ptr = NULL; - asn_dec_rval_t rc_d; - rc_d = asn_decode(NULL, (asn_transfer_syntax)from, (asn_TYPE_descriptor_s *)&td, &ptr, buf.get_data(), buf.get_len()); - if (rc_d.code == RC_OK) { - // Encode as PER - asn_enc_rval_t rc_e; - buf.clear(); - rc_e = asn_encode(NULL, (asn_transfer_syntax)to, (asn_TYPE_descriptor_s *)&td, ptr, asn1c_collect_encoded_data, &buf); - rc = rc_e.encoded; - } - if (ptr) { - ASN_STRUCT_FREE(td, ptr); - } - return rc; -} - -int asn1_recoder::ber2per(const asn_TYPE_descriptor_s &td, TTCN_Buffer &buf) -{ - return recode(td, (int)ATS_BER, (int)ATS_UNALIGNED_CANONICAL_PER, buf); -} - -int asn1_recoder::per2ber(const asn_TYPE_descriptor_s &td, TTCN_Buffer &buf) -{ - return recode(td, (int)ATS_UNALIGNED_BASIC_PER, (int)ATS_DER, buf); -} - -int asn1_recoder::ber2oer(const asn_TYPE_descriptor_s & td, TTCN_Buffer & buf) -{ - return recode(td, (int)ATS_BER, (int)ATS_CANONICAL_OER, buf); -} - -int asn1_recoder::oer2ber(const asn_TYPE_descriptor_s & td, TTCN_Buffer & buf) -{ - return recode(td, (int)ATS_BASIC_OER, (int)ATS_BER, buf); -} diff --git a/ccsrc/Asn1c/asn1_recoder.hh b/ccsrc/Asn1c/asn1_recoder.hh deleted file mode 100644 index 7592e23..0000000 --- a/ccsrc/Asn1c/asn1_recoder.hh +++ /dev/null @@ -1,29 +0,0 @@ -/*! - * \file asn1_recode_per.hh - * \brief Header file ASN.1 PER codec based on asn1c external tool. - * \author ETSI STF525 - * \copyright ETSI Copyright Notification - * No part may be reproduced except as authorized by written permission. - * The copyright and the foregoing restriction extend to reproduction in all media. - * All rights reserved. - * \version 0.1 - */ -#pragma once - -class OCTETSTRING; //! Forward declaration of TITAN class -class CHARSTRING; //! Forward declaration of TITAN class -class BITSTRING; //! Forward declaration of TITAN class -class TTCN_Buffer; //! Forward declaration of TITAN class -class TTCN_EncDec; //! Forward declaration of TITAN class -class TTCN_Typedescriptor_t; //! Forward declaration of TITAN class - -struct asn_TYPE_descriptor_s; //! Forward declaration of asn1c class - -class asn1_recoder { -protected: - int ber2per(const asn_TYPE_descriptor_s &td, TTCN_Buffer &buf); - int per2ber(const asn_TYPE_descriptor_s &td, TTCN_Buffer &buf); - int ber2oer(const asn_TYPE_descriptor_s &td, TTCN_Buffer &buf); - int oer2ber(const asn_TYPE_descriptor_s &td, TTCN_Buffer &buf); - int recode(const asn_TYPE_descriptor_s &td, int from, int to, TTCN_Buffer &buf); -}; // End of class asn1_recode_per diff --git a/ccsrc/Asn1c/module.mk b/ccsrc/Asn1c/module.mk deleted file mode 100644 index 226091a..0000000 --- a/ccsrc/Asn1c/module.mk +++ /dev/null @@ -1,3 +0,0 @@ -sources := asn1_recoder.cc -includes := . - diff --git a/ccsrc/Asn1c/oer_codec.hh b/ccsrc/Asn1c/oer_codec.hh deleted file mode 100644 index 24c14d9..0000000 --- a/ccsrc/Asn1c/oer_codec.hh +++ /dev/null @@ -1,42 +0,0 @@ -#pragma once - -#include "params.hh" -#include "asn1_recoder.hh" - -class OCTETSTRING; -class CHARSTRING; -class BITSTRING; - -struct asn_TYPE_descriptor_s; - -template class oer_codec : public asn1_recoder -{ -public: - virtual int encode(const TPDU& msg, BITSTRING& bits) = 0; - virtual int decode(const BITSTRING& bits, TPDU& msg) = 0; - -protected: - inline int _decode (const TTCN_Typedescriptor_t& ttcn, const asn_TYPE_descriptor_s & td, const BITSTRING& p_data, TPDU& msg) { - TTCN_Buffer buf(bit2oct(p_data)); - TTCN_EncDec::set_error_behavior(TTCN_EncDec::ET_ALL, TTCN_EncDec::EB_WARNING); - int rc = oer2xer (td, buf); - if (rc > 0) { - msg.decode(ttcn, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - rc = buf.get_len(); - } - return rc; - } - inline int _encode (const TTCN_Typedescriptor_t& ttcn, const asn_TYPE_descriptor_s & td, const TPDU& msg, BITSTRING& p_data) { - int rc = -1; - TTCN_Buffer buf; - TTCN_EncDec::set_error_behavior(TTCN_EncDec::ET_ALL, TTCN_EncDec::EB_WARNING); - msg.encode(ttcn, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - if (buf.get_len() > 0) { - rc = xer2oer (td, buf); - if (rc > 0) { - p_data = oct2bit(OCTETSTRING(buf.get_len(), buf.get_data())); - } - } - return rc; - } -}; diff --git a/ccsrc/Asn1c/per_codec.hh b/ccsrc/Asn1c/per_codec.hh deleted file mode 100644 index 0ffc5e1..0000000 --- a/ccsrc/Asn1c/per_codec.hh +++ /dev/null @@ -1,80 +0,0 @@ -/*! - * \file per_codec.hh - * \brief Header file for TITAN message to ASN.1 PER message codec. - * \author ETSI STF525 - * \copyright ETSI Copyright Notification - * No part may be reproduced except as authorized by written permission. - * The copyright and the foregoing restriction extend to reproduction in all media. - * All rights reserved. - * \version 0.1 - */ -#pragma once - -#include "params.hh" -#include "asn1_recoder.hh" - -class BITSTRING; //! Forward declaration of TITAN class -class TTCN_Typedescriptor_t; //! Forward declaration of TITAN class - -struct asn_TYPE_descriptor_s; //! Declare asn1c class - -/*! - * \class per_codec - * \brief This class provides the interface for all ASN.1 PER codecs. - * \remark This class uses asn1c external tool - */ -template -class per_codec : public asn1_recoder -{ -public: //! \publicsection - /*! - * \fn int encode(const TPDU& p_message, BITSTRING& p_bitstring); - * \brief Encode TITAN message into ASN.1 PER message - * \param[in] p_message The PDU message to encode - * \param[out] p_bitstring The encoded PDU message in bit string format - * \pure - */ - virtual int encode(const TPDU& p_message, BITSTRING& p_bitstring) = 0; - /*! - * \fn int decode(const BITSTRING& p_bitstring, TPDU& p_message); - * \brief Decode ASN.1 PER message into TITAN message - * \param[in] p_bitstring The network message in bit string format to decode - * \param[out] p_message The PDU message - * \pure - */ - virtual int decode(const BITSTRING& p_bitstring, TPDU& p_message) = 0; - -protected: //! \protectedsection - int _decode (const TTCN_Typedescriptor_t& ttcn, const asn_TYPE_descriptor_s & td, const BITSTRING& p_data, TPDU& msg); - int _encode (const TTCN_Typedescriptor_t& ttcn, const asn_TYPE_descriptor_s & td, const TPDU& msg, BITSTRING& p_data); -}; // End of class per_codec - -#include - -template -int per_codec::_decode (const TTCN_Typedescriptor_t& ttcn, const asn_TYPE_descriptor_s & td, const BITSTRING& p_data, TPDU& msg) { - TTCN_Buffer buf(bit2oct(p_data)); - TTCN_EncDec::set_error_behavior(TTCN_EncDec::ET_ALL, TTCN_EncDec::EB_WARNING); - int rc = per2ber (td, buf); - if (rc > 0) { - msg.decode(ttcn, buf, TTCN_EncDec::CT_BER, BER_ACCEPT_ALL); - rc = buf.get_len(); - } - return rc; -} - -template -int per_codec::_encode (const TTCN_Typedescriptor_t& ttcn, const asn_TYPE_descriptor_s & td, const TPDU& msg, BITSTRING& p_data) { - int rc = -1; - TTCN_Buffer buf; - TTCN_EncDec::set_error_behavior(TTCN_EncDec::ET_ALL, TTCN_EncDec::EB_WARNING); - msg.encode(ttcn, buf, TTCN_EncDec::CT_BER, BER_ENCODE_DER); - if (buf.get_len() > 0) { - rc = ber2per (td, buf); - if (rc > 0) { - p_data = oct2bit(OCTETSTRING(buf.get_len(), buf.get_data())); - } - } - return rc; -} - diff --git a/ccsrc/EncDec/LibItsAvm_Encdec.cc b/ccsrc/EncDec/LibItsAvm_Encdec.cc index 43cba0e..cfb4258 100644 --- a/ccsrc/EncDec/LibItsAvm_Encdec.cc +++ b/ccsrc/EncDec/LibItsAvm_Encdec.cc @@ -347,49 +347,49 @@ namespace LibItsAvm__EncdecDeclarations { return 0; } - BITSTRING fx__enc__MVM(const MVM__PDU__Descriptions::MVM &p_cam) { - loggers::get_instance().log_msg(">>> fx__enc__MVM: ", p_cam); - - mvm_codec codec; - OCTETSTRING os; - codec.encode(p_cam, os); - return oct2bit(os); - } - - INTEGER fx__dec__MVM(BITSTRING &b, MVM__PDU__Descriptions::MVM &p) { - loggers::get_instance().log(">>> fx__dec__MVM"); - mvm_codec codec; - OCTETSTRING is = bit2oct(b); - - if (codec.decode(OCTETSTRING(is.lengthof(), static_cast(is)), p) == -1) { - loggers::get_instance().warning("fx__dec__MVM: -1 result code was returned"); - return -1; - } - - return 0; - } - - BITSTRING fx__enc__MIM(const MIM__PDU__Descriptions::MIM &p_cam) { - loggers::get_instance().log_msg(">>> fx__enc__MIM: ", p_cam); - - mim_codec codec; - OCTETSTRING os; - codec.encode(p_cam, os); - return oct2bit(os); - } - - INTEGER fx__dec__MIM(BITSTRING &b, MIM__PDU__Descriptions::MIM &p) { - loggers::get_instance().log(">>> fx__dec__MIM"); - mim_codec codec; - OCTETSTRING is = bit2oct(b); - - if (codec.decode(OCTETSTRING(is.lengthof(), static_cast(is)), p) == -1) { - loggers::get_instance().warning("fx__dec__MIM: -1 result code was returned"); - return -1; - } - - return 0; - } + // BITSTRING fx__enc__MVM(const MVM__PDU__Descriptions::MVM &p_cam) { + // loggers::get_instance().log_msg(">>> fx__enc__MVM: ", p_cam); + + // mvm_codec codec; + // OCTETSTRING os; + // codec.encode(p_cam, os); + // return oct2bit(os); + // } + + // INTEGER fx__dec__MVM(BITSTRING &b, MVM__PDU__Descriptions::MVM &p) { + // loggers::get_instance().log(">>> fx__dec__MVM"); + // mvm_codec codec; + // OCTETSTRING is = bit2oct(b); + + // if (codec.decode(OCTETSTRING(is.lengthof(), static_cast(is)), p) == -1) { + // loggers::get_instance().warning("fx__dec__MVM: -1 result code was returned"); + // return -1; + // } + + // return 0; + // } + + // BITSTRING fx__enc__MIM(const MIM__PDU__Descriptions::MIM &p_cam) { + // loggers::get_instance().log_msg(">>> fx__enc__MIM: ", p_cam); + + // mim_codec codec; + // OCTETSTRING os; + // codec.encode(p_cam, os); + // return oct2bit(os); + // } + + // INTEGER fx__dec__MIM(BITSTRING &b, MIM__PDU__Descriptions::MIM &p) { + // loggers::get_instance().log(">>> fx__dec__MIM"); + // mim_codec codec; + // OCTETSTRING is = bit2oct(b); + + // if (codec.decode(OCTETSTRING(is.lengthof(), static_cast(is)), p) == -1) { + // loggers::get_instance().warning("fx__dec__MIM: -1 result code was returned"); + // return -1; + // } + + // return 0; + // } BITSTRING fx__enc__UtAvmInitialize(const LibItsAvm__TypesAndValues::UtAvmInitialize &p_utAvmInitialize) { loggers::get_instance().log_msg(">>> fx__enc__UtAvmInitialize: ", p_utAvmInitialize); diff --git a/ccsrc/EncDec/LibItsCam_Encdec.cc b/ccsrc/EncDec/LibItsCam_Encdec.cc index ef1d490..da8e06f 100644 --- a/ccsrc/EncDec/LibItsCam_Encdec.cc +++ b/ccsrc/EncDec/LibItsCam_Encdec.cc @@ -173,27 +173,27 @@ namespace LibItsCam__EncdecDeclarations { return 0; } - BITSTRING fx__enc__CAM(const CAM__PDU__Descriptions::CAM &p_cam) { - loggers::get_instance().log_msg(">>> fx__enc__CAM: ", p_cam); - - cam_codec codec; - OCTETSTRING os; - codec.encode(p_cam, os); - return oct2bit(os); - } - - INTEGER fx__dec__CAM(BITSTRING &b, CAM__PDU__Descriptions::CAM &p) { - loggers::get_instance().log(">>> fx__dec__CAM"); - cam_codec codec; - OCTETSTRING is = bit2oct(b); - - if (codec.decode(OCTETSTRING(is.lengthof(), static_cast(is)), p) == -1) { - loggers::get_instance().warning("fx__dec__CAM: -1 result code was returned"); - return -1; - } - - return 0; - } + // BITSTRING fx__enc__CAM(const CAM__PDU__Descriptions::CAM &p_cam) { + // loggers::get_instance().log_msg(">>> fx__enc__CAM: ", p_cam); + + // cam_codec codec; + // OCTETSTRING os; + // codec.encode(p_cam, os); + // return oct2bit(os); + // } + + // INTEGER fx__dec__CAM(BITSTRING &b, CAM__PDU__Descriptions::CAM &p) { + // loggers::get_instance().log(">>> fx__dec__CAM"); + // cam_codec codec; + // OCTETSTRING is = bit2oct(b); + + // if (codec.decode(OCTETSTRING(is.lengthof(), static_cast(is)), p) == -1) { + // loggers::get_instance().warning("fx__dec__CAM: -1 result code was returned"); + // return -1; + // } + + // return 0; + // } BITSTRING fx__enc__UtCamInitialize(const LibItsCam__TypesAndValues::UtCamInitialize &p_utCamInitialize) { loggers::get_instance().log_msg(">>> fx__enc__UtCamInitialize: ", p_utCamInitialize); diff --git a/ccsrc/EncDec/LibItsCps_Encdec.cc b/ccsrc/EncDec/LibItsCps_Encdec.cc index 3ff1d3a..30d47c8 100644 --- a/ccsrc/EncDec/LibItsCps_Encdec.cc +++ b/ccsrc/EncDec/LibItsCps_Encdec.cc @@ -173,27 +173,27 @@ namespace LibItsCps__EncdecDeclarations { return 0; } - BITSTRING fx__enc__CPM(const CPM__PDU__Descriptions::CollectivePerceptionMessage &p_cps) { - loggers::get_instance().log_msg(">>> fx__enc__CPM: ", p_cps); - - cps_codec codec; - OCTETSTRING os; - codec.encode(p_cps, os); - return oct2bit(os); - } - - INTEGER fx__dec__CPM(BITSTRING &b, CPM__PDU__Descriptions::CollectivePerceptionMessage &p) { - loggers::get_instance().log(">>> fx__dec__CPM"); - cps_codec codec; - OCTETSTRING is = bit2oct(b); - - if (codec.decode(OCTETSTRING(is.lengthof(), static_cast(is)), p) == -1) { - loggers::get_instance().warning("fx__dec__CPM: -1 result code was returned"); - return -1; - } - - return 0; - } + // BITSTRING fx__enc__CPM(const CPM__PDU__Descriptions::CollectivePerceptionMessage &p_cps) { + // loggers::get_instance().log_msg(">>> fx__enc__CPM: ", p_cps); + + // cps_codec codec; + // OCTETSTRING os; + // codec.encode(p_cps, os); + // return oct2bit(os); + // } + + // INTEGER fx__dec__CPM(BITSTRING &b, CPM__PDU__Descriptions::CollectivePerceptionMessage &p) { + // loggers::get_instance().log(">>> fx__dec__CPM"); + // cps_codec codec; + // OCTETSTRING is = bit2oct(b); + + // if (codec.decode(OCTETSTRING(is.lengthof(), static_cast(is)), p) == -1) { + // loggers::get_instance().warning("fx__dec__CPM: -1 result code was returned"); + // return -1; + // } + + // return 0; + // } BITSTRING fx__enc__UtCpmInitialize(const LibItsCps__TypesAndValues::UtCpmInitialize &p_utCpmInitialize) { loggers::get_instance().log_msg(">>> fx__enc__UtCpmInitialize: ", p_utCpmInitialize); diff --git a/ccsrc/EncDec/LibItsDenm_Encdec.cc b/ccsrc/EncDec/LibItsDenm_Encdec.cc index 65b4245..838bbb0 100644 --- a/ccsrc/EncDec/LibItsDenm_Encdec.cc +++ b/ccsrc/EncDec/LibItsDenm_Encdec.cc @@ -172,27 +172,27 @@ namespace LibItsDenm__EncdecDeclarations { return 0; } - BITSTRING fx__enc__DENM(const DENM__PDU__Descriptions::DENM &p_denm) { - loggers::get_instance().log_msg(">>> fx__enc__DENM: ", p_denm); - - denm_codec codec; - OCTETSTRING os; - codec.encode(p_denm, os); - return oct2bit(os); - } - - INTEGER fx__dec__DENM(BITSTRING &b, DENM__PDU__Descriptions::DENM &p) { - loggers::get_instance().log(">>> fx__dec__DENM"); - denm_codec codec; - OCTETSTRING is = bit2oct(b); - - if (codec.decode(OCTETSTRING(is.lengthof(), static_cast(is)), p) == -1) { - loggers::get_instance().warning("fx__dec__DENM: -1 result code was returned"); - return -1; - } - - return 0; - } + // BITSTRING fx__enc__DENM(const DENM__PDU__Descriptions::DENM &p_denm) { + // loggers::get_instance().log_msg(">>> fx__enc__DENM: ", p_denm); + + // denm_codec codec; + // OCTETSTRING os; + // codec.encode(p_denm, os); + // return oct2bit(os); + // } + + // INTEGER fx__dec__DENM(BITSTRING &b, DENM__PDU__Descriptions::DENM &p) { + // loggers::get_instance().log(">>> fx__dec__DENM"); + // denm_codec codec; + // OCTETSTRING is = bit2oct(b); + + // if (codec.decode(OCTETSTRING(is.lengthof(), static_cast(is)), p) == -1) { + // loggers::get_instance().warning("fx__dec__DENM: -1 result code was returned"); + // return -1; + // } + + // return 0; + // } BITSTRING fx__enc__UtDenmInitialize(const LibItsDenm__TypesAndValues::UtDenmInitialize &p_utDenmInitialize) { loggers::get_instance().log_msg(">>> fx__enc__UtDenmInitialize: ", p_utDenmInitialize); diff --git a/ccsrc/EncDec/LibItsIvim_Encdec.cc b/ccsrc/EncDec/LibItsIvim_Encdec.cc index d6615b3..9b4fca5 100644 --- a/ccsrc/EncDec/LibItsIvim_Encdec.cc +++ b/ccsrc/EncDec/LibItsIvim_Encdec.cc @@ -163,27 +163,27 @@ namespace LibItsIvim__EncdecDeclarations { return 0; } - BITSTRING fx__enc__IVIM(const IVIM__PDU__Descriptions::IVIM &p_ivim) { - loggers::get_instance().log_msg(">>> fx__enc__IVIM: ", p_ivim); + // BITSTRING fx__enc__IVIM(const IVIM__PDU__Descriptions::IVIM &p_ivim) { + // loggers::get_instance().log_msg(">>> fx__enc__IVIM: ", p_ivim); - ivim_codec codec; - OCTETSTRING os; - codec.encode(p_ivim, os); - return oct2bit(os); - } + // ivim_codec codec; + // OCTETSTRING os; + // codec.encode(p_ivim, os); + // return oct2bit(os); + // } - INTEGER fx__dec__IVIM(BITSTRING &b, IVIM__PDU__Descriptions::IVIM &p) { - loggers::get_instance().log(">>> fx__dec__IVIM"); - ivim_codec codec; - OCTETSTRING is = bit2oct(b); + // INTEGER fx__dec__IVIM(BITSTRING &b, IVIM__PDU__Descriptions::IVIM &p) { + // loggers::get_instance().log(">>> fx__dec__IVIM"); + // ivim_codec codec; + // OCTETSTRING is = bit2oct(b); - if (codec.decode(OCTETSTRING(is.lengthof(), static_cast(is)), p) == -1) { - loggers::get_instance().warning("fx__dec__IVIM: -1 result code was returned"); - return -1; - } + // if (codec.decode(OCTETSTRING(is.lengthof(), static_cast(is)), p) == -1) { + // loggers::get_instance().warning("fx__dec__IVIM: -1 result code was returned"); + // return -1; + // } - return 0; - } + // return 0; + // } BITSTRING fx__enc__UtIvimInitialize(const LibItsIvim__TypesAndValues::UtIvimInitialize &p_utIvimInitialize) { loggers::get_instance().log_msg(">>> fx__enc__UtIvimInitialize: ", p_utIvimInitialize); diff --git a/ccsrc/EncDec/LibItsMapemSpatem_Encdec.cc b/ccsrc/EncDec/LibItsMapemSpatem_Encdec.cc index 5be3cfa..73c659b 100644 --- a/ccsrc/EncDec/LibItsMapemSpatem_Encdec.cc +++ b/ccsrc/EncDec/LibItsMapemSpatem_Encdec.cc @@ -164,27 +164,27 @@ namespace LibItsMapemSpatem__EncdecDeclarations { return 0; } - BITSTRING fx__enc__MAPEM(const MAPEM__PDU__Descriptions::MAPEM &p_mapem) { - loggers::get_instance().log_msg(">>> fx__enc__Mapem: ", p_mapem); + // BITSTRING fx__enc__MAPEM(const MAPEM__PDU__Descriptions::MAPEM &p_mapem) { + // loggers::get_instance().log_msg(">>> fx__enc__Mapem: ", p_mapem); - mapem_codec codec; - OCTETSTRING os; - codec.encode(p_mapem, os); - return oct2bit(os); - } + // mapem_codec codec; + // OCTETSTRING os; + // codec.encode(p_mapem, os); + // return oct2bit(os); + // } - INTEGER fx__dec__MAPEM(BITSTRING &b, MAPEM__PDU__Descriptions::MAPEM &p) { - loggers::get_instance().log(">>> fx__dec__Mapem"); - mapem_codec codec; - OCTETSTRING is = bit2oct(b); + // INTEGER fx__dec__MAPEM(BITSTRING &b, MAPEM__PDU__Descriptions::MAPEM &p) { + // loggers::get_instance().log(">>> fx__dec__Mapem"); + // mapem_codec codec; + // OCTETSTRING is = bit2oct(b); - if (codec.decode(OCTETSTRING(is.lengthof(), static_cast(is)), p) == -1) { - loggers::get_instance().warning("fx__dec__Mapem: -1 result code was returned"); - return -1; - } + // if (codec.decode(OCTETSTRING(is.lengthof(), static_cast(is)), p) == -1) { + // loggers::get_instance().warning("fx__dec__Mapem: -1 result code was returned"); + // return -1; + // } - return 0; - } + // return 0; + // } /**************************************************** * @desc External function to encode a SpatemReq type @@ -342,28 +342,28 @@ namespace LibItsMapemSpatem__EncdecDeclarations { return 0; } - BITSTRING fx__enc__SPATEM(const SPATEM__PDU__Descriptions::SPATEM &p_spatem) { - loggers::get_instance().log_msg(">>> fx__enc__Spatem: ", p_spatem); + // BITSTRING fx__enc__SPATEM(const SPATEM__PDU__Descriptions::SPATEM &p_spatem) { + // loggers::get_instance().log_msg(">>> fx__enc__Spatem: ", p_spatem); - spatem_codec codec; - OCTETSTRING os; - codec.encode(p_spatem, os); - return oct2bit(os); - } + // spatem_codec codec; + // OCTETSTRING os; + // codec.encode(p_spatem, os); + // return oct2bit(os); + // } - INTEGER fx__dec__SPATEM(BITSTRING &b, SPATEM__PDU__Descriptions::SPATEM &p_spatem) { - loggers::get_instance().log(">>> fx__dec__Spatem"); + // INTEGER fx__dec__SPATEM(BITSTRING &b, SPATEM__PDU__Descriptions::SPATEM &p_spatem) { + // loggers::get_instance().log(">>> fx__dec__Spatem"); - spatem_codec codec; - OCTETSTRING is = bit2oct(b); + // spatem_codec codec; + // OCTETSTRING is = bit2oct(b); - if (codec.decode(OCTETSTRING(is.lengthof(), static_cast(is)), p_spatem) == -1) { - loggers::get_instance().warning("fx__dec__Spatem: -1 result code was returned"); - return -1; - } + // if (codec.decode(OCTETSTRING(is.lengthof(), static_cast(is)), p_spatem) == -1) { + // loggers::get_instance().warning("fx__dec__Spatem: -1 result code was returned"); + // return -1; + // } - return 0; - } + // return 0; + // } BITSTRING fx__enc__UtMapemSpatemInitialize(const LibItsMapemSpatem__TypesAndValues::UtMapemSpatemInitialize &p_utMapemSpatemInitialize) { loggers::get_instance().log_msg(">>> fx__enc__UtMapemSpatemInitialize: ", p_utMapemSpatemInitialize); diff --git a/ccsrc/EncDec/LibItsMbr_Encdec.cc b/ccsrc/EncDec/LibItsMbr_Encdec.cc index 8e4de1c..97873de 100644 --- a/ccsrc/EncDec/LibItsMbr_Encdec.cc +++ b/ccsrc/EncDec/LibItsMbr_Encdec.cc @@ -6,36 +6,36 @@ namespace LibItsMbr__EncdecDeclarations { - BITSTRING fx__enc__EtsiTs103759Data(const EtsiTs103759Core::EtsiTs103759Data &p_etsi_ts_103759_data) { - loggers::get_instance().log_msg(">>> fx__enc__EtsiTs103759Data: ", p_etsi_ts_103759_data); - - etsi_ts103759_data_codec codec; - OCTETSTRING os; - if (codec.encode(p_etsi_ts_103759_data, os) == -1) { - loggers::get_instance().warning("fx__enc__EtsiTs103759Data: -1 result code was returned"); - return int2bit(0, 1); - } - - return oct2bit(os); - } - - INTEGER fx__dec__EtsiTs103759Data(BITSTRING &b, EtsiTs103759Core::EtsiTs103759Data &p_etsi_ts_103759_data) { - loggers::get_instance().log_msg(">>> fx__dec__EtsiTs103759Data: ", b); - - // Sanity check - if (b.lengthof() == 0) { - return -1; - } - - etsi_ts103759_data_codec codec; - OCTETSTRING is = bit2oct(b); - if (codec.decode(is, p_etsi_ts_103759_data) == -1) { - loggers::get_instance().warning("fx__dec__EtsiTs103759Data: -1 result code was returned"); - return -1; - } - - return 0; - } + // BITSTRING fx__enc__EtsiTs103759Data(const EtsiTs103759Core::EtsiTs103759Data &p_etsi_ts_103759_data) { + // loggers::get_instance().log_msg(">>> fx__enc__EtsiTs103759Data: ", p_etsi_ts_103759_data); + + // etsi_ts103759_data_codec codec; + // OCTETSTRING os; + // if (codec.encode(p_etsi_ts_103759_data, os) == -1) { + // loggers::get_instance().warning("fx__enc__EtsiTs103759Data: -1 result code was returned"); + // return int2bit(0, 1); + // } + + // return oct2bit(os); + // } + + // INTEGER fx__dec__EtsiTs103759Data(BITSTRING &b, EtsiTs103759Core::EtsiTs103759Data &p_etsi_ts_103759_data) { + // loggers::get_instance().log_msg(">>> fx__dec__EtsiTs103759Data: ", b); + + // // Sanity check + // if (b.lengthof() == 0) { + // return -1; + // } + + // etsi_ts103759_data_codec codec; + // OCTETSTRING is = bit2oct(b); + // if (codec.decode(is, p_etsi_ts_103759_data) == -1) { + // loggers::get_instance().warning("fx__dec__EtsiTs103759Data: -1 result code was returned"); + // return -1; + // } + + // return 0; + // } } // End of namespace LibItsMbr__EncdecDeclarations diff --git a/ccsrc/EncDec/LibItsPim_Encdec.cc b/ccsrc/EncDec/LibItsPim_Encdec.cc index 52f2dfc..688fcc0 100644 --- a/ccsrc/EncDec/LibItsPim_Encdec.cc +++ b/ccsrc/EncDec/LibItsPim_Encdec.cc @@ -174,27 +174,27 @@ namespace LibItsPim__EncdecDeclarations { return 0; } - BITSTRING fx__enc__PIM(const PIM__PDU__Descriptions::ParkingInformationMessage &p_cam) { - loggers::get_instance().log_msg(">>> fx__enc__PIM: ", p_cam); - - pim_codec codec; - OCTETSTRING os; - codec.encode(p_cam, os); - return oct2bit(os); - } - - INTEGER fx__dec__PIM(BITSTRING &b, PIM__PDU__Descriptions::ParkingInformationMessage &p) { - loggers::get_instance().log(">>> fx__dec__PIM"); - pim_codec codec; - OCTETSTRING is = bit2oct(b); - - if (codec.decode(OCTETSTRING(is.lengthof(), static_cast(is)), p) == -1) { - loggers::get_instance().warning("fx__dec__PIM: -1 result code was returned"); - return -1; - } - - return 0; - } + // BITSTRING fx__enc__PIM(const PIM__PDU__Descriptions::ParkingInformationMessage &p_cam) { + // loggers::get_instance().log_msg(">>> fx__enc__PIM: ", p_cam); + + // pim_codec codec; + // OCTETSTRING os; + // codec.encode(p_cam, os); + // return oct2bit(os); + // } + + // INTEGER fx__dec__PIM(BITSTRING &b, PIM__PDU__Descriptions::ParkingInformationMessage &p) { + // loggers::get_instance().log(">>> fx__dec__PIM"); + // pim_codec codec; + // OCTETSTRING is = bit2oct(b); + + // if (codec.decode(OCTETSTRING(is.lengthof(), static_cast(is)), p) == -1) { + // loggers::get_instance().warning("fx__dec__PIM: -1 result code was returned"); + // return -1; + // } + + // return 0; + // } BITSTRING fx__enc__UtPimInitialize(const LibItsPim__TypesAndValues::UtPimInitialize &p_utPimInitialize) { loggers::get_instance().log_msg(">>> fx__enc__UtPimInitialize: ", p_utPimInitialize); diff --git a/ccsrc/EncDec/LibItsPki_Encdec.cc b/ccsrc/EncDec/LibItsPki_Encdec.cc index 7117846..47251a6 100644 --- a/ccsrc/EncDec/LibItsPki_Encdec.cc +++ b/ccsrc/EncDec/LibItsPki_Encdec.cc @@ -20,291 +20,291 @@ namespace LibItsPki__EncdecDeclarations { - BITSTRING fx__enc__EtsiTs102941Data(const EtsiTs102941MessagesCa::EtsiTs102941Data &p_etsi_ts_102941_data) { - loggers::get_instance().log_msg(">>> fx__enc__EtsiTs102941Data: ", p_etsi_ts_102941_data); - - etsi_ts102941_data_codec codec; - OCTETSTRING os; - if (codec.encode(p_etsi_ts_102941_data, os) == -1) { - loggers::get_instance().warning("fx__enc__EtsiTs102941Data: -1 result code was returned"); - return int2bit(0, 1); - } - - return oct2bit(os); - } - - INTEGER fx__dec__EtsiTs102941Data(BITSTRING &b, EtsiTs102941MessagesCa::EtsiTs102941Data &p_etsi_ts_102941_data) { - loggers::get_instance().log_msg(">>> fx__dec__EtsiTs102941Data: ", b); - - // Sanity check - if (b.lengthof() == 0) { - return -1; - } - - etsi_ts102941_data_codec codec; - OCTETSTRING is = bit2oct(b); - if (codec.decode(is, p_etsi_ts_102941_data) == -1) { - loggers::get_instance().warning("fx__dec__EtsiTs102941Data: -1 result code was returned"); - return -1; - } - - return 0; - } - - BITSTRING fx__enc__EtsiTs102941DataContent(const EtsiTs102941MessagesCa::EtsiTs102941DataContent &p_etsi_ts_102941_data_content) { - loggers::get_instance().log_msg(">>> fx__enc__EtsiTs102941DataContent: ", p_etsi_ts_102941_data_content); - - etsi_ts102941_data_content_codec codec; - OCTETSTRING os; - if (codec.encode(p_etsi_ts_102941_data_content, os) == -1) { - loggers::get_instance().warning("fx__enc__EtsiTs102941DataContent: -1 result code was returned"); - return int2bit(0, 1); - } - - return oct2bit(os); - } - - INTEGER fx__dec__EtsiTs102941DataContent(BITSTRING &b, EtsiTs102941MessagesCa::EtsiTs102941DataContent &p_etsi_ts_102941_data_content) { - loggers::get_instance().log_msg(">>> fx__dec__EtsiTs102941DataContent: ", b); - - // Sanity check - if (b.lengthof() == 0) { - return -1; - } - - etsi_ts102941_data_content_codec codec; - OCTETSTRING is = bit2oct(b); - if (codec.decode(is, p_etsi_ts_102941_data_content) == -1) { - loggers::get_instance().warning("fx__dec__EtsiTs102941DataContent: -1 result code was returned"); - return -1; - } - - return 0; - } - - BITSTRING fx__enc__InnerEcRequest(const EtsiTs102941TypesEnrolment::InnerEcRequest &p_inner_request) { - loggers::get_instance().log_msg(">>> fx_enc_InnerEcRequest: ", p_inner_request); - - etsi_ts102941_types_enrolment_inner_request codec; - OCTETSTRING os; - if (codec.encode(p_inner_request, os) == -1) { - loggers::get_instance().warning("fx_enc_InnerEcRequest: -1 result code was returned"); - return int2bit(0, 1); - } - - return oct2bit(os); - } - - INTEGER fx__dec__InnerEcRequest(BITSTRING &b, EtsiTs102941TypesEnrolment::InnerEcRequest &p_inner_request) { - loggers::get_instance().log_msg(">>> fx__dec__InnerEcRequest: ", b); - - // Sanity check - if (b.lengthof() == 0) { - return -1; - } - - etsi_ts102941_types_enrolment_inner_request codec; - OCTETSTRING is = bit2oct(b); - if (codec.decode(is, p_inner_request) == -1) { - loggers::get_instance().warning("fx__dec__InnerEcRequest: -1 result code was returned"); - return -1; - } - - loggers::get_instance().log_msg("<<< fx__dec__InnerEcRequest: ", p_inner_request); - return 0; - } - - BITSTRING fx__enc__InnerEcResponse(const EtsiTs102941TypesEnrolment::InnerEcResponse &p_inner_response) { - loggers::get_instance().log_msg(">>> fx__enc__InnerEcResponse: ", p_inner_response); - - etsi_ts102941_types_enrolment_inner_response codec; - OCTETSTRING os; - if (codec.encode(p_inner_response, os) == -1) { - loggers::get_instance().warning("fx__enc__InnerEcResponse: -1 result code was returned"); - return int2bit(0, 1); - } - - return oct2bit(os); - } - - INTEGER fx__dec__InnerEcResponse(BITSTRING &b, EtsiTs102941TypesEnrolment::InnerEcResponse &p_inner_response) { - loggers::get_instance().log_msg(">>> fx__dec__InnerEcResponse: ", b); - - // Sanity check - if (b.lengthof() == 0) { - return -1; - } - - etsi_ts102941_types_enrolment_inner_response codec; - OCTETSTRING is = bit2oct(b); - if (codec.decode(is, p_inner_response) == -1) { - loggers::get_instance().warning("fx__dec__InnerEcResponse: -1 result code was returned"); - return -1; - } - - loggers::get_instance().log_msg("<<< fx__dec__InnerEcResponse: ", p_inner_response); - return 0; - } - - BITSTRING fx__enc__InnerAtRequest(const EtsiTs102941TypesAuthorization::InnerAtRequest &p_inner_request) { - loggers::get_instance().log_msg(">>> fx_enc_InnerAtRequest: ", p_inner_request); - - etsi_ts102941_types_authorization_inner_request codec; - OCTETSTRING os; - if (codec.encode(p_inner_request, os) == -1) { - loggers::get_instance().warning("fx_enc_InnerAtRequest: -1 result code was returned"); - return int2bit(0, 1); - } - - return oct2bit(os); - } - - INTEGER fx__dec__InnerAtRequest(BITSTRING &b, EtsiTs102941TypesAuthorization::InnerAtRequest &p_inner_request) { - loggers::get_instance().log_msg(">>> fx__dec__InnerAtRequest: ", b); - - // Sanity check - if (b.lengthof() == 0) { - return -1; - } - - etsi_ts102941_types_authorization_inner_request codec; - OCTETSTRING is = bit2oct(b); - if (codec.decode(is, p_inner_request) == -1) { - loggers::get_instance().warning("fx__dec__InnerAtRequest: -1 result code was returned"); - return -1; - } - - loggers::get_instance().log_msg("<<< fx__dec__InnerAtRequest: ", p_inner_request); - return 0; - } - - BITSTRING fx__enc__InnerAtResponse(const EtsiTs102941TypesAuthorization::InnerAtResponse &p_inner_response) { - loggers::get_instance().log_msg(">>> fx__enc__InnerAtResponse: ", p_inner_response); - - etsi_ts102941_types_authorization_inner_response codec; - OCTETSTRING os; - if (codec.encode(p_inner_response, os) == -1) { - loggers::get_instance().warning("fx__enc__InnerAtResponse: -1 result code was returned"); - return int2bit(0, 1); - } - - return oct2bit(os); - } - - INTEGER fx__dec__InnerAtResponse(BITSTRING &b, EtsiTs102941TypesAuthorization::InnerAtResponse &p_inner_response) { - loggers::get_instance().log_msg(">>> fx__dec__InnerAtResponse: ", b); - - // Sanity check - if (b.lengthof() == 0) { - return -1; - } - - etsi_ts102941_types_authorization_inner_response codec; - OCTETSTRING is = bit2oct(b); - if (codec.decode(is, p_inner_response) == -1) { - loggers::get_instance().warning("fx__dec__InnerAtResponse: -1 result code was returned"); - return -1; - } - - loggers::get_instance().log_msg("<<< fx__dec__InnerAtResponse: ", p_inner_response); - return 0; - } - - BITSTRING fx__enc__SharedAtRequest(EtsiTs102941TypesAuthorization::SharedAtRequest const &p_shared_at) { - loggers::get_instance().log_msg(">>> fx__enc__SharedAtRequest: ", p_shared_at); - - etsi_ts102941_types_authorization_shared_at_request codec; - OCTETSTRING os; - if (codec.encode(p_shared_at, os) == -1) { - loggers::get_instance().warning("fx__enc__SharedAtRequest: -1 result code was returned"); - return int2bit(0, 1); - } - - return oct2bit(os); - } - - INTEGER fx__dec__SharedAtRequest(BITSTRING &b, EtsiTs102941TypesAuthorization::SharedAtRequest &p_shared_at) { - loggers::get_instance().log_msg(">>> fx__dec__SharedAtRequest: ", b); - - // Sanity check - if (b.lengthof() == 0) { - return -1; - } - - etsi_ts102941_types_authorization_shared_at_request codec; - OCTETSTRING is = bit2oct(b); - if (codec.decode(is, p_shared_at) == -1) { - loggers::get_instance().warning("fx__dec__SharedAtRequest: -1 result code was returned"); - return -1; - } - - loggers::get_instance().log_msg("<<< fx__dec__SharedAtRequest: ", p_shared_at); - return 0; - } - - BITSTRING fx__enc__AuthorizationValidationRequest(EtsiTs102941TypesAuthorizationValidation::AuthorizationValidationRequest const &p_shared_at) { - loggers::get_instance().log_msg(">>> fx__enc__AuthorizationValidationRequest: ", p_shared_at); - - etsi_ts102941_types_authorization_validation_request codec; - OCTETSTRING os; - if (codec.encode(p_shared_at, os) == -1) { - loggers::get_instance().warning("fx__enc__AuthorizationValidationRequest: -1 result code was returned"); - return int2bit(0, 1); - } - - return oct2bit(os); - } - - INTEGER fx__dec__AuthorizationValidationRequest(BITSTRING &b, EtsiTs102941TypesAuthorizationValidation::AuthorizationValidationRequest &p_shared_at) { - loggers::get_instance().log_msg(">>> fx__dec__AuthorizationValidationRequest: ", b); - - // Sanity check - if (b.lengthof() == 0) { - return -1; - } - - etsi_ts102941_types_authorization_validation_request codec; - OCTETSTRING is = bit2oct(b); - if (codec.decode(is, p_shared_at) == -1) { - loggers::get_instance().warning("fx__dec__AuthorizationValidationRequest: -1 result code was returned"); - return -1; - } - - loggers::get_instance().log_msg("<<< fx__dec__AuthorizationValidationRequest: ", p_shared_at); - return 0; - } - - BITSTRING fx__enc__AuthorizationValidationResponse(EtsiTs102941TypesAuthorizationValidation::AuthorizationValidationResponse const &p_shared_at) { - loggers::get_instance().log_msg(">>> fx__enc__AuthorizationValidationResponse: ", p_shared_at); - - etsi_ts102941_types_authorization_validation_response codec; - OCTETSTRING os; - if (codec.encode(p_shared_at, os) == -1) { - loggers::get_instance().warning("fx__enc__AuthorizationValidationResponse: -1 result code was returned"); - return int2bit(0, 1); - } - - return oct2bit(os); - } - - INTEGER fx__dec__AuthorizationValidationResponse(BITSTRING &b, EtsiTs102941TypesAuthorizationValidation::AuthorizationValidationResponse &p_shared_at) { - loggers::get_instance().log_msg(">>> fx__dec__AuthorizationValidationResponse: ", b); - - // Sanity check - if (b.lengthof() == 0) { - return -1; - } - - etsi_ts102941_types_authorization_validation_response codec; - OCTETSTRING is = bit2oct(b); - if (codec.decode(is, p_shared_at) == -1) { - loggers::get_instance().warning("fx__dec__AuthorizationValidationResponse: -1 result code was returned"); - return -1; - } - - loggers::get_instance().log_msg("<<< fx__dec__AuthorizationValidationResponse: ", p_shared_at); - return 0; - } + // BITSTRING fx__enc__EtsiTs102941Data(const EtsiTs102941MessagesCa::EtsiTs102941Data &p_etsi_ts_102941_data) { + // loggers::get_instance().log_msg(">>> fx__enc__EtsiTs102941Data: ", p_etsi_ts_102941_data); + + // etsi_ts102941_data_codec codec; + // OCTETSTRING os; + // if (codec.encode(p_etsi_ts_102941_data, os) == -1) { + // loggers::get_instance().warning("fx__enc__EtsiTs102941Data: -1 result code was returned"); + // return int2bit(0, 1); + // } + + // return oct2bit(os); + // } + + // INTEGER fx__dec__EtsiTs102941Data(BITSTRING &b, EtsiTs102941MessagesCa::EtsiTs102941Data &p_etsi_ts_102941_data) { + // loggers::get_instance().log_msg(">>> fx__dec__EtsiTs102941Data: ", b); + + // // Sanity check + // if (b.lengthof() == 0) { + // return -1; + // } + + // etsi_ts102941_data_codec codec; + // OCTETSTRING is = bit2oct(b); + // if (codec.decode(is, p_etsi_ts_102941_data) == -1) { + // loggers::get_instance().warning("fx__dec__EtsiTs102941Data: -1 result code was returned"); + // return -1; + // } + + // return 0; + // } + + // BITSTRING fx__enc__EtsiTs102941DataContent(const EtsiTs102941MessagesCa::EtsiTs102941DataContent &p_etsi_ts_102941_data_content) { + // loggers::get_instance().log_msg(">>> fx__enc__EtsiTs102941DataContent: ", p_etsi_ts_102941_data_content); + + // etsi_ts102941_data_content_codec codec; + // OCTETSTRING os; + // if (codec.encode(p_etsi_ts_102941_data_content, os) == -1) { + // loggers::get_instance().warning("fx__enc__EtsiTs102941DataContent: -1 result code was returned"); + // return int2bit(0, 1); + // } + + // return oct2bit(os); + // } + + // INTEGER fx__dec__EtsiTs102941DataContent(BITSTRING &b, EtsiTs102941MessagesCa::EtsiTs102941DataContent &p_etsi_ts_102941_data_content) { + // loggers::get_instance().log_msg(">>> fx__dec__EtsiTs102941DataContent: ", b); + + // // Sanity check + // if (b.lengthof() == 0) { + // return -1; + // } + + // etsi_ts102941_data_content_codec codec; + // OCTETSTRING is = bit2oct(b); + // if (codec.decode(is, p_etsi_ts_102941_data_content) == -1) { + // loggers::get_instance().warning("fx__dec__EtsiTs102941DataContent: -1 result code was returned"); + // return -1; + // } + + // return 0; + // } + + // BITSTRING fx__enc__InnerEcRequest(const EtsiTs102941TypesEnrolment::InnerEcRequest &p_inner_request) { + // loggers::get_instance().log_msg(">>> fx_enc_InnerEcRequest: ", p_inner_request); + + // etsi_ts102941_types_enrolment_inner_request codec; + // OCTETSTRING os; + // if (codec.encode(p_inner_request, os) == -1) { + // loggers::get_instance().warning("fx_enc_InnerEcRequest: -1 result code was returned"); + // return int2bit(0, 1); + // } + + // return oct2bit(os); + // } + + // INTEGER fx__dec__InnerEcRequest(BITSTRING &b, EtsiTs102941TypesEnrolment::InnerEcRequest &p_inner_request) { + // loggers::get_instance().log_msg(">>> fx__dec__InnerEcRequest: ", b); + + // // Sanity check + // if (b.lengthof() == 0) { + // return -1; + // } + + // etsi_ts102941_types_enrolment_inner_request codec; + // OCTETSTRING is = bit2oct(b); + // if (codec.decode(is, p_inner_request) == -1) { + // loggers::get_instance().warning("fx__dec__InnerEcRequest: -1 result code was returned"); + // return -1; + // } + + // loggers::get_instance().log_msg("<<< fx__dec__InnerEcRequest: ", p_inner_request); + // return 0; + // } + + // BITSTRING fx__enc__InnerEcResponse(const EtsiTs102941TypesEnrolment::InnerEcResponse &p_inner_response) { + // loggers::get_instance().log_msg(">>> fx__enc__InnerEcResponse: ", p_inner_response); + + // etsi_ts102941_types_enrolment_inner_response codec; + // OCTETSTRING os; + // if (codec.encode(p_inner_response, os) == -1) { + // loggers::get_instance().warning("fx__enc__InnerEcResponse: -1 result code was returned"); + // return int2bit(0, 1); + // } + + // return oct2bit(os); + // } + + // INTEGER fx__dec__InnerEcResponse(BITSTRING &b, EtsiTs102941TypesEnrolment::InnerEcResponse &p_inner_response) { + // loggers::get_instance().log_msg(">>> fx__dec__InnerEcResponse: ", b); + + // // Sanity check + // if (b.lengthof() == 0) { + // return -1; + // } + + // etsi_ts102941_types_enrolment_inner_response codec; + // OCTETSTRING is = bit2oct(b); + // if (codec.decode(is, p_inner_response) == -1) { + // loggers::get_instance().warning("fx__dec__InnerEcResponse: -1 result code was returned"); + // return -1; + // } + + // loggers::get_instance().log_msg("<<< fx__dec__InnerEcResponse: ", p_inner_response); + // return 0; + // } + + // BITSTRING fx__enc__InnerAtRequest(const EtsiTs102941TypesAuthorization::InnerAtRequest &p_inner_request) { + // loggers::get_instance().log_msg(">>> fx_enc_InnerAtRequest: ", p_inner_request); + + // etsi_ts102941_types_authorization_inner_request codec; + // OCTETSTRING os; + // if (codec.encode(p_inner_request, os) == -1) { + // loggers::get_instance().warning("fx_enc_InnerAtRequest: -1 result code was returned"); + // return int2bit(0, 1); + // } + + // return oct2bit(os); + // } + + // INTEGER fx__dec__InnerAtRequest(BITSTRING &b, EtsiTs102941TypesAuthorization::InnerAtRequest &p_inner_request) { + // loggers::get_instance().log_msg(">>> fx__dec__InnerAtRequest: ", b); + + // // Sanity check + // if (b.lengthof() == 0) { + // return -1; + // } + + // etsi_ts102941_types_authorization_inner_request codec; + // OCTETSTRING is = bit2oct(b); + // if (codec.decode(is, p_inner_request) == -1) { + // loggers::get_instance().warning("fx__dec__InnerAtRequest: -1 result code was returned"); + // return -1; + // } + + // loggers::get_instance().log_msg("<<< fx__dec__InnerAtRequest: ", p_inner_request); + // return 0; + // } + + // BITSTRING fx__enc__InnerAtResponse(const EtsiTs102941TypesAuthorization::InnerAtResponse &p_inner_response) { + // loggers::get_instance().log_msg(">>> fx__enc__InnerAtResponse: ", p_inner_response); + + // etsi_ts102941_types_authorization_inner_response codec; + // OCTETSTRING os; + // if (codec.encode(p_inner_response, os) == -1) { + // loggers::get_instance().warning("fx__enc__InnerAtResponse: -1 result code was returned"); + // return int2bit(0, 1); + // } + + // return oct2bit(os); + // } + + // INTEGER fx__dec__InnerAtResponse(BITSTRING &b, EtsiTs102941TypesAuthorization::InnerAtResponse &p_inner_response) { + // loggers::get_instance().log_msg(">>> fx__dec__InnerAtResponse: ", b); + + // // Sanity check + // if (b.lengthof() == 0) { + // return -1; + // } + + // etsi_ts102941_types_authorization_inner_response codec; + // OCTETSTRING is = bit2oct(b); + // if (codec.decode(is, p_inner_response) == -1) { + // loggers::get_instance().warning("fx__dec__InnerAtResponse: -1 result code was returned"); + // return -1; + // } + + // loggers::get_instance().log_msg("<<< fx__dec__InnerAtResponse: ", p_inner_response); + // return 0; + // } + + // BITSTRING fx__enc__SharedAtRequest(EtsiTs102941TypesAuthorization::SharedAtRequest const &p_shared_at) { + // loggers::get_instance().log_msg(">>> fx__enc__SharedAtRequest: ", p_shared_at); + + // etsi_ts102941_types_authorization_shared_at_request codec; + // OCTETSTRING os; + // if (codec.encode(p_shared_at, os) == -1) { + // loggers::get_instance().warning("fx__enc__SharedAtRequest: -1 result code was returned"); + // return int2bit(0, 1); + // } + + // return oct2bit(os); + // } + + // INTEGER fx__dec__SharedAtRequest(BITSTRING &b, EtsiTs102941TypesAuthorization::SharedAtRequest &p_shared_at) { + // loggers::get_instance().log_msg(">>> fx__dec__SharedAtRequest: ", b); + + // // Sanity check + // if (b.lengthof() == 0) { + // return -1; + // } + + // etsi_ts102941_types_authorization_shared_at_request codec; + // OCTETSTRING is = bit2oct(b); + // if (codec.decode(is, p_shared_at) == -1) { + // loggers::get_instance().warning("fx__dec__SharedAtRequest: -1 result code was returned"); + // return -1; + // } + + // loggers::get_instance().log_msg("<<< fx__dec__SharedAtRequest: ", p_shared_at); + // return 0; + // } + + // BITSTRING fx__enc__AuthorizationValidationRequest(EtsiTs102941TypesAuthorizationValidation::AuthorizationValidationRequest const &p_shared_at) { + // loggers::get_instance().log_msg(">>> fx__enc__AuthorizationValidationRequest: ", p_shared_at); + + // etsi_ts102941_types_authorization_validation_request codec; + // OCTETSTRING os; + // if (codec.encode(p_shared_at, os) == -1) { + // loggers::get_instance().warning("fx__enc__AuthorizationValidationRequest: -1 result code was returned"); + // return int2bit(0, 1); + // } + + // return oct2bit(os); + // } + + // INTEGER fx__dec__AuthorizationValidationRequest(BITSTRING &b, EtsiTs102941TypesAuthorizationValidation::AuthorizationValidationRequest &p_shared_at) { + // loggers::get_instance().log_msg(">>> fx__dec__AuthorizationValidationRequest: ", b); + + // // Sanity check + // if (b.lengthof() == 0) { + // return -1; + // } + + // etsi_ts102941_types_authorization_validation_request codec; + // OCTETSTRING is = bit2oct(b); + // if (codec.decode(is, p_shared_at) == -1) { + // loggers::get_instance().warning("fx__dec__AuthorizationValidationRequest: -1 result code was returned"); + // return -1; + // } + + // loggers::get_instance().log_msg("<<< fx__dec__AuthorizationValidationRequest: ", p_shared_at); + // return 0; + // } + + // BITSTRING fx__enc__AuthorizationValidationResponse(EtsiTs102941TypesAuthorizationValidation::AuthorizationValidationResponse const &p_shared_at) { + // loggers::get_instance().log_msg(">>> fx__enc__AuthorizationValidationResponse: ", p_shared_at); + + // etsi_ts102941_types_authorization_validation_response codec; + // OCTETSTRING os; + // if (codec.encode(p_shared_at, os) == -1) { + // loggers::get_instance().warning("fx__enc__AuthorizationValidationResponse: -1 result code was returned"); + // return int2bit(0, 1); + // } + + // return oct2bit(os); + // } + + // INTEGER fx__dec__AuthorizationValidationResponse(BITSTRING &b, EtsiTs102941TypesAuthorizationValidation::AuthorizationValidationResponse &p_shared_at) { + // loggers::get_instance().log_msg(">>> fx__dec__AuthorizationValidationResponse: ", b); + + // // Sanity check + // if (b.lengthof() == 0) { + // return -1; + // } + + // etsi_ts102941_types_authorization_validation_response codec; + // OCTETSTRING is = bit2oct(b); + // if (codec.decode(is, p_shared_at) == -1) { + // loggers::get_instance().warning("fx__dec__AuthorizationValidationResponse: -1 result code was returned"); + // return -1; + // } + + // loggers::get_instance().log_msg("<<< fx__dec__AuthorizationValidationResponse: ", p_shared_at); + // return 0; + // } // BITSTRING fx__enc__RaEeCertInfo(Ieee1609Dot2Dot1EeRaInterface::RaEeCertInfo const &p_ra_ee_cert_info) { // loggers::get_instance().log_msg(">>> fx__enc__RaEeCertInfo: ", p_ra_ee_cert_info); @@ -333,132 +333,132 @@ namespace LibItsPki__EncdecDeclarations { // return 0; // } - BITSTRING fx__enc__PublicKeys(EtsiTs102941BaseTypes::PublicKeys const &p_public_keys) { - loggers::get_instance().log_msg(">>> fx__enc__PublicKeys: ", p_public_keys); - - etsi_ts102941_base_types_public_keys codec; - OCTETSTRING os; - if (codec.encode(p_public_keys, os) == -1) { - loggers::get_instance().warning("fx__enc__PublicKeys: -1 result code was returned"); - return int2bit(0, 1); - } - - return oct2bit(os); - } - - INTEGER fx__dec__PublicKeys(BITSTRING &b, EtsiTs102941BaseTypes::PublicKeys &p_public_keys) { - loggers::get_instance().log_msg(">>> fx__dec__PublicKeys: ", b); - - // Sanity check - if (b.lengthof() == 0) { - return -1; - } - - etsi_ts102941_base_types_public_keys codec; - OCTETSTRING is = bit2oct(b); - if (codec.decode(is, p_public_keys) == -1) { - loggers::get_instance().warning("fx__dec__PublicKeys: -1 result code was returned"); - return -1; - } - - loggers::get_instance().log_msg("<<< fx__dec__PublicKeys: ", p_public_keys); - return 0; - } - - BITSTRING fx__enc__PublicVerificationKey(Ieee1609Dot2BaseTypes::PublicVerificationKey const &p_public_verification_key) { - loggers::get_instance().log_msg(">>> fx__enc__PublicVerificationKey: ", p_public_verification_key); - - ieee_1609dot2_base_types_public_verification_key codec; - OCTETSTRING os; - if (codec.encode(p_public_verification_key, os) == -1) { - loggers::get_instance().warning("fx__enc__PublicVerificationKey: -1 result code was returned"); - return int2bit(0, 1); - } - - return oct2bit(os); - } - - INTEGER fx__dec__PublicVerificationKey(BITSTRING &b, Ieee1609Dot2BaseTypes::PublicVerificationKey &p_public_verification_key) { - loggers::get_instance().log_msg(">>> fx__dec__PublicVerificationKey: ", b); - - // Sanity check - if (b.lengthof() == 0) { - return -1; - } - - ieee_1609dot2_base_types_public_verification_key codec; - OCTETSTRING is = bit2oct(b); - if (codec.decode(is, p_public_verification_key) == -1) { - loggers::get_instance().warning("fx__dec__PublicVerificationKey: -1 result code was returned"); - return -1; - } - - loggers::get_instance().log_msg("<<< fx__dec__PublicVerificationKey: ", p_public_verification_key); - return 0; - } - - BITSTRING fx__enc__PublicEncryptionKey(Ieee1609Dot2BaseTypes::PublicEncryptionKey const &p_public_encryption_key) { - loggers::get_instance().log_msg(">>> fx__enc__PublicEncryptionKey: ", p_public_encryption_key); - - ieee_1609dot2_base_types_public_encryption_key codec; - OCTETSTRING os; - if (codec.encode(p_public_encryption_key, os) == -1) { - loggers::get_instance().warning("fx__enc__PublicEncryptionKey: -1 result code was returned"); - return int2bit(0, 1); - } - - return oct2bit(os); - } - - INTEGER fx__dec__PublicEncryptionKey(BITSTRING &b, Ieee1609Dot2BaseTypes::PublicEncryptionKey &p_public_encryption_key) { - loggers::get_instance().log_msg(">>> fx__dec__PublicEncryptionKey: ", b); - - // Sanity check - if (b.lengthof() == 0) { - return -1; - } - - ieee_1609dot2_base_types_public_encryption_key codec; - OCTETSTRING is = bit2oct(b); - if (codec.decode(is, p_public_encryption_key) == -1) { - loggers::get_instance().warning("fx__dec__PublicEncryptionKey: -1 result code was returned"); - return -1; - } - - loggers::get_instance().log_msg("<<< fx__dec__PublicEncryptionKey: ", p_public_encryption_key); - return 0; - } - - BITSTRING fx__enc__CtlFormat(EtsiTs102941TrustLists::CtlFormat const &p_ctl_format) { - loggers::get_instance().log_msg(">>> fx__enc__CtlFormat: ", p_ctl_format); - - etsi_ts102941_trust_lists_ctl_format codec; - OCTETSTRING os; - if (codec.encode(p_ctl_format, os) == -1) { - loggers::get_instance().warning("fx__enc__CtlFormat: -1 result code was returned"); - return int2bit(0, 1); - } - - return oct2bit(os); - } - - INTEGER fx__dec__CtlFormat(BITSTRING &b, EtsiTs102941TrustLists::CtlFormat &p_ctl_format) { - loggers::get_instance().log_msg(">>> fx__dec__CtlFormat: ", b); - - // Sanity check - if (b.lengthof() == 0) { - return -1; - } - - etsi_ts102941_trust_lists_ctl_format codec; - OCTETSTRING is = bit2oct(b); - if (codec.decode(is, p_ctl_format) == -1) { - loggers::get_instance().warning("fx__dec__CtlFormat: -1 result code was returned"); - return -1; - } - - loggers::get_instance().log_msg("<<< fx__dec__CtlFormat: ", p_ctl_format); - return 0; - } + // BITSTRING fx__enc__PublicKeys(EtsiTs102941BaseTypes::PublicKeys const &p_public_keys) { + // loggers::get_instance().log_msg(">>> fx__enc__PublicKeys: ", p_public_keys); + + // etsi_ts102941_base_types_public_keys codec; + // OCTETSTRING os; + // if (codec.encode(p_public_keys, os) == -1) { + // loggers::get_instance().warning("fx__enc__PublicKeys: -1 result code was returned"); + // return int2bit(0, 1); + // } + + // return oct2bit(os); + // } + + // INTEGER fx__dec__PublicKeys(BITSTRING &b, EtsiTs102941BaseTypes::PublicKeys &p_public_keys) { + // loggers::get_instance().log_msg(">>> fx__dec__PublicKeys: ", b); + + // // Sanity check + // if (b.lengthof() == 0) { + // return -1; + // } + + // etsi_ts102941_base_types_public_keys codec; + // OCTETSTRING is = bit2oct(b); + // if (codec.decode(is, p_public_keys) == -1) { + // loggers::get_instance().warning("fx__dec__PublicKeys: -1 result code was returned"); + // return -1; + // } + + // loggers::get_instance().log_msg("<<< fx__dec__PublicKeys: ", p_public_keys); + // return 0; + // } + + // BITSTRING fx__enc__PublicVerificationKey(Ieee1609Dot2BaseTypes::PublicVerificationKey const &p_public_verification_key) { + // loggers::get_instance().log_msg(">>> fx__enc__PublicVerificationKey: ", p_public_verification_key); + + // ieee_1609dot2_base_types_public_verification_key codec; + // OCTETSTRING os; + // if (codec.encode(p_public_verification_key, os) == -1) { + // loggers::get_instance().warning("fx__enc__PublicVerificationKey: -1 result code was returned"); + // return int2bit(0, 1); + // } + + // return oct2bit(os); + // } + + // INTEGER fx__dec__PublicVerificationKey(BITSTRING &b, Ieee1609Dot2BaseTypes::PublicVerificationKey &p_public_verification_key) { + // loggers::get_instance().log_msg(">>> fx__dec__PublicVerificationKey: ", b); + + // // Sanity check + // if (b.lengthof() == 0) { + // return -1; + // } + + // ieee_1609dot2_base_types_public_verification_key codec; + // OCTETSTRING is = bit2oct(b); + // if (codec.decode(is, p_public_verification_key) == -1) { + // loggers::get_instance().warning("fx__dec__PublicVerificationKey: -1 result code was returned"); + // return -1; + // } + + // loggers::get_instance().log_msg("<<< fx__dec__PublicVerificationKey: ", p_public_verification_key); + // return 0; + // } + + // BITSTRING fx__enc__PublicEncryptionKey(Ieee1609Dot2BaseTypes::PublicEncryptionKey const &p_public_encryption_key) { + // loggers::get_instance().log_msg(">>> fx__enc__PublicEncryptionKey: ", p_public_encryption_key); + + // ieee_1609dot2_base_types_public_encryption_key codec; + // OCTETSTRING os; + // if (codec.encode(p_public_encryption_key, os) == -1) { + // loggers::get_instance().warning("fx__enc__PublicEncryptionKey: -1 result code was returned"); + // return int2bit(0, 1); + // } + + // return oct2bit(os); + // } + + // INTEGER fx__dec__PublicEncryptionKey(BITSTRING &b, Ieee1609Dot2BaseTypes::PublicEncryptionKey &p_public_encryption_key) { + // loggers::get_instance().log_msg(">>> fx__dec__PublicEncryptionKey: ", b); + + // // Sanity check + // if (b.lengthof() == 0) { + // return -1; + // } + + // ieee_1609dot2_base_types_public_encryption_key codec; + // OCTETSTRING is = bit2oct(b); + // if (codec.decode(is, p_public_encryption_key) == -1) { + // loggers::get_instance().warning("fx__dec__PublicEncryptionKey: -1 result code was returned"); + // return -1; + // } + + // loggers::get_instance().log_msg("<<< fx__dec__PublicEncryptionKey: ", p_public_encryption_key); + // return 0; + // } + + // BITSTRING fx__enc__CtlFormat(EtsiTs102941TrustLists::CtlFormat const &p_ctl_format) { + // loggers::get_instance().log_msg(">>> fx__enc__CtlFormat: ", p_ctl_format); + + // etsi_ts102941_trust_lists_ctl_format codec; + // OCTETSTRING os; + // if (codec.encode(p_ctl_format, os) == -1) { + // loggers::get_instance().warning("fx__enc__CtlFormat: -1 result code was returned"); + // return int2bit(0, 1); + // } + + // return oct2bit(os); + // } + + // INTEGER fx__dec__CtlFormat(BITSTRING &b, EtsiTs102941TrustLists::CtlFormat &p_ctl_format) { + // loggers::get_instance().log_msg(">>> fx__dec__CtlFormat: ", b); + + // // Sanity check + // if (b.lengthof() == 0) { + // return -1; + // } + + // etsi_ts102941_trust_lists_ctl_format codec; + // OCTETSTRING is = bit2oct(b); + // if (codec.decode(is, p_ctl_format) == -1) { + // loggers::get_instance().warning("fx__dec__CtlFormat: -1 result code was returned"); + // return -1; + // } + + // loggers::get_instance().log_msg("<<< fx__dec__CtlFormat: ", p_ctl_format); + // return 0; + // } } // End of namespace LibItsPki__EncdecDeclarations diff --git a/ccsrc/EncDec/LibItsRtcmem_Encdec.cc b/ccsrc/EncDec/LibItsRtcmem_Encdec.cc index e2e700c..06bd531 100644 --- a/ccsrc/EncDec/LibItsRtcmem_Encdec.cc +++ b/ccsrc/EncDec/LibItsRtcmem_Encdec.cc @@ -2,7 +2,7 @@ #include "LibItsRtcmem_EncdecDeclarations.hh" -#include "RtcmemCodec.hh" +#include "rtcmem_codec.hh" #include "UpperTesterRtcmemCodec.hh" #include "loggers.hh" @@ -15,7 +15,7 @@ namespace LibItsRtcmem__EncdecDeclarations { BITSTRING fx__enc__RtcmemReq(const LibItsRtcmem__TypesAndValues::RtcmemReq &p_rtcmemReq) { loggers::get_instance().log_msg(">>> fx__enc__RtcmemReq: ", p_rtcmemReq); - RtcmemCodec codec; + rtcmem_codec codec; OCTETSTRING os; if (codec.encode(p_rtcmemReq.msgOut(), os) == -1) { loggers::get_instance().warning("fx__enc__RtcmemReq: -1 result code was returned"); @@ -33,7 +33,7 @@ namespace LibItsRtcmem__EncdecDeclarations { INTEGER fx__dec__RtcmemReq(BITSTRING &b, LibItsRtcmem__TypesAndValues::RtcmemReq &p) { loggers::get_instance().log(">>> fx__dec__RtcmemReq"); - RtcmemCodec codec; + rtcmem_codec codec; RTCMEM__PDU__Descriptions::RTCMEM rtcmem; OCTETSTRING is = bit2oct(b); @@ -49,7 +49,7 @@ namespace LibItsRtcmem__EncdecDeclarations { INTEGER fx__dec__RtcmemInd(BITSTRING &b, LibItsRtcmem__TypesAndValues::RtcmemInd &p_rtcmemInd) { loggers::get_instance().log(">>> fx__dec__RtcmemInd"); - RtcmemCodec codec; + rtcmem_codec codec; RTCMEM__PDU__Descriptions::RTCMEM rtcmem; OCTETSTRING is = bit2oct(b); @@ -163,27 +163,27 @@ namespace LibItsRtcmem__EncdecDeclarations { return 0; } - BITSTRING fx__enc__RTCMEM(const RTCMEM__PDU__Descriptions::RTCMEM &p_rtcmem) { - loggers::get_instance().log_msg(">>> fx__enc__RTCMEM: ", p_rtcmem); + // BITSTRING fx__enc__RTCMEM(const RTCMEM__PDU__Descriptions::RTCMEM &p_rtcmem) { + // loggers::get_instance().log_msg(">>> fx__enc__RTCMEM: ", p_rtcmem); - RtcmemCodec codec; - OCTETSTRING os; - codec.encode(p_rtcmem, os); - return oct2bit(os); - } + // rtcmem_codec codec; + // OCTETSTRING os; + // codec.encode(p_rtcmem, os); + // return oct2bit(os); + // } - INTEGER fx__dec__RTCMEM(BITSTRING &b, RTCMEM__PDU__Descriptions::RTCMEM &p) { - loggers::get_instance().log(">>> fx__dec__RTCMEM"); - RtcmemCodec codec; - OCTETSTRING is = bit2oct(b); + // INTEGER fx__dec__RTCMEM(BITSTRING &b, RTCMEM__PDU__Descriptions::RTCMEM &p) { + // loggers::get_instance().log(">>> fx__dec__RTCMEM"); + // rtcmem_codec codec; + // OCTETSTRING is = bit2oct(b); - if (codec.decode(OCTETSTRING(is.lengthof(), static_cast(is)), p) == -1) { - loggers::get_instance().warning("fx__dec__RTCMEM: -1 result code was returned"); - return -1; - } + // if (codec.decode(OCTETSTRING(is.lengthof(), static_cast(is)), p) == -1) { + // loggers::get_instance().warning("fx__dec__RTCMEM: -1 result code was returned"); + // return -1; + // } - return 0; - } + // return 0; + // } BITSTRING fx__enc__UtRtcmemInitialize(const LibItsRtcmem__TypesAndValues::UtRtcmemInitialize &p_utRtcmemInitialize) { loggers::get_instance().log_msg(">>> fx__enc__UtRtcmemInitialize: ", p_utRtcmemInitialize); diff --git a/ccsrc/EncDec/LibItsSaem_Encdec.cc b/ccsrc/EncDec/LibItsSaem_Encdec.cc index a2cb941..e56e3fe 100644 --- a/ccsrc/EncDec/LibItsSaem_Encdec.cc +++ b/ccsrc/EncDec/LibItsSaem_Encdec.cc @@ -174,27 +174,27 @@ namespace LibItsSaem__EncdecDeclarations { return 0; } - BITSTRING fx__enc__SAEM(const SAEM__PDU__Descriptions::SAEM &p_cam) { - loggers::get_instance().log_msg(">>> fx__enc__SAEM: ", p_cam); - - saem_codec codec; - OCTETSTRING os; - codec.encode(p_cam, os); - return oct2bit(os); - } - - INTEGER fx__dec__SAEM(BITSTRING &b, SAEM__PDU__Descriptions::SAEM &p) { - loggers::get_instance().log(">>> fx__dec__SAEM"); - saem_codec codec; - OCTETSTRING is = bit2oct(b); - - if (codec.decode(OCTETSTRING(is.lengthof(), static_cast(is)), p) == -1) { - loggers::get_instance().warning("fx__dec__SAEM: -1 result code was returned"); - return -1; - } - - return 0; - } + // BITSTRING fx__enc__SAEM(const SAEM__PDU__Descriptions::SAEM &p_cam) { + // loggers::get_instance().log_msg(">>> fx__enc__SAEM: ", p_cam); + + // saem_codec codec; + // OCTETSTRING os; + // codec.encode(p_cam, os); + // return oct2bit(os); + // } + + // INTEGER fx__dec__SAEM(BITSTRING &b, SAEM__PDU__Descriptions::SAEM &p) { + // loggers::get_instance().log(">>> fx__dec__SAEM"); + // saem_codec codec; + // OCTETSTRING is = bit2oct(b); + + // if (codec.decode(OCTETSTRING(is.lengthof(), static_cast(is)), p) == -1) { + // loggers::get_instance().warning("fx__dec__SAEM: -1 result code was returned"); + // return -1; + // } + + // return 0; + // } BITSTRING fx__enc__UtSaemInitialize(const LibItsSaem__TypesAndValues::UtSaemInitialize &p_utSaemInitialize) { loggers::get_instance().log_msg(">>> fx__enc__UtSaemInitialize: ", p_utSaemInitialize); diff --git a/ccsrc/EncDec/LibItsSecurity_Encdec.cc b/ccsrc/EncDec/LibItsSecurity_Encdec.cc index 4097ff3..c37fc57 100644 --- a/ccsrc/EncDec/LibItsSecurity_Encdec.cc +++ b/ccsrc/EncDec/LibItsSecurity_Encdec.cc @@ -9,109 +9,109 @@ namespace LibItsSecurity__EncdecDeclarations { - BITSTRING fx__enc__CertificateBase(Ieee1609Dot2::CertificateBase const &p_cert) { - loggers::get_instance().log_msg(">>> fx__enc__CertificateBase: ", p_cert); - - etsi_ts103097_certificate_codec codec; - OCTETSTRING os; - if (codec.encode(p_cert, os) == -1) { - loggers::get_instance().warning("fx__enc__CertificateBase: -1 result code was returned"); - return int2bit(0, 1); - } - - return oct2bit(os); - } - - INTEGER fx__dec__CertificateBase(BITSTRING &b, Ieee1609Dot2::CertificateBase &p_cert) { - loggers::get_instance().log_msg(">>> fx__dec__CertificateBase: ", b); - - etsi_ts103097_certificate_codec codec; - OCTETSTRING is = bit2oct(b); - if (codec.decode(is, p_cert) == -1) { - loggers::get_instance().warning("fx__dec__CertificateBase: -1 result code was returned"); - return -1; - } - - loggers::get_instance().log_msg("<<< fx__dec__CertificateBase: ", p_cert); - return 0; - } - - BITSTRING fx__enc__ToBeSignedCertificate(const Ieee1609Dot2::ToBeSignedCertificate &p_toBeSignedCertificate) { - loggers::get_instance().log_msg(">>> fx__enc__ToBeSignedCertificate: ", p_toBeSignedCertificate); - - etsi_ts103097_tobesigned_certificate_codec codec; - OCTETSTRING os; - if (codec.encode(p_toBeSignedCertificate, os) == -1) { - loggers::get_instance().warning("fx__enc__ToBeSignedCertificate: -1 result code was returned"); - return int2bit(0, 1); - } - - return oct2bit(os); - } - - BITSTRING fx__enc__Ieee1609Dot2Data(const Ieee1609Dot2::Ieee1609Dot2Data &p__ieee1609Dot2Data) { - loggers::get_instance().log_msg(">>> fx__enc__Ieee1609Dot2Data: ", p__ieee1609Dot2Data); - - etsi_ts103097_data_codec codec; - OCTETSTRING os; - if (codec.encode(p__ieee1609Dot2Data, os) == -1) { - loggers::get_instance().warning("fx__enc__Ieee1609Dot2Data: -1 result code was returned"); - return int2bit(0, 1); - } - - return oct2bit(os); - } - - INTEGER fx__dec__Ieee1609Dot2Data(BITSTRING &p__data, Ieee1609Dot2::Ieee1609Dot2Data &p__ieee1609Dot2Data) { - loggers::get_instance().log_msg(">>> fx__dec__Ieee1609Dot2Data: ", p__data); - - // Sanity check - if (p__data.lengthof() == 0) { - return -1; - } - - etsi_ts103097_data_codec codec; - OCTETSTRING is = bit2oct(p__data); - if (codec.decode(is, p__ieee1609Dot2Data) == -1) { - loggers::get_instance().warning("fx__dec__Ieee1609Dot2Data: -1 result code was returned"); - return -1; - } - - loggers::get_instance().log_msg("<<< fx__dec__Ieee1609Dot2Data: ", p__ieee1609Dot2Data); - return 0; - } - - BITSTRING fx__enc__Ieee1609Dot2ToBeSignedData(const Ieee1609Dot2::ToBeSignedData &p__toBeSignedData) { - loggers::get_instance().log_msg(">>> fx__enc__Ieee1609Dot2ToBeSignedData: ", p__toBeSignedData); - - etsi_ts103097_tobesigned_data_codec codec; - OCTETSTRING os; - if (codec.encode(p__toBeSignedData, os) == -1) { - loggers::get_instance().warning("fx__enc__Ieee1609Dot2ToBeSignedData: -1 result code was returned"); - return int2bit(0, 1); - } - - return oct2bit(os); - } - - INTEGER fx__dec__Ieee1609Dot2ToBeSignedData(BITSTRING &p__data, Ieee1609Dot2::ToBeSignedData &p__toBeSignedData) { - loggers::get_instance().log_msg(">>> fx__dec__Ieee1609Dot2ToBeSignedData: ", p__data); - - // Sanity check - if (p__data.lengthof() == 0) { - return -1; - } - - etsi_ts103097_tobesigned_data_codec codec; - OCTETSTRING is = bit2oct(p__data); - if (codec.decode(is, p__toBeSignedData) == -1) { - loggers::get_instance().warning("fx__dec__Ieee1609Dot2ToBeSignedData: -1 result code was returned"); - return -1; - } - - loggers::get_instance().log_msg("<<< fx__dec__Ieee1609Dot2ToBeSignedData: ", p__toBeSignedData); - return 0; - } + // BITSTRING fx__enc__CertificateBase(Ieee1609Dot2::CertificateBase const &p_cert) { + // loggers::get_instance().log_msg(">>> fx__enc__CertificateBase: ", p_cert); + + // etsi_ts103097_certificate_codec codec; + // OCTETSTRING os; + // if (codec.encode(p_cert, os) == -1) { + // loggers::get_instance().warning("fx__enc__CertificateBase: -1 result code was returned"); + // return int2bit(0, 1); + // } + + // return oct2bit(os); + // } + + // INTEGER fx__dec__CertificateBase(BITSTRING &b, Ieee1609Dot2::CertificateBase &p_cert) { + // loggers::get_instance().log_msg(">>> fx__dec__CertificateBase: ", b); + + // etsi_ts103097_certificate_codec codec; + // OCTETSTRING is = bit2oct(b); + // if (codec.decode(is, p_cert) == -1) { + // loggers::get_instance().warning("fx__dec__CertificateBase: -1 result code was returned"); + // return -1; + // } + + // loggers::get_instance().log_msg("<<< fx__dec__CertificateBase: ", p_cert); + // return 0; + // } + + // BITSTRING fx__enc__ToBeSignedCertificate(const Ieee1609Dot2::ToBeSignedCertificate &p_toBeSignedCertificate) { + // loggers::get_instance().log_msg(">>> fx__enc__ToBeSignedCertificate: ", p_toBeSignedCertificate); + + // etsi_ts103097_tobesigned_certificate_codec codec; + // OCTETSTRING os; + // if (codec.encode(p_toBeSignedCertificate, os) == -1) { + // loggers::get_instance().warning("fx__enc__ToBeSignedCertificate: -1 result code was returned"); + // return int2bit(0, 1); + // } + + // return oct2bit(os); + // } + + // BITSTRING fx__enc__Ieee1609Dot2Data(const Ieee1609Dot2::Ieee1609Dot2Data &p__ieee1609Dot2Data) { + // loggers::get_instance().log_msg(">>> fx__enc__Ieee1609Dot2Data: ", p__ieee1609Dot2Data); + + // etsi_ts103097_data_codec codec; + // OCTETSTRING os; + // if (codec.encode(p__ieee1609Dot2Data, os) == -1) { + // loggers::get_instance().warning("fx__enc__Ieee1609Dot2Data: -1 result code was returned"); + // return int2bit(0, 1); + // } + + // return oct2bit(os); + // } + + // INTEGER fx__dec__Ieee1609Dot2Data(BITSTRING &p__data, Ieee1609Dot2::Ieee1609Dot2Data &p__ieee1609Dot2Data) { + // loggers::get_instance().log_msg(">>> fx__dec__Ieee1609Dot2Data: ", p__data); + + // // Sanity check + // if (p__data.lengthof() == 0) { + // return -1; + // } + + // etsi_ts103097_data_codec codec; + // OCTETSTRING is = bit2oct(p__data); + // if (codec.decode(is, p__ieee1609Dot2Data) == -1) { + // loggers::get_instance().warning("fx__dec__Ieee1609Dot2Data: -1 result code was returned"); + // return -1; + // } + + // loggers::get_instance().log_msg("<<< fx__dec__Ieee1609Dot2Data: ", p__ieee1609Dot2Data); + // return 0; + // } + + // BITSTRING fx__enc__Ieee1609Dot2ToBeSignedData(const Ieee1609Dot2::ToBeSignedData &p__toBeSignedData) { + // loggers::get_instance().log_msg(">>> fx__enc__Ieee1609Dot2ToBeSignedData: ", p__toBeSignedData); + + // etsi_ts103097_tobesigned_data_codec codec; + // OCTETSTRING os; + // if (codec.encode(p__toBeSignedData, os) == -1) { + // loggers::get_instance().warning("fx__enc__Ieee1609Dot2ToBeSignedData: -1 result code was returned"); + // return int2bit(0, 1); + // } + + // return oct2bit(os); + // } + + // INTEGER fx__dec__Ieee1609Dot2ToBeSignedData(BITSTRING &p__data, Ieee1609Dot2::ToBeSignedData &p__toBeSignedData) { + // loggers::get_instance().log_msg(">>> fx__dec__Ieee1609Dot2ToBeSignedData: ", p__data); + + // // Sanity check + // if (p__data.lengthof() == 0) { + // return -1; + // } + + // etsi_ts103097_tobesigned_data_codec codec; + // OCTETSTRING is = bit2oct(p__data); + // if (codec.decode(is, p__toBeSignedData) == -1) { + // loggers::get_instance().warning("fx__dec__Ieee1609Dot2ToBeSignedData: -1 result code was returned"); + // return -1; + // } + + // loggers::get_instance().log_msg("<<< fx__dec__Ieee1609Dot2ToBeSignedData: ", p__toBeSignedData); + // return 0; + // } BITSTRING fx__enc__SspCAM(const LibItsSecurity__TypesAndValues::SspCAM &p__ssp) { loggers::get_instance().log_msg(">>> fx__enc__SspCAM: ", p__ssp); diff --git a/ccsrc/EncDec/LibItsSremSsem_Encdec.cc b/ccsrc/EncDec/LibItsSremSsem_Encdec.cc index 831bb7f..532cc2b 100644 --- a/ccsrc/EncDec/LibItsSremSsem_Encdec.cc +++ b/ccsrc/EncDec/LibItsSremSsem_Encdec.cc @@ -2,8 +2,8 @@ #include "LibItsSremSsem_EncdecDeclarations.hh" -#include "SremCodec.hh" -#include "SsemCodec.hh" +#include "srem_codec.hh" +#include "ssem_codec.hh" #include "UpperTesterSremSsemCodec.hh" #include "loggers.hh" @@ -16,7 +16,7 @@ namespace LibItsSremSsem__EncdecDeclarations { BITSTRING fx__enc__SremReq(const LibItsSremSsem__TypesAndValues::SremReq &p_sremReq) { loggers::get_instance().log_msg(">>> fx__enc__SremReq: ", p_sremReq); - SremCodec codec; + srem_codec codec; OCTETSTRING os; if (codec.encode(p_sremReq.msgOut(), os) == -1) { loggers::get_instance().warning("fx__enc__SremReq: -1 result code was returned"); @@ -34,7 +34,7 @@ namespace LibItsSremSsem__EncdecDeclarations { INTEGER fx__dec__SremReq(BITSTRING &b, LibItsSremSsem__TypesAndValues::SremReq &p) { loggers::get_instance().log(">>> fx__dec__SremReq"); - SremCodec codec; + srem_codec codec; SREM__PDU__Descriptions::SREM srem; OCTETSTRING is = bit2oct(b); @@ -55,7 +55,7 @@ namespace LibItsSremSsem__EncdecDeclarations { BITSTRING fx__enc__SremInd(const LibItsSremSsem__TypesAndValues::SremInd &p_sremInd) { loggers::get_instance().log_msg(">>> fx__enc__SremInd: ", p_sremInd); - SremCodec codec; + srem_codec codec; OCTETSTRING os; if (codec.encode(p_sremInd.msgIn(), os) == -1) { loggers::get_instance().warning("fx__enc__SremInd: -1 result code was returned"); @@ -73,7 +73,7 @@ namespace LibItsSremSsem__EncdecDeclarations { INTEGER fx__dec__SremInd(BITSTRING &b, LibItsSremSsem__TypesAndValues::SremInd &p_sremInd) { loggers::get_instance().log(">>> fx__dec__SremInd"); - SremCodec codec; + srem_codec codec; SREM__PDU__Descriptions::SREM srem; OCTETSTRING is = bit2oct(b); @@ -187,27 +187,27 @@ namespace LibItsSremSsem__EncdecDeclarations { return 0; } - BITSTRING fx__enc__SREM(const SREM__PDU__Descriptions::SREM &p_srem) { - loggers::get_instance().log_msg(">>> fx__enc__SREM: ", p_srem); + // BITSTRING fx__enc__SREM(const SREM__PDU__Descriptions::SREM &p_srem) { + // loggers::get_instance().log_msg(">>> fx__enc__SREM: ", p_srem); - SremCodec codec; - OCTETSTRING os; - codec.encode(p_srem, os); - return oct2bit(os); - } + // srem_codec codec; + // OCTETSTRING os; + // codec.encode(p_srem, os); + // return oct2bit(os); + // } - INTEGER fx__dec__SREM(BITSTRING &b, SREM__PDU__Descriptions::SREM &p) { - loggers::get_instance().log(">>> fx__dec__SREM"); - SremCodec codec; - OCTETSTRING is = bit2oct(b); + // INTEGER fx__dec__SREM(BITSTRING &b, SREM__PDU__Descriptions::SREM &p) { + // loggers::get_instance().log(">>> fx__dec__SREM"); + // srem_codec codec; + // OCTETSTRING is = bit2oct(b); - if (codec.decode(OCTETSTRING(is.lengthof(), static_cast(is)), p) == -1) { - loggers::get_instance().warning("fx__dec__Srem: -1 result code was returned"); - return -1; - } + // if (codec.decode(OCTETSTRING(is.lengthof(), static_cast(is)), p) == -1) { + // loggers::get_instance().warning("fx__dec__Srem: -1 result code was returned"); + // return -1; + // } - return 0; - } + // return 0; + // } /**************************************************** * @desc External function to encode a SsemReq type @@ -217,7 +217,7 @@ namespace LibItsSremSsem__EncdecDeclarations { BITSTRING fx__enc__SsemReq(const LibItsSremSsem__TypesAndValues::SsemReq &p_ssemReq) { loggers::get_instance().log_msg(">>> fx__enc__SsemReq: ", p_ssemReq); - SsemCodec codec; + ssem_codec codec; OCTETSTRING os; if (codec.encode(p_ssemReq.msgOut(), os) == -1) { loggers::get_instance().warning("fx__enc__SsemReq: -1 result code was returned"); @@ -235,7 +235,7 @@ namespace LibItsSremSsem__EncdecDeclarations { INTEGER fx__dec__SsemReq(BITSTRING &b, LibItsSremSsem__TypesAndValues::SsemReq &p) { loggers::get_instance().log(">>> fx__dec__SsemReq"); - SsemCodec codec; + ssem_codec codec; SSEM__PDU__Descriptions::SSEM ssem; OCTETSTRING is = bit2oct(b); @@ -256,7 +256,7 @@ namespace LibItsSremSsem__EncdecDeclarations { BITSTRING fx__enc__SsemInd(const LibItsSremSsem__TypesAndValues::SsemInd &p_ssemInd) { loggers::get_instance().log_msg(">>> fx__enc__SsemInd: ", p_ssemInd); - SsemCodec codec; + ssem_codec codec; OCTETSTRING os; if (codec.encode(p_ssemInd.msgIn(), os) == -1) { loggers::get_instance().warning("fx__enc__SsemInd: -1 result code was returned"); @@ -274,7 +274,7 @@ namespace LibItsSremSsem__EncdecDeclarations { INTEGER fx__dec__SsemInd(BITSTRING &b, LibItsSremSsem__TypesAndValues::SsemInd &p_ssemInd) { loggers::get_instance().log(">>> fx__dec__SsemInd"); - SsemCodec codec; + ssem_codec codec; SSEM__PDU__Descriptions::SSEM ssem; OCTETSTRING is = bit2oct(b); @@ -388,27 +388,27 @@ namespace LibItsSremSsem__EncdecDeclarations { return 0; } - BITSTRING fx__enc__SSEM(const SSEM__PDU__Descriptions::SSEM &p_ssem) { - loggers::get_instance().log_msg(">>> fx__enc__SSEM: ", p_ssem); + // BITSTRING fx__enc__SSEM(const SSEM__PDU__Descriptions::SSEM &p_ssem) { + // loggers::get_instance().log_msg(">>> fx__enc__SSEM: ", p_ssem); - SsemCodec codec; - OCTETSTRING os; - codec.encode(p_ssem, os); - return oct2bit(os); - } + // ssem_codec codec; + // OCTETSTRING os; + // codec.encode(p_ssem, os); + // return oct2bit(os); + // } - INTEGER fx__dec__SSEM(BITSTRING &b, SSEM__PDU__Descriptions::SSEM &p_ssem) { - loggers::get_instance().log(">>> fx__dec__SSEM"); - SsemCodec codec; - OCTETSTRING is = bit2oct(b); + // INTEGER fx__dec__SSEM(BITSTRING &b, SSEM__PDU__Descriptions::SSEM &p_ssem) { + // loggers::get_instance().log(">>> fx__dec__SSEM"); + // ssem_codec codec; + // OCTETSTRING is = bit2oct(b); - if (codec.decode(OCTETSTRING(is.lengthof(), static_cast(is)), p_ssem) == -1) { - loggers::get_instance().warning("fx__dec__Ssem: -1 result code was returned"); - return -1; - } + // if (codec.decode(OCTETSTRING(is.lengthof(), static_cast(is)), p_ssem) == -1) { + // loggers::get_instance().warning("fx__dec__Ssem: -1 result code was returned"); + // return -1; + // } - return 0; - } + // return 0; + // } BITSTRING fx__enc__UtSremInitialize(const LibItsSremSsem__TypesAndValues::UtSremInitialize &p_utSremInitialize) { loggers::get_instance().log_msg(">>> fx__enc__UtSremInitialize: ", p_utSremInitialize); diff --git a/ccsrc/EncDec/LibItsVru_Encdec.cc b/ccsrc/EncDec/LibItsVru_Encdec.cc index 6582aa2..ea02ed1 100644 --- a/ccsrc/EncDec/LibItsVru_Encdec.cc +++ b/ccsrc/EncDec/LibItsVru_Encdec.cc @@ -173,27 +173,27 @@ namespace LibItsVru__EncdecDeclarations { return 0; } - BITSTRING fx__enc__VAM(const VAM__PDU__Descriptions::VAM &p_vru) { - loggers::get_instance().log_msg(">>> fx__enc__VAM: ", p_vru); - - vru_codec codec; - OCTETSTRING os; - codec.encode(p_vru, os); - return oct2bit(os); - } - - INTEGER fx__dec__VAM(BITSTRING &b, VAM__PDU__Descriptions::VAM &p) { - loggers::get_instance().log(">>> fx__dec__VAM"); - vru_codec codec; - OCTETSTRING is = bit2oct(b); - - if (codec.decode(OCTETSTRING(is.lengthof(), static_cast(is)), p) == -1) { - loggers::get_instance().warning("fx__dec__VAM: -1 result code was returned"); - return -1; - } - - return 0; - } + // BITSTRING fx__enc__VAM(const VAM__PDU__Descriptions::VAM &p_vru) { + // loggers::get_instance().log_msg(">>> fx__enc__VAM: ", p_vru); + + // vru_codec codec; + // OCTETSTRING os; + // codec.encode(p_vru, os); + // return oct2bit(os); + // } + + // INTEGER fx__dec__VAM(BITSTRING &b, VAM__PDU__Descriptions::VAM &p) { + // loggers::get_instance().log(">>> fx__dec__VAM"); + // vru_codec codec; + // OCTETSTRING is = bit2oct(b); + + // if (codec.decode(OCTETSTRING(is.lengthof(), static_cast(is)), p) == -1) { + // loggers::get_instance().warning("fx__dec__VAM: -1 result code was returned"); + // return -1; + // } + + // return 0; + // } BITSTRING fx__enc__UtVamInitialize(const LibItsVru__TypesAndValues::UtVamInitialize &p_utVamInitialize) { loggers::get_instance().log_msg(">>> fx__enc__UtVamInitialize: ", p_utVamInitialize); diff --git a/ccsrc/Ports/LibIts_ports/RSUsSimulator_ports/ConfigRsuSimulatorCodec.cc b/ccsrc/Ports/LibIts_ports/RSUsSimulator_ports/ConfigRsuSimulatorCodec.cc index 4a373aa..99624ec 100644 --- a/ccsrc/Ports/LibIts_ports/RSUsSimulator_ports/ConfigRsuSimulatorCodec.cc +++ b/ccsrc/Ports/LibIts_ports/RSUsSimulator_ports/ConfigRsuSimulatorCodec.cc @@ -6,15 +6,15 @@ #include "ItsRSUsSimulator_TestSystem.hh" -int ConfigRsuSimulatorCodec::encode(const Record_Type &msg, OCTETSTRING &data) { +int ConfigRsuSimulatorCodec::encode(const Record_Type &msg, OCTETSTRING &p_data) { loggers::get_instance().log_msg(">>> ConfigRsuSimulatorCodec::encode: ", (const Base_Type &)msg); TTCN_EncDec::clear_error(); TTCN_Buffer encoding_buffer; encode_(msg, *msg.get_descriptor(), encoding_buffer); - data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); + p_data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); - loggers::get_instance().log_msg("<<< ConfigRsuSimulatorCodec::encode: data=", data); + loggers::get_instance().log_msg("<<< ConfigRsuSimulatorCodec::encode: p_data=", p_data); return 0; } @@ -44,9 +44,9 @@ int ConfigRsuSimulatorCodec::encode_(const Base_Type &type, const TTCN_Typedescr return 0; } -int ConfigRsuSimulatorCodec::decode(const OCTETSTRING &data, Record_Type &msg, params_its *params) { +int ConfigRsuSimulatorCodec::decode(const OCTETSTRING &p_data, Record_Type &msg, params_its *params) { TTCN_EncDec::clear_error(); - TTCN_Buffer decoding_buffer(data); + TTCN_Buffer decoding_buffer(p_data); _params = params; loggers::get_instance().log_to_hexa(">>> ConfigRsuSimulatorCodec::decode: decoding_buffer=", decoding_buffer); diff --git a/ccsrc/Ports/LibIts_ports/RSUsSimulator_ports/ConfigRsuSimulatorCodec.hh b/ccsrc/Ports/LibIts_ports/RSUsSimulator_ports/ConfigRsuSimulatorCodec.hh index 3208e99..03efa6d 100644 --- a/ccsrc/Ports/LibIts_ports/RSUsSimulator_ports/ConfigRsuSimulatorCodec.hh +++ b/ccsrc/Ports/LibIts_ports/RSUsSimulator_ports/ConfigRsuSimulatorCodec.hh @@ -19,6 +19,6 @@ public: explicit ConfigRsuSimulatorCodec() : codec(){}; virtual ~ConfigRsuSimulatorCodec(){}; - virtual int encode(const Record_Type &, OCTETSTRING &data); - virtual int decode(const OCTETSTRING &data, Record_Type &, params_its *params = NULL); + virtual int encode(const Record_Type &, OCTETSTRING &p_data); + virtual int decode(const OCTETSTRING &p_data, Record_Type &, params_its *params = NULL); }; // End of class ConfigRsuSimulatorCodec diff --git a/ccsrc/Ports/LibIts_ports/RSUsSimulator_ports/ConfigRsuSimulatorLayer.cc b/ccsrc/Ports/LibIts_ports/RSUsSimulator_ports/ConfigRsuSimulatorLayer.cc index f485eb4..320006f 100644 --- a/ccsrc/Ports/LibIts_ports/RSUsSimulator_ports/ConfigRsuSimulatorLayer.cc +++ b/ccsrc/Ports/LibIts_ports/RSUsSimulator_ports/ConfigRsuSimulatorLayer.cc @@ -581,80 +581,80 @@ void ConfigRsuSimulatorLayer::sendMsg(const LibItsSaem__TypesAndValues::UtSaemEv send_data(data, _params); } -void ConfigRsuSimulatorLayer::send_data(OCTETSTRING &data, params ¶ms) { - loggers::get_instance().log_msg(">>> ConfigRsuSimulatorLayer::send_data: ", data); +void ConfigRsuSimulatorLayer::send_data(OCTETSTRING &p_data, params ¶ms) { + loggers::get_instance().log_msg(">>> ConfigRsuSimulatorLayer::send_data: ", p_data); - send_to_all_layers(data, params); + send_to_all_layers(p_data, params); } -void ConfigRsuSimulatorLayer::receive_data(OCTETSTRING &data, params ¶ms) { // FIXME To be moved into ConfigRsuSimulatorCodec - loggers::get_instance().log_msg(">>> ConfigRsuSimulatorLayer::receive_data: ", data); +void ConfigRsuSimulatorLayer::receive_data(OCTETSTRING &p_data, params ¶ms) { // FIXME To be moved into ConfigRsuSimulatorCodec + loggers::get_instance().log_msg(">>> ConfigRsuSimulatorLayer::receive_data: ", p_data); - uint8_t id = *(static_cast(data)); + uint8_t id = *(static_cast(p_data)); if (id == 0x00) { // Receive an UtxxInitialise - process_utinitialize_data(data, params); + process_utinitialize_data(p_data, params); } else if (id == uppertester_cam_codec::c_utCamChangeCurvature) { - process_ut_cam_changecurvature_data(data, params); + process_ut_cam_changecurvature_data(p_data, params); } else if (id == uppertester_cam_codec::c_utCamChangeSpeed) { - process_ut_cam_changespeed_data(data, params); + process_ut_cam_changespeed_data(p_data, params); } else if (id == uppertester_cam_codec::c_utCamChangeHeading) { - process_ut_cam_changeheading_data(data, params); + process_ut_cam_changeheading_data(p_data, params); } else if (id == uppertester_cam_codec::c_utCamSetVehicleRole) { - process_ut_cam_setvehiclerole_data(data, params); + process_ut_cam_setvehiclerole_data(p_data, params); } else if (id == uppertester_cam_codec::c_utCamChangePseudonym) { - process_ut_cam_changepseudonym(data, params); + process_ut_cam_changepseudonym(p_data, params); } else if (id == uppertester_denm_codec::c_utDenmTrigger) { - process_ut_denm_trigger(data, params); + process_ut_denm_trigger(p_data, params); } else if (id == uppertester_denm_codec::c_utDenmUpdate) { - process_ut_denm_update(data, params); + process_ut_denm_update(p_data, params); } else if (id == uppertester_denm_codec::c_utDenmTermination) { - process_ut_denm_termination(data, params); + process_ut_denm_termination(p_data, params); } else if (id == uppertester_denm_codec::c_utDenmChangePseudonym) { - process_ut_denm_changepseudonym(data, params); + process_ut_denm_changepseudonym(p_data, params); } else if (id == uppertester_mapem_spatem_codec::c_utMapemSpatemTrigger) { - process_ut_mapem_spatem_trigger(data, params); + process_ut_mapem_spatem_trigger(p_data, params); } else if (id == uppertester_ivim_codec::c_utIvimTrigger) { - process_ut_ivim_trigger(data, params); + process_ut_ivim_trigger(p_data, params); } else if (id == uppertester_ivim_codec::c_utIvimUpdate) { - process_ut_ivim_update(data, params); + process_ut_ivim_update(p_data, params); } else if (id == uppertester_ivim_codec::c_utIvimTermination) { - process_ut_ivim_termination(data, params); + process_ut_ivim_termination(p_data, params); } else if (id == UpperTesterSremSsemCodec::c_utSremTrigger) { - process_ut_srem_trigger(data, params); + process_ut_srem_trigger(p_data, params); } else if (id == UpperTesterSremSsemCodec::c_utSremUpdate) { - process_ut_srem_update(data, params); + process_ut_srem_update(p_data, params); } else if (id == UpperTesterSremSsemCodec::c_utSremCancelation) { - process_ut_srem_termination(data, params); + process_ut_srem_termination(p_data, params); } else if (id == UpperTesterRtcmemCodec::c_utRtcmemTrigger) { - process_ut_rtcmem_trigger(data, params); + process_ut_rtcmem_trigger(p_data, params); } else if (id == UpperTesterRtcmemCodec::c_utRtcmemUpdate) { - process_ut_rtcmem_update(data, params); + process_ut_rtcmem_update(p_data, params); } else if (id == UpperTesterRtcmemCodec::c_utRtcmemTermination) { - process_ut_rtcmem_termination(data, params); + process_ut_rtcmem_termination(p_data, params); } else if ((id >= uppertester_geonetworking_codec::c_utGnTrigger_GeoUnicast) && (id <= uppertester_geonetworking_codec::c_utGnTrigger_Tsb)) { // Receive an UtGnTrigger - process_ut_geonetworking_trigger(data, params); + process_ut_geonetworking_trigger(p_data, params); } else if ((id == uppertester_pki_codec::c_utPkiTriggerEnrolmentRequest) || (id == uppertester_pki_codec::c_utPkiTriggerAuthorizationRequest)) { // Receive an UtPkiTrigger - process_ut_pki_trigger(data, params); + process_ut_pki_trigger(p_data, params); } else if (id == uppertester_vru_codec::c_utVamTrigger) { // Receive an UtVamTrigger - process_ut_vam_trigger(data, params); + process_ut_vam_trigger(p_data, params); } else if (id == uppertester_cps_codec::c_utCpmTrigger) { // Receive an UtCpmTrigger - process_ut_cpm_trigger(data, params); + process_ut_cpm_trigger(p_data, params); } else if (id == uppertester_avm_codec::c_utAvmTrigger) { // Receive an UtAvmTrigger - process_ut_vam_trigger(data, params); + process_ut_vam_trigger(p_data, params); } else if (id == uppertester_pim_codec::c_utPimTrigger) { // Receive an UtPimTrigger - process_ut_vam_trigger(data, params); + process_ut_vam_trigger(p_data, params); } else if (id == uppertester_saem_codec::c_utSaemTrigger) { // Receive an UtSaemTrigger - process_ut_vam_trigger(data, params); + process_ut_vam_trigger(p_data, params); } else if (id == uppertester_mbr_codec::c_utMbrTrigger) { // Receive an UtMbrTrigger - process_ut_mbr_trigger(data, params); + process_ut_mbr_trigger(p_data, params); } else { loggers::get_instance().warning("ConfigRsuSimulatorLayer::receive_data: Unsupported tag %02x", id); } } -int ConfigRsuSimulatorLayer::process_utinitialize_data(const OCTETSTRING &data, params ¶ms) { +int ConfigRsuSimulatorLayer::process_utinitialize_data(const OCTETSTRING &p_data, params ¶ms) { loggers::get_instance().log(">>> ConfigRsuSimulatorLayer::process_utinitialize_data"); params::const_iterator it = _params.find("ut"); @@ -664,72 +664,72 @@ int ConfigRsuSimulatorLayer::process_utinitialize_data(const OCTETSTRING &data, } if (_params[std::string("ut")].compare("gn") == 0) { - OCTETSTRING hashedId(data.lengthof() - 1, 1 + static_cast(data)); + OCTETSTRING hashedId(p_data.lengthof() - 1, 1 + static_cast(p_data)); LibItsGeoNetworking__TypesAndValues::UtGnInitialize p(hashedId); // Pass it to the ports if any to_all_upper_ports(p, params); } else if (_params[std::string("ut")].compare("cam") == 0) { - OCTETSTRING hashedId(data.lengthof() - 1, 1 + static_cast(data)); + OCTETSTRING hashedId(p_data.lengthof() - 1, 1 + static_cast(p_data)); LibItsCam__TypesAndValues::UtCamInitialize p(hashedId); // Pass it to the ports if any to_all_upper_ports(p, params); } else if (_params[std::string("ut")].compare("denm") == 0) { - OCTETSTRING hashedId(data.lengthof() - 1, 1 + static_cast(data)); + OCTETSTRING hashedId(p_data.lengthof() - 1, 1 + static_cast(p_data)); LibItsDenm__TypesAndValues::UtDenmInitialize p(hashedId); // Pass it to the ports if any to_all_upper_ports(p, params); } else if (_params[std::string("ut")].compare("pki") == 0) { - OCTETSTRING hashedId(data.lengthof() - 1, 1 + static_cast(data)); + OCTETSTRING hashedId(p_data.lengthof() - 1, 1 + static_cast(p_data)); LibItsPki__TypesAndValues::UtPkiInitialize p(hashedId); // Pass it to the ports if any to_all_upper_ports(p, params); } else if (_params[std::string("ut")].compare("ivim") == 0) { - OCTETSTRING hashedId(data.lengthof() - 1, 1 + static_cast(data)); + OCTETSTRING hashedId(p_data.lengthof() - 1, 1 + static_cast(p_data)); LibItsIvim__TypesAndValues::UtIvimInitialize p(hashedId); // Pass it to the ports if any to_all_upper_ports(p, params); } else if (_params[std::string("ut")].compare("mapemspatem") == 0) { - OCTETSTRING hashedId(data.lengthof() - 1, 1 + static_cast(data)); + OCTETSTRING hashedId(p_data.lengthof() - 1, 1 + static_cast(p_data)); LibItsMapemSpatem__TypesAndValues::UtMapemSpatemInitialize p(hashedId); // Pass it to the ports if any to_all_upper_ports(p, params); } else if (_params[std::string("ut")].compare("sremssem") == 0) { - OCTETSTRING hashedId(data.lengthof() - 1, 1 + static_cast(data)); + OCTETSTRING hashedId(p_data.lengthof() - 1, 1 + static_cast(p_data)); LibItsSremSsem__TypesAndValues::UtSremInitialize p(hashedId); // Pass it to the ports if any to_all_upper_ports(p, params); } else if (_params[std::string("ut")].compare("rtcmem") == 0) { - OCTETSTRING hashedId(data.lengthof() - 1, 1 + static_cast(data)); + OCTETSTRING hashedId(p_data.lengthof() - 1, 1 + static_cast(p_data)); LibItsRtcmem__TypesAndValues::UtRtcmemInitialize p(hashedId); // Pass it to the ports if any to_all_upper_ports(p, params); } else if (_params[std::string("ut")].compare("mbr") == 0) { - OCTETSTRING hashedId(data.lengthof() - 1, 1 + static_cast(data)); + OCTETSTRING hashedId(p_data.lengthof() - 1, 1 + static_cast(p_data)); LibItsMbr__TypesAndValues::UtMbrInitialize p(hashedId); // Pass it to the ports if any to_all_upper_ports(p, params); } else if (_params[std::string("ut")].compare("vam") == 0) { - OCTETSTRING hashedId(data.lengthof() - 1, 1 + static_cast(data)); + OCTETSTRING hashedId(p_data.lengthof() - 1, 1 + static_cast(p_data)); LibItsVru__TypesAndValues::UtVamInitialize p(hashedId); // Pass it to the ports if any to_all_upper_ports(p, params); } else if (_params[std::string("ut")].compare("cpm") == 0) { - OCTETSTRING hashedId(data.lengthof() - 1, 1 + static_cast(data)); + OCTETSTRING hashedId(p_data.lengthof() - 1, 1 + static_cast(p_data)); LibItsCps__TypesAndValues::UtCpmInitialize p(hashedId); // Pass it to the ports if any to_all_upper_ports(p, params); } else if (_params[std::string("ut")].compare("avm") == 0) { - OCTETSTRING hashedId(data.lengthof() - 1, 1 + static_cast(data)); + OCTETSTRING hashedId(p_data.lengthof() - 1, 1 + static_cast(p_data)); LibItsAvm__TypesAndValues::UtAvmInitialize p(hashedId); // Pass it to the ports if any to_all_upper_ports(p, params); } else if (_params[std::string("ut")].compare("pim") == 0) { - OCTETSTRING hashedId(data.lengthof() - 1, 1 + static_cast(data)); + OCTETSTRING hashedId(p_data.lengthof() - 1, 1 + static_cast(p_data)); LibItsPim__TypesAndValues::UtPimInitialize p(hashedId); // Pass it to the ports if any to_all_upper_ports(p, params); } else if (_params[std::string("ut")].compare("saem") == 0) { - OCTETSTRING hashedId(data.lengthof() - 1, 1 + static_cast(data)); + OCTETSTRING hashedId(p_data.lengthof() - 1, 1 + static_cast(p_data)); LibItsSaem__TypesAndValues::UtSaemInitialize p(hashedId); // Pass it to the ports if any to_all_upper_ports(p, params); @@ -741,7 +741,7 @@ int ConfigRsuSimulatorLayer::process_utinitialize_data(const OCTETSTRING &data, return 0; } -int ConfigRsuSimulatorLayer::process_ut_cam_changepseudonym(const OCTETSTRING &data, params ¶ms) { +int ConfigRsuSimulatorLayer::process_ut_cam_changepseudonym(const OCTETSTRING &p_data, params ¶ms) { loggers::get_instance().log(">>> ConfigRsuSimulatorLayer::process_ut_cam_changepseudonym"); params::const_iterator it = _params.find("ut"); @@ -751,7 +751,7 @@ int ConfigRsuSimulatorLayer::process_ut_cam_changepseudonym(const OCTETSTRING &d } if (_params[std::string("ut")].compare("cam") == 0) { - OCTETSTRING hashedId(data.lengthof() - 1, 1 + static_cast(data)); + OCTETSTRING hashedId(p_data.lengthof() - 1, 1 + static_cast(p_data)); LibItsCam__TypesAndValues::UtCamChangePseudonym p(hashedId); // Pass it to the ports if any to_all_upper_ports(p, params); @@ -763,7 +763,7 @@ int ConfigRsuSimulatorLayer::process_ut_cam_changepseudonym(const OCTETSTRING &d return 0; } -int ConfigRsuSimulatorLayer::process_ut_cam_changespeed_data(const OCTETSTRING &data, params ¶ms) { +int ConfigRsuSimulatorLayer::process_ut_cam_changespeed_data(const OCTETSTRING &p_data, params ¶ms) { loggers::get_instance().log(">>> ConfigRsuSimulatorLayer::process_ut_cam_changespeed_data"); params::const_iterator it = _params.find("ut"); @@ -773,7 +773,7 @@ int ConfigRsuSimulatorLayer::process_ut_cam_changespeed_data(const OCTETSTRING & } if (_params[std::string("ut")].compare("cam") == 0) { - OCTETSTRING speed(data.lengthof() - 1, 1 + static_cast(data)); + OCTETSTRING speed(p_data.lengthof() - 1, 1 + static_cast(p_data)); LibItsCam__TypesAndValues::UtCamTrigger p; p.changeSpeed() = oct2int(speed); // Pass it to the ports if any @@ -786,7 +786,7 @@ int ConfigRsuSimulatorLayer::process_ut_cam_changespeed_data(const OCTETSTRING & return 0; } -int ConfigRsuSimulatorLayer::process_ut_cam_changecurvature_data(const OCTETSTRING &data, params ¶ms) { +int ConfigRsuSimulatorLayer::process_ut_cam_changecurvature_data(const OCTETSTRING &p_data, params ¶ms) { loggers::get_instance().log(">>> ConfigRsuSimulatorLayer::process_ut_cam_changecurvature_data"); params::const_iterator it = _params.find("ut"); @@ -796,7 +796,7 @@ int ConfigRsuSimulatorLayer::process_ut_cam_changecurvature_data(const OCTETSTRI } if (_params[std::string("ut")].compare("cam") == 0) { - OCTETSTRING curvature(data.lengthof() - 1, 1 + static_cast(data)); + OCTETSTRING curvature(p_data.lengthof() - 1, 1 + static_cast(p_data)); LibItsCam__TypesAndValues::UtCamTrigger p; p.changeCurvature() = oct2int(curvature); // Pass it to the ports if any @@ -809,7 +809,7 @@ int ConfigRsuSimulatorLayer::process_ut_cam_changecurvature_data(const OCTETSTRI return 0; } -int ConfigRsuSimulatorLayer::process_ut_cam_changeheading_data(const OCTETSTRING &data, params ¶ms) { +int ConfigRsuSimulatorLayer::process_ut_cam_changeheading_data(const OCTETSTRING &p_data, params ¶ms) { loggers::get_instance().log(">>> ConfigRsuSimulatorLayer::process_ut_cam_changeheading_data"); params::const_iterator it = _params.find("ut"); @@ -819,7 +819,7 @@ int ConfigRsuSimulatorLayer::process_ut_cam_changeheading_data(const OCTETSTRING } if (_params[std::string("ut")].compare("cam") == 0) { - OCTETSTRING heading(data.lengthof() - 1, 1 + static_cast(data)); + OCTETSTRING heading(p_data.lengthof() - 1, 1 + static_cast(p_data)); LibItsCam__TypesAndValues::UtCamTrigger p; p.changeHeading() = oct2int(heading); // Pass it to the ports if any @@ -832,7 +832,7 @@ int ConfigRsuSimulatorLayer::process_ut_cam_changeheading_data(const OCTETSTRING return 0; } -int ConfigRsuSimulatorLayer::process_ut_cam_setvehiclerole_data(const OCTETSTRING &data, params ¶ms) { +int ConfigRsuSimulatorLayer::process_ut_cam_setvehiclerole_data(const OCTETSTRING &p_data, params ¶ms) { loggers::get_instance().log(">>> ConfigRsuSimulatorLayer::process_ut_cam_setvehiclerole_data"); params::const_iterator it = _params.find("ut"); @@ -842,7 +842,7 @@ int ConfigRsuSimulatorLayer::process_ut_cam_setvehiclerole_data(const OCTETSTRIN } if (_params[std::string("ut")].compare("cam") == 0) { - OCTETSTRING vehicle_role(data.lengthof() - 1, 1 + static_cast(data)); + OCTETSTRING vehicle_role(p_data.lengthof() - 1, 1 + static_cast(p_data)); LibItsCam__TypesAndValues::UtCamTrigger p; p.setVehicleRole() = oct2int(vehicle_role); // Pass it to the ports if any @@ -855,8 +855,8 @@ int ConfigRsuSimulatorLayer::process_ut_cam_setvehiclerole_data(const OCTETSTRIN return 0; } -int ConfigRsuSimulatorLayer::process_ut_denm_trigger(const OCTETSTRING &data, params ¶ms) { - loggers::get_instance().log_msg(">>> ConfigRsuSimulatorLayer::process_ut_denm_trigger", data); +int ConfigRsuSimulatorLayer::process_ut_denm_trigger(const OCTETSTRING &p_data, params ¶ms) { + loggers::get_instance().log_msg(">>> ConfigRsuSimulatorLayer::process_ut_denm_trigger", p_data); params::const_iterator it = _params.find("ut"); if (it == _params.cend()) { @@ -865,7 +865,7 @@ int ConfigRsuSimulatorLayer::process_ut_denm_trigger(const OCTETSTRING &data, pa } if (_params[std::string("ut")].compare("denm") == 0) { - uint8_t *p = (uint8_t *)static_cast(data); + uint8_t *p = (uint8_t *)static_cast(p_data); uint8_t msg_id = *p++; loggers::get_instance().log("ConfigRsuSimulatorLayer::process_ut_denm_trigger: msg_id=%02x", msg_id); uint8_t flag = *p++; @@ -934,8 +934,8 @@ int ConfigRsuSimulatorLayer::process_ut_denm_trigger(const OCTETSTRING &data, pa return 0; } -int ConfigRsuSimulatorLayer::process_ut_denm_update(const OCTETSTRING &data, params ¶ms) { - loggers::get_instance().log_msg(">>> ConfigRsuSimulatorLayer::process_ut_denm_update", data); +int ConfigRsuSimulatorLayer::process_ut_denm_update(const OCTETSTRING &p_data, params ¶ms) { + loggers::get_instance().log_msg(">>> ConfigRsuSimulatorLayer::process_ut_denm_update", p_data); params::const_iterator it = _params.find("ut"); if (it == _params.cend()) { @@ -944,7 +944,7 @@ int ConfigRsuSimulatorLayer::process_ut_denm_update(const OCTETSTRING &data, par } if (_params[std::string("ut")].compare("denm") == 0) { - uint8_t *p = (uint8_t *)static_cast(data); + uint8_t *p = (uint8_t *)static_cast(p_data); uint8_t msg_id = *p++; loggers::get_instance().log("ConfigRsuSimulatorLayer::process_ut_denm_update: msg_id=%02x", msg_id); uint8_t flag = *p++; @@ -1028,7 +1028,7 @@ int ConfigRsuSimulatorLayer::process_ut_denm_update(const OCTETSTRING &data, par return 0; } -int ConfigRsuSimulatorLayer::process_ut_denm_termination(const OCTETSTRING &data, params ¶ms) { +int ConfigRsuSimulatorLayer::process_ut_denm_termination(const OCTETSTRING &p_data, params ¶ms) { loggers::get_instance().log(">>> ConfigRsuSimulatorLayer::process_ut_denm_termination"); params::const_iterator it = _params.find("ut"); @@ -1038,7 +1038,7 @@ int ConfigRsuSimulatorLayer::process_ut_denm_termination(const OCTETSTRING &data } if (_params[std::string("ut")].compare("denm") == 0) { - uint8_t *p = (uint8_t *)static_cast(data); + uint8_t *p = (uint8_t *)static_cast(p_data); uint8_t msg_id = *p++; loggers::get_instance().log("ConfigRsuSimulatorLayer::process_ut_denm_termination: msg_id=%02x", msg_id); LibItsDenm__TypesAndValues::UtDenmTermination termination; @@ -1056,7 +1056,7 @@ int ConfigRsuSimulatorLayer::process_ut_denm_termination(const OCTETSTRING &data return 0; } -int ConfigRsuSimulatorLayer::process_ut_denm_changepseudonym(const OCTETSTRING &data, params ¶ms) { +int ConfigRsuSimulatorLayer::process_ut_denm_changepseudonym(const OCTETSTRING &p_data, params ¶ms) { loggers::get_instance().log(">>> ConfigRsuSimulatorLayer::process_ut_denm_changepseudonym"); params::const_iterator it = _params.find("ut"); @@ -1066,7 +1066,7 @@ int ConfigRsuSimulatorLayer::process_ut_denm_changepseudonym(const OCTETSTRING & } if (_params[std::string("ut")].compare("denm") == 0) { - OCTETSTRING hashedId(data.lengthof() - 1, 1 + static_cast(data)); + OCTETSTRING hashedId(p_data.lengthof() - 1, 1 + static_cast(p_data)); LibItsDenm__TypesAndValues::UtDenmChangePseudonym p(hashedId); // Pass it to the ports if any to_all_upper_ports(p, params); @@ -1078,7 +1078,7 @@ int ConfigRsuSimulatorLayer::process_ut_denm_changepseudonym(const OCTETSTRING & return 0; } -int ConfigRsuSimulatorLayer::process_ut_geonetworking_trigger(const OCTETSTRING &data, params ¶ms) { +int ConfigRsuSimulatorLayer::process_ut_geonetworking_trigger(const OCTETSTRING &p_data, params ¶ms) { loggers::get_instance().log(">>> ConfigRsuSimulatorLayer::process_ut_geonetworking_trigger"); params::const_iterator it = _params.find("ut"); @@ -1088,9 +1088,9 @@ int ConfigRsuSimulatorLayer::process_ut_geonetworking_trigger(const OCTETSTRING } if (_params[std::string("ut")].compare("gn") == 0) { - uint8_t msg_id = *static_cast(data); + uint8_t msg_id = *static_cast(p_data); loggers::get_instance().log("ConfigRsuSimulatorLayer::process_ut_geonetworking_trigger: msg_id=%02x", msg_id); - OCTETSTRING payload(data.lengthof() - 1, 1 + static_cast(data)); + OCTETSTRING payload(p_data.lengthof() - 1, 1 + static_cast(p_data)); loggers::get_instance().log_msg("ConfigRsuSimulatorLayer::process_ut_geonetworking_trigger: payload:", payload); TTCN_EncDec::clear_error(); TTCN_Buffer decoding_buffer(payload); @@ -1153,7 +1153,7 @@ int ConfigRsuSimulatorLayer::process_ut_geonetworking_trigger(const OCTETSTRING return 0; } -int ConfigRsuSimulatorLayer::process_ut_pki_trigger(const OCTETSTRING &data, params ¶ms) { +int ConfigRsuSimulatorLayer::process_ut_pki_trigger(const OCTETSTRING &p_data, params ¶ms) { loggers::get_instance().log(">>> ConfigRsuSimulatorLayer::process_ut_pki_trigger"); params::const_iterator it = _params.find("ut"); @@ -1163,9 +1163,9 @@ int ConfigRsuSimulatorLayer::process_ut_pki_trigger(const OCTETSTRING &data, par } if (_params[std::string("ut")].compare("pki") == 0) { - uint8_t msg_id = *static_cast(data); + uint8_t msg_id = *static_cast(p_data); loggers::get_instance().log("ConfigRsuSimulatorLayer::process_ut_mbr_trigger: msg_id=%02x", msg_id); - OCTETSTRING payload(data.lengthof() - 1, 1 + static_cast(data)); + OCTETSTRING payload(p_data.lengthof() - 1, 1 + static_cast(p_data)); loggers::get_instance().log_msg("ConfigRsuSimulatorLayer::process_ut_mbr_trigger: payload:", payload); TTCN_EncDec::clear_error(); TTCN_Buffer decoding_buffer(payload); @@ -1199,7 +1199,7 @@ int ConfigRsuSimulatorLayer::process_ut_pki_trigger(const OCTETSTRING &data, par return 0; } -int ConfigRsuSimulatorLayer::process_ut_mbr_trigger(const OCTETSTRING &data, params ¶ms) { +int ConfigRsuSimulatorLayer::process_ut_mbr_trigger(const OCTETSTRING &p_data, params ¶ms) { loggers::get_instance().log(">>> ConfigRsuSimulatorLayer::process_ut_mbr_trigger"); params::const_iterator it = _params.find("ut"); @@ -1209,13 +1209,13 @@ int ConfigRsuSimulatorLayer::process_ut_mbr_trigger(const OCTETSTRING &data, par } if (_params[std::string("ut")].compare("mbr") == 0) { - uint8_t msg_id = *static_cast(data); + uint8_t msg_id = *static_cast(p_data); loggers::get_instance().log("ConfigRsuSimulatorLayer::process_ut_mbr_trigger: msg_id=%02x", msg_id); LibItsMbr__TypesAndValues::UtMbrTrigger p; if (msg_id == uppertester_mbr_codec::c_utMbrTrigger) { - p.targetId() = oct2int(OCTETSTRING(1, 1 + static_cast(data))); - p.cause() = oct2int(OCTETSTRING(1, 2 + static_cast(data))); + p.targetId() = oct2int(OCTETSTRING(1, 1 + static_cast(p_data))); + p.cause() = oct2int(OCTETSTRING(1, 2 + static_cast(p_data))); } // Pass it to the ports if any @@ -1228,8 +1228,8 @@ int ConfigRsuSimulatorLayer::process_ut_mbr_trigger(const OCTETSTRING &data, par return 0; } -int ConfigRsuSimulatorLayer::process_ut_mapem_spatem_trigger(const OCTETSTRING &data, params ¶ms) { - loggers::get_instance().log_msg(">>> ConfigRsuSimulatorLayer::process_ut_mapem_spatem_trigger", data); +int ConfigRsuSimulatorLayer::process_ut_mapem_spatem_trigger(const OCTETSTRING &p_data, params ¶ms) { + loggers::get_instance().log_msg(">>> ConfigRsuSimulatorLayer::process_ut_mapem_spatem_trigger", p_data); params::const_iterator it = _params.find("ut"); if (it == _params.cend()) { @@ -1238,7 +1238,7 @@ int ConfigRsuSimulatorLayer::process_ut_mapem_spatem_trigger(const OCTETSTRING & } if (_params[std::string("ut")].compare("mapemspatem") == 0) { - uint8_t *p = (uint8_t *)static_cast(data); + uint8_t *p = (uint8_t *)static_cast(p_data); uint8_t msg_id = *p++; loggers::get_instance().log("ConfigRsuSimulatorLayer::process_ut_mapem_spatem_trigger: msg_id=%02x", msg_id); uint8_t flag = *p++; @@ -1280,8 +1280,8 @@ int ConfigRsuSimulatorLayer::process_ut_mapem_spatem_trigger(const OCTETSTRING & return 0; } -int ConfigRsuSimulatorLayer::process_ut_ivim_trigger(const OCTETSTRING &data, params ¶ms) { - loggers::get_instance().log_msg(">>> ConfigRsuSimulatorLayer::process_ut_ivim_trigger", data); +int ConfigRsuSimulatorLayer::process_ut_ivim_trigger(const OCTETSTRING &p_data, params ¶ms) { + loggers::get_instance().log_msg(">>> ConfigRsuSimulatorLayer::process_ut_ivim_trigger", p_data); params::const_iterator it = _params.find("ut"); if (it == _params.cend()) { @@ -1290,7 +1290,7 @@ int ConfigRsuSimulatorLayer::process_ut_ivim_trigger(const OCTETSTRING &data, pa } if (_params[std::string("ut")].compare("ivim") == 0) { - uint8_t *p = (uint8_t *)static_cast(data); + uint8_t *p = (uint8_t *)static_cast(p_data); uint8_t msg_id = *p++; loggers::get_instance().log("ConfigRsuSimulatorLayer::process_ut_ivim_trigger: msg_id=%02x", msg_id); unsigned short flag = static_cast((*p++) << 8 | (*p++)); @@ -1400,8 +1400,8 @@ int ConfigRsuSimulatorLayer::process_ut_ivim_trigger(const OCTETSTRING &data, pa return 0; } -int ConfigRsuSimulatorLayer::process_ut_ivim_update(const OCTETSTRING &data, params ¶ms) { - loggers::get_instance().log_msg(">>> ConfigRsuSimulatorLayer::process_ut_ivim_update", data); +int ConfigRsuSimulatorLayer::process_ut_ivim_update(const OCTETSTRING &p_data, params ¶ms) { + loggers::get_instance().log_msg(">>> ConfigRsuSimulatorLayer::process_ut_ivim_update", p_data); params::const_iterator it = _params.find("ut"); if (it == _params.cend()) { @@ -1410,7 +1410,7 @@ int ConfigRsuSimulatorLayer::process_ut_ivim_update(const OCTETSTRING &data, par } if (_params[std::string("ut")].compare("ivim") == 0) { - uint8_t *p = (uint8_t *)static_cast(data); + uint8_t *p = (uint8_t *)static_cast(p_data); uint8_t msg_id = *p++; loggers::get_instance().log("ConfigRsuSimulatorLayer::process_ut_ivim_update: msg_id=%02x", msg_id); uint8_t flag = *p++; @@ -1465,7 +1465,7 @@ int ConfigRsuSimulatorLayer::process_ut_ivim_update(const OCTETSTRING &data, par return 0; } -int ConfigRsuSimulatorLayer::process_ut_ivim_termination(const OCTETSTRING &data, params ¶ms) { +int ConfigRsuSimulatorLayer::process_ut_ivim_termination(const OCTETSTRING &p_data, params ¶ms) { loggers::get_instance().log(">>> ConfigRsuSimulatorLayer::process_ut_ivim_termination"); params::const_iterator it = _params.find("ut"); @@ -1475,7 +1475,7 @@ int ConfigRsuSimulatorLayer::process_ut_ivim_termination(const OCTETSTRING &data } if (_params[std::string("ut")].compare("ivim") == 0) { - uint8_t *p = (uint8_t *)static_cast(data); + uint8_t *p = (uint8_t *)static_cast(p_data); uint8_t msg_id = *p++; loggers::get_instance().log("ConfigRsuSimulatorLayer::process_ut_ivim_termination: msg_id=%02x", msg_id); LibItsIvim__TypesAndValues::UtIvimTermination termination; @@ -1491,7 +1491,7 @@ int ConfigRsuSimulatorLayer::process_ut_ivim_termination(const OCTETSTRING &data return 0; } -int ConfigRsuSimulatorLayer::process_ut_srem_trigger(const OCTETSTRING &data, params ¶ms) { +int ConfigRsuSimulatorLayer::process_ut_srem_trigger(const OCTETSTRING &p_data, params ¶ms) { loggers::get_instance().log(">>> ConfigRsuSimulatorLayer::process_ut_srem_trigger"); params::const_iterator it = _params.find("ut"); @@ -1501,7 +1501,7 @@ int ConfigRsuSimulatorLayer::process_ut_srem_trigger(const OCTETSTRING &data, pa } if (_params[std::string("ut")].compare("sremssem") == 0) { - uint8_t *p = (uint8_t *)static_cast(data); + uint8_t *p = (uint8_t *)static_cast(p_data); uint8_t msg_id = *p++; loggers::get_instance().log("ConfigRsuSimulatorLayer::process_ut_geonetworking_trigger: msg_id=%02x", msg_id); LibItsSremSsem__TypesAndValues::UtSremTrigger trigger; // See ETSI TR 103 099 @@ -1522,7 +1522,7 @@ int ConfigRsuSimulatorLayer::process_ut_srem_trigger(const OCTETSTRING &data, pa return 0; } -int ConfigRsuSimulatorLayer::process_ut_srem_update(const OCTETSTRING &data, params ¶ms) { +int ConfigRsuSimulatorLayer::process_ut_srem_update(const OCTETSTRING &p_data, params ¶ms) { loggers::get_instance().log(">>> ConfigRsuSimulatorLayer::process_ut_srem_update"); params::const_iterator it = _params.find("ut"); @@ -1532,7 +1532,7 @@ int ConfigRsuSimulatorLayer::process_ut_srem_update(const OCTETSTRING &data, par } if (_params[std::string("ut")].compare("sremssem") == 0) { - uint8_t *p = (uint8_t *)static_cast(data); + uint8_t *p = (uint8_t *)static_cast(p_data); uint8_t msg_id = *p++; loggers::get_instance().log("ConfigRsuSimulatorLayer::process_ut_geonetworking_update: msg_id=%02x", msg_id); LibItsSremSsem__TypesAndValues::UtSremUpdate update; // See ETSI TR 103 099 @@ -1553,7 +1553,7 @@ int ConfigRsuSimulatorLayer::process_ut_srem_update(const OCTETSTRING &data, par return 0; } -int ConfigRsuSimulatorLayer::process_ut_srem_termination(const OCTETSTRING &data, params ¶ms) { +int ConfigRsuSimulatorLayer::process_ut_srem_termination(const OCTETSTRING &p_data, params ¶ms) { loggers::get_instance().log(">>> ConfigRsuSimulatorLayer::process_ut_srem_termination"); params::const_iterator it = _params.find("ut"); @@ -1563,7 +1563,7 @@ int ConfigRsuSimulatorLayer::process_ut_srem_termination(const OCTETSTRING &data } if (_params[std::string("ut")].compare("sremssem") == 0) { - uint8_t *p = (uint8_t *)static_cast(data); + uint8_t *p = (uint8_t *)static_cast(p_data); uint8_t msg_id = *p++; loggers::get_instance().log("ConfigRsuSimulatorLayer::process_ut_geonetworking_termination: msg_id=%02x", msg_id); LibItsSremSsem__TypesAndValues::UtSremCancelation termination; // See ETSI TR 103 099 @@ -1580,8 +1580,8 @@ int ConfigRsuSimulatorLayer::process_ut_srem_termination(const OCTETSTRING &data return 0; } -int ConfigRsuSimulatorLayer::process_ut_rtcmem_trigger(const OCTETSTRING &data, params ¶ms) { - loggers::get_instance().log_msg(">>> ConfigRsuSimulatorLayer::process_ut_rtcmem_trigger", data); +int ConfigRsuSimulatorLayer::process_ut_rtcmem_trigger(const OCTETSTRING &p_data, params ¶ms) { + loggers::get_instance().log_msg(">>> ConfigRsuSimulatorLayer::process_ut_rtcmem_trigger", p_data); params::const_iterator it = _params.find("ut"); if (it == _params.cend()) { @@ -1590,7 +1590,7 @@ int ConfigRsuSimulatorLayer::process_ut_rtcmem_trigger(const OCTETSTRING &data, } if (_params[std::string("ut")].compare("rtcmem") == 0) { - uint8_t *p = (uint8_t *)static_cast(data); + uint8_t *p = (uint8_t *)static_cast(p_data); uint8_t msg_id = *p++; loggers::get_instance().log("ConfigRsuSimulatorLayer::process_ut_rtcmem_trigger: msg_id=%02x", msg_id); uint8_t flag = *p++; @@ -1642,8 +1642,8 @@ int ConfigRsuSimulatorLayer::process_ut_rtcmem_trigger(const OCTETSTRING &data, return 0; } -int ConfigRsuSimulatorLayer::process_ut_rtcmem_update(const OCTETSTRING &data, params ¶ms) { - loggers::get_instance().log_msg(">>> ConfigRsuSimulatorLayer::process_ut_rtcmem_update", data); +int ConfigRsuSimulatorLayer::process_ut_rtcmem_update(const OCTETSTRING &p_data, params ¶ms) { + loggers::get_instance().log_msg(">>> ConfigRsuSimulatorLayer::process_ut_rtcmem_update", p_data); params::const_iterator it = _params.find("ut"); if (it == _params.cend()) { @@ -1652,7 +1652,7 @@ int ConfigRsuSimulatorLayer::process_ut_rtcmem_update(const OCTETSTRING &data, p } if (_params[std::string("ut")].compare("rtcmem") == 0) { - uint8_t *p = (uint8_t *)static_cast(data); + uint8_t *p = (uint8_t *)static_cast(p_data); uint8_t msg_id = *p++; loggers::get_instance().log("ConfigRsuSimulatorLayer::process_ut_rtcmem_update: msg_id=%02x", msg_id); uint8_t flag = *p++; @@ -1699,7 +1699,7 @@ int ConfigRsuSimulatorLayer::process_ut_rtcmem_update(const OCTETSTRING &data, p return 0; } -int ConfigRsuSimulatorLayer::process_ut_rtcmem_termination(const OCTETSTRING &data, params ¶ms) { +int ConfigRsuSimulatorLayer::process_ut_rtcmem_termination(const OCTETSTRING &p_data, params ¶ms) { loggers::get_instance().log(">>> ConfigRsuSimulatorLayer::process_ut_rtcmem_termination"); params::const_iterator it = _params.find("ut"); @@ -1709,7 +1709,7 @@ int ConfigRsuSimulatorLayer::process_ut_rtcmem_termination(const OCTETSTRING &da } if (_params[std::string("ut")].compare("rtcmem") == 0) { - uint8_t *p = (uint8_t *)static_cast(data); + uint8_t *p = (uint8_t *)static_cast(p_data); uint8_t msg_id = *p++; loggers::get_instance().log("ConfigRsuSimulatorLayer::process_ut_rtcmem_termination: msg_id=%02x", msg_id); LibItsRtcmem__TypesAndValues::UtRtcmemTermination termination; @@ -1725,8 +1725,8 @@ int ConfigRsuSimulatorLayer::process_ut_rtcmem_termination(const OCTETSTRING &da return 0; } -int ConfigRsuSimulatorLayer::process_ut_vam_trigger(const OCTETSTRING &data, params ¶ms) { - loggers::get_instance().log_msg(">>> ConfigRsuSimulatorLayer::process_ut_vam_trigger", data); +int ConfigRsuSimulatorLayer::process_ut_vam_trigger(const OCTETSTRING &p_data, params ¶ms) { + loggers::get_instance().log_msg(">>> ConfigRsuSimulatorLayer::process_ut_vam_trigger", p_data); params::const_iterator it = _params.find("ut"); if (it == _params.cend()) { @@ -1735,7 +1735,7 @@ int ConfigRsuSimulatorLayer::process_ut_vam_trigger(const OCTETSTRING &data, par } if (_params[std::string("ut")].compare("vam") == 0) { - uint8_t *p = (uint8_t *)static_cast(data); + uint8_t *p = (uint8_t *)static_cast(p_data); uint8_t msg_id = *p++; loggers::get_instance().log("ConfigRsuSimulatorLayer::process_ut_vam_trigger: msg_id=%02x", msg_id); uint8_t flag = *p++; @@ -1763,8 +1763,8 @@ int ConfigRsuSimulatorLayer::process_ut_vam_trigger(const OCTETSTRING &data, par return 0; } -int ConfigRsuSimulatorLayer::process_ut_cpm_trigger(const OCTETSTRING &data, params ¶ms) { - loggers::get_instance().log_msg(">>> ConfigRsuSimulatorLayer::process_ut_cpm_trigger", data); +int ConfigRsuSimulatorLayer::process_ut_cpm_trigger(const OCTETSTRING &p_data, params ¶ms) { + loggers::get_instance().log_msg(">>> ConfigRsuSimulatorLayer::process_ut_cpm_trigger", p_data); params::const_iterator it = _params.find("ut"); if (it == _params.cend()) { @@ -1773,7 +1773,7 @@ int ConfigRsuSimulatorLayer::process_ut_cpm_trigger(const OCTETSTRING &data, par } if (_params[std::string("ut")].compare("cpm") == 0) { - uint8_t *p = (uint8_t *)static_cast(data); + uint8_t *p = (uint8_t *)static_cast(p_data); uint8_t msg_id = *p++; loggers::get_instance().log("ConfigRsuSimulatorLayer::process_ut_cpm_trigger: msg_id=%02x", msg_id); uint8_t flag = *p++; @@ -1798,8 +1798,8 @@ int ConfigRsuSimulatorLayer::process_ut_cpm_trigger(const OCTETSTRING &data, par return 0; } -int ConfigRsuSimulatorLayer::process_ut_avm_trigger(const OCTETSTRING &data, params ¶ms) { - loggers::get_instance().log_msg(">>> ConfigRsuSimulatorLayer::process_ut_avm_trigger", data); +int ConfigRsuSimulatorLayer::process_ut_avm_trigger(const OCTETSTRING &p_data, params ¶ms) { + loggers::get_instance().log_msg(">>> ConfigRsuSimulatorLayer::process_ut_avm_trigger", p_data); params::const_iterator it = _params.find("ut"); if (it == _params.cend()) { @@ -1808,7 +1808,7 @@ int ConfigRsuSimulatorLayer::process_ut_avm_trigger(const OCTETSTRING &data, par } if (_params[std::string("ut")].compare("avm") == 0) { - uint8_t *p = (uint8_t *)static_cast(data); + uint8_t *p = (uint8_t *)static_cast(p_data); uint8_t msg_id = *p++; loggers::get_instance().log("ConfigRsuSimulatorLayer::process_ut_avm_trigger: msg_id=%02x", msg_id); uint8_t flag = *p++; @@ -1833,8 +1833,8 @@ int ConfigRsuSimulatorLayer::process_ut_avm_trigger(const OCTETSTRING &data, par return 0; } -int ConfigRsuSimulatorLayer::process_ut_pim_trigger(const OCTETSTRING &data, params ¶ms) { - loggers::get_instance().log_msg(">>> ConfigRsuSimulatorLayer::process_ut_pim_trigger", data); +int ConfigRsuSimulatorLayer::process_ut_pim_trigger(const OCTETSTRING &p_data, params ¶ms) { + loggers::get_instance().log_msg(">>> ConfigRsuSimulatorLayer::process_ut_pim_trigger", p_data); params::const_iterator it = _params.find("ut"); if (it == _params.cend()) { @@ -1843,7 +1843,7 @@ int ConfigRsuSimulatorLayer::process_ut_pim_trigger(const OCTETSTRING &data, par } if (_params[std::string("ut")].compare("pim") == 0) { - uint8_t *p = (uint8_t *)static_cast(data); + uint8_t *p = (uint8_t *)static_cast(p_data); uint8_t msg_id = *p++; loggers::get_instance().log("ConfigRsuSimulatorLayer::process_ut_pim_trigger: msg_id=%02x", msg_id); uint8_t flag = *p++; @@ -1868,8 +1868,8 @@ int ConfigRsuSimulatorLayer::process_ut_pim_trigger(const OCTETSTRING &data, par return 0; } -int ConfigRsuSimulatorLayer::process_ut_saem_trigger(const OCTETSTRING &data, params ¶ms) { - loggers::get_instance().log_msg(">>> ConfigRsuSimulatorLayer::process_ut_saem_trigger", data); +int ConfigRsuSimulatorLayer::process_ut_saem_trigger(const OCTETSTRING &p_data, params ¶ms) { + loggers::get_instance().log_msg(">>> ConfigRsuSimulatorLayer::process_ut_saem_trigger", p_data); params::const_iterator it = _params.find("ut"); if (it == _params.cend()) { @@ -1878,7 +1878,7 @@ int ConfigRsuSimulatorLayer::process_ut_saem_trigger(const OCTETSTRING &data, pa } if (_params[std::string("ut")].compare("saem") == 0) { - uint8_t *p = (uint8_t *)static_cast(data); + uint8_t *p = (uint8_t *)static_cast(p_data); uint8_t msg_id = *p++; loggers::get_instance().log("ConfigRsuSimulatorLayer::process_ut_saem_trigger: msg_id=%02x", msg_id); uint8_t flag = *p++; diff --git a/ccsrc/Ports/LibIts_ports/RSUsSimulator_ports/ConfigRsuSimulatorLayer.hh b/ccsrc/Ports/LibIts_ports/RSUsSimulator_ports/ConfigRsuSimulatorLayer.hh index 594cbc2..4bcdbb7 100644 --- a/ccsrc/Ports/LibIts_ports/RSUsSimulator_ports/ConfigRsuSimulatorLayer.hh +++ b/ccsrc/Ports/LibIts_ports/RSUsSimulator_ports/ConfigRsuSimulatorLayer.hh @@ -78,38 +78,38 @@ public: void sendMsg(const LibItsSaem__TypesAndValues::UtSaemResults &send_par, params ¶ms); void sendMsg(const LibItsSaem__TypesAndValues::UtSaemEventInd &send_par, params ¶ms); - virtual void send_data(OCTETSTRING &data, params ¶ms); - virtual void receive_data(OCTETSTRING &data, params ¶ms); + virtual void send_data(OCTETSTRING &p_data, params ¶ms); + virtual void receive_data(OCTETSTRING &p_data, params ¶ms); private: - int process_utinitialize_data(const OCTETSTRING &data, params ¶ms); - int process_ut_cam_changespeed_data(const OCTETSTRING &data, params ¶ms); - int process_ut_cam_changecurvature_data(const OCTETSTRING &data, params ¶ms); - int process_ut_cam_changeheading_data(const OCTETSTRING &data, params ¶ms); - int process_ut_cam_setvehiclerole_data(const OCTETSTRING &data, params ¶ms); - int process_ut_cam_changepseudonym(const OCTETSTRING &data, params ¶ms); - int process_ut_denm_trigger(const OCTETSTRING &data, params ¶ms); - int process_ut_denm_update(const OCTETSTRING &data, params ¶ms); - int process_ut_denm_termination(const OCTETSTRING &data, params ¶ms); - int process_ut_denm_changepseudonym(const OCTETSTRING &data, params ¶ms); - int process_ut_geonetworking_trigger(const OCTETSTRING &data, params ¶ms); - int process_ut_pki_trigger(const OCTETSTRING &data, params ¶ms); - int process_ut_mbr_trigger(const OCTETSTRING &data, params ¶ms); - int process_ut_ivim_trigger(const OCTETSTRING &data, params ¶ms); - int process_ut_ivim_update(const OCTETSTRING &data, params ¶ms); - int process_ut_ivim_termination(const OCTETSTRING &data, params ¶ms); - int process_ut_mapem_spatem_trigger(const OCTETSTRING &data, params ¶ms); - int process_ut_srem_trigger(const OCTETSTRING &data, params ¶ms); - int process_ut_srem_update(const OCTETSTRING &data, params ¶ms); - int process_ut_srem_termination(const OCTETSTRING &data, params ¶ms); - int process_ut_rtcmem_trigger(const OCTETSTRING &data, params ¶ms); - int process_ut_rtcmem_update(const OCTETSTRING &data, params ¶ms); - int process_ut_rtcmem_termination(const OCTETSTRING &data, params ¶ms); - int process_ut_vam_trigger(const OCTETSTRING &data, params ¶ms); - int process_ut_cpm_trigger(const OCTETSTRING &data, params ¶ms); - int process_ut_avm_trigger(const OCTETSTRING &data, params ¶ms); - int process_ut_pim_trigger(const OCTETSTRING &data, params ¶ms); - int process_ut_saem_trigger(const OCTETSTRING &data, params ¶ms); + int process_utinitialize_data(const OCTETSTRING &p_data, params ¶ms); + int process_ut_cam_changespeed_data(const OCTETSTRING &p_data, params ¶ms); + int process_ut_cam_changecurvature_data(const OCTETSTRING &p_data, params ¶ms); + int process_ut_cam_changeheading_data(const OCTETSTRING &p_data, params ¶ms); + int process_ut_cam_setvehiclerole_data(const OCTETSTRING &p_data, params ¶ms); + int process_ut_cam_changepseudonym(const OCTETSTRING &p_data, params ¶ms); + int process_ut_denm_trigger(const OCTETSTRING &p_data, params ¶ms); + int process_ut_denm_update(const OCTETSTRING &p_data, params ¶ms); + int process_ut_denm_termination(const OCTETSTRING &p_data, params ¶ms); + int process_ut_denm_changepseudonym(const OCTETSTRING &p_data, params ¶ms); + int process_ut_geonetworking_trigger(const OCTETSTRING &p_data, params ¶ms); + int process_ut_pki_trigger(const OCTETSTRING &p_data, params ¶ms); + int process_ut_mbr_trigger(const OCTETSTRING &p_data, params ¶ms); + int process_ut_ivim_trigger(const OCTETSTRING &p_data, params ¶ms); + int process_ut_ivim_update(const OCTETSTRING &p_data, params ¶ms); + int process_ut_ivim_termination(const OCTETSTRING &p_data, params ¶ms); + int process_ut_mapem_spatem_trigger(const OCTETSTRING &p_data, params ¶ms); + int process_ut_srem_trigger(const OCTETSTRING &p_data, params ¶ms); + int process_ut_srem_update(const OCTETSTRING &p_data, params ¶ms); + int process_ut_srem_termination(const OCTETSTRING &p_data, params ¶ms); + int process_ut_rtcmem_trigger(const OCTETSTRING &p_data, params ¶ms); + int process_ut_rtcmem_update(const OCTETSTRING &p_data, params ¶ms); + int process_ut_rtcmem_termination(const OCTETSTRING &p_data, params ¶ms); + int process_ut_vam_trigger(const OCTETSTRING &p_data, params ¶ms); + int process_ut_cpm_trigger(const OCTETSTRING &p_data, params ¶ms); + int process_ut_avm_trigger(const OCTETSTRING &p_data, params ¶ms); + int process_ut_pim_trigger(const OCTETSTRING &p_data, params ¶ms); + int process_ut_saem_trigger(const OCTETSTRING &p_data, params ¶ms); int set_cause_code_choice(const int p_cause, ETSI__ITS__CDD::CauseCodeChoice& p_causeCodeChoice); }; // End of class ConfigRsuSimulatorLayer diff --git a/ccsrc/Ports/LibIts_ports/Rtcmem_ports/AdapterControlPort_Rtcmem.cc b/ccsrc/Ports/LibIts_ports/Rtcmem_ports/AdapterControlPort_Rtcmem.cc index b701400..dc95069 100644 --- a/ccsrc/Ports/LibIts_ports/Rtcmem_ports/AdapterControlPort_Rtcmem.cc +++ b/ccsrc/Ports/LibIts_ports/Rtcmem_ports/AdapterControlPort_Rtcmem.cc @@ -1,7 +1,7 @@ #include "loggers.hh" #include "registration.hh" -#include "RtcmemLayer.hh" +#include "rtcmem_layer.hh" #include "AdapterControlPort_Rtcmem.hh" //============================================================================= @@ -36,7 +36,7 @@ namespace LibItsRtcmem__TestSystem { loggers::get_instance().log_msg(">>> AdapterControlPort::outgoing_send: ", send_par); // Register this object for AdapterControlPort - RtcmemLayer *p = registration::get_instance().get_item(std::string("RTCMEM")); + rtcmem_layer *p = registration::get_instance().get_item(std::string("RTCMEM")); if (p != NULL) { loggers::get_instance().log("AdapterControlPort::outgoing_send: Got GN layer %p", p); LibItsCommon__TypesAndValues::AdapterControlResults response; diff --git a/ccsrc/Ports/LibIts_ports/Rtcmem_ports/RtcmemPort.cc b/ccsrc/Ports/LibIts_ports/Rtcmem_ports/RtcmemPort.cc index b276d95..3f70f3a 100644 --- a/ccsrc/Ports/LibIts_ports/Rtcmem_ports/RtcmemPort.cc +++ b/ccsrc/Ports/LibIts_ports/Rtcmem_ports/RtcmemPort.cc @@ -8,7 +8,7 @@ // add your member functions here. #include "RtcmemPort.hh" -#include "RtcmemLayerFactory.hh" +#include "rtcmem_layer_factory.hh" #include "loggers.hh" namespace LibItsRtcmem__TestSystem { @@ -45,10 +45,10 @@ namespace LibItsRtcmem__TestSystem { if (it != _cfg_params.end()) { loggers::get_instance().log("RtcmemPort::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) { + if (static_cast(_layer) == NULL) { loggers::get_instance().error("RtcmemPort::user_map: Invalid stack configuration: %s", it->second.c_str()); } - static_cast(_layer)->add_upper_port(this); + static_cast(_layer)->add_upper_port(this); } else { loggers::get_instance().error("RtcmemPort::user_map: No layers defined in configuration file"); } @@ -72,7 +72,7 @@ namespace LibItsRtcmem__TestSystem { float duration; loggers::get_instance().set_start_time(_time_key); params_its params; - static_cast(_layer)->sendMsg(send_par, params); + static_cast(_layer)->sendMsg(send_par, params); loggers::get_instance().set_stop_time(_time_key, duration); } diff --git a/ccsrc/Ports/LibIts_ports/SremSsem_ports/AdapterControlPort_SremSsem.cc b/ccsrc/Ports/LibIts_ports/SremSsem_ports/AdapterControlPort_SremSsem.cc index 95d1bba..7cfb15e 100644 --- a/ccsrc/Ports/LibIts_ports/SremSsem_ports/AdapterControlPort_SremSsem.cc +++ b/ccsrc/Ports/LibIts_ports/SremSsem_ports/AdapterControlPort_SremSsem.cc @@ -1,7 +1,7 @@ #include "loggers.hh" #include "registration.hh" -#include "SremSsemLayer.hh" +#include "srem_ssem_layer.hh" //============================================================================= #include "AdapterControlPort_SremSsem.hh" @@ -36,7 +36,7 @@ namespace LibItsSremSsem__TestSystem { loggers::get_instance().log_msg(">>> AdapterControlPort::outgoing_send: ", send_par); // Register this object for AdapterControlPort - SremSsemLayer *p = registration::get_instance().get_item(std::string("SremSsem")); + srem_ssem_layer *p = registration::get_instance().get_item(std::string("SremSsem")); if (p != NULL) { loggers::get_instance().log("AdapterControlPort::outgoing_send: Got GN layer %p", p); LibItsCommon__TypesAndValues::AdapterControlResults response; diff --git a/ccsrc/Ports/LibIts_ports/SremSsem_ports/SremSsemPort.cc b/ccsrc/Ports/LibIts_ports/SremSsem_ports/SremSsemPort.cc index 80eca24..a8f8f0f 100644 --- a/ccsrc/Ports/LibIts_ports/SremSsem_ports/SremSsemPort.cc +++ b/ccsrc/Ports/LibIts_ports/SremSsem_ports/SremSsemPort.cc @@ -8,7 +8,7 @@ // add your member functions here. #include "SremSsemPort.hh" -#include "SremSsemLayerFactory.hh" +#include "srem_ssem_layer_factory.hh" #include "loggers.hh" namespace LibItsSremSsem__TestSystem { @@ -45,10 +45,10 @@ namespace LibItsSremSsem__TestSystem { if (it != _cfg_params.end()) { loggers::get_instance().log("SremSsemPort::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) { + if (static_cast(_layer) == NULL) { loggers::get_instance().error("SremSsemPort::user_map: Invalid stack configuration: %s", it->second.c_str()); } - static_cast(_layer)->add_upper_port(this); + static_cast(_layer)->add_upper_port(this); } else { loggers::get_instance().error("SremSsemPort::user_map: No layers defined in configuration file"); } @@ -72,7 +72,7 @@ namespace LibItsSremSsem__TestSystem { float duration; loggers::get_instance().set_start_time(_time_key); params_its params; - static_cast(_layer)->sendMsg(send_par, params); + static_cast(_layer)->sendMsg(send_par, params); loggers::get_instance().set_stop_time(_time_key, duration); } @@ -82,7 +82,7 @@ namespace LibItsSremSsem__TestSystem { float duration; loggers::get_instance().set_start_time(_time_key); params_its params; - static_cast(_layer)->sendMsg(send_par, params); + static_cast(_layer)->sendMsg(send_par, params); loggers::get_instance().set_stop_time(_time_key, duration); } diff --git a/ccsrc/Ports/LibIts_ports/UpperTesterPort.hh b/ccsrc/Ports/LibIts_ports/UpperTesterPort.hh index 081ae3f..b9ec154 100644 --- a/ccsrc/Ports/LibIts_ports/UpperTesterPort.hh +++ b/ccsrc/Ports/LibIts_ports/UpperTesterPort.hh @@ -63,7 +63,7 @@ #ifdef AtsCPS #include "BTP_ports/UpperTesterPort_BTP.hh" -#include "CAM_ports/UpperTesterPort_CAM.hh" +//#include "CAM_ports/UpperTesterPort_CAM.hh" #include "CPS_ports/UpperTesterPort_CPS.hh" #include "GN_ports/UpperTesterPort_GN.hh" #endif @@ -181,7 +181,7 @@ #ifdef AtsCPS #include "UpperTesterPort_BTP.hh" -#include "UpperTesterPort_CAM.hh" +//#include "UpperTesterPort_CAM.hh" #include "UpperTesterPort_CPS.hh" #include "UpperTesterPort_GN.hh" #endif diff --git a/ccsrc/Protocols/AVM/avm_pdu_codec.cc b/ccsrc/Protocols/AVM/avm_pdu_codec.cc deleted file mode 100644 index b33b586..0000000 --- a/ccsrc/Protocols/AVM/avm_pdu_codec.cc +++ /dev/null @@ -1,28 +0,0 @@ -#include "avm_pdu_codec.hh" -#include "LibItsAvm_TypesAndValues.hh" -#include "asn1/asn_application.h" // from asn1c -#include "loggers.hh" - -extern "C" { -extern asn_TYPE_descriptor_t asn_DEF_MIM; -} - -extern "C" { -extern asn_TYPE_descriptor_t asn_DEF_MVM; -} - -int mim_pdu_codec::encode(const MIM__PDU__Descriptions::MIM &p_mim, BITSTRING &p_data) { - return _encode(MIM__PDU__Descriptions::MIM_descr_, asn_DEF_MIM, p_mim, p_data); -} - -int mim_pdu_codec::decode(const BITSTRING &p_data, MIM__PDU__Descriptions::MIM &p_mim) { - return _decode(MIM__PDU__Descriptions::MIM_descr_, asn_DEF_MIM, p_data, p_mim); -} - -int mvm_pdu_codec::encode(const MVM__PDU__Descriptions::MVM &p_mvm, BITSTRING &p_data) { - return _encode(MVM__PDU__Descriptions::MVM_descr_, asn_DEF_MVM, p_mvm, p_data); -} - -int mvm_pdu_codec::decode(const BITSTRING &p_data, MVM__PDU__Descriptions::MVM &p_mvm) { - return _decode(MVM__PDU__Descriptions::MVM_descr_, asn_DEF_MVM, p_data, p_mvm); -} diff --git a/ccsrc/Protocols/AVM/avm_pdu_codec.hh b/ccsrc/Protocols/AVM/avm_pdu_codec.hh deleted file mode 100644 index 0481a3f..0000000 --- a/ccsrc/Protocols/AVM/avm_pdu_codec.hh +++ /dev/null @@ -1,31 +0,0 @@ -#pragma once - -#include "codec.hh" -#include "params.hh" -#include "per_codec.hh" - -class BITSTRING; //! Forward declaration of TITAN class -class OCTETSTRING; //! Forward declaration of TITAN class - -namespace MIM__PDU__Descriptions { //! Forward declaration of asn1c CAM class - class MIM; -} - -class mim_pdu_codec : per_codec { -public: - explicit mim_pdu_codec(){}; - virtual int encode(const MIM__PDU__Descriptions::MIM &mim, BITSTRING &data); - virtual int decode(const BITSTRING &data, MIM__PDU__Descriptions::MIM &); -}; - -namespace MVM__PDU__Descriptions { //! Forward declaration of asn1c CAM class - class MVM; -} - -class mvm_pdu_codec : public per_codec { -public: - explicit mvm_pdu_codec(){}; - virtual int encode(const MVM__PDU__Descriptions::MVM &mvm, BITSTRING &data); - virtual int decode(const BITSTRING &data, MVM__PDU__Descriptions::MVM &); -}; - diff --git a/ccsrc/Protocols/AVM/mim_codec.cc b/ccsrc/Protocols/AVM/mim_codec.cc index 8deb576..c23faa5 100644 --- a/ccsrc/Protocols/AVM/mim_codec.cc +++ b/ccsrc/Protocols/AVM/mim_codec.cc @@ -1,27 +1,30 @@ #include "mim_codec.hh" #include "LibItsAvm_TypesAndValues.hh" -#include "asn1/asn_application.h" // from asn1c +#include "LibItsAvm_EncdecDeclarations.hh" #include "loggers.hh" -int mim_codec::encode(const MIM__PDU__Descriptions::MIM &min, OCTETSTRING &data) { +int mim_codec::encode(const MIM__PDU__Descriptions::MIM &mim, OCTETSTRING &p_data) { loggers::get_instance().log(">>> mim_codec::encode"); - BITSTRING b; - int rc = asn_codec.encode(min, b); - if (rc != -1) { - data = bit2oct(b); - loggers::get_instance().log_msg("mim_codec::encode: ", data); + BITSTRING bs = LibItsAvm__EncdecDeclarations::fx__enc__MIM(mim); + if (!bs.is_bound()) { + loggers::get_instance().error("mim_codec::encode: Failed to encode MIM value"); + return -1; } - return rc; + + p_data = bit2oct(bs); + return 0; } -int mim_codec::decode(const OCTETSTRING &data, MIM__PDU__Descriptions::MIM &min, params_its *params) { - loggers::get_instance().log_msg(">>> mim_codec::decode: ", data); +int mim_codec::decode(const OCTETSTRING &p_data, MIM__PDU__Descriptions::MIM &mim, params_its *params) { + loggers::get_instance().log_msg(">>> mim_codec::decode: ", p_data); - int rc = asn_codec.decode(oct2bit(data), min); - loggers::get_instance().log("mim_codec::decode: ASN.1 codec returned %d", rc); - if (rc != -1) { - loggers::get_instance().log_msg("mim_codec::decode: ", min); + BITSTRING bs = oct2bit(p_data); + int result = static_cast(LibItsAvm__EncdecDeclarations::fx__dec__MIM(bs, mim)); + if (result != 0) { + loggers::get_instance().error("mim_codec::decode: Failed to decode MIM PDU"); + return -1; } - return rc; + + return 0; } diff --git a/ccsrc/Protocols/AVM/mim_codec.hh b/ccsrc/Protocols/AVM/mim_codec.hh index dc99db4..6f47709 100644 --- a/ccsrc/Protocols/AVM/mim_codec.hh +++ b/ccsrc/Protocols/AVM/mim_codec.hh @@ -1,6 +1,5 @@ #pragma once -#include "avm_pdu_codec.hh" #include "codec.hh" #include "params_its.hh" @@ -12,13 +11,12 @@ namespace MIM__PDU__Descriptions { //! Forward declaration of asn1c MIM class } class mim_codec : public codec { - mim_pdu_codec asn_codec; public: - explicit mim_codec() : codec(), asn_codec(){}; + explicit mim_codec() : codec() {}; virtual ~mim_codec(){}; - virtual int encode(const MIM__PDU__Descriptions::MIM &mim, OCTETSTRING &data); - virtual int decode(const OCTETSTRING &data, MIM__PDU__Descriptions::MIM &mim, params_its *params = NULL); + virtual int encode(const MIM__PDU__Descriptions::MIM &mim, OCTETSTRING &p_data); + virtual int decode(const OCTETSTRING &p_data, MIM__PDU__Descriptions::MIM &mim, params_its *params = NULL); }; diff --git a/ccsrc/Protocols/AVM/module.mk b/ccsrc/Protocols/AVM/module.mk index 337510c..02bff10 100644 --- a/ccsrc/Protocols/AVM/module.mk +++ b/ccsrc/Protocols/AVM/module.mk @@ -1,2 +1,2 @@ -sources := mvm_codec.cc mim_codec.cc avm_pdu_codec.cc +sources := mvm_codec.cc mim_codec.cc includes := . diff --git a/ccsrc/Protocols/AVM/mvm_codec.cc b/ccsrc/Protocols/AVM/mvm_codec.cc index af70d5f..886ec9f 100644 --- a/ccsrc/Protocols/AVM/mvm_codec.cc +++ b/ccsrc/Protocols/AVM/mvm_codec.cc @@ -1,28 +1,32 @@ #include "mvm_codec.hh" #include "LibItsAvm_TypesAndValues.hh" -#include "asn1/asn_application.h" // from asn1c +#include "LibItsAvm_EncdecDeclarations.hh" #include "loggers.hh" -int mvm_codec::encode(const MVM__PDU__Descriptions::MVM &min, OCTETSTRING &data) { +int mvm_codec::encode(const MVM__PDU__Descriptions::MVM &mvm, OCTETSTRING &p_data) { loggers::get_instance().log(">>> mvm_codec::encode"); - BITSTRING b; - int rc = asn_codec.encode(min, b); - if (rc != -1) { - data = bit2oct(b); - loggers::get_instance().log_msg("mvm_codec::encode: ", data); + BITSTRING bs = LibItsAvm__EncdecDeclarations::fx__enc__MVM(mvm); + if (!bs.is_bound()) { + loggers::get_instance().error("mvm_codec::encode: Failed to encode MVM value"); + return -1; } - return rc; + + p_data = bit2oct(bs); + return 0; + } -int mvm_codec::decode(const OCTETSTRING &data, MVM__PDU__Descriptions::MVM &min, params_its *params) { - loggers::get_instance().log_msg(">>> mvm_codec::decode: ", data); +int mvm_codec::decode(const OCTETSTRING &p_data, MVM__PDU__Descriptions::MVM &mvm, params_its *params) { + loggers::get_instance().log_msg(">>> mvm_codec::decode: ", p_data); - int rc = asn_codec.decode(oct2bit(data), min); - loggers::get_instance().log("mvm_codec::decode: ASN.1 codec returned %d", rc); - if (rc != -1) { - loggers::get_instance().log_msg("mvm_codec::decode: ", min); + BITSTRING bs = oct2bit(p_data); + int result = static_cast(LibItsAvm__EncdecDeclarations::fx__dec__MVM(bs, mvm)); + if (result != 0) { + loggers::get_instance().error("mvm_codec::decode: Failed to decode MVM PDU"); + return -1; } - return rc; + + return 0; } diff --git a/ccsrc/Protocols/AVM/mvm_codec.hh b/ccsrc/Protocols/AVM/mvm_codec.hh index 8ad3973..0394a12 100644 --- a/ccsrc/Protocols/AVM/mvm_codec.hh +++ b/ccsrc/Protocols/AVM/mvm_codec.hh @@ -1,6 +1,5 @@ #pragma once -#include "avm_pdu_codec.hh" #include "codec.hh" #include "params_its.hh" class BITSTRING; //! Forward declaration of TITAN class @@ -11,13 +10,11 @@ namespace MVM__PDU__Descriptions { //! Forward declaration of asn1c MVM class } class mvm_codec : public codec { - mvm_pdu_codec asn_codec; - public: - explicit mvm_codec() : codec(), asn_codec(){}; + explicit mvm_codec() : codec() {}; virtual ~mvm_codec(){}; - virtual int encode(const MVM__PDU__Descriptions::MVM &avm, OCTETSTRING &data); - virtual int decode(const OCTETSTRING &data, MVM__PDU__Descriptions::MVM &mvm, params_its *params = NULL); + virtual int encode(const MVM__PDU__Descriptions::MVM &avm, OCTETSTRING &p_data); + virtual int decode(const OCTETSTRING &p_data, MVM__PDU__Descriptions::MVM &mvm, params_its *params = NULL); }; diff --git a/ccsrc/Protocols/AVM_layers/avm_layer.cc b/ccsrc/Protocols/AVM_layers/avm_layer.cc index 3a1cf44..e3f25c7 100644 --- a/ccsrc/Protocols/AVM_layers/avm_layer.cc +++ b/ccsrc/Protocols/AVM_layers/avm_layer.cc @@ -48,25 +48,25 @@ void avm_layer::sendMsg(const LibItsAvm__TypesAndValues::MimReq &p, params_its & send_data(data, _params); } -void avm_layer::send_data(OCTETSTRING &data, params &p_params) { - loggers::get_instance().log_msg(">>> avm_layer::send_data: ", data); +void avm_layer::send_data(OCTETSTRING &p_data, params &p_params) { + loggers::get_instance().log_msg(">>> avm_layer::send_data: ", p_data); - send_to_all_layers(data, p_params); + send_to_all_layers(p_data, p_params); } -void avm_layer::receive_data(OCTETSTRING &data, params &p_params) { - loggers::get_instance().log_msg(">>> avm_layer::receive_data: ", data); +void avm_layer::receive_data(OCTETSTRING &p_data, params &p_params) { + loggers::get_instance().log_msg(">>> avm_layer::receive_data: ", p_data); // Sanity check - if (*(static_cast(data) + 1) == 0x12) { // Check that received packet has MIM message id - See ETSI TS 102 894 + if (*(static_cast(p_data) + 1) == 0x12) { // Check that received packet has MIM message id - See ETSI TS 102 894 // MIM message _params[params_its::payload_type] = "18"; - } else if (*(static_cast(data) + 1) != 0x13) { // Check that received packet has MVM message id - See ETSI TS 102 894 + } else if (*(static_cast(p_data) + 1) != 0x13) { // Check that received packet has MVM message id - See ETSI TS 102 894 // MVM message _params[params_its::payload_type] = "19"; } else { // Not a AVM message, discard it - loggers::get_instance().warning("avm_layer::receive_data: Wrong message id: 0x%02x", *(static_cast(data) + 1)); + loggers::get_instance().warning("avm_layer::receive_data: Wrong message id: 0x%02x", *(static_cast(p_data) + 1)); return; } @@ -74,12 +74,12 @@ void avm_layer::receive_data(OCTETSTRING &data, params &p_params) { params_its ¶ms = static_cast(p_params); if (_params[params_its::payload_type].compare("18") == 0) { LibItsAvm__TypesAndValues::MimInd p; - _mim_codec.decode(data, p.msgIn()); + _mim_codec.decode(p_data, p.msgIn()); if (!p.msgIn().is_bound()) { // Discard it return; } // else, continue - // Process lower layer data + // Process lower layer p_data // recvTime params_its::const_iterator it = params.find(params_its::timestamp); if (it != params.cend()) { @@ -152,18 +152,18 @@ void avm_layer::receive_data(OCTETSTRING &data, params &p_params) { p.its__aid().set_to_omit(); } // raw_message - p.raw__message() = data; + p.raw__message() = p_data; // Pass it to the ports if any to_all_upper_ports(p, params); } else { LibItsAvm__TypesAndValues::MvmInd p; - _mvm_codec.decode(data, p.msgIn()); + _mvm_codec.decode(p_data, p.msgIn()); if (!p.msgIn().is_bound()) { // Discard it return; } // else, continue - // Process lower layer data + // Process lower layer p_data // recvTime params_its::const_iterator it = params.find(params_its::timestamp); if (it != params.cend()) { @@ -236,7 +236,7 @@ void avm_layer::receive_data(OCTETSTRING &data, params &p_params) { p.its__aid().set_to_omit(); } // raw_message - p.raw__message() = data; + p.raw__message() = p_data; // Pass it to the ports if any to_all_upper_ports(p, params); diff --git a/ccsrc/Protocols/AVM_layers/avm_layer.hh b/ccsrc/Protocols/AVM_layers/avm_layer.hh index 94e26f3..b83048d 100644 --- a/ccsrc/Protocols/AVM_layers/avm_layer.hh +++ b/ccsrc/Protocols/AVM_layers/avm_layer.hh @@ -72,7 +72,7 @@ public: //! \publicsection * \param[in] p_data The data to be sent * \param[in] p_params Some parameters to overwrite default value of the lower layers parameters */ - virtual void send_data(OCTETSTRING &data, params ¶ms); + virtual void send_data(OCTETSTRING &p_data, params ¶ms); /*! * \virtual * \fn void receive_data(OCTETSTRING& data, params& params); @@ -80,7 +80,7 @@ public: //! \publicsection * \param[in] p_data The bytes formated data received * \param[in] p_params Some lower layers parameters values when data was received */ - virtual void receive_data(OCTETSTRING &data, params &info); + virtual void receive_data(OCTETSTRING &p_data, params &info); int enable_secured_mode(const std::string &p_certificate_id, const boolean p_enforce_security); diff --git a/ccsrc/Protocols/BTP/btp_codec.cc b/ccsrc/Protocols/BTP/btp_codec.cc index 5e29b82..e7692bd 100644 --- a/ccsrc/Protocols/BTP/btp_codec.cc +++ b/ccsrc/Protocols/BTP/btp_codec.cc @@ -9,15 +9,15 @@ template class OPTIONAL; class TTCN_EncDec; -int btp_codec::encode(const LibItsBtp__TypesAndValues::BtpPacket &msg, OCTETSTRING &data) { +int btp_codec::encode(const LibItsBtp__TypesAndValues::BtpPacket &msg, OCTETSTRING &p_data) { // loggers::get_instance().log_msg(">>> btp_codec::encode: ", (const Base_Type&)msg); TTCN_EncDec::clear_error(); TTCN_Buffer encoding_buffer; encode_(msg, *msg.get_descriptor(), encoding_buffer); - data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); + p_data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); - // loggers::get_instance().log_msg("<<< btp_codec::encode: data=", data); + // loggers::get_instance().log_msg("<<< btp_codec::encode: p_data=", p_data); return 0; } @@ -57,9 +57,9 @@ int btp_codec::encode_(const Base_Type &type, const TTCN_Typedescriptor_t &field return 0; } -int btp_codec::decode(const OCTETSTRING &data, LibItsBtp__TypesAndValues::BtpPacket &msg, params_its *params) { +int btp_codec::decode(const OCTETSTRING &p_data, LibItsBtp__TypesAndValues::BtpPacket &msg, params_its *params) { TTCN_EncDec::clear_error(); - TTCN_Buffer decoding_buffer(data); + TTCN_Buffer decoding_buffer(p_data); _params = params; // loggers::get_instance().log_to_hexa(">>> btp_codec::decode: decoding_buffer=", decoding_buffer); @@ -110,7 +110,7 @@ int btp_codec::decode_(Base_Type &type, const TTCN_Typedescriptor_t &field_descr // loggers::get_instance().log("btp_codec::decode_: Set OPTIONAL to omit"); dynamic_cast &>(type).set_to_omit(); } else { - // Decode BtpRawPayload data structure + // Decode BtpRawPayload p_data structure OCTETSTRING os(decoding_buffer.get_len() - decoding_buffer.get_pos(), decoding_buffer.get_data() + decoding_buffer.get_pos()); // loggers::get_instance().log_msg("btp_codec::decode_: s=", os); if (_params != NULL) { diff --git a/ccsrc/Protocols/BTP/btp_codec.hh b/ccsrc/Protocols/BTP/btp_codec.hh index e895543..00f60b0 100644 --- a/ccsrc/Protocols/BTP/btp_codec.hh +++ b/ccsrc/Protocols/BTP/btp_codec.hh @@ -27,8 +27,8 @@ public: btp_codec() : codec() { _type = btp_codec::btpA; }; virtual ~btp_codec(){}; - virtual int encode(const LibItsBtp__TypesAndValues::BtpPacket &, OCTETSTRING &data); - virtual int decode(const OCTETSTRING &data, LibItsBtp__TypesAndValues::BtpPacket &, params_its *params = NULL); + virtual int encode(const LibItsBtp__TypesAndValues::BtpPacket &, OCTETSTRING &p_data); + virtual int decode(const OCTETSTRING &p_data, LibItsBtp__TypesAndValues::BtpPacket &, params_its *params = NULL); inline void set_btp_type(const btp_codec::BtpType p_btp_type) { _type = p_btp_type; }; diff --git a/ccsrc/Protocols/BTP_layers/btp_layer.cc b/ccsrc/Protocols/BTP_layers/btp_layer.cc index 182039a..7f2949b 100644 --- a/ccsrc/Protocols/BTP_layers/btp_layer.cc +++ b/ccsrc/Protocols/BTP_layers/btp_layer.cc @@ -41,8 +41,8 @@ void btp_layer::sendMsg(const LibItsBtp__TypesAndValues::BtpReq &p, params &p_pa send_data(data, p_params); } -void btp_layer::send_data(OCTETSTRING &data, params &p_params) { - loggers::get_instance().log_msg(">>> btp_layer::send_data: ", data); +void btp_layer::send_data(OCTETSTRING &p_data, params &p_params) { + loggers::get_instance().log_msg(">>> btp_layer::send_data: ", p_data); //p_params.log(); // TODO To be removed //_params.log(); // TODO To be removed @@ -69,23 +69,23 @@ void btp_layer::send_data(OCTETSTRING &data, params &p_params) { } else { header.btpBHeader() = LibItsBtp__TypesAndValues::BtpBHeader(btp_destination_port, std::stoi(_params[params_its::btp_info])); } - LibItsBtp__TypesAndValues::BtpPacket p(header, data); + LibItsBtp__TypesAndValues::BtpPacket p(header, p_data); loggers::get_instance().log_msg("btp_layer::send_data: ", p); // Encode BTP PDU OCTETSTRING os; _codec.encode(p, os); - data = os; + p_data = os; } - send_to_all_layers(data, params); + send_to_all_layers(p_data, params); } -void btp_layer::receive_data(OCTETSTRING &data, params &p_params) { - loggers::get_instance().log_msg(">>> btp_layer::receive_data: ", data); +void btp_layer::receive_data(OCTETSTRING &p_data, params &p_params) { + loggers::get_instance().log_msg(">>> btp_layer::receive_data: ", p_data); //p_params.log(); - if (data.lengthof() == 0) { + if (p_data.lengthof() == 0) { loggers::get_instance().warning("btp_layer::receive_data: No payload"); return; } @@ -99,7 +99,7 @@ void btp_layer::receive_data(OCTETSTRING &data, params &p_params) { (it->second.compare("2") == 0) ? btp_codec::btpB : btp_codec::btpA); _codec.set_btp_type((it->second.compare("2") == 0) ? btp_codec::btpB : btp_codec::btpA); } - _codec.decode(data, p.msgIn(), ¶ms); + _codec.decode(p_data, p.msgIn(), ¶ms); // Pass the BTP raw payload to the upper layers if any it = params.find(params_its::btp_payload); diff --git a/ccsrc/Protocols/BTP_layers/btp_layer.hh b/ccsrc/Protocols/BTP_layers/btp_layer.hh index 99f1888..4b2f7e5 100644 --- a/ccsrc/Protocols/BTP_layers/btp_layer.hh +++ b/ccsrc/Protocols/BTP_layers/btp_layer.hh @@ -57,7 +57,7 @@ public: //! \publicsection * \param[in] p_data The data to be sent * \param[in] p_params Some parameters to overwrite default value of the lower layers parameters */ - virtual void send_data(OCTETSTRING &data, params& p_params); + virtual void send_data(OCTETSTRING &p_data, params& p_params); /*! * \virtual * \fn void receive_data(OCTETSTRING& data, params& params); @@ -65,5 +65,5 @@ public: //! \publicsection * \param[in] p_data The bytes formated data received * \param[in] p_params Some lower layers parameters values when data was received */ - virtual void receive_data(OCTETSTRING &data, params& p_params); + virtual void receive_data(OCTETSTRING &p_data, params& p_params); }; // End of class btp_layer diff --git a/ccsrc/Protocols/CAM/cam_codec.cc b/ccsrc/Protocols/CAM/cam_codec.cc index 815d294..d799306 100644 --- a/ccsrc/Protocols/CAM/cam_codec.cc +++ b/ccsrc/Protocols/CAM/cam_codec.cc @@ -1,27 +1,31 @@ #include "cam_codec.hh" #include "LibItsCam_TypesAndValues.hh" -#include "asn1/asn_application.h" // from asn1c +#include "LibItsCam_EncdecDeclarations.hh" + #include "loggers.hh" -int cam_codec::encode(const CAM__PDU__Descriptions::CAM &cam, OCTETSTRING &data) { +int cam_codec::encode(const CAM__PDU__Descriptions::CAM &cam, OCTETSTRING &p_data) { loggers::get_instance().log(">>> cam_codec::encode"); - BITSTRING b; - int rc = asn_codec.encode(cam, b); - if (rc != -1) { - data = bit2oct(b); - loggers::get_instance().log_msg("cam_codec::encode: ", data); + BITSTRING bs = LibItsCam__EncdecDeclarations::fx__enc__CAM(cam); + if (!bs.is_bound()) { + loggers::get_instance().error("cam_codec::encode: Failed to encode CAM value"); + return -1; } - return rc; + + p_data = bit2oct(bs); + return 0; } -int cam_codec::decode(const OCTETSTRING &data, CAM__PDU__Descriptions::CAM &cam, params_its *params) { - loggers::get_instance().log_msg(">>> cam_codec::decode: ", data); +int cam_codec::decode(const OCTETSTRING &p_data, CAM__PDU__Descriptions::CAM &cam, params_its *params) { + loggers::get_instance().log_msg(">>> cam_codec::decode: ", p_data); - int rc = asn_codec.decode(oct2bit(data), cam); - loggers::get_instance().log("cam_codec::decode: ASN.1 codec returned %d", rc); - if (rc != -1) { - loggers::get_instance().log_msg("cam_codec::decode: ", cam); + BITSTRING bs = oct2bit(p_data); + int result = static_cast(LibItsCam__EncdecDeclarations::fx__dec__CAM(bs, cam)); + if (result != 0) { + loggers::get_instance().error("cam_codec::decode: Failed to decode CAM PDU"); + return -1; } - return rc; + + return 0; } diff --git a/ccsrc/Protocols/CAM/cam_codec.hh b/ccsrc/Protocols/CAM/cam_codec.hh index ec0ed67..2ecba09 100644 --- a/ccsrc/Protocols/CAM/cam_codec.hh +++ b/ccsrc/Protocols/CAM/cam_codec.hh @@ -1,6 +1,6 @@ #pragma once -#include "cam_pdu_codec.hh" +// FIXME To be removed #include "cam_pdu_codec.hh" #include "codec.hh" #include "params_its.hh" @@ -12,12 +12,11 @@ namespace CAM__PDU__Descriptions { //! Forward declaration of asn1c CAM class } class cam_codec : public codec { - cam_pdu_codec asn_codec; public: - explicit cam_codec() : codec(), asn_codec(){}; + explicit cam_codec() : codec() {}; virtual ~cam_codec(){}; - virtual int encode(const CAM__PDU__Descriptions::CAM &cam, OCTETSTRING &data); - virtual int decode(const OCTETSTRING &data, CAM__PDU__Descriptions::CAM &cam, params_its *params = NULL); + virtual int encode(const CAM__PDU__Descriptions::CAM &cam, OCTETSTRING &p_data); + virtual int decode(const OCTETSTRING &p_data, CAM__PDU__Descriptions::CAM &cam, params_its *params = NULL); }; diff --git a/ccsrc/Protocols/CAM/cam_pdu_codec.cc b/ccsrc/Protocols/CAM/cam_pdu_codec.cc deleted file mode 100644 index 457e3fe..0000000 --- a/ccsrc/Protocols/CAM/cam_pdu_codec.cc +++ /dev/null @@ -1,16 +0,0 @@ -#include "cam_pdu_codec.hh" -#include "LibItsCam_TypesAndValues.hh" -#include "asn1/asn_application.h" // from asn1c -#include "loggers.hh" - -extern "C" { -extern asn_TYPE_descriptor_t asn_DEF_CAM; -} - -int cam_pdu_codec::encode(const CAM__PDU__Descriptions::CAM &p_cam, BITSTRING &p_data) { - return _encode(CAM__PDU__Descriptions::CAM_descr_, asn_DEF_CAM, p_cam, p_data); -} - -int cam_pdu_codec::decode(const BITSTRING &p_data, CAM__PDU__Descriptions::CAM &p_cam) { - return _decode(CAM__PDU__Descriptions::CAM_descr_, asn_DEF_CAM, p_data, p_cam); -} diff --git a/ccsrc/Protocols/CAM/cam_pdu_codec.hh b/ccsrc/Protocols/CAM/cam_pdu_codec.hh deleted file mode 100644 index 8a924af..0000000 --- a/ccsrc/Protocols/CAM/cam_pdu_codec.hh +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "codec.hh" -#include "params.hh" -#include "per_codec.hh" - -class BITSTRING; //! Forward declaration of TITAN class -class OCTETSTRING; //! Forward declaration of TITAN class - -namespace CAM__PDU__Descriptions { //! Forward declaration of asn1c CAM class - class CAM; -} - -class cam_pdu_codec : public per_codec { -public: - explicit cam_pdu_codec(){}; - virtual int encode(const CAM__PDU__Descriptions::CAM &cam, BITSTRING &data); - virtual int decode(const BITSTRING &data, CAM__PDU__Descriptions::CAM &); -}; diff --git a/ccsrc/Protocols/CAM/module.mk b/ccsrc/Protocols/CAM/module.mk index 138aaaf..02e8db5 100644 --- a/ccsrc/Protocols/CAM/module.mk +++ b/ccsrc/Protocols/CAM/module.mk @@ -1,2 +1,2 @@ -sources := cam_codec.cc cam_pdu_codec.cc +sources := cam_codec.cc includes := . diff --git a/ccsrc/Protocols/CAM_layers/cam_layer.cc b/ccsrc/Protocols/CAM_layers/cam_layer.cc index 8fb3808..61cc4c0 100644 --- a/ccsrc/Protocols/CAM_layers/cam_layer.cc +++ b/ccsrc/Protocols/CAM_layers/cam_layer.cc @@ -34,19 +34,19 @@ void cam_layer::sendMsg(const LibItsCam__TypesAndValues::CamReq &p, params_its & send_data(data, _params); } -void cam_layer::send_data(OCTETSTRING &data, params &p_params) { - loggers::get_instance().log_msg(">>> cam_layer::send_data: ", data); +void cam_layer::send_data(OCTETSTRING &p_data, params &p_params) { + loggers::get_instance().log_msg(">>> cam_layer::send_data: ", p_data); - send_to_all_layers(data, p_params); + send_to_all_layers(p_data, p_params); } -void cam_layer::receive_data(OCTETSTRING &data, params &p_params) { - loggers::get_instance().log_msg(">>> cam_layer::receive_data: ", data); +void cam_layer::receive_data(OCTETSTRING &p_data, params &p_params) { + loggers::get_instance().log_msg(">>> cam_layer::receive_data: ", p_data); // Sanity check - if (*(static_cast(data) + 1) != 0x02) { // Check that received packet has CA message id - See ETSI TS 102 894 + if (*(static_cast(p_data) + 1) != 0x02) { // Check that received packet has CA message id - See ETSI TS 102 894 // Not a CAM message, discard it - loggers::get_instance().warning("cam_layer::receive_data: Wrong message id: 0x%02x", *(static_cast(data) + 1)); + loggers::get_instance().warning("cam_layer::receive_data: Wrong message id: 0x%02x", *(static_cast(p_data) + 1)); return; } @@ -54,13 +54,13 @@ void cam_layer::receive_data(OCTETSTRING &data, params &p_params) { params_its ¶ms = static_cast(p_params); LibItsCam__TypesAndValues::CamInd p; - _codec.decode(data, p.msgIn()); + _codec.decode(p_data, p.msgIn()); if (!p.msgIn().is_bound()) { // Discard it return; } // else, continue - // Process lower layer data + // Process lower layer p_data // recvTime params_its::const_iterator it = params.find(params_its::timestamp); if (it != params.cend()) { diff --git a/ccsrc/Protocols/CAM_layers/cam_layer.hh b/ccsrc/Protocols/CAM_layers/cam_layer.hh index 6261aa7..95824fc 100644 --- a/ccsrc/Protocols/CAM_layers/cam_layer.hh +++ b/ccsrc/Protocols/CAM_layers/cam_layer.hh @@ -59,7 +59,7 @@ public: //! \publicsection * \param[in] p_data The data to be sent * \param[in] p_params Some parameters to overwrite default value of the lower layers parameters */ - virtual void send_data(OCTETSTRING &data, params ¶ms); + virtual void send_data(OCTETSTRING &p_data, params ¶ms); /*! * \virtual * \fn void receive_data(OCTETSTRING& data, params& params); @@ -67,7 +67,7 @@ public: //! \publicsection * \param[in] p_data The bytes formated data received * \param[in] p_params Some lower layers parameters values when data was received */ - virtual void receive_data(OCTETSTRING &data, params &info); + virtual void receive_data(OCTETSTRING &p_data, params &info); int enable_secured_mode(const std::string &p_certificate_id, const boolean p_enforce_security); diff --git a/ccsrc/Protocols/CPS/cps_codec.cc b/ccsrc/Protocols/CPS/cps_codec.cc index e64de86..647657f 100644 --- a/ccsrc/Protocols/CPS/cps_codec.cc +++ b/ccsrc/Protocols/CPS/cps_codec.cc @@ -1,27 +1,30 @@ #include "cps_codec.hh" #include "LibItsCps_TypesAndValues.hh" -#include "asn1/asn_application.h" // from asn1c +#include "LibItsCps_EncdecDeclarations.hh" #include "loggers.hh" -int cps_codec::encode(const CPM__PDU__Descriptions::CollectivePerceptionMessage &cps, OCTETSTRING &data) { +int cps_codec::encode(const CPM__PDU__Descriptions::CollectivePerceptionMessage &cps, OCTETSTRING &p_data) { loggers::get_instance().log(">>> cps_codec::encode"); - BITSTRING b; - int rc = asn_codec.encode(cps, b); - if (rc != -1) { - data = bit2oct(b); - loggers::get_instance().log_msg("cps_codec::encode: ", data); + BITSTRING bs = LibItsCps__EncdecDeclarations::fx__enc__CPM(cps); + if (!bs.is_bound()) { + loggers::get_instance().error("cps_codec::encode: Failed to encode CPM value"); + return -1; } - return rc; + + p_data = bit2oct(bs); + return 0; } -int cps_codec::decode(const OCTETSTRING &data, CPM__PDU__Descriptions::CollectivePerceptionMessage &cps, params_its *params) { - loggers::get_instance().log_msg(">>> cps_codec::decode: ", data); +int cps_codec::decode(const OCTETSTRING &p_data, CPM__PDU__Descriptions::CollectivePerceptionMessage &cps, params_its *params) { + loggers::get_instance().log_msg(">>> cps_codec::decode: ", p_data); + + BITSTRING bs = oct2bit(p_data); + int result = static_cast(LibItsCps__EncdecDeclarations::fx__dec__CPM(bs, cps)); + if (result != 0) { + loggers::get_instance().error("cps_codec::decode: Failed to decode CPM PDU"); + return -1; + } - int rc = asn_codec.decode(oct2bit(data), cps); - loggers::get_instance().log("cps_codec::decode: ASN.1 codec returned %d", rc); - // if (rc != -1) { - // loggers::get_instance().log_msg("cps_codec::decode: ", static_cast(cps)); - // } - return rc; + return 0; } diff --git a/ccsrc/Protocols/CPS/cps_codec.hh b/ccsrc/Protocols/CPS/cps_codec.hh index 4504e9e..452f441 100644 --- a/ccsrc/Protocols/CPS/cps_codec.hh +++ b/ccsrc/Protocols/CPS/cps_codec.hh @@ -1,6 +1,5 @@ #pragma once -#include "cps_pdu_codec.hh" #include "codec.hh" #include "params_its.hh" @@ -12,12 +11,11 @@ namespace CPM__PDU__Descriptions { //! Forward declaration of asn1c CPS class } class cps_codec : public codec { - cps_pdu_codec asn_codec; public: - explicit cps_codec() : codec(), asn_codec(){}; + explicit cps_codec() : codec() {}; virtual ~cps_codec(){}; - virtual int encode(const CPM__PDU__Descriptions::CollectivePerceptionMessage &cps, OCTETSTRING &data); - virtual int decode(const OCTETSTRING &data, CPM__PDU__Descriptions::CollectivePerceptionMessage &cps, params_its *params = NULL); + virtual int encode(const CPM__PDU__Descriptions::CollectivePerceptionMessage &cps, OCTETSTRING &p_data); + virtual int decode(const OCTETSTRING &p_data, CPM__PDU__Descriptions::CollectivePerceptionMessage &cps, params_its *params = NULL); }; diff --git a/ccsrc/Protocols/CPS/cps_pdu_codec.cc b/ccsrc/Protocols/CPS/cps_pdu_codec.cc deleted file mode 100644 index 07d7c01..0000000 --- a/ccsrc/Protocols/CPS/cps_pdu_codec.cc +++ /dev/null @@ -1,16 +0,0 @@ -#include "cps_pdu_codec.hh" -#include "LibItsCps_TypesAndValues.hh" -#include "asn1/asn_application.h" // from asn1c -#include "loggers.hh" - -extern "C" { -extern asn_TYPE_descriptor_t asn_DEF_CollectivePerceptionMessage; -} - -int cps_pdu_codec::encode(const CPM__PDU__Descriptions::CollectivePerceptionMessage &p_cps, BITSTRING &p_data) { - return _encode(CPM__PDU__Descriptions::CollectivePerceptionMessage_descr_, asn_DEF_CollectivePerceptionMessage, p_cps, p_data); -} - -int cps_pdu_codec::decode(const BITSTRING &p_data, CPM__PDU__Descriptions::CollectivePerceptionMessage &p_cps) { - return _decode(CPM__PDU__Descriptions::CollectivePerceptionMessage_descr_, asn_DEF_CollectivePerceptionMessage, p_data, p_cps); -} diff --git a/ccsrc/Protocols/CPS/cps_pdu_codec.hh b/ccsrc/Protocols/CPS/cps_pdu_codec.hh deleted file mode 100644 index fd8ba93..0000000 --- a/ccsrc/Protocols/CPS/cps_pdu_codec.hh +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "codec.hh" -#include "params.hh" -#include "per_codec.hh" - -class BITSTRING; //! Forward declaration of TITAN class -class OCTETSTRING; //! Forward declaration of TITAN class - -namespace CPM__PDU__Descriptions { //! Forward declaration of asn1c CPS class - class CollectivePerceptionMessage; -} - -class cps_pdu_codec : public per_codec { -public: - explicit cps_pdu_codec(){}; - virtual int encode(const CPM__PDU__Descriptions::CollectivePerceptionMessage &cps, BITSTRING &data); - virtual int decode(const BITSTRING &data, CPM__PDU__Descriptions::CollectivePerceptionMessage &); -}; diff --git a/ccsrc/Protocols/CPS/module.mk b/ccsrc/Protocols/CPS/module.mk index 4109227..0de266c 100644 --- a/ccsrc/Protocols/CPS/module.mk +++ b/ccsrc/Protocols/CPS/module.mk @@ -1,2 +1,2 @@ -sources := cps_codec.cc cps_pdu_codec.cc +sources := cps_codec.cc includes := . diff --git a/ccsrc/Protocols/CPS_layers/cps_layer.cc b/ccsrc/Protocols/CPS_layers/cps_layer.cc index 4f06494..e9a5cd9 100644 --- a/ccsrc/Protocols/CPS_layers/cps_layer.cc +++ b/ccsrc/Protocols/CPS_layers/cps_layer.cc @@ -34,19 +34,19 @@ void cps_layer::sendMsg(const LibItsCps__TypesAndValues::CpmReq &p, params_its & send_data(data, _params); } -void cps_layer::send_data(OCTETSTRING &data, params &p_params) { - loggers::get_instance().log_msg(">>> cps_layer::send_data: ", data); +void cps_layer::send_data(OCTETSTRING &p_data, params &p_params) { + loggers::get_instance().log_msg(">>> cps_layer::send_data: ", p_data); - send_to_all_layers(data, p_params); + send_to_all_layers(p_data, p_params); } -void cps_layer::receive_data(OCTETSTRING &data, params &p_params) { - loggers::get_instance().log_msg(">>> cps_layer::receive_data: ", data); +void cps_layer::receive_data(OCTETSTRING &p_data, params &p_params) { + loggers::get_instance().log_msg(">>> cps_layer::receive_data: ", p_data); // Sanity check - if (*(static_cast(data) + 1) != 0x0E) { // Check that received packet has CA message id - See ETSI TS 102 894 + if (*(static_cast(p_data) + 1) != 0x0E) { // Check that received packet has CPS message id - See ETSI TS 102 894 // Not a CPS message, discard it - loggers::get_instance().warning("cps_layer::receive_data: Wrong message id: 0x%02x", *(static_cast(data) + 1)); + loggers::get_instance().warning("cps_layer::receive_data: Wrong message id: 0x%02x", *(static_cast(p_data) + 1)); return; } @@ -54,7 +54,7 @@ void cps_layer::receive_data(OCTETSTRING &data, params &p_params) { params_its ¶ms = static_cast(p_params); LibItsCps__TypesAndValues::CpmInd p; - _codec.decode(data, p.msgIn()); + _codec.decode(p_data, p.msgIn()); if (!p.msgIn().is_bound()) { // Discard it return; diff --git a/ccsrc/Protocols/CPS_layers/cps_layer.hh b/ccsrc/Protocols/CPS_layers/cps_layer.hh index ba8dfe5..a87fcc6 100644 --- a/ccsrc/Protocols/CPS_layers/cps_layer.hh +++ b/ccsrc/Protocols/CPS_layers/cps_layer.hh @@ -59,7 +59,7 @@ public: //! \publicsection * \param[in] p_data The data to be sent * \param[in] p_params Some parameters to overwrite default value of the lower layers parameters */ - virtual void send_data(OCTETSTRING &data, params ¶ms); + virtual void send_data(OCTETSTRING &p_data, params ¶ms); /*! * \virtual * \fn void receive_data(OCTETSTRING& data, params& params); @@ -67,7 +67,7 @@ public: //! \publicsection * \param[in] p_data The bytes formated data received * \param[in] p_params Some lower layers parameters values when data was received */ - virtual void receive_data(OCTETSTRING &data, params &info); + virtual void receive_data(OCTETSTRING &p_data, params &info); int enable_secured_mode(const std::string &p_certificate_id, const boolean p_enforce_security); diff --git a/ccsrc/Protocols/Commsignia/commsignia_layer.cc b/ccsrc/Protocols/Commsignia/commsignia_layer.cc index 702d2b5..cb539a7 100644 --- a/ccsrc/Protocols/Commsignia/commsignia_layer.cc +++ b/ccsrc/Protocols/Commsignia/commsignia_layer.cc @@ -52,7 +52,7 @@ commsignia_layer::commsignia_layer(const std::string &p_type, const std::string //_params.log(); } -void commsignia_layer::send_data(OCTETSTRING &data, params ¶ms) { +void commsignia_layer::send_data(OCTETSTRING &p_data, params ¶ms) { loggers::get_instance().log_msg(">>> commsignia_layer::send_data: ", data); OCTETSTRING buffer = OCTETSTRING(0, nullptr); @@ -109,7 +109,7 @@ void commsignia_layer::send_data(OCTETSTRING &data, params ¶ms) { send_to_all_layers(buffer, params); } -void commsignia_layer::receive_data(OCTETSTRING &data, params ¶ms) { +void commsignia_layer::receive_data(OCTETSTRING &p_data, params ¶ms) { loggers::get_instance().log_msg(">>> commsignia_layer::receive_data: ", data); const unsigned char *p = static_cast(data); diff --git a/ccsrc/Protocols/Commsignia/commsignia_layer.hh b/ccsrc/Protocols/Commsignia/commsignia_layer.hh index 30403e6..e7d4ce7 100644 --- a/ccsrc/Protocols/Commsignia/commsignia_layer.hh +++ b/ccsrc/Protocols/Commsignia/commsignia_layer.hh @@ -131,6 +131,6 @@ public: */ virtual ~commsignia_layer(){}; - virtual void send_data(OCTETSTRING &data, params ¶ms); - virtual void receive_data(OCTETSTRING &data, params &info); + virtual void send_data(OCTETSTRING &p_data, params ¶ms); + virtual void receive_data(OCTETSTRING &p_data, params &info); }; // End of class commsignia_layer diff --git a/ccsrc/Protocols/DENM/denm_codec.cc b/ccsrc/Protocols/DENM/denm_codec.cc index 355ac67..0c60b2f 100644 --- a/ccsrc/Protocols/DENM/denm_codec.cc +++ b/ccsrc/Protocols/DENM/denm_codec.cc @@ -1,27 +1,30 @@ #include "denm_codec.hh" #include "LibItsDenm_TypesAndValues.hh" -#include "asn1/asn_application.h" // from asn1c +#include "LibItsDenm_EncdecDeclarations.hh" #include "loggers.hh" int denm_codec::encode(const DENM__PDU__Descriptions::DENM &p_denm, OCTETSTRING &p_data) { loggers::get_instance().log_msg(">>> denm_codec::encode: ", p_denm); - BITSTRING b; - int rc = asn_codec.encode(p_denm, b); - if (rc != -1) { - p_data = bit2oct(b); + BITSTRING bs = LibItsDenm__EncdecDeclarations::fx__enc__DENM(p_denm); + if (!bs.is_bound()) { + loggers::get_instance().error("denm_codec::encode: Failed to encode DENM value"); + return -1; } - loggers::get_instance().log("<<< denm_codec::encode: %d", rc); - return rc; + + p_data = bit2oct(bs); + return 0; } int denm_codec::decode(const OCTETSTRING &p_data, DENM__PDU__Descriptions::DENM &p_denm, params_its *params) { loggers::get_instance().log_msg(">>> denm_codec::decode:", p_data); - int rc = asn_codec.decode(oct2bit(p_data), p_denm); - loggers::get_instance().log("denm_codec::decode: ASN.1 codec returned %d", rc); - if (rc != -1) { - loggers::get_instance().log_msg("denm_codec::decode: ", p_denm); + BITSTRING bs = oct2bit(p_data); + int result = static_cast(LibItsDenm__EncdecDeclarations::fx__dec__DENM(bs, p_denm)); + if (result != 0) { + loggers::get_instance().error("denm_codec::decode: Failed to decode DENM PDU"); + return -1; } - return rc; + + return 0; } diff --git a/ccsrc/Protocols/DENM/denm_codec.hh b/ccsrc/Protocols/DENM/denm_codec.hh index 2490cb0..a882117 100644 --- a/ccsrc/Protocols/DENM/denm_codec.hh +++ b/ccsrc/Protocols/DENM/denm_codec.hh @@ -1,7 +1,6 @@ #pragma once #include "codec.hh" -#include "denm_pdu_codec.hh" #include "params_its.hh" class BITSTRING; @@ -15,12 +14,11 @@ namespace DENM__PDU__Descriptions { } class denm_codec : public codec { - denm_pdu_codec asn_codec; public: - explicit denm_codec() : codec(), asn_codec(){}; + explicit denm_codec() : codec() {}; virtual ~denm_codec(){}; - virtual int encode(const DENM__PDU__Descriptions::DENM &denm, OCTETSTRING &data); - virtual int decode(const OCTETSTRING &data, DENM__PDU__Descriptions::DENM &, params_its *params = NULL); + virtual int encode(const DENM__PDU__Descriptions::DENM &denm, OCTETSTRING &p_data); + virtual int decode(const OCTETSTRING &p_data, DENM__PDU__Descriptions::DENM &, params_its *params = NULL); }; diff --git a/ccsrc/Protocols/DENM/denm_pdu_codec.cc b/ccsrc/Protocols/DENM/denm_pdu_codec.cc deleted file mode 100644 index b420d64..0000000 --- a/ccsrc/Protocols/DENM/denm_pdu_codec.cc +++ /dev/null @@ -1,16 +0,0 @@ -#include "denm_pdu_codec.hh" -#include "LibItsDenm_TypesAndValues.hh" -#include "asn1/asn_application.h" // from asn1c -#include "loggers.hh" - -extern "C" { -extern asn_TYPE_descriptor_t asn_DEF_DENM; -} - -int denm_pdu_codec::encode(const DENM__PDU__Descriptions::DENM &p_denm, BITSTRING &p_data) { - return _encode(DENM__PDU__Descriptions::DENM_descr_, asn_DEF_DENM, p_denm, p_data); -} - -int denm_pdu_codec::decode(const BITSTRING &p_data, DENM__PDU__Descriptions::DENM &p_denm) { - return _decode(DENM__PDU__Descriptions::DENM_descr_, asn_DEF_DENM, p_data, p_denm); -} diff --git a/ccsrc/Protocols/DENM/denm_pdu_codec.hh b/ccsrc/Protocols/DENM/denm_pdu_codec.hh deleted file mode 100644 index 08bd0af..0000000 --- a/ccsrc/Protocols/DENM/denm_pdu_codec.hh +++ /dev/null @@ -1,22 +0,0 @@ -#pragma once - -#include "codec.hh" -#include "params.hh" -#include "per_codec.hh" - -class BITSTRING; -class OCTETSTRING; -class Base_Type; -class TTCN_Typedescriptor_t; -class TTCN_Buffer; - -namespace DENM__PDU__Descriptions { - class DENM; -} - -class denm_pdu_codec : public per_codec { -public: - explicit denm_pdu_codec(){}; - virtual int encode(const DENM__PDU__Descriptions::DENM &denm, BITSTRING &data); - virtual int decode(const BITSTRING &data, DENM__PDU__Descriptions::DENM &); -}; diff --git a/ccsrc/Protocols/DENM/module.mk b/ccsrc/Protocols/DENM/module.mk index 779ece7..ac7f579 100644 --- a/ccsrc/Protocols/DENM/module.mk +++ b/ccsrc/Protocols/DENM/module.mk @@ -1,4 +1,4 @@ -sources := denm_codec.cc denm_pdu_codec.cc +sources := denm_codec.cc includes := . diff --git a/ccsrc/Protocols/DENM_layers/denm_layer.cc b/ccsrc/Protocols/DENM_layers/denm_layer.cc index a626c92..ff56bd5 100644 --- a/ccsrc/Protocols/DENM_layers/denm_layer.cc +++ b/ccsrc/Protocols/DENM_layers/denm_layer.cc @@ -32,19 +32,19 @@ void denm_layer::sendMsg(const LibItsDenm__TypesAndValues::DenmReq &p, params_it send_data(data, _params); } -void denm_layer::send_data(OCTETSTRING &data, params &p_params) { - loggers::get_instance().log_msg(">>> denm_layer::send_data: ", data); +void denm_layer::send_data(OCTETSTRING &p_data, params &p_params) { + loggers::get_instance().log_msg(">>> denm_layer::send_data: ", p_data); // params.log(); - send_to_all_layers(data, p_params); + send_to_all_layers(p_data, p_params); } -void denm_layer::receive_data(OCTETSTRING &data, params &p_params) { - loggers::get_instance().log_msg(">>> denm_layer::receive_data: ", data); +void denm_layer::receive_data(OCTETSTRING &p_data, params &p_params) { + loggers::get_instance().log_msg(">>> denm_layer::receive_data: ", p_data); // Sanity check - if (*(static_cast(data) + 1) != 0x01) { // Check that received packet has DEN message id - See ETSI TS 102 894 + if (*(static_cast(p_data) + 1) != 0x01) { // Check that received packet has DEN message id - See ETSI TS 102 894 // Not a DENM message, discard it - loggers::get_instance().warning("denm_layer::receive_data: Wrong message id: 0x%02x", *(static_cast(data) + 1)); + loggers::get_instance().warning("denm_layer::receive_data: Wrong message id: 0x%02x", *(static_cast(p_data) + 1)); return; } @@ -52,13 +52,13 @@ void denm_layer::receive_data(OCTETSTRING &data, params &p_params) { params_its ¶ms = static_cast(p_params); LibItsDenm__TypesAndValues::DenmInd p; - _codec.decode(data, p.msgIn()); + _codec.decode(p_data, p.msgIn()); if (!p.msgIn().is_bound()) { // Discard it return; } // else, continue - // Process lower layer data + // Process lower layer p_data // recvTime params::const_iterator it = params.find(params::timestamp); if (it != params.cend()) { diff --git a/ccsrc/Protocols/DENM_layers/denm_layer.hh b/ccsrc/Protocols/DENM_layers/denm_layer.hh index 6390fa4..3200baf 100644 --- a/ccsrc/Protocols/DENM_layers/denm_layer.hh +++ b/ccsrc/Protocols/DENM_layers/denm_layer.hh @@ -59,7 +59,7 @@ public: //! \publicsection * \param[in] p_data The data to be sent * \param[in] p_params Some parameters to overwrite default value of the lower layers parameters */ - virtual void send_data(OCTETSTRING &data, params ¶ms); + virtual void send_data(OCTETSTRING &p_data, params ¶ms); /*! * \virtual * \fn void receive_data(OCTETSTRING& data, params& params); @@ -67,7 +67,7 @@ public: //! \publicsection * \param[in] p_data The bytes formated data received * \param[in] p_params Some lower layers parameters values when data was received */ - virtual void receive_data(OCTETSTRING &data, params &info); + virtual void receive_data(OCTETSTRING &p_data, params &info); int enable_secured_mode(const std::string &p_certificate_id, const boolean p_enforce_security); diff --git a/ccsrc/Protocols/GeoNetworking/geonetworking_codec.cc b/ccsrc/Protocols/GeoNetworking/geonetworking_codec.cc index ad81d7e..a5b80c0 100644 --- a/ccsrc/Protocols/GeoNetworking/geonetworking_codec.cc +++ b/ccsrc/Protocols/GeoNetworking/geonetworking_codec.cc @@ -11,7 +11,7 @@ template class OPTIONAL; class TTCN_EncDec; -int geonetworking_codec::encode(const LibItsGeoNetworking__TypesAndValues::GeoNetworkingPdu &msg, OCTETSTRING &data) { +int geonetworking_codec::encode(const LibItsGeoNetworking__TypesAndValues::GeoNetworkingPdu &msg, OCTETSTRING &p_data) { loggers::get_instance().log_msg(">>> geonetworking_codec::encode (1): ", (const Base_Type &)msg); TTCN_EncDec::clear_error(); @@ -20,41 +20,41 @@ int geonetworking_codec::encode(const LibItsGeoNetworking__TypesAndValues::GeoNe _ec.reset(); encode_(msg, *msg.get_descriptor(), encoding_buffer); - data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); + p_data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); // Overwrite the payload length if (_ec.get_length() != (unsigned int)-1) { - loggers::get_instance().log("geonetworking_codec::encode (1): length=%d - plLength_position = %d - plLength = %d", data.lengthof(), _ec.get_length_position(), + loggers::get_instance().log("geonetworking_codec::encode (1): length=%d - plLength_position = %d - plLength = %d", p_data.lengthof(), _ec.get_length_position(), _ec.get_length()); unsigned char b[] = {(unsigned char)((_ec.get_length() & 0x0000FF00) >> 8), (unsigned char)_ec.get_length()}; OCTETSTRING rpl(sizeof(b), b); loggers::get_instance().log_msg("geonetworking_codec::encode: rpl=", rpl); - data = replace(data, _ec.get_length_position(), rpl.lengthof(), rpl); - loggers::get_instance().log_msg("geonetworking_codec::encode (1): after replace: ", data); + p_data = replace(p_data, _ec.get_length_position(), rpl.lengthof(), rpl); + loggers::get_instance().log_msg("geonetworking_codec::encode (1): after replace: ", p_data); } - loggers::get_instance().log_msg("geonetworking_codec::encode (1): After encoding: ", data); + loggers::get_instance().log_msg("geonetworking_codec::encode (1): After encoding: ", p_data); loggers::get_instance().log("<<< geonetworking_codec::encode (1)"); return 0; } -int geonetworking_codec::encode(const LibItsGeoNetworking__TypesAndValues::GnNonSecuredPacket &p_gnNonSecuredPacket, OCTETSTRING &data) { +int geonetworking_codec::encode(const LibItsGeoNetworking__TypesAndValues::GnNonSecuredPacket &p_gnNonSecuredPacket, OCTETSTRING &p_data) { loggers::get_instance().log_msg(">>> geonetworking_codec::encode (2): ", (const Base_Type &)p_gnNonSecuredPacket); TTCN_EncDec::clear_error(); TTCN_Buffer encoding_buffer; encode_(p_gnNonSecuredPacket, *p_gnNonSecuredPacket.get_descriptor(), encoding_buffer); - data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); + p_data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); // Overwrite the payload length if (_ec.get_length() != (unsigned int)-1) { - loggers::get_instance().log("geonetworking_codec::encode (2): length=%d - plLength_position = %d - plLength = %d", data.lengthof(), _ec.get_length_position(), + loggers::get_instance().log("geonetworking_codec::encode (2): length=%d - plLength_position = %d - plLength = %d", p_data.lengthof(), _ec.get_length_position(), _ec.get_length()); unsigned char b[] = {(unsigned char)((_ec.get_length() & 0x0000FF00) >> 8), (unsigned char)_ec.get_length()}; OCTETSTRING rpl(sizeof(b), b); loggers::get_instance().log_msg("geonetworking_codec::encode (2): rpl=", rpl); - data = replace(data, _ec.get_length_position(), rpl.lengthof(), rpl); - loggers::get_instance().log_msg("geonetworking_codec::encode (2): after replace: ", data); + p_data = replace(p_data, _ec.get_length_position(), rpl.lengthof(), rpl); + loggers::get_instance().log_msg("geonetworking_codec::encode (2): after replace: ", p_data); } - loggers::get_instance().log_msg("geonetworking_codec::encode (2): After encoding: ", data); + loggers::get_instance().log_msg("geonetworking_codec::encode (2): After encoding: ", p_data); loggers::get_instance().log("<<< geonetworking_codec::encode (2)"); return 0; @@ -144,9 +144,9 @@ int geonetworking_codec::encode_(const Base_Type &type, const TTCN_Typedescripto return 0; } -int geonetworking_codec::decode(const OCTETSTRING &data, LibItsGeoNetworking__TypesAndValues::GeoNetworkingPdu &msg, params_its *params) { +int geonetworking_codec::decode(const OCTETSTRING &p_data, LibItsGeoNetworking__TypesAndValues::GeoNetworkingPdu &msg, params_its *params) { TTCN_EncDec::clear_error(); - TTCN_Buffer decoding_buffer(data); + TTCN_Buffer decoding_buffer(p_data); _dc.reset(); @@ -184,7 +184,7 @@ int geonetworking_codec::decode_(Base_Type &type, const TTCN_Typedescriptor_t &f return -1; } } // End of 'for' statement - // Save data for upper layer + // Save p_data for upper layer if (std::string(r.get_descriptor()->name).compare("@LibItsGeoNetworking_TypesAndValues.Lifetime") == 0) { LibItsGeoNetworking__TypesAndValues::Lifetime &l = static_cast(r); unsigned int base = 0; @@ -215,14 +215,14 @@ int geonetworking_codec::decode_(Base_Type &type, const TTCN_Typedescriptor_t &f // loggers::get_instance().log("geonetworking_codec::decode_ (else): processing type %s/%s - optional:%d", type.get_descriptor()->name, // field_descriptor.name, type.is_optional()); if (std::string(field_descriptor.name).compare("@LibItsGeoNetworking_TypesAndValues.CommonHeader.nextHeader") == 0) { - // Decode NextHeader data structure + // Decode NextHeader p_data structure type.decode(field_descriptor, decoding_buffer, TTCN_EncDec::CT_RAW); // Store NextHeader field value and continue decoding _dc.set_next_header((unsigned int)dynamic_cast(type).as_int()); } else if (std::string(field_descriptor.name).compare("@LibItsGeoNetworking_TypesAndValues.CommonHeader.headerTST") == 0) { decode_headerTST(static_cast(type), decoding_buffer); } else if (std::string(field_descriptor.name).compare("@LibItsGeoNetworking_TypesAndValues.GnNonSecuredPacket.extendedHeader") == 0) { - // Decode ExtendedHeader data structure + // Decode ExtendedHeader p_data structure LibItsGeoNetworking__TypesAndValues::ExtendedHeader e; decode_extendedHeader(e, decoding_buffer); if (e.is_bound()) { @@ -233,7 +233,7 @@ int geonetworking_codec::decode_(Base_Type &type, const TTCN_Typedescriptor_t &f dynamic_cast &>(type).set_to_omit(); } } else if (std::string(field_descriptor.name).compare("@LibItsGeoNetworking_TypesAndValues.GnNonSecuredPacket.payload") == 0) { - // Decode raw payload data structure + // Decode raw payload p_data structure OCTETSTRING s(decoding_buffer.get_len() - decoding_buffer.get_pos(), decoding_buffer.get_data() + decoding_buffer.get_pos()); // loggers::get_instance().log_msg("geonetworking_codec::decode_: s=", s); const unsigned char *p = static_cast(s); @@ -266,7 +266,7 @@ int geonetworking_codec::decode_(Base_Type &type, const TTCN_Typedescriptor_t &f dynamic_cast &>(type).set_to_omit(); } } else if (std::string(field_descriptor.name).compare("@LibItsGeoNetworking_TypesAndValues.CommonHeader.plLength") == 0) { - // Decode plLength data structure + // Decode plLength p_data structure type.decode(field_descriptor, decoding_buffer, TTCN_EncDec::CT_RAW); // Store playload length and continue decoding _dc.set_length((unsigned int)static_cast(dynamic_cast(type))); @@ -335,7 +335,7 @@ int geonetworking_codec::encode_extendedHeader(const LibItsGeoNetworking__TypesA int geonetworking_codec::decode_headerTST(LibItsGeoNetworking__TypesAndValues::HeaderTST &u, TTCN_Buffer &decoding_buffer) { // loggers::get_instance().log(">>> geonetworking_codec::decode_headerTST: processing %s", u.get_descriptor()->name); - // Decode HeaderTST data structure + // Decode HeaderTST p_data structure _dc.set_header_type(*(decoding_buffer.get_data() + decoding_buffer.get_pos()) >> 4); _dc.set_header_sub_type(*(decoding_buffer.get_data() + decoding_buffer.get_pos()) & 0x0F); // loggers::get_instance().log("geonetworking_codec::decode_: headerTST selectors: _dc.header_type = %d - _dc.header_sub_type = %d", _dc.get_header_type(), diff --git a/ccsrc/Protocols/GeoNetworking/geonetworking_codec.hh b/ccsrc/Protocols/GeoNetworking/geonetworking_codec.hh index c63b5ec..cf8fc83 100644 --- a/ccsrc/Protocols/GeoNetworking/geonetworking_codec.hh +++ b/ccsrc/Protocols/GeoNetworking/geonetworking_codec.hh @@ -41,8 +41,8 @@ public: : codec(), _ec(), _dc(){}; virtual ~geonetworking_codec(){}; - virtual int encode(const LibItsGeoNetworking__TypesAndValues::GeoNetworkingPdu &msg, OCTETSTRING &data); - virtual int decode(const OCTETSTRING &data, LibItsGeoNetworking__TypesAndValues::GeoNetworkingPdu &msg, params_its *params = NULL); + virtual int encode(const LibItsGeoNetworking__TypesAndValues::GeoNetworkingPdu &msg, OCTETSTRING &p_data); + virtual int decode(const OCTETSTRING &p_data, LibItsGeoNetworking__TypesAndValues::GeoNetworkingPdu &msg, params_its *params = NULL); int encode(const LibItsGeoNetworking__TypesAndValues::GnNonSecuredPacket &p_gnNonSecuredPacket, OCTETSTRING & data); // TODO Duplicate code with virtual encode, to be enhanced diff --git a/ccsrc/Protocols/GeoNetworking/geonetworking_layer.cc b/ccsrc/Protocols/GeoNetworking/geonetworking_layer.cc index 92b5e36..4934974 100644 --- a/ccsrc/Protocols/GeoNetworking/geonetworking_layer.cc +++ b/ccsrc/Protocols/GeoNetworking/geonetworking_layer.cc @@ -206,8 +206,8 @@ void geonetworking_layer::sendMsg(const LibItsGeoNetworking__TypesAndValues::Geo send_data(data, param); } -void geonetworking_layer::send_data(OCTETSTRING &data, params &p_params) { - loggers::get_instance().log_msg(">>> geonetworking_layer::send_data: ", data); +void geonetworking_layer::send_data(OCTETSTRING &p_data, params &p_params) { + loggers::get_instance().log_msg(">>> geonetworking_layer::send_data: ", p_data); //p_params.log(); params_its ¶ms = static_cast(p_params); @@ -215,12 +215,12 @@ void geonetworking_layer::send_data(OCTETSTRING &data, params &p_params) { if (_device_mode) { // Need to build a GN packet params[params_its::certificate] = _params[params_its::certificate]; params[params_its::hash] = _params[params_its::hash]; // TODO Should be removed - if (build_geonetworking_pdu(data, params) != 0) { + if (build_geonetworking_pdu(p_data, params) != 0) { return; } } if (_secured_mode) { // Add Security support - if (build_secured_pdu(data, params) != 0) { + if (build_secured_pdu(p_data, params) != 0) { return; } } @@ -230,7 +230,7 @@ void geonetworking_layer::send_data(OCTETSTRING &data, params &p_params) { // not ready yet std::this_thread::sleep_for(std::chrono::milliseconds(1)); } // End of 'while' statement - send_to_all_layers(data, params); + send_to_all_layers(p_data, params); _sendData.unlock(); loggers::get_instance().log("<<< geonetworking_layer::send_data"); } @@ -239,22 +239,22 @@ const TTCN_RAWdescriptor_t _intx_raw_ = {RAW_INTX, SG_NO, ORDER_MSB, TOP_BIT_INHERITED, 0, 0, 0, 8, 0, NULL, -1, CharCoding::UNKNOWN_CHAR_CODING}; const TTCN_Typedescriptor_t _intx_descr_ = {"IntX", NULL, &_intx_raw_, NULL, NULL, NULL, NULL, NULL, NULL, TTCN_Typedescriptor_t::DONTCARE}; -void geonetworking_layer::receive_data(OCTETSTRING &data, params &p_params) { - loggers::get_instance().log_msg(">>> geonetworking_layer::receive_data: ", data); +void geonetworking_layer::receive_data(OCTETSTRING &p_data, params &p_params) { + loggers::get_instance().log_msg(">>> geonetworking_layer::receive_data: ", p_data); params_its ¶ms = static_cast(p_params); // Check security mode Ieee1609Dot2::Ieee1609Dot2Data ieee_1609dot2_data; LibItsGeoNetworking__TypesAndValues::BasicHeader basic_header; - decode_basic_header(data, basic_header); + decode_basic_header(p_data, basic_header); if ((int)basic_header.nextHeader() == 2) { // Verify and extract the GeoNetworking Secured Packet as specified in ETSI EN 302 636-4-1 V1.3.1 (2017-08) // Clause 9.6.1 Composition of the Basic Header unsigned int basic_header_len = 4; // FIXME How to retrive the BasicHeader length basic_header.get_descriptor()->raw->fieldlength / 8; loggers::get_instance().log("geonetworking_layer::receive_data: basic_header_len = %d", basic_header_len); // Verify and extract the GeoNetworking Secured Packet as specified in ETSI EN 302 636-4-1 V1.3.1 (2017-08) Clause 9.4 GeoNetworking Secured Packet OCTETSTRING unsecured_gn_payload; - OCTETSTRING secured_data = OCTETSTRING(data.lengthof() - basic_header_len, static_cast(data) + basic_header_len); + OCTETSTRING secured_data = OCTETSTRING(p_data.lengthof() - basic_header_len, static_cast(p_data) + basic_header_len); /////////////////// // FIXME Check what to do with this! if (*static_cast(secured_data) != 0x03) { @@ -272,15 +272,15 @@ void geonetworking_layer::receive_data(OCTETSTRING &data, params &p_params) { } } } - // Update data + // Update p_data loggers::get_instance().log_msg("geonetworking_layer::receive_data: Unsecured payload: ", unsecured_gn_payload); - data = OCTETSTRING(basic_header_len, static_cast(data)) + unsecured_gn_payload; + p_data = OCTETSTRING(basic_header_len, static_cast(p_data)) + unsecured_gn_payload; } // Decode the payload - loggers::get_instance().log_msg("geonetworking_layer::receive_data: Geonetworking payload to decode: ", data); + loggers::get_instance().log_msg("geonetworking_layer::receive_data: Geonetworking payload to decode: ", p_data); LibItsGeoNetworking__TypesAndValues::GeoNetworkingInd ind; - _codec.decode(data, ind.msgIn(), ¶ms); + _codec.decode(p_data, ind.msgIn(), ¶ms); if (ind.msgIn().is_bound()) { // Update optional securedMsg field if required if (ieee_1609dot2_data.is_bound()) { @@ -328,7 +328,7 @@ void geonetworking_layer::receive_data(OCTETSTRING &data, params &p_params) { _codec.encode(*_ls_reply, os); // Apply signature if (_secured_mode) { - if (build_secured_pdu(data, _params) != 0) { + if (build_secured_pdu(p_data, _params) != 0) { return; } } @@ -426,8 +426,8 @@ void geonetworking_layer::receive_data(OCTETSTRING &data, params &p_params) { to_all_upper_ports(ind, params); } -OCTETSTRING geonetworking_layer::trigger_ac_event(OCTETSTRING &data, params_its ¶ms) { - loggers::get_instance().log_to_hexa(">>> geonetworking_layer::trigger_ac_event: ", data); +OCTETSTRING geonetworking_layer::trigger_ac_event(OCTETSTRING &p_data, params_its ¶ms) { + loggers::get_instance().log_to_hexa(">>> geonetworking_layer::trigger_ac_event: ", p_data); return int2oct(0, 2); } // End of trigger_ac_event method @@ -745,7 +745,7 @@ void geonetworking_layer::timer_irq_sigalrm_handler(int p_signal, siginfo_t *p_s static_cast(p_signal_info->si_value.sival_ptr)->send_beacon(); } // End of method timer_irq_sigalrm_handler -int geonetworking_layer::build_geonetworking_pdu(OCTETSTRING &data, params_its ¶ms) { +int geonetworking_layer::build_geonetworking_pdu(OCTETSTRING &p_data, params_its ¶ms) { loggers::get_instance().log(">>> geonetworking_layer::build_geonetworking_pdu"); // params.log(); @@ -781,8 +781,8 @@ int geonetworking_layer::build_geonetworking_pdu(OCTETSTRING &data, params_its & _shb_packet->gnPacket().packet().commonHeader().nextHeader() = NextHeader::e__btpA; } // Update payload - _shb_packet->gnPacket().packet().commonHeader().plLength() = data.lengthof(); - _shb_packet->gnPacket().packet().payload() = OPTIONAL(data); + _shb_packet->gnPacket().packet().commonHeader().plLength() = p_data.lengthof(); + _shb_packet->gnPacket().packet().payload() = OPTIONAL(p_data); // Update timestamp eh->shbHeader().srcPosVector().timestamp__().set_long_long_val(static_cast(base_time::get_instance().get_its_current_time_mod_ms())); @@ -790,7 +790,7 @@ int geonetworking_layer::build_geonetworking_pdu(OCTETSTRING &data, params_its & // Encode GeoNetworking PDU OCTETSTRING os; _codec.encode(*_shb_packet, os); - data = os; + p_data = os; } else { // Use TSB ExtendedHeader *eh = static_cast(_tsb_packet->gnPacket().packet().extendedHeader().get_opt_value()); if (eh == nullptr) { @@ -807,8 +807,8 @@ int geonetworking_layer::build_geonetworking_pdu(OCTETSTRING &data, params_its & _tsb_packet->gnPacket().packet().commonHeader().nextHeader() = NextHeader::e__btpA; } // Update payload - _tsb_packet->gnPacket().packet().commonHeader().plLength() = data.lengthof(); - _tsb_packet->gnPacket().packet().payload() = OPTIONAL(data); + _tsb_packet->gnPacket().packet().commonHeader().plLength() = p_data.lengthof(); + _tsb_packet->gnPacket().packet().payload() = OPTIONAL(p_data); // Update timestamp eh->tsbHeader().srcPosVector().timestamp__().set_long_long_val(static_cast(base_time::get_instance().get_its_current_time_mod_ms())); @@ -816,7 +816,7 @@ int geonetworking_layer::build_geonetworking_pdu(OCTETSTRING &data, params_its & // Encode GeoNetworking PDU OCTETSTRING os; _codec.encode(*_tsb_packet, os); - data = os; + p_data = os; } } else if (header_type.compare("uni") == 0) { ExtendedHeader *eh = static_cast(_uni_packet->gnPacket().packet().extendedHeader().get_opt_value()); @@ -834,8 +834,8 @@ int geonetworking_layer::build_geonetworking_pdu(OCTETSTRING &data, params_its & // Update sequence number eh->geoUnicastHeader().seqNumber() = _sequence_number++; // Update payload - _uni_packet->gnPacket().packet().commonHeader().plLength() = data.lengthof(); - _uni_packet->gnPacket().packet().payload() = OPTIONAL(data); + _uni_packet->gnPacket().packet().commonHeader().plLength() = p_data.lengthof(); + _uni_packet->gnPacket().packet().payload() = OPTIONAL(p_data); // Update timestamp eh->geoUnicastHeader().srcPosVector().timestamp__().set_long_long_val(static_cast(base_time::get_instance().get_its_current_time_mod_ms())); @@ -844,7 +844,7 @@ int geonetworking_layer::build_geonetworking_pdu(OCTETSTRING &data, params_its & // Encode GeoNetworking PDU OCTETSTRING os; _codec.encode(*_uni_packet, os); - data = os; + p_data = os; } else { // TODO To be continued // Default: Use GBC ExtendedHeader *eh = static_cast(_gbc_packet->gnPacket().packet().extendedHeader().get_opt_value()); @@ -862,8 +862,8 @@ int geonetworking_layer::build_geonetworking_pdu(OCTETSTRING &data, params_its & // Update sequence number eh->geoBroadcastHeader().seqNumber() = _sequence_number++; // Update payload - _gbc_packet->gnPacket().packet().commonHeader().plLength() = data.lengthof(); - _gbc_packet->gnPacket().packet().payload() = OPTIONAL(data); + _gbc_packet->gnPacket().packet().commonHeader().plLength() = p_data.lengthof(); + _gbc_packet->gnPacket().packet().payload() = OPTIONAL(p_data); // Update timestamp eh->geoBroadcastHeader().srcPosVector().timestamp__().set_long_long_val(static_cast(base_time::get_instance().get_its_current_time_mod_ms())); @@ -872,28 +872,28 @@ int geonetworking_layer::build_geonetworking_pdu(OCTETSTRING &data, params_its & // Encode GeoNetworking PDU OCTETSTRING os; _codec.encode(*_gbc_packet, os); - data = os; + p_data = os; } return 0; } -int geonetworking_layer::build_secured_pdu(OCTETSTRING &data, params_its ¶ms) { - loggers::get_instance().log_msg(">>> geonetworking_layer::build_secured_pdu: ", data); +int geonetworking_layer::build_secured_pdu(OCTETSTRING &p_data, params_its ¶ms) { + loggers::get_instance().log_msg(">>> geonetworking_layer::build_secured_pdu: ", p_data); // params.log(); LibItsGeoNetworking__TypesAndValues::BasicHeader basic_header; - decode_basic_header(data, basic_header); + decode_basic_header(p_data, basic_header); if (basic_header.nextHeader() == BasicNextHeader::e__securedPacket) { // Already secured (ATS Security test suite/f_sendSecuredGn/Cam/Denm TTCN-3 functions - // Leave data unchanged - loggers::get_instance().log_msg("<<< geonetworking_layer::build_secured_pdu: Leave data unchanged: ", data); + // Leave p_data unchanged + loggers::get_instance().log_msg("<<< geonetworking_layer::build_secured_pdu: Leave p_data unchanged: ", p_data); return 0; } // Update security mode unsigned int basic_header_len = 4; // FIXME How to retrieve the BasicHeader length basic_header.get_descriptor()->raw->fieldlength / 8; loggers::get_instance().log("geonetworking_layer::build_secured_pdu: basic_header_len = %d", basic_header_len); basic_header.nextHeader() = BasicNextHeader::e__securedPacket; - OCTETSTRING unsecured_gn_payload = OCTETSTRING(data.lengthof() - basic_header_len, static_cast(data) + basic_header_len); + OCTETSTRING unsecured_gn_payload = OCTETSTRING(p_data.lengthof() - basic_header_len, static_cast(p_data) + basic_header_len); OCTETSTRING secured_gn_payload; if (security_services_its::get_instance().secure_gn_payload(unsecured_gn_payload, secured_gn_payload, params) != 0) { loggers::get_instance().warning("geonetworking_layer::build_secured_pdu: failed to build secured pdu"); @@ -910,8 +910,8 @@ int geonetworking_layer::build_secured_pdu(OCTETSTRING &data, params_its ¶ms TTCN_Buffer encoding_buffer; enc_tree.put_to_buf(encoding_buffer); // Copy result - data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()) + secured_gn_payload; - loggers::get_instance().log_msg("geonetworking_layer::build_secured_pdu: Secured pdu = ", data); + p_data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()) + secured_gn_payload; + loggers::get_instance().log_msg("geonetworking_layer::build_secured_pdu: Secured pdu = ", p_data); return 0; } diff --git a/ccsrc/Protocols/GeoNetworking/geonetworking_layer.hh b/ccsrc/Protocols/GeoNetworking/geonetworking_layer.hh index 56eb368..023d744 100644 --- a/ccsrc/Protocols/GeoNetworking/geonetworking_layer.hh +++ b/ccsrc/Protocols/GeoNetworking/geonetworking_layer.hh @@ -25,11 +25,11 @@ class OCTETSTRING; //! Forward declaration of TITAN class namespace LibItsGeoNetworking__TestSystem { class GeoNetworkingPort; //! Forward declaration of TITAN class - class GeoNetworkingReq; //! Forward declaration of TITAN class - class GeoNetworkingInd; //! Forward declaration of TITAN class } // namespace LibItsGeoNetworking__TestSystem namespace LibItsGeoNetworking__TypesAndValues { + class GeoNetworkingReq; //! Forward declaration of TITAN class + class GeoNetworkingInd; //! Forward declaration of TITAN class class BasicHeader; //! Forward declaration of TITAN class class GeoNetworkingPdu; //! Forward declaration of TITAN class class BeaconHeader; //! Forward declaration of TITAN class @@ -147,7 +147,7 @@ public: virtual ~geonetworking_layer(); /*! - * \fn void sendMsg(const LibItsGeoNetworking__TestSystem::GeoNetworkingReq& p_gn_req, params_its& p_param); + * \fn void sendMsg(const LibItsGeoNetworking__TypesAndValues::GeoNetworkingReq& p_gn_req, params_its& p_param); * \brief Send GeoNetworking message to the lower layers * \param[in] p_gn_req The GeoNetworking message to be sent * \param[in] p_params Some parameters to overwrite default value of the lower layers parameters @@ -161,7 +161,7 @@ public: * \param[in] p_data The data to be sent * \param[in] p_params Some parameters to overwrite default value of the lower layers parameters */ - virtual void send_data(OCTETSTRING &data, params &p_param); + virtual void send_data(OCTETSTRING &p_data, params &p_param); /*! * \virtual * \fn void receive_data(OCTETSTRING& data, params_its& params); @@ -169,7 +169,7 @@ public: * \param[in] p_data The bytes formated data received * \param[in] p_params Some lower layers parameters values when data was received */ - virtual void receive_data(OCTETSTRING &data, params &p_param); + virtual void receive_data(OCTETSTRING &p_data, params &p_param); /*! * \virtual @@ -178,7 +178,7 @@ public: * \param[in] p_data The data to be sent * \param[in] p_params Some parameters to overwrite default value of the lower layers parameters */ - virtual OCTETSTRING trigger_ac_event(OCTETSTRING &data, params_its ¶ms); + virtual OCTETSTRING trigger_ac_event(OCTETSTRING &p_data, params_its ¶ms); const LibItsGeoNetworking__TypesAndValues::LongPosVector *get_lpv(const LibItsGeoNetworking__TypesAndValues::GN__Address &p_gn_address); void start_beaconing(); @@ -193,8 +193,8 @@ public: private: void init(const std::string &p_type, const std::string &p_param); void send_beacon(); - int build_geonetworking_pdu(OCTETSTRING &data, params_its ¶ms); - int build_secured_pdu(OCTETSTRING &data, params_its ¶ms); + int build_geonetworking_pdu(OCTETSTRING &p_data, params_its ¶ms); + int build_secured_pdu(OCTETSTRING &p_data, params_its ¶ms); int decode_basic_header(const OCTETSTRING &p_data, LibItsGeoNetworking__TypesAndValues::BasicHeader &p_basic_header); int setup_secured_mode(); diff --git a/ccsrc/Protocols/IVIM/ivim_codec.cc b/ccsrc/Protocols/IVIM/ivim_codec.cc index d9bbb2d..28a2714 100644 --- a/ccsrc/Protocols/IVIM/ivim_codec.cc +++ b/ccsrc/Protocols/IVIM/ivim_codec.cc @@ -1,27 +1,30 @@ #include "ivim_codec.hh" #include "LibItsIvim_TypesAndValues.hh" -#include "asn1/asn_application.h" // from asn1c +#include "LibItsIvim_EncdecDeclarations.hh" #include "loggers.hh" -int ivim_codec::encode(const IVIM__PDU__Descriptions::IVIM &ivim, OCTETSTRING &data) { +int ivim_codec::encode(const IVIM__PDU__Descriptions::IVIM &ivim, OCTETSTRING &p_data) { loggers::get_instance().log(">>> ivim_codec::encode"); - BITSTRING b; - int rc = asn_codec.encode(ivim, b); - loggers::get_instance().log("ivim_codec::encode: ASN.1 codec returned %d", rc); - if (rc != -1) { - data = bit2oct(b); - loggers::get_instance().log_msg("ivim_codec::encode: ", data); + + BITSTRING bs = LibItsIvim__EncdecDeclarations::fx__enc__IVIM(ivim); + if (!bs.is_bound()) { + loggers::get_instance().error("ivim_codec::encode: Failed to encode IVIM value"); + return -1; } - return rc; + + p_data = bit2oct(bs); + return 0; } -int ivim_codec::decode(const OCTETSTRING &data, IVIM__PDU__Descriptions::IVIM &ivim, params_its *params) { - loggers::get_instance().log_msg(">>> ivim_codec::decode: ", data); +int ivim_codec::decode(const OCTETSTRING &p_data, IVIM__PDU__Descriptions::IVIM &ivim, params_its *params) { + loggers::get_instance().log_msg(">>> ivim_codec::decode: ", p_data); - int rc = asn_codec.decode(oct2bit(data), ivim); - loggers::get_instance().log("ivim_codec::decode: ASN.1 codec returned %d", rc); - if (rc != -1) { - loggers::get_instance().log_msg("ivim_codec::decode: ", ivim); + BITSTRING bs = oct2bit(p_data); + int result = static_cast(LibItsIvim__EncdecDeclarations::fx__dec__IVIM(bs, ivim)); + if (result != 0) { + loggers::get_instance().error("ivim_codec::decode: Failed to decode IVIM PDU"); + return -1; } - return rc; + + return 0; } diff --git a/ccsrc/Protocols/IVIM/ivim_codec.hh b/ccsrc/Protocols/IVIM/ivim_codec.hh index 5a94e2a..18fd337 100644 --- a/ccsrc/Protocols/IVIM/ivim_codec.hh +++ b/ccsrc/Protocols/IVIM/ivim_codec.hh @@ -1,7 +1,6 @@ #pragma once #include "codec.hh" -#include "ivim_pdu_codec.hh" #include "params_its.hh" #include "LibItsIvim_TypesAndValues.hh" @@ -10,12 +9,11 @@ // class IVIM__PDU__Descriptions::IVIM; class ivim_codec : public codec { - ivim_pdu_codec asn_codec; public: - explicit ivim_codec() : codec(), asn_codec(){}; + explicit ivim_codec() : codec() {}; virtual ~ivim_codec(){}; - virtual int encode(const IVIM__PDU__Descriptions::IVIM &ivim, OCTETSTRING &data); - virtual int decode(const OCTETSTRING &data, IVIM__PDU__Descriptions::IVIM &, params_its *params = NULL); + virtual int encode(const IVIM__PDU__Descriptions::IVIM &ivim, OCTETSTRING &p_data); + virtual int decode(const OCTETSTRING &p_data, IVIM__PDU__Descriptions::IVIM &, params_its *params = NULL); }; // End of class ivim_codec diff --git a/ccsrc/Protocols/IVIM/ivim_pdu_codec.cc b/ccsrc/Protocols/IVIM/ivim_pdu_codec.cc deleted file mode 100644 index 4cf8589..0000000 --- a/ccsrc/Protocols/IVIM/ivim_pdu_codec.cc +++ /dev/null @@ -1,16 +0,0 @@ -#include "LibItsIvim_TypesAndValues.hh" -#include "asn1/asn_application.h" // from asn1c -#include "ivim_codec.hh" -#include "loggers.hh" - -extern "C" { -extern asn_TYPE_descriptor_t asn_DEF_IVIM; -} - -int ivim_pdu_codec::encode(const IVIM__PDU__Descriptions::IVIM &p_ivim, BITSTRING &p_data) { - return _encode(IVIM__PDU__Descriptions::IVIM_descr_, asn_DEF_IVIM, p_ivim, p_data); -} - -int ivim_pdu_codec::decode(const BITSTRING &p_data, IVIM__PDU__Descriptions::IVIM &p_ivim) { - return _decode(IVIM__PDU__Descriptions::IVIM_descr_, asn_DEF_IVIM, p_data, p_ivim); -} diff --git a/ccsrc/Protocols/IVIM/ivim_pdu_codec.hh b/ccsrc/Protocols/IVIM/ivim_pdu_codec.hh deleted file mode 100644 index 5fc4e1f..0000000 --- a/ccsrc/Protocols/IVIM/ivim_pdu_codec.hh +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once - -#include "codec.hh" -#include "params.hh" -#include "per_codec.hh" - -#include "LibItsIvim_TypesAndValues.hh" -// class BITSTRING; -// class OCTETSTRING; -// class IVIM__PDU__Descriptions::IVIM; - -class ivim_pdu_codec : public per_codec { -public: - explicit ivim_pdu_codec(){}; - virtual int encode(const IVIM__PDU__Descriptions::IVIM &ivim, BITSTRING &data); - virtual int decode(const BITSTRING &data, IVIM__PDU__Descriptions::IVIM &); -}; diff --git a/ccsrc/Protocols/IVIM/module.mk b/ccsrc/Protocols/IVIM/module.mk index 0ac5c01..29859fc 100644 --- a/ccsrc/Protocols/IVIM/module.mk +++ b/ccsrc/Protocols/IVIM/module.mk @@ -1,3 +1,3 @@ -sources := ivim_codec.cc ivim_pdu_codec.cc +sources := ivim_codec.cc includes := . diff --git a/ccsrc/Protocols/IVIM_layers/ivim_layer.cc b/ccsrc/Protocols/IVIM_layers/ivim_layer.cc index 92ff7a7..32dc110 100644 --- a/ccsrc/Protocols/IVIM_layers/ivim_layer.cc +++ b/ccsrc/Protocols/IVIM_layers/ivim_layer.cc @@ -45,32 +45,32 @@ void ivim_layer::sendMsg(const LibItsIvim__TypesAndValues::IvimInd &p, params_it send_data(data, _params); } -void ivim_layer::send_data(OCTETSTRING &data, params ¶ms) { - loggers::get_instance().log_msg(">>> ivim_layer::send_data: ", data); +void ivim_layer::send_data(OCTETSTRING &p_data, params ¶ms) { + loggers::get_instance().log_msg(">>> ivim_layer::send_data: ", p_data); // params.log(); - send_to_all_layers(data, params); + send_to_all_layers(p_data, params); } -void ivim_layer::receive_data(OCTETSTRING &data, params ¶ms) { - loggers::get_instance().log_msg(">>> ivim_layer::receive_data: ", data); +void ivim_layer::receive_data(OCTETSTRING &p_data, params ¶ms) { + loggers::get_instance().log_msg(">>> ivim_layer::receive_data: ", p_data); params.log(); // Sanity check - if (*(static_cast(data) + 1) != 0x06) { // Check that received packet has IVI message id - See ETSI TS 102 894 + if (*(static_cast(p_data) + 1) != 0x06) { // Check that received packet has IVI message id - See ETSI TS 102 894 // Not a IVIM message, discard it - loggers::get_instance().warning("ivim_layer::receive_data: Wrong message id: 0x%02x", *(static_cast(data) + 1)); + loggers::get_instance().warning("ivim_layer::receive_data: Wrong message id: 0x%02x", *(static_cast(p_data) + 1)); return; } // Decode the payload LibItsIvim__TypesAndValues::IvimInd p; - _codec.decode(data, p.msgIn()); + _codec.decode(p_data, p.msgIn()); if (!p.msgIn().is_bound()) { // Discard it return; } // else, continue - // Process lower layer data + // Process lower layer p_data // recvTime params_its::const_iterator it = params.find(params_its::timestamp); if (it != params.cend()) { diff --git a/ccsrc/Protocols/IVIM_layers/ivim_layer.hh b/ccsrc/Protocols/IVIM_layers/ivim_layer.hh index 1760eeb..4967e5f 100644 --- a/ccsrc/Protocols/IVIM_layers/ivim_layer.hh +++ b/ccsrc/Protocols/IVIM_layers/ivim_layer.hh @@ -31,8 +31,8 @@ public: void sendMsg(const LibItsIvim__TypesAndValues::IvimReq &, params_its ¶ms); void sendMsg(const LibItsIvim__TypesAndValues::IvimInd &, params_its ¶ms); - virtual void send_data(OCTETSTRING &data, params ¶ms); - virtual void receive_data(OCTETSTRING &data, params &info); + virtual void send_data(OCTETSTRING &p_data, params ¶ms); + virtual void receive_data(OCTETSTRING &p_data, params &info); int enable_secured_mode(const std::string &p_certificate_id, const boolean p_enforce_security); diff --git a/ccsrc/Protocols/LTE/lte_layer.cc b/ccsrc/Protocols/LTE/lte_layer.cc index fda713e..5548a8f 100644 --- a/ccsrc/Protocols/LTE/lte_layer.cc +++ b/ccsrc/Protocols/LTE/lte_layer.cc @@ -83,8 +83,8 @@ void lte_layer::close() { } } -void lte_layer::send_data(OCTETSTRING &data, params ¶ms) { - loggers::get_instance().log_msg(">>> lte_layer::send_data: ", data); +void lte_layer::send_data(OCTETSTRING &p_data, params ¶ms) { + loggers::get_instance().log_msg(">>> lte_layer::send_data: ", p_data); params::const_iterator it = params.find(std::string("its_aid")); /*its_aid=137: SPAT @@ -97,20 +97,20 @@ void lte_layer::send_data(OCTETSTRING &data, params ¶ms) { loggers::get_instance().log("lte_layer::send_data: %s", it->second.c_str()); if (it == params.cend()) { loggers::get_instance().log("lte_layer::send_data: 1111111111111111111111111111111"); - _uu_layer->send_data(data, params); + _uu_layer->send_data(p_data, params); } else if ((it->second.compare("36") == 0) || (it->second.compare("141") == 0)) { // CAM and Beacons over PC#5 loggers::get_instance().log("lte_layer::send_data: 2222222222222222222222222222222"); - _pc5_layer->send_data(data, params); + _pc5_layer->send_data(p_data, params); } else { loggers::get_instance().log("lte_layer::send_data: 3333333333333333333333333333333"); - _uu_layer->send_data(data, params); + _uu_layer->send_data(p_data, params); } } -void lte_layer::receive_data(OCTETSTRING &data, params ¶ms) { - loggers::get_instance().log_msg(">>> lte_layer::receive_data: ", data); +void lte_layer::receive_data(OCTETSTRING &p_data, params ¶ms) { + loggers::get_instance().log_msg(">>> lte_layer::receive_data: ", p_data); - receive_to_all_layers(data, params); + receive_to_all_layers(p_data, params); } void lte_layer::Handle_Fd_Event_Readable(int fd) { diff --git a/ccsrc/Protocols/LTE/lte_layer.hh b/ccsrc/Protocols/LTE/lte_layer.hh index 572652f..b49249f 100644 --- a/ccsrc/Protocols/LTE/lte_layer.hh +++ b/ccsrc/Protocols/LTE/lte_layer.hh @@ -49,7 +49,7 @@ class lte_layer : public layer, public data_event_notifier { * \param[in] p_data The data to be sent * \param[in] p_params Some parameters to overwrite default value of the lower layers parameters */ - virtual void send_data(OCTETSTRING &data, params ¶ms); + virtual void send_data(OCTETSTRING &p_data, params ¶ms); /*! * \virtual * \fn void receive_data(OCTETSTRING& data, params& params); @@ -57,7 +57,7 @@ class lte_layer : public layer, public data_event_notifier { * \param[in] p_data The bytes formated data received * \param[in] p_params Some lower layers parameters values when data was received */ - virtual void receive_data(OCTETSTRING &data, params &info); + virtual void receive_data(OCTETSTRING &p_data, params &info); virtual void update(OCTETSTRING &p_data, params_its &p_params); diff --git a/ccsrc/Protocols/LTE/lte_udp_layer.cc b/ccsrc/Protocols/LTE/lte_udp_layer.cc index 6e73180..e9702b6 100644 --- a/ccsrc/Protocols/LTE/lte_udp_layer.cc +++ b/ccsrc/Protocols/LTE/lte_udp_layer.cc @@ -12,14 +12,14 @@ lte_udp_layer::lte_udp_layer(const std::string &p_type, const params_its &p_para } -void lte_udp_layer::receive_data(OCTETSTRING &data, params_its ¶ms) { - loggers::get_instance().log_msg(">>> lte_udp_layer::receive_data: ", data); +void lte_udp_layer::receive_data(OCTETSTRING &p_data, params_its ¶ms) { + loggers::get_instance().log_msg(">>> lte_udp_layer::receive_data: ", p_data); if (_observers.size() != 0) { - incoming_packet_notify(data, params); + incoming_packet_notify(p_data, params); } else { // Pass the packet to the upper layers - receive_to_all_layers(data, params); + receive_to_all_layers(p_data, params); } } diff --git a/ccsrc/Protocols/LTE/lte_udp_layer.hh b/ccsrc/Protocols/LTE/lte_udp_layer.hh index e172464..ff5627a 100644 --- a/ccsrc/Protocols/LTE/lte_udp_layer.hh +++ b/ccsrc/Protocols/LTE/lte_udp_layer.hh @@ -41,7 +41,7 @@ public: //! \publicsection */ virtual ~lte_udp_layer() {}; - void receive_data(OCTETSTRING &data, params_its ¶ms); + void receive_data(OCTETSTRING &p_data, params_its ¶ms); inline void incoming_packet_observer_attach(data_event_notifier* p_observer) { _observers.push_back(p_observer); diff --git a/ccsrc/Protocols/LTE/uu_amqp.cc b/ccsrc/Protocols/LTE/uu_amqp.cc index e74c654..e465a25 100644 --- a/ccsrc/Protocols/LTE/uu_amqp.cc +++ b/ccsrc/Protocols/LTE/uu_amqp.cc @@ -76,9 +76,9 @@ int uu_amqp::shutdown() { return 0; } -void uu_amqp::send_data(OCTETSTRING &data, params ¶ms) { +void uu_amqp::send_data(OCTETSTRING &p_data, params ¶ms) { loggers::get_instance().log(">>> uu_amqp::send_data"); - _layer->send_data(data, params); + _layer->send_data(p_data, params); } void uu_amqp::receive_data(OCTETSTRING &p_data, params &p_params) { diff --git a/ccsrc/Protocols/LTE/uu_amqp.hh b/ccsrc/Protocols/LTE/uu_amqp.hh index 903a903..9f7384f 100644 --- a/ccsrc/Protocols/LTE/uu_amqp.hh +++ b/ccsrc/Protocols/LTE/uu_amqp.hh @@ -26,7 +26,7 @@ public: int setup(const params_its ¶ms); int shutdown(); - void send_data(OCTETSTRING &data, params ¶ms); + void send_data(OCTETSTRING &p_data, params ¶ms); void receive_data(OCTETSTRING &p_data, params &p_params); void update(OCTETSTRING &p_data, params_its &p_params); diff --git a/ccsrc/Protocols/LTE/uu_mqtt.cc b/ccsrc/Protocols/LTE/uu_mqtt.cc index 0ae1efb..ff59195 100644 --- a/ccsrc/Protocols/LTE/uu_mqtt.cc +++ b/ccsrc/Protocols/LTE/uu_mqtt.cc @@ -133,10 +133,10 @@ int uu_mqtt::shutdown() { return 0; } -void uu_mqtt::send_data(OCTETSTRING &data, params ¶ms) { +void uu_mqtt::send_data(OCTETSTRING &p_data, params ¶ms) { loggers::get_instance().log(">>> uu_mqtt::send_data"); - send_publish_command(data, static_cast(params)); + send_publish_command(p_data, static_cast(params)); } void uu_mqtt::receive_data(OCTETSTRING &p_data, params &p_params) { diff --git a/ccsrc/Protocols/LTE/uu_mqtt.hh b/ccsrc/Protocols/LTE/uu_mqtt.hh index 6deb066..e262a4a 100644 --- a/ccsrc/Protocols/LTE/uu_mqtt.hh +++ b/ccsrc/Protocols/LTE/uu_mqtt.hh @@ -35,7 +35,7 @@ public: int setup(const params_its ¶ms); int shutdown(); - void send_data(OCTETSTRING &data, params ¶ms); + void send_data(OCTETSTRING &p_data, params ¶ms); void receive_data(OCTETSTRING &p_data, params &p_params); void update(OCTETSTRING &p_data, params_its &p_params); diff --git a/ccsrc/Protocols/LTE/uu_raw.cc b/ccsrc/Protocols/LTE/uu_raw.cc index bb3817a..79cab6e 100644 --- a/ccsrc/Protocols/LTE/uu_raw.cc +++ b/ccsrc/Protocols/LTE/uu_raw.cc @@ -58,9 +58,9 @@ int uu_raw::shutdown() { return 0; } -void uu_raw::send_data(OCTETSTRING &data, params ¶ms) { +void uu_raw::send_data(OCTETSTRING &p_data, params ¶ms) { loggers::get_instance().log(">>> uu_raw::send_data"); - _layer->send_data(data, params); + _layer->send_data(p_data, params); } void uu_raw::receive_data(OCTETSTRING &p_data, params &p_params) { diff --git a/ccsrc/Protocols/LTE/uu_raw.hh b/ccsrc/Protocols/LTE/uu_raw.hh index a1401e2..2255ff8 100644 --- a/ccsrc/Protocols/LTE/uu_raw.hh +++ b/ccsrc/Protocols/LTE/uu_raw.hh @@ -15,7 +15,7 @@ public: int setup(const params_its ¶ms); int shutdown(); - void send_data(OCTETSTRING &data, params ¶ms); + void send_data(OCTETSTRING &p_data, params ¶ms); void receive_data(OCTETSTRING &p_data, params &p_params); void update(OCTETSTRING &p_data, params_its &p_params); diff --git a/ccsrc/Protocols/MapemSpatem/mapem_codec.cc b/ccsrc/Protocols/MapemSpatem/mapem_codec.cc index 48e459c..4533d33 100644 --- a/ccsrc/Protocols/MapemSpatem/mapem_codec.cc +++ b/ccsrc/Protocols/MapemSpatem/mapem_codec.cc @@ -1,27 +1,30 @@ #include "mapem_codec.hh" #include "LibItsMapemSpatem_TypesAndValues.hh" -#include "asn1/asn_application.h" // from asn1c +#include "LibItsMapemSpatem_EncdecDeclarations.hh" #include "loggers.hh" -int mapem_codec::encode(const MAPEM__PDU__Descriptions::MAPEM &mapem, OCTETSTRING &data) { +int mapem_codec::encode(const MAPEM__PDU__Descriptions::MAPEM &mapem, OCTETSTRING &p_data) { loggers::get_instance().log(">>> mapem_codec::encode"); - BITSTRING b; - int rc = asn_codec.encode(mapem, b); - if (rc != -1) { - data = bit2oct(b); - loggers::get_instance().log_msg("mapem_codec::encode: ", data); + BITSTRING bs = LibItsMapemSpatem__EncdecDeclarations::fx__enc__MAPEM(mapem); + if (!bs.is_bound()) { + loggers::get_instance().error("mapem_codec::encode: Failed to encode MAPEM value"); + return -1; } - return rc; + + p_data = bit2oct(bs); + return 0; } -int mapem_codec::decode(const OCTETSTRING &data, MAPEM__PDU__Descriptions::MAPEM &mapem, params_its *params) { - loggers::get_instance().log_msg(">>> mapem_codec::decode: ", data); +int mapem_codec::decode(const OCTETSTRING &p_data, MAPEM__PDU__Descriptions::MAPEM &mapem, params_its *params) { + loggers::get_instance().log_msg(">>> mapem_codec::decode: ", p_data); - int rc = asn_codec.decode(oct2bit(data), mapem); - loggers::get_instance().log("mapem_codec::decode: ASN.1 codec returned %d", rc); - if (rc != -1) { - loggers::get_instance().log_msg("mapem_codec::decode: ", mapem); + BITSTRING bs = oct2bit(p_data); + int result = static_cast(LibItsMapemSpatem__EncdecDeclarations::fx__dec__MAPEM(bs, mapem)); + if (result != 0) { + loggers::get_instance().error("mapem_codec::decode: Failed to decode MAPEM PDU"); + return -1; } - return rc; + + return 0; } diff --git a/ccsrc/Protocols/MapemSpatem/mapem_codec.hh b/ccsrc/Protocols/MapemSpatem/mapem_codec.hh index a9cd2db..222fd51 100644 --- a/ccsrc/Protocols/MapemSpatem/mapem_codec.hh +++ b/ccsrc/Protocols/MapemSpatem/mapem_codec.hh @@ -1,18 +1,15 @@ #pragma once #include "codec.hh" -#include "mapem_pdu_codec.hh" #include "params_its.hh" #include "LibItsMapemSpatem_TypesAndValues.hh" class mapem_codec : public codec { - mapem_pdu_codec asn_codec; - public: - explicit mapem_codec() : codec(), asn_codec(){}; + explicit mapem_codec() : codec() {}; virtual ~mapem_codec(){}; - virtual int encode(const MAPEM__PDU__Descriptions::MAPEM &sapem, OCTETSTRING &data); - virtual int decode(const OCTETSTRING &data, MAPEM__PDU__Descriptions::MAPEM &, params_its *params = NULL); + virtual int encode(const MAPEM__PDU__Descriptions::MAPEM &sapem, OCTETSTRING &p_data); + virtual int decode(const OCTETSTRING &p_data, MAPEM__PDU__Descriptions::MAPEM &, params_its *params = NULL); }; // End of class mapem_codec diff --git a/ccsrc/Protocols/MapemSpatem/mapem_pdu_codec.cc b/ccsrc/Protocols/MapemSpatem/mapem_pdu_codec.cc deleted file mode 100644 index 9455e64..0000000 --- a/ccsrc/Protocols/MapemSpatem/mapem_pdu_codec.cc +++ /dev/null @@ -1,16 +0,0 @@ -#include "LibItsMapemSpatem_TypesAndValues.hh" -#include "asn1/asn_application.h" // from asn1c -#include "loggers.hh" -#include "mapem_codec.hh" - -extern "C" { -extern asn_TYPE_descriptor_t asn_DEF_MAPEM; -} - -int mapem_pdu_codec::encode(const MAPEM__PDU__Descriptions::MAPEM &p_mapem, BITSTRING &p_data) { - return _encode(MAPEM__PDU__Descriptions::MAPEM_descr_, asn_DEF_MAPEM, p_mapem, p_data); -} - -int mapem_pdu_codec::decode(const BITSTRING &p_data, MAPEM__PDU__Descriptions::MAPEM &p_mapem) { - return _decode(MAPEM__PDU__Descriptions::MAPEM_descr_, asn_DEF_MAPEM, p_data, p_mapem); -} diff --git a/ccsrc/Protocols/MapemSpatem/mapem_pdu_codec.hh b/ccsrc/Protocols/MapemSpatem/mapem_pdu_codec.hh deleted file mode 100644 index 4125924..0000000 --- a/ccsrc/Protocols/MapemSpatem/mapem_pdu_codec.hh +++ /dev/null @@ -1,14 +0,0 @@ -#pragma once - -#include "codec.hh" -#include "params.hh" -#include "per_codec.hh" - -#include "LibItsMapemSpatem_TypesAndValues.hh" - -class mapem_pdu_codec : public per_codec { -public: - explicit mapem_pdu_codec(){}; - virtual int encode(const MAPEM__PDU__Descriptions::MAPEM &sapem, BITSTRING &data); - virtual int decode(const BITSTRING &data, MAPEM__PDU__Descriptions::MAPEM &); -}; // End of class mapem_pdu_codec diff --git a/ccsrc/Protocols/MapemSpatem/module.mk b/ccsrc/Protocols/MapemSpatem/module.mk index 6f879a7..cef0d89 100644 --- a/ccsrc/Protocols/MapemSpatem/module.mk +++ b/ccsrc/Protocols/MapemSpatem/module.mk @@ -1,3 +1,3 @@ -sources := mapem_codec.cc mapem_pdu_codec.cc spatem_codec.cc spatem_pdu_codec.cc +sources := mapem_codec.cc spatem_codec.cc includes := . diff --git a/ccsrc/Protocols/MapemSpatem/spatem_codec.cc b/ccsrc/Protocols/MapemSpatem/spatem_codec.cc index 854e4cc..7ae351a 100644 --- a/ccsrc/Protocols/MapemSpatem/spatem_codec.cc +++ b/ccsrc/Protocols/MapemSpatem/spatem_codec.cc @@ -1,27 +1,30 @@ #include "spatem_codec.hh" -#include "asn1/asn_application.h" // from asn1c +#include "LibItsMapemSpatem_EncdecDeclarations.hh" #include "loggers.hh" #include "mapem_spatem_types.hh" -int spatem_codec::encode(const SPATEM__PDU__Descriptions::SPATEM &spatem, OCTETSTRING &data) { +int spatem_codec::encode(const SPATEM__PDU__Descriptions::SPATEM &spatem, OCTETSTRING &p_data) { loggers::get_instance().log(">>> spatem_codec::encode"); - BITSTRING b; - int rc = asn_codec.encode(spatem, b); - if (rc != -1) { - data = bit2oct(b); - loggers::get_instance().log_msg("spatem_codec::encode: ", data); + BITSTRING bs = LibItsMapemSpatem__EncdecDeclarations::fx__enc__SPATEM(spatem); + if (!bs.is_bound()) { + loggers::get_instance().error("spatem_codec::encode: Failed to encode SPATEM value"); + return -1; } - return rc; + + p_data = bit2oct(bs); + return 0; } -int spatem_codec::decode(const OCTETSTRING &data, SPATEM__PDU__Descriptions::SPATEM &spatem, params_its *params) { - loggers::get_instance().log_msg(">>> spatem_codec::decode: ", data); +int spatem_codec::decode(const OCTETSTRING &p_data, SPATEM__PDU__Descriptions::SPATEM &spatem, params_its *params) { + loggers::get_instance().log_msg(">>> spatem_codec::decode: ", p_data); - int rc = asn_codec.decode(oct2bit(data), spatem); - loggers::get_instance().log("spatem_codec::decode: ASN.1 codec returned %d", rc); - if (rc != -1) { - loggers::get_instance().log_msg("spatem_codec::decode: ", spatem); + BITSTRING bs = oct2bit(p_data); + int result = static_cast(LibItsMapemSpatem__EncdecDeclarations::fx__dec__SPATEM(bs, spatem)); + if (result != 0) { + loggers::get_instance().error("spatem_codec::decode: Failed to decode SPATEM PDU"); + return -1; } - return rc; + + return 0; } diff --git a/ccsrc/Protocols/MapemSpatem/spatem_codec.hh b/ccsrc/Protocols/MapemSpatem/spatem_codec.hh index bfb07b6..94b6e30 100644 --- a/ccsrc/Protocols/MapemSpatem/spatem_codec.hh +++ b/ccsrc/Protocols/MapemSpatem/spatem_codec.hh @@ -2,17 +2,14 @@ #include "codec.hh" #include "params_its.hh" -#include "spatem_pdu_codec.hh" #include "mapem_spatem_types.hh" class spatem_codec : public codec { - spatem_pdu_codec asn_codec; - public: - explicit spatem_codec() : codec(), asn_codec(){}; + explicit spatem_codec() : codec() {}; virtual ~spatem_codec(){}; - virtual int encode(const SPATEM__PDU__Descriptions::SPATEM &spatem, OCTETSTRING &data); - virtual int decode(const OCTETSTRING &data, SPATEM__PDU__Descriptions::SPATEM &, params_its *params = NULL); + virtual int encode(const SPATEM__PDU__Descriptions::SPATEM &spatem, OCTETSTRING &p_data); + virtual int decode(const OCTETSTRING &p_data, SPATEM__PDU__Descriptions::SPATEM &, params_its *params = NULL); }; // End of class spatem_codec diff --git a/ccsrc/Protocols/MapemSpatem/spatem_pdu_codec.cc b/ccsrc/Protocols/MapemSpatem/spatem_pdu_codec.cc deleted file mode 100644 index 1256850..0000000 --- a/ccsrc/Protocols/MapemSpatem/spatem_pdu_codec.cc +++ /dev/null @@ -1,16 +0,0 @@ -#include "asn1/asn_application.h" // from asn1c -#include "loggers.hh" -#include "mapem_spatem_types.hh" -#include "spatem_codec.hh" - -extern "C" { -extern asn_TYPE_descriptor_t asn_DEF_SPATEM; -} - -int spatem_pdu_codec::encode(const SPATEM__PDU__Descriptions::SPATEM &p_spatem, BITSTRING &p_data) { - return _encode(SPATEM__PDU__Descriptions::SPATEM_descr_, asn_DEF_SPATEM, p_spatem, p_data); -} - -int spatem_pdu_codec::decode(const BITSTRING &p_data, SPATEM__PDU__Descriptions::SPATEM &p_spatem) { - return _decode(SPATEM__PDU__Descriptions::SPATEM_descr_, asn_DEF_SPATEM, p_data, p_spatem); -} diff --git a/ccsrc/Protocols/MapemSpatem/spatem_pdu_codec.hh b/ccsrc/Protocols/MapemSpatem/spatem_pdu_codec.hh deleted file mode 100644 index aec1124..0000000 --- a/ccsrc/Protocols/MapemSpatem/spatem_pdu_codec.hh +++ /dev/null @@ -1,14 +0,0 @@ -#pragma once - -#include "codec.hh" -#include "params.hh" -#include "per_codec.hh" - -#include "mapem_spatem_types.hh" - -class spatem_pdu_codec : public per_codec { -public: - explicit spatem_pdu_codec(){}; - virtual int encode(const SPATEM__PDU__Descriptions::SPATEM &spatem, BITSTRING &data); - virtual int decode(const BITSTRING &data, SPATEM__PDU__Descriptions::SPATEM &); -}; // End of class spatem_pdu_codec diff --git a/ccsrc/Protocols/MapemSpatem_layers/mapem_spatem_layer.cc b/ccsrc/Protocols/MapemSpatem_layers/mapem_spatem_layer.cc index 830cb41..ea26dd2 100644 --- a/ccsrc/Protocols/MapemSpatem_layers/mapem_spatem_layer.cc +++ b/ccsrc/Protocols/MapemSpatem_layers/mapem_spatem_layer.cc @@ -45,25 +45,25 @@ void mapem_spatem_layer::sendMsg(const LibItsMapemSpatem__TypesAndValues::Spatem send_data(data, _params); } -void mapem_spatem_layer::send_data(OCTETSTRING &data, params ¶ms) { - loggers::get_instance().log_msg(">>> mapem_spatem_layer::send_data: ", data); +void mapem_spatem_layer::send_data(OCTETSTRING &p_data, params ¶ms) { + loggers::get_instance().log_msg(">>> mapem_spatem_layer::send_data: ", p_data); // params.log(); - send_to_all_layers(data, params); + send_to_all_layers(p_data, params); } -void mapem_spatem_layer::receive_data(OCTETSTRING &data, params ¶ms) { - loggers::get_instance().log_msg(">>> mapem_spatem_layer::receive_data: ", data); +void mapem_spatem_layer::receive_data(OCTETSTRING &p_data, params ¶ms) { + loggers::get_instance().log_msg(">>> mapem_spatem_layer::receive_data: ", p_data); // Sanity check - if (*(static_cast(data) + 1) == 0x05) { // Check that received packet has MAPE message id + if (*(static_cast(p_data) + 1) == 0x05) { // Check that received packet has MAPE message id // Decode the MAPEM payload LibItsMapemSpatem__TypesAndValues::MapemInd p; - _mapem_codec.decode(data, p.msgIn()); + _mapem_codec.decode(p_data, p.msgIn()); if (!p.msgIn().is_bound()) { // Discard it return; } // else, continue - // Process lower layer data + // Process lower layer p_data // recvTime params_its::const_iterator it = params.find(params_its::timestamp); if (it != params.cend()) { @@ -138,15 +138,15 @@ void mapem_spatem_layer::receive_data(OCTETSTRING &data, params ¶ms) { // Pass it to the ports if any to_all_upper_ports(p, params); - } else if (*(static_cast(data) + 1) == 0x04) { // Check that received packet has SPATE message id + } else if (*(static_cast(p_data) + 1) == 0x04) { // Check that received packet has SPATE message id // Decode the SPATEM payload LibItsMapemSpatem__TypesAndValues::SpatemInd p; - _spatem_codec.decode(data, p.msgIn()); + _spatem_codec.decode(p_data, p.msgIn()); if (!p.msgIn().is_bound()) { // Discard it return; } // else, continue - // Process lower layer data + // Process lower layer p_data // recvTime params_its::const_iterator it = params.find(params_its::timestamp); if (it != params.cend()) { @@ -223,7 +223,7 @@ void mapem_spatem_layer::receive_data(OCTETSTRING &data, params ¶ms) { to_all_upper_ports(p, params); } else { // Not a MAPEM/SPATEM message, discard it - loggers::get_instance().warning("mapem_spatem_layer::receive_data: Wrong message id: 0x%02x", *(static_cast(data) + 1)); + loggers::get_instance().warning("mapem_spatem_layer::receive_data: Wrong message id: 0x%02x", *(static_cast(p_data) + 1)); return; } } diff --git a/ccsrc/Protocols/MapemSpatem_layers/mapem_spatem_layer.hh b/ccsrc/Protocols/MapemSpatem_layers/mapem_spatem_layer.hh index 37b7843..5aa47cb 100644 --- a/ccsrc/Protocols/MapemSpatem_layers/mapem_spatem_layer.hh +++ b/ccsrc/Protocols/MapemSpatem_layers/mapem_spatem_layer.hh @@ -35,8 +35,8 @@ public: void sendMsg(const LibItsMapemSpatem__TypesAndValues::MapemReq &, params_its ¶ms); void sendMsg(const LibItsMapemSpatem__TypesAndValues::SpatemReq &, params_its ¶ms); - virtual void send_data(OCTETSTRING &data, params ¶ms); - virtual void receive_data(OCTETSTRING &data, params &info); + virtual void send_data(OCTETSTRING &p_data, params ¶ms); + virtual void receive_data(OCTETSTRING &p_data, params &info); int enable_secured_mode(const std::string &p_certificate_id, const boolean p_enforce_security); diff --git a/ccsrc/Protocols/PIM/module.mk b/ccsrc/Protocols/PIM/module.mk index a0aac9d..2398cde 100644 --- a/ccsrc/Protocols/PIM/module.mk +++ b/ccsrc/Protocols/PIM/module.mk @@ -1,2 +1,2 @@ -sources := pim_codec.cc pim_pdu_codec.cc +sources := pim_codec.cc includes := . diff --git a/ccsrc/Protocols/PIM/pim_codec.cc b/ccsrc/Protocols/PIM/pim_codec.cc index 915e099..69e18ef 100644 --- a/ccsrc/Protocols/PIM/pim_codec.cc +++ b/ccsrc/Protocols/PIM/pim_codec.cc @@ -1,28 +1,31 @@ #include "pim_codec.hh" #include "LibItsPim_TypesAndValues.hh" -#include "asn1/asn_application.h" // from asn1c +#include "LibItsPim_EncdecDeclarations.hh" #include "loggers.hh" -int pim_codec::encode(const PIM__PDU__Descriptions::ParkingInformationMessage &pim, OCTETSTRING &data) { +int pim_codec::encode(const PIM__PDU__Descriptions::ParkingInformationMessage &pim, OCTETSTRING &p_data) { loggers::get_instance().log(">>> pim_codec::encode"); - BITSTRING b; - int rc = asn_codec.encode(pim, b); - if (rc != -1) { - data = bit2oct(b); - loggers::get_instance().log_msg("pim_codec::encode: ", data); + BITSTRING bs = LibItsPim__EncdecDeclarations::fx__enc__PIM(pim); + if (!bs.is_bound()) { + loggers::get_instance().error("pim_codec::encode: Failed to encode PIM value"); + return -1; } - return rc; + + p_data = bit2oct(bs); + return 0; } -int pim_codec::decode(const OCTETSTRING &data, PIM__PDU__Descriptions::ParkingInformationMessage &p_pim, params_its *params) { - loggers::get_instance().log_msg(">>> pim_codec::decode: ", data); +int pim_codec::decode(const OCTETSTRING &p_data, PIM__PDU__Descriptions::ParkingInformationMessage &p_pim, params_its *params) { + loggers::get_instance().log_msg(">>> pim_codec::decode: ", p_data); - int rc = asn_codec.decode(oct2bit(data), p_pim); - loggers::get_instance().log("pim_codec::decode: ASN.1 codec returned %d", rc); - if (rc != -1) { - loggers::get_instance().log_msg("pim_codec::decode: ", p_pim); + BITSTRING bs = oct2bit(p_data); + int result = static_cast(LibItsPim__EncdecDeclarations::fx__dec__PIM(bs, p_pim)); + if (result != 0) { + loggers::get_instance().error("pim_codec::decode: Failed to decode PIM PDU"); + return -1; } - return rc; + + return 0; } diff --git a/ccsrc/Protocols/PIM/pim_codec.hh b/ccsrc/Protocols/PIM/pim_codec.hh index 96a0b7e..eda11a1 100644 --- a/ccsrc/Protocols/PIM/pim_codec.hh +++ b/ccsrc/Protocols/PIM/pim_codec.hh @@ -1,20 +1,22 @@ #pragma once -#include "pim_pdu_codec.hh" #include "codec.hh" #include "params_its.hh" class BITSTRING; //! Forward declaration of TITAN class class OCTETSTRING; //! Forward declaration of TITAN class +namespace PIM__PDU__Descriptions { //! Forward declaration of asn1c MIM class + class ParkingInformationMessage; +} + class pim_codec : public codec { - pim_pdu_codec asn_codec; public: - explicit pim_codec() : codec(), asn_codec(){}; + explicit pim_codec() : codec() {}; virtual ~pim_codec(){}; - virtual int encode(const PIM__PDU__Descriptions::ParkingInformationMessage &pim, OCTETSTRING &data); - virtual int decode(const OCTETSTRING &data, PIM__PDU__Descriptions::ParkingInformationMessage &pim, params_its *params = NULL); + virtual int encode(const PIM__PDU__Descriptions::ParkingInformationMessage &pim, OCTETSTRING &p_data); + virtual int decode(const OCTETSTRING &p_data, PIM__PDU__Descriptions::ParkingInformationMessage &pim, params_its *params = NULL); }; diff --git a/ccsrc/Protocols/PIM/pim_pdu_codec.cc b/ccsrc/Protocols/PIM/pim_pdu_codec.cc deleted file mode 100644 index 3bf192b..0000000 --- a/ccsrc/Protocols/PIM/pim_pdu_codec.cc +++ /dev/null @@ -1,16 +0,0 @@ -#include "pim_pdu_codec.hh" -#include "LibItsPim_TypesAndValues.hh" -#include "asn1/asn_application.h" // from asn1c -#include "loggers.hh" - -extern "C" { -extern asn_TYPE_descriptor_t asn_DEF_ParkingInformationMessage; -} - -int pim_pdu_codec::encode(const PIM__PDU__Descriptions::ParkingInformationMessage &p_pim, BITSTRING &p_data) { - return _encode(PIM__PDU__Descriptions::ParkingInformationMessage_descr_, asn_DEF_ParkingInformationMessage, p_pim, p_data); -} - -int pim_pdu_codec::decode(const BITSTRING &p_data, PIM__PDU__Descriptions::ParkingInformationMessage &p_pim) { - return _decode(PIM__PDU__Descriptions::ParkingInformationMessage_descr_, asn_DEF_ParkingInformationMessage, p_data, p_pim); -} diff --git a/ccsrc/Protocols/PIM/pim_pdu_codec.hh b/ccsrc/Protocols/PIM/pim_pdu_codec.hh deleted file mode 100644 index 4d6b8ef..0000000 --- a/ccsrc/Protocols/PIM/pim_pdu_codec.hh +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "codec.hh" -#include "params.hh" -#include "per_codec.hh" - -class BITSTRING; //! Forward declaration of TITAN class -class OCTETSTRING; //! Forward declaration of TITAN class - -namespace PIM__PDU__Descriptions { //! Forward declaration of asn1c ParkingInformationMessage class - class ParkingInformationMessage; -} - -class pim_pdu_codec : per_codec { -public: - explicit pim_pdu_codec(){}; - virtual int encode(const PIM__PDU__Descriptions::ParkingInformationMessage &pim, BITSTRING &data); - virtual int decode(const BITSTRING &data, PIM__PDU__Descriptions::ParkingInformationMessage &); -}; diff --git a/ccsrc/Protocols/PIM_layers/pim_layer.cc b/ccsrc/Protocols/PIM_layers/pim_layer.cc index 2f8d778..cb895f6 100644 --- a/ccsrc/Protocols/PIM_layers/pim_layer.cc +++ b/ccsrc/Protocols/PIM_layers/pim_layer.cc @@ -34,31 +34,31 @@ void pim_layer::sendMsg(const LibItsPim__TypesAndValues::PimReq &p, params_its & send_data(data, _params); } -void pim_layer::send_data(OCTETSTRING &data, params &p_params) { - loggers::get_instance().log_msg(">>> pim_layer::send_data: ", data); +void pim_layer::send_data(OCTETSTRING &p_data, params &p_params) { + loggers::get_instance().log_msg(">>> pim_layer::send_data: ", p_data); - send_to_all_layers(data, p_params); + send_to_all_layers(p_data, p_params); } -void pim_layer::receive_data(OCTETSTRING &data, params &p_params) { - loggers::get_instance().log_msg(">>> pim_layer::receive_data: ", data); +void pim_layer::receive_data(OCTETSTRING &p_data, params &p_params) { + loggers::get_instance().log_msg(">>> pim_layer::receive_data: ", p_data); // Sanity check - if (*(static_cast(data) + 1) == 0x12) { // Check that received packet has PIM message id - See ETSI TS 102 894 + if (*(static_cast(p_data) + 1) == 0x12) { // Check that received packet has PIM message id - See ETSI TS 102 894 // Not a PIM message, discard it - loggers::get_instance().warning("pim_layer::receive_data: Wrong message id: 0x%02x", *(static_cast(data) + 1)); + loggers::get_instance().warning("pim_layer::receive_data: Wrong message id: 0x%02x", *(static_cast(p_data) + 1)); return; } // Decode the payload params_its ¶ms = static_cast(p_params); LibItsPim__TypesAndValues::PimInd p; - _codec.decode(data, p.msgIn()); + _codec.decode(p_data, p.msgIn()); if (!p.msgIn().is_bound()) { // Discard it return; } // else, continue - // Process lower layer data + // Process lower layer p_data // recvTime params_its::const_iterator it = params.find(params_its::timestamp); if (it != params.cend()) { diff --git a/ccsrc/Protocols/PIM_layers/pim_layer.hh b/ccsrc/Protocols/PIM_layers/pim_layer.hh index ff7e753..4cf843e 100644 --- a/ccsrc/Protocols/PIM_layers/pim_layer.hh +++ b/ccsrc/Protocols/PIM_layers/pim_layer.hh @@ -59,7 +59,7 @@ public: //! \publicsection * \param[in] p_data The data to be sent * \param[in] p_params Some parameters to overwrite default value of the lower layers parameters */ - virtual void send_data(OCTETSTRING &data, params ¶ms); + virtual void send_data(OCTETSTRING &p_data, params ¶ms); /*! * \virtual * \fn void receive_data(OCTETSTRING& data, params& params); @@ -67,7 +67,7 @@ public: //! \publicsection * \param[in] p_data The bytes formated data received * \param[in] p_params Some lower layers parameters values when data was received */ - virtual void receive_data(OCTETSTRING &data, params &info); + virtual void receive_data(OCTETSTRING &p_data, params &info); int enable_secured_mode(const std::string &p_certificate_id, const boolean p_enforce_security); diff --git a/ccsrc/Protocols/Qualcomm/qualcomm_layer.cc b/ccsrc/Protocols/Qualcomm/qualcomm_layer.cc index b8434fa..ec776d2 100644 --- a/ccsrc/Protocols/Qualcomm/qualcomm_layer.cc +++ b/ccsrc/Protocols/Qualcomm/qualcomm_layer.cc @@ -22,29 +22,29 @@ qualcomm_layer::qualcomm_layer(const std::string &p_type, const std::string &par registration::get_instance().add_item(p_type, this); } -void qualcomm_layer::send_data(OCTETSTRING &data, params ¶ms) { - loggers::get_instance().log_msg(">>> qualcomm_layer::send_data: ", data); +void qualcomm_layer::send_data(OCTETSTRING &p_data, params ¶ms) { + loggers::get_instance().log_msg(">>> qualcomm_layer::send_data: ", p_data); OCTETSTRING buffer = int2oct(3, 1); // CV2X identifier - buffer += data; // Payload + buffer += p_data; // Payload loggers::get_instance().log_msg("qualcomm_layer::send_data: Final buffer=", buffer); send_to_all_layers(buffer, params); } -void qualcomm_layer::receive_data(OCTETSTRING &data, params ¶ms) { - loggers::get_instance().log(">>> qualcomm_layer::receive_data: Received %d bytes", data.lengthof()); - loggers::get_instance().log_to_hexa("Packet dump", data); +void qualcomm_layer::receive_data(OCTETSTRING &p_data, params ¶ms) { + loggers::get_instance().log(">>> qualcomm_layer::receive_data: Received %d bytes", p_data.lengthof()); + loggers::get_instance().log_to_hexa("Packet dump", p_data); // Remove CV2X identifier - data = OCTETSTRING(data.lengthof() - 1, 1 + static_cast(data)); - loggers::get_instance().log_msg("qualcomm_layer::receive_data: payload for upper layer:", data); + p_data = OCTETSTRING(p_data.lengthof() - 1, 1 + static_cast(p_data)); + loggers::get_instance().log_msg("qualcomm_layer::receive_data: payload for upper layer:", p_data); if (_observers.size() != 0) { - incoming_packet_notify(data, static_cast(params)); + incoming_packet_notify(p_data, static_cast(params)); } else { // Pass the packet to the upper layers - receive_to_all_layers(data, static_cast(params)); + receive_to_all_layers(p_data, static_cast(params)); } } diff --git a/ccsrc/Protocols/Qualcomm/qualcomm_layer.hh b/ccsrc/Protocols/Qualcomm/qualcomm_layer.hh index 866e91c..3008507 100644 --- a/ccsrc/Protocols/Qualcomm/qualcomm_layer.hh +++ b/ccsrc/Protocols/Qualcomm/qualcomm_layer.hh @@ -40,8 +40,8 @@ public: */ virtual ~qualcomm_layer(){}; - virtual void send_data(OCTETSTRING &data, params ¶ms); - virtual void receive_data(OCTETSTRING &data, params &info); + virtual void send_data(OCTETSTRING &p_data, params ¶ms); + virtual void receive_data(OCTETSTRING &p_data, params &info); inline void incoming_packet_observer_attach(data_event_notifier* p_observer) { _observers.push_back(p_observer); diff --git a/ccsrc/Protocols/Rtcmem/RtcmemCodec.cc b/ccsrc/Protocols/Rtcmem/RtcmemCodec.cc deleted file mode 100644 index b5eb13e..0000000 --- a/ccsrc/Protocols/Rtcmem/RtcmemCodec.cc +++ /dev/null @@ -1,39 +0,0 @@ -#include "RtcmemCodec.hh" -#include "LibItsRtcmem_TypesAndValues.hh" -#include "asn1/asn_application.h" // from asn1c -#include "loggers.hh" - -int RtcmemCodec::encode(const RTCMEM__PDU__Descriptions::RTCMEM &rtcmem, OCTETSTRING &data) { - loggers::get_instance().log(">>> RtcmemCodec::encode"); - - BITSTRING b; - int rc = asn_codec.encode(rtcmem, b); - if (rc != -1) { - data = bit2oct(b); - loggers::get_instance().log_msg("RtcmemCodec::encode: ", data); - } - return rc; -} - -int RtcmemCodec::decode(const OCTETSTRING &data, RTCMEM__PDU__Descriptions::RTCMEM &p_rtcmem, params_its *params) { - loggers::get_instance().log_msg(">>> RtcmemCodec::decode: ", data); - - int rc = asn_codec.decode(oct2bit(data), p_rtcmem); - loggers::get_instance().log("RtcmemCodec::decode: ASN.1 codec returned %d", rc); - if (rc != -1) { - loggers::get_instance().log_msg("RtcmemCodec::decode: ", p_rtcmem); - } - return rc; -} - -extern "C" { -extern asn_TYPE_descriptor_t asn_DEF_RTCMEM; -} - -int RtcmemPDUCodec::encode(const RTCMEM__PDU__Descriptions::RTCMEM &p_rtcmem, BITSTRING &p_data) { - return _encode(RTCMEM__PDU__Descriptions::RTCMEM_descr_, asn_DEF_RTCMEM, p_rtcmem, p_data); -} - -int RtcmemPDUCodec::decode(const BITSTRING &p_data, RTCMEM__PDU__Descriptions::RTCMEM &p_rtcmem) { - return _decode(RTCMEM__PDU__Descriptions::RTCMEM_descr_, asn_DEF_RTCMEM, p_data, p_rtcmem); -} diff --git a/ccsrc/Protocols/Rtcmem/RtcmemCodec.hh b/ccsrc/Protocols/Rtcmem/RtcmemCodec.hh deleted file mode 100644 index c647e35..0000000 --- a/ccsrc/Protocols/Rtcmem/RtcmemCodec.hh +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef RTCMEMCODEC_H -#define RTCMEMCODEC_H - -#include "codec.hh" -#include "params_its.hh" -#include "per_codec.hh" - -#include "LibItsRtcmem_TypesAndValues.hh" - -class RtcmemPDUCodec : public per_codec { -public: - RtcmemPDUCodec(){}; - virtual int encode(const RTCMEM__PDU__Descriptions::RTCMEM &srem, BITSTRING &data); - virtual int decode(const BITSTRING &data, RTCMEM__PDU__Descriptions::RTCMEM &); -}; - -class RtcmemCodec : public codec { - RtcmemPDUCodec asn_codec; - -public: - RtcmemCodec() : codec(), asn_codec(){}; - virtual ~RtcmemCodec(){}; - - virtual int encode(const RTCMEM__PDU__Descriptions::RTCMEM &srem, OCTETSTRING &data); - virtual int decode(const OCTETSTRING &data, RTCMEM__PDU__Descriptions::RTCMEM &, params_its *params = NULL); -}; - -#endif diff --git a/ccsrc/Protocols/Rtcmem/module.mk b/ccsrc/Protocols/Rtcmem/module.mk index a9b2cd3..9ef29c7 100644 --- a/ccsrc/Protocols/Rtcmem/module.mk +++ b/ccsrc/Protocols/Rtcmem/module.mk @@ -1,3 +1,3 @@ -sources := RtcmemCodec.cc +sources := rtcmem_codec.cc includes := . diff --git a/ccsrc/Protocols/Rtcmem/rtcmem_codec.cc b/ccsrc/Protocols/Rtcmem/rtcmem_codec.cc new file mode 100644 index 0000000..b596921 --- /dev/null +++ b/ccsrc/Protocols/Rtcmem/rtcmem_codec.cc @@ -0,0 +1,30 @@ +#include "rtcmem_codec.hh" +#include "LibItsRtcmem_TypesAndValues.hh" +#include "LibItsRtcmem_EncdecDeclarations.hh" +#include "loggers.hh" + +int rtcmem_codec::encode(const RTCMEM__PDU__Descriptions::RTCMEM &rtcmem, OCTETSTRING &p_data) { + loggers::get_instance().log(">>> rtcmem_codec::encode"); + + BITSTRING bs = LibItsRtcmem__EncdecDeclarations::fx__enc__RTCMEM(rtcmem); + if (!bs.is_bound()) { + loggers::get_instance().error("rtcmem_codec::encode: Failed to encode RTCMEM value"); + return -1; + } + + p_data = bit2oct(bs); + return 0; +} + +int rtcmem_codec::decode(const OCTETSTRING &p_data, RTCMEM__PDU__Descriptions::RTCMEM &p_rtcmem, params_its *params) { + loggers::get_instance().log_msg(">>> rtcmem_codec::decode: ", p_data); + + BITSTRING bs = oct2bit(p_data); + int result = static_cast(LibItsRtcmem__EncdecDeclarations::fx__dec__RTCMEM(bs, p_rtcmem)); + if (result != 0) { + loggers::get_instance().error("rtcmem_codec::decode: Failed to decode RTCMEM PDU"); + return -1; + } + + return 0; +} diff --git a/ccsrc/Protocols/Rtcmem/rtcmem_codec.hh b/ccsrc/Protocols/Rtcmem/rtcmem_codec.hh new file mode 100644 index 0000000..8b4c34c --- /dev/null +++ b/ccsrc/Protocols/Rtcmem/rtcmem_codec.hh @@ -0,0 +1,23 @@ +#ifndef RTCMEMCODEC_H +#define RTCMEMCODEC_H + +#include "codec.hh" +#include "params_its.hh" + +#include "LibItsRtcmem_TypesAndValues.hh" + +namespace RTCMEM__PDU__Descriptions { //! Forward declaration of asn1c RTCMEM class + class RTCMEM; +} + +class rtcmem_codec : public codec { + +public: + rtcmem_codec() : codec() {}; + virtual ~rtcmem_codec(){}; + + virtual int encode(const RTCMEM__PDU__Descriptions::RTCMEM &srem, OCTETSTRING &p_data); + virtual int decode(const OCTETSTRING &p_data, RTCMEM__PDU__Descriptions::RTCMEM &, params_its *params = NULL); +}; + +#endif diff --git a/ccsrc/Protocols/Rtcmem/RtcmemTypes.hh b/ccsrc/Protocols/Rtcmem/rtcmem_types.hh similarity index 100% rename from ccsrc/Protocols/Rtcmem/RtcmemTypes.hh rename to ccsrc/Protocols/Rtcmem/rtcmem_types.hh diff --git a/ccsrc/Protocols/Rtcmem_layers/module.mk b/ccsrc/Protocols/Rtcmem_layers/module.mk index fe95cc9..4b4cebc 100644 --- a/ccsrc/Protocols/Rtcmem_layers/module.mk +++ b/ccsrc/Protocols/Rtcmem_layers/module.mk @@ -1,3 +1,3 @@ -sources := RtcmemLayer.cc +sources := rtcmem_layer.cc includes := . ../Rtcmem ../GeoNetworking diff --git a/ccsrc/Protocols/Rtcmem_layers/RtcmemLayer.cc b/ccsrc/Protocols/Rtcmem_layers/rtcmem_layer.cc similarity index 66% rename from ccsrc/Protocols/Rtcmem_layers/RtcmemLayer.cc rename to ccsrc/Protocols/Rtcmem_layers/rtcmem_layer.cc index 0972d03..3ce3156 100644 --- a/ccsrc/Protocols/Rtcmem_layers/RtcmemLayer.cc +++ b/ccsrc/Protocols/Rtcmem_layers/rtcmem_layer.cc @@ -1,56 +1,56 @@ -#include "RtcmemLayer.hh" +#include "rtcmem_layer.hh" #include "LibItsRtcmem_TestSystem.hh" #include "geonetworking_layer_factory.hh" -#include "RtcmemLayerFactory.hh" +#include "rtcmem_layer_factory.hh" #include "registration.hh" #include "loggers.hh" -RtcmemLayer::RtcmemLayer(const std::string &p_type, const std::string ¶m) +rtcmem_layer::rtcmem_layer(const std::string &p_type, const std::string ¶m) : t_layer(p_type), _params(), _rtcmem_codec() { - loggers::get_instance().log(">>> RtcmemLayer::RtcmemLayer: %s, %s", to_string().c_str(), param.c_str()); + loggers::get_instance().log(">>> rtcmem_layer::rtcmem_layer: %s, %s", to_string().c_str(), param.c_str()); // Setup parameters params_its::convert(_params, param); _params.insert(std::make_pair(static_cast(params_its::its_aid), "128")); // ETSI TS 102 965 V2.1.1 (2021-11) _params.insert(std::make_pair(static_cast(params_its::payload_type), "13")); // RTCME message id - See ETSI TS 103 301 // Register this object for AdapterControlPort - loggers::get_instance().log("RtcmemLayer::RtcmemLayer: Register %s/%p", p_type.c_str(), this); - registration::get_instance().add_item(p_type, this); + loggers::get_instance().log("rtcmem_layer::rtcmem_layer: Register %s/%p", p_type.c_str(), this); + registration::get_instance().add_item(p_type, this); } -void RtcmemLayer::sendMsg(const LibItsRtcmem__TypesAndValues::RtcmemReq &p, params_its ¶ms) { - loggers::get_instance().log_msg(">>> RtcmemLayer::sendMsg: ", p); +void rtcmem_layer::sendMsg(const LibItsRtcmem__TypesAndValues::RtcmemReq &p, params_its ¶ms) { + loggers::get_instance().log_msg(">>> rtcmem_layer::sendMsg: ", p); // Encode rtcmem PDU OCTETSTRING data; if (_rtcmem_codec.encode(p.msgOut(), data) == -1) { - loggers::get_instance().warning("RtcmemLayer::sendMsg: Encoding failure"); + loggers::get_instance().warning("rtcmem_layer::sendMsg: Encoding failure"); return; } send_data(data, _params); } -void RtcmemLayer::send_data(OCTETSTRING &data, params ¶ms) { - loggers::get_instance().log_msg(">>> RtcmemLayer::send_data: ", data); - send_to_all_layers(data, params); +void rtcmem_layer::send_data(OCTETSTRING &p_data, params ¶ms) { + loggers::get_instance().log_msg(">>> rtcmem_layer::send_data: ", p_data); + send_to_all_layers(p_data, params); } -void RtcmemLayer::receive_data(OCTETSTRING &data, params ¶ms) { - loggers::get_instance().log_msg(">>> RtcmemLayer::receive_data: ", data); +void rtcmem_layer::receive_data(OCTETSTRING &p_data, params ¶ms) { + loggers::get_instance().log_msg(">>> rtcmem_layer::receive_data: ", p_data); // Decode the RTCMEM payload LibItsRtcmem__TypesAndValues::RtcmemInd p; - _rtcmem_codec.decode(data, p.msgIn()); + _rtcmem_codec.decode(p_data, p.msgIn()); if (!p.msgIn().is_bound()) { // Discard it return; } // else, continue - // Process lower layer data + // Process lower layer p_data // recvTime params_its::const_iterator it = params.find(params_its::timestamp); if (it != params.cend()) { @@ -110,7 +110,7 @@ void RtcmemLayer::receive_data(OCTETSTRING &data, params ¶ms) { // ssp it = params.find(params_its::ssp); if (it != params.cend()) { - loggers::get_instance().log("RtcmemLayer::receive_data: ssp=%s", it->second.c_str()); + loggers::get_instance().log("rtcmem_layer::receive_data: ssp=%s", it->second.c_str()); p.ssp() = oct2bit(str2oct(CHARSTRING(it->second.c_str()))); } else { p.ssp().set_to_omit(); @@ -127,28 +127,28 @@ void RtcmemLayer::receive_data(OCTETSTRING &data, params ¶ms) { to_all_upper_ports(p, params); } -int RtcmemLayer::enable_secured_mode(const std::string &p_certificate_id, const boolean p_enforce_security) { - loggers::get_instance().log(">>> RtcmemLayer::enable_secured_mode: '%s' - %x", p_certificate_id.c_str(), p_enforce_security); +int rtcmem_layer::enable_secured_mode(const std::string &p_certificate_id, const boolean p_enforce_security) { + loggers::get_instance().log(">>> rtcmem_layer::enable_secured_mode: '%s' - %x", p_certificate_id.c_str(), p_enforce_security); geonetworking_layer *p = registration::get_instance().get_item(std::string("GN")); if (p == NULL) { return -1; } - loggers::get_instance().log("RtcmemLayer::enable_secured_mode: Got GN layer %p", p); + loggers::get_instance().log("rtcmem_layer::enable_secured_mode: Got GN layer %p", p); return p->enable_secured_mode(p_certificate_id, p_enforce_security); } -int RtcmemLayer::disable_secured_mode() { - loggers::get_instance().log(">>> RtcmemLayer::disable_secured_mode"); +int rtcmem_layer::disable_secured_mode() { + loggers::get_instance().log(">>> rtcmem_layer::disable_secured_mode"); geonetworking_layer *p = registration::get_instance().get_item(std::string("GN")); if (p == NULL) { return -1; } - loggers::get_instance().log("RtcmemLayer::disable_secured_mode: Got GN layer %p", p); + loggers::get_instance().log("rtcmem_layer::disable_secured_mode: Got GN layer %p", p); return p->disable_secured_mode(); } -RtcmemLayerFactory RtcmemLayerFactory::_f; +rtcmem_layer_factory rtcmem_layer_factory::_f; diff --git a/ccsrc/Protocols/Rtcmem_layers/RtcmemLayer.hh b/ccsrc/Protocols/Rtcmem_layers/rtcmem_layer.hh similarity index 60% rename from ccsrc/Protocols/Rtcmem_layers/RtcmemLayer.hh rename to ccsrc/Protocols/Rtcmem_layers/rtcmem_layer.hh index 791be4b..c1e3497 100644 --- a/ccsrc/Protocols/Rtcmem_layers/RtcmemLayer.hh +++ b/ccsrc/Protocols/Rtcmem_layers/rtcmem_layer.hh @@ -1,5 +1,5 @@ /*! - * \file RtcmemLayer.hh + * \file rtcmem_layer.hh * \brief Header file for ITS Rtcmem protocol layer. * \author ETSI STF525 * \copyright ETSI Copyright Notification @@ -10,7 +10,7 @@ */ #pragma once -#include "RtcmemCodec.hh" +#include "rtcmem_codec.hh" #include "t_layer.hh" namespace LibItsRtcmem__TestSystem { @@ -19,22 +19,22 @@ namespace LibItsRtcmem__TestSystem { class RtcmemInd; } // namespace LibItsRtcmem__TestSystem -class RtcmemLayer : public t_layer { +class rtcmem_layer : public t_layer { params_its _params; - RtcmemCodec _rtcmem_codec; + rtcmem_codec _rtcmem_codec; public: - RtcmemLayer() : t_layer(), _params(), _rtcmem_codec(){}; - RtcmemLayer(const std::string &p_type, const std::string ¶m); - virtual ~RtcmemLayer(){}; + rtcmem_layer() : t_layer(), _params(), _rtcmem_codec(){}; + rtcmem_layer(const std::string &p_type, const std::string ¶m); + virtual ~rtcmem_layer(){}; void sendMsg(const LibItsRtcmem__TypesAndValues::RtcmemReq &, params_its ¶ms); - virtual void send_data(OCTETSTRING &data, params ¶ms); - virtual void receive_data(OCTETSTRING &data, params &info); + virtual void send_data(OCTETSTRING &p_data, params ¶ms); + virtual void receive_data(OCTETSTRING &p_data, params &info); int enable_secured_mode(const std::string &p_certificate_id, const boolean p_enforce_security); int disable_secured_mode(); -}; // End of class RtcmemLayer +}; // End of class rtcmem_layer diff --git a/ccsrc/Protocols/Rtcmem_layers/RtcmemLayerFactory.hh b/ccsrc/Protocols/Rtcmem_layers/rtcmem_layer_factory.hh similarity index 64% rename from ccsrc/Protocols/Rtcmem_layers/RtcmemLayerFactory.hh rename to ccsrc/Protocols/Rtcmem_layers/rtcmem_layer_factory.hh index da037e9..e130723 100644 --- a/ccsrc/Protocols/Rtcmem_layers/RtcmemLayerFactory.hh +++ b/ccsrc/Protocols/Rtcmem_layers/rtcmem_layer_factory.hh @@ -1,5 +1,5 @@ /*! - * \file RtcmemLayerFactory.hh + * \file rtcmem_layer_factory.hh * \brief Header file for ITS Rtcmem protocol layer factory. * \author ETSI STF525 * \copyright ETSI Copyright Notification @@ -12,15 +12,15 @@ #include "layer_stack_builder.hh" -#include "RtcmemLayer.hh" +#include "rtcmem_layer.hh" -class RtcmemLayerFactory : public layer_factory { - static RtcmemLayerFactory _f; +class rtcmem_layer_factory : public layer_factory { + static rtcmem_layer_factory _f; public: - RtcmemLayerFactory() { + rtcmem_layer_factory() { // Register factory layer_stack_builder::register_layer_factory("Rtcmem", this); }; - inline virtual layer *create_layer(const std::string &p_type, const std::string &p_param) { return new RtcmemLayer(p_type, p_param); }; -}; // End of class RtcmemLayerFactory + inline virtual layer *create_layer(const std::string &p_type, const std::string &p_param) { return new rtcmem_layer(p_type, p_param); }; +}; // End of class rtcmem_layer_factory diff --git a/ccsrc/Protocols/SAEM/module.mk b/ccsrc/Protocols/SAEM/module.mk index c8556fc..baa33f7 100644 --- a/ccsrc/Protocols/SAEM/module.mk +++ b/ccsrc/Protocols/SAEM/module.mk @@ -1,2 +1,2 @@ -sources := saem_codec.cc saem_pdu_codec.cc +sources := saem_codec.cc includes := . diff --git a/ccsrc/Protocols/SAEM/saem_codec.cc b/ccsrc/Protocols/SAEM/saem_codec.cc index e2cc5b2..9a1b171 100644 --- a/ccsrc/Protocols/SAEM/saem_codec.cc +++ b/ccsrc/Protocols/SAEM/saem_codec.cc @@ -1,27 +1,31 @@ #include "saem_codec.hh" #include "LibItsSaem_TypesAndValues.hh" -#include "asn1/asn_application.h" // from asn1c +#include "LibItsSaem_EncdecDeclarations.hh" + #include "loggers.hh" -int saem_codec::encode(const SAEM__PDU__Descriptions::SAEM &p_saem, OCTETSTRING &data) { +int saem_codec::encode(const SAEM__PDU__Descriptions::SAEM &p_saem, OCTETSTRING &p_data) { loggers::get_instance().log(">>> saem_codec::encode"); - BITSTRING b; - int rc = asn_codec.encode(p_saem, b); - if (rc != -1) { - data = bit2oct(b); - loggers::get_instance().log_msg("saem_codec::encode: ", data); + BITSTRING bs = LibItsSaem__EncdecDeclarations::fx__enc__SAEM(p_saem); + if (!bs.is_bound()) { + loggers::get_instance().error("saem_codec::encode: Failed to encode SAEM value"); + return -1; } - return rc; + + p_data = bit2oct(bs); + return 0; } -int saem_codec::decode(const OCTETSTRING &data, SAEM__PDU__Descriptions::SAEM &p_saem, params_its *params) { - loggers::get_instance().log_msg(">>> saem_codec::decode: ", data); +int saem_codec::decode(const OCTETSTRING &p_data, SAEM__PDU__Descriptions::SAEM &p_saem, params_its *params) { + loggers::get_instance().log_msg(">>> saem_codec::decode: ", p_data); - int rc = asn_codec.decode(oct2bit(data), p_saem); - loggers::get_instance().log("saem_codec::decode: ASN.1 codec returned %d", rc); - if (rc != -1) { - loggers::get_instance().log_msg("saem_codec::decode: ", p_saem); + BITSTRING bs = oct2bit(p_data); + int result = static_cast(LibItsSaem__EncdecDeclarations::fx__dec__SAEM(bs, p_saem)); + if (result != 0) { + loggers::get_instance().error("saem_codec::decode: Failed to decode SAEM PDU"); + return -1; } - return rc; + + return 0; } diff --git a/ccsrc/Protocols/SAEM/saem_codec.hh b/ccsrc/Protocols/SAEM/saem_codec.hh index 8012320..03b0aaa 100644 --- a/ccsrc/Protocols/SAEM/saem_codec.hh +++ b/ccsrc/Protocols/SAEM/saem_codec.hh @@ -1,6 +1,5 @@ #pragma once -#include "saem_pdu_codec.hh" #include "codec.hh" #include "params_its.hh" @@ -12,13 +11,12 @@ namespace SAEM__PDU__Descriptions { //! Forward declaration of asn1c SAEM class } class saem_codec : public codec { - saem_pdu_codec asn_codec; public: - explicit saem_codec() : codec(), asn_codec(){}; + explicit saem_codec() : codec() {}; virtual ~saem_codec(){}; - virtual int encode(const SAEM__PDU__Descriptions::SAEM &saem, OCTETSTRING &data); - virtual int decode(const OCTETSTRING &data, SAEM__PDU__Descriptions::SAEM &saem, params_its *params = NULL); + virtual int encode(const SAEM__PDU__Descriptions::SAEM &saem, OCTETSTRING &p_data); + virtual int decode(const OCTETSTRING &p_data, SAEM__PDU__Descriptions::SAEM &saem, params_its *params = NULL); }; diff --git a/ccsrc/Protocols/SAEM/saem_pdu_codec.cc b/ccsrc/Protocols/SAEM/saem_pdu_codec.cc deleted file mode 100644 index d91b5ce..0000000 --- a/ccsrc/Protocols/SAEM/saem_pdu_codec.cc +++ /dev/null @@ -1,16 +0,0 @@ -#include "saem_pdu_codec.hh" -#include "LibItsSaem_TypesAndValues.hh" -#include "asn1/asn_application.h" // from asn1c -#include "loggers.hh" - -extern "C" { -extern asn_TYPE_descriptor_t asn_DEF_SAEM; -} - -int saem_pdu_codec::encode(const SAEM__PDU__Descriptions::SAEM &p_saem, BITSTRING &p_data) { - return _encode(SAEM__PDU__Descriptions::SAEM_descr_, asn_DEF_SAEM, p_saem, p_data); -} - -int saem_pdu_codec::decode(const BITSTRING &p_data, SAEM__PDU__Descriptions::SAEM &p_saem) { - return _decode(SAEM__PDU__Descriptions::SAEM_descr_, asn_DEF_SAEM, p_data, p_saem); -} diff --git a/ccsrc/Protocols/SAEM/saem_pdu_codec.hh b/ccsrc/Protocols/SAEM/saem_pdu_codec.hh deleted file mode 100644 index e060522..0000000 --- a/ccsrc/Protocols/SAEM/saem_pdu_codec.hh +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "codec.hh" -#include "params.hh" -#include "per_codec.hh" - -class BITSTRING; //! Forward declaration of TITAN class -class OCTETSTRING; //! Forward declaration of TITAN class - -namespace SAEM__PDU__Descriptions { //! Forward declaration of asn1c SAEM class - class SAEM; -} - -class saem_pdu_codec : public per_codec { -public: - explicit saem_pdu_codec(){}; - virtual int encode(const SAEM__PDU__Descriptions::SAEM &saem, BITSTRING &data); - virtual int decode(const BITSTRING &data, SAEM__PDU__Descriptions::SAEM &); -}; diff --git a/ccsrc/Protocols/SAEM_layers/saem_layer.cc b/ccsrc/Protocols/SAEM_layers/saem_layer.cc index d23d537..e2319ba 100644 --- a/ccsrc/Protocols/SAEM_layers/saem_layer.cc +++ b/ccsrc/Protocols/SAEM_layers/saem_layer.cc @@ -34,31 +34,31 @@ void saem_layer::sendMsg(const LibItsSaem__TypesAndValues::SaemReq &p, params_it send_data(data, _params); } -void saem_layer::send_data(OCTETSTRING &data, params &p_params) { - loggers::get_instance().log_msg(">>> saem_layer::send_data: ", data); +void saem_layer::send_data(OCTETSTRING &p_data, params &p_params) { + loggers::get_instance().log_msg(">>> saem_layer::send_data: ", p_data); - send_to_all_layers(data, p_params); + send_to_all_layers(p_data, p_params); } -void saem_layer::receive_data(OCTETSTRING &data, params &p_params) { - loggers::get_instance().log_msg(">>> saem_layer::receive_data: ", data); +void saem_layer::receive_data(OCTETSTRING &p_data, params &p_params) { + loggers::get_instance().log_msg(">>> saem_layer::receive_data: ", p_data); // Sanity check - if (*(static_cast(data) + 1) == 0x12) { // Check that received packet has SAEM message id - See ETSI TS 102 894 + if (*(static_cast(p_data) + 1) == 0x12) { // Check that received packet has SAEM message id - See ETSI TS 102 894 // Not a SAEM message, discard it - loggers::get_instance().warning("saem_layer::receive_data: Wrong message id: 0x%02x", *(static_cast(data) + 1)); + loggers::get_instance().warning("saem_layer::receive_data: Wrong message id: 0x%02x", *(static_cast(p_data) + 1)); return; } // Decode the payload params_its ¶ms = static_cast(p_params); LibItsSaem__TypesAndValues::SaemInd p; - _codec.decode(data, p.msgIn()); + _codec.decode(p_data, p.msgIn()); if (!p.msgIn().is_bound()) { // Discard it return; } // else, continue - // Process lower layer data + // Process lower layer p_data // recvTime params_its::const_iterator it = params.find(params_its::timestamp); if (it != params.cend()) { diff --git a/ccsrc/Protocols/SAEM_layers/saem_layer.hh b/ccsrc/Protocols/SAEM_layers/saem_layer.hh index f5ecac5..f63cca6 100644 --- a/ccsrc/Protocols/SAEM_layers/saem_layer.hh +++ b/ccsrc/Protocols/SAEM_layers/saem_layer.hh @@ -59,7 +59,7 @@ public: //! \publicsection * \param[in] p_data The data to be sent * \param[in] p_params Some parameters to overwrite default value of the lower layers parameters */ - virtual void send_data(OCTETSTRING &data, params ¶ms); + virtual void send_data(OCTETSTRING &p_data, params ¶ms); /*! * \virtual * \fn void receive_data(OCTETSTRING& data, params& params); @@ -67,7 +67,7 @@ public: //! \publicsection * \param[in] p_data The bytes formated data received * \param[in] p_params Some lower layers parameters values when data was received */ - virtual void receive_data(OCTETSTRING &data, params &info); + virtual void receive_data(OCTETSTRING &p_data, params &info); int enable_secured_mode(const std::string &p_certificate_id, const boolean p_enforce_security); diff --git a/ccsrc/Protocols/Security/etsi_ts103097_certificate_codec.cc b/ccsrc/Protocols/Security/etsi_ts103097_certificate_codec.cc index cd507fe..66843ae 100644 --- a/ccsrc/Protocols/Security/etsi_ts103097_certificate_codec.cc +++ b/ccsrc/Protocols/Security/etsi_ts103097_certificate_codec.cc @@ -1,11 +1,16 @@ #include "EtsiTs103097Module.hh" -#include "asn1/EtsiTs103097Certificate.h" -#include "asn1/asn_application.h" // from asn1c +// FIXME To be removed +// #include "asn1/EtsiTs103097Certificate.h" +// #include "asn1/asn_application.h" // from asn1c #include "etsi_ts103097_certificate_codec.hh" #include "loggers.hh" +namespace Ieee1609Dot2 { + class CertificateBase; +} + int etsi_ts103097_certificate_codec::encode(const Ieee1609Dot2::CertificateBase &p_cert, OCTETSTRING &p_data) { loggers::get_instance().log(">>> etsi_ts103097_certificate_codec::encode: %s", p_cert.get_descriptor()->name); diff --git a/ccsrc/Protocols/Security/etsi_ts103097_certificate_codec.hh b/ccsrc/Protocols/Security/etsi_ts103097_certificate_codec.hh index 2721e49..244747e 100644 --- a/ccsrc/Protocols/Security/etsi_ts103097_certificate_codec.hh +++ b/ccsrc/Protocols/Security/etsi_ts103097_certificate_codec.hh @@ -4,23 +4,10 @@ #include "params.hh" #include "EtsiTs103097Module.hh" -// class BITSTRING; -// class OCTETSTRING; -// class Ieee1609Dot2::CertificateBase; - -// class EtsiTs103097PDUCodec// : public oer_codec -// { -// public: -// explicit EtsiTs103097PDUCodec() { }; -// virtual int encode (const Ieee1609Dot2::CertificateBase& p_cert, BITSTRING& data); -// virtual int decode (const BITSTRING& data, Ieee1609Dot2::CertificateBase&); -// }; class etsi_ts103097_certificate_codec : public codec_gen { - // EtsiTs103097PDUCodec asn_codec; public: - // explicit etsi_ts103097_certificate_codec() : codec_gen(), asn_codec() { }; explicit etsi_ts103097_certificate_codec() : codec_gen(){}; virtual ~etsi_ts103097_certificate_codec(){}; diff --git a/ccsrc/Protocols/Security/etsi_ts103097_data_codec.cc b/ccsrc/Protocols/Security/etsi_ts103097_data_codec.cc index d0c99f9..71f9beb 100644 --- a/ccsrc/Protocols/Security/etsi_ts103097_data_codec.cc +++ b/ccsrc/Protocols/Security/etsi_ts103097_data_codec.cc @@ -1,11 +1,16 @@ #include "EtsiTs103097Module.hh" -#include "asn1/EtsiTs103097Certificate.h" -#include "asn1/asn_application.h" // from asn1c +// FIXME To be removed +// #include "asn1/EtsiTs103097Certificate.h" +// #include "asn1/asn_application.h" // from asn1c #include "etsi_ts103097_data_codec.hh" #include "loggers.hh" +namespace Ieee1609Dot2 { + class Ieee1609Dot2Data; +} + int etsi_ts103097_data_codec::encode(const Ieee1609Dot2::Ieee1609Dot2Data &p_ieee1609Dot2Data, OCTETSTRING &p_data) { loggers::get_instance().log(">>> etsi_ts103097_data_codec::encode: %s", p_ieee1609Dot2Data.get_descriptor()->name); diff --git a/ccsrc/Protocols/Security/etsi_ts103097_data_codec.hh b/ccsrc/Protocols/Security/etsi_ts103097_data_codec.hh index b3884d7..1ce5d6c 100644 --- a/ccsrc/Protocols/Security/etsi_ts103097_data_codec.hh +++ b/ccsrc/Protocols/Security/etsi_ts103097_data_codec.hh @@ -1,27 +1,13 @@ #pragma once #include "codec_gen.hh" -//#include "CodecOer.hh" #include "params.hh" #include "EtsiTs103097Module.hh" -// class BITSTRING; -// class OCTETSTRING; -// class Ieee1609Dot2::Ieee1609Dot2Data; - -// class EtsiTs103097PDUCodec// : public oer_codec -// { -// public: -// explicit EtsiTs103097PDUCodec() { }; -// virtual int encode (const Ieee1609Dot2::Ieee1609Dot2Data& p_cert, BITSTRING& data); -// virtual int decode (const BITSTRING& data, Ieee1609Dot2::Ieee1609Dot2Data&); -// }; class etsi_ts103097_data_codec : public codec_gen { - // EtsiTs103097PDUCodec asn_codec; public: - // explicit etsi_ts103097_data_codec() : codec_gen(), asn_codec() { }; explicit etsi_ts103097_data_codec() : codec_gen(){}; virtual ~etsi_ts103097_data_codec(){}; diff --git a/ccsrc/Protocols/Security/etsi_ts103097_tobesigned_certificate_codec.cc b/ccsrc/Protocols/Security/etsi_ts103097_tobesigned_certificate_codec.cc index eee9014..31e45e2 100644 --- a/ccsrc/Protocols/Security/etsi_ts103097_tobesigned_certificate_codec.cc +++ b/ccsrc/Protocols/Security/etsi_ts103097_tobesigned_certificate_codec.cc @@ -1,28 +1,34 @@ #include "EtsiTs103097Module.hh" -#include "asn1/EtsiTs103097Certificate.h" -#include "asn1/asn_application.h" // from asn1c +// FIXME To be removed +// #include "asn1/EtsiTs103097Certificate.h" +// #include "asn1/asn_application.h" // from asn1c #include "etsi_ts103097_tobesigned_certificate_codec.hh" #include "loggers.hh" -int etsi_ts103097_tobesigned_certificate_codec::encode(const Ieee1609Dot2::ToBeSignedCertificate &p_cert, OCTETSTRING &data) { +namespace Ieee1609Dot2 { + class Ieee1609Dot2Data; +} + + +int etsi_ts103097_tobesigned_certificate_codec::encode(const Ieee1609Dot2::ToBeSignedCertificate &p_cert, OCTETSTRING &p_data) { loggers::get_instance().log(">>> etsi_ts103097_tobesigned_certificate_codec::encode: %s", p_cert.get_descriptor()->name); TTCN_EncDec::clear_error(); TTCN_Buffer buffer; p_cert.encode(*p_cert.get_descriptor(), buffer, TTCN_EncDec::CT_OER); - data = OCTETSTRING(buffer.get_len(), buffer.get_data()); - loggers::get_instance().log_msg("etsi_ts103097_tobesigned_certificate_codec::encode: ", data); + p_data = OCTETSTRING(buffer.get_len(), buffer.get_data()); + loggers::get_instance().log_msg("etsi_ts103097_tobesigned_certificate_codec::encode: ", p_data); return 0; } -int etsi_ts103097_tobesigned_certificate_codec::decode(const OCTETSTRING &data, Ieee1609Dot2::ToBeSignedCertificate &p_cert, params *params) { - loggers::get_instance().log_msg(">>> etsi_ts103097_tobesigned_certificate_codec::decode: ", data); +int etsi_ts103097_tobesigned_certificate_codec::decode(const OCTETSTRING &p_data, Ieee1609Dot2::ToBeSignedCertificate &p_cert, params *params) { + loggers::get_instance().log_msg(">>> etsi_ts103097_tobesigned_certificate_codec::decode: ", p_data); TTCN_EncDec::clear_error(); - TTCN_Buffer decoding_buffer(data); + TTCN_Buffer decoding_buffer(p_data); _params = params; p_cert.decode(*p_cert.get_descriptor(), decoding_buffer, TTCN_EncDec::CT_OER); diff --git a/ccsrc/Protocols/Security/etsi_ts103097_tobesigned_certificate_codec.hh b/ccsrc/Protocols/Security/etsi_ts103097_tobesigned_certificate_codec.hh index 2b4d322..1278ab6 100644 --- a/ccsrc/Protocols/Security/etsi_ts103097_tobesigned_certificate_codec.hh +++ b/ccsrc/Protocols/Security/etsi_ts103097_tobesigned_certificate_codec.hh @@ -1,27 +1,13 @@ #pragma once #include "codec_gen.hh" -//#include "CodecOer.hh" #include "params.hh" #include "EtsiTs103097Module.hh" -// class BITSTRING; -// class OCTETSTRING; -// class Ieee1609Dot2::ToBeSignedCertificate; - -// class EtsiTs103097PDUCodec// : public oer_codec -// { -// public: -// explicit EtsiTs103097PDUCodec() { }; -// virtual int encode (const Ieee1609Dot2::ToBeSignedCertificate& p_cert, BITSTRING& data); -// virtual int decode (const BITSTRING& data, Ieee1609Dot2::ToBeSignedCertificate&); -// }; class etsi_ts103097_tobesigned_certificate_codec : public codec_gen { - // EtsiTs103097PDUCodec asn_codec; public: - // explicit etsi_ts103097_tobesigned_certificate_codec() : codec_gen(), asn_codec() { }; explicit etsi_ts103097_tobesigned_certificate_codec() : codec_gen(){}; virtual ~etsi_ts103097_tobesigned_certificate_codec(){}; diff --git a/ccsrc/Protocols/Security/etsi_ts103097_tobesigned_data_codec.cc b/ccsrc/Protocols/Security/etsi_ts103097_tobesigned_data_codec.cc index 6e3d0a2..4f3af76 100644 --- a/ccsrc/Protocols/Security/etsi_ts103097_tobesigned_data_codec.cc +++ b/ccsrc/Protocols/Security/etsi_ts103097_tobesigned_data_codec.cc @@ -1,28 +1,33 @@ #include "EtsiTs103097Module.hh" -#include "asn1/EtsiTs103097Data.h" -#include "asn1/asn_application.h" // from asn1c +// FIXME To be removed +// #include "asn1/EtsiTs103097Data.h" +// #include "asn1/asn_application.h" // from asn1c #include "etsi_ts103097_tobesigned_data_codec.hh" #include "loggers.hh" -int etsi_ts103097_tobesigned_data_codec::encode(const Ieee1609Dot2::ToBeSignedData &p_cert, OCTETSTRING &data) { +namespace Ieee1609Dot2 { + class ToBeSignedData; +} + +int etsi_ts103097_tobesigned_data_codec::encode(const Ieee1609Dot2::ToBeSignedData &p_cert, OCTETSTRING &p_data) { loggers::get_instance().log(">>> etsi_ts103097_tobesigned_data_codec::encode: %s", p_cert.get_descriptor()->name); TTCN_EncDec::clear_error(); TTCN_Buffer buffer; p_cert.encode(*p_cert.get_descriptor(), buffer, TTCN_EncDec::CT_OER); - data = OCTETSTRING(buffer.get_len(), buffer.get_data()); - loggers::get_instance().log_msg("etsi_ts103097_tobesigned_data_codec::encode: ", data); + p_data = OCTETSTRING(buffer.get_len(), buffer.get_data()); + loggers::get_instance().log_msg("etsi_ts103097_tobesigned_data_codec::encode: ", p_data); return 0; } -int etsi_ts103097_tobesigned_data_codec::decode(const OCTETSTRING &data, Ieee1609Dot2::ToBeSignedData &p_cert, params *params) { - loggers::get_instance().log_msg(">>> etsi_ts103097_tobesigned_data_codec::decode: ", data); +int etsi_ts103097_tobesigned_data_codec::decode(const OCTETSTRING &p_data, Ieee1609Dot2::ToBeSignedData &p_cert, params *params) { + loggers::get_instance().log_msg(">>> etsi_ts103097_tobesigned_data_codec::decode: ", p_data); TTCN_EncDec::clear_error(); - TTCN_Buffer decoding_buffer(data); + TTCN_Buffer decoding_buffer(p_data); _params = params; p_cert.decode(*p_cert.get_descriptor(), decoding_buffer, TTCN_EncDec::CT_OER); diff --git a/ccsrc/Protocols/Security/etsi_ts103097_tobesigned_data_codec.hh b/ccsrc/Protocols/Security/etsi_ts103097_tobesigned_data_codec.hh index 5ff7e77..eb01422 100644 --- a/ccsrc/Protocols/Security/etsi_ts103097_tobesigned_data_codec.hh +++ b/ccsrc/Protocols/Security/etsi_ts103097_tobesigned_data_codec.hh @@ -1,27 +1,13 @@ #pragma once #include "codec_gen.hh" -//#include "CodecOer.hh" #include "params.hh" #include "EtsiTs103097Module.hh" -// class BITSTRING; -// class OCTETSTRING; -// class Ieee1609Dot2::ToBeSignedData; - -// class EtsiTs103097PDUCodec// : public oer_codec -// { -// public: -// explicit EtsiTs103097PDUCodec() { }; -// virtual int encode (const Ieee1609Dot2::ToBeSignedData& p_cert, BITSTRING& data); -// virtual int decode (const BITSTRING& data, Ieee1609Dot2::ToBeSignedData&); -// }; class etsi_ts103097_tobesigned_data_codec : public codec_gen { - // EtsiTs103097PDUCodec asn_codec; public: - // explicit etsi_ts103097_tobesigned_data_codec() : codec_gen(), asn_codec() { }; explicit etsi_ts103097_tobesigned_data_codec() : codec_gen(){}; virtual ~etsi_ts103097_tobesigned_data_codec(){}; diff --git a/ccsrc/Protocols/SremSsem/SremCodec.cc b/ccsrc/Protocols/SremSsem/SremCodec.cc deleted file mode 100644 index 17fd954..0000000 --- a/ccsrc/Protocols/SremSsem/SremCodec.cc +++ /dev/null @@ -1,39 +0,0 @@ -#include "SremCodec.hh" -#include "LibItsSremSsem_TypesAndValues.hh" -#include "asn1/asn_application.h" // from asn1c -#include "loggers.hh" - -int SremCodec::encode(const SREM__PDU__Descriptions::SREM &srem, OCTETSTRING &data) { - loggers::get_instance().log(">>> SremCodec::encode"); - - BITSTRING b; - int rc = asn_codec.encode(srem, b); - if (rc != -1) { - data = bit2oct(b); - loggers::get_instance().log_msg("SremCodec::encode: ", data); - } - return rc; -} - -int SremCodec::decode(const OCTETSTRING &data, SREM__PDU__Descriptions::SREM &srem, params_its *params) { - loggers::get_instance().log_msg(">>> SremCodec::decode: ", data); - - int rc = asn_codec.decode(oct2bit(data), srem); - loggers::get_instance().log("SremCodec::decode: ASN.1 codec returned %d", rc); - if (rc != -1) { - loggers::get_instance().log_msg("SremCodec::decode: ", srem); - } - return rc; -} - -extern "C" { -extern asn_TYPE_descriptor_t asn_DEF_SREM; -} - -int SremPDUCodec::encode(const SREM__PDU__Descriptions::SREM &p_srem, BITSTRING &p_data) { - return _encode(SREM__PDU__Descriptions::SREM_descr_, asn_DEF_SREM, p_srem, p_data); -} - -int SremPDUCodec::decode(const BITSTRING &p_data, SREM__PDU__Descriptions::SREM &p_srem) { - return _decode(SREM__PDU__Descriptions::SREM_descr_, asn_DEF_SREM, p_data, p_srem); -} diff --git a/ccsrc/Protocols/SremSsem/SremCodec.hh b/ccsrc/Protocols/SremSsem/SremCodec.hh deleted file mode 100644 index 7685942..0000000 --- a/ccsrc/Protocols/SremSsem/SremCodec.hh +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef SREMCODEC_H -#define SREMCODEC_H - -#include "codec.hh" -#include "params_its.hh" -#include "per_codec.hh" - -#include "LibItsSremSsem_TypesAndValues.hh" - -class SremPDUCodec : public per_codec { -public: - SremPDUCodec(){}; - virtual int encode(const SREM__PDU__Descriptions::SREM &srem, BITSTRING &data); - virtual int decode(const BITSTRING &data, SREM__PDU__Descriptions::SREM &); -}; - -class SremCodec : public codec { - SremPDUCodec asn_codec; - -public: - SremCodec() : codec(), asn_codec(){}; - virtual ~SremCodec(){}; - - virtual int encode(const SREM__PDU__Descriptions::SREM &srem, OCTETSTRING &data); - virtual int decode(const OCTETSTRING &data, SREM__PDU__Descriptions::SREM &, params_its *params = NULL); -}; - -#endif diff --git a/ccsrc/Protocols/SremSsem/SsemCodec.cc b/ccsrc/Protocols/SremSsem/SsemCodec.cc deleted file mode 100644 index 895b00b..0000000 --- a/ccsrc/Protocols/SremSsem/SsemCodec.cc +++ /dev/null @@ -1,39 +0,0 @@ -#include "SsemCodec.hh" -#include "LibItsSremSsem_TypesAndValues.hh" -#include "asn1/asn_application.h" // from asn1c -#include "loggers.hh" - -int SsemCodec::encode(const SSEM__PDU__Descriptions::SSEM &ssem, OCTETSTRING &data) { - loggers::get_instance().log(">>> SsemCodec::encode"); - - BITSTRING b; - int rc = asn_codec.encode(ssem, b); - if (rc != -1) { - data = bit2oct(b); - loggers::get_instance().log_msg("SsemCodec::encode: ", data); - } - return rc; -} - -int SsemCodec::decode(const OCTETSTRING &data, SSEM__PDU__Descriptions::SSEM &ssem, params_its *params) { - loggers::get_instance().log_msg(">>> SsemCodec::decode: ", data); - - int rc = asn_codec.decode(oct2bit(data), ssem); - loggers::get_instance().log("SsemCodec::decode: ASN.1 codec returned %d", rc); - if (rc != -1) { - loggers::get_instance().log_msg("SsemCodec::decode: ", ssem); - } - return rc; -} - -extern "C" { -extern asn_TYPE_descriptor_t asn_DEF_SSEM; -} - -int SsemPDUCodec::encode(const SSEM__PDU__Descriptions::SSEM &p_ssem, BITSTRING &p_data) { - return _encode(SSEM__PDU__Descriptions::SSEM_descr_, asn_DEF_SSEM, p_ssem, p_data); -} - -int SsemPDUCodec::decode(const BITSTRING &p_data, SSEM__PDU__Descriptions::SSEM &p_ssem) { - return _decode(SSEM__PDU__Descriptions::SSEM_descr_, asn_DEF_SSEM, p_data, p_ssem); -} diff --git a/ccsrc/Protocols/SremSsem/SsemCodec.hh b/ccsrc/Protocols/SremSsem/SsemCodec.hh deleted file mode 100644 index 4a92df4..0000000 --- a/ccsrc/Protocols/SremSsem/SsemCodec.hh +++ /dev/null @@ -1,28 +0,0 @@ -#ifndef SSEMCODEC_H -#define SSEMCODEC_H - -#include "codec.hh" -#include "params_its.hh" -#include "per_codec.hh" - -#include "LibItsSremSsem_TypesAndValues.hh" - -class SsemPDUCodec : public per_codec { -public: - SsemPDUCodec(){}; - virtual int encode(const SSEM__PDU__Descriptions::SSEM &ssem, BITSTRING &data); - virtual int decode(const BITSTRING &data, SSEM__PDU__Descriptions::SSEM &); -}; - -class SsemCodec : public codec { - SsemPDUCodec asn_codec; - -public: - SsemCodec() : codec(), asn_codec(){}; - virtual ~SsemCodec(){}; - - virtual int encode(const SSEM__PDU__Descriptions::SSEM &ssem, OCTETSTRING &data); - virtual int decode(const OCTETSTRING &data, SSEM__PDU__Descriptions::SSEM &, params_its *params = NULL); -}; - -#endif diff --git a/ccsrc/Protocols/SremSsem/module.mk b/ccsrc/Protocols/SremSsem/module.mk index e8a710f..ea7b873 100644 --- a/ccsrc/Protocols/SremSsem/module.mk +++ b/ccsrc/Protocols/SremSsem/module.mk @@ -1,3 +1,3 @@ -sources := SremCodec.cc SsemCodec.cc +sources := ssem_codec.cc srem_codec.cc includes := . diff --git a/ccsrc/Protocols/SremSsem/srem_codec.cc b/ccsrc/Protocols/SremSsem/srem_codec.cc new file mode 100644 index 0000000..796fbc1 --- /dev/null +++ b/ccsrc/Protocols/SremSsem/srem_codec.cc @@ -0,0 +1,30 @@ +#include "srem_codec.hh" +#include "LibItsSremSsem_TypesAndValues.hh" +#include "LibItsSremSsem_EncdecDeclarations.hh" +#include "loggers.hh" + +int srem_codec::encode(const SREM__PDU__Descriptions::SREM &srem, OCTETSTRING &p_data) { + loggers::get_instance().log(">>> srem_codec::encode"); + + BITSTRING bs = LibItsSremSsem__EncdecDeclarations::fx__enc__SREM(srem); + if (!bs.is_bound()) { + loggers::get_instance().error("srem_codec::encode: Failed to encode SREM value"); + return -1; + } + + p_data = bit2oct(bs); + return 0; +} + +int srem_codec::decode(const OCTETSTRING &p_data, SREM__PDU__Descriptions::SREM &srem, params_its *params) { + loggers::get_instance().log_msg(">>> srem_codec::decode: ", p_data); + + BITSTRING bs = oct2bit(p_data); + int result = static_cast(LibItsSremSsem__EncdecDeclarations::fx__dec__SREM(bs, srem)); + if (result != 0) { + loggers::get_instance().error("srem_codec::decode: Failed to decode SREM PDU"); + return -1; + } + + return 0; +} diff --git a/ccsrc/Protocols/SremSsem/srem_codec.hh b/ccsrc/Protocols/SremSsem/srem_codec.hh new file mode 100644 index 0000000..e9e57e8 --- /dev/null +++ b/ccsrc/Protocols/SremSsem/srem_codec.hh @@ -0,0 +1,23 @@ +#ifndef SREMCODEC_H +#define SREMCODEC_H + +#include "codec.hh" +#include "params_its.hh" + +#include "LibItsSremSsem_TypesAndValues.hh" + +namespace SREM__PDU__Descriptions { //! Forward declaration of asn1c SREM class + class SREM; +} + +class srem_codec : public codec { + +public: + explicit srem_codec() : codec() {}; + virtual ~srem_codec(){}; + + virtual int encode(const SREM__PDU__Descriptions::SREM &srem, OCTETSTRING &p_data); + virtual int decode(const OCTETSTRING &p_data, SREM__PDU__Descriptions::SREM &srem, params_its *params = NULL); +}; + +#endif diff --git a/ccsrc/Protocols/SremSsem/SremSsemTypes.hh b/ccsrc/Protocols/SremSsem/srem_ssem_types.hh similarity index 100% rename from ccsrc/Protocols/SremSsem/SremSsemTypes.hh rename to ccsrc/Protocols/SremSsem/srem_ssem_types.hh diff --git a/ccsrc/Protocols/SremSsem/ssem_codec.cc b/ccsrc/Protocols/SremSsem/ssem_codec.cc new file mode 100644 index 0000000..a3fc5e9 --- /dev/null +++ b/ccsrc/Protocols/SremSsem/ssem_codec.cc @@ -0,0 +1,30 @@ +#include "ssem_codec.hh" +#include "LibItsSremSsem_TypesAndValues.hh" +#include "LibItsSremSsem_EncdecDeclarations.hh" +#include "loggers.hh" + +int ssem_codec::encode(const SSEM__PDU__Descriptions::SSEM &ssem, OCTETSTRING &p_data) { + loggers::get_instance().log(">>> ssem_codec::encode"); + + BITSTRING bs = LibItsSremSsem__EncdecDeclarations::fx__enc__SSEM(ssem); + if (!bs.is_bound()) { + loggers::get_instance().error("ssem_codec::encode: Failed to encode SSEM value"); + return -1; + } + + p_data = bit2oct(bs); + return 0; +} + +int ssem_codec::decode(const OCTETSTRING &p_data, SSEM__PDU__Descriptions::SSEM &ssem, params_its *params) { + loggers::get_instance().log_msg(">>> ssem_codec::decode: ", p_data); + + BITSTRING bs = oct2bit(p_data); + int result = static_cast(LibItsSremSsem__EncdecDeclarations::fx__dec__SSEM(bs, ssem)); + if (result != 0) { + loggers::get_instance().error("ssem_codec::decode: Failed to decode SSEM PDU"); + return -1; + } + + return 0; +} diff --git a/ccsrc/Protocols/SremSsem/ssem_codec.hh b/ccsrc/Protocols/SremSsem/ssem_codec.hh new file mode 100644 index 0000000..d87305a --- /dev/null +++ b/ccsrc/Protocols/SremSsem/ssem_codec.hh @@ -0,0 +1,24 @@ +#ifndef SSEMCODEC_H +#define SSEMCODEC_H + +#include "codec.hh" +#include "params_its.hh" + +#include "LibItsSremSsem_TypesAndValues.hh" + +namespace SSEM__PDU__Descriptions { //! Forward declaration of asn1c SSEM class + class SSEM; +} + +class ssem_codec : public codec { + +public: + explicit ssem_codec() : codec() {}; + virtual ~ssem_codec(){}; + + virtual int encode(const SSEM__PDU__Descriptions::SSEM &srem, OCTETSTRING &p_data); + virtual int decode(const OCTETSTRING &p_data, SSEM__PDU__Descriptions::SSEM &srem, params_its *params = NULL); +}; + + +#endif diff --git a/ccsrc/Protocols/SremSsem_layers/module.mk b/ccsrc/Protocols/SremSsem_layers/module.mk index 4037656..e0d04f5 100644 --- a/ccsrc/Protocols/SremSsem_layers/module.mk +++ b/ccsrc/Protocols/SremSsem_layers/module.mk @@ -1,2 +1,2 @@ -sources := SremSsemLayer.cc +sources := srem_ssem_layer.cc includes := . ./SremSsem ../GeoNetworking diff --git a/ccsrc/Protocols/SremSsem_layers/SremSsemLayer.cc b/ccsrc/Protocols/SremSsem_layers/srem_ssem_layer.cc similarity index 71% rename from ccsrc/Protocols/SremSsem_layers/SremSsemLayer.cc rename to ccsrc/Protocols/SremSsem_layers/srem_ssem_layer.cc index 222478a..c0e669c 100644 --- a/ccsrc/Protocols/SremSsem_layers/SremSsemLayer.cc +++ b/ccsrc/Protocols/SremSsem_layers/srem_ssem_layer.cc @@ -1,15 +1,15 @@ -#include "SremSsemTypes.hh" +#include "srem_ssem_types.hh" -#include "SremSsemLayerFactory.hh" +#include "srem_ssem_layer_factory.hh" #include "geonetworking_layer_factory.hh" #include "registration.hh" #include "loggers.hh" -SremSsemLayer::SremSsemLayer(const std::string &p_type, const std::string ¶m) +srem_ssem_layer::srem_ssem_layer(const std::string &p_type, const std::string ¶m) : t_layer(p_type), _params(), _srem_codec(), _ssem_codec() { - loggers::get_instance().log(">>> SremSsemLayer::SremSsemLayer: %s, %s", to_string().c_str(), param.c_str()); + loggers::get_instance().log(">>> srem_ssem_layer::srem_ssem_layer: %s, %s", to_string().c_str(), param.c_str()); // Setup parameters params_its::convert(_params, param); _params.insert(std::make_pair(static_cast(params_its::its_aid), "140")); // ETSI TS 102 965 V2.1.1 (2021-11) @@ -17,17 +17,17 @@ SremSsemLayer::SremSsemLayer(const std::string &p_type, const std::string ¶m _params.insert(std::make_pair(static_cast(params_its::btp_destination_port), "2007")); // Register this object for AdapterControlPort - loggers::get_instance().log("SremSsemLayer::SremSsemLayer: Register %s/%p", p_type.c_str(), this); - registration::get_instance().add_item(p_type, this); + loggers::get_instance().log("srem_ssem_layer::srem_ssem_layer: Register %s/%p", p_type.c_str(), this); + registration::get_instance().add_item(p_type, this); } -void SremSsemLayer::sendMsg(const LibItsSremSsem__TypesAndValues::SremReq &p, params_its ¶ms) { - loggers::get_instance().log_msg(">>> SremSsemLayer::sendMsg: ", p); +void srem_ssem_layer::sendMsg(const LibItsSremSsem__TypesAndValues::SremReq &p, params_its ¶ms) { + loggers::get_instance().log_msg(">>> srem_ssem_layer::sendMsg: ", p); // Encode srem PDU OCTETSTRING data; if (_srem_codec.encode(p.msgOut(), data) == -1) { - loggers::get_instance().warning("SremSsemLayer::sendMsg: Encoding failure"); + loggers::get_instance().warning("srem_ssem_layer::sendMsg: Encoding failure"); return; } @@ -35,38 +35,38 @@ void SremSsemLayer::sendMsg(const LibItsSremSsem__TypesAndValues::SremReq &p, pa send_data(data, _params); } -void SremSsemLayer::sendMsg(const LibItsSremSsem__TypesAndValues::SsemReq &p, params_its ¶ms) { - loggers::get_instance().log_msg(">>> SremSsemLayer::sendMsg: ", p); +void srem_ssem_layer::sendMsg(const LibItsSremSsem__TypesAndValues::SsemReq &p, params_its ¶ms) { + loggers::get_instance().log_msg(">>> srem_ssem_layer::sendMsg: ", p); // Encode ssem PDU OCTETSTRING data; if (_ssem_codec.encode(p.msgOut(), data) == -1) { - loggers::get_instance().warning("SremSsemLayer::sendMsg: Encoding failure"); + loggers::get_instance().warning("srem_ssem_layer::sendMsg: Encoding failure"); return; } _params[params_its::btp_destination_port] = "2008"; send_data(data, _params); } -void SremSsemLayer::send_data(OCTETSTRING &data, params_its ¶ms) { - loggers::get_instance().log_msg(">>> SremSsemLayer::send_data: ", data); +void srem_ssem_layer::send_data(OCTETSTRING &p_data, params_its ¶ms) { + loggers::get_instance().log_msg(">>> srem_ssem_layer::send_data: ", p_data); // params.log(); - send_to_all_layers(data, params); + send_to_all_layers(p_data, params); } -void SremSsemLayer::receive_data(OCTETSTRING &data, params_its ¶ms) { - loggers::get_instance().log_msg(">>> SremSsemLayer::receive_data: ", data); +void srem_ssem_layer::receive_data(OCTETSTRING &p_data, params_its ¶ms) { + loggers::get_instance().log_msg(">>> srem_ssem_layer::receive_data: ", p_data); // Sanity check - if (*(static_cast(data) + 1) == 0x09) { // Check that received packet has SRE message id + if (*(static_cast(p_data) + 1) == 0x09) { // Check that received packet has SRE message id // Decode the SREM payload LibItsSremSsem__TypesAndValues::SremInd p; - _srem_codec.decode(data, p.msgIn()); + _srem_codec.decode(p_data, p.msgIn()); if (!p.msgIn().is_bound()) { // Discard it return; } // else, continue - // Process lower layer data + // Process lower layer p_data // recvTime params_its::const_iterator it = params.find(params_its::timestamp); if (it != params.cend()) { @@ -141,15 +141,15 @@ void SremSsemLayer::receive_data(OCTETSTRING &data, params_its ¶ms) { // Pass it to the ports if any to_all_upper_ports(p, params); - } else if (*(static_cast(data) + 1) == 0x0A) { // Check that received packet has SSE message id + } else if (*(static_cast(p_data) + 1) == 0x0A) { // Check that received packet has SSE message id // Decode the SSEM payload LibItsSremSsem__TypesAndValues::SsemInd p; - _ssem_codec.decode(data, p.msgIn()); + _ssem_codec.decode(p_data, p.msgIn()); if (!p.msgIn().is_bound()) { // Discard it return; } // else, continue - // Process lower layer data + // Process lower layer p_data params_its::const_iterator it = params.find(params_its::timestamp); if (it != params.cend()) { p.recvTime().set_long_long_val(std::stoll(it->second)); @@ -208,7 +208,7 @@ void SremSsemLayer::receive_data(OCTETSTRING &data, params_its ¶ms) { // ssp it = params.find(params_its::ssp); if (it != params.cend()) { - loggers::get_instance().log("SremSsemLayer::receive_data: ssp=%s", it->second.c_str()); + loggers::get_instance().log("srem_ssem_layer::receive_data: ssp=%s", it->second.c_str()); p.ssp() = oct2bit(str2oct(CHARSTRING(it->second.c_str()))); } else { p.ssp().set_to_omit(); @@ -225,33 +225,33 @@ void SremSsemLayer::receive_data(OCTETSTRING &data, params_its ¶ms) { to_all_upper_ports(p, params); } else { // Not a DENM message, discard it - loggers::get_instance().warning("SremSsemLayer::receive_data: Wrong message id: 0x%02x", *(static_cast(data) + 1)); + loggers::get_instance().warning("srem_ssem_layer::receive_data: Wrong message id: 0x%02x", *(static_cast(p_data) + 1)); return; } } -int SremSsemLayer::enable_secured_mode(const std::string &p_certificate_id, const boolean p_enforce_security) { - loggers::get_instance().log(">>> SremSsemLayer::enable_secured_mode: '%s' - %x", p_certificate_id.c_str(), p_enforce_security); +int srem_ssem_layer::enable_secured_mode(const std::string &p_certificate_id, const boolean p_enforce_security) { + loggers::get_instance().log(">>> srem_ssem_layer::enable_secured_mode: '%s' - %x", p_certificate_id.c_str(), p_enforce_security); geonetworking_layer *p = registration::get_instance().get_item(std::string("GN")); if (p == NULL) { return -1; } - loggers::get_instance().log("SremSsemLayer::enable_secured_mode: Got GN layer %p", p); + loggers::get_instance().log("srem_ssem_layer::enable_secured_mode: Got GN layer %p", p); return p->enable_secured_mode(p_certificate_id, p_enforce_security); } -int SremSsemLayer::disable_secured_mode() { - loggers::get_instance().log(">>> SremSsemLayer::disable_secured_mode"); +int srem_ssem_layer::disable_secured_mode() { + loggers::get_instance().log(">>> srem_ssem_layer::disable_secured_mode"); geonetworking_layer *p = registration::get_instance().get_item(std::string("GN")); if (p == NULL) { return -1; } - loggers::get_instance().log("SremSsemLayer::disable_secured_mode: Got GN layer %p", p); + loggers::get_instance().log("srem_ssem_layer::disable_secured_mode: Got GN layer %p", p); return p->disable_secured_mode(); } -SremSsemLayerFactory SremSsemLayerFactory::_f; +srem_ssem_layer_factory srem_ssem_layer_factory::_f; diff --git a/ccsrc/Protocols/SremSsem_layers/SremSsemLayer.hh b/ccsrc/Protocols/SremSsem_layers/srem_ssem_layer.hh similarity index 68% rename from ccsrc/Protocols/SremSsem_layers/SremSsemLayer.hh rename to ccsrc/Protocols/SremSsem_layers/srem_ssem_layer.hh index 937403c..26f0f92 100644 --- a/ccsrc/Protocols/SremSsem_layers/SremSsemLayer.hh +++ b/ccsrc/Protocols/SremSsem_layers/srem_ssem_layer.hh @@ -1,5 +1,5 @@ /*! - * \file SremSsemLayer.hh + * \file srem_ssem_layer.hh * \brief Header file for ITS SremSsem protocol layer. * \author ETSI STF525 * \copyright ETSI Copyright Notification @@ -10,8 +10,8 @@ */ #pragma once -#include "SremCodec.hh" -#include "SsemCodec.hh" +#include "srem_codec.hh" +#include "ssem_codec.hh" #include "t_layer.hh" namespace LibItsSremSsem__TestSystem { @@ -22,15 +22,15 @@ namespace LibItsSremSsem__TestSystem { class SsemInd; } // namespace LibItsSremSsem__TestSystem -class SremSsemLayer : public t_layer { +class srem_ssem_layer : public t_layer { params_its _params; - SremCodec _srem_codec; - SsemCodec _ssem_codec; + srem_codec _srem_codec; + ssem_codec _ssem_codec; public: - SremSsemLayer() : t_layer(), _params(), _srem_codec(), _ssem_codec(){}; - SremSsemLayer(const std::string &p_type, const std::string ¶m); - virtual ~SremSsemLayer(){}; + srem_ssem_layer() : t_layer(), _params(), _srem_codec(), _ssem_codec(){}; + srem_ssem_layer(const std::string &p_type, const std::string ¶m); + virtual ~srem_ssem_layer(){}; void sendMsg(const LibItsSremSsem__TypesAndValues::SremReq &, params_its& params); void sendMsg(const LibItsSremSsem__TypesAndValues::SsemReq &, params_its& params); @@ -42,4 +42,4 @@ public: int disable_secured_mode(); -}; // End of class SremSsemLayer +}; // End of class srem_ssem_layer diff --git a/ccsrc/Protocols/SremSsem_layers/SremSsemLayerFactory.hh b/ccsrc/Protocols/SremSsem_layers/srem_ssem_layer_factory.hh similarity index 63% rename from ccsrc/Protocols/SremSsem_layers/SremSsemLayerFactory.hh rename to ccsrc/Protocols/SremSsem_layers/srem_ssem_layer_factory.hh index 7099437..0929c93 100644 --- a/ccsrc/Protocols/SremSsem_layers/SremSsemLayerFactory.hh +++ b/ccsrc/Protocols/SremSsem_layers/srem_ssem_layer_factory.hh @@ -1,5 +1,5 @@ /*! - * \file SremSsemLayerFactory.hh + * \file srem_ssem_layer_factory.hh * \brief Header file for ITS SremSsem protocol layer factory. * \author ETSI STF525 * \copyright ETSI Copyright Notification @@ -12,15 +12,15 @@ #include "layer_stack_builder.hh" -#include "SremSsemLayer.hh" +#include "srem_ssem_layer.hh" -class SremSsemLayerFactory : public layer_factory { - static SremSsemLayerFactory _f; +class srem_ssem_layer_factory : public layer_factory { + static srem_ssem_layer_factory _f; public: - SremSsemLayerFactory() { + srem_ssem_layer_factory() { // Register factory layer_stack_builder::register_layer_factory("SremSsem", this); }; - inline virtual layer *create_layer(const std::string &p_type, const std::string &p_param) { return new SremSsemLayer(p_type, p_param); }; -}; // End of class SremSsemLayerFactory + inline virtual layer *create_layer(const std::string &p_type, const std::string &p_param) { return new srem_ssem_layer(p_type, p_param); }; +}; // End of class srem_ssem_layer_factory diff --git a/ccsrc/Protocols/SremSsem_layers/SremSsemTypes.hh b/ccsrc/Protocols/SremSsem_layers/srem_ssem_types.hh similarity index 100% rename from ccsrc/Protocols/SremSsem_layers/SremSsemTypes.hh rename to ccsrc/Protocols/SremSsem_layers/srem_ssem_types.hh diff --git a/ccsrc/Protocols/UpperTester/UpperTesterRtcmemCodec.cc b/ccsrc/Protocols/UpperTester/UpperTesterRtcmemCodec.cc index 4e6c770..5c75888 100644 --- a/ccsrc/Protocols/UpperTester/UpperTesterRtcmemCodec.cc +++ b/ccsrc/Protocols/UpperTester/UpperTesterRtcmemCodec.cc @@ -4,7 +4,7 @@ #include "UpperTesterRtcmemCodec.hh" #include "loggers.hh" -#include "RtcmemCodec.hh" +#include "rtcmem_codec.hh" template class OPTIONAL; class TTCN_EncDec; @@ -19,7 +19,7 @@ uint8_t UpperTesterRtcmemCodec::c_utRtcmemTermination = 0xC4; uint8_t UpperTesterRtcmemCodec::c_utRtcmemTerminationResult = 0xC5; uint8_t UpperTesterRtcmemCodec::c_utRtcmemEventIndication = 0xC6; -int UpperTesterRtcmemCodec::encode(const Record_Type &msg, OCTETSTRING &data) { +int UpperTesterRtcmemCodec::encode(const Record_Type &msg, OCTETSTRING &p_data) { loggers::get_instance().log_msg(">>> UpperTesterRtcmemCodec::encode: ", (const Record_Type &)msg); loggers::get_instance().log(">>> UpperTesterRtcmemCodec::encode: %s", msg.get_descriptor()->name); @@ -46,13 +46,13 @@ int UpperTesterRtcmemCodec::encode(const Record_Type &msg, OCTETSTRING &data) { } else if (std::string(msg.get_descriptor()->name).compare("@LibItsRtcmem_TypesAndValues.UtRtcmemTermination") == 0) { encoding_buffer.put_c(static_cast(UpperTesterRtcmemCodec::c_utRtcmemTermination)); } else { // Error - data = OCTETSTRING(0, nullptr); + p_data = OCTETSTRING(0, nullptr); loggers::get_instance().log("<<< UpperTesterRtcmemCodec::encode: Return -1"); return -1; } encode_(msg, *msg.get_descriptor(), encoding_buffer); - data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); - loggers::get_instance().log_msg("<<< UpperTesterRtcmemCodec::encode: data=", data); + p_data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); + loggers::get_instance().log_msg("<<< UpperTesterRtcmemCodec::encode: p_data=", p_data); return 0; } @@ -95,9 +95,9 @@ int UpperTesterRtcmemCodec::encode_(const Base_Type &type, const TTCN_Typedescri return 0; } -int UpperTesterRtcmemCodec::decode(const OCTETSTRING &data, Record_Type &msg, params_its *params) { +int UpperTesterRtcmemCodec::decode(const OCTETSTRING &p_data, Record_Type &msg, params_its *params) { TTCN_EncDec::clear_error(); - TTCN_Buffer decoding_buffer(data); + TTCN_Buffer decoding_buffer(p_data); _params = params; loggers::get_instance().log_to_hexa(">>> UpperTesterRtcmemCodec::decode: decoding_buffer=", decoding_buffer); @@ -107,27 +107,27 @@ int UpperTesterRtcmemCodec::decode(const OCTETSTRING &data, Record_Type &msg, pa return 0; } -std::unique_ptr UpperTesterRtcmemCodec::decode(const OCTETSTRING &data, params_its *params) { +std::unique_ptr UpperTesterRtcmemCodec::decode(const OCTETSTRING &p_data, params_its *params) { std::unique_ptr result; - const uint8_t *ptr = static_cast(data); + const uint8_t *ptr = static_cast(p_data); if (*ptr != UpperTesterRtcmemCodec::c_utRtcmemEventIndication) { LibItsRtcmem__TypesAndValues::UtRtcmemResults res; - decode(data, res, params); + decode(p_data, res, params); result.reset((Base_Type *)res.clone()); } else { LibItsRtcmem__TypesAndValues::UtRtcmemEventInd ind; - decode(data, ind, params); + decode(p_data, ind, params); result.reset((Base_Type *)ind.clone()); } return result; } -int UpperTesterRtcmemCodec::decode(const OCTETSTRING &data, LibItsRtcmem__TypesAndValues::UtRtcmemResults &msg, params_its *params) { - loggers::get_instance().log_to_hexa(">>> UpperTesterRtcmemCodec::decode: decoding_buffer=", data); +int UpperTesterRtcmemCodec::decode(const OCTETSTRING &p_data, LibItsRtcmem__TypesAndValues::UtRtcmemResults &msg, params_its *params) { + loggers::get_instance().log_to_hexa(">>> UpperTesterRtcmemCodec::decode: decoding_buffer=", p_data); - const uint8_t *ptr = static_cast(data); + const uint8_t *ptr = static_cast(p_data); if (*ptr == UpperTesterRtcmemCodec::c_utRtcmemInitializeResult) { msg.utRtcmemInitializeResult() = BOOLEAN(*(ptr + 1) == 0x01); } else if (*ptr == UpperTesterRtcmemCodec::c_utRtcmemTriggerResult) { @@ -144,17 +144,17 @@ int UpperTesterRtcmemCodec::decode(const OCTETSTRING &data, LibItsRtcmem__TypesA return 0; } -int UpperTesterRtcmemCodec::decode(const OCTETSTRING &data, LibItsRtcmem__TypesAndValues::UtRtcmemEventInd &msg, params_its *params) { - loggers::get_instance().log_to_hexa(">>> UpperTesterRtcmemCodec::decode: decoding_buffer=", data); +int UpperTesterRtcmemCodec::decode(const OCTETSTRING &p_data, LibItsRtcmem__TypesAndValues::UtRtcmemEventInd &msg, params_its *params) { + loggers::get_instance().log_to_hexa(">>> UpperTesterRtcmemCodec::decode: decoding_buffer=", p_data); - const uint8_t *ptr = static_cast(data) + 1; + const uint8_t *ptr = static_cast(p_data) + 1; OCTETSTRING os(2, ptr); ptr += 2; unsigned int length = oct2int(os); loggers::get_instance().log("UpperTesterRtcmemCodec::decode: RTCMEM message length=%d", length); os = OCTETSTRING(length, ptr); loggers::get_instance().log_to_hexa("UpperTesterRtcmemCodec::decode: RTCMEM message=", os); - RtcmemCodec codec; + rtcmem_codec codec; codec.decode(os, msg.rtcmemMsg(), params); loggers::get_instance().log_msg("<<< UpperTesterRtcmemCodec::decode", msg); diff --git a/ccsrc/Protocols/UpperTester/UpperTesterRtcmemCodec.hh b/ccsrc/Protocols/UpperTester/UpperTesterRtcmemCodec.hh index c75e8bb..60338c1 100644 --- a/ccsrc/Protocols/UpperTester/UpperTesterRtcmemCodec.hh +++ b/ccsrc/Protocols/UpperTester/UpperTesterRtcmemCodec.hh @@ -35,12 +35,12 @@ public: UpperTesterRtcmemCodec() : codec(){}; virtual ~UpperTesterRtcmemCodec(){}; - virtual int encode(const Record_Type &, OCTETSTRING &data); - virtual int decode(const OCTETSTRING &data, Record_Type &, params_its *params = NULL); - std::unique_ptr decode(const OCTETSTRING &data, params_its *params = NULL); + virtual int encode(const Record_Type &, OCTETSTRING &p_data); + virtual int decode(const OCTETSTRING &p_data, Record_Type &, params_its *params = NULL); + std::unique_ptr decode(const OCTETSTRING &p_data, params_its *params = NULL); private: - int decode(const OCTETSTRING &data, LibItsRtcmem__TypesAndValues::UtRtcmemResults &msg, params_its *params = NULL); - int decode(const OCTETSTRING &data, LibItsRtcmem__TypesAndValues::UtRtcmemEventInd &msg, params_its *params = NULL); + int decode(const OCTETSTRING &p_data, LibItsRtcmem__TypesAndValues::UtRtcmemResults &msg, params_its *params = NULL); + int decode(const OCTETSTRING &p_data, LibItsRtcmem__TypesAndValues::UtRtcmemEventInd &msg, params_its *params = NULL); }; #endif diff --git a/ccsrc/Protocols/UpperTester/UpperTesterSremSsemCodec.cc b/ccsrc/Protocols/UpperTester/UpperTesterSremSsemCodec.cc index 6ab0024..bee8bf2 100644 --- a/ccsrc/Protocols/UpperTester/UpperTesterSremSsemCodec.cc +++ b/ccsrc/Protocols/UpperTester/UpperTesterSremSsemCodec.cc @@ -7,8 +7,8 @@ #include "LibItsSremSsem_TestSystem.hh" #include "LibItsSremSsem_TypesAndValues.hh" -#include "SremCodec.hh" -#include "SsemCodec.hh" +#include "srem_codec.hh" +#include "ssem_codec.hh" template class OPTIONAL; class TTCN_EncDec; @@ -24,7 +24,7 @@ uint8_t UpperTesterSremSsemCodec::c_utSremCancelationResult = 0xA5; uint8_t UpperTesterSremSsemCodec::c_utSremEventIndication = 0xA6; uint8_t UpperTesterSremSsemCodec::c_utSsemEventIndication = 0xA7; -int UpperTesterSremSsemCodec::encode(const Record_Type &msg, OCTETSTRING &data) { +int UpperTesterSremSsemCodec::encode(const Record_Type &msg, OCTETSTRING &p_data) { loggers::get_instance().log_msg(">>> UpperTesterSremSsemCodec::encode: ", (const Record_Type &)msg); loggers::get_instance().log(">>> UpperTesterSremSsemCodec::encode: %s", msg.get_descriptor()->name); @@ -39,13 +39,13 @@ int UpperTesterSremSsemCodec::encode(const Record_Type &msg, OCTETSTRING &data) } else if (std::string(msg.get_descriptor()->name).compare("@LibItsSremSsem_TypesAndValues.UtSremCancelation") == 0) { encoding_buffer.put_c(static_cast(UpperTesterSremSsemCodec::c_utSremCancelation)); } else { // Error - data = OCTETSTRING(0, nullptr); + p_data = OCTETSTRING(0, nullptr); loggers::get_instance().log("<<< UpperTesterSremSsemCodec::encode: Return -1"); return -1; } encode_(msg, *msg.get_descriptor(), encoding_buffer); - data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); - loggers::get_instance().log_msg("<<< UpperTesterSremSsemCodec::encode: data=", data); + p_data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); + loggers::get_instance().log_msg("<<< UpperTesterSremSsemCodec::encode: p_data=", p_data); return 0; } @@ -79,11 +79,11 @@ int UpperTesterSremSsemCodec::encode_(const Base_Type &type, const TTCN_Typedesc return 0; } -int UpperTesterSremSsemCodec::decode(const OCTETSTRING &data, Record_Type &msg, params_its *params) { - loggers::get_instance().log_msg(">>> UpperTesterSremSsemCodec::decode (1): data=", data); +int UpperTesterSremSsemCodec::decode(const OCTETSTRING &p_data, Record_Type &msg, params_its *params) { + loggers::get_instance().log_msg(">>> UpperTesterSremSsemCodec::decode (1): p_data=", p_data); TTCN_EncDec::clear_error(); - TTCN_Buffer decoding_buffer(data); + TTCN_Buffer decoding_buffer(p_data); _params = params; loggers::get_instance().log_to_hexa("UpperTesterSremSsemCodec::decode: decoding_buffer=", decoding_buffer); @@ -93,33 +93,33 @@ int UpperTesterSremSsemCodec::decode(const OCTETSTRING &data, Record_Type &msg, return 0; } -std::unique_ptr UpperTesterSremSsemCodec::decode(const OCTETSTRING &data, params_its *params) { - loggers::get_instance().log_to_hexa(">>> UpperTesterSremSsemCodec::decode (2): decoding_buffer=", data); +std::unique_ptr UpperTesterSremSsemCodec::decode(const OCTETSTRING &p_data, params_its *params) { + loggers::get_instance().log_to_hexa(">>> UpperTesterSremSsemCodec::decode (2): decoding_buffer=", p_data); std::unique_ptr result; - const uint8_t *ptr = static_cast(data); + const uint8_t *ptr = static_cast(p_data); if (*ptr == UpperTesterSremSsemCodec::c_utSsemEventIndication) { LibItsSremSsem__TypesAndValues::UtSsemEventInd ind; - decode(data, ind, params); + decode(p_data, ind, params); result.reset((Base_Type *)ind.clone()); } else if (*ptr == UpperTesterSremSsemCodec::c_utSremEventIndication) { LibItsSremSsem__TypesAndValues::UtSremEventInd ind; - decode(data, ind, params); + decode(p_data, ind, params); result.reset((Base_Type *)ind.clone()); } else { LibItsSremSsem__TypesAndValues::UtSremResults res; - decode(data, res, params); + decode(p_data, res, params); result.reset((Base_Type *)res.clone()); } return result; } -int UpperTesterSremSsemCodec::decode(const OCTETSTRING &data, LibItsSremSsem__TypesAndValues::UtSremResults &msg, params_its *params) { - loggers::get_instance().log_to_hexa(">>> UpperTesterSremSsemCodec::decode (3): decoding_buffer=", data); +int UpperTesterSremSsemCodec::decode(const OCTETSTRING &p_data, LibItsSremSsem__TypesAndValues::UtSremResults &msg, params_its *params) { + loggers::get_instance().log_to_hexa(">>> UpperTesterSremSsemCodec::decode (3): decoding_buffer=", p_data); - const uint8_t *ptr = static_cast(data); + const uint8_t *ptr = static_cast(p_data); if (*ptr == UpperTesterSremSsemCodec::c_utSremInitializeResult) { msg.utSremInitializeResult() = BOOLEAN(*(ptr + 1) == 0x01); } else if (*ptr == UpperTesterSremSsemCodec::c_utSremTriggerResult) { @@ -140,34 +140,34 @@ int UpperTesterSremSsemCodec::decode(const OCTETSTRING &data, LibItsSremSsem__Ty return 0; } -int UpperTesterSremSsemCodec::decode(const OCTETSTRING &data, LibItsSremSsem__TypesAndValues::UtSremEventInd &msg, params_its *params) { - loggers::get_instance().log_to_hexa(">>> UpperTesterSremSsemCodec::decode (4): decoding_buffer=", data); +int UpperTesterSremSsemCodec::decode(const OCTETSTRING &p_data, LibItsSremSsem__TypesAndValues::UtSremEventInd &msg, params_its *params) { + loggers::get_instance().log_to_hexa(">>> UpperTesterSremSsemCodec::decode (4): decoding_buffer=", p_data); - const uint8_t *ptr = static_cast(data) + 1; + const uint8_t *ptr = static_cast(p_data) + 1; OCTETSTRING os(2, ptr); ptr += 2; unsigned int length = oct2int(os); loggers::get_instance().log("UpperTesterSremSsemCodec::decode: SREM message length=%d", length); os = OCTETSTRING(length, ptr); loggers::get_instance().log_to_hexa("UpperTesterSremSsemCodec::decode: SREM message=", os); - SremCodec codec; + srem_codec codec; codec.decode(os, msg.sreMsg(), params); loggers::get_instance().log_msg("<<< UpperTesterSremSsemCodec::decode (4): ", msg); return 0; } -int UpperTesterSremSsemCodec::decode(const OCTETSTRING &data, LibItsSremSsem__TypesAndValues::UtSsemEventInd &msg, params_its *params) { - loggers::get_instance().log_to_hexa(">>> UpperTesterSremSsemCodec::decode (5): decoding_buffer=", data); +int UpperTesterSremSsemCodec::decode(const OCTETSTRING &p_data, LibItsSremSsem__TypesAndValues::UtSsemEventInd &msg, params_its *params) { + loggers::get_instance().log_to_hexa(">>> UpperTesterSremSsemCodec::decode (5): decoding_buffer=", p_data); - const uint8_t *ptr = static_cast(data) + 1; + const uint8_t *ptr = static_cast(p_data) + 1; OCTETSTRING os(2, ptr); ptr += 2; unsigned int length = oct2int(os); loggers::get_instance().log("UpperTesterSremSsemCodec::decode: SSEM message length=%d", length); os = OCTETSTRING(length, ptr); loggers::get_instance().log_to_hexa("UpperTesterSremSsemCodec::decode: SSEM message=", os); - SsemCodec codec; + ssem_codec codec; codec.decode(os, msg.sseMsg(), params); loggers::get_instance().log_msg("<<< UpperTesterSremSsemCodec::decode (5): ", msg); diff --git a/ccsrc/Protocols/UpperTester/UpperTesterSremSsemCodec.hh b/ccsrc/Protocols/UpperTester/UpperTesterSremSsemCodec.hh index fd0aa62..6b54b78 100644 --- a/ccsrc/Protocols/UpperTester/UpperTesterSremSsemCodec.hh +++ b/ccsrc/Protocols/UpperTester/UpperTesterSremSsemCodec.hh @@ -36,13 +36,13 @@ public: UpperTesterSremSsemCodec() : codec(){}; virtual ~UpperTesterSremSsemCodec(){}; - virtual int encode(const Record_Type &, OCTETSTRING &data); - virtual int decode(const OCTETSTRING &data, Record_Type &, params_its *params = NULL); - std::unique_ptr decode(const OCTETSTRING &data, params_its *params = NULL); + virtual int encode(const Record_Type &, OCTETSTRING &p_data); + virtual int decode(const OCTETSTRING &p_data, Record_Type &, params_its *params = NULL); + std::unique_ptr decode(const OCTETSTRING &p_data, params_its *params = NULL); private: - int decode(const OCTETSTRING &data, LibItsSremSsem__TypesAndValues::UtSremResults &msg, params_its *params = NULL); - int decode(const OCTETSTRING &data, LibItsSremSsem__TypesAndValues::UtSremEventInd &msg, params_its *params = NULL); - int decode(const OCTETSTRING &data, LibItsSremSsem__TypesAndValues::UtSsemEventInd &msg, params_its *params = NULL); + int decode(const OCTETSTRING &p_data, LibItsSremSsem__TypesAndValues::UtSremResults &msg, params_its *params = NULL); + int decode(const OCTETSTRING &p_data, LibItsSremSsem__TypesAndValues::UtSremEventInd &msg, params_its *params = NULL); + int decode(const OCTETSTRING &p_data, LibItsSremSsem__TypesAndValues::UtSsemEventInd &msg, params_its *params = NULL); }; #endif diff --git a/ccsrc/Protocols/UpperTester/UpperTesterSremSsemLayer.cc b/ccsrc/Protocols/UpperTester/UpperTesterSremSsemLayer.cc index 76b8de6..5fb86fe 100644 --- a/ccsrc/Protocols/UpperTester/UpperTesterSremSsemLayer.cc +++ b/ccsrc/Protocols/UpperTester/UpperTesterSremSsemLayer.cc @@ -52,16 +52,16 @@ void UpperTesterSremSsemLayer::sendMsg(const LibItsSremSsem__TypesAndValues::UtS send_data(data, p_params); } -void UpperTesterSremSsemLayer::send_data(OCTETSTRING &data, params &p_params) { - loggers::get_instance().log_msg(">>> UpperTesterSremSsemLayer::send_data: ", data); +void UpperTesterSremSsemLayer::send_data(OCTETSTRING &p_data, params &p_params) { + loggers::get_instance().log_msg(">>> UpperTesterSremSsemLayer::send_data: ", p_data); // params.log(); - send_to_all_layers(data, p_params); + send_to_all_layers(p_data, p_params); } -void UpperTesterSremSsemLayer::receive_data(OCTETSTRING &data, params &p_params) { - loggers::get_instance().log_msg(">>> UpperTesterSremSsemLayer::receive_data: ", data); +void UpperTesterSremSsemLayer::receive_data(OCTETSTRING &p_data, params &p_params) { + loggers::get_instance().log_msg(">>> UpperTesterSremSsemLayer::receive_data: ", p_data); - std::unique_ptr r = _codec.decode(data); + std::unique_ptr r = _codec.decode(p_data); if (r.get() != nullptr) { // Pass it to the ports if any to_all_upper_ports(*r, p_params); diff --git a/ccsrc/Protocols/UpperTester/uppertester_avm_codec.cc b/ccsrc/Protocols/UpperTester/uppertester_avm_codec.cc index c5d1b65..b0b596e 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_avm_codec.cc +++ b/ccsrc/Protocols/UpperTester/uppertester_avm_codec.cc @@ -18,7 +18,7 @@ uint8_t uppertester_avm_codec::c_utAvmTrigger = 0x03; uint8_t uppertester_avm_codec::c_utAvmTriggerResult = 0x21; uint8_t uppertester_avm_codec::c_utAvmEventInd = 0x23; -int uppertester_avm_codec::encode(const Record_Type &msg, OCTETSTRING &data) { +int uppertester_avm_codec::encode(const Record_Type &msg, OCTETSTRING &p_data) { loggers::get_instance().log_msg(">>> uppertester_avm_codec::encode: ", (const Record_Type &)msg); TTCN_EncDec::clear_error(); @@ -26,17 +26,17 @@ int uppertester_avm_codec::encode(const Record_Type &msg, OCTETSTRING &data) { if (std::string(msg.get_descriptor()->name).compare("@LibItsAvm_TypesAndValues.UtAvmInitialize") == 0) { encoding_buffer.put_c(static_cast(uppertester_avm_codec::c_utAvmInitialize)); } else { // Error - data = OCTETSTRING(0, nullptr); + p_data = OCTETSTRING(0, nullptr); loggers::get_instance().warning("<<< uppertester_avm_codec::encode: Failed to encode UT message"); return -1; } encode_(msg, *msg.get_descriptor(), encoding_buffer); - data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); - loggers::get_instance().log_msg("<<< uppertester_avm_codec::encode: data=", data); + p_data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); + loggers::get_instance().log_msg("<<< uppertester_avm_codec::encode: p_data=", p_data); return 0; } -int uppertester_avm_codec::encode(const LibItsAvm__TypesAndValues::UtAvmTrigger &msg, OCTETSTRING &data) { +int uppertester_avm_codec::encode(const LibItsAvm__TypesAndValues::UtAvmTrigger &msg, OCTETSTRING &p_data) { loggers::get_instance().log_msg(">>> uppertester_avm_codec::encode: ", (const Record_Type &)msg); TTCN_EncDec::clear_error(); @@ -45,8 +45,8 @@ int uppertester_avm_codec::encode(const LibItsAvm__TypesAndValues::UtAvmTrigger const LibItsAvm__TypesAndValues::UtAvmTrigger &u = static_cast(msg); // // encode_(*type, *type->get_descriptor(), encoding_buffer); - // data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); - // loggers::get_instance().log_msg("<<< uppertester_avm_codec::encode: data=", data); + // p_data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); + // loggers::get_instance().log_msg("<<< uppertester_avm_codec::encode: p_data=", p_data); // return 0; return -1; } @@ -85,9 +85,9 @@ int uppertester_avm_codec::encode_(const Base_Type &type, const TTCN_Typedescrip return -1; } -int uppertester_avm_codec::decode(const OCTETSTRING &data, Record_Type &msg, params_its *params) { +int uppertester_avm_codec::decode(const OCTETSTRING &p_data, Record_Type &msg, params_its *params) { TTCN_EncDec::clear_error(); - TTCN_Buffer decoding_buffer(data); + TTCN_Buffer decoding_buffer(p_data); _params = params; loggers::get_instance().log_to_hexa(">>> uppertester_avm_codec::decode: decoding_buffer=", decoding_buffer); @@ -97,31 +97,31 @@ int uppertester_avm_codec::decode(const OCTETSTRING &data, Record_Type &msg, par return 0; } -std::unique_ptr uppertester_avm_codec::decode(const OCTETSTRING &data, params_its *params) { +std::unique_ptr uppertester_avm_codec::decode(const OCTETSTRING &p_data, params_its *params) { std::unique_ptr result; - const uint8_t *ptr = static_cast(data); + const uint8_t *ptr = static_cast(p_data); if (*ptr != uppertester_avm_codec::c_utAvmEventInd) { LibItsAvm__TypesAndValues::UtAvmResults res; - if (decode(data, res, params) == 0) { + if (decode(p_data, res, params) == 0) { result.reset((Base_Type *)res.clone()); } else { result.reset(nullptr); } } else { LibItsAvm__TypesAndValues::UtAvmEventInd ind; - decode(data, ind, params); + decode(p_data, ind, params); result.reset((Base_Type *)ind.clone()); } return result; } -int uppertester_avm_codec::decode(const OCTETSTRING &data, LibItsAvm__TypesAndValues::UtAvmResults &msg, params_its *params) { - loggers::get_instance().log_to_hexa(">>> uppertester_avm_codec::decode: decoding_buffer=", data); +int uppertester_avm_codec::decode(const OCTETSTRING &p_data, LibItsAvm__TypesAndValues::UtAvmResults &msg, params_its *params) { + loggers::get_instance().log_to_hexa(">>> uppertester_avm_codec::decode: decoding_buffer=", p_data); - const uint8_t *ptr = static_cast(data); + const uint8_t *ptr = static_cast(p_data); if (*ptr == uppertester_avm_codec::c_utAvmInitializeResult) { msg.utAvmInitializeResult() = BOOLEAN(*(ptr + 1) == 0x01); } else if (*ptr == uppertester_avm_codec::c_utAvmTriggerResult) { @@ -138,15 +138,15 @@ int uppertester_avm_codec::decode(const OCTETSTRING &data, LibItsAvm__TypesAndVa return 0; } -int uppertester_avm_codec::decode(const OCTETSTRING &data, LibItsAvm__TypesAndValues::UtAvmEventInd &msg, params_its *params) { - loggers::get_instance().log_to_hexa(">>> uppertester_avm_codec::decode (1): decoding_buffer=", data); +int uppertester_avm_codec::decode(const OCTETSTRING &p_data, LibItsAvm__TypesAndValues::UtAvmEventInd &msg, params_its *params) { + loggers::get_instance().log_to_hexa(">>> uppertester_avm_codec::decode (1): decoding_buffer=", p_data); - const uint8_t *ptr = static_cast(data) + 1; + const uint8_t *ptr = static_cast(p_data) + 1; OCTETSTRING os(2, ptr); const unsigned int length = (const unsigned int)((*ptr << 8 & 0xff00) | *(ptr + 1)); ptr += 2; loggers::get_instance().log("uppertester_avm_codec::decode (1): AVM message length=%d", length); - if (data.lengthof() - 3 != (const int)length) { + if (p_data.lengthof() - 3 != (const int)length) { loggers::get_instance().warning("uppertester_avm_codec::decode (1) (4): Wrong payload length: %d", length); return -1; } @@ -162,7 +162,7 @@ int uppertester_avm_codec::decode(const OCTETSTRING &data, LibItsAvm__TypesAndVa codec.decode(os, msg.mvmMsg(), params); } else { // Not a AVM message, discard it - loggers::get_instance().warning("uppertester_avm_codec::decode (1): Wrong message id: 0x%02x", *(static_cast(data) + 1)); + loggers::get_instance().warning("uppertester_avm_codec::decode (1): Wrong message id: 0x%02x", *(static_cast(p_data) + 1)); return -1; } diff --git a/ccsrc/Protocols/UpperTester/uppertester_avm_codec.hh b/ccsrc/Protocols/UpperTester/uppertester_avm_codec.hh index b74226c..4646882 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_avm_codec.hh +++ b/ccsrc/Protocols/UpperTester/uppertester_avm_codec.hh @@ -41,12 +41,12 @@ public: uppertester_avm_codec() : codec(){}; virtual ~uppertester_avm_codec(){}; - virtual int encode(const Record_Type &, OCTETSTRING &data); - int encode(const LibItsAvm__TypesAndValues::UtAvmTrigger &, OCTETSTRING &data); - virtual int decode(const OCTETSTRING &data, Record_Type &, params_its *params = NULL); - std::unique_ptr decode(const OCTETSTRING &data, params_its *params = NULL); + virtual int encode(const Record_Type &, OCTETSTRING &p_data); + int encode(const LibItsAvm__TypesAndValues::UtAvmTrigger &, OCTETSTRING &p_data); + virtual int decode(const OCTETSTRING &p_data, Record_Type &, params_its *params = NULL); + std::unique_ptr decode(const OCTETSTRING &p_data, params_its *params = NULL); private: - int decode(const OCTETSTRING &data, LibItsAvm__TypesAndValues::UtAvmResults &msg, params_its *params = NULL); - int decode(const OCTETSTRING &data, LibItsAvm__TypesAndValues::UtAvmEventInd &msg, params_its *params = NULL); + int decode(const OCTETSTRING &p_data, LibItsAvm__TypesAndValues::UtAvmResults &msg, params_its *params = NULL); + int decode(const OCTETSTRING &p_data, LibItsAvm__TypesAndValues::UtAvmEventInd &msg, params_its *params = NULL); }; // End of class uppertester_avm_codec diff --git a/ccsrc/Protocols/UpperTester/uppertester_avm_layer.cc b/ccsrc/Protocols/UpperTester/uppertester_avm_layer.cc index 91c10cf..ef972a7 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_avm_layer.cc +++ b/ccsrc/Protocols/UpperTester/uppertester_avm_layer.cc @@ -48,16 +48,16 @@ void uppertester_avm_layer::sendMsg(const LibItsAvm__TypesAndValues::UtAvmTrigge } } -void uppertester_avm_layer::send_data(OCTETSTRING &data, params &p_params) { - loggers::get_instance().log_msg(">>> uppertester_avm_layer::send_data: ", data); +void uppertester_avm_layer::send_data(OCTETSTRING &p_data, params &p_params) { + loggers::get_instance().log_msg(">>> uppertester_avm_layer::send_data: ", p_data); // params.log(); - send_to_all_layers(data, p_params); + send_to_all_layers(p_data, p_params); } -void uppertester_avm_layer::receive_data(OCTETSTRING &data, params &p_params) { - loggers::get_instance().log_msg(">>> uppertester_avm_layer::receive_data: ", data); +void uppertester_avm_layer::receive_data(OCTETSTRING &p_data, params &p_params) { + loggers::get_instance().log_msg(">>> uppertester_avm_layer::receive_data: ", p_data); - std::unique_ptr r = _codec.decode(data); + std::unique_ptr r = _codec.decode(p_data); if (r.get() != nullptr) { // Pass it to the ports if any to_all_upper_ports(*r, p_params); diff --git a/ccsrc/Protocols/UpperTester/uppertester_avm_layer.hh b/ccsrc/Protocols/UpperTester/uppertester_avm_layer.hh index 3ebd2bc..292f2ff 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_avm_layer.hh +++ b/ccsrc/Protocols/UpperTester/uppertester_avm_layer.hh @@ -36,6 +36,6 @@ public: void sendMsg(const LibItsAvm__TypesAndValues::UtAvmInitialize &send_par, params_its& p_params); void sendMsg(const LibItsAvm__TypesAndValues::UtAvmTrigger &send_par, params_its& p_params); - virtual void send_data(OCTETSTRING &data, params& p_params); - virtual void receive_data(OCTETSTRING &data, params& p_params); + virtual void send_data(OCTETSTRING &p_data, params& p_params); + virtual void receive_data(OCTETSTRING &p_data, params& p_params); }; // End of class uppertester_avm_layer diff --git a/ccsrc/Protocols/UpperTester/uppertester_cam_codec.cc b/ccsrc/Protocols/UpperTester/uppertester_cam_codec.cc index 5eb4c0f..392d2fc 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_cam_codec.cc +++ b/ccsrc/Protocols/UpperTester/uppertester_cam_codec.cc @@ -33,7 +33,7 @@ uint8_t uppertester_cam_codec::c_utCamSetLightBarSirene = 0x3f; uint8_t uppertester_cam_codec::c_utCamChangePseudonym = 0x04; uint8_t uppertester_cam_codec::c_utCamEventInd = 0x23; -int uppertester_cam_codec::encode(const Record_Type &msg, OCTETSTRING &data) { +int uppertester_cam_codec::encode(const Record_Type &msg, OCTETSTRING &p_data) { loggers::get_instance().log_msg(">>> uppertester_cam_codec::encode: ", (const Record_Type &)msg); TTCN_EncDec::clear_error(); @@ -45,17 +45,17 @@ int uppertester_cam_codec::encode(const Record_Type &msg, OCTETSTRING &data) { } else if (std::string(msg.get_descriptor()->name).compare("@LibItsCam_TypesAndValues.UtCamChangePseudonym") == 0) { encoding_buffer.put_c(static_cast(uppertester_cam_codec::c_utCamChangePseudonym)); } else { // Error - data = OCTETSTRING(0, nullptr); + p_data = OCTETSTRING(0, nullptr); loggers::get_instance().warning("<<< uppertester_cam_codec::encode: Failed to encode UT message"); return -1; } encode_(msg, *msg.get_descriptor(), encoding_buffer); - data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); - loggers::get_instance().log_msg("<<< uppertester_cam_codec::encode: data=", data); + p_data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); + loggers::get_instance().log_msg("<<< uppertester_cam_codec::encode: p_data=", p_data); return 0; } -int uppertester_cam_codec::encode(const LibItsCam__TypesAndValues::UtCamTrigger &msg, OCTETSTRING &data) { +int uppertester_cam_codec::encode(const LibItsCam__TypesAndValues::UtCamTrigger &msg, OCTETSTRING &p_data) { loggers::get_instance().log_msg(">>> uppertester_cam_codec::encode: ", (const Record_Type &)msg); TTCN_EncDec::clear_error(); @@ -123,13 +123,13 @@ int uppertester_cam_codec::encode(const LibItsCam__TypesAndValues::UtCamTrigger *static_cast(u.setLightBarSirene()) << 6); encoding_buffer.put_c(*static_cast(u.setLightBarSirene()) << 6); } else { // Error - data = OCTETSTRING(0, nullptr); + p_data = OCTETSTRING(0, nullptr); loggers::get_instance().warning("<<< uppertester_cam_codec::encode: Failed to encode UT message"); return -1; } // encode_(*type, *type->get_descriptor(), encoding_buffer); - data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); - loggers::get_instance().log_msg("<<< uppertester_cam_codec::encode: data=", data); + p_data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); + loggers::get_instance().log_msg("<<< uppertester_cam_codec::encode: p_data=", p_data); return 0; } @@ -217,9 +217,9 @@ int uppertester_cam_codec::encode_(const Base_Type &type, const TTCN_Typedescrip return 0; } -int uppertester_cam_codec::decode(const OCTETSTRING &data, Record_Type &msg, params_its *params) { +int uppertester_cam_codec::decode(const OCTETSTRING &p_data, Record_Type &msg, params_its *params) { TTCN_EncDec::clear_error(); - TTCN_Buffer decoding_buffer(data); + TTCN_Buffer decoding_buffer(p_data); _params = params; loggers::get_instance().log_to_hexa(">>> uppertester_cam_codec::decode: decoding_buffer=", decoding_buffer); @@ -229,31 +229,31 @@ int uppertester_cam_codec::decode(const OCTETSTRING &data, Record_Type &msg, par return 0; } -std::unique_ptr uppertester_cam_codec::decode(const OCTETSTRING &data, params_its *params) { +std::unique_ptr uppertester_cam_codec::decode(const OCTETSTRING &p_data, params_its *params) { std::unique_ptr result; - const uint8_t *ptr = static_cast(data); + const uint8_t *ptr = static_cast(p_data); if (*ptr != uppertester_cam_codec::c_utCamEventInd) { LibItsCam__TypesAndValues::UtCamResults res; - if (decode(data, res, params) == 0) { + if (decode(p_data, res, params) == 0) { result.reset((Base_Type *)res.clone()); } else { result.reset(nullptr); } } else { LibItsCam__TypesAndValues::UtCamEventInd ind; - decode(data, ind, params); + decode(p_data, ind, params); result.reset((Base_Type *)ind.clone()); } return result; } -int uppertester_cam_codec::decode(const OCTETSTRING &data, LibItsCam__TypesAndValues::UtCamResults &msg, params_its *params) { - loggers::get_instance().log_to_hexa(">>> uppertester_cam_codec::decode: decoding_buffer=", data); +int uppertester_cam_codec::decode(const OCTETSTRING &p_data, LibItsCam__TypesAndValues::UtCamResults &msg, params_its *params) { + loggers::get_instance().log_to_hexa(">>> uppertester_cam_codec::decode: decoding_buffer=", p_data); - const uint8_t *ptr = static_cast(data); + const uint8_t *ptr = static_cast(p_data); if (*ptr == uppertester_cam_codec::c_utCamInitializeResult) { msg.utCamInitializeResult() = BOOLEAN(*(ptr + 1) == 0x01); } else if (*ptr == uppertester_cam_codec::c_utCamChangePositionResult) { @@ -274,15 +274,15 @@ int uppertester_cam_codec::decode(const OCTETSTRING &data, LibItsCam__TypesAndVa return 0; } -int uppertester_cam_codec::decode(const OCTETSTRING &data, LibItsCam__TypesAndValues::UtCamEventInd &msg, params_its *params) { - loggers::get_instance().log_to_hexa(">>> uppertester_cam_codec::decode (1): decoding_buffer=", data); +int uppertester_cam_codec::decode(const OCTETSTRING &p_data, LibItsCam__TypesAndValues::UtCamEventInd &msg, params_its *params) { + loggers::get_instance().log_to_hexa(">>> uppertester_cam_codec::decode (1): decoding_buffer=", p_data); - const uint8_t *ptr = static_cast(data) + 1; + const uint8_t *ptr = static_cast(p_data) + 1; OCTETSTRING os(2, ptr); const unsigned int length = (const unsigned int)((*ptr << 8 & 0xff00) | *(ptr + 1)); ptr += 2; loggers::get_instance().log("uppertester_cam_codec::decode (1): CAM message length=%d", length); - if (data.lengthof() - 3 != (const int)length) { + if (p_data.lengthof() - 3 != (const int)length) { loggers::get_instance().warning("uppertester_cam_codec::decode (1) (4): Wrong payload length: %d", length); return -1; } diff --git a/ccsrc/Protocols/UpperTester/uppertester_cam_codec.hh b/ccsrc/Protocols/UpperTester/uppertester_cam_codec.hh index 4197b20..93a6976 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_cam_codec.hh +++ b/ccsrc/Protocols/UpperTester/uppertester_cam_codec.hh @@ -57,12 +57,12 @@ public: uppertester_cam_codec() : codec(){}; virtual ~uppertester_cam_codec(){}; - virtual int encode(const Record_Type &, OCTETSTRING &data); - int encode(const LibItsCam__TypesAndValues::UtCamTrigger &, OCTETSTRING &data); - virtual int decode(const OCTETSTRING &data, Record_Type &, params_its *params = NULL); - std::unique_ptr decode(const OCTETSTRING &data, params_its *params = NULL); + virtual int encode(const Record_Type &, OCTETSTRING &p_data); + int encode(const LibItsCam__TypesAndValues::UtCamTrigger &, OCTETSTRING &p_data); + virtual int decode(const OCTETSTRING &p_data, Record_Type &, params_its *params = NULL); + std::unique_ptr decode(const OCTETSTRING &p_data, params_its *params = NULL); private: - int decode(const OCTETSTRING &data, LibItsCam__TypesAndValues::UtCamResults &msg, params_its *params = NULL); - int decode(const OCTETSTRING &data, LibItsCam__TypesAndValues::UtCamEventInd &msg, params_its *params = NULL); + int decode(const OCTETSTRING &p_data, LibItsCam__TypesAndValues::UtCamResults &msg, params_its *params = NULL); + int decode(const OCTETSTRING &p_data, LibItsCam__TypesAndValues::UtCamEventInd &msg, params_its *params = NULL); }; // End of class uppertester_cam_codec diff --git a/ccsrc/Protocols/UpperTester/uppertester_cam_layer.cc b/ccsrc/Protocols/UpperTester/uppertester_cam_layer.cc index e74905b..7dd0741 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_cam_layer.cc +++ b/ccsrc/Protocols/UpperTester/uppertester_cam_layer.cc @@ -80,16 +80,16 @@ void uppertester_cam_layer::sendMsg(const LibItsCam__TypesAndValues::UtCamTrigge } } -void uppertester_cam_layer::send_data(OCTETSTRING &data, params &p_params) { - loggers::get_instance().log_msg(">>> uppertester_cam_layer::send_data: ", data); +void uppertester_cam_layer::send_data(OCTETSTRING &p_data, params &p_params) { + loggers::get_instance().log_msg(">>> uppertester_cam_layer::send_data: ", p_data); // params.log(); - send_to_all_layers(data, p_params); + send_to_all_layers(p_data, p_params); } -void uppertester_cam_layer::receive_data(OCTETSTRING &data, params &p_params) { - loggers::get_instance().log_msg(">>> uppertester_cam_layer::receive_data: ", data); +void uppertester_cam_layer::receive_data(OCTETSTRING &p_data, params &p_params) { + loggers::get_instance().log_msg(">>> uppertester_cam_layer::receive_data: ", p_data); - std::unique_ptr r = _codec.decode(data); + std::unique_ptr r = _codec.decode(p_data); if (r.get() != nullptr) { // Pass it to the ports if any to_all_upper_ports(*r, p_params); diff --git a/ccsrc/Protocols/UpperTester/uppertester_cam_layer.hh b/ccsrc/Protocols/UpperTester/uppertester_cam_layer.hh index f76d5a4..6a22309 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_cam_layer.hh +++ b/ccsrc/Protocols/UpperTester/uppertester_cam_layer.hh @@ -40,6 +40,6 @@ public: void sendMsg(const LibItsCam__TypesAndValues::UtCamChangePseudonym &send_par, params_its& p_params); void sendMsg(const LibItsCam__TypesAndValues::UtCamTrigger &send_par, params_its& p_params); - virtual void send_data(OCTETSTRING &data, params& p_params); - virtual void receive_data(OCTETSTRING &data, params& p_params); + virtual void send_data(OCTETSTRING &p_data, params& p_params); + virtual void receive_data(OCTETSTRING &p_data, params& p_params); }; // End of class uppertester_cam_layer diff --git a/ccsrc/Protocols/UpperTester/uppertester_cps_codec.cc b/ccsrc/Protocols/UpperTester/uppertester_cps_codec.cc index 497679d..077594b 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_cps_codec.cc +++ b/ccsrc/Protocols/UpperTester/uppertester_cps_codec.cc @@ -17,19 +17,19 @@ uint8_t uppertester_cps_codec::c_utCpmTrigger = 0xF6; uint8_t uppertester_cps_codec::c_utCpmTriggerResult = 0xF7; uint8_t uppertester_cps_codec::c_utCpmEventInd = 0xF8; -int uppertester_cps_codec::encode(const LibItsCps__TypesAndValues::UtCpmInitialize &r, OCTETSTRING &data) { +int uppertester_cps_codec::encode(const LibItsCps__TypesAndValues::UtCpmInitialize &r, OCTETSTRING &p_data) { loggers::get_instance().log_msg(">>> uppertester_cps_codec::encode (1): ", r); TTCN_EncDec::clear_error(); TTCN_Buffer encoding_buffer; encoding_buffer.put_c(static_cast(uppertester_cps_codec::c_utCpmInitialize)); encoding_buffer.put_string(r.hashedId8()); - data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); - loggers::get_instance().log_msg("<<< uppertester_cps_codec::encode (1): data=", data); + p_data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); + loggers::get_instance().log_msg("<<< uppertester_cps_codec::encode (1): p_data=", p_data); return 0; } -int uppertester_cps_codec::encode(const LibItsCps__TypesAndValues::UtCpmTrigger &r, OCTETSTRING &data) { +int uppertester_cps_codec::encode(const LibItsCps__TypesAndValues::UtCpmTrigger &r, OCTETSTRING &p_data) { loggers::get_instance().log_msg(">>> uppertester_cps_codec::encode (2): ", r); TTCN_EncDec::clear_error(); @@ -58,13 +58,13 @@ int uppertester_cps_codec::encode(const LibItsCps__TypesAndValues::UtCpmTrigger } encoding_buffer.put_c(flags); encoding_buffer.put_string(val); - data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); + p_data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); - loggers::get_instance().log_msg("<<< uppertester_cps_codec::encode: data=", data); + loggers::get_instance().log_msg("<<< uppertester_cps_codec::encode: p_data=", p_data); return 0; } -int uppertester_cps_codec::encode(const Record_Type &msg, OCTETSTRING &data) { +int uppertester_cps_codec::encode(const Record_Type &msg, OCTETSTRING &p_data) { loggers::get_instance().log_msg(">>> uppertester_cps_codec::encode: ", (const Record_Type &)msg); TTCN_EncDec::clear_error(); @@ -74,12 +74,12 @@ int uppertester_cps_codec::encode(const Record_Type &msg, OCTETSTRING &data) { } else if (std::string(msg.get_descriptor()->name).compare("@LibItsCps_TypesAndValues.UtCpmPerceivedObjects") == 0) { encode_(msg, *msg.get_descriptor(), encoding_buffer); } else { // Error - data = OCTETSTRING(0, nullptr); + p_data = OCTETSTRING(0, nullptr); loggers::get_instance().warning("<<< uppertester_cps_codec::encode: Failed to encode UT message"); return -1; } - data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); - loggers::get_instance().log_msg("<<< uppertester_cps_codec::encode: data=", data); + p_data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); + loggers::get_instance().log_msg("<<< uppertester_cps_codec::encode: p_data=", p_data); return 0; } @@ -141,9 +141,9 @@ int uppertester_cps_codec::encode_(const Base_Type &type, const TTCN_Typedescrip return 0; } -int uppertester_cps_codec::decode(const OCTETSTRING &data, Record_Type &msg, params_its *params) { +int uppertester_cps_codec::decode(const OCTETSTRING &p_data, Record_Type &msg, params_its *params) { TTCN_EncDec::clear_error(); - TTCN_Buffer decoding_buffer(data); + TTCN_Buffer decoding_buffer(p_data); _params = params; loggers::get_instance().log_to_hexa(">>> uppertester_cps_codec::decode: decoding_buffer=", decoding_buffer); @@ -153,31 +153,31 @@ int uppertester_cps_codec::decode(const OCTETSTRING &data, Record_Type &msg, par return 0; } -std::unique_ptr uppertester_cps_codec::decode(const OCTETSTRING &data, params_its *params) { +std::unique_ptr uppertester_cps_codec::decode(const OCTETSTRING &p_data, params_its *params) { std::unique_ptr result; - const uint8_t *ptr = static_cast(data); + const uint8_t *ptr = static_cast(p_data); if (*ptr != uppertester_cps_codec::c_utCpmEventInd) { LibItsCps__TypesAndValues::UtCpmResults res; - if (decode(data, res, params) == 0) { + if (decode(p_data, res, params) == 0) { result.reset((Base_Type *)res.clone()); } else { result.reset(nullptr); } } else { LibItsCps__TypesAndValues::UtCpmEventInd ind; - decode(data, ind, params); + decode(p_data, ind, params); result.reset((Base_Type *)ind.clone()); } return result; } -int uppertester_cps_codec::decode(const OCTETSTRING &data, LibItsCps__TypesAndValues::UtCpmResults &msg, params_its *params) { - loggers::get_instance().log_to_hexa(">>> uppertester_cps_codec::decode: decoding_buffer=", data); +int uppertester_cps_codec::decode(const OCTETSTRING &p_data, LibItsCps__TypesAndValues::UtCpmResults &msg, params_its *params) { + loggers::get_instance().log_to_hexa(">>> uppertester_cps_codec::decode: decoding_buffer=", p_data); - const uint8_t *ptr = static_cast(data); + const uint8_t *ptr = static_cast(p_data); if (*ptr == uppertester_cps_codec::c_utCpmInitializeResult) { msg.utCpmInitializeResult() = BOOLEAN(*(ptr + 1) == 0x01); } else if (*ptr == uppertester_cps_codec::c_utCpmTriggerResult) { @@ -191,15 +191,15 @@ int uppertester_cps_codec::decode(const OCTETSTRING &data, LibItsCps__TypesAndVa return 0; } -int uppertester_cps_codec::decode(const OCTETSTRING &data, LibItsCps__TypesAndValues::UtCpmEventInd &msg, params_its *params) { - loggers::get_instance().log_to_hexa(">>> uppertester_cps_codec::decode (1): decoding_buffer=", data); +int uppertester_cps_codec::decode(const OCTETSTRING &p_data, LibItsCps__TypesAndValues::UtCpmEventInd &msg, params_its *params) { + loggers::get_instance().log_to_hexa(">>> uppertester_cps_codec::decode (1): decoding_buffer=", p_data); - const uint8_t *ptr = static_cast(data) + 1; + const uint8_t *ptr = static_cast(p_data) + 1; OCTETSTRING os(2, ptr); const unsigned int length = (const unsigned int)((*ptr << 8 & 0xff00) | *(ptr + 1)); ptr += 2; loggers::get_instance().log("uppertester_cps_codec::decode (1): CPS message length=%d", length); - if (data.lengthof() - 3 != (const int)length) { + if (p_data.lengthof() - 3 != (const int)length) { loggers::get_instance().warning("uppertester_cps_codec::decode (1) (4): Wrong payload length: %d", length); return -1; } diff --git a/ccsrc/Protocols/UpperTester/uppertester_cps_codec.hh b/ccsrc/Protocols/UpperTester/uppertester_cps_codec.hh index baa78ae..de55923 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_cps_codec.hh +++ b/ccsrc/Protocols/UpperTester/uppertester_cps_codec.hh @@ -44,14 +44,14 @@ public: uppertester_cps_codec() : codec(){}; virtual ~uppertester_cps_codec(){}; - int encode(const LibItsCps__TypesAndValues::UtCpmInitialize &, OCTETSTRING &data); - int encode(const LibItsCps__TypesAndValues::UtCpmTrigger &, OCTETSTRING &data); - virtual int encode(const Record_Type &, OCTETSTRING &data); - //int encode(const LibItsCps__TypesAndValues::UtCpmTrigger &, OCTETSTRING &data); - virtual int decode(const OCTETSTRING &data, Record_Type &, params_its *params = NULL); - std::unique_ptr decode(const OCTETSTRING &data, params_its *params = NULL); + int encode(const LibItsCps__TypesAndValues::UtCpmInitialize &, OCTETSTRING &p_data); + int encode(const LibItsCps__TypesAndValues::UtCpmTrigger &, OCTETSTRING &p_data); + virtual int encode(const Record_Type &, OCTETSTRING &p_data); + //int encode(const LibItsCps__TypesAndValues::UtCpmTrigger &, OCTETSTRING &p_data); + virtual int decode(const OCTETSTRING &p_data, Record_Type &, params_its *params = NULL); + std::unique_ptr decode(const OCTETSTRING &p_data, params_its *params = NULL); private: - int decode(const OCTETSTRING &data, LibItsCps__TypesAndValues::UtCpmResults &msg, params_its *params = NULL); - int decode(const OCTETSTRING &data, LibItsCps__TypesAndValues::UtCpmEventInd &msg, params_its *params = NULL); + int decode(const OCTETSTRING &p_data, LibItsCps__TypesAndValues::UtCpmResults &msg, params_its *params = NULL); + int decode(const OCTETSTRING &p_data, LibItsCps__TypesAndValues::UtCpmEventInd &msg, params_its *params = NULL); }; // End of class uppertester_cps_codec diff --git a/ccsrc/Protocols/UpperTester/uppertester_cps_layer.cc b/ccsrc/Protocols/UpperTester/uppertester_cps_layer.cc index 27904e9..8ff2201 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_cps_layer.cc +++ b/ccsrc/Protocols/UpperTester/uppertester_cps_layer.cc @@ -48,16 +48,16 @@ void uppertester_cps_layer::sendMsg(const LibItsCps__TypesAndValues::UtCpmTrigge } } -void uppertester_cps_layer::send_data(OCTETSTRING &data, params &p_params) { - loggers::get_instance().log_msg(">>> uppertester_cps_layer::send_data: ", data); +void uppertester_cps_layer::send_data(OCTETSTRING &p_data, params &p_params) { + loggers::get_instance().log_msg(">>> uppertester_cps_layer::send_data: ", p_data); // params.log(); - send_to_all_layers(data, p_params); + send_to_all_layers(p_data, p_params); } -void uppertester_cps_layer::receive_data(OCTETSTRING &data, params &p_params) { - loggers::get_instance().log_msg(">>> uppertester_cps_layer::receive_data: ", data); +void uppertester_cps_layer::receive_data(OCTETSTRING &p_data, params &p_params) { + loggers::get_instance().log_msg(">>> uppertester_cps_layer::receive_data: ", p_data); - std::unique_ptr r = _codec.decode(data); + std::unique_ptr r = _codec.decode(p_data); if (r.get() != nullptr) { // Pass it to the ports if any to_all_upper_ports(*r, p_params); diff --git a/ccsrc/Protocols/UpperTester/uppertester_cps_layer.hh b/ccsrc/Protocols/UpperTester/uppertester_cps_layer.hh index d1e8bf7..aad35d2 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_cps_layer.hh +++ b/ccsrc/Protocols/UpperTester/uppertester_cps_layer.hh @@ -36,6 +36,6 @@ public: void sendMsg(const LibItsCps__TypesAndValues::UtCpmInitialize &send_par, params_its& p_params); void sendMsg(const LibItsCps__TypesAndValues::UtCpmTrigger &send_par, params_its& p_params); - virtual void send_data(OCTETSTRING &data, params& p_params); - virtual void receive_data(OCTETSTRING &data, params& p_params); + virtual void send_data(OCTETSTRING &p_data, params& p_params); + virtual void receive_data(OCTETSTRING &p_data, params& p_params); }; // End of class uppertester_cps_layer diff --git a/ccsrc/Protocols/UpperTester/uppertester_denm_codec.cc b/ccsrc/Protocols/UpperTester/uppertester_denm_codec.cc index 90b0b22..ec19d0e 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_denm_codec.cc +++ b/ccsrc/Protocols/UpperTester/uppertester_denm_codec.cc @@ -26,7 +26,7 @@ uint8_t uppertester_denm_codec::c_utDenmTermination = 0x14; uint8_t uppertester_denm_codec::c_utDenmTerminationResult = 0x15; uint8_t uppertester_denm_codec::c_utDenmEventIndication = 0x17; -int uppertester_denm_codec::encode(const Record_Type &msg, OCTETSTRING &data) { +int uppertester_denm_codec::encode(const Record_Type &msg, OCTETSTRING &p_data) { loggers::get_instance().log_msg(">>> uppertester_denm_codec::encode: ", (const Record_Type &)msg); TTCN_EncDec::clear_error(); @@ -93,13 +93,13 @@ int uppertester_denm_codec::encode(const Record_Type &msg, OCTETSTRING &data) { } else if (std::string(msg.get_descriptor()->name).compare("@LibItsDenm_TypesAndValues.UtDenmTermination") == 0) { encoding_buffer.put_c(static_cast(uppertester_denm_codec::c_utDenmTermination)); } else { // Error - data = OCTETSTRING(0, nullptr); + p_data = OCTETSTRING(0, nullptr); loggers::get_instance().warning("<<< uppertester_denm_codec::encode: Failed to encode UT message"); return -1; } encode_(msg, *msg.get_descriptor(), encoding_buffer); - data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); - loggers::get_instance().log_msg("<<< uppertester_denm_codec::encode: data=", data); + p_data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); + loggers::get_instance().log_msg("<<< uppertester_denm_codec::encode: p_data=", p_data); return 0; } @@ -220,9 +220,9 @@ int uppertester_denm_codec::encode_(const Base_Type &type, const TTCN_Typedescri return 0; } -int uppertester_denm_codec::decode(const OCTETSTRING &data, Record_Type &msg, params_its *params) { +int uppertester_denm_codec::decode(const OCTETSTRING &p_data, Record_Type &msg, params_its *params) { TTCN_EncDec::clear_error(); - TTCN_Buffer decoding_buffer(data); + TTCN_Buffer decoding_buffer(p_data); _params = params; loggers::get_instance().log_to_hexa(">>> uppertester_denm_codec::decode: decoding_buffer=", decoding_buffer); @@ -232,28 +232,28 @@ int uppertester_denm_codec::decode(const OCTETSTRING &data, Record_Type &msg, pa return 0; } -std::unique_ptr uppertester_denm_codec::decode(const OCTETSTRING &data, params_its *params) { +std::unique_ptr uppertester_denm_codec::decode(const OCTETSTRING &p_data, params_its *params) { std::unique_ptr result; - const uint8_t *ptr = static_cast(data); + const uint8_t *ptr = static_cast(p_data); if (*ptr != uppertester_denm_codec::c_utDenmEventIndication) { LibItsDenm__TypesAndValues::UtDenmResults res; - decode(data, res, params); + decode(p_data, res, params); result.reset((Base_Type *)res.clone()); } else { LibItsDenm__TypesAndValues::UtDenmEventInd ind; - decode(data, ind, params); + decode(p_data, ind, params); result.reset((Base_Type *)ind.clone()); } return result; } -int uppertester_denm_codec::decode(const OCTETSTRING &data, LibItsDenm__TypesAndValues::UtDenmResults &msg, params_its *params) { - loggers::get_instance().log_to_hexa(">>> uppertester_denm_codec::decode: decoding_buffer=", data); +int uppertester_denm_codec::decode(const OCTETSTRING &p_data, LibItsDenm__TypesAndValues::UtDenmResults &msg, params_its *params) { + loggers::get_instance().log_to_hexa(">>> uppertester_denm_codec::decode: decoding_buffer=", p_data); - const uint8_t *ptr = static_cast(data); + const uint8_t *ptr = static_cast(p_data); if (*ptr == uppertester_denm_codec::c_utDenmInitializeResult) { msg.utDenmInitializeResult() = BOOLEAN(*(ptr + 1) == 0x01); } else if (*ptr == uppertester_denm_codec::c_utDenmChangePositionResult) { @@ -295,10 +295,10 @@ int uppertester_denm_codec::decode(const OCTETSTRING &data, LibItsDenm__TypesAnd return 0; } -int uppertester_denm_codec::decode(const OCTETSTRING &data, LibItsDenm__TypesAndValues::UtDenmEventInd &msg, params_its *params) { - loggers::get_instance().log_to_hexa(">>> uppertester_denm_codec::decode (1): decoding_buffer=", data); +int uppertester_denm_codec::decode(const OCTETSTRING &p_data, LibItsDenm__TypesAndValues::UtDenmEventInd &msg, params_its *params) { + loggers::get_instance().log_to_hexa(">>> uppertester_denm_codec::decode (1): decoding_buffer=", p_data); - const uint8_t *ptr = static_cast(data) + 1; + const uint8_t *ptr = static_cast(p_data) + 1; OCTETSTRING os(2, ptr); ptr += 2; unsigned int length = oct2int(os); diff --git a/ccsrc/Protocols/UpperTester/uppertester_denm_codec.hh b/ccsrc/Protocols/UpperTester/uppertester_denm_codec.hh index 6f29df7..30a1aa8 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_denm_codec.hh +++ b/ccsrc/Protocols/UpperTester/uppertester_denm_codec.hh @@ -47,11 +47,11 @@ public: uppertester_denm_codec() : codec(){}; virtual ~uppertester_denm_codec(){}; - virtual int encode(const Record_Type &, OCTETSTRING &data); - virtual int decode(const OCTETSTRING &data, Record_Type &, params_its *params = NULL); - std::unique_ptr decode(const OCTETSTRING &data, params_its *params = NULL); + virtual int encode(const Record_Type &, OCTETSTRING &p_data); + virtual int decode(const OCTETSTRING &p_data, Record_Type &, params_its *params = NULL); + std::unique_ptr decode(const OCTETSTRING &p_data, params_its *params = NULL); private: - int decode(const OCTETSTRING &data, LibItsDenm__TypesAndValues::UtDenmResults &msg, params_its *params = NULL); - int decode(const OCTETSTRING &data, LibItsDenm__TypesAndValues::UtDenmEventInd &msg, params_its *params = NULL); + int decode(const OCTETSTRING &p_data, LibItsDenm__TypesAndValues::UtDenmResults &msg, params_its *params = NULL); + int decode(const OCTETSTRING &p_data, LibItsDenm__TypesAndValues::UtDenmEventInd &msg, params_its *params = NULL); }; // End of class uppertester_denm_codec diff --git a/ccsrc/Protocols/UpperTester/uppertester_geonetworking_codec.cc b/ccsrc/Protocols/UpperTester/uppertester_geonetworking_codec.cc index 083232f..eaf79f4 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_geonetworking_codec.cc +++ b/ccsrc/Protocols/UpperTester/uppertester_geonetworking_codec.cc @@ -24,7 +24,7 @@ uint8_t uppertester_geonetworking_codec::c_utGnTrigger_Shb = 0x53; uint8_t uppertester_geonetworking_codec::c_utGnTrigger_Tsb = 0x54; uint8_t uppertester_geonetworking_codec::c_utGnEventIndication = 0x55; -int uppertester_geonetworking_codec::encode(const Record_Type &msg, OCTETSTRING &data) { +int uppertester_geonetworking_codec::encode(const Record_Type &msg, OCTETSTRING &p_data) { loggers::get_instance().log_msg(">>> uppertester_geonetworking_codec::encode: ", (const Record_Type &)msg); TTCN_EncDec::clear_error(); @@ -34,17 +34,17 @@ int uppertester_geonetworking_codec::encode(const Record_Type &msg, OCTETSTRING } else if (std::string(msg.get_descriptor()->name).compare("@LibItsGeoNetworking_TypesAndValues.UtGnChangePosition") == 0) { encoding_buffer.put_c(static_cast(uppertester_geonetworking_codec::c_utGnChangePosition)); } else { // Error - data = OCTETSTRING(0, nullptr); + p_data = OCTETSTRING(0, nullptr); return -1; } encode_(msg, *msg.get_descriptor(), encoding_buffer); - data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); + p_data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); - loggers::get_instance().log_msg("<<< uppertester_geonetworking_codec::encode: data=", data); + loggers::get_instance().log_msg("<<< uppertester_geonetworking_codec::encode: p_data=", p_data); return 0; } -int uppertester_geonetworking_codec::encode(const Base_Type &msg, OCTETSTRING &data) { +int uppertester_geonetworking_codec::encode(const Base_Type &msg, OCTETSTRING &p_data) { loggers::get_instance().log(">>> uppertester_geonetworking_codec::encode: %s", msg.get_descriptor()->name); TTCN_EncDec::clear_error(); @@ -71,13 +71,13 @@ int uppertester_geonetworking_codec::encode(const Base_Type &msg, OCTETSTRING &d type = (Base_Type *)&(t.tsb()); } // else, nothing to do } else { - data = OCTETSTRING(0, nullptr); + p_data = OCTETSTRING(0, nullptr); return -1; } encode_(*type, *(type->get_descriptor()), encoding_buffer); - data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); + p_data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); - loggers::get_instance().log_msg("<<< uppertester_geonetworking_codec::encode: data=", data); + loggers::get_instance().log_msg("<<< uppertester_geonetworking_codec::encode: p_data=", p_data); return 0; } @@ -121,11 +121,11 @@ int uppertester_geonetworking_codec::encode_(const Base_Type &type, const TTCN_T return 0; } -int uppertester_geonetworking_codec::decode(const OCTETSTRING &data, Record_Type &msg, params_its *params) { - loggers::get_instance().log_msg(">>> uppertester_geonetworking_codec::decode (1): ", data); +int uppertester_geonetworking_codec::decode(const OCTETSTRING &p_data, Record_Type &msg, params_its *params) { + loggers::get_instance().log_msg(">>> uppertester_geonetworking_codec::decode (1): ", p_data); TTCN_EncDec::clear_error(); - TTCN_Buffer decoding_buffer(data); + TTCN_Buffer decoding_buffer(p_data); _params = params; loggers::get_instance().log_to_hexa("uppertester_geonetworking_codec::decode: decoding_buffer=", decoding_buffer); @@ -135,20 +135,20 @@ int uppertester_geonetworking_codec::decode(const OCTETSTRING &data, Record_Type return 0; } -std::unique_ptr uppertester_geonetworking_codec::decode(const OCTETSTRING &data, params_its *params) { - loggers::get_instance().log_msg(">>> uppertester_geonetworking_codec::decode (2): ", data); +std::unique_ptr uppertester_geonetworking_codec::decode(const OCTETSTRING &p_data, params_its *params) { + loggers::get_instance().log_msg(">>> uppertester_geonetworking_codec::decode (2): ", p_data); std::unique_ptr result; - const uint8_t *ptr = static_cast(data); + const uint8_t *ptr = static_cast(p_data); if ((*ptr == uppertester_geonetworking_codec::c_utGnInitializeResult) || (*ptr == uppertester_geonetworking_codec::c_utGnChangePositionResult) || (*ptr == uppertester_geonetworking_codec::c_utGnTriggerResult)) { LibItsGeoNetworking__TypesAndValues::UtGnResults res; - decode(data, res, params); + decode(p_data, res, params); result.reset((Base_Type *)res.clone()); } else if ((*ptr == uppertester_geonetworking_codec::c_utGnEventIndication)) { LibItsGeoNetworking__TypesAndValues::UtGnEventInd ind; - decode(data, ind, params); + decode(p_data, ind, params); result.reset((Base_Type *)ind.clone()); } else { loggers::get_instance().warning("uppertester_geonetworking_codec::decode (2): Unsupported UpperTester command 0x%02x", *ptr); @@ -157,10 +157,10 @@ std::unique_ptr uppertester_geonetworking_codec::decode(const OCTETST return result; } -int uppertester_geonetworking_codec::decode(const OCTETSTRING &data, LibItsGeoNetworking__TypesAndValues::UtGnResults &msg, params_its *params) { - loggers::get_instance().log_msg(">>> uppertester_geonetworking_codec::decode (3): ", data); +int uppertester_geonetworking_codec::decode(const OCTETSTRING &p_data, LibItsGeoNetworking__TypesAndValues::UtGnResults &msg, params_its *params) { + loggers::get_instance().log_msg(">>> uppertester_geonetworking_codec::decode (3): ", p_data); - const uint8_t *ptr = static_cast(data); + const uint8_t *ptr = static_cast(p_data); if (*ptr == uppertester_geonetworking_codec::c_utGnInitializeResult) { msg.utGnInitializeResult() = BOOLEAN(*(ptr + 1) == 0x01); } else if (*ptr == uppertester_geonetworking_codec::c_utGnChangePositionResult) { @@ -179,20 +179,20 @@ int uppertester_geonetworking_codec::decode(const OCTETSTRING &data, LibItsGeoNe return 0; } -int uppertester_geonetworking_codec::decode(const OCTETSTRING &data, LibItsGeoNetworking__TypesAndValues::UtGnEventInd &msg, params_its *params) { - loggers::get_instance().log_msg(">>> uppertester_geonetworking_codec::decode (4): ", data); +int uppertester_geonetworking_codec::decode(const OCTETSTRING &p_data, LibItsGeoNetworking__TypesAndValues::UtGnEventInd &msg, params_its *params) { + loggers::get_instance().log_msg(">>> uppertester_geonetworking_codec::decode (4): ", p_data); TTCN_EncDec::clear_error(); - TTCN_Buffer decoding_buffer(data); + TTCN_Buffer decoding_buffer(p_data); _params = params; - const unsigned int length = (const unsigned int)((data[1].get_octet() << 8 & 0xff00) | data[2].get_octet()); - if (data.lengthof() - 3 != (const int)length) { + const unsigned int length = (const unsigned int)((p_data[1].get_octet() << 8 & 0xff00) | p_data[2].get_octet()); + if (p_data.lengthof() - 3 != (const int)length) { loggers::get_instance().warning("uppertester_geonetworking_codec::decode (4): Wrong payload length: %d", length); return -1; } - msg.rawPayload() = OCTETSTRING(length, 3 + static_cast(data)); + msg.rawPayload() = OCTETSTRING(length, 3 + static_cast(p_data)); loggers::get_instance().log_msg("<<< uppertester_geonetworking_codec::decode (4): ", msg); return 0; diff --git a/ccsrc/Protocols/UpperTester/uppertester_geonetworking_codec.hh b/ccsrc/Protocols/UpperTester/uppertester_geonetworking_codec.hh index 9481ba1..7c8192f 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_geonetworking_codec.hh +++ b/ccsrc/Protocols/UpperTester/uppertester_geonetworking_codec.hh @@ -48,12 +48,12 @@ public: uppertester_geonetworking_codec() : codec(){}; virtual ~uppertester_geonetworking_codec(){}; - virtual int encode(const Record_Type &, OCTETSTRING &data); - virtual int encode(const Base_Type &, OCTETSTRING &data); - virtual int decode(const OCTETSTRING &data, Record_Type &, params_its *params = NULL); - virtual std::unique_ptr decode(const OCTETSTRING &data, params_its *params = NULL); + virtual int encode(const Record_Type &, OCTETSTRING &p_data); + virtual int encode(const Base_Type &, OCTETSTRING &p_data); + virtual int decode(const OCTETSTRING &p_data, Record_Type &, params_its *params = NULL); + virtual std::unique_ptr decode(const OCTETSTRING &p_data, params_its *params = NULL); private: - int decode(const OCTETSTRING &data, LibItsGeoNetworking__TypesAndValues::UtGnResults &msg, params_its *params = NULL); - int decode(const OCTETSTRING &data, LibItsGeoNetworking__TypesAndValues::UtGnEventInd &msg, params_its *params = NULL); + int decode(const OCTETSTRING &p_data, LibItsGeoNetworking__TypesAndValues::UtGnResults &msg, params_its *params = NULL); + int decode(const OCTETSTRING &p_data, LibItsGeoNetworking__TypesAndValues::UtGnEventInd &msg, params_its *params = NULL); }; // End of class uppertester_geonetworking_codec diff --git a/ccsrc/Protocols/UpperTester/uppertester_geonetworking_layer.cc b/ccsrc/Protocols/UpperTester/uppertester_geonetworking_layer.cc index d3ff227..e51d32a 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_geonetworking_layer.cc +++ b/ccsrc/Protocols/UpperTester/uppertester_geonetworking_layer.cc @@ -80,15 +80,15 @@ void uppertester_geonetworking_layer::sendMsg(const LibItsGeoNetworking__TypesAn } } -void uppertester_geonetworking_layer::send_data(OCTETSTRING &data, params &p_params) { - loggers::get_instance().log_msg(">>> uppertester_geonetworking_layer::send_data: ", data); +void uppertester_geonetworking_layer::send_data(OCTETSTRING &p_data, params &p_params) { + loggers::get_instance().log_msg(">>> uppertester_geonetworking_layer::send_data: ", p_data); // params.log(); - send_to_all_layers(data, p_params); + send_to_all_layers(p_data, p_params); } -void uppertester_geonetworking_layer::receive_data(OCTETSTRING &data, params &p_params) { - loggers::get_instance().log_msg(">>> uppertester_geonetworking_layer::receive_data: ", data); - std::unique_ptr r = _codec.decode(data); +void uppertester_geonetworking_layer::receive_data(OCTETSTRING &p_data, params &p_params) { + loggers::get_instance().log_msg(">>> uppertester_geonetworking_layer::receive_data: ", p_data); + std::unique_ptr r = _codec.decode(p_data); if (r.get() != nullptr) { // Pass it to the ports if any to_all_upper_ports(*r, p_params); diff --git a/ccsrc/Protocols/UpperTester/uppertester_geonetworking_layer.hh b/ccsrc/Protocols/UpperTester/uppertester_geonetworking_layer.hh index 0ba44fb..4b75e32 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_geonetworking_layer.hh +++ b/ccsrc/Protocols/UpperTester/uppertester_geonetworking_layer.hh @@ -38,6 +38,6 @@ public: void sendMsg(const LibItsGeoNetworking__TypesAndValues::UtGnTrigger &send_par, params_its& p_params); void sendMsg(const LibItsGeoNetworking__TypesAndValues::UtAutoInteropTrigger &send_par, params_its& p_params); - virtual void send_data(OCTETSTRING &data, params& p_params); - virtual void receive_data(OCTETSTRING &data, params& p_params); + virtual void send_data(OCTETSTRING &p_data, params& p_params); + virtual void receive_data(OCTETSTRING &p_data, params& p_params); }; // End of class uppertester_geonetworking_layer diff --git a/ccsrc/Protocols/UpperTester/uppertester_ivim_codec.cc b/ccsrc/Protocols/UpperTester/uppertester_ivim_codec.cc index 2129db5..e5cf4b3 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_ivim_codec.cc +++ b/ccsrc/Protocols/UpperTester/uppertester_ivim_codec.cc @@ -22,7 +22,7 @@ uint8_t uppertester_ivim_codec::c_utIvimTermination = 0x84; uint8_t uppertester_ivim_codec::c_utIvimTerminationResult = 0x85; uint8_t uppertester_ivim_codec::c_utIvimEventIndication = 0x86; -int uppertester_ivim_codec::encode(const Record_Type &msg, OCTETSTRING &data) { +int uppertester_ivim_codec::encode(const Record_Type &msg, OCTETSTRING &p_data) { loggers::get_instance().log_msg(">>> uppertester_ivim_codec::encode: ", (const Record_Type &)msg); TTCN_EncDec::clear_error(); @@ -95,13 +95,13 @@ int uppertester_ivim_codec::encode(const Record_Type &msg, OCTETSTRING &data) { // See ETSI TR 103 099 V1.4.1 Clause C.9.3 TerminateIvimEvent encoding_buffer.put_c(static_cast(uppertester_ivim_codec::c_utIvimTermination)); } else { // Error - data = OCTETSTRING(0, nullptr); + p_data = OCTETSTRING(0, nullptr); loggers::get_instance().log("<<< uppertester_ivim_codec::encode: Return -1"); return -1; } encode_(msg, *msg.get_descriptor(), encoding_buffer); - data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); - loggers::get_instance().log_msg("<<< uppertester_ivim_codec::encode: data=", data); + p_data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); + loggers::get_instance().log_msg("<<< uppertester_ivim_codec::encode: p_data=", p_data); return 0; } @@ -193,9 +193,9 @@ int uppertester_ivim_codec::encode_(const Base_Type &type, const TTCN_Typedescri return 0; } -int uppertester_ivim_codec::decode(const OCTETSTRING &data, Record_Type &msg, params_its *params) { +int uppertester_ivim_codec::decode(const OCTETSTRING &p_data, Record_Type &msg, params_its *params) { TTCN_EncDec::clear_error(); - TTCN_Buffer decoding_buffer(data); + TTCN_Buffer decoding_buffer(p_data); _params = params; loggers::get_instance().log_to_hexa(">>> uppertester_ivim_codec::decode: decoding_buffer=", decoding_buffer); @@ -205,28 +205,28 @@ int uppertester_ivim_codec::decode(const OCTETSTRING &data, Record_Type &msg, pa return 0; } -std::unique_ptr uppertester_ivim_codec::decode(const OCTETSTRING &data, params_its *params) { +std::unique_ptr uppertester_ivim_codec::decode(const OCTETSTRING &p_data, params_its *params) { std::unique_ptr result; - const uint8_t *ptr = static_cast(data); + const uint8_t *ptr = static_cast(p_data); if (*ptr != uppertester_ivim_codec::c_utIvimEventIndication) { LibItsIvim__TypesAndValues::UtIvimResults res; - decode(data, res, params); + decode(p_data, res, params); result.reset((Base_Type *)res.clone()); } else { LibItsIvim__TypesAndValues::UtIvimEventInd ind; - decode(data, ind, params); + decode(p_data, ind, params); result.reset((Base_Type *)ind.clone()); } return result; } -int uppertester_ivim_codec::decode(const OCTETSTRING &data, LibItsIvim__TypesAndValues::UtIvimResults &msg, params_its *params) { - loggers::get_instance().log_to_hexa(">>> uppertester_ivim_codec::decode: decoding_buffer=", data); +int uppertester_ivim_codec::decode(const OCTETSTRING &p_data, LibItsIvim__TypesAndValues::UtIvimResults &msg, params_its *params) { + loggers::get_instance().log_to_hexa(">>> uppertester_ivim_codec::decode: decoding_buffer=", p_data); - const uint8_t *ptr = static_cast(data); + const uint8_t *ptr = static_cast(p_data); if (*ptr == uppertester_ivim_codec::c_utIvimInitializeResult) { msg.utIvimInitializeResult() = BOOLEAN(*(ptr + 1) == 0x01); } else if (*ptr == uppertester_ivim_codec::c_utIvimTerminationResult) { @@ -260,10 +260,10 @@ int uppertester_ivim_codec::decode(const OCTETSTRING &data, LibItsIvim__TypesAnd return 0; } -int uppertester_ivim_codec::decode(const OCTETSTRING &data, LibItsIvim__TypesAndValues::UtIvimEventInd &msg, params_its *params) { - loggers::get_instance().log_to_hexa(">>> uppertester_ivim_codec::decode: decoding_buffer=", data); +int uppertester_ivim_codec::decode(const OCTETSTRING &p_data, LibItsIvim__TypesAndValues::UtIvimEventInd &msg, params_its *params) { + loggers::get_instance().log_to_hexa(">>> uppertester_ivim_codec::decode: decoding_buffer=", p_data); - const uint8_t *ptr = static_cast(data) + 1; + const uint8_t *ptr = static_cast(p_data) + 1; OCTETSTRING os(2, ptr); ptr += 2; unsigned int length = oct2int(os); diff --git a/ccsrc/Protocols/UpperTester/uppertester_ivim_codec.hh b/ccsrc/Protocols/UpperTester/uppertester_ivim_codec.hh index 7099b8f..dad8e62 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_ivim_codec.hh +++ b/ccsrc/Protocols/UpperTester/uppertester_ivim_codec.hh @@ -43,11 +43,11 @@ public: uppertester_ivim_codec() : codec(){}; virtual ~uppertester_ivim_codec(){}; - virtual int encode(const Record_Type &, OCTETSTRING &data); - virtual int decode(const OCTETSTRING &data, Record_Type &, params_its *params = NULL); - std::unique_ptr decode(const OCTETSTRING &data, params_its *params = NULL); + virtual int encode(const Record_Type &, OCTETSTRING &p_data); + virtual int decode(const OCTETSTRING &p_data, Record_Type &, params_its *params = NULL); + std::unique_ptr decode(const OCTETSTRING &p_data, params_its *params = NULL); private: - int decode(const OCTETSTRING &data, LibItsIvim__TypesAndValues::UtIvimResults &msg, params_its *params = NULL); - int decode(const OCTETSTRING &data, LibItsIvim__TypesAndValues::UtIvimEventInd &msg, params_its *params = NULL); + int decode(const OCTETSTRING &p_data, LibItsIvim__TypesAndValues::UtIvimResults &msg, params_its *params = NULL); + int decode(const OCTETSTRING &p_data, LibItsIvim__TypesAndValues::UtIvimEventInd &msg, params_its *params = NULL); }; // End of class uppertester_ivim_codec diff --git a/ccsrc/Protocols/UpperTester/uppertester_ivim_layer.cc b/ccsrc/Protocols/UpperTester/uppertester_ivim_layer.cc index 1af03aa..3c73fa0 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_ivim_layer.cc +++ b/ccsrc/Protocols/UpperTester/uppertester_ivim_layer.cc @@ -52,16 +52,16 @@ void uppertester_ivim_layer::sendMsg(const LibItsIvim__TypesAndValues::UtIvimTer send_data(data, p_params); } -void uppertester_ivim_layer::send_data(OCTETSTRING &data, params &p_params) { - loggers::get_instance().log_msg(">>> uppertester_ivim_layer::send_data: ", data); +void uppertester_ivim_layer::send_data(OCTETSTRING &p_data, params &p_params) { + loggers::get_instance().log_msg(">>> uppertester_ivim_layer::send_data: ", p_data); // params.log(); - send_to_all_layers(data, p_params); + send_to_all_layers(p_data, p_params); } -void uppertester_ivim_layer::receive_data(OCTETSTRING &data, params &p_params) { - loggers::get_instance().log_msg(">>> uppertester_ivim_layer::receive_data: ", data); +void uppertester_ivim_layer::receive_data(OCTETSTRING &p_data, params &p_params) { + loggers::get_instance().log_msg(">>> uppertester_ivim_layer::receive_data: ", p_data); - std::unique_ptr r = _codec.decode(data); + std::unique_ptr r = _codec.decode(p_data); if (r.get() != nullptr) { // Pass it to the ports if any to_all_upper_ports(*r, p_params); diff --git a/ccsrc/Protocols/UpperTester/uppertester_ivim_layer.hh b/ccsrc/Protocols/UpperTester/uppertester_ivim_layer.hh index 8525662..642df6d 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_ivim_layer.hh +++ b/ccsrc/Protocols/UpperTester/uppertester_ivim_layer.hh @@ -38,6 +38,6 @@ public: void sendMsg(const LibItsIvim__TypesAndValues::UtIvimUpdate &send_par, params_its& p_params); void sendMsg(const LibItsIvim__TypesAndValues::UtIvimTermination &send_par, params_its& p_params); - virtual void send_data(OCTETSTRING &data, params& p_params); - virtual void receive_data(OCTETSTRING &data, params& info); + virtual void send_data(OCTETSTRING &p_data, params& p_params); + virtual void receive_data(OCTETSTRING &p_data, params& info); }; // End of class uppertester_ivim_layer diff --git a/ccsrc/Protocols/UpperTester/uppertester_mapem_spatem_codec.cc b/ccsrc/Protocols/UpperTester/uppertester_mapem_spatem_codec.cc index 8c526f2..6c8546a 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_mapem_spatem_codec.cc +++ b/ccsrc/Protocols/UpperTester/uppertester_mapem_spatem_codec.cc @@ -20,7 +20,7 @@ uint8_t uppertester_mapem_spatem_codec::c_utMapemSpatemTriggerResult = 0x7B; uint8_t uppertester_mapem_spatem_codec::c_utMapemEventIndication = 0x7C; uint8_t uppertester_mapem_spatem_codec::c_utSpatemEventIndication = 0x7D; -int uppertester_mapem_spatem_codec::encode(const Record_Type &msg, OCTETSTRING &data) { +int uppertester_mapem_spatem_codec::encode(const Record_Type &msg, OCTETSTRING &p_data) { loggers::get_instance().log_msg(">>> uppertester_mapem_spatem_codec::encode: ", (const Record_Type &)msg); TTCN_EncDec::clear_error(); @@ -40,13 +40,13 @@ int uppertester_mapem_spatem_codec::encode(const Record_Type &msg, OCTETSTRING & } encoding_buffer.put_c(flags); } else { // Error - data = OCTETSTRING(0, nullptr); + p_data = OCTETSTRING(0, nullptr); loggers::get_instance().log("<<< uppertester_mapem_spatem_codec::encode: Return -1"); return -1; } encode_(msg, *msg.get_descriptor(), encoding_buffer); - data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); - loggers::get_instance().log_msg("<<< uppertester_mapem_spatem_codec::encode: data=", data); + p_data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); + loggers::get_instance().log_msg("<<< uppertester_mapem_spatem_codec::encode: p_data=", p_data); return 0; } @@ -113,9 +113,9 @@ int uppertester_mapem_spatem_codec::encode_(const Base_Type &type, const TTCN_Ty return 0; } -int uppertester_mapem_spatem_codec::decode(const OCTETSTRING &data, Record_Type &msg, params_its *params) { +int uppertester_mapem_spatem_codec::decode(const OCTETSTRING &p_data, Record_Type &msg, params_its *params) { TTCN_EncDec::clear_error(); - TTCN_Buffer decoding_buffer(data); + TTCN_Buffer decoding_buffer(p_data); _params = params; loggers::get_instance().log_to_hexa(">>> uppertester_mapem_spatem_codec::decode: decoding_buffer=", decoding_buffer); @@ -125,32 +125,32 @@ int uppertester_mapem_spatem_codec::decode(const OCTETSTRING &data, Record_Type return 0; } -std::unique_ptr uppertester_mapem_spatem_codec::decode(const OCTETSTRING &data, params_its *params) { +std::unique_ptr uppertester_mapem_spatem_codec::decode(const OCTETSTRING &p_data, params_its *params) { std::unique_ptr result; - const uint8_t *ptr = static_cast(data); + const uint8_t *ptr = static_cast(p_data); if ((*ptr != uppertester_mapem_spatem_codec::c_utMapemEventIndication) && (*ptr != uppertester_mapem_spatem_codec::c_utSpatemEventIndication)) { LibItsMapemSpatem__TypesAndValues::UtMapemSpatemResults res; - decode(data, res, params); + decode(p_data, res, params); result.reset((Base_Type *)res.clone()); } else if (*ptr == uppertester_mapem_spatem_codec::c_utMapemEventIndication) { LibItsMapemSpatem__TypesAndValues::UtMapemEventInd ind; - decode(data, ind, params); + decode(p_data, ind, params); result.reset((Base_Type *)ind.clone()); } else { LibItsMapemSpatem__TypesAndValues::UtSpatemEventInd ind; - decode(data, ind, params); + decode(p_data, ind, params); result.reset((Base_Type *)ind.clone()); } return result; } -int uppertester_mapem_spatem_codec::decode(const OCTETSTRING &data, LibItsMapemSpatem__TypesAndValues::UtMapemSpatemResults &msg, params_its *params) { - loggers::get_instance().log_to_hexa(">>> uppertester_mapem_spatem_codec::decode: decoding_buffer=", data); +int uppertester_mapem_spatem_codec::decode(const OCTETSTRING &p_data, LibItsMapemSpatem__TypesAndValues::UtMapemSpatemResults &msg, params_its *params) { + loggers::get_instance().log_to_hexa(">>> uppertester_mapem_spatem_codec::decode: decoding_buffer=", p_data); - const uint8_t *ptr = static_cast(data); + const uint8_t *ptr = static_cast(p_data); if (*ptr == uppertester_mapem_spatem_codec::c_utMapemSpatemInitializeResult) { msg.utMapemSpatemInitializeResult() = BOOLEAN(*(ptr + 1) == 0x01); } else if (*ptr == uppertester_mapem_spatem_codec::c_utMapemSpatemTriggerResult) { @@ -163,10 +163,10 @@ int uppertester_mapem_spatem_codec::decode(const OCTETSTRING &data, LibItsMapemS return 0; } -int uppertester_mapem_spatem_codec::decode(const OCTETSTRING &data, LibItsMapemSpatem__TypesAndValues::UtMapemEventInd &msg, params_its *params) { - loggers::get_instance().log_to_hexa(">>> uppertester_mapem_spatem_codec::decode: decoding_buffer=", data); +int uppertester_mapem_spatem_codec::decode(const OCTETSTRING &p_data, LibItsMapemSpatem__TypesAndValues::UtMapemEventInd &msg, params_its *params) { + loggers::get_instance().log_to_hexa(">>> uppertester_mapem_spatem_codec::decode: decoding_buffer=", p_data); - const uint8_t *ptr = static_cast(data) + 1; + const uint8_t *ptr = static_cast(p_data) + 1; OCTETSTRING os(2, ptr); ptr += 2; unsigned int length = oct2int(os); @@ -180,10 +180,10 @@ int uppertester_mapem_spatem_codec::decode(const OCTETSTRING &data, LibItsMapemS return 0; } -int uppertester_mapem_spatem_codec::decode(const OCTETSTRING &data, LibItsMapemSpatem__TypesAndValues::UtSpatemEventInd &msg, params_its *params) { - loggers::get_instance().log_to_hexa(">>> uppertester_mapem_spatem_codec::decode: decoding_buffer=", data); +int uppertester_mapem_spatem_codec::decode(const OCTETSTRING &p_data, LibItsMapemSpatem__TypesAndValues::UtSpatemEventInd &msg, params_its *params) { + loggers::get_instance().log_to_hexa(">>> uppertester_mapem_spatem_codec::decode: decoding_buffer=", p_data); - const uint8_t *ptr = static_cast(data) + 1; + const uint8_t *ptr = static_cast(p_data) + 1; OCTETSTRING os(2, ptr); ptr += 2; unsigned int length = oct2int(os); diff --git a/ccsrc/Protocols/UpperTester/uppertester_mapem_spatem_codec.hh b/ccsrc/Protocols/UpperTester/uppertester_mapem_spatem_codec.hh index 3f64f3b..38430b7 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_mapem_spatem_codec.hh +++ b/ccsrc/Protocols/UpperTester/uppertester_mapem_spatem_codec.hh @@ -41,12 +41,12 @@ public: uppertester_mapem_spatem_codec() : codec(){}; virtual ~uppertester_mapem_spatem_codec(){}; - virtual int encode(const Record_Type &, OCTETSTRING &data); - virtual int decode(const OCTETSTRING &data, Record_Type &, params_its *params = NULL); - std::unique_ptr decode(const OCTETSTRING &data, params_its *params = NULL); + virtual int encode(const Record_Type &, OCTETSTRING &p_data); + virtual int decode(const OCTETSTRING &p_data, Record_Type &, params_its *params = NULL); + std::unique_ptr decode(const OCTETSTRING &p_data, params_its *params = NULL); private: - int decode(const OCTETSTRING &data, LibItsMapemSpatem__TypesAndValues::UtMapemSpatemResults &msg, params_its *params = NULL); - int decode(const OCTETSTRING &data, LibItsMapemSpatem__TypesAndValues::UtMapemEventInd &msg, params_its *params = NULL); - int decode(const OCTETSTRING &data, LibItsMapemSpatem__TypesAndValues::UtSpatemEventInd &msg, params_its *params = NULL); + int decode(const OCTETSTRING &p_data, LibItsMapemSpatem__TypesAndValues::UtMapemSpatemResults &msg, params_its *params = NULL); + int decode(const OCTETSTRING &p_data, LibItsMapemSpatem__TypesAndValues::UtMapemEventInd &msg, params_its *params = NULL); + int decode(const OCTETSTRING &p_data, LibItsMapemSpatem__TypesAndValues::UtSpatemEventInd &msg, params_its *params = NULL); }; // End of class uppertester_mapem_spatem_codec diff --git a/ccsrc/Protocols/UpperTester/uppertester_mbr_codec.cc b/ccsrc/Protocols/UpperTester/uppertester_mbr_codec.cc index 7641022..bc4c707 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_mbr_codec.cc +++ b/ccsrc/Protocols/UpperTester/uppertester_mbr_codec.cc @@ -18,7 +18,7 @@ uint8_t uppertester_mbr_codec::c_utMbrTrigger = 0xF0; uint8_t uppertester_mbr_codec::c_utMbrTriggerResult = 0xF1; uint8_t uppertester_mbr_codec::c_utMbrEventInd = 0xF2; -int uppertester_mbr_codec::encode(const Record_Type &msg, OCTETSTRING &data) { +int uppertester_mbr_codec::encode(const Record_Type &msg, OCTETSTRING &p_data) { loggers::get_instance().log_msg(">>> uppertester_mbr_codec::encode (1): ", (const Record_Type &)msg); TTCN_EncDec::clear_error(); @@ -26,17 +26,17 @@ int uppertester_mbr_codec::encode(const Record_Type &msg, OCTETSTRING &data) { if (std::string(msg.get_descriptor()->name).compare("@LibItsMbr_TypesAndValues.UtMbrInitialize") == 0) { encoding_buffer.put_c(static_cast(uppertester_mbr_codec::c_utMbrInitialize)); } else { // Error - data = OCTETSTRING(0, nullptr); + p_data = OCTETSTRING(0, nullptr); loggers::get_instance().warning("<<< uppertester_mbr_codec::encode: Failed to encode UT message"); return -1; } encode_(msg, *msg.get_descriptor(), encoding_buffer); - data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); - loggers::get_instance().log_msg("<<< uppertester_mbr_codec::encode: data=", data); + p_data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); + loggers::get_instance().log_msg("<<< uppertester_mbr_codec::encode: p_data=", p_data); return 0; } -int uppertester_mbr_codec::encode(const LibItsMbr__TypesAndValues::UtMbrTrigger &msg, OCTETSTRING &data) { +int uppertester_mbr_codec::encode(const LibItsMbr__TypesAndValues::UtMbrTrigger &msg, OCTETSTRING &p_data) { loggers::get_instance().log_msg(">>> uppertester_mbr_codec::encode (2): ", (const Record_Type &)msg); TTCN_EncDec::clear_error(); @@ -45,12 +45,12 @@ int uppertester_mbr_codec::encode(const LibItsMbr__TypesAndValues::UtMbrTrigger encoding_buffer.put_c(static_cast(uppertester_mbr_codec::c_utMbrTrigger)); encoding_buffer.put_c(static_cast(msg.targetId())); encoding_buffer.put_c(static_cast(msg.cause())); - data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); - loggers::get_instance().log_msg("<<< uppertester_mbr_codec::encode: data=", data); + p_data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); + loggers::get_instance().log_msg("<<< uppertester_mbr_codec::encode: p_data=", p_data); return 0; } -int uppertester_mbr_codec::encode(const LibItsMbr__TypesAndValues::UtMbrEventInd &msg, OCTETSTRING &data) { +int uppertester_mbr_codec::encode(const LibItsMbr__TypesAndValues::UtMbrEventInd &msg, OCTETSTRING &p_data) { loggers::get_instance().log_msg(">>> uppertester_mbr_codec::encode (3): ", (const Record_Type &)msg); TTCN_EncDec::clear_error(); @@ -59,8 +59,8 @@ int uppertester_mbr_codec::encode(const LibItsMbr__TypesAndValues::UtMbrEventInd encoding_buffer.put_c(static_cast(uppertester_mbr_codec::c_utMbrEventInd)); loggers::get_instance().error("uppertester_mbr_codec::encode: To be implemented"); // encoding_buffer.put_c(static_cast(msg.state())); - data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); - loggers::get_instance().log_msg("<<< uppertester_mbr_codec::encode: data=", data); + p_data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); + loggers::get_instance().log_msg("<<< uppertester_mbr_codec::encode: p_data=", p_data); return 0; } @@ -98,9 +98,9 @@ int uppertester_mbr_codec::encode_(const Base_Type &type, const TTCN_Typedescrip return 0; } -int uppertester_mbr_codec::decode(const OCTETSTRING &data, Record_Type &msg, params_its *params) { +int uppertester_mbr_codec::decode(const OCTETSTRING &p_data, Record_Type &msg, params_its *params) { TTCN_EncDec::clear_error(); - TTCN_Buffer decoding_buffer(data); + TTCN_Buffer decoding_buffer(p_data); _params = params; loggers::get_instance().log_to_hexa(">>> uppertester_mbr_codec::decode: decoding_buffer=", decoding_buffer); @@ -110,11 +110,11 @@ int uppertester_mbr_codec::decode(const OCTETSTRING &data, Record_Type &msg, par return 0; } -std::unique_ptr uppertester_mbr_codec::decode(const OCTETSTRING &data, params_its *params) { +std::unique_ptr uppertester_mbr_codec::decode(const OCTETSTRING &p_data, params_its *params) { std::unique_ptr result; - const uint8_t * ptr = static_cast(data); + const uint8_t * ptr = static_cast(p_data); if (*ptr == uppertester_mbr_codec::c_utMbrInitializeResult) { LibItsMbr__TypesAndValues::UtMbrResults msg; msg.utMbrInitializeResult() = BOOLEAN(*(ptr + 1) == 0x01); diff --git a/ccsrc/Protocols/UpperTester/uppertester_mbr_codec.hh b/ccsrc/Protocols/UpperTester/uppertester_mbr_codec.hh index 3d5c137..b8fa17d 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_mbr_codec.hh +++ b/ccsrc/Protocols/UpperTester/uppertester_mbr_codec.hh @@ -41,9 +41,9 @@ public: uppertester_mbr_codec() : codec(){}; virtual ~uppertester_mbr_codec(){}; - virtual int encode(const Record_Type &, OCTETSTRING &data); - int encode(const LibItsMbr__TypesAndValues::UtMbrTrigger &, OCTETSTRING &data); - int encode(const LibItsMbr__TypesAndValues::UtMbrEventInd &, OCTETSTRING &data); - virtual int decode(const OCTETSTRING &data, Record_Type &, params_its *params = NULL); - std::unique_ptr decode(const OCTETSTRING &data, params_its *params = NULL); + virtual int encode(const Record_Type &, OCTETSTRING &p_data); + int encode(const LibItsMbr__TypesAndValues::UtMbrTrigger &, OCTETSTRING &p_data); + int encode(const LibItsMbr__TypesAndValues::UtMbrEventInd &, OCTETSTRING &p_data); + virtual int decode(const OCTETSTRING &p_data, Record_Type &, params_its *params = NULL); + std::unique_ptr decode(const OCTETSTRING &p_data, params_its *params = NULL); }; // End of class uppertester_mbr_codec diff --git a/ccsrc/Protocols/UpperTester/uppertester_mbr_layer.cc b/ccsrc/Protocols/UpperTester/uppertester_mbr_layer.cc index 1a90041..940143e 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_mbr_layer.cc +++ b/ccsrc/Protocols/UpperTester/uppertester_mbr_layer.cc @@ -64,16 +64,16 @@ void uppertester_mbr_layer::sendMsg(const LibItsMbr__TypesAndValues::UtMbrEventI } } -void uppertester_mbr_layer::send_data(OCTETSTRING &data, params &p_params) { - loggers::get_instance().log_msg(">>> uppertester_mbr_layer::send_data: ", data); +void uppertester_mbr_layer::send_data(OCTETSTRING &p_data, params &p_params) { + loggers::get_instance().log_msg(">>> uppertester_mbr_layer::send_data: ", p_data); // params.log(); - send_to_all_layers(data, p_params); + send_to_all_layers(p_data, p_params); } -void uppertester_mbr_layer::receive_data(OCTETSTRING &data, params &p_params) { - loggers::get_instance().log_msg(">>> uppertester_mbr_layer::receive_data: ", data); +void uppertester_mbr_layer::receive_data(OCTETSTRING &p_data, params &p_params) { + loggers::get_instance().log_msg(">>> uppertester_mbr_layer::receive_data: ", p_data); - std::unique_ptr r = _codec.decode(data); + std::unique_ptr r = _codec.decode(p_data); if (r.get() != nullptr) { // Pass it to the ports if any to_all_upper_ports(*r, p_params); diff --git a/ccsrc/Protocols/UpperTester/uppertester_mbr_layer.hh b/ccsrc/Protocols/UpperTester/uppertester_mbr_layer.hh index ac2b6f2..08b61a8 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_mbr_layer.hh +++ b/ccsrc/Protocols/UpperTester/uppertester_mbr_layer.hh @@ -37,6 +37,6 @@ public: void sendMsg(const LibItsMbr__TypesAndValues::UtMbrTrigger &send_par, params& p_params); void sendMsg(const LibItsMbr__TypesAndValues::UtMbrEventInd &send_par, params& p_params); - virtual void send_data(OCTETSTRING &data, params& p_params); - virtual void receive_data(OCTETSTRING &data, params& params); + virtual void send_data(OCTETSTRING &p_data, params& p_params); + virtual void receive_data(OCTETSTRING &p_data, params& params); }; // End of class uppertester_mbr_layer diff --git a/ccsrc/Protocols/UpperTester/uppertester_pim_codec.cc b/ccsrc/Protocols/UpperTester/uppertester_pim_codec.cc index 4e2d026..007b24f 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_pim_codec.cc +++ b/ccsrc/Protocols/UpperTester/uppertester_pim_codec.cc @@ -17,7 +17,7 @@ uint8_t uppertester_pim_codec::c_utPimTrigger = 0x03; uint8_t uppertester_pim_codec::c_utPimTriggerResult = 0x21; uint8_t uppertester_pim_codec::c_utPimEventInd = 0x23; -int uppertester_pim_codec::encode(const Record_Type &msg, OCTETSTRING &data) { +int uppertester_pim_codec::encode(const Record_Type &msg, OCTETSTRING &p_data) { loggers::get_instance().log_msg(">>> uppertester_pim_codec::encode: ", (const Record_Type &)msg); TTCN_EncDec::clear_error(); @@ -25,17 +25,17 @@ int uppertester_pim_codec::encode(const Record_Type &msg, OCTETSTRING &data) { if (std::string(msg.get_descriptor()->name).compare("@LibItsPim_TypesAndValues.UtPimInitialize") == 0) { encoding_buffer.put_c(static_cast(uppertester_pim_codec::c_utPimInitialize)); } else { // Error - data = OCTETSTRING(0, nullptr); + p_data = OCTETSTRING(0, nullptr); loggers::get_instance().warning("<<< uppertester_pim_codec::encode: Failed to encode UT message"); return -1; } encode_(msg, *msg.get_descriptor(), encoding_buffer); - data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); - loggers::get_instance().log_msg("<<< uppertester_pim_codec::encode: data=", data); + p_data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); + loggers::get_instance().log_msg("<<< uppertester_pim_codec::encode: p_data=", p_data); return 0; } -int uppertester_pim_codec::encode(const LibItsPim__TypesAndValues::UtPimTrigger &msg, OCTETSTRING &data) { +int uppertester_pim_codec::encode(const LibItsPim__TypesAndValues::UtPimTrigger &msg, OCTETSTRING &p_data) { loggers::get_instance().log_msg(">>> uppertester_pim_codec::encode: ", (const Record_Type &)msg); TTCN_EncDec::clear_error(); @@ -44,8 +44,8 @@ int uppertester_pim_codec::encode(const LibItsPim__TypesAndValues::UtPimTrigger const LibItsPim__TypesAndValues::UtPimTrigger &u = static_cast(msg); // // encode_(*type, *type->get_descriptor(), encoding_buffer); - // data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); - // loggers::get_instance().log_msg("<<< uppertester_pim_codec::encode: data=", data); + // p_data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); + // loggers::get_instance().log_msg("<<< uppertester_pim_codec::encode: p_data=", p_data); // return 0; return -1; } @@ -60,9 +60,9 @@ int uppertester_pim_codec::encode_(const Base_Type &type, const TTCN_Typedescrip return -1; } -int uppertester_pim_codec::decode(const OCTETSTRING &data, Record_Type &msg, params_its *params) { +int uppertester_pim_codec::decode(const OCTETSTRING &p_data, Record_Type &msg, params_its *params) { TTCN_EncDec::clear_error(); - TTCN_Buffer decoding_buffer(data); + TTCN_Buffer decoding_buffer(p_data); _params = params; loggers::get_instance().log_to_hexa(">>> uppertester_pim_codec::decode: decoding_buffer=", decoding_buffer); @@ -72,31 +72,31 @@ int uppertester_pim_codec::decode(const OCTETSTRING &data, Record_Type &msg, par return 0; } -std::unique_ptr uppertester_pim_codec::decode(const OCTETSTRING &data, params_its *params) { +std::unique_ptr uppertester_pim_codec::decode(const OCTETSTRING &p_data, params_its *params) { std::unique_ptr result; - const uint8_t *ptr = static_cast(data); + const uint8_t *ptr = static_cast(p_data); if (*ptr != uppertester_pim_codec::c_utPimEventInd) { LibItsPim__TypesAndValues::UtPimResults res; - if (decode(data, res, params) == 0) { + if (decode(p_data, res, params) == 0) { result.reset((Base_Type *)res.clone()); } else { result.reset(nullptr); } } else { LibItsPim__TypesAndValues::UtPimEventInd ind; - decode(data, ind, params); + decode(p_data, ind, params); result.reset((Base_Type *)ind.clone()); } return result; } -int uppertester_pim_codec::decode(const OCTETSTRING &data, LibItsPim__TypesAndValues::UtPimResults &msg, params_its *params) { - loggers::get_instance().log_to_hexa(">>> uppertester_pim_codec::decode: decoding_buffer=", data); +int uppertester_pim_codec::decode(const OCTETSTRING &p_data, LibItsPim__TypesAndValues::UtPimResults &msg, params_its *params) { + loggers::get_instance().log_to_hexa(">>> uppertester_pim_codec::decode: decoding_buffer=", p_data); - const uint8_t *ptr = static_cast(data); + const uint8_t *ptr = static_cast(p_data); if (*ptr == uppertester_pim_codec::c_utPimInitializeResult) { msg.utPimInitializeResult() = BOOLEAN(*(ptr + 1) == 0x01); } else if (*ptr == uppertester_pim_codec::c_utPimTriggerResult) { @@ -113,15 +113,15 @@ int uppertester_pim_codec::decode(const OCTETSTRING &data, LibItsPim__TypesAndVa return 0; } -int uppertester_pim_codec::decode(const OCTETSTRING &data, LibItsPim__TypesAndValues::UtPimEventInd &msg, params_its *params) { - loggers::get_instance().log_to_hexa(">>> uppertester_pim_codec::decode (1): decoding_buffer=", data); +int uppertester_pim_codec::decode(const OCTETSTRING &p_data, LibItsPim__TypesAndValues::UtPimEventInd &msg, params_its *params) { + loggers::get_instance().log_to_hexa(">>> uppertester_pim_codec::decode (1): decoding_buffer=", p_data); - const uint8_t *ptr = static_cast(data) + 1; + const uint8_t *ptr = static_cast(p_data) + 1; OCTETSTRING os(2, ptr); const unsigned int length = (const unsigned int)((*ptr << 8 & 0xff00) | *(ptr + 1)); ptr += 2; loggers::get_instance().log("uppertester_pim_codec::decode (1): PIM message length=%d", length); - if (data.lengthof() - 3 != (const int)length) { + if (p_data.lengthof() - 3 != (const int)length) { loggers::get_instance().warning("uppertester_pim_codec::decode (1) (4): Wrong payload length: %d", length); return -1; } diff --git a/ccsrc/Protocols/UpperTester/uppertester_pim_codec.hh b/ccsrc/Protocols/UpperTester/uppertester_pim_codec.hh index 5ddad89..b1935ba 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_pim_codec.hh +++ b/ccsrc/Protocols/UpperTester/uppertester_pim_codec.hh @@ -41,12 +41,12 @@ public: uppertester_pim_codec() : codec(){}; virtual ~uppertester_pim_codec(){}; - virtual int encode(const Record_Type &, OCTETSTRING &data); - int encode(const LibItsPim__TypesAndValues::UtPimTrigger &, OCTETSTRING &data); - virtual int decode(const OCTETSTRING &data, Record_Type &, params_its *params = NULL); - std::unique_ptr decode(const OCTETSTRING &data, params_its *params = NULL); + virtual int encode(const Record_Type &, OCTETSTRING &p_data); + int encode(const LibItsPim__TypesAndValues::UtPimTrigger &, OCTETSTRING &p_data); + virtual int decode(const OCTETSTRING &p_data, Record_Type &, params_its *params = NULL); + std::unique_ptr decode(const OCTETSTRING &p_data, params_its *params = NULL); private: - int decode(const OCTETSTRING &data, LibItsPim__TypesAndValues::UtPimResults &msg, params_its *params = NULL); - int decode(const OCTETSTRING &data, LibItsPim__TypesAndValues::UtPimEventInd &msg, params_its *params = NULL); + int decode(const OCTETSTRING &p_data, LibItsPim__TypesAndValues::UtPimResults &msg, params_its *params = NULL); + int decode(const OCTETSTRING &p_data, LibItsPim__TypesAndValues::UtPimEventInd &msg, params_its *params = NULL); }; // End of class uppertester_pim_codec diff --git a/ccsrc/Protocols/UpperTester/uppertester_pim_layer.cc b/ccsrc/Protocols/UpperTester/uppertester_pim_layer.cc index f8d39b3..b236a6d 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_pim_layer.cc +++ b/ccsrc/Protocols/UpperTester/uppertester_pim_layer.cc @@ -48,16 +48,16 @@ void uppertester_pim_layer::sendMsg(const LibItsPim__TypesAndValues::UtPimTrigge } } -void uppertester_pim_layer::send_data(OCTETSTRING &data, params &p_params) { - loggers::get_instance().log_msg(">>> uppertester_pim_layer::send_data: ", data); +void uppertester_pim_layer::send_data(OCTETSTRING &p_data, params &p_params) { + loggers::get_instance().log_msg(">>> uppertester_pim_layer::send_data: ", p_data); // params.log(); - send_to_all_layers(data, p_params); + send_to_all_layers(p_data, p_params); } -void uppertester_pim_layer::receive_data(OCTETSTRING &data, params &p_params) { - loggers::get_instance().log_msg(">>> uppertester_pim_layer::receive_data: ", data); +void uppertester_pim_layer::receive_data(OCTETSTRING &p_data, params &p_params) { + loggers::get_instance().log_msg(">>> uppertester_pim_layer::receive_data: ", p_data); - std::unique_ptr r = _codec.decode(data); + std::unique_ptr r = _codec.decode(p_data); if (r.get() != nullptr) { // Pass it to the ports if any to_all_upper_ports(*r, p_params); diff --git a/ccsrc/Protocols/UpperTester/uppertester_pim_layer.hh b/ccsrc/Protocols/UpperTester/uppertester_pim_layer.hh index 697d9d2..d517907 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_pim_layer.hh +++ b/ccsrc/Protocols/UpperTester/uppertester_pim_layer.hh @@ -36,6 +36,6 @@ public: void sendMsg(const LibItsPim__TypesAndValues::UtPimInitialize &send_par, params_its& p_params); void sendMsg(const LibItsPim__TypesAndValues::UtPimTrigger &send_par, params_its& p_params); - virtual void send_data(OCTETSTRING &data, params& p_params); - virtual void receive_data(OCTETSTRING &data, params& p_params); + virtual void send_data(OCTETSTRING &p_data, params& p_params); + virtual void receive_data(OCTETSTRING &p_data, params& p_params); }; // End of class uppertester_pim_layer diff --git a/ccsrc/Protocols/UpperTester/uppertester_pki_codec.cc b/ccsrc/Protocols/UpperTester/uppertester_pki_codec.cc index b8a1ee1..c999e01 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_pki_codec.cc +++ b/ccsrc/Protocols/UpperTester/uppertester_pki_codec.cc @@ -19,7 +19,7 @@ uint8_t uppertester_pki_codec::c_utPkiTriggerAuthorizationRequest = 0xD1; uint8_t uppertester_pki_codec::c_utPkiTriggerResult = 0xD2; uint8_t uppertester_pki_codec::c_utPkiTriggerInd = 0xD3; -int uppertester_pki_codec::encode(const Record_Type &msg, OCTETSTRING &data) { +int uppertester_pki_codec::encode(const Record_Type &msg, OCTETSTRING &p_data) { loggers::get_instance().log_msg(">>> uppertester_pki_codec::encode (1): ", (const Record_Type &)msg); TTCN_EncDec::clear_error(); @@ -27,17 +27,17 @@ int uppertester_pki_codec::encode(const Record_Type &msg, OCTETSTRING &data) { if (std::string(msg.get_descriptor()->name).compare("@LibItsPki_TypesAndValues.UtPkiInitialize") == 0) { encoding_buffer.put_c(static_cast(uppertester_pki_codec::c_utPkiInitialize)); } else { // Error - data = OCTETSTRING(0, nullptr); + p_data = OCTETSTRING(0, nullptr); loggers::get_instance().warning("<<< uppertester_pki_codec::encode: Failed to encode UT message"); return -1; } encode_(msg, *msg.get_descriptor(), encoding_buffer); - data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); - loggers::get_instance().log_msg("<<< uppertester_pki_codec::encode: data=", data); + p_data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); + loggers::get_instance().log_msg("<<< uppertester_pki_codec::encode: p_data=", p_data); return 0; } -int uppertester_pki_codec::encode(const LibItsPki__TypesAndValues::UtPkiTrigger &msg, OCTETSTRING &data) { +int uppertester_pki_codec::encode(const LibItsPki__TypesAndValues::UtPkiTrigger &msg, OCTETSTRING &p_data) { loggers::get_instance().log_msg(">>> uppertester_pki_codec::encode (2): ", (const Record_Type &)msg); TTCN_EncDec::clear_error(); @@ -55,17 +55,17 @@ int uppertester_pki_codec::encode(const LibItsPki__TypesAndValues::UtPkiTrigger } else if (u.ischosen(LibItsPki__TypesAndValues::UtPkiTrigger::ALT_triggerAuthorizationRequest)) { encoding_buffer.put_c(static_cast(uppertester_pki_codec::c_utPkiTriggerAuthorizationRequest)); } else { // Error - data = OCTETSTRING(0, nullptr); + p_data = OCTETSTRING(0, nullptr); loggers::get_instance().warning("<<< uppertester_pki_codec::encode: Failed to encode UT message"); return -1; } // encode_(*type, *type->get_descriptor(), encoding_buffer); - data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); - loggers::get_instance().log_msg("<<< uppertester_pki_codec::encode: data=", data); + p_data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); + loggers::get_instance().log_msg("<<< uppertester_pki_codec::encode: p_data=", p_data); return 0; } -int uppertester_pki_codec::encode(const LibItsPki__TypesAndValues::UtPkiTriggerInd &msg, OCTETSTRING &data) { +int uppertester_pki_codec::encode(const LibItsPki__TypesAndValues::UtPkiTriggerInd &msg, OCTETSTRING &p_data) { loggers::get_instance().log_msg(">>> uppertester_pki_codec::encode (3): ", (const Record_Type &)msg); TTCN_EncDec::clear_error(); @@ -73,8 +73,8 @@ int uppertester_pki_codec::encode(const LibItsPki__TypesAndValues::UtPkiTriggerI // const Record_Type *type; encoding_buffer.put_c(static_cast(uppertester_pki_codec::c_utPkiTriggerInd)); encoding_buffer.put_c(static_cast(msg.state())); - data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); - loggers::get_instance().log_msg("<<< uppertester_pki_codec::encode: data=", data); + p_data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); + loggers::get_instance().log_msg("<<< uppertester_pki_codec::encode: p_data=", p_data); return 0; } @@ -112,9 +112,9 @@ int uppertester_pki_codec::encode_(const Base_Type &type, const TTCN_Typedescrip return 0; } -int uppertester_pki_codec::decode(const OCTETSTRING &data, Record_Type &msg, params_its *params) { +int uppertester_pki_codec::decode(const OCTETSTRING &p_data, Record_Type &msg, params_its *params) { TTCN_EncDec::clear_error(); - TTCN_Buffer decoding_buffer(data); + TTCN_Buffer decoding_buffer(p_data); _params = params; loggers::get_instance().log_to_hexa(">>> uppertester_pki_codec::decode: decoding_buffer=", decoding_buffer); @@ -124,11 +124,11 @@ int uppertester_pki_codec::decode(const OCTETSTRING &data, Record_Type &msg, par return 0; } -std::unique_ptr uppertester_pki_codec::decode(const OCTETSTRING &data, params_its *params) { +std::unique_ptr uppertester_pki_codec::decode(const OCTETSTRING &p_data, params_its *params) { std::unique_ptr result; - const uint8_t * ptr = static_cast(data); + const uint8_t * ptr = static_cast(p_data); if (*ptr == uppertester_pki_codec::c_utPkiInitializeResult) { LibItsPki__TypesAndValues::UtPkiResults msg; msg.utPkiInitializeResult() = BOOLEAN(*(ptr + 1) == 0x01); diff --git a/ccsrc/Protocols/UpperTester/uppertester_pki_codec.hh b/ccsrc/Protocols/UpperTester/uppertester_pki_codec.hh index d039561..fc95d1a 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_pki_codec.hh +++ b/ccsrc/Protocols/UpperTester/uppertester_pki_codec.hh @@ -42,9 +42,9 @@ public: uppertester_pki_codec() : codec(){}; virtual ~uppertester_pki_codec(){}; - virtual int encode(const Record_Type &, OCTETSTRING &data); - int encode(const LibItsPki__TypesAndValues::UtPkiTrigger &, OCTETSTRING &data); - int encode(const LibItsPki__TypesAndValues::UtPkiTriggerInd &, OCTETSTRING &data); - virtual int decode(const OCTETSTRING &data, Record_Type &, params_its *params = NULL); - std::unique_ptr decode(const OCTETSTRING &data, params_its *params = NULL); + virtual int encode(const Record_Type &, OCTETSTRING &p_data); + int encode(const LibItsPki__TypesAndValues::UtPkiTrigger &, OCTETSTRING &p_data); + int encode(const LibItsPki__TypesAndValues::UtPkiTriggerInd &, OCTETSTRING &p_data); + virtual int decode(const OCTETSTRING &p_data, Record_Type &, params_its *params = NULL); + std::unique_ptr decode(const OCTETSTRING &p_data, params_its *params = NULL); }; // End of class uppertester_pki_codec diff --git a/ccsrc/Protocols/UpperTester/uppertester_pki_layer.cc b/ccsrc/Protocols/UpperTester/uppertester_pki_layer.cc index 4676dd8..d8913f3 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_pki_layer.cc +++ b/ccsrc/Protocols/UpperTester/uppertester_pki_layer.cc @@ -64,16 +64,16 @@ void uppertester_pki_layer::sendMsg(const LibItsPki__TypesAndValues::UtPkiTrigge } } -void uppertester_pki_layer::send_data(OCTETSTRING &data, params &p_params) { - loggers::get_instance().log_msg(">>> uppertester_pki_layer::send_data: ", data); +void uppertester_pki_layer::send_data(OCTETSTRING &p_data, params &p_params) { + loggers::get_instance().log_msg(">>> uppertester_pki_layer::send_data: ", p_data); // params.log(); - send_to_all_layers(data, p_params); + send_to_all_layers(p_data, p_params); } -void uppertester_pki_layer::receive_data(OCTETSTRING &data, params &p_params) { - loggers::get_instance().log_msg(">>> uppertester_pki_layer::receive_data: ", data); +void uppertester_pki_layer::receive_data(OCTETSTRING &p_data, params &p_params) { + loggers::get_instance().log_msg(">>> uppertester_pki_layer::receive_data: ", p_data); - std::unique_ptr r = _codec.decode(data); + std::unique_ptr r = _codec.decode(p_data); if (r.get() != nullptr) { // Pass it to the ports if any to_all_upper_ports(*r, p_params); diff --git a/ccsrc/Protocols/UpperTester/uppertester_pki_layer.hh b/ccsrc/Protocols/UpperTester/uppertester_pki_layer.hh index 88d169b..3b8730a 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_pki_layer.hh +++ b/ccsrc/Protocols/UpperTester/uppertester_pki_layer.hh @@ -37,6 +37,6 @@ public: void sendMsg(const LibItsPki__TypesAndValues::UtPkiTrigger &send_par, params& p_params); void sendMsg(const LibItsPki__TypesAndValues::UtPkiTriggerInd &send_par, params& p_params); - virtual void send_data(OCTETSTRING &data, params& p_params); - virtual void receive_data(OCTETSTRING &data, params& params); + virtual void send_data(OCTETSTRING &p_data, params& p_params); + virtual void receive_data(OCTETSTRING &p_data, params& params); }; // End of class uppertester_pki_layer diff --git a/ccsrc/Protocols/UpperTester/uppertester_saem_codec.cc b/ccsrc/Protocols/UpperTester/uppertester_saem_codec.cc index 61d60c4..419f0e2 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_saem_codec.cc +++ b/ccsrc/Protocols/UpperTester/uppertester_saem_codec.cc @@ -17,7 +17,7 @@ uint8_t uppertester_saem_codec::c_utSaemTrigger = 0x03; uint8_t uppertester_saem_codec::c_utSaemTriggerResult = 0x21; uint8_t uppertester_saem_codec::c_utSaemEventInd = 0x23; -int uppertester_saem_codec::encode(const Record_Type &msg, OCTETSTRING &data) { +int uppertester_saem_codec::encode(const Record_Type &msg, OCTETSTRING &p_data) { loggers::get_instance().log_msg(">>> uppertester_saem_codec::encode: ", (const Record_Type &)msg); TTCN_EncDec::clear_error(); @@ -25,17 +25,17 @@ int uppertester_saem_codec::encode(const Record_Type &msg, OCTETSTRING &data) { if (std::string(msg.get_descriptor()->name).compare("@LibItsSaem_TypesAndValues.UtSaemInitialize") == 0) { encoding_buffer.put_c(static_cast(uppertester_saem_codec::c_utSaemInitialize)); } else { // Error - data = OCTETSTRING(0, nullptr); + p_data = OCTETSTRING(0, nullptr); loggers::get_instance().warning("<<< uppertester_saem_codec::encode: Failed to encode UT message"); return -1; } encode_(msg, *msg.get_descriptor(), encoding_buffer); - data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); - loggers::get_instance().log_msg("<<< uppertester_saem_codec::encode: data=", data); + p_data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); + loggers::get_instance().log_msg("<<< uppertester_saem_codec::encode: p_data=", p_data); return 0; } -int uppertester_saem_codec::encode(const LibItsSaem__TypesAndValues::UtSaemTrigger &msg, OCTETSTRING &data) { +int uppertester_saem_codec::encode(const LibItsSaem__TypesAndValues::UtSaemTrigger &msg, OCTETSTRING &p_data) { loggers::get_instance().log_msg(">>> uppertester_saem_codec::encode: ", (const Record_Type &)msg); TTCN_EncDec::clear_error(); @@ -44,8 +44,8 @@ int uppertester_saem_codec::encode(const LibItsSaem__TypesAndValues::UtSaemTrigg const LibItsSaem__TypesAndValues::UtSaemTrigger &u = static_cast(msg); // // encode_(*type, *type->get_descriptor(), encoding_buffer); - // data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); - // loggers::get_instance().log_msg("<<< uppertester_saem_codec::encode: data=", data); + // p_data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); + // loggers::get_instance().log_msg("<<< uppertester_saem_codec::encode: p_data=", p_data); // return 0; return -1; } @@ -60,9 +60,9 @@ int uppertester_saem_codec::encode_(const Base_Type &type, const TTCN_Typedescri return -1; } -int uppertester_saem_codec::decode(const OCTETSTRING &data, Record_Type &msg, params_its *params) { +int uppertester_saem_codec::decode(const OCTETSTRING &p_data, Record_Type &msg, params_its *params) { TTCN_EncDec::clear_error(); - TTCN_Buffer decoding_buffer(data); + TTCN_Buffer decoding_buffer(p_data); _params = params; loggers::get_instance().log_to_hexa(">>> uppertester_saem_codec::decode: decoding_buffer=", decoding_buffer); @@ -72,31 +72,31 @@ int uppertester_saem_codec::decode(const OCTETSTRING &data, Record_Type &msg, pa return 0; } -std::unique_ptr uppertester_saem_codec::decode(const OCTETSTRING &data, params_its *params) { +std::unique_ptr uppertester_saem_codec::decode(const OCTETSTRING &p_data, params_its *params) { std::unique_ptr result; - const uint8_t *ptr = static_cast(data); + const uint8_t *ptr = static_cast(p_data); if (*ptr != uppertester_saem_codec::c_utSaemEventInd) { LibItsSaem__TypesAndValues::UtSaemResults res; - if (decode(data, res, params) == 0) { + if (decode(p_data, res, params) == 0) { result.reset((Base_Type *)res.clone()); } else { result.reset(nullptr); } } else { LibItsSaem__TypesAndValues::UtSaemEventInd ind; - decode(data, ind, params); + decode(p_data, ind, params); result.reset((Base_Type *)ind.clone()); } return result; } -int uppertester_saem_codec::decode(const OCTETSTRING &data, LibItsSaem__TypesAndValues::UtSaemResults &msg, params_its *params) { - loggers::get_instance().log_to_hexa(">>> uppertester_saem_codec::decode: decoding_buffer=", data); +int uppertester_saem_codec::decode(const OCTETSTRING &p_data, LibItsSaem__TypesAndValues::UtSaemResults &msg, params_its *params) { + loggers::get_instance().log_to_hexa(">>> uppertester_saem_codec::decode: decoding_buffer=", p_data); - const uint8_t *ptr = static_cast(data); + const uint8_t *ptr = static_cast(p_data); if (*ptr == uppertester_saem_codec::c_utSaemInitializeResult) { msg.utSaemInitializeResult() = BOOLEAN(*(ptr + 1) == 0x01); } else if (*ptr == uppertester_saem_codec::c_utSaemTriggerResult) { @@ -113,15 +113,15 @@ int uppertester_saem_codec::decode(const OCTETSTRING &data, LibItsSaem__TypesAnd return 0; } -int uppertester_saem_codec::decode(const OCTETSTRING &data, LibItsSaem__TypesAndValues::UtSaemEventInd &msg, params_its *params) { - loggers::get_instance().log_to_hexa(">>> uppertester_saem_codec::decode (1): decoding_buffer=", data); +int uppertester_saem_codec::decode(const OCTETSTRING &p_data, LibItsSaem__TypesAndValues::UtSaemEventInd &msg, params_its *params) { + loggers::get_instance().log_to_hexa(">>> uppertester_saem_codec::decode (1): decoding_buffer=", p_data); - const uint8_t *ptr = static_cast(data) + 1; + const uint8_t *ptr = static_cast(p_data) + 1; OCTETSTRING os(2, ptr); const unsigned int length = (const unsigned int)((*ptr << 8 & 0xff00) | *(ptr + 1)); ptr += 2; loggers::get_instance().log("uppertester_saem_codec::decode (1): SAEM message length=%d", length); - if (data.lengthof() - 3 != (const int)length) { + if (p_data.lengthof() - 3 != (const int)length) { loggers::get_instance().warning("uppertester_saem_codec::decode (1) (4): Wrong payload length: %d", length); return -1; } diff --git a/ccsrc/Protocols/UpperTester/uppertester_saem_codec.hh b/ccsrc/Protocols/UpperTester/uppertester_saem_codec.hh index eaf4b3a..b6141ac 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_saem_codec.hh +++ b/ccsrc/Protocols/UpperTester/uppertester_saem_codec.hh @@ -41,12 +41,12 @@ public: uppertester_saem_codec() : codec(){}; virtual ~uppertester_saem_codec(){}; - virtual int encode(const Record_Type &, OCTETSTRING &data); - int encode(const LibItsSaem__TypesAndValues::UtSaemTrigger &, OCTETSTRING &data); - virtual int decode(const OCTETSTRING &data, Record_Type &, params_its *params = NULL); - std::unique_ptr decode(const OCTETSTRING &data, params_its *params = NULL); + virtual int encode(const Record_Type &, OCTETSTRING &p_data); + int encode(const LibItsSaem__TypesAndValues::UtSaemTrigger &, OCTETSTRING &p_data); + virtual int decode(const OCTETSTRING &p_data, Record_Type &, params_its *params = NULL); + std::unique_ptr decode(const OCTETSTRING &p_data, params_its *params = NULL); private: - int decode(const OCTETSTRING &data, LibItsSaem__TypesAndValues::UtSaemResults &msg, params_its *params = NULL); - int decode(const OCTETSTRING &data, LibItsSaem__TypesAndValues::UtSaemEventInd &msg, params_its *params = NULL); + int decode(const OCTETSTRING &p_data, LibItsSaem__TypesAndValues::UtSaemResults &msg, params_its *params = NULL); + int decode(const OCTETSTRING &p_data, LibItsSaem__TypesAndValues::UtSaemEventInd &msg, params_its *params = NULL); }; // End of class uppertester_saem_codec diff --git a/ccsrc/Protocols/UpperTester/uppertester_saem_layer.cc b/ccsrc/Protocols/UpperTester/uppertester_saem_layer.cc index 853afa3..c272865 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_saem_layer.cc +++ b/ccsrc/Protocols/UpperTester/uppertester_saem_layer.cc @@ -48,16 +48,16 @@ void uppertester_saem_layer::sendMsg(const LibItsSaem__TypesAndValues::UtSaemTri } } -void uppertester_saem_layer::send_data(OCTETSTRING &data, params &p_params) { - loggers::get_instance().log_msg(">>> uppertester_saem_layer::send_data: ", data); +void uppertester_saem_layer::send_data(OCTETSTRING &p_data, params &p_params) { + loggers::get_instance().log_msg(">>> uppertester_saem_layer::send_data: ", p_data); // params.log(); - send_to_all_layers(data, p_params); + send_to_all_layers(p_data, p_params); } -void uppertester_saem_layer::receive_data(OCTETSTRING &data, params &p_params) { - loggers::get_instance().log_msg(">>> uppertester_saem_layer::receive_data: ", data); +void uppertester_saem_layer::receive_data(OCTETSTRING &p_data, params &p_params) { + loggers::get_instance().log_msg(">>> uppertester_saem_layer::receive_data: ", p_data); - std::unique_ptr r = _codec.decode(data); + std::unique_ptr r = _codec.decode(p_data); if (r.get() != nullptr) { // Pass it to the ports if any to_all_upper_ports(*r, p_params); diff --git a/ccsrc/Protocols/UpperTester/uppertester_saem_layer.hh b/ccsrc/Protocols/UpperTester/uppertester_saem_layer.hh index 0b2831a..561f2d9 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_saem_layer.hh +++ b/ccsrc/Protocols/UpperTester/uppertester_saem_layer.hh @@ -36,6 +36,6 @@ public: void sendMsg(const LibItsSaem__TypesAndValues::UtSaemInitialize &send_par, params_its& p_params); void sendMsg(const LibItsSaem__TypesAndValues::UtSaemTrigger &send_par, params_its& p_params); - virtual void send_data(OCTETSTRING &data, params& p_params); - virtual void receive_data(OCTETSTRING &data, params& p_params); + virtual void send_data(OCTETSTRING &p_data, params& p_params); + virtual void receive_data(OCTETSTRING &p_data, params& p_params); }; // End of class uppertester_saem_layer diff --git a/ccsrc/Protocols/UpperTester/uppertester_vru_codec.cc b/ccsrc/Protocols/UpperTester/uppertester_vru_codec.cc index a843eea..cb5269f 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_vru_codec.cc +++ b/ccsrc/Protocols/UpperTester/uppertester_vru_codec.cc @@ -17,19 +17,19 @@ uint8_t uppertester_vru_codec::c_utVamTrigger = 0xF3; uint8_t uppertester_vru_codec::c_utVamTriggerResult = 0xF4; uint8_t uppertester_vru_codec::c_utVamEventInd = 0xF5; -int uppertester_vru_codec::encode(const LibItsVru__TypesAndValues::UtVamInitialize &r, OCTETSTRING &data) { +int uppertester_vru_codec::encode(const LibItsVru__TypesAndValues::UtVamInitialize &r, OCTETSTRING &p_data) { loggers::get_instance().log_msg(">>> uppertester_vru_codec::encode (1): ", r); TTCN_EncDec::clear_error(); TTCN_Buffer encoding_buffer; encoding_buffer.put_c(static_cast(uppertester_vru_codec::c_utVamInitialize)); encoding_buffer.put_string(r.hashedId8()); - data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); - loggers::get_instance().log_msg("<<< uppertester_vru_codec::encode (1): data=", data); + p_data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); + loggers::get_instance().log_msg("<<< uppertester_vru_codec::encode (1): p_data=", p_data); return 0; } -int uppertester_vru_codec::encode(const LibItsVru__TypesAndValues::UtVamTrigger &r, OCTETSTRING &data) { +int uppertester_vru_codec::encode(const LibItsVru__TypesAndValues::UtVamTrigger &r, OCTETSTRING &p_data) { loggers::get_instance().log_msg(">>> uppertester_vru_codec::encode (2): ", r); TTCN_EncDec::clear_error(); @@ -49,8 +49,8 @@ int uppertester_vru_codec::encode(const LibItsVru__TypesAndValues::UtVamTrigger } encoding_buffer.put_c(flags); encoding_buffer.put_string(val); - data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); - loggers::get_instance().log_msg("<<< uppertester_vru_codec::encode: data=", data); + p_data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data()); + loggers::get_instance().log_msg("<<< uppertester_vru_codec::encode: p_data=", p_data); return 0; } @@ -59,9 +59,9 @@ int uppertester_vru_codec::encode(const Record_Type &p_message, OCTETSTRING &p_d return -1; } -int uppertester_vru_codec::decode(const OCTETSTRING &data, Record_Type &msg, params_its *params) { +int uppertester_vru_codec::decode(const OCTETSTRING &p_data, Record_Type &msg, params_its *params) { TTCN_EncDec::clear_error(); - TTCN_Buffer decoding_buffer(data); + TTCN_Buffer decoding_buffer(p_data); _params = params; loggers::get_instance().log_to_hexa(">>> uppertester_vru_codec::decode: decoding_buffer=", decoding_buffer); @@ -71,31 +71,31 @@ int uppertester_vru_codec::decode(const OCTETSTRING &data, Record_Type &msg, par return 0; } -std::unique_ptr uppertester_vru_codec::decode(const OCTETSTRING &data, params_its *params) { +std::unique_ptr uppertester_vru_codec::decode(const OCTETSTRING &p_data, params_its *params) { std::unique_ptr result; - const uint8_t *ptr = static_cast(data); + const uint8_t *ptr = static_cast(p_data); if (*ptr != uppertester_vru_codec::c_utVamEventInd) { LibItsVru__TypesAndValues::UtVamResults res; - if (decode(data, res, params) == 0) { + if (decode(p_data, res, params) == 0) { result.reset((Base_Type *)res.clone()); } else { result.reset(nullptr); } } else { LibItsVru__TypesAndValues::UtVamEventInd ind; - decode(data, ind, params); + decode(p_data, ind, params); result.reset((Base_Type *)ind.clone()); } return result; } -int uppertester_vru_codec::decode(const OCTETSTRING &data, LibItsVru__TypesAndValues::UtVamResults &msg, params_its *params) { - loggers::get_instance().log_to_hexa(">>> uppertester_vru_codec::decode (3): decoding_buffer=", data); +int uppertester_vru_codec::decode(const OCTETSTRING &p_data, LibItsVru__TypesAndValues::UtVamResults &msg, params_its *params) { + loggers::get_instance().log_to_hexa(">>> uppertester_vru_codec::decode (3): decoding_buffer=", p_data); - const uint8_t *ptr = static_cast(data); + const uint8_t *ptr = static_cast(p_data); if (*ptr == uppertester_vru_codec::c_utVamInitializeResult) { msg.utVamInitializeResult() = BOOLEAN(*(ptr + 1) == 0x01); } else if (*ptr == uppertester_vru_codec::c_utVamTriggerResult) { @@ -109,15 +109,15 @@ int uppertester_vru_codec::decode(const OCTETSTRING &data, LibItsVru__TypesAndVa return 0; } -int uppertester_vru_codec::decode(const OCTETSTRING &data, LibItsVru__TypesAndValues::UtVamEventInd &msg, params_its *params) { - loggers::get_instance().log_to_hexa(">>> uppertester_vru_codec::decode (1): decoding_buffer=", data); +int uppertester_vru_codec::decode(const OCTETSTRING &p_data, LibItsVru__TypesAndValues::UtVamEventInd &msg, params_its *params) { + loggers::get_instance().log_to_hexa(">>> uppertester_vru_codec::decode (1): decoding_buffer=", p_data); - const uint8_t *ptr = static_cast(data) + 1; + const uint8_t *ptr = static_cast(p_data) + 1; OCTETSTRING os(2, ptr); const unsigned int length = (const unsigned int)((*ptr << 8 & 0xff00) | *(ptr + 1)); ptr += 2; loggers::get_instance().log("uppertester_vru_codec::decode (1): CPS message length=%d", length); - if (data.lengthof() - 3 != (const int)length) { + if (p_data.lengthof() - 3 != (const int)length) { loggers::get_instance().warning("uppertester_vru_codec::decode (1) (4): Wrong payload length: %d", length); return -1; } diff --git a/ccsrc/Protocols/UpperTester/uppertester_vru_codec.hh b/ccsrc/Protocols/UpperTester/uppertester_vru_codec.hh index 94678aa..4ff5bfb 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_vru_codec.hh +++ b/ccsrc/Protocols/UpperTester/uppertester_vru_codec.hh @@ -42,14 +42,14 @@ public: uppertester_vru_codec() : codec(){}; virtual ~uppertester_vru_codec(){}; - //virtual int encode(const Record_Type &, OCTETSTRING &data); - int encode(const LibItsVru__TypesAndValues::UtVamInitialize &, OCTETSTRING &data); - int encode(const LibItsVru__TypesAndValues::UtVamTrigger &, OCTETSTRING &data); + //virtual int encode(const Record_Type &, OCTETSTRING &p_data); + int encode(const LibItsVru__TypesAndValues::UtVamInitialize &, OCTETSTRING &p_data); + int encode(const LibItsVru__TypesAndValues::UtVamTrigger &, OCTETSTRING &p_data); int encode(const Record_Type &p_message, OCTETSTRING &p_data); - virtual int decode(const OCTETSTRING &data, Record_Type &, params_its *params = NULL); - std::unique_ptr decode(const OCTETSTRING &data, params_its *params = NULL); + virtual int decode(const OCTETSTRING &p_data, Record_Type &, params_its *params = NULL); + std::unique_ptr decode(const OCTETSTRING &p_data, params_its *params = NULL); private: - int decode(const OCTETSTRING &data, LibItsVru__TypesAndValues::UtVamResults &msg, params_its *params = NULL); - int decode(const OCTETSTRING &data, LibItsVru__TypesAndValues::UtVamEventInd &msg, params_its *params = NULL); + int decode(const OCTETSTRING &p_data, LibItsVru__TypesAndValues::UtVamResults &msg, params_its *params = NULL); + int decode(const OCTETSTRING &p_data, LibItsVru__TypesAndValues::UtVamEventInd &msg, params_its *params = NULL); }; // End of class uppertester_vru_codec diff --git a/ccsrc/Protocols/UpperTester/uppertester_vru_layer.cc b/ccsrc/Protocols/UpperTester/uppertester_vru_layer.cc index 6fead1b..79eb6dc 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_vru_layer.cc +++ b/ccsrc/Protocols/UpperTester/uppertester_vru_layer.cc @@ -48,16 +48,16 @@ void uppertester_vru_layer::sendMsg(const LibItsVru__TypesAndValues::UtVamTrigge } } -void uppertester_vru_layer::send_data(OCTETSTRING &data, params &p_params) { - loggers::get_instance().log_msg(">>> uppertester_vru_layer::send_data: ", data); +void uppertester_vru_layer::send_data(OCTETSTRING &p_data, params &p_params) { + loggers::get_instance().log_msg(">>> uppertester_vru_layer::send_data: ", p_data); // params.log(); - send_to_all_layers(data, p_params); + send_to_all_layers(p_data, p_params); } -void uppertester_vru_layer::receive_data(OCTETSTRING &data, params &p_params) { - loggers::get_instance().log_msg(">>> uppertester_vru_layer::receive_data: ", data); +void uppertester_vru_layer::receive_data(OCTETSTRING &p_data, params &p_params) { + loggers::get_instance().log_msg(">>> uppertester_vru_layer::receive_data: ", p_data); - std::unique_ptr r = _codec.decode(data); + std::unique_ptr r = _codec.decode(p_data); if (r.get() != nullptr) { // Pass it to the ports if any to_all_upper_ports(*r, p_params); diff --git a/ccsrc/Protocols/UpperTester/uppertester_vru_layer.hh b/ccsrc/Protocols/UpperTester/uppertester_vru_layer.hh index dcc5242..02e284b 100644 --- a/ccsrc/Protocols/UpperTester/uppertester_vru_layer.hh +++ b/ccsrc/Protocols/UpperTester/uppertester_vru_layer.hh @@ -37,6 +37,6 @@ public: void sendMsg(const LibItsVru__TypesAndValues::UtVamTrigger &send_par, params_its& p_params); - virtual void send_data(OCTETSTRING &data, params& p_params); - virtual void receive_data(OCTETSTRING &data, params& p_params); + virtual void send_data(OCTETSTRING &p_data, params& p_params); + virtual void receive_data(OCTETSTRING &p_data, params& p_params); }; // End of class uppertester_vru_layer diff --git a/ccsrc/Protocols/VRU/module.mk b/ccsrc/Protocols/VRU/module.mk index 44b83fc..2060227 100644 --- a/ccsrc/Protocols/VRU/module.mk +++ b/ccsrc/Protocols/VRU/module.mk @@ -1,2 +1,2 @@ -sources := vru_codec.cc vru_pdu_codec.cc +sources := vru_codec.cc includes := . diff --git a/ccsrc/Protocols/VRU/vru_codec.cc b/ccsrc/Protocols/VRU/vru_codec.cc index ebdcc06..4c6841f 100644 --- a/ccsrc/Protocols/VRU/vru_codec.cc +++ b/ccsrc/Protocols/VRU/vru_codec.cc @@ -1,27 +1,30 @@ #include "vru_codec.hh" #include "LibItsVru_TypesAndValues.hh" -#include "asn1/asn_application.h" // from asn1c +#include "LibItsVru_EncdecDeclarations.hh" #include "loggers.hh" -int vru_codec::encode(const VAM__PDU__Descriptions::VAM &vru, OCTETSTRING &data) { +int vru_codec::encode(const VAM__PDU__Descriptions::VAM &vru, OCTETSTRING &p_data) { loggers::get_instance().log(">>> vru_codec::encode"); - BITSTRING b; - int rc = asn_codec.encode(vru, b); - if (rc != -1) { - data = bit2oct(b); - loggers::get_instance().log_msg("vru_codec::encode: ", data); + BITSTRING bs = LibItsVru__EncdecDeclarations::fx__enc__VAM(vru); + if (!bs.is_bound()) { + loggers::get_instance().error("vru_codec::encode: Failed to encode VAM value"); + return -1; } - return rc; + + p_data = bit2oct(bs); + return 0; } -int vru_codec::decode(const OCTETSTRING &data, VAM__PDU__Descriptions::VAM &vru, params_its *params) { - loggers::get_instance().log_msg(">>> vru_codec::decode: ", data); +int vru_codec::decode(const OCTETSTRING &p_data, VAM__PDU__Descriptions::VAM &vru, params_its *params) { + loggers::get_instance().log_msg(">>> vru_codec::decode: ", p_data); + + BITSTRING bs = oct2bit(p_data); + int result = static_cast(LibItsVru__EncdecDeclarations::fx__dec__VAM(bs, vru)); + if (result != 0) { + loggers::get_instance().error("vru_codec::decode: Failed to decode VAM PDU"); + return -1; + } - int rc = asn_codec.decode(oct2bit(data), vru); - loggers::get_instance().log("vru_codec::decode: ASN.1 codec returned %d", rc); - // if (rc != -1) { - // loggers::get_instance().log_msg("vru_codec::decode: ", static_cast(vru)); - // } - return rc; + return 0; } diff --git a/ccsrc/Protocols/VRU/vru_codec.hh b/ccsrc/Protocols/VRU/vru_codec.hh index 75272bd..c8df8a7 100644 --- a/ccsrc/Protocols/VRU/vru_codec.hh +++ b/ccsrc/Protocols/VRU/vru_codec.hh @@ -1,6 +1,5 @@ #pragma once -#include "vru_pdu_codec.hh" #include "codec.hh" #include "params_its.hh" @@ -12,12 +11,11 @@ namespace VAM__PDU__Descriptions { //! Forward declaration of asn1c VRU class } class vru_codec : public codec { - vru_pdu_codec asn_codec; public: - explicit vru_codec() : codec(), asn_codec(){}; + explicit vru_codec() : codec() {}; virtual ~vru_codec(){}; - virtual int encode(const VAM__PDU__Descriptions::VAM &vru, OCTETSTRING &data); - virtual int decode(const OCTETSTRING &data, VAM__PDU__Descriptions::VAM &vru, params_its *params = NULL); + virtual int encode(const VAM__PDU__Descriptions::VAM &vru, OCTETSTRING &p_data); + virtual int decode(const OCTETSTRING &p_data, VAM__PDU__Descriptions::VAM &vru, params_its *params = NULL); }; diff --git a/ccsrc/Protocols/VRU/vru_pdu_codec.cc b/ccsrc/Protocols/VRU/vru_pdu_codec.cc deleted file mode 100644 index 60f2bbd..0000000 --- a/ccsrc/Protocols/VRU/vru_pdu_codec.cc +++ /dev/null @@ -1,16 +0,0 @@ -#include "vru_pdu_codec.hh" -#include "LibItsVru_TypesAndValues.hh" -#include "asn1/asn_application.h" // from asn1c -#include "loggers.hh" - -extern "C" { -extern asn_TYPE_descriptor_t asn_DEF_VAM; -} - -int vru_pdu_codec::encode(const VAM__PDU__Descriptions::VAM &p_vru, BITSTRING &p_data) { - return _encode(VAM__PDU__Descriptions::VAM_descr_, asn_DEF_VAM, p_vru, p_data); -} - -int vru_pdu_codec::decode(const BITSTRING &p_data, VAM__PDU__Descriptions::VAM &p_vru) { - return _decode(VAM__PDU__Descriptions::VAM_descr_, asn_DEF_VAM, p_data, p_vru); -} diff --git a/ccsrc/Protocols/VRU/vru_pdu_codec.hh b/ccsrc/Protocols/VRU/vru_pdu_codec.hh deleted file mode 100644 index 1781f15..0000000 --- a/ccsrc/Protocols/VRU/vru_pdu_codec.hh +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "codec.hh" -#include "params.hh" -#include "per_codec.hh" - -class BITSTRING; //! Forward declaration of TITAN class -class OCTETSTRING; //! Forward declaration of TITAN class - -namespace VAM__PDU__Descriptions { //! Forward declaration of asn1c VRU class - class VAM; -} - -class vru_pdu_codec : public per_codec { -public: - explicit vru_pdu_codec(){}; - virtual int encode(const VAM__PDU__Descriptions::VAM &vru, BITSTRING &data); - virtual int decode(const BITSTRING &data, VAM__PDU__Descriptions::VAM &); -}; diff --git a/ccsrc/Protocols/VRU_layers/vru_layer.cc b/ccsrc/Protocols/VRU_layers/vru_layer.cc index 346eff2..5aa07aa 100644 --- a/ccsrc/Protocols/VRU_layers/vru_layer.cc +++ b/ccsrc/Protocols/VRU_layers/vru_layer.cc @@ -34,19 +34,19 @@ void vru_layer::sendMsg(const LibItsVru__TypesAndValues::VamReq &p, params_its & send_data(data, _params); } -void vru_layer::send_data(OCTETSTRING &data, params &p_params) { - loggers::get_instance().log_msg(">>> vru_layer::send_data: ", data); +void vru_layer::send_data(OCTETSTRING &p_data, params &p_params) { + loggers::get_instance().log_msg(">>> vru_layer::send_data: ", p_data); - send_to_all_layers(data, p_params); + send_to_all_layers(p_data, p_params); } -void vru_layer::receive_data(OCTETSTRING &data, params &p_params) { - loggers::get_instance().log_msg(">>> vru_layer::receive_data: ", data); +void vru_layer::receive_data(OCTETSTRING &p_data, params &p_params) { + loggers::get_instance().log_msg(">>> vru_layer::receive_data: ", p_data); // Sanity check - if (*(static_cast(data) + 1) != 0x10) { // Check that received packet has VA message id - See ETSI TS 102 894 + if (*(static_cast(p_data) + 1) != 0x10) { // Check that received packet has VA message id - See ETSI TS 102 894 // Not a VRU message, discard it - loggers::get_instance().warning("vru_layer::receive_data: Wrong message id: 0x%02x", *(static_cast(data) + 1)); + loggers::get_instance().warning("vru_layer::receive_data: Wrong message id: 0x%02x", *(static_cast(p_data) + 1)); return; } @@ -54,13 +54,13 @@ void vru_layer::receive_data(OCTETSTRING &data, params &p_params) { params_its ¶ms = static_cast(p_params); LibItsVru__TypesAndValues::VamInd p; - _codec.decode(data, p.msgIn()); + _codec.decode(p_data, p.msgIn()); if (!p.msgIn().is_bound()) { // Discard it return; } // else, continue - // Process lower layer data + // Process lower layer p_data // recvTime params_its::const_iterator it = params.find(params_its::timestamp); if (it != params.cend()) { diff --git a/ccsrc/Protocols/VRU_layers/vru_layer.hh b/ccsrc/Protocols/VRU_layers/vru_layer.hh index b4fde09..80e4d5b 100644 --- a/ccsrc/Protocols/VRU_layers/vru_layer.hh +++ b/ccsrc/Protocols/VRU_layers/vru_layer.hh @@ -59,7 +59,7 @@ public: //! \publicsection * \param[in] p_data The data to be sent * \param[in] p_params Some parameters to overwrite default value of the lower layers parameters */ - virtual void send_data(OCTETSTRING &data, params ¶ms); + virtual void send_data(OCTETSTRING &p_data, params ¶ms); /*! * \virtual * \fn void receive_data(OCTETSTRING& data, params& params); @@ -67,7 +67,7 @@ public: //! \publicsection * \param[in] p_data The bytes formated data received * \param[in] p_params Some lower layers parameters values when data was received */ - virtual void receive_data(OCTETSTRING &data, params &info); + virtual void receive_data(OCTETSTRING &p_data, params &info); int enable_secured_mode(const std::string &p_certificate_id, const boolean p_enforce_security); diff --git a/config.mk b/config.mk index c36c17b..323054b 100644 --- a/config.mk +++ b/config.mk @@ -1,8 +1,6 @@ -TTCN3_COMPILER_OPTIONS := -d -e -f -g -H -j -l -L -R -U none -x -X +# Do not use -X if -H is not used +TTCN3_COMPILER_OPTIONS := -d -e -f -g -j -l -L -R -U none -x -X TTCN3_DIR := $(HOME)/frameworks/titan/titan.core/Install -ASN1C_PATH := $(HOME)/frameworks/asn1c -#WPCAP_DLL_PATH := /cygdrive/c/windows/system32/npcap/wpcap.dll -#NPCAP_INCLUDE := /cygdrive/c/PROGRA~1/Npcap/sdk/include #T3Q_PATH=./tools/t3q-v2.0.0b30 #T3Q_CONFIG=t3q.cfg #T3D_PATH=./tools/t3d-v2.0.0b30 diff --git a/etc/AtsCAM/AtsCAM.cfg b/etc/AtsCAM/AtsCAM.cfg index 163eea7..444b71a 100644 --- a/etc/AtsCAM/AtsCAM.cfg +++ b/etc/AtsCAM/AtsCAM.cfg @@ -102,7 +102,7 @@ system.camPort.params := "CAM(next_header=btpB,header_type=tsb,header_sub_type=s #system.camPort.params := "CAM(next_header=btpB,header_type=tsb,header_sub_type=sh)/BTP/GN(ll_address=4C5E0C14D2EA,latitude=367470520,longitude=-45559502,distanceA=1500,distanceB=1500,angle=0,device_mode=1,secured_mode=1,sec_db_path=../data/certificates/certificates)/LTE(mac_src=8c554ac1eee0,nic=wlp0s20f3,filter=and ether proto 0x8947,pc5_layer=QUALCOMM,uu_protocol=mqtt,mqtt_client_id=8c554ac1eee0,mqtt_topics=rsu,uu_transport=tcp,debug=1,server=192.168.1.39,port=1883)" # CAM UpperTester port based on UDP -system.utPort.params := "UT_CAM/UDP(dst_ip=10.200.60.23,dst_port=12345,src_port=12346)" +system.utPort.params := "UT_CAM/UDP(dst_ip=192.168.1.21,dst_port=12345,src_port=12346)" #system.utPort.params := "UT_CAM/UDP(dst_ip=192.168.146.26)" #system.utPort.params := "UT_CAM/UDP(dst_ip=172.16.35.1)" diff --git a/install.sh b/install.sh index efac90f..ee440b2 100755 --- a/install.sh +++ b/install.sh @@ -50,6 +50,8 @@ do ln -sf SAEM-PDU-Descriptions.asn SAEM_PDU_Descriptions.asn ln -sf ITSsa1-1-0-16460-2-1.asn ITSsa1.asn ln -sf ITSee1-1-0-16460-4-1.asn ITSee1.asn + ln -sf SAEM-ExternalModule.asn SAEM_ExternalModule.asn + ln -sf SAEM-InfoContainer.asn SAEM_InfoContainer.asn else git checkout --recurse-submodules $ASN1_BRANCH if [ -f ETSI-ITS-CDD.asn ] diff --git a/libasn1.mk b/libasn1.mk deleted file mode 100644 index 1893bfa..0000000 --- a/libasn1.mk +++ /dev/null @@ -1,129 +0,0 @@ -########################################################## -# This Makefile is to build the ASN1 library to be used -# for external codec in Titan -# This Makefile is expected that asn1c compiler is -# installed in the PATHs -########################################################## - -# The name of the library -ASN_LIBRARY = libItsAsn.a - -ifeq (,$(sort $(ASN_FILES))) - $(error ASN_FILES should be specified ) -endif - -#Override ASN1C instalation path -ifneq (, $(ASN1C_PATH)) - ASN1C:=$(ASN1C_PATH)/asn1c/asn1c -S $(ASN1C_PATH)/skeletons -else - ASN1C:=asn1c -endif - -LIB_MAKEFILE=Makefile.am.libasncodec -include $(LIB_MAKEFILE) -OBJS = ${ASN_MODULE_SRCS:.c=.o} -CONVERTER=converter -ASN_CONVERTER_SOURCES := \ - converter-example.c\ - pdu_collection.c -CONVERTER_OBJS=${ASN_CONVERTER_SOURCES:.c=.o} -ifneq ($(strip $(ASN_PDU)),$(firstword $(ASN_PDU))) - HAS_PDU_COLLECTION := -DASN_PDU_COLLECTION -endif - -CFLAGS += $(ASN_MODULE_CFLAGS) -DPDU=$(firstword $(ASN_PDU)) $(HAS_PDU_COLLECTION) -fPIC -I. -CC = gcc -std=c99 -ASN1C_OPTIONS += -no-gen-example -fcompound-names -no-gen-XER -no-gen-JER -no-gen-APER -no-gen-print -no-gen-random-fill -ifeq (yes,$(DEBUG)) - CFLAGS += -g -O0 -DASN_EMIT_DEBUG=1 -endif -ASN_SRC_FILES := $(addprefix $(TOP_DIR)/, $(ASN_FILES)) - -all: $(ASN_LIBRARY) - -$(LIB_MAKEFILE): $(ASN_SRC_FILES) Makefile - $(ASN1C) $(ASN1C_OPTIONS) $(addprefix -pdu=,$(pdu)) $(ASN_SRC_FILES) -# -for n in $(PATCHES); do git apply "$(SCRIPT_DIR)/$$n"; done - -$(CONVERTER): $(ASN_LIBRARY) $(CONVERTER_OBJS) - $(CC) $(CFLAGS) -o $@ $(CONVERTER_OBJS) $(ASN_LIBRARY) $(LIBS) - -$(ASN_LIBRARY): ${ASN_MODULE_SRCS:.c=.o} - ar rcs $@ $^ -# $(CC) $(CFLAGS) -o $@ $^ -shared $(LDFLAGS) $(LIBS) - -.SUFFIXES: -.SUFFIXES: .c .o - -.c.o: - $(CC) $(CFLAGS) -o $@ -c $< - -clean: - rm -f $(CONVERTER) $(ASN_LIBRARY) - rm -f $(OBJS) $(CONVERTER_OBJS) - -regen: clear-asn1c $(LIB_MAKEFILE) -clear-asn1c: - rm -f $(LIB_MAKEFILE) - -########################################################## - -$(TOP_DIR)/./build/asn1/ISO_TS_14816/AVIAEINumberingAndDataStructures.asn: - mkdir -p "$(dir $@)" - curl 'https://standards.iso.org/iso/14816/ISO14816%20ASN.1%20repository/ISO14816_AVIAEINumberingAndDataStructures.asn' | \ - sed -e 's/IssuerIdentifier/AVIAEIIssuerIdentifier/g' > "$@" - -#$(TOP_DIR)/./build/asn1/ISO_TS_14906/EfcDsrcApplication.asn: -# mkdir -p "$(dir $@)" -# curl -o "$@" 'https://standards.iso.org/iso/14906/ed-3/en/ISO14906(2018)EfcDsrcApplicationv6.asn' - -#$(TOP_DIR)/./build/asn1/ISO_TS_14906/EfcDsrcGeneric.asn: -# mkdir -p "$(dir $@) -# curl -o "$@" 'https://standards.iso.org/iso/14906/ed-3/en/ISO14906(2018)EfcDsrcGenericv7.asn' - -#$(TOP_DIR)/./build/asn1/ISO_TS_ISO17573_3/EfcDataDictionary.asn: -# mkdir -p "$(dir $@) -# curl -o "$@" 'https://standards.iso.org/iso/17573/-3/ed-1/en/ISO17573-3(2023)EfcDataDictionaryV1.3.asn' - -#$(TOP_DIR)/./build/asn1/ISO_TS_17419/CITSapplMgmtIDs.asn: -# mkdir -p "$(dir $@)" -# curl -o "$@" 'https://standards.iso.org/iso/ts/17419/TS%2017419%20ASN.1%20repository/TS17419_2014_CITSapplMgmtIDs.asn' - -$(TOP_DIR)/./build/asn1/ISO_TS_19091/ISO-TS-19091-addgrp-C-2018-patched.asn: - mkdir -p "$(dir $@)" - curl 'https://standards.iso.org/iso/ts/19091/ed-2/en/ISO-TS-19091-addgrp-C-2018.asn' | \ - sed -e 's/\bHeadingConfidence\b/HeadingConfidenceDSRC/g' \ - -e 's/\bSpeedConfidence\b/SpeedConfidenceDSRC/g' \ - -e 's/\bHeading\b/HeadingDSRC/g' > "$@" - -$(TOP_DIR)/./build/asn1/ISO_TS_17419/CITSdataDictionary1.asn: - mkdir -p "$(dir $@)" - curl -o "$@" 'https://standards.iso.org/iso/17419/ed-1/en/17419.1.asn' - -$(TOP_DIR)/./build/asn1/ISO_TS_17419/CITSapplMgmtApplReg2.asn: - mkdir -p "$(dir $@)" - curl -o "$@" 'https://standards.iso.org/iso/17419/ed-1/en/17419.2.asn' - patch -i $(TOP_DIR)/./ttcn/AtsSAEM/lib/asn1/CITSapplMgmtApplReg2.asn.patch $(TOP_DIR)/./build/asn1/ISO_TS_17419/CITSapplMgmtApplReg2.asn - -$(TOP_DIR)/./build/asn1/ISO_TS_16460/ITSsa1.asn: - mkdir -p "$(dir $@)" - curl -o "$@" 'https://standards.iso.org/iso/16460/ed-1/en/ISO_16460_ITSsa1.asn' - patch -i $(TOP_DIR)/./ttcn/AtsSAEM/lib/asn1/ITSsa1.asn.patch $(TOP_DIR)/./build/asn1/ISO_TS_16460/ITSsa1.asn - -$(TOP_DIR)/./build/asn1/ISO_TS_16460/ITSee1.asn: - mkdir -p "$(dir $@)" - curl -o "$@" 'https://standards.iso.org/iso/16460/ed-1/en/ISO_16460_ITSee1.asn' - patch -i $(TOP_DIR)/./ttcn/AtsSAEM/lib/asn1/ITSee1.asn.patch $(TOP_DIR)/./build/asn1/ISO_TS_16460/ITSee1.asn - -#$(TOP_DIR)/./build/asn1/ISO_TS_19321/IVI.asn: -# mkdir -p "$(dir $@)" -# curl -o "$@" 'https://standards.iso.org/iso/ts/19321/ed-3/en/ISO_CD%20TS%2019321%20ed.3%20-%20id.82956%20Approval%20ISO19321IVIv3.1.asn' - -#$(TOP_DIR)/./build/asn1/ISO_TS_19321/IVI-IS.asn: -# mkdir -p "$(dir $@)" -# curl -o "$@" 'https://standards.iso.org/iso/ts/19321/ed-3/en/ISO_CD%20TS%2019321%20ed.3%20-%20id.82956%20Approval%20ISO19321IVI-IS.asn' - -#$(TOP_DIR)/build/asn1/ISO_TS_24534-3/ElectronicRegistrationIdentificationVehicleDataModule.asn: -# mkdir -p "$(dir $@)" -# curl -o "$@" 'https://standards.iso.org/iso/24534/-3/ISO%2024534-3%20ASN.1%20repository/ISO24534-3_ElectronicRegistrationIdentificationVehicleDataModule_ForBallot.asn' - diff --git a/titan-test-system-framework b/titan-test-system-framework index b6218a7..0354bd8 160000 --- a/titan-test-system-framework +++ b/titan-test-system-framework @@ -1 +1 @@ -Subproject commit b6218a702155deb9041de2b36a6c0220dc57f4d6 +Subproject commit 0354bd8fa2f1f85d39c35a8dc5e38416ab9db5cf diff --git a/ttcn/AtsCPS b/ttcn/AtsCPS index 47c5614..da882b4 160000 --- a/ttcn/AtsCPS +++ b/ttcn/AtsCPS @@ -1 +1 @@ -Subproject commit 47c561413ca8de2a664309f5651d2a15bbb18001 +Subproject commit da882b4861c9b8a8950e99b5d3ff06955bb62451 diff --git a/ttcn/AtsMBR b/ttcn/AtsMBR index fc16ba2..a180edd 160000 --- a/ttcn/AtsMBR +++ b/ttcn/AtsMBR @@ -1 +1 @@ -Subproject commit fc16ba2278f8bcad4dfad9afcb1b79485c368225 +Subproject commit a180edd7aafab35af9780d2615b6c844f604410c diff --git a/ttcn/AtsPIM b/ttcn/AtsPIM index 27329d3..d16094b 160000 --- a/ttcn/AtsPIM +++ b/ttcn/AtsPIM @@ -1 +1 @@ -Subproject commit 27329d3afac51fbf2762428e12f2635d1137c549 +Subproject commit d16094bc2059cc171e8c29095c12b5d7d84b7c92 diff --git a/ttcn/AtsPki b/ttcn/AtsPki index 923bd58..ed59c39 160000 --- a/ttcn/AtsPki +++ b/ttcn/AtsPki @@ -1 +1 @@ -Subproject commit 923bd5882f5eb8824bd600bd16203e837848e0a7 +Subproject commit ed59c399964d654375ab486f64e1ed18208e898c diff --git a/ttcn/AtsSAEM b/ttcn/AtsSAEM index 27329d3..ddf7265 160000 --- a/ttcn/AtsSAEM +++ b/ttcn/AtsSAEM @@ -1 +1 @@ -Subproject commit 27329d3afac51fbf2762428e12f2635d1137c549 +Subproject commit ddf7265d2a306a74115fd25d5005d5f65a3cfbc1 diff --git a/ttcn/AtsSecurity b/ttcn/AtsSecurity index 060d338..77482f6 160000 --- a/ttcn/AtsSecurity +++ b/ttcn/AtsSecurity @@ -1 +1 @@ -Subproject commit 060d3384e88c6e61e828733dd57c23b260d9f24e +Subproject commit 77482f6e2cb03ca5b9d25fb4c738f76231306d67 -- GitLab From 67983cb83b854576828f537d54022622955044b6 Mon Sep 17 00:00:00 2001 From: garciay Date: Thu, 30 Apr 2026 16:15:21 +0200 Subject: [PATCH 2/4] Bug fixed in security_services_its::retrieve_ssps --- ccsrc/Protocols/Security/security_services_its.cc | 4 +++- etc/AtsCAM/AtsCAM.cfg | 7 +++++-- ttcn/AtsAVM | 2 +- ttcn/AtsBTP | 2 +- ttcn/AtsDENM | 2 +- ttcn/AtsVRU | 2 +- 6 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ccsrc/Protocols/Security/security_services_its.cc b/ccsrc/Protocols/Security/security_services_its.cc index c220a38..3d2452e 100644 --- a/ccsrc/Protocols/Security/security_services_its.cc +++ b/ccsrc/Protocols/Security/security_services_its.cc @@ -368,11 +368,12 @@ int security_services_its::process_ieee_1609_dot2_signed_data(const Ieee1609Dot2 int security_services_its::retrieve_ssps(const Ieee1609Dot2BaseTypes::SequenceOfPsidSsp& p_psid_ssps, params_its &p_params) { loggers::get_instance().log_msg(">>> security_services_its::retrieve_ssps: ", p_psid_ssps); loggers::get_instance().log(">>> security_services_its::retrieve_ssps: psid_ssps size: %d", p_psid_ssps.lengthof()); + loggers::get_instance().log(">>> security_services_its::retrieve_ssps: its_aid: %s", p_params[params_its::its_aid].c_str()); for (int i = 0; i < p_psid_ssps.lengthof(); i++) { const Ieee1609Dot2BaseTypes::PsidSsp &psid_ssp = p_psid_ssps[i]; loggers::get_instance().log_msg("security_services_its::retrieve_ssps: Processing psid_ssp ", psid_ssp); const OPTIONAL &s = psid_ssp.ssp(); - if (s.is_present()) { + if ((p_params[params_its::its_aid].compare(std::to_string(static_cast(psid_ssp.psid()))) == 0) && (s.is_present())) { const Ieee1609Dot2BaseTypes::ServiceSpecificPermissions &ssp = static_cast(s); loggers::get_instance().log_msg("security_services_its::retrieve_ssps: Processing ssp ", ssp); params_its::const_iterator it = p_params.find(std::to_string(psid_ssp.psid())); @@ -384,6 +385,7 @@ int security_services_its::retrieve_ssps(const Ieee1609Dot2BaseTypes::SequenceOf os = ssp.bitmapSsp(); } p_params[params_its::ssp] = std::string(static_cast(oct2str(os))); + break; // End of 'for' statement } } } // End of 'for' statement diff --git a/etc/AtsCAM/AtsCAM.cfg b/etc/AtsCAM/AtsCAM.cfg index 444b71a..64a7bae 100644 --- a/etc/AtsCAM/AtsCAM.cfg +++ b/etc/AtsCAM/AtsCAM.cfg @@ -10,6 +10,9 @@ LibItsGeoNetworking_Pixits.PX_GN_UPPER_LAYER := e_btpB LibItsCam_Pics.PICS_DANGEROUSGOODS := true LibItsCam_Pics.PICS_IS_IUT_SECURED := true +# Instruct the Test System to use this certificate. Comment to use the default one (CERT_IUT_A_AT) +LibItsCommon_Pixits.PX_CERT_FOR_TS := "CERT_TS_A_ATv2" + [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). @@ -109,7 +112,7 @@ system.utPort.params := "UT_CAM/UDP(dst_ip=192.168.1.21,dst_port=12345,src_port= [EXECUTE] # Check that protocolVersion is set to 2 and messageID is set to 2 -#ItsCam_TestCases.TC_CAM_MSD_FMT_BV_01 +ItsCam_TestCases.TC_CAM_MSD_FMT_BV_01 # Check that LF container is included in 1st CAM since CA basic service activation #ItsCam_TestCases.TC_CAM_MSD_FMT_BV_02 # Check that LF container is included if time elapsed since the generation of the last CAM with the low frequency container generation is equal or larger than 500 ms @@ -243,7 +246,7 @@ system.utPort.params := "UT_CAM/UDP(dst_ip=192.168.1.21,dst_port=12345,src_port= #ItsCam_TestCases.TC_CAM_MSP_SSP_BV_03 # Check that content of received CAM is transmitted to applications and other facilities -ItsCam_TestCases.TC_CAM_MSP_BV_01 +#ItsCam_TestCases.TC_CAM_MSP_BV_01 [MAIN_CONTROLLER] # The options herein control the behavior of MC. diff --git a/ttcn/AtsAVM b/ttcn/AtsAVM index be2bda4..bf4481f 160000 --- a/ttcn/AtsAVM +++ b/ttcn/AtsAVM @@ -1 +1 @@ -Subproject commit be2bda49ffda160a0258185d752dd989ebd51193 +Subproject commit bf4481fe103e935e6b5c7260cc456cc1dbf85f39 diff --git a/ttcn/AtsBTP b/ttcn/AtsBTP index 3576386..fd2b43d 160000 --- a/ttcn/AtsBTP +++ b/ttcn/AtsBTP @@ -1 +1 @@ -Subproject commit 3576386312f9dff1afcccc8f96247876ab9a0865 +Subproject commit fd2b43d30a404240b722c568a9249c1c9590fcea diff --git a/ttcn/AtsDENM b/ttcn/AtsDENM index bb8dbab..93717b7 160000 --- a/ttcn/AtsDENM +++ b/ttcn/AtsDENM @@ -1 +1 @@ -Subproject commit bb8dbabf7eb22813383aaaa92292b736bf767510 +Subproject commit 93717b763d11bc05b1840e13955f2003602c8a7f diff --git a/ttcn/AtsVRU b/ttcn/AtsVRU index ccf334f..0baeeca 160000 --- a/ttcn/AtsVRU +++ b/ttcn/AtsVRU @@ -1 +1 @@ -Subproject commit ccf334f7fae9212f6d7de7ba46d7d5cb9963b37b +Subproject commit 0baeeca2e71f1b003f6dff592e03822539dd5591 -- GitLab From b540583ef7225c646045558530f32f0bb7841a56 Mon Sep 17 00:00:00 2001 From: garciay Date: Tue, 5 May 2026 10:14:20 +0200 Subject: [PATCH 3/4] Bug fixed for TITAN built-in OER encoding --- TS.ITS.TTF_T05x.code-workspace | 3 --- ccsrc/Protocols/AVM_layers/avm_layer.cc | 2 +- ccsrc/Protocols/GeoNetworking/geonetworking_codec.cc | 12 ++++++------ ccsrc/Protocols/PIM_layers/pim_layer.cc | 2 +- ccsrc/Protocols/SAEM_layers/saem_layer.cc | 4 ++-- etc/AtsDENM/AtsDENM.cfg | 6 +++--- ttcn/AtsCPS | 2 +- ttcn/AtsGeoNetworking | 2 +- ttcn/AtsIS | 2 +- ttcn/AtsMBR | 2 +- ttcn/AtsPIM | 2 +- ttcn/AtsPki | 2 +- ttcn/AtsSAEM | 2 +- ttcn/AtsSecurity | 2 +- ttcn/AtsVRU | 2 +- 15 files changed, 22 insertions(+), 25 deletions(-) diff --git a/TS.ITS.TTF_T05x.code-workspace b/TS.ITS.TTF_T05x.code-workspace index d1804e5..4713868 100644 --- a/TS.ITS.TTF_T05x.code-workspace +++ b/TS.ITS.TTF_T05x.code-workspace @@ -5,9 +5,6 @@ }, { "path": "../../frameworks/titan/titan.core" - }, - { - "path": "../TS.ITS.TTF_T036" } ] } \ No newline at end of file diff --git a/ccsrc/Protocols/AVM_layers/avm_layer.cc b/ccsrc/Protocols/AVM_layers/avm_layer.cc index e3f25c7..ecb6318 100644 --- a/ccsrc/Protocols/AVM_layers/avm_layer.cc +++ b/ccsrc/Protocols/AVM_layers/avm_layer.cc @@ -13,7 +13,7 @@ avm_layer::avm_layer(const std::string &p_type, const std::string ¶m) : t_la loggers::get_instance().log(">>> avm_layer::avm_layer: %s, %s", to_string().c_str(), param.c_str()); // Setup parameters params::convert(_params, param); - _params.insert(std::make_pair(static_cast(params_its::its_aid), "71")); // ETSI TS 102 965 V2.4.1 + _params.insert(std::make_pair(static_cast(params_its::its_aid), "638")); // ETSI TS 102 965 V2.4.1 _params.insert(std::make_pair(static_cast(params_its::payload_type), "19")); // MVM message id:19 - See ETSI TS 102 894 // MIM message id:18 - See ETSI TS 102 894 diff --git a/ccsrc/Protocols/GeoNetworking/geonetworking_codec.cc b/ccsrc/Protocols/GeoNetworking/geonetworking_codec.cc index a5b80c0..1222334 100644 --- a/ccsrc/Protocols/GeoNetworking/geonetworking_codec.cc +++ b/ccsrc/Protocols/GeoNetworking/geonetworking_codec.cc @@ -184,7 +184,7 @@ int geonetworking_codec::decode_(Base_Type &type, const TTCN_Typedescriptor_t &f return -1; } } // End of 'for' statement - // Save p_data for upper layer + // Save data for upper layer if (std::string(r.get_descriptor()->name).compare("@LibItsGeoNetworking_TypesAndValues.Lifetime") == 0) { LibItsGeoNetworking__TypesAndValues::Lifetime &l = static_cast(r); unsigned int base = 0; @@ -215,14 +215,14 @@ int geonetworking_codec::decode_(Base_Type &type, const TTCN_Typedescriptor_t &f // loggers::get_instance().log("geonetworking_codec::decode_ (else): processing type %s/%s - optional:%d", type.get_descriptor()->name, // field_descriptor.name, type.is_optional()); if (std::string(field_descriptor.name).compare("@LibItsGeoNetworking_TypesAndValues.CommonHeader.nextHeader") == 0) { - // Decode NextHeader p_data structure + // Decode NextHeader data structure type.decode(field_descriptor, decoding_buffer, TTCN_EncDec::CT_RAW); // Store NextHeader field value and continue decoding _dc.set_next_header((unsigned int)dynamic_cast(type).as_int()); } else if (std::string(field_descriptor.name).compare("@LibItsGeoNetworking_TypesAndValues.CommonHeader.headerTST") == 0) { decode_headerTST(static_cast(type), decoding_buffer); } else if (std::string(field_descriptor.name).compare("@LibItsGeoNetworking_TypesAndValues.GnNonSecuredPacket.extendedHeader") == 0) { - // Decode ExtendedHeader p_data structure + // Decode ExtendedHeader data structure LibItsGeoNetworking__TypesAndValues::ExtendedHeader e; decode_extendedHeader(e, decoding_buffer); if (e.is_bound()) { @@ -233,7 +233,7 @@ int geonetworking_codec::decode_(Base_Type &type, const TTCN_Typedescriptor_t &f dynamic_cast &>(type).set_to_omit(); } } else if (std::string(field_descriptor.name).compare("@LibItsGeoNetworking_TypesAndValues.GnNonSecuredPacket.payload") == 0) { - // Decode raw payload p_data structure + // Decode raw payload data structure OCTETSTRING s(decoding_buffer.get_len() - decoding_buffer.get_pos(), decoding_buffer.get_data() + decoding_buffer.get_pos()); // loggers::get_instance().log_msg("geonetworking_codec::decode_: s=", s); const unsigned char *p = static_cast(s); @@ -266,7 +266,7 @@ int geonetworking_codec::decode_(Base_Type &type, const TTCN_Typedescriptor_t &f dynamic_cast &>(type).set_to_omit(); } } else if (std::string(field_descriptor.name).compare("@LibItsGeoNetworking_TypesAndValues.CommonHeader.plLength") == 0) { - // Decode plLength p_data structure + // Decode plLength data structure type.decode(field_descriptor, decoding_buffer, TTCN_EncDec::CT_RAW); // Store playload length and continue decoding _dc.set_length((unsigned int)static_cast(dynamic_cast(type))); @@ -335,7 +335,7 @@ int geonetworking_codec::encode_extendedHeader(const LibItsGeoNetworking__TypesA int geonetworking_codec::decode_headerTST(LibItsGeoNetworking__TypesAndValues::HeaderTST &u, TTCN_Buffer &decoding_buffer) { // loggers::get_instance().log(">>> geonetworking_codec::decode_headerTST: processing %s", u.get_descriptor()->name); - // Decode HeaderTST p_data structure + // Decode HeaderTST data structure _dc.set_header_type(*(decoding_buffer.get_data() + decoding_buffer.get_pos()) >> 4); _dc.set_header_sub_type(*(decoding_buffer.get_data() + decoding_buffer.get_pos()) & 0x0F); // loggers::get_instance().log("geonetworking_codec::decode_: headerTST selectors: _dc.header_type = %d - _dc.header_sub_type = %d", _dc.get_header_type(), diff --git a/ccsrc/Protocols/PIM_layers/pim_layer.cc b/ccsrc/Protocols/PIM_layers/pim_layer.cc index cb895f6..fe3f0d3 100644 --- a/ccsrc/Protocols/PIM_layers/pim_layer.cc +++ b/ccsrc/Protocols/PIM_layers/pim_layer.cc @@ -13,7 +13,7 @@ pim_layer::pim_layer(const std::string &p_type, const std::string ¶m) : t_la loggers::get_instance().log(">>> pim_layer::pim_layer: %s, %s", to_string().c_str(), param.c_str()); // Setup parameters params::convert(_params, param); - _params.insert(std::make_pair(static_cast(params_its::its_aid), "71")); // ETSI TS 102 965 V2.4.1 + _params.insert(std::make_pair(static_cast(params_its::its_aid), "1621")); // ETSI TS 102 965 V2.4.1 _params.insert(std::make_pair(static_cast(params_its::payload_type), "19")); // PIM message id:18 - See ETSI TS 102 894 // Register this object for AdapterControlPort diff --git a/ccsrc/Protocols/SAEM_layers/saem_layer.cc b/ccsrc/Protocols/SAEM_layers/saem_layer.cc index e2319ba..b52aeda 100644 --- a/ccsrc/Protocols/SAEM_layers/saem_layer.cc +++ b/ccsrc/Protocols/SAEM_layers/saem_layer.cc @@ -13,8 +13,8 @@ saem_layer::saem_layer(const std::string &p_type, const std::string ¶m) : t_ loggers::get_instance().log(">>> saem_layer::saem_layer: %s, %s", to_string().c_str(), param.c_str()); // Setup parameters params::convert(_params, param); - _params.insert(std::make_pair(static_cast(params_its::its_aid), "71")); // ETSI TS 102 965 V2.4.1 - _params.insert(std::make_pair(static_cast(params_its::payload_type), "19")); // SAEM message id:18 - See ETSI TS 102 894 + _params.insert(std::make_pair(static_cast(params_its::its_aid), "540801")); // ETSI TS 102 965 V2.4.1 + _params.insert(std::make_pair(static_cast(params_its::payload_type), "15")); // SAEM message id:15 - See ETSI TS 102 894 // Register this object for AdapterControlPort loggers::get_instance().log("saem_layer::saem_layer: Register %s/%p", p_type.c_str(), this); diff --git a/etc/AtsDENM/AtsDENM.cfg b/etc/AtsDENM/AtsDENM.cfg index 4a830d5..d4ef9fd 100644 --- a/etc/AtsDENM/AtsDENM.cfg +++ b/etc/AtsDENM/AtsDENM.cfg @@ -8,7 +8,7 @@ LibItsCommon_Pixits.PX_IUT_STATION_ID := 2533729309 LibItsGeoNetworking_Pixits.PX_GN_UPPER_LAYER := e_btpB LibItsDenm_Pics.PICS_IS_IUT_SECURED := true - +# Instruct the Test System to use this certificate. Comment to use the default one (CERT_IUT_A_AT) LibItsCommon_Pixits.PX_CERT_FOR_TS := "CERT_TS_A_ATv2" [LOGGING] @@ -96,7 +96,7 @@ system.utPort.params := "UT_DENM/UDP(dst_ip=192.168.1.21,dst_port=12345,src_port [EXECUTE] # Check that protocolVersion is set to 2 and messageID is set to 1 -#ItsDenm_TestCases.TC_DEN_MSGF_BV_01 +ItsDenm_TestCases.TC_DEN_MSGF_BV_01 # Check that sent DENM contains at least one 'detectionZonesToEventPosition' DE #ItsDenm_TestCases.TC_DEN_MSGF_BV_02 # Check that DEN Basic Service generates a new DENM on reception of a valid AppDENM_Trigger request @@ -130,7 +130,7 @@ system.utPort.params := "UT_DENM/UDP(dst_ip=192.168.1.21,dst_port=12345,src_port # Check that situation container, location container and alacarte container are not present in a negation DENM #ItsDenm_TestCases.TC_DEN_EVTR_BV_05 # Check that DEN Basic Service does not send any termination DENM if actionId is not in -ItsDenm_TestCases.TC_DEN_EVTR_BO_06 +#ItsDenm_TestCases.TC_DEN_EVTR_BO_06 # Check that DEN Basic Service does not send any termination DENM if actionId is not in #ItsDenm_TestCases.TC_DEN_EVTR_BO_07 # Check that referenceTime is set to to the current time when generating a cancellation DENM diff --git a/ttcn/AtsCPS b/ttcn/AtsCPS index da882b4..2e383ee 160000 --- a/ttcn/AtsCPS +++ b/ttcn/AtsCPS @@ -1 +1 @@ -Subproject commit da882b4861c9b8a8950e99b5d3ff06955bb62451 +Subproject commit 2e383eed41e38b65ec92fd02a84d0b7b2ebf5841 diff --git a/ttcn/AtsGeoNetworking b/ttcn/AtsGeoNetworking index 8a3c78b..e986054 160000 --- a/ttcn/AtsGeoNetworking +++ b/ttcn/AtsGeoNetworking @@ -1 +1 @@ -Subproject commit 8a3c78b1923182ea189af32178c8bde5523750f5 +Subproject commit e9860544d75bb897807d108115797fca39dd2e9d diff --git a/ttcn/AtsIS b/ttcn/AtsIS index baa1b4f..4ef7678 160000 --- a/ttcn/AtsIS +++ b/ttcn/AtsIS @@ -1 +1 @@ -Subproject commit baa1b4fa7634eb26e627e15933f9a3892ca0c449 +Subproject commit 4ef7678769c00f11762c514fae267b255e0c8102 diff --git a/ttcn/AtsMBR b/ttcn/AtsMBR index a180edd..559892e 160000 --- a/ttcn/AtsMBR +++ b/ttcn/AtsMBR @@ -1 +1 @@ -Subproject commit a180edd7aafab35af9780d2615b6c844f604410c +Subproject commit 559892e01c3e0b0f53b0407fb7a984bf44411b53 diff --git a/ttcn/AtsPIM b/ttcn/AtsPIM index d16094b..42805ce 160000 --- a/ttcn/AtsPIM +++ b/ttcn/AtsPIM @@ -1 +1 @@ -Subproject commit d16094bc2059cc171e8c29095c12b5d7d84b7c92 +Subproject commit 42805ceac04cb987e62f27bf28c45630c331c0ba diff --git a/ttcn/AtsPki b/ttcn/AtsPki index ed59c39..f105d3c 160000 --- a/ttcn/AtsPki +++ b/ttcn/AtsPki @@ -1 +1 @@ -Subproject commit ed59c399964d654375ab486f64e1ed18208e898c +Subproject commit f105d3cb5eff3a1b4cc7248dcc1e37cb42d9b2a7 diff --git a/ttcn/AtsSAEM b/ttcn/AtsSAEM index ddf7265..6aa537a 160000 --- a/ttcn/AtsSAEM +++ b/ttcn/AtsSAEM @@ -1 +1 @@ -Subproject commit ddf7265d2a306a74115fd25d5005d5f65a3cfbc1 +Subproject commit 6aa537a4e45528c83758e72e772fa4e2a4e5e4ce diff --git a/ttcn/AtsSecurity b/ttcn/AtsSecurity index 77482f6..f9e136a 160000 --- a/ttcn/AtsSecurity +++ b/ttcn/AtsSecurity @@ -1 +1 @@ -Subproject commit 77482f6e2cb03ca5b9d25fb4c738f76231306d67 +Subproject commit f9e136a4c26acc75c531e4e6cb804ced319d2e26 diff --git a/ttcn/AtsVRU b/ttcn/AtsVRU index 0baeeca..91c6d7a 160000 --- a/ttcn/AtsVRU +++ b/ttcn/AtsVRU @@ -1 +1 @@ -Subproject commit 0baeeca2e71f1b003f6dff592e03822539dd5591 +Subproject commit 91c6d7a02fe61322ddd0ff16d2c9a8eb98e1c671 -- GitLab From bcac62891af9e03a6da256eb766bb26032003b61 Mon Sep 17 00:00:00 2001 From: garciay Date: Tue, 5 May 2026 11:28:33 +0200 Subject: [PATCH 4/4] Enhance README file --- README.md | 14 +++++++++----- titan-test-system-framework | 2 +- ttcn/AtsAVM | 2 +- ttcn/AtsSAEM | 2 +- ttcn/LibIts | 2 +- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 80cd800..3bfe487 100644 --- a/README.md +++ b/README.md @@ -5,11 +5,15 @@ This repositories contains the test specifications and test adapter code for ETSI ITS protocols testing, Release 1. ETSI ITS protocols project supports: -- ETSI TS 103 900 v2.1.1: "Intelligent Transport Systems (ITS); Vehicular Communications; Basic Set of Applications; Part 2: Specification of Cooperative Awareness Basic Service" -- ETSI TS 103 831 v2.1.1: "Intelligent Transport Systems (ITS); Vehicular Communications; Basic Set of Applications; Part 3: Specifications of Decentralized Environmental Notification Basic Service" -- ETSI TS 103 301 v2.1.1: "Intelligent Transport Systems (ITS); Vehicular Communications; Basic Set of Applications; Facilities layer protocols and communication requirements for infrastructure services" +- ETSI TS 103 900 v2.1.1: "Intelligent Transport Systems (ITS); Vehicular Communications; Basic Set of Applications; Part 2: Specification of Cooperative Awareness Basic Service; Release 2" +- ETSI TS 103 831 v2.1.1: "Intelligent Transport Systems (ITS); Vehicular Communications; Basic Set of Applications; Part 3: Specifications of Decentralized Environmental Notification Basic Service; Release 2" +- ETSI TS 103 301 v2.1.1: "Intelligent Transport Systems (ITS); Vehicular Communications; Basic Set of Applications; Facilities layer protocols and communication requirements for infrastructure services; Release 2" +- ETSI TS 103 301 v1.3.1: "ntelligent Transport Systems (ITS); Vehicular Communications; Basic Set of Applications; Facilities layer protocols and communication requirements for infrastructure services" +- ETSI TS 103 882 V2.1.1: "Intelligent Transport Systems (ITS); Automated Vehicle Marshalling (AVM); Release 2" +- ETSI TS 104 072 V2.1.1: "Intelligent Transport Systems (ITS); Facilities Layer; Parking Information Service; Release 2" +- ETSI TS 104 091 v2.1.1: "Intelligent Transport Systems (ITS); Facilities Layer; Services Announcement (SA) Service; Release 2" - EN 302 636-5-1 V1.4.1: "Intelligent Transport Systems (ITS); Vehicular Communications; GeoNetworking; Part 5: Transport Protocols; Sub-part 1: Basic Transport Protocol" -- ETSI TS 103 836-4-1 v2.1.1: "Intelligent Transport Systems (ITS); Vehicular Communications; GeoNetworking; Part 4: Geographical addressing and forwarding for point-to-point and point-to-multipoint communications; Sub-part 1: Media-Independent Functionality" +- ETSI TS 103 836-4-1 v2.1.1: "Intelligent Transport Systems (ITS); Vehicular Communications; GeoNetworking; Part 4: Geographical addressing and forwarding for point-to-point and point-to-multipoint communications; Sub-part 1: Media-Independent Functionality; Release 2" In addition, it also support ITS Security as define by: - ETSI TS 103 940 v2.1.1: "Intelligent Transport Systems (ITS); Security; Security Architecture and Management". @@ -30,7 +34,7 @@ See the attached LICENSE file or visit https://forge.etsi.org/legal-matters. ## STFs/TTFs The following STFs were or are currently involved in the evolutions of the ETSI ITS protocols project: -- STF 405, STF 422, STF 424, STF 455, STF 462, STF 481, STF 484, STF 507, STF 517, STF 525, STF 538, STF 545, STF 594, TTF T002, TTF T011, TTF T024, TTF T025, TTF T030, TTF T036 +- STF 405, STF 422, STF 424, STF 455, STF 462, STF 481, STF 484, STF 507, STF 517, STF 525, STF 538, STF 545, STF 594, TTF T002, TTF T011, TTF T024, TTF T025, TTF T030, TTF T036, TTF T042, TTF T051, TTF T052, TTF T053 # Installation diff --git a/titan-test-system-framework b/titan-test-system-framework index 0354bd8..b67cdc9 160000 --- a/titan-test-system-framework +++ b/titan-test-system-framework @@ -1 +1 @@ -Subproject commit 0354bd8fa2f1f85d39c35a8dc5e38416ab9db5cf +Subproject commit b67cdc992c3836d1872956a07698e3966eb7bb30 diff --git a/ttcn/AtsAVM b/ttcn/AtsAVM index bf4481f..03233b0 160000 --- a/ttcn/AtsAVM +++ b/ttcn/AtsAVM @@ -1 +1 @@ -Subproject commit bf4481fe103e935e6b5c7260cc456cc1dbf85f39 +Subproject commit 03233b0b2cbc782d8e49e24bfa3a3b304843a9ce diff --git a/ttcn/AtsSAEM b/ttcn/AtsSAEM index 6aa537a..7ae7969 160000 --- a/ttcn/AtsSAEM +++ b/ttcn/AtsSAEM @@ -1 +1 @@ -Subproject commit 6aa537a4e45528c83758e72e772fa4e2a4e5e4ce +Subproject commit 7ae7969973a05915d11c42d0411781cdbe327424 diff --git a/ttcn/LibIts b/ttcn/LibIts index 267342b..53590cb 160000 --- a/ttcn/LibIts +++ b/ttcn/LibIts @@ -1 +1 @@ -Subproject commit 267342b551cc482530bb9741597f191d4c4818aa +Subproject commit 53590cb7b70f8659f6010699b7a213262c72579d -- GitLab