fix compilation errors (4e5fff6a) · Commits · ITS - Intelligent Transport Systems / ITS

ccsrc/Asn1c/asn1_recode_per.hh

+0 −2

Original line number	Diff line number	Diff line
		@@ -10,8 +10,6 @@
		*/
		#pragma once

		#include "Params.hh"

		class OCTETSTRING; //! Forward declaration of TITAN class
		class CHARSTRING; //! Forward declaration of TITAN class
		class BITSTRING; //! Forward declaration of TITAN class

ccsrc/Protocols/UpperTester/UpperTesterGnLayer.cc

+4 −4

Original line number	Diff line number	Diff line
		@@ -47,14 +47,14 @@ void UpperTesterGnLayer::sendMsg(const LibItsGeoNetworking__TypesAndValues::UtGn
		}
		}

		void UpperTesterGnLayer::sendMsg(const LibItsGeoNetworking__TypesAndValues::UtGnTrigger& send_par, params& params)
		void UpperTesterGnLayer::sendMsg(const LibItsGeoNetworking__TypesAndValues::UtGnTrigger& send_par, params& p_params)
		{
		loggers::get_instance().log_msg(">>> UpperTesterGnLayer::sendMsg", send_par);

		if (_params[params::loopback].compare("1") == 0) {
		LibItsGeoNetworking__TypesAndValues::UtGnResults ut_gn_results;
		ut_gn_results.utGnTriggerResult() = BOOLEAN(true);
		to_all_upper_ports(ut_gn_results, params);
		to_all_upper_ports(ut_gn_results, p_params);
		} else {
		// Encode UpperTester PDU
		OCTETSTRING data;
		@@ -64,14 +64,14 @@ void UpperTesterGnLayer::sendMsg(const LibItsGeoNetworking__TypesAndValues::UtGn
		}
		}

		void UpperTesterGnLayer::sendMsg(const LibItsGeoNetworking__TypesAndValues::UtAutoInteropTrigger& send_par, params& params)
		void UpperTesterGnLayer::sendMsg(const LibItsGeoNetworking__TypesAndValues::UtAutoInteropTrigger& send_par, params& p_params)
		{
		loggers::get_instance().log_msg(">>> UpperTesterGnLayer::sendMsg", send_par);

		if (_params[params::loopback].compare("1") == 0) {
		LibItsGeoNetworking__TypesAndValues::UtGnResults ut_gn_results;
		ut_gn_results.utGnTriggerResult() = BOOLEAN(true);
		to_all_upper_ports(ut_gn_results, params);
		to_all_upper_ports(ut_gn_results, p_params);
		} else {
		// Encode UpperTester PDU
		OCTETSTRING data;

ttcn/AtsBTP/ItsBtp_TestCases.ttcn

+2 −2

Original line number	Diff line number	Diff line
		@@ -298,7 +298,7 @@ module ItsBtp_TestCases {
		btpPort.send(v_btpReq);

		f_sleep(PX_TNOAC);
		for(i:=0; i < lengthof(vc_utEvents) and not match(v_btpReq.msgOut.payload.rawPayload, vc_utEvents[i].rawPayload); i:=i+1) {
		for(i:=0; i < lengthof(vc_utEvents) and not match(v_btpReq.msgOut.payload, vc_utEvents[i].rawPayload); i:=i+1) {
		// empty on purpose
		}
		if(i < lengthof(vc_utEvents)) {
		@@ -365,7 +365,7 @@ module ItsBtp_TestCases {
		btpPort.send(v_btpReq);

		f_sleep(PX_TNOAC);
		for(i:=0; i < lengthof(vc_utEvents) and not match(v_btpReq.msgOut.payload.rawPayload, vc_utEvents[i].rawPayload); i:=i+1) {
		for(i:=0; i < lengthof(vc_utEvents) and not match(v_btpReq.msgOut.payload, vc_utEvents[i].rawPayload); i:=i+1) {
		// empty on purpose
		}
		if(i < lengthof(vc_utEvents)) {

ttcn/AtsIVIM/ItsIvim_TpFunctions.ttcn

+9 −9

Original line number	Diff line number	Diff line
		@@ -458,7 +458,7 @@ module ItsIvim_TpFunctions {
		f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);

		// Test Body
		f_utUpdateEvent(m_utUpdateEvent(v_iviIdentificationNumber));
		f_utUpdateEvent(m_utIvimUpdateEvent(v_iviIdentificationNumber));

		tc_ac.start;
		alt {
		@@ -530,7 +530,7 @@ module ItsIvim_TpFunctions {
		)))),
		v_rcvdMsg
		);
		f_utUpdateEvent(m_utUpdateEvent(v_iviIdentificationNumber));
		f_utUpdateEvent(m_utIvimUpdateEvent(v_iviIdentificationNumber));
		f_awaitIviMessage(
		mw_ivimInd(
		mw_anyIvimPdu(
		@@ -547,7 +547,7 @@ module ItsIvim_TpFunctions {

		// Test Body
		v_validTo := f_getCurrentTime() + 1000 * 3600; // Current ITS time + one hour
		f_utUpdateEvent(m_utUpdateEvent(v_iviIdentificationNumber, -, v_validTo));
		f_utUpdateEvent(m_utIvimUpdateEvent(v_iviIdentificationNumber, -, v_validTo));

		tc_ac.start;
		alt {
		@@ -620,7 +620,7 @@ module ItsIvim_TpFunctions {
		)))),
		v_rcvdMsg
		);
		f_utUpdateEvent(m_utUpdateEvent(v_iviIdentificationNumber));
		f_utUpdateEvent(m_utIvimUpdateEvent(v_iviIdentificationNumber));
		f_awaitIviMessage(
		mw_ivimInd(
		mw_anyIvimPdu(
		@@ -637,7 +637,7 @@ module ItsIvim_TpFunctions {

		// Test Body
		v_validFrom := f_getCurrentTime() + 1000 * 3600; // Current ITS time + one hour
		f_utUpdateEvent(m_utUpdateEvent(v_iviIdentificationNumber, -, v_validFrom));
		f_utUpdateEvent(m_utIvimUpdateEvent(v_iviIdentificationNumber, -, v_validFrom));

		tc_ac.start;
		alt {
		@@ -715,7 +715,7 @@ module ItsIvim_TpFunctions {

		// Test Body
		v_timestamp := f_getCurrentTime();
		f_utUpdateEvent(m_utUpdateEvent(v_iviIdentificationNumber));
		f_utUpdateEvent(m_utIvimUpdateEvent(v_iviIdentificationNumber));

		tc_ac.start;
		alt {
		@@ -794,7 +794,7 @@ module ItsIvim_TpFunctions {
		f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);

		// Test Body
		f_utUpdateEvent(m_utUpdateEvent(v_iviIdentificationNumber));
		f_utUpdateEvent(m_utIvimUpdateEvent(v_iviIdentificationNumber));

		tc_ac.start;
		alt {
		@@ -878,7 +878,7 @@ module ItsIvim_TpFunctions {
		f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);

		// Test Body
		f_utUpdateEvent(m_utUpdateEvent(v_iviIdentificationNumber, c_duration_4sec));
		f_utUpdateEvent(m_utIvimUpdateEvent(v_iviIdentificationNumber, c_duration_4sec));

		tc_ac.start;
		ivimPort.clear;
		@@ -970,7 +970,7 @@ module ItsIvim_TpFunctions {
		f_selfOrClientSyncAndVerdictPreamble(c_prDone, e_success);

		// Test Body
		f_utUpdateEvent(m_utUpdateEvent(v_iviIdentificationNumber, c_repetition_interval_deactivated));
		f_utUpdateEvent(m_utIvimUpdateEvent(v_iviIdentificationNumber, c_repetition_interval_deactivated));

		ivimPort.clear;
		tc_noac.start;

ttcn/TestCodec/TestCodec_ChainOfCertificates.ttcn

+2 −2

Original line number	Diff line number	Diff line
		@@ -142,7 +142,7 @@ module TestCodec_ChainOfCertificates {
		v_enc_msg := encvalue(v_secured_data.content.signedData.tbsData);
		if (f_verifyWithEcdsaNistp256WithSha256(
		bit2oct(v_enc_msg),
		valueof(v_secured_data.content.signedData.signature_.ecdsaNistP256Signature.rSig.x_only & v_secured_data.content.signedData.signature_.ecdsaNistP256Signature.sSig),
		valueof(v_secured_data.content.signedData.signature_.ecdsaNistP256Signature.rSig.x_only) & valueof(v_secured_data.content.signedData.signature_.ecdsaNistP256Signature.sSig),
		v_chain_sec_info.at.cert.toBeSigned.verifyKeyIndicator.verificationKey.ecdsaNistP256.uncompressedP256.x,
		v_chain_sec_info.at.cert.toBeSigned.verifyKeyIndicator.verificationKey.ecdsaNistP256.uncompressedP256.y
		) == false) {
		@@ -255,7 +255,7 @@ module TestCodec_ChainOfCertificates {
		v_enc_msg := encvalue(v_secured_data.content.signedData.tbsData);
		if (f_verifyWithEcdsaBrainpoolp256WithSha256(
		bit2oct(v_enc_msg),
		valueof(v_secured_data.content.signedData.signature_.ecdsaNistP256Signature.rSig.x_only & v_secured_data.content.signedData.signature_.ecdsaNistP256Signature.sSig),
		valueof(v_secured_data.content.signedData.signature_.ecdsaNistP256Signature.rSig.x_only) & valueof(v_secured_data.content.signedData.signature_.ecdsaNistP256Signature.sSig),
		v_chain_sec_info.aa.cert.toBeSigned.verifyKeyIndicator.verificationKey.ecdsaBrainpoolP256r1.uncompressedP256.x,
		v_chain_sec_info.aa.cert.toBeSigned.verifyKeyIndicator.verificationKey.ecdsaBrainpoolP256r1.uncompressedP256.y
		) == false) {

Admin message