Bug fixed in install.sh (bf2341d4) · Commits · ITS - Intelligent Transport Systems / ITS Test Suite

ccsrc/Ports/LibIts_ports/RSUsSimulator_ports/ConfigRsuSimulatorPort.cc

+554 −544

Original line number	Original line	Diff line number	Diff line
	@@ -361,6 +361,16 @@ namespace ItsRSUsSimulator__TestSystem {
	incoming_message(p_ind);		incoming_message(p_ind);
	}		}

			void ConfigRsuSimulatorPort::receiveMsg(const LibItsDenm__TypesAndValues::UtDenmChangePseudonym &p_ind, const params &p_params) {
			loggers::get_instance().log_msg(">>> ConfigRsuSimulatorPort::receive_msg: ", p_ind);
			// Sanity check
			if (!p_ind.is_bound()) {
			return;
			}

			incoming_message(p_ind);
			}

	void ConfigRsuSimulatorPort::receiveMsg(const LibItsPki__TypesAndValues::UtPkiInitialize &p_ind, const params &p_params) {		void ConfigRsuSimulatorPort::receiveMsg(const LibItsPki__TypesAndValues::UtPkiInitialize &p_ind, const params &p_params) {
	loggers::get_instance().log_msg(">>> ConfigRsuSimulatorPort::receive_msg: ", p_ind);		loggers::get_instance().log_msg(">>> ConfigRsuSimulatorPort::receive_msg: ", p_ind);
	// Sanity check		// Sanity check

ccsrc/Ports/LibIts_ports/RSUsSimulator_ports/ConfigRsuSimulatorPort.hh

+103 −102

Original line number	Original line	Diff line number	Diff line
	@@ -28,6 +28,7 @@ namespace ItsRSUsSimulator__TestSystem {
	void receiveMsg(const LibItsDenm__TypesAndValues::UtDenmTrigger &p_ind, const params &p_params);		void receiveMsg(const LibItsDenm__TypesAndValues::UtDenmTrigger &p_ind, const params &p_params);
	void receiveMsg(const LibItsDenm__TypesAndValues::UtDenmUpdate &p_ind, const params &p_params);		void receiveMsg(const LibItsDenm__TypesAndValues::UtDenmUpdate &p_ind, const params &p_params);
	void receiveMsg(const LibItsDenm__TypesAndValues::UtDenmTermination &p_ind, const params &p_params);		void receiveMsg(const LibItsDenm__TypesAndValues::UtDenmTermination &p_ind, const params &p_params);
			void receiveMsg(const LibItsDenm__TypesAndValues::UtDenmChangePseudonym &p_ind, const params &p_params);
	void receiveMsg(const LibItsPki__TypesAndValues::UtPkiInitialize &p_ind, const params &p_params);		void receiveMsg(const LibItsPki__TypesAndValues::UtPkiInitialize &p_ind, const params &p_params);
	void receiveMsg(const LibItsPki__TypesAndValues::UtPkiTrigger &p_ind, const params &p_params);		void receiveMsg(const LibItsPki__TypesAndValues::UtPkiTrigger &p_ind, const params &p_params);
	void receiveMsg(const LibItsMbr__TypesAndValues::UtMbrInitialize &p_ind, const params &p_params);		void receiveMsg(const LibItsMbr__TypesAndValues::UtMbrInitialize &p_ind, const params &p_params);

ccsrc/Protocols/LTE/uu_mqtt.cc

+34 −32

install.sh

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -65,5 +65,4 @@ git checkout devel2
	cd $BASE_PATH		cd $BASE_PATH
	ln ./ttcn/patch_lib_common_titan/module.mk ./ttcn/LibCommon/\		ln ./ttcn/patch_lib_common_titan/module.mk ./ttcn/LibCommon/\


	exit 0		exit 0

AtsSecurity @ 767ded71

Original line number	Original line	Diff line number	Diff line
	Subproject commit ac25a27fea14b00551822f7939fe66de4aade8cb		Subproject commit 767ded71855daade9f6d53084ffb460bf55a26e5

Original line number	Original line	Diff line number	Diff line
	@@ -49,42 +49,44 @@ int uu_mqtt::setup(const params_its &params) {
	if (it != params.cend()) {		if (it != params.cend()) {
	if (it->second.compare("obu") == 0) { // Subscribe to /3gpp/v2x/obu published messages		if (it->second.compare("obu") == 0) { // Subscribe to /3gpp/v2x/obu published messages
	// OBUs publishes to RSUs topics		// OBUs publishes to RSUs topics
	_subscribed_topics.insert(std::pair<std::string, std::string>("141", "/3gpp/v2x/obu/beacon"));		_subscribed_topics.insert(std::pair<std::string, std::string>("141", "3gpp/v2x/obu/beacon"));
	_subscribed_topics.insert(std::pair<std::string, std::string>("36", "/3gpp/v2x/obu/cam"));		_subscribed_topics.insert(std::pair<std::string, std::string>("36", "3gpp/v2x/obu/cam"));
	_subscribed_topics.insert(std::pair<std::string, std::string>("37", "/3gpp/v2x/obu/denm"));		_subscribed_topics.insert(std::pair<std::string, std::string>("37", "3gpp/v2x/obu/denm"));
	_subscribed_topics.insert(std::pair<std::string, std::string>("139", "/3gpp/v2x/obu/ivim"));		_subscribed_topics.insert(std::pair<std::string, std::string>("39", "3gpp/v2x/obu/vam"));
	_subscribed_topics.insert(std::pair<std::string, std::string>("138", "/3gpp/v2x/obu/mapem"));		_subscribed_topics.insert(std::pair<std::string, std::string>("139", "3gpp/v2x/obu/ivim"));
	_subscribed_topics.insert(std::pair<std::string, std::string>("137", "/3gpp/v2x/obu/spatem"));		_subscribed_topics.insert(std::pair<std::string, std::string>("138", "3gpp/v2x/obu/mapem"));
	_subscribed_topics.insert(std::pair<std::string, std::string>("140", "/3gpp/v2x/obu/sxem"));		_subscribed_topics.insert(std::pair<std::string, std::string>("137", "3gpp/v2x/obu/spatem"));
	_subscribed_topics.insert(std::pair<std::string, std::string>("128", "/3gpp/v2x/obu/rtcmem"));		_subscribed_topics.insert(std::pair<std::string, std::string>("140", "3gpp/v2x/obu/sxem"));
			_subscribed_topics.insert(std::pair<std::string, std::string>("128", "3gpp/v2x/obu/rtcmem"));
	// RSU publishes on OBUs topics		// RSU publishes on OBUs topics
	_topics.insert(std::pair<std::string, std::string>("141", "/3gpp/v2x/rsu/beacon"));		_topics.insert(std::pair<std::string, std::string>("141", "3gpp/v2x/rsu/beacon"));
	_topics.insert(std::pair<std::string, std::string>("36", "/3gpp/v2x/rsu/cam"));		_topics.insert(std::pair<std::string, std::string>("36", "3gpp/v2x/rsu/cam"));
	_topics.insert(std::pair<std::string, std::string>("37", "/3gpp/v2x/rsu/denm"));		_topics.insert(std::pair<std::string, std::string>("37", "3gpp/v2x/rsu/denm"));
	_topics.insert(std::pair<std::string, std::string>("139", "/3gpp/v2x/rsu/ivim"));		_topics.insert(std::pair<std::string, std::string>("39", "3gpp/v2x/rsu/vam"));
	_topics.insert(std::pair<std::string, std::string>("138", "/3gpp/v2x/rsu/mapem"));		_topics.insert(std::pair<std::string, std::string>("139", "3gpp/v2x/rsu/ivim"));
	_topics.insert(std::pair<std::string, std::string>("137", "/3gpp/v2x/rsu/spatem"));		_topics.insert(std::pair<std::string, std::string>("138", "3gpp/v2x/rsu/mapem"));
	_topics.insert(std::pair<std::string, std::string>("140", "/3gpp/v2x/rsu/sxem"));		_topics.insert(std::pair<std::string, std::string>("137", "3gpp/v2x/rsu/spatem"));
	_topics.insert(std::pair<std::string, std::string>("128", "/3gpp/v2x/rsu/rtcmem"));		_topics.insert(std::pair<std::string, std::string>("140", "3gpp/v2x/rsu/sxem"));
			_topics.insert(std::pair<std::string, std::string>("128", "3gpp/v2x/rsu/rtcmem"));
	} else { // Subscribe to /3gpp/v2x/rsu published messages		} else { // Subscribe to /3gpp/v2x/rsu published messages
	// OBU subscribes to RSUs topics		// OBU subscribes to RSUs topics
	_subscribed_topics.insert(std::pair<std::string, std::string>("141", "/3gpp/v2x/rsu/beacon"));		_subscribed_topics.insert(std::pair<std::string, std::string>("141", "3gpp/v2x/rsu/beacon"));
	_subscribed_topics.insert(std::pair<std::string, std::string>("36", "/3gpp/v2x/rsu/cam"));		_subscribed_topics.insert(std::pair<std::string, std::string>("36", "3gpp/v2x/rsu/cam"));
	_subscribed_topics.insert(std::pair<std::string, std::string>("37", "/3gpp/v2x/rsu/denm"));		_subscribed_topics.insert(std::pair<std::string, std::string>("37", "3gpp/v2x/rsu/denm"));
	_subscribed_topics.insert(std::pair<std::string, std::string>("139", "/3gpp/v2x/rsu/ivim"));		_subscribed_topics.insert(std::pair<std::string, std::string>("139", "3gpp/v2x/rsu/ivim"));
	_subscribed_topics.insert(std::pair<std::string, std::string>("138", "/3gpp/v2x/rsu/mapem"));		_subscribed_topics.insert(std::pair<std::string, std::string>("138", "3gpp/v2x/rsu/mapem"));
	_subscribed_topics.insert(std::pair<std::string, std::string>("137", "/3gpp/v2x/rsu/spatem"));		_subscribed_topics.insert(std::pair<std::string, std::string>("137", "3gpp/v2x/rsu/spatem"));
	_subscribed_topics.insert(std::pair<std::string, std::string>("140", "/3gpp/v2x/rsu/sxem"));		_subscribed_topics.insert(std::pair<std::string, std::string>("140", "3gpp/v2x/rsu/sxem"));
	_subscribed_topics.insert(std::pair<std::string, std::string>("128", "/3gpp/v2x/rsu/rtcmem"));		_subscribed_topics.insert(std::pair<std::string, std::string>("128", "3gpp/v2x/rsu/rtcmem"));
	// RSU publishes on OBUs topics		// RSU publishes on OBUs topics
	_topics.insert(std::pair<std::string, std::string>("141", "/3gpp/v2x/obu/beacon"));		_topics.insert(std::pair<std::string, std::string>("141", "3gpp/v2x/obu/beacon"));
	_topics.insert(std::pair<std::string, std::string>("36", "/3gpp/v2x/obu/cam"));		_topics.insert(std::pair<std::string, std::string>("36", "3gpp/v2x/obu/cam"));
	_topics.insert(std::pair<std::string, std::string>("37", "/3gpp/v2x/obu/denm"));		_topics.insert(std::pair<std::string, std::string>("37", "3gpp/v2x/obu/denm"));
	_topics.insert(std::pair<std::string, std::string>("139", "/3gpp/v2x/obu/ivim"));		_topics.insert(std::pair<std::string, std::string>("139", "3gpp/v2x/obu/ivim"));
	_topics.insert(std::pair<std::string, std::string>("138", "/3gpp/v2x/obu/mapem"));		_topics.insert(std::pair<std::string, std::string>("138", "3gpp/v2x/obu/mapem"));
	_topics.insert(std::pair<std::string, std::string>("137", "/3gpp/v2x/obu/spatem"));		_topics.insert(std::pair<std::string, std::string>("137", "3gpp/v2x/obu/spatem"));

Admin message