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

asn1/Makefile

+204 −203

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ ASN_FILES = AtsCAM/lib_cam_bases/asn1/CAM_PDU_Descriptions.asn \
		AtsIS/lib/asn1/iso-patched/DSRC_noCircular.asn \
		AtsIS/lib/asn1/iso-patched/REGION.asn \
		AtsIS/lib/asn1/iso-patched/AddGrpC.asn \
		AtsIS/lib/asn1/iso-patched/AddGrpC_noCircular.asn \
		../build/asn1/ISO_TS_14816/AVIAEINumberingAndDataStructures.asn \
		../build/asn1/ISO_TS_17419/CITSapplMgmtIDs.asn \
		../build/asn1/ISO_TS_19321/IVI.asn \

ccsrc/EncDec/LibItsBtp_Encdec.cc

+120 −120

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@ namespace LibItsBtp__EncdecDeclarations {
		* @param value to encode
		* @return encoded value
		****************************************************/
		BITSTRING fx__enc__BtpReq(LibItsBtp__TestSystem::BtpReq const &p_btpReq) {
		BITSTRING fx__enc__BtpReq(LibItsBtp__TypesAndValues::BtpReq const &p_btpReq) {
		loggers::get_instance().log_msg(">>> fx__enc__BtpReq: ", p_btpReq);

		btp_codec codec;
		@@ -29,7 +29,7 @@ namespace LibItsBtp__EncdecDeclarations {
		* @return encoded value
		****************************************************/

		INTEGER fx__dec__BtpReq(BITSTRING &b, LibItsBtp__TestSystem::BtpReq &p) {
		INTEGER fx__dec__BtpReq(BITSTRING &b, LibItsBtp__TypesAndValues::BtpReq &p) {
		loggers::get_instance().log(">>> fx__dec__BtpReq");
		btp_codec codec;
		LibItsBtp__TypesAndValues::BtpPacket pdu;
		@@ -49,7 +49,7 @@ namespace LibItsBtp__EncdecDeclarations {
		* @param value to encode
		* @return encoded value
		****************************************************/
		BITSTRING fx__enc__BtpInd(LibItsBtp__TestSystem::BtpInd const &p_btpInd) {
		BITSTRING fx__enc__BtpInd(LibItsBtp__TypesAndValues::BtpInd const &p_btpInd) {
		loggers::get_instance().log_msg(">>> fx__enc__BtpInd: ", p_btpInd);

		btp_codec codec;
		@@ -68,7 +68,7 @@ namespace LibItsBtp__EncdecDeclarations {
		* @return encoded value
		****************************************************/

		INTEGER fx__dec__BtpInd(BITSTRING &b, LibItsBtp__TestSystem::BtpInd &p_btpInd) {
		INTEGER fx__dec__BtpInd(BITSTRING &b, LibItsBtp__TypesAndValues::BtpInd &p_btpInd) {
		loggers::get_instance().log(">>> fx__dec__BtpInd");
		btp_codec codec;
		LibItsBtp__TypesAndValues::BtpPacket pdu;

ccsrc/EncDec/LibItsDenm_Encdec.cc

+279 −279

Original line number	Diff line number	Diff line
		@@ -12,7 +12,7 @@ namespace LibItsDenm__EncdecDeclarations {
		* @param value to encode
		* @return encoded value
		****************************************************/
		BITSTRING fx__enc__DenmReq(const LibItsDenm__TestSystem::DenmReq &p_denmReq) {
		BITSTRING fx__enc__DenmReq(const LibItsDenm__TypesAndValues::DenmReq &p_denmReq) {
		loggers::get_instance().log_msg(">>> fx__enc__DenmReq: ", p_denmReq);

		denm_codec codec;
		@@ -30,7 +30,7 @@ namespace LibItsDenm__EncdecDeclarations {
		* @param value to encode
		* @return encoded value
		****************************************************/
		INTEGER fx__dec__DenmReq(BITSTRING &b, LibItsDenm__TestSystem::DenmReq &p) {
		INTEGER fx__dec__DenmReq(BITSTRING &b, LibItsDenm__TypesAndValues::DenmReq &p) {
		loggers::get_instance().log(">>> fx__dec__DenmReq");

		denm_codec codec;
		@@ -46,18 +46,18 @@ namespace LibItsDenm__EncdecDeclarations {
		return 0;
		}

		INTEGER fx__dec__DenmInd(BITSTRING &b, LibItsDenm__TestSystem::DenmInd &p_denmInd) {
		INTEGER fx__dec__DenmInd(BITSTRING &b, LibItsDenm__TypesAndValues::DenmInd &p_denmInd) {
		loggers::get_instance().log(">>> fx__dec__DenmInd");

		denm_codec codec;
		DENM__PDU__Descriptions::DENM denm;
		OCTETSTRING is = bit2oct(b);

		int s = (LibItsDenm__TestSystem::DenmInd_gnNextHeader_raw_.fieldlength + LibItsDenm__TestSystem::DenmInd_gnHeaderType_raw_.fieldlength +
		LibItsDenm__TestSystem::DenmInd_gnHeaderSubtype_raw_.fieldlength + LibItsDenm__TestSystem::DenmInd_gnLifetime_raw_.fieldlength +
		LibItsDenm__TestSystem::DenmInd_gnTrafficClass_raw_.fieldlength + LibItsDenm__TestSystem::DenmInd_btpDestinationPort_raw_.fieldlength +
		LibItsDenm__TestSystem::DenmInd_btpInfo_raw_.fieldlength + LibItsDenm__TestSystem::DenmInd_ssp_raw_.fieldlength +
		LibItsDenm__TestSystem::DenmInd_its__aid_raw_.fieldlength) /
		int s = (LibItsDenm__TypesAndValues::DenmInd_gnNextHeader_raw_.fieldlength + LibItsDenm__TypesAndValues::DenmInd_gnHeaderType_raw_.fieldlength +
		LibItsDenm__TypesAndValues::DenmInd_gnHeaderSubtype_raw_.fieldlength + LibItsDenm__TypesAndValues::DenmInd_gnLifetime_raw_.fieldlength +
		LibItsDenm__TypesAndValues::DenmInd_gnTrafficClass_raw_.fieldlength + LibItsDenm__TypesAndValues::DenmInd_btpDestinationPort_raw_.fieldlength +
		LibItsDenm__TypesAndValues::DenmInd_btpInfo_raw_.fieldlength + LibItsDenm__TypesAndValues::DenmInd_ssp_raw_.fieldlength +
		LibItsDenm__TypesAndValues::DenmInd_its__aid_raw_.fieldlength) /
		8;
		// Decode DEN message
		if (codec.decode(OCTETSTRING(is.lengthof() - s, static_cast<const unsigned char *>(is)), denm) == -1) {
		@@ -69,91 +69,91 @@ namespace LibItsDenm__EncdecDeclarations {
		TTCN_Buffer decoding_buffer(OCTETSTRING(s, static_cast<const unsigned char *>(is) + is.lengthof() - s));
		loggers::get_instance().log_to_hexa("fx__dec__DENM: ", decoding_buffer);
		// gnNextHeader
		if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsDenm__TestSystem::DenmInd_gnNextHeader_raw_.fieldlength / 8)) {
		if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsDenm__TypesAndValues::DenmInd_gnNextHeader_raw_.fieldlength / 8)) {
		p_denmInd.gnNextHeader().set_to_omit();
		} else {
		OCTETSTRING os;
		os.decode(LibItsDenm__TestSystem::DenmInd_gnNextHeader_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);
		os.decode(LibItsDenm__TypesAndValues::DenmInd_gnNextHeader_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);
		p_denmInd.gnNextHeader() = oct2int(os);
		}
		loggers::get_instance().log_msg("fx__dec__DENM: gnNextHeader=", p_denmInd.gnNextHeader());
		loggers::get_instance().log_to_hexa("fx__dec__DENM: ", decoding_buffer);
		// gnHeaderType
		if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsDenm__TestSystem::DenmInd_gnHeaderType_raw_.fieldlength / 8)) {
		if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsDenm__TypesAndValues::DenmInd_gnHeaderType_raw_.fieldlength / 8)) {
		p_denmInd.gnHeaderType().set_to_omit();
		} else {
		OCTETSTRING os;
		os.decode(LibItsDenm__TestSystem::DenmInd_gnHeaderType_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);
		os.decode(LibItsDenm__TypesAndValues::DenmInd_gnHeaderType_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);
		p_denmInd.gnHeaderType() = oct2int(os);
		}
		loggers::get_instance().log_msg("fx__dec__DENM: gnHeaderType=", p_denmInd.gnHeaderType());
		loggers::get_instance().log_to_hexa("fx__dec__DENM: ", decoding_buffer);
		// gnHeaderSubtype
		if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsDenm__TestSystem::DenmInd_gnHeaderSubtype_raw_.fieldlength / 8)) {
		if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsDenm__TypesAndValues::DenmInd_gnHeaderSubtype_raw_.fieldlength / 8)) {
		p_denmInd.gnHeaderSubtype().set_to_omit();
		} else {
		OCTETSTRING os;
		os.decode(LibItsDenm__TestSystem::DenmInd_gnHeaderSubtype_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);
		os.decode(LibItsDenm__TypesAndValues::DenmInd_gnHeaderSubtype_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);
		p_denmInd.gnHeaderSubtype() = oct2int(os);
		}
		loggers::get_instance().log_msg("fx__dec__DENM: gnHeaderSubType=", p_denmInd.gnHeaderSubtype());
		loggers::get_instance().log_to_hexa("fx__dec__DENM: ", decoding_buffer);
		// gnLifetime
		if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsDenm__TestSystem::DenmInd_gnLifetime_raw_.fieldlength / 8)) {
		if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsDenm__TypesAndValues::DenmInd_gnLifetime_raw_.fieldlength / 8)) {
		p_denmInd.gnLifetime().set_to_omit();
		} else {
		OCTETSTRING os;
		os.decode(LibItsDenm__TestSystem::DenmInd_gnLifetime_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);
		os.decode(LibItsDenm__TypesAndValues::DenmInd_gnLifetime_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);
		p_denmInd.gnLifetime() = oct2int(os);
		}
		loggers::get_instance().log_msg("fx__dec__DENM: gnLifetime=", p_denmInd.gnLifetime());
		loggers::get_instance().log_to_hexa("fx__dec__DENM: ", decoding_buffer);
		// gnTrafficClass
		if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsDenm__TestSystem::DenmInd_gnTrafficClass_raw_.fieldlength / 8)) {
		if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsDenm__TypesAndValues::DenmInd_gnTrafficClass_raw_.fieldlength / 8)) {
		p_denmInd.gnTrafficClass().set_to_omit();
		} else {
		OCTETSTRING os;
		os.decode(LibItsDenm__TestSystem::DenmInd_gnTrafficClass_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);
		os.decode(LibItsDenm__TypesAndValues::DenmInd_gnTrafficClass_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);
		p_denmInd.gnTrafficClass() = oct2int(os);
		}
		loggers::get_instance().log_msg("fx__dec__DENM: gnTrafficClass=", p_denmInd.gnTrafficClass());
		loggers::get_instance().log_to_hexa("fx__dec__DENM: ", decoding_buffer);
		// btpDestinationPort
		if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsDenm__TestSystem::DenmInd_btpDestinationPort_raw_.fieldlength / 8)) {
		if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsDenm__TypesAndValues::DenmInd_btpDestinationPort_raw_.fieldlength / 8)) {
		p_denmInd.btpDestinationPort().set_to_omit();
		} else {
		OCTETSTRING os;
		os.decode(LibItsDenm__TestSystem::DenmInd_btpDestinationPort_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);
		os.decode(LibItsDenm__TypesAndValues::DenmInd_btpDestinationPort_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);
		p_denmInd.btpDestinationPort() = oct2int(os);
		}
		loggers::get_instance().log_msg("fx__dec__DENM: btpDestinationPort=", p_denmInd.btpDestinationPort());
		loggers::get_instance().log_to_hexa("fx__dec__DENM: ", decoding_buffer);
		// btpInfo
		if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsDenm__TestSystem::DenmInd_btpInfo_raw_.fieldlength / 8)) {
		if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsDenm__TypesAndValues::DenmInd_btpInfo_raw_.fieldlength / 8)) {
		p_denmInd.btpInfo().set_to_omit();
		} else {
		OCTETSTRING os;
		os.decode(LibItsDenm__TestSystem::DenmInd_btpInfo_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);
		os.decode(LibItsDenm__TypesAndValues::DenmInd_btpInfo_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);
		p_denmInd.btpInfo() = oct2int(os);
		}
		loggers::get_instance().log_msg("fx__dec__DENM: btpInfo=", p_denmInd.btpInfo());
		loggers::get_instance().log_to_hexa("fx__dec__DENM: ", decoding_buffer);
		// ssp
		if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsDenm__TestSystem::DenmInd_ssp_raw_.fieldlength / 8)) {
		if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsDenm__TypesAndValues::DenmInd_ssp_raw_.fieldlength / 8)) {
		p_denmInd.ssp().set_to_omit();
		} else {
		BITSTRING bs;
		bs.decode(LibItsDenm__TestSystem::DenmInd_ssp_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);
		bs.decode(LibItsDenm__TypesAndValues::DenmInd_ssp_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);
		p_denmInd.ssp() = bs;
		}
		loggers::get_instance().log_msg("fx__dec__DENM: ssp=", p_denmInd.ssp());
		loggers::get_instance().log_to_hexa("fx__dec__DENM: ", decoding_buffer);
		// its__aid
		if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsDenm__TestSystem::DenmInd_its__aid_raw_.fieldlength / 8)) {
		if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsDenm__TypesAndValues::DenmInd_its__aid_raw_.fieldlength / 8)) {
		p_denmInd.its__aid().set_to_omit();
		} else {
		OCTETSTRING os;
		os.decode(LibItsDenm__TestSystem::DenmInd_its__aid_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);
		os.decode(LibItsDenm__TypesAndValues::DenmInd_its__aid_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);
		p_denmInd.its__aid() = oct2int(os);
		}
		loggers::get_instance().log_msg("fx__dec__DENM: its_aid=", p_denmInd.its__aid());

ccsrc/EncDec/LibItsGeoNetworking_Encdec.cc

+268 −268

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@ namespace LibItsGeoNetworking__EncdecDeclarations {
		* \param[in] p_geoNetworkingReq The value to encode
		* \return encoded value
		****************************************************/
		BITSTRING fx__enc__GeoNetworkingReq(LibItsGeoNetworking__TestSystem::GeoNetworkingReq const &p_geoNetworkingReq) {
		BITSTRING fx__enc__GeoNetworkingReq(LibItsGeoNetworking__TypesAndValues::GeoNetworkingReq const &p_geoNetworkingReq) {
		loggers::get_instance().log_msg(">>> fx__enc__GeoNetworkingReq: ", p_geoNetworkingReq);

		float duration;
		@@ -55,15 +55,15 @@ namespace LibItsGeoNetworking__EncdecDeclarations {
		* @return encoded value
		****************************************************/

		INTEGER fx__dec__GeoNetworkingReq(BITSTRING &b, LibItsGeoNetworking__TestSystem::GeoNetworkingReq &p) {
		INTEGER fx__dec__GeoNetworkingReq(BITSTRING &b, LibItsGeoNetworking__TypesAndValues::GeoNetworkingReq &p) {
		loggers::get_instance().log(">>> fx__dec__GeoNetworkingReq");
		geonetworking_codec codec;
		LibItsGeoNetworking__TypesAndValues::GeoNetworkingPdu pdu;
		OCTETSTRING is = bit2oct(b);

		// Calculate the size of the lower layers information
		unsigned int s = (LibItsGeoNetworking__TestSystem::GeoNetworkingInd_macDestinationAddress_raw_.fieldlength +
		LibItsGeoNetworking__TestSystem::GeoNetworkingInd_its__aid_raw_.fieldlength) /
		unsigned int s = (LibItsGeoNetworking__TypesAndValues::GeoNetworkingInd_macDestinationAddress_raw_.fieldlength +
		LibItsGeoNetworking__TypesAndValues::GeoNetworkingInd_its__aid_raw_.fieldlength) /
		8;
		if (codec.decode(OCTETSTRING(is.lengthof() - s, static_cast<const unsigned char *>(is)), pdu) == -1) {
		loggers::get_instance().warning("fx__dec__GeoNetworkingReq: -1 result code was returned");
		@@ -85,7 +85,7 @@ namespace LibItsGeoNetworking__EncdecDeclarations {
		* @param value to encode
		* @return encoded value
		****************************************************/
		BITSTRING fx__enc__GeoNetworkingInd(LibItsGeoNetworking__TestSystem::GeoNetworkingInd const &p_geoNetworkingInd) {
		BITSTRING fx__enc__GeoNetworkingInd(LibItsGeoNetworking__TypesAndValues::GeoNetworkingInd const &p_geoNetworkingInd) {
		loggers::get_instance().log_msg(">>> fx__enc__GeoNetworkingInd: ", p_geoNetworkingInd);

		geonetworking_codec codec;
		@@ -115,7 +115,7 @@ namespace LibItsGeoNetworking__EncdecDeclarations {
		* @return encoded value
		****************************************************/

		INTEGER fx__dec__GeoNetworkingInd(BITSTRING &b, LibItsGeoNetworking__TestSystem::GeoNetworkingInd &p_geoNetworkingInd) {
		INTEGER fx__dec__GeoNetworkingInd(BITSTRING &b, LibItsGeoNetworking__TypesAndValues::GeoNetworkingInd &p_geoNetworkingInd) {
		loggers::get_instance().log(">>> fx__dec__GeoNetworkingInd");

		float duration;
		@@ -128,8 +128,8 @@ namespace LibItsGeoNetworking__EncdecDeclarations {

		// Calculate the size of the lower layers information
		unsigned int s =
		(LibItsGeoNetworking__TestSystem::GeoNetworkingInd_macDestinationAddress_raw_.fieldlength +
		LibItsGeoNetworking__TestSystem::GeoNetworkingInd_ssp_raw_.fieldlength + LibItsGeoNetworking__TestSystem::GeoNetworkingInd_its__aid_raw_.fieldlength) /
		(LibItsGeoNetworking__TypesAndValues::GeoNetworkingInd_macDestinationAddress_raw_.fieldlength +
		LibItsGeoNetworking__TypesAndValues::GeoNetworkingInd_ssp_raw_.fieldlength + LibItsGeoNetworking__TypesAndValues::GeoNetworkingInd_its__aid_raw_.fieldlength) /
		8;
		if (codec.decode(OCTETSTRING(is.lengthof() - s, static_cast<const unsigned char *>(is)), pdu) == -1) {
		loggers::get_instance().warning("fx__dec__GeoNetworkingInd: -1 result code was returned");

ccsrc/EncDec/LibItsIvim_Encdec.cc

+26 −26

File changed.

Preview size limit exceeded, changes collapsed.

Admin message