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

asn1/PsidGroupPermissions.c.diff

100755 → 100644

+0 −0

File mode changed from 100755 to 100644.

ccsrc/Ports/LibIts_ports/IVIM_ports/IvimPort.hh

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -12,6 +12,9 @@

	#include "LibItsIvim_TestSystem.hh"		#include "LibItsIvim_TestSystem.hh"

			#include "layer.hh"
			#include "params.hh"

	namespace LibItsIvim__TestSystem {		namespace LibItsIvim__TestSystem {

	class IvimPort : public IvimPort_BASE {		class IvimPort : public IvimPort_BASE {

ccsrc/Ports/LibIts_ports/MapemSpatem_ports/MapemSpatemPort.hh

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -12,6 +12,9 @@

	#include "LibItsMapemSpatem_TestSystem.hh"		#include "LibItsMapemSpatem_TestSystem.hh"

			#include "layer.hh"
			#include "params.hh"

	namespace LibItsMapemSpatem__TestSystem {		namespace LibItsMapemSpatem__TestSystem {

	class MapemSpatemPort : public MapemSpatemPort_BASE {		class MapemSpatemPort : public MapemSpatemPort_BASE {

ccsrc/Ports/LibIts_ports/Pki_ports/AdapterControlPort_Pki.cc

+39 −12

Original line number	Original line	Diff line number	Diff line
	@@ -7,7 +7,7 @@
	//=============================================================================		//=============================================================================
	namespace LibItsPki__TestSystem {		namespace LibItsPki__TestSystem {

	AdapterControlPort::AdapterControlPort(const char *par_port_name) : AdapterControlPort_BASE(par_port_name), _params() {		AdapterControlPort::AdapterControlPort(const char par_port_name) : AdapterControlPort_BASE(par_port_name)/, _params()*/ {
	loggers::get_instance().log("AdapterControlPort::AdapterControlPort");		loggers::get_instance().log("AdapterControlPort::AdapterControlPort");
	}		}

	@@ -36,26 +36,53 @@ namespace LibItsPki__TestSystem {

	void AdapterControlPort::user_stop() {}		void AdapterControlPort::user_stop() {}

	void AdapterControlPort::outgoing_send(const LibItsPki__TypesAndValues::AcPkiPrimitive &send_par) {		void AdapterControlPort::outgoing_send(const LibItsPki__TypesAndValues::AcPkiPrimitive &send_par) {/*
	loggers::get_instance().log_msg(">>> AdapterControlPort::outgoing_send: ", send_par);		loggers::get_instance().log_msg(">>> AdapterControlPort::outgoing_send: ", send_par);

	// Register this object for AdapterControlPort		// Register this object for AdapterControlPort
	pki_layer *p = registration<pki_layer>::get_instance().get_item(std::string("PKI"));		geonetworking_layer *p = registration<geonetworking_layer>::get_instance().get_item(std::string("GN"));
	if (p != NULL) {		if (p != NULL) {
	loggers::get_instance().log("AdapterControlPort::outgoing_send: Got PKI layer %p", p);		loggers::get_instance().log("AdapterControlPort::outgoing_send: Got GN layer %p", p);
	LibItsPki__TypesAndValues::AcPkiResponse response;		LibItsGeoNetworking__TypesAndValues::AcGnResponse response;
	response.result() = BOOLEAN(false);		response.failure() = LibItsGeoNetworking__TypesAndValues::AcGnResponseFailure(BOOLEAN(false));
	if (send_par.ischosen(LibItsPki__TypesAndValues::AcPkiPrimitive::ALT_acSetSecurityData)) {		if (send_par.ischosen(LibItsGeoNetworking__TypesAndValues::AcGnPrimitive::ALT_startBeaconing)) {
	loggers::get_instance().log("AdapterControlPort::outgoing_send: AcSetSecurityData");		loggers::get_instance().log("AdapterControlPort::outgoing_send: Start beaconing");
	p->set_pki_keys(send_par.acSetSecurityData());		p->start_beaconing(send_par.startBeaconing().beaconPacket());
	response.result() = BOOLEAN(true);		// No response
			return;
			} else if (send_par.ischosen(LibItsGeoNetworking__TypesAndValues::AcGnPrimitive::ALT_stopBeaconing)) {
			loggers::get_instance().log("AdapterControlPort::outgoing_send: Stop beaconing");
			p->stop_beaconing();
			// No response
			return;
			} else if (send_par.ischosen(LibItsGeoNetworking__TypesAndValues::AcGnPrimitive::ALT_getLongPosVector)) {
			loggers::get_instance().log("AdapterControlPort::outgoing_send: Get LongPosVector");
			const LibItsGeoNetworking__TypesAndValues::LongPosVector *lpv = p->get_lpv(send_par.getLongPosVector().gnAddress());
			loggers::get_instance().log("AdapterControlPort::outgoing_send: Return value: %p", lpv);
			if (lpv == nullptr) {
			response.failure() = LibItsGeoNetworking__TypesAndValues::AcGnResponseFailure(BOOLEAN(true));
			} else {
			response.getLongPosVector() = *lpv;
			}
			} else if (send_par.ischosen(LibItsGeoNetworking__TypesAndValues::AcGnPrimitive::ALT_startPassBeaconing)) {
			loggers::get_instance().log("AdapterControlPort::outgoing_send: Start pass beaconing");
			p->start_pass_beaconing(send_par.startPassBeaconing().beaconHeader());
			// No response
			return;
			} else if (send_par.ischosen(LibItsGeoNetworking__TypesAndValues::AcGnPrimitive::ALT_stopPassBeaconing)) {
			loggers::get_instance().log("AdapterControlPort::outgoing_send: Stop pass beaconing");
			p->stop_pass_beaconing();
			// No response
			return;
			} else {
			response.failure() = LibItsGeoNetworking__TypesAndValues::AcGnResponseFailure(BOOLEAN(true));
	}		}
	// Send response		// Send response
	loggers::get_instance().log_msg("AdapterControlPort::outgoing_send: Send response: ", response);		loggers::get_instance().log_msg("AdapterControlPort::outgoing_send: Send response: ", response);
	incoming_message(response);		incoming_message(response);
	} else {		} else {
	loggers::get_instance().error("AdapterControlPort::outgoing_send: pkiPort not registered");		loggers::get_instance().error("AdapterControlPort::outgoing_send: %s not registered", "geoNetworkingPort");
	}		}*/
	}		}

	} // namespace LibItsPki__TestSystem		} // namespace LibItsPki__TestSystem

ccsrc/Ports/LibIts_ports/Pki_ports/AdapterControlPort_Pki.hh

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -4,12 +4,12 @@

	#include "LibItsPki_TestSystem.hh"		#include "LibItsPki_TestSystem.hh"

	#include "params.hh"		//#include "params.hh"

	namespace LibItsPki__TestSystem {		namespace LibItsPki__TestSystem {

	class AdapterControlPort : public AdapterControlPort_BASE {		class AdapterControlPort : public AdapterControlPort_BASE {
	params _params;		// params _params;

	public:		public:
	AdapterControlPort(const char *par_port_name = NULL);		AdapterControlPort(const char *par_port_name = NULL);

Admin message