Add missing protocol ports and layers; Add UpperTesterPort & AdapterConfigPort (770659f9) · Commits · INT - Core Network and Interoperability Testing / Voice and Video over LTE / Emergency VoLTE Interoperability Tests

ccsrc/Ports/Data/DataPort.cc

0 → 100644

+73 −0

Original line number	Diff line number	Diff line
		#include "DataPort.hh"
		#include "loggers.hh"

		namespace AtsImsIot__TestSystem {

		DataPort::DataPort(const char *par_port_name): DataPort_BASE(par_port_name), _cfg_params(), _layer_params(), _layer(nullptr), _time_key("DataPort::outgoing_send") {
		// Nothing to do
		} // End of constructor

		DataPort::~DataPort() {
		loggers::get_instance().log(">>> DataPort::~DataPort");

		if (_layer != nullptr) {
		delete _layer;
		}
		} // End of destructor

		void DataPort::set_parameter(const char * parameter_name, const char * parameter_value)
		{
		loggers::get_instance().log("DataPort::set_parameter: %s=%s", parameter_name, parameter_value);
		_cfg_params.insert(std::pair<std::string, std::string>(std::string(parameter_name), std::string(parameter_value)));
		}

		/*void DataPort::Handle_Fd_Event(int fd, boolean is_readable,
		boolean is_writable, boolean is_error) {}*/

		void DataPort::Handle_Fd_Event_Error(int /fd/)
		{

		}

		void DataPort::Handle_Fd_Event_Writable(int /fd/)
		{

		}

		void DataPort::Handle_Fd_Event_Readable(int /fd/)
		{

		}

		/void DataPort::Handle_Timeout(double time_since_last_call) {}/

		void DataPort::user_map(const char * system_port)
		{
		loggers::get_instance().log(">>> DataPort::user_map: %s", system_port);
		} // End of user_map method

		void DataPort::user_unmap(const char * system_port)
		{
		loggers::get_instance().log(">>> DataPort::user_unmap: %s", system_port);

		// Reset layers
		if (_layer != nullptr) {
		delete _layer;
		_layer = nullptr;
		}
		} // End of user_unmap method

		void DataPort::user_start()
		{
		loggers::get_instance().log(">>> DataPort::user_start");

		} // End of user_start method

		void DataPort::user_stop()
		{
		loggers::get_instance().log(">>> DataPort::user_stop");

		} // End of user_stop method

		}

ccsrc/Ports/Data/DataPort.hh

0 → 100644

+45 −0

Original line number	Diff line number	Diff line
		#pragma once

		#include "AtsImsIot_TestSystem.hh"

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

		namespace AtsImsIot__TestSystem {

		class DataPort : public DataPort_BASE {
		params _cfg_params;
		params _layer_params;
		layer* _layer;
		std::string _time_key;
		public:
		DataPort(const char *par_port_name);
		~DataPort();

		void set_parameter(const char parameter_name, const char parameter_value);

		void receiveMsg (const LibSip__SIPTypesAndValues::Request& p_ind, const params& p_params) {};
		void receiveMsg (const LibSip__SIPTypesAndValues::Response& p_ind, const params& p_params) {};
		void receiveMsg (const LibMsrp__TypesAndValues::SEND__request& p_ind, const params& p_params) {};
		void receiveMsg (const LibMsrp__TypesAndValues::RECEIVE__response& p_ind, const params& p_params) {};

		private:
		/* void Handle_Fd_Event(int fd, boolean is_readable,
		boolean is_writable, boolean is_error); */
		void Handle_Fd_Event_Error(int fd);
		void Handle_Fd_Event_Writable(int fd);
		void Handle_Fd_Event_Readable(int fd);
		/* void Handle_Timeout(double time_since_last_call); */

		protected:
		void user_map(const char *system_port);
		void user_unmap(const char *system_port);

		void user_start();
		void user_stop();

		protected:
		}; // End of class DataPort

		}

ccsrc/Ports/Data/module.mk

0 → 100644

+3 −0

Original line number	Diff line number	Diff line
		sources := DataPort.cc
		includes := .

ccsrc/Ports/LibDiameter/DiameterPort.cc

+6 −139

Original line number	Diff line number	Diff line
		#include "DiameterPort.hh"
		#include "sip_layer_factory.hh"
		#include "diameter_layer_factory.hh"
		#include "loggers.hh"

		namespace LibDiameter__Interface {
		@@ -53,10 +53,10 @@ namespace LibDiameter__Interface {
		params::convert(_layer_params, it->second); // TODO This _layer_params seems to be useless
		// Create layer
		_layer = layer_stack_builder::get_instance()->create_layer_stack(it->second.c_str());
		if (static_cast<sip_layer *>(_layer) == nullptr) {
		if (static_cast<diameter_layer *>(_layer) == nullptr) {
		loggers::get_instance().error("DiameterPort::user_map: Invalid stack configuration: %s", it->second.c_str());
		}
		static_cast<sip_layer *>(_layer)->add_upper_port(this);
		static_cast<diameter_layer *>(_layer)->add_upper_port(this);

		} else {
		loggers::get_instance().error("DiameterPort::user_map: No layers defined in configuration file");
		@@ -86,7 +86,7 @@ namespace LibDiameter__Interface {

		} // End of user_stop method

		void DiameterPort::receiveMsg (const LibDiameter__SIPTypesAndValues::Request& p_ind, const params& p_params) {
		void DiameterPort::receiveMsg (const LibDiameter__TypesAndValues::DIAMETER__MSG& p_ind, const params& p_params) {
		loggers::get_instance().log_msg(">>> DiameterPort::receive_msg: ", p_ind);

		// Sanity check
		@@ -94,153 +94,20 @@ namespace LibDiameter__Interface {
		return;
		}

		if (p_ind.requestLine().method() == LibDiameter__SIPTypesAndValues::Method::REGISTER__E) {
		incoming_message(LibDiameter__SIPTypesAndValues::REGISTER__Request(p_ind.requestLine(), p_ind.msgHeader(), p_ind.messageBody(), p_ind.payload()));
		} else if (p_ind.requestLine().method() == LibDiameter__SIPTypesAndValues::Method::INVITE__E) {
		incoming_message(LibDiameter__SIPTypesAndValues::INVITE__Request(p_ind.requestLine(), p_ind.msgHeader(), p_ind.messageBody(), p_ind.payload()));
		} else if (p_ind.requestLine().method() == LibDiameter__SIPTypesAndValues::Method::SUBSCRIBE__E) {
		incoming_message(LibDiameter__SIPTypesAndValues::SUBSCRIBE__Request(p_ind.requestLine(), p_ind.msgHeader(), p_ind.messageBody(), p_ind.payload()));
		} else if (p_ind.requestLine().method() == LibDiameter__SIPTypesAndValues::Method::NOTIFY__E) {
		incoming_message(LibDiameter__SIPTypesAndValues::NOTIFY__Request(p_ind.requestLine(), p_ind.msgHeader(), p_ind.messageBody(), p_ind.payload()));
		} else if (p_ind.requestLine().method() == LibDiameter__SIPTypesAndValues::Method::BYE__E) {
		incoming_message(LibDiameter__SIPTypesAndValues::BYE__Request(p_ind.requestLine(), p_ind.msgHeader(), p_ind.messageBody(), p_ind.payload()));
		} else if (p_ind.requestLine().method() == LibDiameter__SIPTypesAndValues::Method::INFO__E) {
		incoming_message(LibDiameter__SIPTypesAndValues::INFO__Request(p_ind.requestLine(), p_ind.msgHeader(), p_ind.messageBody(), p_ind.payload()));
		} else if (p_ind.requestLine().method() == LibDiameter__SIPTypesAndValues::Method::OPTIONS__E) {
		incoming_message(LibDiameter__SIPTypesAndValues::OPTIONS__Request(p_ind.requestLine(), p_ind.msgHeader(), p_ind.messageBody(), p_ind.payload()));
		} else if (p_ind.requestLine().method() == LibDiameter__SIPTypesAndValues::Method::MESSAGE__E) {
		incoming_message(LibDiameter__SIPTypesAndValues::MESSAGE__Request(p_ind.requestLine(), p_ind.msgHeader(), p_ind.messageBody(), p_ind.payload()));
		} else if (p_ind.requestLine().method() == LibDiameter__SIPTypesAndValues::Method::CANCEL__E) {
		incoming_message(LibDiameter__SIPTypesAndValues::CANCEL__Request(p_ind.requestLine(), p_ind.msgHeader(), p_ind.messageBody(), p_ind.payload()));
		} else if (p_ind.requestLine().method() == LibDiameter__SIPTypesAndValues::Method::ACK__E) {
		incoming_message(LibDiameter__SIPTypesAndValues::ACK__Request(p_ind.requestLine(), p_ind.msgHeader(), p_ind.messageBody(), p_ind.payload()));
		} else {
		incoming_message(p_ind);
		}
		} // End of method receiveMsg

		void DiameterPort::receiveMsg (const LibDiameter__SIPTypesAndValues::Response& p_ind, const params& p_params) {
		loggers::get_instance().log_msg(">>> DiameterPort::receive_msg: ", p_ind);

		// Sanity check
		if (!p_ind.is_bound()) {
		return;
		}

		incoming_message(p_ind);
		} // End of method receiveMsg

		void DiameterPort::outgoing_send(const LibDiameter__SIPTypesAndValues::INVITE__Request& send_par, const Address4SIP *destination_address)
		void DiameterPort::outgoing_send(const LibDiameter__TypesAndValues::DIAMETER__MSG& send_par)
		{
		loggers::get_instance().log_msg(">>> DiameterPort::outgoing_send: ", send_par);

		float duration;
		loggers::get_instance().set_start_time(_time_key);
		params params;
		static_cast<sip_layer*>(_layer)->sendMsg(send_par, params);
		static_cast<diameter_layer*>(_layer)->sendMsg(send_par, params);
		loggers::get_instance().set_stop_time(_time_key, duration);
		} // End of outgoing_send

		void DiameterPort::outgoing_send(const LibDiameter__SIPTypesAndValues::ACK__Request& send_par, const Address4SIP *destination_address)
		{
		loggers::get_instance().log_msg(">>> DiameterPort::outgoing_send: ", send_par);

		float duration;
		loggers::get_instance().set_start_time(_time_key);
		params params;
		static_cast<sip_layer*>(_layer)->sendMsg(send_par, params);
		loggers::get_instance().set_stop_time(_time_key, duration);
		} // End of outgoing_send

		void DiameterPort::outgoing_send(const LibDiameter__SIPTypesAndValues::REGISTER__Request& send_par, const Address4SIP *destination_address) {
		loggers::get_instance().log_msg(">>> DiameterPort::outgoing_send: ", send_par);

		float duration;
		loggers::get_instance().set_start_time(_time_key);
		params params;
		static_cast<sip_layer*>(_layer)->sendMsg(send_par, params);
		loggers::get_instance().set_stop_time(_time_key, duration);
		}

		void DiameterPort::outgoing_send(const LibDiameter__SIPTypesAndValues::SUBSCRIBE__Request& send_par, const Address4SIP *destination_address) {
		loggers::get_instance().log_msg(">>> DiameterPort::outgoing_send: ", send_par);

		float duration;
		loggers::get_instance().set_start_time(_time_key);
		params params;
		static_cast<sip_layer*>(_layer)->sendMsg(send_par, params);
		loggers::get_instance().set_stop_time(_time_key, duration);
		}

		void DiameterPort::outgoing_send(const LibDiameter__SIPTypesAndValues::MESSAGE__Request& send_par, const Address4SIP *destination_address) {
		loggers::get_instance().log_msg(">>> DiameterPort::outgoing_send: ", send_par);

		float duration;
		loggers::get_instance().set_start_time(_time_key);
		params params;
		static_cast<sip_layer*>(_layer)->sendMsg(send_par, params);
		loggers::get_instance().set_stop_time(_time_key, duration);
		}

		void DiameterPort::outgoing_send(const LibDiameter__SIPTypesAndValues::OPTIONS__Request& send_par, const Address4SIP *destination_address) {
		loggers::get_instance().log_msg(">>> DiameterPort::outgoing_send: ", send_par);

		float duration;
		loggers::get_instance().set_start_time(_time_key);
		params params;
		static_cast<sip_layer*>(_layer)->sendMsg(send_par, params);
		loggers::get_instance().set_stop_time(_time_key, duration);
		}

		void DiameterPort::outgoing_send(const LibDiameter__SIPTypesAndValues::BYE__Request& send_par, const Address4SIP *destination_address) {
		loggers::get_instance().log_msg(">>> DiameterPort::outgoing_send: ", send_par);

		float duration;
		loggers::get_instance().set_start_time(_time_key);
		params params;
		static_cast<sip_layer*>(_layer)->sendMsg(send_par, params);
		loggers::get_instance().set_stop_time(_time_key, duration);
		}

		void DiameterPort::outgoing_send(const LibDiameter__SIPTypesAndValues::CANCEL__Request& send_par, const Address4SIP *destination_address) {
		loggers::get_instance().log_msg(">>> DiameterPort::outgoing_send: ", send_par);

		float duration;
		loggers::get_instance().set_start_time(_time_key);
		params params;
		static_cast<sip_layer*>(_layer)->sendMsg(send_par, params);
		loggers::get_instance().set_stop_time(_time_key, duration);
		}

		void DiameterPort::outgoing_send(const LibDiameter__SIPTypesAndValues::NOTIFY__Request& send_par, const Address4SIP *destination_address) {
		loggers::get_instance().log_msg(">>> DiameterPort::outgoing_send: ", send_par);

		float duration;
		loggers::get_instance().set_start_time(_time_key);
		params params;
		static_cast<sip_layer*>(_layer)->sendMsg(send_par, params);
		loggers::get_instance().set_stop_time(_time_key, duration);
		}

		void DiameterPort::outgoing_send(const LibDiameter__SIPTypesAndValues::INFO__Request& send_par, const Address4SIP *destination_address) {
		loggers::get_instance().log_msg(">>> DiameterPort::outgoing_send: ", send_par);

		float duration;
		loggers::get_instance().set_start_time(_time_key);
		params params;
		static_cast<sip_layer*>(_layer)->sendMsg(send_par, params);
		loggers::get_instance().set_stop_time(_time_key, duration);
		}

		void DiameterPort::outgoing_send(const LibDiameter__SIPTypesAndValues::Response& send_par, const Address4SIP *destination_address) {
		loggers::get_instance().log_msg(">>> DiameterPort::outgoing_send: ", send_par);

		float duration;
		loggers::get_instance().set_start_time(_time_key);
		params params;
		static_cast<sip_layer*>(_layer)->sendMsg(send_par, params);
		loggers::get_instance().set_stop_time(_time_key, duration);
		}

		}

ccsrc/Ports/LibDiameter/DiameterPort.hh

+2 −23

Original line number	Diff line number	Diff line
		@@ -5,10 +5,6 @@
		#include "layer.hh"
		#include "params.hh"

		namespace LibDiameter__SIPTypesAndValues {
		class REGISTER__Request;
		}

		namespace LibDiameter__Interface {

		class DiameterPort : public DiameterPort_BASE {
		@@ -22,8 +18,7 @@ namespace LibDiameter__Interface {

		void set_parameter(const char parameter_name, const char parameter_value);

		void receiveMsg (const LibDiameter__SIPTypesAndValues::Request& p_ind, const params& p_params);
		void receiveMsg (const LibDiameter__SIPTypesAndValues::Response& p_ind, const params& p_params);
		void receiveMsg (const LibDiameter__TypesAndValues::DIAMETER__MSG& p_ind, const params& p_params);

		private:
		/* void Handle_Fd_Event(int fd, boolean is_readable,
		@@ -41,23 +36,7 @@ namespace LibDiameter__Interface {
		void user_stop();

		protected:
		virtual void outgoing_send(const LibDiameter__SIPTypesAndValues::Request& send_par, const Address4SIP *destination_address) { };
		void outgoing_send(const LibDiameter__SIPTypesAndValues::REGISTER__Request& send_par, const Address4SIP *destination_address);
		void outgoing_send(const LibDiameter__SIPTypesAndValues::INVITE__Request& send_par, const Address4SIP *destination_address);
		void outgoing_send(const LibDiameter__SIPTypesAndValues::OPTIONS__Request& send_par, const Address4SIP *destination_address);
		void outgoing_send(const LibDiameter__SIPTypesAndValues::BYE__Request& send_par, const Address4SIP *destination_address);
		virtual void outgoing_send(const LibDiameter__SIPTypesAndValues::CANCEL__Request& send_par, const Address4SIP *destination_address);
		void outgoing_send(const LibDiameter__SIPTypesAndValues::ACK__Request& send_par, const Address4SIP *destination_address);
		virtual void outgoing_send(const LibDiameter__SIPTypesAndValues::PRACK__Request& send_par, const Address4SIP *destination_address) { };
		virtual void outgoing_send(const LibDiameter__SIPTypesAndValues::NOTIFY__Request& send_par, const Address4SIP *destination_address);
		void outgoing_send(const LibDiameter__SIPTypesAndValues::SUBSCRIBE__Request& send_par, const Address4SIP *destination_address);
		virtual void outgoing_send(const LibDiameter__SIPTypesAndValues::PUBLISH__Request& send_par, const Address4SIP *destination_address) { };
		virtual void outgoing_send(const LibDiameter__SIPTypesAndValues::UPDATE__Request& send_par, const Address4SIP *destination_address) { };
		virtual void outgoing_send(const LibDiameter__SIPTypesAndValues::REFER__Request& send_par, const Address4SIP *destination_address) { };
		void outgoing_send(const LibDiameter__SIPTypesAndValues::MESSAGE__Request& send_par, const Address4SIP *destination_address);
		virtual void outgoing_send(const LibDiameter__SIPTypesAndValues::INFO__Request& send_par, const Address4SIP *destination_address);
		virtual void outgoing_send(const LibDiameter__SIPTypesAndValues::Response& send_par, const Address4SIP *destination_address);
		virtual void outgoing_send(const CHARSTRING& send_par, const Address4SIP *destination_address) { };
		virtual void outgoing_send(const LibDiameter__TypesAndValues::DIAMETER__MSG& send_par);
		}; // End of class DiameterPort

		}