......@@ -10,17 +10,16 @@ namespace LibItsGeoNetworking__TestSystem {
class UpperTesterPort : public UpperTesterPort_BASE {
params _cfg_params;
params _layer_params;
layer* _layer;
layer * _layer;
std::string _time_key;
public:
UpperTesterPort(const char *par_port_name = NULL);
~UpperTesterPort();
void set_parameter(const char *parameter_name,
const char *parameter_value);
void set_parameter(const char *parameter_name, const char *parameter_value);
void receiveMsg (const Base_Type&, const params&);
void receiveMsg(const Base_Type &, const params &);
private:
/* void Handle_Fd_Event(int fd, boolean is_readable,
......@@ -36,14 +35,14 @@ namespace LibItsGeoNetworking__TestSystem {
void user_start();
void user_stop();
void outgoing_send(const LibItsGeoNetworking__TypesAndValues::UtGnInitialize& send_par);
void outgoing_send(const LibItsGeoNetworking__TypesAndValues::UtGnInitialize &send_par);
void outgoing_send(const LibItsGeoNetworking__TypesAndValues::UtGnChangePosition& send_par);
void outgoing_send(const LibItsGeoNetworking__TypesAndValues::UtGnChangePosition &send_par);
void outgoing_send(const LibItsGeoNetworking__TypesAndValues::UtGnTrigger& send_par);
void outgoing_send(const LibItsGeoNetworking__TypesAndValues::UtGnTrigger &send_par);
void outgoing_send(const LibItsGeoNetworking__TypesAndValues::UtAutoInteropTrigger& send_par);
void outgoing_send(const LibItsGeoNetworking__TypesAndValues::UtAutoInteropTrigger &send_par);
};
} /* end of namespace */
} // namespace LibItsGeoNetworking__TestSystem
#endif
......@@ -6,7 +6,8 @@
namespace LibItsHttp__TestSystem {
HttpPort::HttpPort(const char *par_port_name): HttpPort_BASE(par_port_name), _cfg_params(), _layer_params(), _layer(nullptr), _time_key("HttpPort::outgoing_send") {
HttpPort::HttpPort(const char *par_port_name)
: HttpPort_BASE(par_port_name), _cfg_params(), _layer_params(), _layer(nullptr), _time_key("HttpPort::outgoing_send") {
// Nothing to do
} // End of constructor
......@@ -18,8 +19,7 @@ namespace LibItsHttp__TestSystem {
}
} // End of destructor
void HttpPort::set_parameter(const char * parameter_name, const char * parameter_value)
{
void HttpPort::set_parameter(const char *parameter_name, const char *parameter_value) {
loggers::get_instance().log("HttpPort::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)));
}
......@@ -27,25 +27,15 @@ namespace LibItsHttp__TestSystem {
/*void HttpPort::Handle_Fd_Event(int fd, boolean is_readable,
boolean is_writable, boolean is_error) {}*/
void HttpPort::Handle_Fd_Event_Error(int /*fd*/)
{
void HttpPort::Handle_Fd_Event_Error(int /*fd*/) {}
}
void HttpPort::Handle_Fd_Event_Writable(int /*fd*/)
{
void HttpPort::Handle_Fd_Event_Writable(int /*fd*/) {}
}
void HttpPort::Handle_Fd_Event_Readable(int /*fd*/)
{
}
void HttpPort::Handle_Fd_Event_Readable(int /*fd*/) {}
/*void HttpPort::Handle_Timeout(double time_since_last_call) {}*/
void HttpPort::user_map(const char * system_port)
{
void HttpPort::user_map(const char *system_port) {
loggers::get_instance().log(">>> HttpPort::user_map: %s", system_port);
// Build layer stack
params::iterator it = _cfg_params.find(std::string("params"));
......@@ -65,8 +55,7 @@ namespace LibItsHttp__TestSystem {
}
} // End of user_map method
void HttpPort::user_unmap(const char * system_port)
{
void HttpPort::user_unmap(const char *system_port) {
loggers::get_instance().log(">>> HttpPort::user_unmap: %s", system_port);
// Reset layers
......@@ -76,30 +65,21 @@ namespace LibItsHttp__TestSystem {
}
} // End of user_unmap method
void HttpPort::user_start()
{
loggers::get_instance().log(">>> HttpPort::user_start");
} // End of user_start method
void HttpPort::user_start() { loggers::get_instance().log(">>> HttpPort::user_start"); } // End of user_start method
void HttpPort::user_stop()
{
loggers::get_instance().log(">>> HttpPort::user_stop");
void HttpPort::user_stop() { loggers::get_instance().log(">>> HttpPort::user_stop"); } // End of user_stop method
} // End of user_stop method
void HttpPort::outgoing_send(const LibItsHttp__TypesAndValues::HttpMessage& send_par)
{
void HttpPort::outgoing_send(const LibItsHttp__TypesAndValues::HttpMessage &send_par) {
loggers::get_instance().log_msg(">>> HttpPort::outgoing_send: payload=", send_par);
float duration;
loggers::get_instance().set_start_time(_time_key);
params params;
static_cast<http_layer*>(_layer)->sendMsg(send_par, params);
static_cast<http_layer *>(_layer)->sendMsg(send_par, params);
loggers::get_instance().set_stop_time(_time_key, duration);
}
void HttpPort::receiveMsg (const LibItsHttp__TypesAndValues::HttpMessage& p_ind, const params& p_params) {
void HttpPort::receiveMsg(const LibItsHttp__TypesAndValues::HttpMessage &p_ind, const params &p_params) {
loggers::get_instance().log_msg(">>> HttpPort::receive_msg: ", p_ind);
// Sanity check
if (!p_ind.is_bound()) {
......@@ -109,5 +89,4 @@ namespace LibItsHttp__TestSystem {
incoming_message(p_ind);
}
}
} // namespace LibItsHttp__TestSystem
......@@ -14,14 +14,15 @@ namespace LibItsHttp__TestSystem {
class HttpPort : public HttpPort_BASE {
params _cfg_params;
params _layer_params;
layer* _layer;
layer * _layer;
std::string _time_key;
public:
HttpPort(const char *par_port_name);
~HttpPort();
void set_parameter(const char *parameter_name, const char *parameter_value);
void receiveMsg (const LibItsHttp__TypesAndValues::HttpMessage& p_ind, const params& p_params);
void receiveMsg(const LibItsHttp__TypesAndValues::HttpMessage &p_ind, const params &p_params);
private:
/* void Handle_Fd_Event(int fd, boolean is_readable,
......@@ -39,8 +40,7 @@ namespace LibItsHttp__TestSystem {
void user_stop();
protected:
void outgoing_send(const LibItsHttp__TypesAndValues::HttpMessage& send_par);
void outgoing_send(const LibItsHttp__TypesAndValues::HttpMessage &send_par);
}; // End of class HttpPort
}
} // namespace LibItsHttp__TestSystem
......@@ -11,67 +11,31 @@
namespace LibItsIpv6OverGeoNetworking__TestSystem {
IPv6OverGeoNetworkingPort::IPv6OverGeoNetworkingPort(const char *par_port_name)
: IPv6OverGeoNetworkingPort_BASE(par_port_name)
{
IPv6OverGeoNetworkingPort::IPv6OverGeoNetworkingPort(const char *par_port_name) : IPv6OverGeoNetworkingPort_BASE(par_port_name) {}
}
IPv6OverGeoNetworkingPort::~IPv6OverGeoNetworkingPort() {}
IPv6OverGeoNetworkingPort::~IPv6OverGeoNetworkingPort()
{
void IPv6OverGeoNetworkingPort::set_parameter(const char * /*parameter_name*/, const char * /*parameter_value*/) {}
}
void IPv6OverGeoNetworkingPort::set_parameter(const char * /*parameter_name*/,
const char * /*parameter_value*/)
{
}
/*void IPv6OverGeoNetworkingPort::Handle_Fd_Event(int fd, boolean is_readable,
/*void IPv6OverGeoNetworkingPort::Handle_Fd_Event(int fd, boolean is_readable,
boolean is_writable, boolean is_error) {}*/
void IPv6OverGeoNetworkingPort::Handle_Fd_Event_Error(int /*fd*/)
{
}
void IPv6OverGeoNetworkingPort::Handle_Fd_Event_Writable(int /*fd*/)
{
}
void IPv6OverGeoNetworkingPort::Handle_Fd_Event_Readable(int /*fd*/)
{
}
/*void IPv6OverGeoNetworkingPort::Handle_Timeout(double time_since_last_call) {}*/
void IPv6OverGeoNetworkingPort::user_map(const char * /*system_port*/)
{
}
void IPv6OverGeoNetworkingPort::user_unmap(const char * /*system_port*/)
{
void IPv6OverGeoNetworkingPort::Handle_Fd_Event_Error(int /*fd*/) {}
}
void IPv6OverGeoNetworkingPort::Handle_Fd_Event_Writable(int /*fd*/) {}
void IPv6OverGeoNetworkingPort::user_start()
{
void IPv6OverGeoNetworkingPort::Handle_Fd_Event_Readable(int /*fd*/) {}
}
/*void IPv6OverGeoNetworkingPort::Handle_Timeout(double time_since_last_call) {}*/
void IPv6OverGeoNetworkingPort::user_stop()
{
void IPv6OverGeoNetworkingPort::user_map(const char * /*system_port*/) {}
}
void IPv6OverGeoNetworkingPort::user_unmap(const char * /*system_port*/) {}
void IPv6OverGeoNetworkingPort::outgoing_send(const IPv6OverGeoNetworkingReq& /*send_par*/)
{
void IPv6OverGeoNetworkingPort::user_start() {}
}
void IPv6OverGeoNetworkingPort::user_stop() {}
} /* end of namespace */
void IPv6OverGeoNetworkingPort::outgoing_send(const IPv6OverGeoNetworkingReq & /*send_par*/) {}
} // namespace LibItsIpv6OverGeoNetworking__TestSystem
......@@ -14,31 +14,30 @@
namespace LibItsIpv6OverGeoNetworking__TestSystem {
class IPv6OverGeoNetworkingPort : public IPv6OverGeoNetworkingPort_BASE {
public:
class IPv6OverGeoNetworkingPort : public IPv6OverGeoNetworkingPort_BASE {
public:
IPv6OverGeoNetworkingPort(const char *par_port_name = NULL);
~IPv6OverGeoNetworkingPort();
void set_parameter(const char *parameter_name,
const char *parameter_value);
void set_parameter(const char *parameter_name, const char *parameter_value);
private:
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:
protected:
void user_map(const char *system_port);
void user_unmap(const char *system_port);
void user_start();
void user_stop();
void outgoing_send(const IPv6OverGeoNetworkingReq& send_par);
};
void outgoing_send(const IPv6OverGeoNetworkingReq &send_par);
};
} /* end of namespace */
} // namespace LibItsIpv6OverGeoNetworking__TestSystem
#endif
......@@ -7,81 +7,45 @@
#include "AdapterControlPort_IVIM.hh"
namespace LibItsIvim__TestSystem {
AdapterControlPort::AdapterControlPort(const char *par_port_name)
: AdapterControlPort_BASE(par_port_name)
{
AdapterControlPort::AdapterControlPort(const char *par_port_name) : AdapterControlPort_BASE(par_port_name) {}
}
AdapterControlPort::~AdapterControlPort() {}
AdapterControlPort::~AdapterControlPort()
{
void AdapterControlPort::set_parameter(const char * /*parameter_name*/, const char * /*parameter_value*/) {}
}
void AdapterControlPort::set_parameter(const char * /*parameter_name*/,
const char * /*parameter_value*/)
{
}
/*void AdapterControlPort::Handle_Fd_Event(int fd, boolean is_readable,
/*void AdapterControlPort::Handle_Fd_Event(int fd, boolean is_readable,
boolean is_writable, boolean is_error) {}*/
void AdapterControlPort::Handle_Fd_Event_Error(int /*fd*/)
{
}
void AdapterControlPort::Handle_Fd_Event_Writable(int /*fd*/)
{
}
void AdapterControlPort::Handle_Fd_Event_Error(int /*fd*/) {}
void AdapterControlPort::Handle_Fd_Event_Readable(int /*fd*/)
{
void AdapterControlPort::Handle_Fd_Event_Writable(int /*fd*/) {}
}
void AdapterControlPort::Handle_Fd_Event_Readable(int /*fd*/) {}
/*void AdapterControlPort::Handle_Timeout(double time_since_last_call) {}*/
/*void AdapterControlPort::Handle_Timeout(double time_since_last_call) {}*/
void AdapterControlPort::user_map(const char * /*system_port*/)
{
void AdapterControlPort::user_map(const char * /*system_port*/) {}
}
void AdapterControlPort::user_unmap(const char * /*system_port*/) {}
void AdapterControlPort::user_unmap(const char * /*system_port*/)
{
void AdapterControlPort::user_start() {}
}
void AdapterControlPort::user_stop() {}
void AdapterControlPort::user_start()
{
void AdapterControlPort::outgoing_send(const LibItsCommon__TypesAndValues::AcGnssPrimitive & /*send_par*/) {}
}
void AdapterControlPort::user_stop()
{
}
void AdapterControlPort::outgoing_send(const LibItsCommon__TypesAndValues::AcGnssPrimitive& /*send_par*/)
{
}
void AdapterControlPort::outgoing_send(const LibItsCommon__TypesAndValues::AcSecPrimitive& send_par)
{
void AdapterControlPort::outgoing_send(const LibItsCommon__TypesAndValues::AcSecPrimitive &send_par) {
loggers::get_instance().log_msg(">>> AdapterControlPort::outgoing_send: ", send_par);
// Register this object for AdapterControlPort
ivim_layer* p = registration<ivim_layer>::get_instance().get_item(std::string("IVIM"));
ivim_layer *p = registration<ivim_layer>::get_instance().get_item(std::string("IVIM"));
if (p != NULL) {
loggers::get_instance().log("AdapterControlPort::outgoing_send: Got GN layer %p", p);
LibItsCommon__TypesAndValues::AdapterControlResults response;
response.acSecResponse() = BOOLEAN(true);
if (send_par.ischosen(LibItsCommon__TypesAndValues::AcSecPrimitive::ALT_acEnableSecurity)) {
loggers::get_instance().log("AdapterControlPort::outgoing_send: Enable secured mode");
std::string str(static_cast<const char*>(send_par.acEnableSecurity().certificateId()));
std::string str(static_cast<const char *>(send_par.acEnableSecurity().certificateId()));
if (p->enable_secured_mode(str, send_par.acEnableSecurity().enforceSecurity()) == -1) {
response.acSecResponse() = BOOLEAN(false);
}
......@@ -99,6 +63,6 @@ void AdapterControlPort::outgoing_send(const LibItsCommon__TypesAndValues::AcSec
} else {
loggers::get_instance().error("AdapterControlPort::outgoing_send: IVIM not registered");
}
}
}
} /* end of namespace */
} // namespace LibItsIvim__TestSystem
......@@ -6,33 +6,31 @@
namespace LibItsIvim__TestSystem {
class AdapterControlPort : public AdapterControlPort_BASE {
public:
class AdapterControlPort : public AdapterControlPort_BASE {
public:
AdapterControlPort(const char *par_port_name = NULL);
~AdapterControlPort();
void set_parameter(const char *parameter_name,
const char *parameter_value);
void set_parameter(const char *parameter_name, const char *parameter_value);
private:
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:
protected:
void user_map(const char *system_port);
void user_unmap(const char *system_port);
void user_start();
void user_stop();
void outgoing_send(const LibItsCommon__TypesAndValues::AcGnssPrimitive& send_par);
void outgoing_send(const LibItsCommon__TypesAndValues::AcGnssPrimitive &send_par);
void outgoing_send(const LibItsCommon__TypesAndValues::AcSecPrimitive& send_par);
void outgoing_send(const LibItsCommon__TypesAndValues::AcSecPrimitive &send_par);
};
};
} // end of namespace
} // namespace LibItsIvim__TestSystem
#endif
......@@ -13,19 +13,16 @@
namespace LibItsIvim__TestSystem {
IvimPort::IvimPort(const char *par_port_name) : IvimPort_BASE(par_port_name), _cfg_params(), _layer_params(), _layer(NULL), _time_key("IvimPort::outgoing_send") {
IvimPort::IvimPort(const char *par_port_name)
: IvimPort_BASE(par_port_name), _cfg_params(), _layer_params(), _layer(NULL), _time_key("IvimPort::outgoing_send") {}
}
IvimPort::~IvimPort()
{
IvimPort::~IvimPort() {
if (_layer != NULL) {
delete _layer;
}
}
void IvimPort::set_parameter(const char * parameter_name, const char * parameter_value)
{
void IvimPort::set_parameter(const char *parameter_name, const char *parameter_value) {
loggers::get_instance().log("IvimPort::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)));
}
......@@ -33,25 +30,15 @@ namespace LibItsIvim__TestSystem {
/*void IvimPort::Handle_Fd_Event(int fd, boolean is_readable,
boolean is_writable, boolean is_error) {}*/
void IvimPort::Handle_Fd_Event_Error(int /*fd*/)
{
void IvimPort::Handle_Fd_Event_Error(int /*fd*/) {}
}
void IvimPort::Handle_Fd_Event_Writable(int /*fd*/) {}
void IvimPort::Handle_Fd_Event_Writable(int /*fd*/)
{
}
void IvimPort::Handle_Fd_Event_Readable(int /*fd*/)
{
}
void IvimPort::Handle_Fd_Event_Readable(int /*fd*/) {}
/*void IvimPort::Handle_Timeout(double time_since_last_call) {}*/
void IvimPort::user_map(const char * system_port)
{
void IvimPort::user_map(const char *system_port) {
loggers::get_instance().log(">>> IvimPort::user_map: %s", system_port);
// Build layer stack
params::iterator it = _cfg_params.find(std::string("params"));
......@@ -67,8 +54,7 @@ namespace LibItsIvim__TestSystem {
}
}
void IvimPort::user_unmap(const char * system_port)
{
void IvimPort::user_unmap(const char *system_port) {
loggers::get_instance().log(">>> IvimPort::user_unmap: %s", system_port);
if (_layer != NULL) {
delete _layer;
......@@ -76,18 +62,11 @@ namespace LibItsIvim__TestSystem {
}
}
void IvimPort::user_start()
{
}
void IvimPort::user_stop()
{
void IvimPort::user_start() {}
}
void IvimPort::user_stop() {}
void IvimPort::outgoing_send(const IvimReq& send_par)
{
void IvimPort::outgoing_send(const IvimReq &send_par) {
loggers::get_instance().log_msg(">>> IvimPort::outgoing_send: payload=", send_par);
float duration;
......@@ -97,8 +76,7 @@ namespace LibItsIvim__TestSystem {
loggers::get_instance().set_stop_time(_time_key, duration);
}
void IvimPort::outgoing_send(const IvimInd& send_par)
{
void IvimPort::outgoing_send(const IvimInd &send_par) {
loggers::get_instance().log_msg(">>> IvimPort::outgoing_send: payload=", send_par);
float duration;
......@@ -108,11 +86,10 @@ namespace LibItsIvim__TestSystem {
loggers::get_instance().set_stop_time(_time_key, duration);
}
void IvimPort::receiveMsg(const LibItsIvim__TestSystem::IvimInd& p_ind, const params& p_params) {
void IvimPort::receiveMsg(const LibItsIvim__TestSystem::IvimInd &p_ind, const params &p_params) {
loggers::get_instance().log_msg(">>> IvimPort::receive_msg: ", p_ind);
incoming_message(p_ind);
}
} /* end of namespace */
} // namespace LibItsIvim__TestSystem
......@@ -14,38 +14,38 @@
namespace LibItsIvim__TestSystem {
class IvimPort : public IvimPort_BASE {
class IvimPort : public IvimPort_BASE {
params _cfg_params;
params _layer_params;
layer* _layer;
layer * _layer;
std::string _time_key;
public:
public:
IvimPort(const char *par_port_name = NULL);
~IvimPort();
void set_parameter(const char *parameter_name,
const char *parameter_value);
void set_parameter(const char *parameter_name, const char *parameter_value);
void receiveMsg (const LibItsIvim__TestSystem::IvimInd&, const params&);
void receiveMsg(const LibItsIvim__TestSystem::IvimInd &, const params &);
private:
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:
protected:
void user_map(const char *system_port);
void user_unmap(const char *system_port);
void user_start();
void user_stop();
void outgoing_send(const IvimReq& send_par);
void outgoing_send(const IvimInd& send_par);
};
void outgoing_send(const IvimReq &send_par);
void outgoing_send(const IvimInd &send_par);
};
} /* end of namespace */
} // namespace LibItsIvim__TestSystem
#endif
#include "uppertester_ivim_factory.hh"
#include "loggers.hh"
#include "UpperTesterPort_IVIM.hh"
#include "loggers.hh"
//=============================================================================
namespace LibItsIvim__TestSystem {
UpperTesterPort::UpperTesterPort(const char *par_port_name)
: UpperTesterPort_BASE(par_port_name), _cfg_params(), _layer_params(), _layer(NULL), _time_key("UpperTesterPort_Ivim::outgoing_send")
{
: UpperTesterPort_BASE(par_port_name), _cfg_params(), _layer_params(), _layer(NULL), _time_key("UpperTesterPort_Ivim::outgoing_send") {
loggers::get_instance().log("UpperTesterPort_Ivim::UpperTesterPort_Ivim");
}
UpperTesterPort::~UpperTesterPort()
{
UpperTesterPort::~UpperTesterPort() {
if (_layer != NULL) {
delete _layer;
}
}
void UpperTesterPort::set_parameter(const char * parameter_name, const char * parameter_value)
{
void UpperTesterPort::set_parameter(const char *parameter_name, const char *parameter_value) {
loggers::get_instance().log("UpperTesterPort_Ivim::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)));
_cfg_params.log();
......@@ -28,25 +25,15 @@ namespace LibItsIvim__TestSystem {
/*void UpperTesterPort::Handle_Fd_Event(int fd, boolean is_readable,
boolean is_writable, boolean is_error) {}*/
void UpperTesterPort::Handle_Fd_Event_Error(int /*fd*/)
{
void UpperTesterPort::Handle_Fd_Event_Error(int /*fd*/) {}
}
void UpperTesterPort::Handle_Fd_Event_Writable(int /*fd*/) {}
void UpperTesterPort::Handle_Fd_Event_Writable(int /*fd*/)
{
}
void UpperTesterPort::Handle_Fd_Event_Readable(int /*fd*/)
{
}
void UpperTesterPort::Handle_Fd_Event_Readable(int /*fd*/) {}
/*void UpperTesterPort::Handle_Timeout(double time_since_last_call) {}*/
void UpperTesterPort::user_map(const char * system_port)
{
void UpperTesterPort::user_map(const char *system_port) {
loggers::get_instance().log(">>> UpperTesterPort_Ivim::user_map: %s", system_port);
// Build layer stack
params::iterator it = _cfg_params.find(std::string("params"));
......@@ -62,28 +49,19 @@ namespace LibItsIvim__TestSystem {
}
}
void UpperTesterPort::user_unmap(const char * system_port)
{
void UpperTesterPort::user_unmap(const char *system_port) {
loggers::get_instance().log(">>> UpperTesterPort_Ivim::user_unmap: %s", system_port);
if (_layer != NULL) {
delete _layer;
_layer = NULL;
}
}
void UpperTesterPort::user_start()
{
}
void UpperTesterPort::user_stop()
{
void UpperTesterPort::user_start() {}
}
void UpperTesterPort::user_stop() {}
void UpperTesterPort::outgoing_send(const LibItsIvim__TypesAndValues::UtIvimInitialize& send_par)
{
void UpperTesterPort::outgoing_send(const LibItsIvim__TypesAndValues::UtIvimInitialize &send_par) {
loggers::get_instance().log_msg(">>> UppertesterPort::outgoing_send: ", send_par);
float duration;
......@@ -92,8 +70,7 @@ namespace LibItsIvim__TestSystem {
loggers::get_instance().set_stop_time(_time_key, duration);
}
void UpperTesterPort::outgoing_send(const LibItsIvim__TypesAndValues::UtIvimTrigger& send_par)
{
void UpperTesterPort::outgoing_send(const LibItsIvim__TypesAndValues::UtIvimTrigger &send_par) {
loggers::get_instance().log_msg(">>> UppertesterPort::outgoing_send: ", send_par);
float duration;
......@@ -102,8 +79,7 @@ namespace LibItsIvim__TestSystem {
loggers::get_instance().set_stop_time(_time_key, duration);
}
void UpperTesterPort::outgoing_send(const LibItsIvim__TypesAndValues::UtIvimUpdate& send_par)
{
void UpperTesterPort::outgoing_send(const LibItsIvim__TypesAndValues::UtIvimUpdate &send_par) {
loggers::get_instance().log_msg(">>> UppertesterPort::outgoing_send: ", send_par);
float duration;
......@@ -112,8 +88,7 @@ namespace LibItsIvim__TestSystem {
loggers::get_instance().set_stop_time(_time_key, duration);
}
void UpperTesterPort::outgoing_send(const LibItsIvim__TypesAndValues::UtIvimTermination& send_par)
{
void UpperTesterPort::outgoing_send(const LibItsIvim__TypesAndValues::UtIvimTermination &send_par) {
loggers::get_instance().log_msg(">>> UppertesterPort::outgoing_send: ", send_par);
float duration;
......@@ -122,7 +97,7 @@ namespace LibItsIvim__TestSystem {
loggers::get_instance().set_stop_time(_time_key, duration);
}
void UpperTesterPort::receiveMsg (const Base_Type& p_ind, const params& p_params) {
void UpperTesterPort::receiveMsg(const Base_Type &p_ind, const params &p_params) {
loggers::get_instance().log_msg(">>> UpperTesterPort_Ivim::receive_msg: ", p_ind);
// Sanity check
if (!p_ind.is_bound()) {
......@@ -131,10 +106,10 @@ namespace LibItsIvim__TestSystem {
loggers::get_instance().log("UpperTesterPort_Ivim::receive_msg: %s", p_ind.get_descriptor()->name);
if (std::string(p_ind.get_descriptor()->name).compare("@LibItsIvim_TypesAndValues.UtIvimResults") == 0) { // TODO To be refined
incoming_message((LibItsIvim__TypesAndValues::UtIvimResults&)p_ind);
incoming_message((LibItsIvim__TypesAndValues::UtIvimResults &)p_ind);
} else if (std::string(p_ind.get_descriptor()->name).compare("@LibItsIvim_TypesAndValues.UtIvimEventInd") == 0) {
incoming_message(static_cast<const LibItsIvim__TypesAndValues::UtIvimEventInd&>(p_ind));
incoming_message(static_cast<const LibItsIvim__TypesAndValues::UtIvimEventInd &>(p_ind));
}
}
} /* end of namespace */
} // namespace LibItsIvim__TestSystem
......@@ -8,44 +8,42 @@
#include "LibItsIvim_TestSystem.hh"
namespace LibItsIvim__TestSystem {
class UpperTesterPort : public UpperTesterPort_BASE {
class UpperTesterPort : public UpperTesterPort_BASE {
params _cfg_params;
params _layer_params;
layer* _layer;
layer * _layer;
std::string _time_key;
public:
public:
UpperTesterPort(const char *par_port_name = NULL);
~UpperTesterPort();
void set_parameter(const char *parameter_name,
const char *parameter_value);
void set_parameter(const char *parameter_name, const char *parameter_value);
void receiveMsg (const Base_Type&, const params&);
void receiveMsg(const Base_Type &, const params &);
private:
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:
protected:
void user_map(const char *system_port);
void user_unmap(const char *system_port);
void user_start();
void user_stop();
void outgoing_send(const LibItsIvim__TypesAndValues::UtIvimInitialize& send_par);
void outgoing_send(const LibItsIvim__TypesAndValues::UtIvimInitialize &send_par);
void outgoing_send(const LibItsIvim__TypesAndValues::UtIvimTrigger& send_par);
void outgoing_send(const LibItsIvim__TypesAndValues::UtIvimTrigger &send_par);
void outgoing_send(const LibItsIvim__TypesAndValues::UtIvimUpdate& send_par);
void outgoing_send(const LibItsIvim__TypesAndValues::UtIvimUpdate &send_par);
void outgoing_send(const LibItsIvim__TypesAndValues::UtIvimTermination& send_par);
void outgoing_send(const LibItsIvim__TypesAndValues::UtIvimTermination &send_par);
};
};
} /* end of namespace */
} // namespace LibItsIvim__TestSystem
#endif
\ No newline at end of file
......@@ -7,76 +7,43 @@
#include "AdapterControlPort_MapemSpatem.hh"
namespace LibItsMapemSpatem__TestSystem {
AdapterControlPort::AdapterControlPort(const char *par_port_name)
: AdapterControlPort_BASE(par_port_name)
{
AdapterControlPort::AdapterControlPort(const char *par_port_name) : AdapterControlPort_BASE(par_port_name) {}
}
AdapterControlPort::~AdapterControlPort() {}
AdapterControlPort::~AdapterControlPort()
{
void AdapterControlPort::set_parameter(const char * /*parameter_name*/, const char * /*parameter_value*/) {}
}
void AdapterControlPort::set_parameter(const char * /*parameter_name*/,
const char * /*parameter_value*/)
{
}
/*void AdapterControlPort::Handle_Fd_Event(int fd, boolean is_readable,
/*void AdapterControlPort::Handle_Fd_Event(int fd, boolean is_readable,
boolean is_writable, boolean is_error) {}*/
void AdapterControlPort::Handle_Fd_Event_Error(int /*fd*/)
{
}
void AdapterControlPort::Handle_Fd_Event_Writable(int /*fd*/)
{
}
void AdapterControlPort::Handle_Fd_Event_Error(int /*fd*/) {}
void AdapterControlPort::Handle_Fd_Event_Readable(int /*fd*/)
{
void AdapterControlPort::Handle_Fd_Event_Writable(int /*fd*/) {}
}
void AdapterControlPort::Handle_Fd_Event_Readable(int /*fd*/) {}
/*void AdapterControlPort::Handle_Timeout(double time_since_last_call) {}*/
/*void AdapterControlPort::Handle_Timeout(double time_since_last_call) {}*/
void AdapterControlPort::user_map(const char * /*system_port*/)
{
void AdapterControlPort::user_map(const char * /*system_port*/) {}
}
void AdapterControlPort::user_unmap(const char * /*system_port*/) {}
void AdapterControlPort::user_unmap(const char * /*system_port*/)
{
void AdapterControlPort::user_start() {}
}
void AdapterControlPort::user_stop() {}
void AdapterControlPort::user_start()
{
}
void AdapterControlPort::user_stop()
{
}
void AdapterControlPort::outgoing_send(const LibItsCommon__TypesAndValues::AcSecPrimitive& send_par)
{
void AdapterControlPort::outgoing_send(const LibItsCommon__TypesAndValues::AcSecPrimitive &send_par) {
loggers::get_instance().log_msg(">>> AdapterControlPort::outgoing_send: ", send_par);
// Register this object for AdapterControlPort
mapem_spatem_layer* p = registration<mapem_spatem_layer>::get_instance().get_item(std::string("MapemSpatem"));
mapem_spatem_layer *p = registration<mapem_spatem_layer>::get_instance().get_item(std::string("MapemSpatem"));
if (p != NULL) {
loggers::get_instance().log("AdapterControlPort::outgoing_send: Got GN layer %p", p);
LibItsCommon__TypesAndValues::AdapterControlResults response;
response.acSecResponse() = BOOLEAN(true);
if (send_par.ischosen(LibItsCommon__TypesAndValues::AcSecPrimitive::ALT_acEnableSecurity)) {
loggers::get_instance().log("AdapterControlPort::outgoing_send: Enable secured mode");
std::string str(static_cast<const char*>(send_par.acEnableSecurity().certificateId()));
std::string str(static_cast<const char *>(send_par.acEnableSecurity().certificateId()));
if (p->enable_secured_mode(str, send_par.acEnableSecurity().enforceSecurity()) == -1) {
response.acSecResponse() = BOOLEAN(false);
}
......@@ -94,6 +61,6 @@ void AdapterControlPort::outgoing_send(const LibItsCommon__TypesAndValues::AcSec
} else {
loggers::get_instance().error("AdapterControlPort::outgoing_send: MapemSpatem not registered");
}
}
}
} /* end of namespace */
} // namespace LibItsMapemSpatem__TestSystem
......@@ -6,31 +6,29 @@
namespace LibItsMapemSpatem__TestSystem {
class AdapterControlPort : public AdapterControlPort_BASE {
public:
class AdapterControlPort : public AdapterControlPort_BASE {
public:
AdapterControlPort(const char *par_port_name = NULL);
~AdapterControlPort();
void set_parameter(const char *parameter_name,
const char *parameter_value);
void set_parameter(const char *parameter_name, const char *parameter_value);
private:
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:
protected:
void user_map(const char *system_port);
void user_unmap(const char *system_port);
void user_start();
void user_stop();
void outgoing_send(const LibItsCommon__TypesAndValues::AcSecPrimitive& send_par);
void outgoing_send(const LibItsCommon__TypesAndValues::AcSecPrimitive &send_par);
};
};
} // end of namespace
} // namespace LibItsMapemSpatem__TestSystem
#endif
......@@ -8,24 +8,21 @@
// add your member functions here.
#include "MapemSpatemPort.hh"
#include "mapem_spatem_layer_factory.hh"
#include "loggers.hh"
#include "mapem_spatem_layer_factory.hh"
namespace LibItsMapemSpatem__TestSystem {
MapemSpatemPort::MapemSpatemPort(const char *par_port_name) : MapemSpatemPort_BASE(par_port_name), _cfg_params(), _layer_params(), _layer(NULL), _time_key("MapemSpatemPort::outgoing_send") {
}
MapemSpatemPort::MapemSpatemPort(const char *par_port_name)
: MapemSpatemPort_BASE(par_port_name), _cfg_params(), _layer_params(), _layer(NULL), _time_key("MapemSpatemPort::outgoing_send") {}
MapemSpatemPort::~MapemSpatemPort()
{
MapemSpatemPort::~MapemSpatemPort() {
if (_layer != NULL) {
delete _layer;
}
}
void MapemSpatemPort::set_parameter(const char * parameter_name, const char * parameter_value)
{
void MapemSpatemPort::set_parameter(const char *parameter_name, const char *parameter_value) {
loggers::get_instance().log("MapemSpatemPort::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)));
}
......@@ -33,25 +30,15 @@ namespace LibItsMapemSpatem__TestSystem {
/*void MapemSpatemPort::Handle_Fd_Event(int fd, boolean is_readable,
boolean is_writable, boolean is_error) {}*/
void MapemSpatemPort::Handle_Fd_Event_Error(int /*fd*/)
{
void MapemSpatemPort::Handle_Fd_Event_Error(int /*fd*/) {}
}
void MapemSpatemPort::Handle_Fd_Event_Writable(int /*fd*/)
{
}
void MapemSpatemPort::Handle_Fd_Event_Writable(int /*fd*/) {}
void MapemSpatemPort::Handle_Fd_Event_Readable(int /*fd*/)
{
}
void MapemSpatemPort::Handle_Fd_Event_Readable(int /*fd*/) {}
/*void MapemSpatemPort::Handle_Timeout(double time_since_last_call) {}*/
void MapemSpatemPort::user_map(const char * system_port)
{
void MapemSpatemPort::user_map(const char *system_port) {
loggers::get_instance().log(">>> MapemSpatemPort::user_map: %s", system_port);
// Build layer stack
params::iterator it = _cfg_params.find(std::string("params"));
......@@ -67,8 +54,7 @@ namespace LibItsMapemSpatem__TestSystem {
}
}
void MapemSpatemPort::user_unmap(const char * system_port)
{
void MapemSpatemPort::user_unmap(const char *system_port) {
loggers::get_instance().log(">>> MapemSpatemPort::user_unmap: %s", system_port);
if (_layer != NULL) {
delete _layer;
......@@ -76,18 +62,11 @@ namespace LibItsMapemSpatem__TestSystem {
}
}
void MapemSpatemPort::user_start()
{
}
void MapemSpatemPort::user_start() {}
void MapemSpatemPort::user_stop()
{
void MapemSpatemPort::user_stop() {}
}
void MapemSpatemPort::outgoing_send(const MapemReq& send_par)
{
void MapemSpatemPort::outgoing_send(const MapemReq &send_par) {
loggers::get_instance().log_msg(">>> MapemSpatemPort::outgoing_send: payload=", send_par);
float duration;
......@@ -97,8 +76,7 @@ namespace LibItsMapemSpatem__TestSystem {
loggers::get_instance().set_stop_time(_time_key, duration);
}
void MapemSpatemPort::outgoing_send(const SpatemReq& send_par)
{
void MapemSpatemPort::outgoing_send(const SpatemReq &send_par) {
loggers::get_instance().log_msg(">>> MapemSpatemPort::outgoing_send: payload=", send_par);
float duration;
......@@ -108,17 +86,16 @@ namespace LibItsMapemSpatem__TestSystem {
loggers::get_instance().set_stop_time(_time_key, duration);
}
void MapemSpatemPort::receiveMsg(const LibItsMapemSpatem__TestSystem::MapemInd& p_ind, const params& p_params) {
void MapemSpatemPort::receiveMsg(const LibItsMapemSpatem__TestSystem::MapemInd &p_ind, const params &p_params) {
loggers::get_instance().log_msg(">>> MapemSpatemPort::receive_msg: ", p_ind);
incoming_message(p_ind);
}
void MapemSpatemPort::receiveMsg(const LibItsMapemSpatem__TestSystem::SpatemInd& p_ind, const params& p_params) {
void MapemSpatemPort::receiveMsg(const LibItsMapemSpatem__TestSystem::SpatemInd &p_ind, const params &p_params) {
loggers::get_instance().log_msg(">>> MapemSpatemPort::receive_msg: ", p_ind);
incoming_message(p_ind);
}
} /* end of namespace */
} // namespace LibItsMapemSpatem__TestSystem
......@@ -14,41 +14,41 @@
namespace LibItsMapemSpatem__TestSystem {
class MapemSpatemPort : public MapemSpatemPort_BASE {
class MapemSpatemPort : public MapemSpatemPort_BASE {
params _cfg_params;
params _layer_params;
layer* _layer;
layer * _layer;
std::string _time_key;
public:
public:
MapemSpatemPort(const char *par_port_name = NULL);
~MapemSpatemPort();
void set_parameter(const char *parameter_name,
const char *parameter_value);
void set_parameter(const char *parameter_name, const char *parameter_value);
void receiveMsg (const LibItsMapemSpatem__TestSystem::MapemInd&, const params&);
void receiveMsg(const LibItsMapemSpatem__TestSystem::MapemInd &, const params &);
void receiveMsg (const LibItsMapemSpatem__TestSystem::SpatemInd&, const params&);
void receiveMsg(const LibItsMapemSpatem__TestSystem::SpatemInd &, const params &);
private:
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:
protected:
void user_map(const char *system_port);
void user_unmap(const char *system_port);
void user_start();
void user_stop();
void outgoing_send(const MapemReq& send_par);
void outgoing_send(const MapemReq &send_par);
void outgoing_send(const SpatemReq& send_par);
};
void outgoing_send(const SpatemReq &send_par);
};
} /* end of namespace */
} // namespace LibItsMapemSpatem__TestSystem
#endif
#include "uppertester_mapem_spatem_factory.hh"
#include "loggers.hh"
#include "UpperTesterPort_MapemSpatem.hh"
#include "loggers.hh"
//=============================================================================
namespace LibItsMapemSpatem__TestSystem {
UpperTesterPort::UpperTesterPort(const char *par_port_name)
: UpperTesterPort_BASE(par_port_name), _cfg_params(), _layer_params(), _layer(NULL), _time_key("UpperTesterPort_MapemSpatem::outgoing_send")
{
: UpperTesterPort_BASE(par_port_name), _cfg_params(), _layer_params(), _layer(NULL), _time_key("UpperTesterPort_MapemSpatem::outgoing_send") {
loggers::get_instance().log("UpperTesterPort_MapemSpatem::UpperTesterPort_MapemSpatem");
}
UpperTesterPort::~UpperTesterPort()
{
UpperTesterPort::~UpperTesterPort() {
if (_layer != NULL) {
delete _layer;
}
}
void UpperTesterPort::set_parameter(const char * parameter_name, const char * parameter_value)
{
void UpperTesterPort::set_parameter(const char *parameter_name, const char *parameter_value) {
loggers::get_instance().log("UpperTesterPort_MapemSpatem::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)));
_cfg_params.log();
......@@ -28,25 +25,15 @@ namespace LibItsMapemSpatem__TestSystem {
/*void UpperTesterPort::Handle_Fd_Event(int fd, boolean is_readable,
boolean is_writable, boolean is_error) {}*/
void UpperTesterPort::Handle_Fd_Event_Error(int /*fd*/)
{
void UpperTesterPort::Handle_Fd_Event_Error(int /*fd*/) {}
}
void UpperTesterPort::Handle_Fd_Event_Writable(int /*fd*/) {}
void UpperTesterPort::Handle_Fd_Event_Writable(int /*fd*/)
{
}
void UpperTesterPort::Handle_Fd_Event_Readable(int /*fd*/)
{
}
void UpperTesterPort::Handle_Fd_Event_Readable(int /*fd*/) {}
/*void UpperTesterPort::Handle_Timeout(double time_since_last_call) {}*/
void UpperTesterPort::user_map(const char * system_port)
{
void UpperTesterPort::user_map(const char *system_port) {
loggers::get_instance().log(">>> UpperTesterPort_MapemSpatem::user_map: %s", system_port);
// Build layer stack
params::iterator it = _cfg_params.find(std::string("params"));
......@@ -62,28 +49,19 @@ namespace LibItsMapemSpatem__TestSystem {
}
}
void UpperTesterPort::user_unmap(const char * system_port)
{
void UpperTesterPort::user_unmap(const char *system_port) {
loggers::get_instance().log(">>> UpperTesterPort_MapemSpatem::user_unmap: %s", system_port);
if (_layer != NULL) {
delete _layer;
_layer = NULL;
}
}
void UpperTesterPort::user_start()
{
}
void UpperTesterPort::user_stop()
{
void UpperTesterPort::user_start() {}
}
void UpperTesterPort::user_stop() {}
void UpperTesterPort::outgoing_send(const LibItsMapemSpatem__TypesAndValues::UtMapemSpatemInitialize& send_par)
{
void UpperTesterPort::outgoing_send(const LibItsMapemSpatem__TypesAndValues::UtMapemSpatemInitialize &send_par) {
loggers::get_instance().log_msg(">>> UppertesterPort::outgoing_send: ", send_par);
float duration;
......@@ -92,8 +70,7 @@ namespace LibItsMapemSpatem__TestSystem {
loggers::get_instance().set_stop_time(_time_key, duration);
}
void UpperTesterPort::outgoing_send(const LibItsMapemSpatem__TypesAndValues::UtMapemSpatemTrigger& send_par)
{
void UpperTesterPort::outgoing_send(const LibItsMapemSpatem__TypesAndValues::UtMapemSpatemTrigger &send_par) {
loggers::get_instance().log_msg(">>> UppertesterPort::outgoing_send: ", send_par);
float duration;
......@@ -102,7 +79,7 @@ namespace LibItsMapemSpatem__TestSystem {
loggers::get_instance().set_stop_time(_time_key, duration);
}
void UpperTesterPort::receiveMsg (const Base_Type& p_ind, const params& p_params) {
void UpperTesterPort::receiveMsg(const Base_Type &p_ind, const params &p_params) {
loggers::get_instance().log_msg(">>> UpperTesterPort_MapemSpatem::receive_msg: ", p_ind);
// Sanity check
if (!p_ind.is_bound()) {
......@@ -111,14 +88,14 @@ namespace LibItsMapemSpatem__TestSystem {
loggers::get_instance().log("UpperTesterPort_MapemSpatem::receive_msg: %s", p_ind.get_descriptor()->name);
if (std::string(p_ind.get_descriptor()->name).compare("@LibItsMapemSpatem_TypesAndValues.UtMapemSpatemResults") == 0) { // TODO To be refined
incoming_message((LibItsMapemSpatem__TypesAndValues::UtMapemSpatemResults&)p_ind);
incoming_message((LibItsMapemSpatem__TypesAndValues::UtMapemSpatemResults &)p_ind);
} else if (std::string(p_ind.get_descriptor()->name).compare("@LibItsMapemSpatem_TypesAndValues.UtMapemEventInd") == 0) {
incoming_message(static_cast<const LibItsMapemSpatem__TypesAndValues::UtMapemEventInd&>(p_ind));
incoming_message(static_cast<const LibItsMapemSpatem__TypesAndValues::UtMapemEventInd &>(p_ind));
} else if (std::string(p_ind.get_descriptor()->name).compare("@LibItsMapemSpatem_TypesAndValues.UtSpatemEventInd") == 0) {
incoming_message(static_cast<const LibItsMapemSpatem__TypesAndValues::UtSpatemEventInd&>(p_ind));
incoming_message(static_cast<const LibItsMapemSpatem__TypesAndValues::UtSpatemEventInd &>(p_ind));
} else {
loggers::get_instance().warning("UpperTesterPort_MapemSpatem::receive_msg: Message not processed: %s", p_ind.get_descriptor()->name);
}
}
} /* end of namespace */
} // namespace LibItsMapemSpatem__TestSystem
......@@ -9,39 +9,38 @@
namespace LibItsMapemSpatem__TestSystem {
class UpperTesterPort : public UpperTesterPort_BASE {
class UpperTesterPort : public UpperTesterPort_BASE {
params _cfg_params;
params _layer_params;
layer* _layer;
layer * _layer;
std::string _time_key;
public:
public:
UpperTesterPort(const char *par_port_name = NULL);
~UpperTesterPort();
void set_parameter(const char *parameter_name,
const char *parameter_value);
void set_parameter(const char *parameter_name, const char *parameter_value);
void receiveMsg (const Base_Type&, const params&);
void receiveMsg(const Base_Type &, const params &);
private:
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:
protected:
void user_map(const char *system_port);
void user_unmap(const char *system_port);
void user_start();
void user_stop();
void outgoing_send(const LibItsMapemSpatem__TypesAndValues::UtMapemSpatemInitialize& send_par);
void outgoing_send(const LibItsMapemSpatem__TypesAndValues::UtMapemSpatemInitialize &send_par);
void outgoing_send(const LibItsMapemSpatem__TypesAndValues::UtMapemSpatemTrigger& send_par);
};
void outgoing_send(const LibItsMapemSpatem__TypesAndValues::UtMapemSpatemTrigger &send_par);
};
} /* end of namespace */
} // namespace LibItsMapemSpatem__TestSystem
#endif
......@@ -7,73 +7,40 @@
//=============================================================================
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");
}
AdapterControlPort::~AdapterControlPort()
{
AdapterControlPort::~AdapterControlPort() {}
}
void AdapterControlPort::set_parameter(const char * parameter_name, const char * parameter_value)
{
void AdapterControlPort::set_parameter(const char *parameter_name, const char *parameter_value) {
loggers::get_instance().log("AdapterControlPort::set_parameter: %s=%s", parameter_name, parameter_value);
}
/*void AdapterControlPort::Handle_Fd_Event(int fd, boolean is_readable,
boolean is_writable, boolean is_error) {}*/
void AdapterControlPort::Handle_Fd_Event_Error(int /*fd*/)
{
void AdapterControlPort::Handle_Fd_Event_Error(int /*fd*/) {}
}
void AdapterControlPort::Handle_Fd_Event_Writable(int /*fd*/)
{
void AdapterControlPort::Handle_Fd_Event_Writable(int /*fd*/) {}
}
void AdapterControlPort::Handle_Fd_Event_Readable(int /*fd*/)
{
}
void AdapterControlPort::Handle_Fd_Event_Readable(int /*fd*/) {}
/*void AdapterControlPort::Handle_Timeout(double time_since_last_call) {}*/
void AdapterControlPort::user_map(const char * system_port)
{
loggers::get_instance().log(">>> AdapterControlPort::user_map: %s", system_port);
}
void AdapterControlPort::user_map(const char *system_port) { loggers::get_instance().log(">>> AdapterControlPort::user_map: %s", system_port); }
void AdapterControlPort::user_unmap(const char * system_port)
{
loggers::get_instance().log(">>> AdapterControlPort::user_unmap: %s", system_port);
}
void AdapterControlPort::user_unmap(const char *system_port) { loggers::get_instance().log(">>> AdapterControlPort::user_unmap: %s", system_port); }
void AdapterControlPort::user_start()
{
void AdapterControlPort::user_start() {}
}
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);
// Register this object for AdapterControlPort
pki_layer* p = registration<pki_layer>::get_instance().get_item(std::string("PKI"));
pki_layer *p = registration<pki_layer>::get_instance().get_item(std::string("PKI"));
if (p != NULL) {
loggers::get_instance().log("AdapterControlPort::outgoing_send: Got PKI layer %p", p);
LibItsPki__TypesAndValues::AcPkiResponse response;
......@@ -91,4 +58,4 @@ namespace LibItsPki__TestSystem {
}
}
} /* end of namespace */
} // namespace LibItsPki__TestSystem
......@@ -8,33 +8,31 @@
namespace LibItsPki__TestSystem {
class AdapterControlPort : public AdapterControlPort_BASE {
class AdapterControlPort : public AdapterControlPort_BASE {
params _params;
public:
public:
AdapterControlPort(const char *par_port_name = NULL);
~AdapterControlPort();
void set_parameter(const char *parameter_name,
const char *parameter_value);
void set_parameter(const char *parameter_name, const char *parameter_value);
private:
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:
protected:
void user_map(const char *system_port);
void user_unmap(const char *system_port);
void user_start();
void user_stop();
void outgoing_send(const LibItsPki__TypesAndValues::AcPkiPrimitive& send_par);
void outgoing_send(const LibItsPki__TypesAndValues::AcPkiPrimitive &send_par);
};
};
} /* end of namespace */
} // namespace LibItsPki__TestSystem
#endif
\ No newline at end of file
......@@ -4,27 +4,24 @@
#include "loggers.hh"
#include "uppertester_pki_layer_factory.hh"
#include "uppertester_pki_layer.hh"
#include "uppertester_pki_layer_factory.hh"
//=============================================================================
namespace LibItsPki__TestSystem {
UpperTesterPkiPort::UpperTesterPkiPort(const char *par_port_name)
: UpperTesterPkiPort_BASE(par_port_name), _cfg_params(), _layer_params(), _layer(NULL), _time_key("UpperTesterPkiPort_Pki::outgoing_send")
{
: UpperTesterPkiPort_BASE(par_port_name), _cfg_params(), _layer_params(), _layer(NULL), _time_key("UpperTesterPkiPort_Pki::outgoing_send") {
loggers::get_instance().log("UpperTesterPkiPort_Pki::UpperTesterPkiPort_Pki");
}
UpperTesterPkiPort::~UpperTesterPkiPort()
{
UpperTesterPkiPort::~UpperTesterPkiPort() {
if (_layer != NULL) {
delete _layer;
}
}
void UpperTesterPkiPort::set_parameter(const char * parameter_name, const char * parameter_value)
{
void UpperTesterPkiPort::set_parameter(const char *parameter_name, const char *parameter_value) {
loggers::get_instance().log("UpperTesterPkiPort_Pki::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)));
_cfg_params.log();
......@@ -33,25 +30,15 @@ namespace LibItsPki__TestSystem {
/*void UpperTesterPkiPort::Handle_Fd_Event(int fd, boolean is_readable,
boolean is_writable, boolean is_error) {}*/
void UpperTesterPkiPort::Handle_Fd_Event_Error(int /*fd*/)
{
void UpperTesterPkiPort::Handle_Fd_Event_Error(int /*fd*/) {}
}
void UpperTesterPkiPort::Handle_Fd_Event_Writable(int /*fd*/) {}
void UpperTesterPkiPort::Handle_Fd_Event_Writable(int /*fd*/)
{
}
void UpperTesterPkiPort::Handle_Fd_Event_Readable(int /*fd*/)
{
}
void UpperTesterPkiPort::Handle_Fd_Event_Readable(int /*fd*/) {}
/*void UpperTesterPkiPort::Handle_Timeout(double time_since_last_call) {}*/
void UpperTesterPkiPort::user_map(const char * system_port)
{
void UpperTesterPkiPort::user_map(const char *system_port) {
loggers::get_instance().log(">>> UpperTesterPkiPort_Pki::user_map: %s", system_port);
// Build layer stack
params::iterator it = _cfg_params.find(std::string("params"));
......@@ -67,28 +54,19 @@ namespace LibItsPki__TestSystem {
}
}
void UpperTesterPkiPort::user_unmap(const char * system_port)
{
void UpperTesterPkiPort::user_unmap(const char *system_port) {
loggers::get_instance().log(">>> UpperTesterPkiPort_Pki::user_unmap: %s", system_port);
if (_layer != NULL) {
delete _layer;
_layer = NULL;
}
}
void UpperTesterPkiPort::user_start()
{
}
void UpperTesterPkiPort::user_stop()
{
void UpperTesterPkiPort::user_start() {}
}
void UpperTesterPkiPort::user_stop() {}
void UpperTesterPkiPort::outgoing_send(const LibItsPki__TypesAndValues::UtPkiInitialize& send_par)
{
void UpperTesterPkiPort::outgoing_send(const LibItsPki__TypesAndValues::UtPkiInitialize &send_par) {
loggers::get_instance().log_msg(">>> UppertesterPort::outgoing_send: ", send_par);
float duration;
......@@ -97,8 +75,7 @@ namespace LibItsPki__TestSystem {
loggers::get_instance().set_stop_time(_time_key, duration);
}
void UpperTesterPkiPort::outgoing_send(const LibItsPki__TypesAndValues::UtPkiTrigger& send_par)
{
void UpperTesterPkiPort::outgoing_send(const LibItsPki__TypesAndValues::UtPkiTrigger &send_par) {
loggers::get_instance().log_msg(">>> UppertesterPort::outgoing_send: ", send_par);
float duration;
......@@ -107,7 +84,7 @@ namespace LibItsPki__TestSystem {
loggers::get_instance().set_stop_time(_time_key, duration);
}
void UpperTesterPkiPort::receiveMsg (const Base_Type& p_ind, const params& p_params) {
void UpperTesterPkiPort::receiveMsg(const Base_Type &p_ind, const params &p_params) {
loggers::get_instance().log_msg(">>> UpperTesterPkiPort_Pki::receive_msg: ", p_ind);
// Sanity check
if (!p_ind.is_bound()) {
......@@ -115,10 +92,10 @@ namespace LibItsPki__TestSystem {
}
if (std::string(p_ind.get_descriptor()->name).compare("@LibItsPki_TypesAndValues.UtPkiResults") == 0) { // TODO To be refined
incoming_message(static_cast<const LibItsPki__TypesAndValues::UtPkiResults&>(p_ind));
incoming_message(static_cast<const LibItsPki__TypesAndValues::UtPkiResults &>(p_ind));
} else {
loggers::get_instance().warning("UpperTesterPkiPort_Pki::receive_msg: Message not processed: %s", p_ind.get_descriptor()->name);
}
}
} /* end of namespace */
} // namespace LibItsPki__TestSystem