Resolve conflicts (8fefe9dc) · Commits · ITS - Intelligent Transport Systems / ITS Test Suite

ccsrc/Ports/LibIts_ports/RSUsSimulator_ports/ConfigRsuSimulatorLayer.cc

+27 −0

Original line number	Original line	Diff line number	Diff line
	@@ -137,6 +137,9 @@ void ConfigRsuSimulatorLayer::sendMsg(const LibItsDenm__TypesAndValues::UtDenmRe
	} else if (send_par.ischosen(LibItsDenm__TypesAndValues::UtDenmResults::ALT_utDenmTerminationResult)) {		} else if (send_par.ischosen(LibItsDenm__TypesAndValues::UtDenmResults::ALT_utDenmTerminationResult)) {
	encoding_buffer.put_c(static_cast<const uint8_t>(uppertester_denm_codec::c_utDenmTerminationResult));		encoding_buffer.put_c(static_cast<const uint8_t>(uppertester_denm_codec::c_utDenmTerminationResult));
	encoding_buffer.put_c((uint8_t)static_cast<const boolean>(send_par.utDenmTerminationResult()));		encoding_buffer.put_c((uint8_t)static_cast<const boolean>(send_par.utDenmTerminationResult()));
			} else if (send_par.ischosen(LibItsDenm__TypesAndValues::UtDenmResults::ALT_utDenmChangePseudonymResult)) {
			encoding_buffer.put_c(static_cast<const uint8_t>(uppertester_denm_codec::c_utDenmChangePseudonymResult));
			encoding_buffer.put_c((uint8_t)static_cast<const boolean>(send_par.utDenmChangePseudonymResult()));
	} else {		} else {
	loggers::get_instance().warning("ConfigRsuSimulatorLayer::sendMsg: Unsupported UtDenmResults variant");		loggers::get_instance().warning("ConfigRsuSimulatorLayer::sendMsg: Unsupported UtDenmResults variant");
	return;		return;
	@@ -434,6 +437,8 @@ void ConfigRsuSimulatorLayer::receive_data(OCTETSTRING &data, params &params) {
	process_ut_denm_update(data, params);		process_ut_denm_update(data, params);
	} else if (id == uppertester_denm_codec::c_utDenmTermination) {		} else if (id == uppertester_denm_codec::c_utDenmTermination) {
	process_ut_denm_termination(data, params);		process_ut_denm_termination(data, params);
			} else if (id == uppertester_denm_codec::c_utDenmChangePseudonym) {
			process_ut_denm_changepseudonym(data, params);
	} else if (id == uppertester_mapem_spatem_codec::c_utMapemSpatemTrigger) {		} else if (id == uppertester_mapem_spatem_codec::c_utMapemSpatemTrigger) {
	process_ut_mapem_spatem_trigger(data, params);		process_ut_mapem_spatem_trigger(data, params);
	} else if (id == uppertester_ivim_codec::c_utIvimTrigger) {		} else if (id == uppertester_ivim_codec::c_utIvimTrigger) {
	@@ -834,6 +839,28 @@ int ConfigRsuSimulatorLayer::process_ut_denm_termination(const OCTETSTRING &data
	return 0;		return 0;
	}		}

			int ConfigRsuSimulatorLayer::process_ut_denm_changepseudonym(const OCTETSTRING &data, params &params) {
			loggers::get_instance().log(">>> ConfigRsuSimulatorLayer::process_ut_denm_changepseudonym");

			params::const_iterator it = _params.find("ut");
			if (it == _params.cend()) {
			loggers::get_instance().warning("ConfigRsuSimulatorLayer::process_ut_denm_changepseudonym: CF layer's ut parameter is missing");
			return -1;
			}

			if (_params[std::string("ut")].compare("denm") == 0) {
			OCTETSTRING hashedId(data.lengthof() - 1, 1 + static_cast<const uint8_t *>(data));
			LibItsDenm__TypesAndValues::UtDenmChangePseudonym p(hashedId);
			// Pass it to the ports if any
			to_all_upper_ports(p, params);
			} else {
			loggers::get_instance().warning("ConfigRsuSimulatorLayer::process_ut_denm_changepseudonym: Unsupported protocol");
			return -1;
			}

			return 0;
			}

	int ConfigRsuSimulatorLayer::process_ut_geonetworking_trigger(const OCTETSTRING &data, params &params) {		int ConfigRsuSimulatorLayer::process_ut_geonetworking_trigger(const OCTETSTRING &data, params &params) {
	loggers::get_instance().log(">>> ConfigRsuSimulatorLayer::process_ut_geonetworking_trigger");		loggers::get_instance().log(">>> ConfigRsuSimulatorLayer::process_ut_geonetworking_trigger");

ccsrc/Ports/LibIts_ports/RSUsSimulator_ports/ConfigRsuSimulatorLayer.hh

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -72,6 +72,7 @@ private:
	int process_ut_denm_trigger(const OCTETSTRING &data, params &params);		int process_ut_denm_trigger(const OCTETSTRING &data, params &params);
	int process_ut_denm_update(const OCTETSTRING &data, params &params);		int process_ut_denm_update(const OCTETSTRING &data, params &params);
	int process_ut_denm_termination(const OCTETSTRING &data, params &params);		int process_ut_denm_termination(const OCTETSTRING &data, params &params);
			int process_ut_denm_changepseudonym(const OCTETSTRING &data, params &params);
	int process_ut_geonetworking_trigger(const OCTETSTRING &data, params &params);		int process_ut_geonetworking_trigger(const OCTETSTRING &data, params &params);
	int process_ut_pki_trigger(const OCTETSTRING &data, params &params);		int process_ut_pki_trigger(const OCTETSTRING &data, params &params);
	int process_ut_mbr_trigger(const OCTETSTRING &data, params &params);		int process_ut_mbr_trigger(const OCTETSTRING &data, params &params);

ccsrc/Protocols/UpperTester/uppertester_cam_codec.cc

+2 −2

ccsrc/Protocols/UpperTester/uppertester_denm_codec.cc

+2 −2

ccsrc/Protocols/UpperTester/uppertester_geonetworking_codec.cc

+13 −11

Original line number	Original line	Diff line number	Diff line
	@@ -21,6 +21,8 @@ uint8_t uppertester_geonetworking_codec::c_utGnTrigger_GeoAnycast = 0x52;
	uint8_t uppertester_geonetworking_codec::c_utGnTrigger_Shb = 0x53;		uint8_t uppertester_geonetworking_codec::c_utGnTrigger_Shb = 0x53;
	uint8_t uppertester_geonetworking_codec::c_utGnTrigger_Tsb = 0x54;		uint8_t uppertester_geonetworking_codec::c_utGnTrigger_Tsb = 0x54;
	uint8_t uppertester_geonetworking_codec::c_utGnEventIndication = 0x55;		uint8_t uppertester_geonetworking_codec::c_utGnEventIndication = 0x55;
			uint8_t uppertester_geonetworking_codec::c_utGnChangePseudonym = 0x56;
			uint8_t uppertester_geonetworking_codec::c_utGnChangePseudonymResult = 0x57;

	int uppertester_geonetworking_codec::encode(const Record_Type &msg, OCTETSTRING &data) {		int uppertester_geonetworking_codec::encode(const Record_Type &msg, OCTETSTRING &data) {
	loggers::get_instance().log_msg(">>> uppertester_geonetworking_codec::encode: ", (const Record_Type &)msg);		loggers::get_instance().log_msg(">>> uppertester_geonetworking_codec::encode: ", (const Record_Type &)msg);

Original line number	Original line	Diff line number	Diff line
	@@ -15,8 +15,6 @@ uint8_t uppertester_cam_codec::c_utCamInitialize = 0x00;
	uint8_t uppertester_cam_codec::c_utCamInitializeResult = 0x01;		uint8_t uppertester_cam_codec::c_utCamInitializeResult = 0x01;
	uint8_t uppertester_cam_codec::c_utCamChangePosition = 0x02;		uint8_t uppertester_cam_codec::c_utCamChangePosition = 0x02;
	uint8_t uppertester_cam_codec::c_utCamChangePositionResult = 0x03;		uint8_t uppertester_cam_codec::c_utCamChangePositionResult = 0x03;
	uint8_t uppertester_cam_codec::c_utCamChangePseudonym = 0x04;
	uint8_t uppertester_cam_codec::c_utCamChangePseudonymResult = 0x05;
	uint8_t uppertester_cam_codec::c_utCamChangeCurvature = 0x30;		uint8_t uppertester_cam_codec::c_utCamChangeCurvature = 0x30;
	uint8_t uppertester_cam_codec::c_utCamChangeSpeed = 0x31;		uint8_t uppertester_cam_codec::c_utCamChangeSpeed = 0x31;
	uint8_t uppertester_cam_codec::c_utCamSetAccelerationStatus = 0x32;		uint8_t uppertester_cam_codec::c_utCamSetAccelerationStatus = 0x32;
	@@ -30,6 +28,8 @@ uint8_t uppertester_cam_codec::c_utCamSetEmbarkationStatus = 0x3b;
	uint8_t uppertester_cam_codec::c_utCamSetPtActivation = 0x3c;		uint8_t uppertester_cam_codec::c_utCamSetPtActivation = 0x3c;
	uint8_t uppertester_cam_codec::c_utCamSetDangerousGoods = 0x3d;		uint8_t uppertester_cam_codec::c_utCamSetDangerousGoods = 0x3d;
	uint8_t uppertester_cam_codec::c_utCamSetLightBarSirene = 0x3f;		uint8_t uppertester_cam_codec::c_utCamSetLightBarSirene = 0x3f;
			uint8_t uppertester_cam_codec::c_utCamChangePseudonym = 0x40;
			uint8_t uppertester_cam_codec::c_utCamChangePseudonymResult = 0x41;
	uint8_t uppertester_cam_codec::c_utCamTriggerResult = 0x21;		uint8_t uppertester_cam_codec::c_utCamTriggerResult = 0x21;
	uint8_t uppertester_cam_codec::c_utCamEventInd = 0x23;		uint8_t uppertester_cam_codec::c_utCamEventInd = 0x23;

Original line number	Original line	Diff line number	Diff line
	@@ -16,8 +16,6 @@ uint8_t uppertester_denm_codec::c_utDenmInitialize = 0x00;
	uint8_t uppertester_denm_codec::c_utDenmInitializeResult = 0x01;		uint8_t uppertester_denm_codec::c_utDenmInitializeResult = 0x01;
	uint8_t uppertester_denm_codec::c_utDenmChangePosition = 0x02;		uint8_t uppertester_denm_codec::c_utDenmChangePosition = 0x02;
	uint8_t uppertester_denm_codec::c_utDenmChangePositionResult = 0x03;		uint8_t uppertester_denm_codec::c_utDenmChangePositionResult = 0x03;
	uint8_t uppertester_denm_codec::c_utDenmChangePseudonym = 0x04;
	uint8_t uppertester_denm_codec::c_utDenmChangePseudonymResult = 0x05;
	uint8_t uppertester_denm_codec::c_utDenmTrigger = 0x10;		uint8_t uppertester_denm_codec::c_utDenmTrigger = 0x10;
	uint8_t uppertester_denm_codec::c_utDenmTriggerResult = 0x11;		uint8_t uppertester_denm_codec::c_utDenmTriggerResult = 0x11;
	uint8_t uppertester_denm_codec::c_utDenmUpdate = 0x12;		uint8_t uppertester_denm_codec::c_utDenmUpdate = 0x12;
	@@ -25,6 +23,8 @@ uint8_t uppertester_denm_codec::c_utDenmUpdateResult = 0x13;
	uint8_t uppertester_denm_codec::c_utDenmTermination = 0x14;		uint8_t uppertester_denm_codec::c_utDenmTermination = 0x14;
	uint8_t uppertester_denm_codec::c_utDenmTerminationResult = 0x15;		uint8_t uppertester_denm_codec::c_utDenmTerminationResult = 0x15;
	uint8_t uppertester_denm_codec::c_utDenmEventIndication = 0x17;		uint8_t uppertester_denm_codec::c_utDenmEventIndication = 0x17;
			uint8_t uppertester_denm_codec::c_utDenmChangePseudonym = 0x18;
			uint8_t uppertester_denm_codec::c_utDenmChangePseudonymResult = 0x19;

	int uppertester_denm_codec::encode(const Record_Type &msg, OCTETSTRING &data) {		int uppertester_denm_codec::encode(const Record_Type &msg, OCTETSTRING &data) {
	loggers::get_instance().log_msg(">>> uppertester_denm_codec::encode: ", (const Record_Type &)msg);		loggers::get_instance().log_msg(">>> uppertester_denm_codec::encode: ", (const Record_Type &)msg);

Admin message