...@@ -8,86 +8,86 @@ ...@@ -8,86 +8,86 @@
* All rights reserved. * All rights reserved.
* \version 0.1 * \version 0.1
*/ */
#include <stdexcept>
#include <regex> #include <regex>
#include <stdexcept>
#include "params.hh"
#include "loggers.hh" #include "loggers.hh"
#include "params.hh"
const std::string& params::debug = std::string("debug"); const std::string &params::debug = std::string("debug");
const std::string& params::loopback = std::string("loopback"); const std::string &params::loopback = std::string("loopback");
const std::string& params::mac_src = std::string("mac_src"); const std::string &params::mac_src = std::string("mac_src");
const std::string& params::mac_dst = std::string("mac_dst"); const std::string &params::mac_dst = std::string("mac_dst");
const std::string& params::mac_bc = std::string("mac_bc"); const std::string &params::mac_bc = std::string("mac_bc");
const std::string& params::eth_type = std::string("eth_type"); const std::string &params::eth_type = std::string("eth_type");
const std::string& params::beaconing = std::string("beaconing"); const std::string &params::beaconing = std::string("beaconing");
const std::string& params::timestamp = std::string("timestamp"); const std::string &params::timestamp = std::string("timestamp");
const std::string& params::station_type = std::string("station_type"); const std::string &params::station_type = std::string("station_type");
const std::string& params::country = std::string("country"); const std::string &params::country = std::string("country");
const std::string& params::type_of_address = std::string("type_of_address"); const std::string &params::type_of_address = std::string("type_of_address");
const std::string& params::its_aid = std::string("its_aid"); const std::string &params::its_aid = std::string("its_aid");
const std::string& params::ssp = std::string("ssp"); const std::string &params::ssp = std::string("ssp");
const std::string& params::gn_payload = std::string("gn_payload"); const std::string &params::gn_payload = std::string("gn_payload");
const std::string& params::gn_next_header = std::string("gnNextHeader"); const std::string &params::gn_next_header = std::string("gnNextHeader");
const std::string& params::gn_header_type = std::string("gnHeaderType"); const std::string &params::gn_header_type = std::string("gnHeaderType");
const std::string& params::gn_header_sub_type = std::string("gnHeaderSubtype"); const std::string &params::gn_header_sub_type = std::string("gnHeaderSubtype");
const std::string& params::gn_lifetime = std::string("gnLifetime"); const std::string &params::gn_lifetime = std::string("gnLifetime");
const std::string& params::gn_traffic_class = std::string("gnTrafficClass"); const std::string &params::gn_traffic_class = std::string("gnTrafficClass");
const std::string& params::btp_type = std::string("btp_type"); const std::string &params::btp_type = std::string("btp_type");
const std::string& params::btp_payload = std::string("btp_payload"); const std::string &params::btp_payload = std::string("btp_payload");
const std::string& params::btp_destination_port = std::string("dst_port"); const std::string &params::btp_destination_port = std::string("dst_port");
const std::string& params::btp_info = std::string("btp_info"); const std::string &params::btp_info = std::string("btp_info");
const std::string& params::nic = std::string("nic"); const std::string &params::nic = std::string("nic");
const std::string& params::latitude = std::string("latitude"); const std::string &params::latitude = std::string("latitude");
const std::string& params::longitude = std::string("longitude"); const std::string &params::longitude = std::string("longitude");
const std::string& params::ll_address = std::string("ll_address"); const std::string &params::ll_address = std::string("ll_address");
const std::string& params::expiry = std::string("expiry"); const std::string &params::expiry = std::string("expiry");
const std::string& params::station_id = std::string("station_id"); const std::string &params::station_id = std::string("station_id");
const std::string& params::device_mode = std::string("device_mode"); const std::string &params::device_mode = std::string("device_mode");
const std::string& params::secured_mode = std::string("secured_mode"); const std::string &params::secured_mode = std::string("secured_mode");
const std::string& params::encrypted_mode = std::string("encrypted_mode"); const std::string &params::encrypted_mode = std::string("encrypted_mode");
const std::string& params::enable_security_checks = std::string("enable_security_checks"); const std::string &params::enable_security_checks = std::string("enable_security_checks");
const std::string& params::certificate = std::string("certificate"); const std::string &params::certificate = std::string("certificate");
const std::string& params::peer_certificate = std::string("peer_certificate"); const std::string &params::peer_certificate = std::string("peer_certificate");
const std::string& params::sec_db_path = std::string("sec_db_path"); const std::string &params::sec_db_path = std::string("sec_db_path");
const std::string& params::hash = std::string("hash"); const std::string &params::hash = std::string("hash");
const std::string& params::signature = std::string("signature"); const std::string &params::signature = std::string("signature");
const std::string& params::cypher = std::string("cypher"); const std::string &params::cypher = std::string("cypher");
const std::string& params::distanceA = std::string("distanceA"); const std::string &params::distanceA = std::string("distanceA");
const std::string& params::distanceB = std::string("distanceB"); const std::string &params::distanceB = std::string("distanceB");
const std::string& params::angle = std::string("angle"); const std::string &params::angle = std::string("angle");
const std::string& params::payload_type = std::string("payload_type"); const std::string &params::payload_type = std::string("payload_type");
const std::string& params::next_header = std::string("next_header"); const std::string &params::next_header = std::string("next_header");
const std::string& params::header_type = std::string("header_type"); const std::string &params::header_type = std::string("header_type");
const std::string& params::header_sub_type = std::string("header_sub_type"); const std::string &params::header_sub_type = std::string("header_sub_type");
const std::string& params::interface_id = std::string("interface_id"); const std::string &params::interface_id = std::string("interface_id");
const std::string& params::server = std::string("server"); const std::string &params::server = std::string("server");
const std::string& params::port = std::string("port"); const std::string &params::port = std::string("port");
const std::string& params::use_ssl = std::string("use_ssl"); const std::string &params::use_ssl = std::string("use_ssl");
const std::string& params::server_mode = std::string("server_mode"); const std::string &params::server_mode = std::string("server_mode");
const std::string& params::local_port = std::string("local_port"); const std::string &params::local_port = std::string("local_port");
const std::string& params::method = std::string("method"); const std::string &params::method = std::string("method");
const std::string& params::uri = std::string("uri"); const std::string &params::uri = std::string("uri");
const std::string& params::host = std::string("host"); const std::string &params::host = std::string("host");
const std::string& params::content_type = std::string("content_type"); const std::string &params::content_type = std::string("content_type");
//const std::string& params::sip_url = std::string("sip_url"); // const std::string& params::sip_url = std::string("sip_url");
//const std::string& params::sip_version = std::string("sip_version"); // const std::string& params::sip_version = std::string("sip_version");
//const std::string& params::payload = std::string("payload"); // const std::string& params::payload = std::string("payload");
const std::string& params::codecs = std::string("codecs"); const std::string &params::codecs = std::string("codecs");
void params::convert(params& p_param, const std::string p_parameters) { void params::convert(params &p_param, const std::string p_parameters) {
// Sanity checks // Sanity checks
if (p_parameters.length() == 0) { if (p_parameters.length() == 0) {
return; return;
...@@ -95,16 +95,16 @@ void params::convert(params& p_param, const std::string p_parameters) { ...@@ -95,16 +95,16 @@ void params::convert(params& p_param, const std::string p_parameters) {
loggers::get_instance().log(">>> params::convert: %s", p_parameters.c_str()); loggers::get_instance().log(">>> params::convert: %s", p_parameters.c_str());
// Extract parameters // Extract parameters
try { try {
std::regex rgx ("(\\w+)=(.*?)(,|$)"); std::regex rgx("(\\w+)=(.*?)(,|$)");
std::sregex_iterator begin(p_parameters.cbegin(), p_parameters.cend(), rgx); std::sregex_iterator begin(p_parameters.cbegin(), p_parameters.cend(), rgx);
std::sregex_iterator end = std::sregex_iterator(); std::sregex_iterator end = std::sregex_iterator();
for (std::sregex_iterator it = begin; it != end; ++it) { for (std::sregex_iterator it = begin; it != end; ++it) {
std::smatch m = *it; std::smatch m = *it;
loggers::get_instance().log("params::convert: %d - %s - %s - %s - %s", m.size(), m[0].str().c_str(), m[1].str().c_str(), m[2].str().c_str(), m[3].str().c_str()); loggers::get_instance().log("params::convert: %d - %s - %s - %s - %s", m.size(), m[0].str().c_str(), m[1].str().c_str(), m[2].str().c_str(),
m[3].str().c_str());
p_param.insert(std::pair<std::string, std::string>(m[1].str(), m[2].str())); p_param.insert(std::pair<std::string, std::string>(m[1].str(), m[2].str()));
} // End of 'for' statement } // End of 'for' statement
} } catch (const std::logic_error &e) {
catch(const std::logic_error& e){
p_param.clear(); p_param.clear();
} }
loggers::get_instance().log("<<< params::convert"); loggers::get_instance().log("<<< params::convert");
......
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
* A port protocol layer derives from both a layer class and a template port class * A port protocol layer derives from both a layer class and a template port class
*/ */
template <typename TPort> class t_layer : public layer { template <typename TPort> class t_layer : public layer {
typedef std::vector<TPort*> TPortList; typedef std::vector<TPort *> TPortList;
typedef typename std::vector<TPort*>::iterator TPortListIterator; typedef typename std::vector<TPort *>::iterator TPortListIterator;
TPortList upperPorts; //! The list of the upper ports TPortList upperPorts; //! The list of the upper ports
...@@ -30,7 +30,7 @@ public: //! \publicsection ...@@ -30,7 +30,7 @@ public: //! \publicsection
* Create a new instance of the t_layer class * Create a new instance of the t_layer class
* \todo Remove logs * \todo Remove logs
*/ */
explicit t_layer() : layer(), upperPorts() { }; explicit t_layer() : layer(), upperPorts(){};
/*! /*!
* \brief Specialized constructor * \brief Specialized constructor
...@@ -39,20 +39,20 @@ public: //! \publicsection ...@@ -39,20 +39,20 @@ public: //! \publicsection
* \remark This constructor is called by the layer factory * \remark This constructor is called by the layer factory
* \see layer_factory * \see layer_factory
*/ */
explicit t_layer(const std::string& p_type) : layer(p_type), upperPorts() { }; explicit t_layer(const std::string &p_type) : layer(p_type), upperPorts(){};
/*! /*!
* \inline * \inline
* \fn void add_upper_port(TPort * p_port); * \fn void add_upper_port(TPort * p_port);
* \brief Add a new upper port layer * \brief Add a new upper port layer
* \todo To be done * \todo To be done
*/ */
inline void add_upper_port(TPort * p_port) { upperPorts.push_back(p_port); }; inline void add_upper_port(TPort *p_port) { upperPorts.push_back(p_port); };
/*! /*!
* \fn void remove_upper_port(TPort*); * \fn void remove_upper_port(TPort*);
* \brief Remove the specified upper layer port protocol from the list of the upper layers * \brief Remove the specified upper layer port protocol from the list of the upper layers
* \param[in] p_layer The layer protocol to be removed * \param[in] p_layer The layer protocol to be removed
*/ */
void remove_upper_port(TPort*); void remove_upper_port(TPort *);
protected: //! \protectedsection protected: //! \protectedsection
/*! /*!
...@@ -62,11 +62,9 @@ protected: //! \protectedsection ...@@ -62,11 +62,9 @@ protected: //! \protectedsection
* \param[in] p_message The message to be forwarded * \param[in] p_message The message to be forwarded
* \param[in] p_params Some lower layers parameters values when data was received * \param[in] p_params Some lower layers parameters values when data was received
*/ */
template <typename TMessage> template <typename TMessage> inline void to_all_upper_ports(const TMessage &p_message, const params &p_params) {
inline void to_all_upper_ports(const TMessage& p_message, const params& p_params) { for (TPortListIterator it = upperPorts.begin(); it < upperPorts.end(); ++it) {
for(TPortListIterator it=upperPorts.begin(); it<upperPorts.end(); ++it){
(*it)->receiveMsg(p_message, p_params); (*it)->receiveMsg(p_message, p_params);
} }
} }
}; // End of class t_layer }; // End of class t_layer
...@@ -56,10 +56,10 @@ ...@@ -56,10 +56,10 @@
#include "AdapterControlPort_GN.hh" #include "AdapterControlPort_GN.hh"
#endif #endif
/* /*
#include "AdapterControlPort_Evcsn.partH"
#include "AdapterControlPort_IVIM.partH" #include "AdapterControlPort_IVIM.partH"
#include "AdapterControlPort_MapemSpatem.partH" #include "AdapterControlPort_MapemSpatem.partH"
#include "AdapterControlPort_SremSsem.partH" #include "AdapterControlPort_SremSsem.partH"
#include "AdapterControlPort_Evcsn.partH"
*/ */
//#include "AdapterControlPort_V2G.partH" //#include "AdapterControlPort_V2G.partH"
#endif //_NO_SOFTLINKS_ #endif //_NO_SOFTLINKS_
...@@ -11,67 +11,31 @@ ...@@ -11,67 +11,31 @@
namespace ItsAutoInterop__TestSystem { namespace ItsAutoInterop__TestSystem {
HmiPort::HmiPort(const char *par_port_name) HmiPort::HmiPort(const char *par_port_name) : HmiPort_BASE(par_port_name) {}
: HmiPort_BASE(par_port_name)
{
} HmiPort::~HmiPort() {}
HmiPort::~HmiPort() void HmiPort::set_parameter(const char * /*parameter_name*/, const char * /*parameter_value*/) {}
{
} /*void HmiPort::Handle_Fd_Event(int fd, boolean is_readable,
void HmiPort::set_parameter(const char * /*parameter_name*/,
const char * /*parameter_value*/)
{
}
/*void HmiPort::Handle_Fd_Event(int fd, boolean is_readable,
boolean is_writable, boolean is_error) {}*/ boolean is_writable, boolean is_error) {}*/
void HmiPort::Handle_Fd_Event_Error(int /*fd*/) void HmiPort::Handle_Fd_Event_Error(int /*fd*/) {}
{
}
void HmiPort::Handle_Fd_Event_Writable(int /*fd*/)
{
}
void HmiPort::Handle_Fd_Event_Readable(int /*fd*/)
{
}
/*void HmiPort::Handle_Timeout(double time_since_last_call) {}*/
void HmiPort::user_map(const char * /*system_port*/)
{
}
void HmiPort::user_unmap(const char * /*system_port*/)
{
} void HmiPort::Handle_Fd_Event_Writable(int /*fd*/) {}
void HmiPort::user_start() void HmiPort::Handle_Fd_Event_Readable(int /*fd*/) {}
{
} /*void HmiPort::Handle_Timeout(double time_since_last_call) {}*/
void HmiPort::user_stop() void HmiPort::user_map(const char * /*system_port*/) {}
{
} void HmiPort::user_unmap(const char * /*system_port*/) {}
void HmiPort::outgoing_send(const ItsAutoInterop__TypesAndValues::HmiInitialize& /*send_par*/) void HmiPort::user_start() {}
{
} void HmiPort::user_stop() {}
} /* end of namespace */ void HmiPort::outgoing_send(const ItsAutoInterop__TypesAndValues::HmiInitialize & /*send_par*/) {}
} // namespace ItsAutoInterop__TestSystem
...@@ -15,31 +15,30 @@ ...@@ -15,31 +15,30 @@
namespace ItsAutoInterop__TestSystem { namespace ItsAutoInterop__TestSystem {
class HmiPort : public HmiPort_BASE { class HmiPort : public HmiPort_BASE {
public: public:
HmiPort(const char *par_port_name = NULL); HmiPort(const char *par_port_name = NULL);
~HmiPort(); ~HmiPort();
void set_parameter(const char *parameter_name, void set_parameter(const char *parameter_name, const char *parameter_value);
const char *parameter_value);
private: private:
/* void Handle_Fd_Event(int fd, boolean is_readable, /* void Handle_Fd_Event(int fd, boolean is_readable,
boolean is_writable, boolean is_error); */ boolean is_writable, boolean is_error); */
void Handle_Fd_Event_Error(int fd); void Handle_Fd_Event_Error(int fd);
void Handle_Fd_Event_Writable(int fd); void Handle_Fd_Event_Writable(int fd);
void Handle_Fd_Event_Readable(int fd); void Handle_Fd_Event_Readable(int fd);
/* void Handle_Timeout(double time_since_last_call); */ /* void Handle_Timeout(double time_since_last_call); */
protected: protected:
void user_map(const char *system_port); void user_map(const char *system_port);
void user_unmap(const char *system_port); void user_unmap(const char *system_port);
void user_start(); void user_start();
void user_stop(); void user_stop();
void outgoing_send(const ItsAutoInterop__TypesAndValues::HmiInitialize& send_par); void outgoing_send(const ItsAutoInterop__TypesAndValues::HmiInitialize &send_par);
}; };
} /* end of namespace */ } // namespace ItsAutoInterop__TestSystem
#endif #endif
...@@ -13,10 +13,8 @@ ...@@ -13,10 +13,8 @@
namespace LibItsBtp__TestSystem { namespace LibItsBtp__TestSystem {
BtpPort::BtpPort(const char *par_port_name) : BtpPort::BtpPort(const char *par_port_name)
BtpPort_BASE(par_port_name), _cfg_params(), _layer_params(), _layer(NULL), _time_key("BtpPort::outgoing_send") { : BtpPort_BASE(par_port_name), _cfg_params(), _layer_params(), _layer(NULL), _time_key("BtpPort::outgoing_send") {}
}
BtpPort::~BtpPort() { BtpPort::~BtpPort() {
if (_layer != NULL) { if (_layer != NULL) {
...@@ -24,7 +22,7 @@ namespace LibItsBtp__TestSystem { ...@@ -24,7 +22,7 @@ namespace LibItsBtp__TestSystem {
} }
} }
void BtpPort::set_parameter(const char * parameter_name, const char * parameter_value) { void BtpPort::set_parameter(const char *parameter_name, const char *parameter_value) {
loggers::get_instance().log("BtpPort::set_parameter: %s=%s", parameter_name, parameter_value); loggers::get_instance().log("BtpPort::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.insert(std::pair<std::string, std::string>(std::string(parameter_name), std::string(parameter_value)));
} }
...@@ -32,21 +30,15 @@ namespace LibItsBtp__TestSystem { ...@@ -32,21 +30,15 @@ namespace LibItsBtp__TestSystem {
/*void BtpPort::Handle_Fd_Event(int fd, boolean is_readable, /*void BtpPort::Handle_Fd_Event(int fd, boolean is_readable,
boolean is_writable, boolean is_error) {}*/ boolean is_writable, boolean is_error) {}*/
void BtpPort::Handle_Fd_Event_Error(int /*fd*/) { void BtpPort::Handle_Fd_Event_Error(int /*fd*/) {}
} void BtpPort::Handle_Fd_Event_Writable(int /*fd*/) {}
void BtpPort::Handle_Fd_Event_Writable(int /*fd*/) { void BtpPort::Handle_Fd_Event_Readable(int /*fd*/) {}
}
void BtpPort::Handle_Fd_Event_Readable(int /*fd*/) {
}
/*void BtpPort::Handle_Timeout(double time_since_last_call) {}*/ /*void BtpPort::Handle_Timeout(double time_since_last_call) {}*/
void BtpPort::user_map(const char * system_port) { void BtpPort::user_map(const char *system_port) {
loggers::get_instance().log(">>> BtpPort::user_map: %s", system_port); loggers::get_instance().log(">>> BtpPort::user_map: %s", system_port);
// Build layer stack // Build layer stack
params::iterator it = _cfg_params.find(std::string("params")); params::iterator it = _cfg_params.find(std::string("params"));
...@@ -65,7 +57,7 @@ namespace LibItsBtp__TestSystem { ...@@ -65,7 +57,7 @@ namespace LibItsBtp__TestSystem {
} }
} }
void BtpPort::user_unmap(const char * system_port) { void BtpPort::user_unmap(const char *system_port) {
loggers::get_instance().log(">>> BtpPort::user_unmap: %s", system_port); loggers::get_instance().log(">>> BtpPort::user_unmap: %s", system_port);
if (_layer != NULL) { if (_layer != NULL) {
delete _layer; delete _layer;
...@@ -73,16 +65,12 @@ namespace LibItsBtp__TestSystem { ...@@ -73,16 +65,12 @@ namespace LibItsBtp__TestSystem {
} }
} }
void BtpPort::user_start() { void BtpPort::user_start() {}
}
void BtpPort::user_stop() {
} void BtpPort::user_stop() {}
void BtpPort::outgoing_send(const BtpReq& send_par) { void BtpPort::outgoing_send(const BtpReq &send_par) {
// loggers::get_instance().log_msg(">>> BtpPort::outgoing_send: payload=", send_par); // loggers::get_instance().log_msg(">>> BtpPort::outgoing_send: payload=", send_par);
float duration; float duration;
loggers::get_instance().set_start_time(_time_key); loggers::get_instance().set_start_time(_time_key);
...@@ -90,11 +78,10 @@ namespace LibItsBtp__TestSystem { ...@@ -90,11 +78,10 @@ namespace LibItsBtp__TestSystem {
loggers::get_instance().set_stop_time(_time_key, duration); loggers::get_instance().set_stop_time(_time_key, duration);
} }
void BtpPort::receiveMsg(const LibItsBtp__TestSystem::BtpInd& p_ind, const params& p_params) { void BtpPort::receiveMsg(const LibItsBtp__TestSystem::BtpInd &p_ind, const params &p_params) {
// loggers::get_instance().log_msg(">>> BtpPort::receive_msg: ", p_ind); // loggers::get_instance().log_msg(">>> BtpPort::receive_msg: ", p_ind);
incoming_message(p_ind); incoming_message(p_ind);
} }
} /* end of namespace */ } // namespace LibItsBtp__TestSystem
...@@ -20,16 +20,16 @@ namespace LibItsBtp__TestSystem { ...@@ -20,16 +20,16 @@ namespace LibItsBtp__TestSystem {
class BtpPort : public BtpPort_BASE { class BtpPort : public BtpPort_BASE {
params _cfg_params; params _cfg_params;
params _layer_params; params _layer_params;
layer* _layer; layer * _layer;
std::string _time_key; std::string _time_key;
public: public:
BtpPort(const char *par_port_name = NULL); BtpPort(const char *par_port_name = NULL);
~BtpPort(); ~BtpPort();
void set_parameter(const char *parameter_name, void set_parameter(const char *parameter_name, const char *parameter_value);
const char *parameter_value);
void receiveMsg (const LibItsBtp__TestSystem::BtpInd&, const params&); void receiveMsg(const LibItsBtp__TestSystem::BtpInd &, const params &);
private: private:
/* void Handle_Fd_Event(int fd, boolean is_readable, /* void Handle_Fd_Event(int fd, boolean is_readable,
...@@ -45,9 +45,9 @@ namespace LibItsBtp__TestSystem { ...@@ -45,9 +45,9 @@ namespace LibItsBtp__TestSystem {
void user_start(); void user_start();
void user_stop(); void user_stop();
void outgoing_send(const BtpReq& send_par); void outgoing_send(const BtpReq &send_par);
}; };
} /* end of namespace */ } // namespace LibItsBtp__TestSystem
#endif #endif
...@@ -2,71 +2,33 @@ ...@@ -2,71 +2,33 @@
//============================================================================= //=============================================================================
namespace LibItsBtp__TestSystem { namespace LibItsBtp__TestSystem {
UpperTesterPort::UpperTesterPort(const char *par_port_name) UpperTesterPort::UpperTesterPort(const char *par_port_name) : UpperTesterPort_BASE(par_port_name) {}
: UpperTesterPort_BASE(par_port_name)
{
} UpperTesterPort::~UpperTesterPort() {}
UpperTesterPort::~UpperTesterPort() void UpperTesterPort::set_parameter(const char * /*parameter_name*/, const char * /*parameter_value*/) {}
{
} /*void UpperTesterPort::Handle_Fd_Event(int fd, boolean is_readable,
void UpperTesterPort::set_parameter(const char * /*parameter_name*/,
const char * /*parameter_value*/)
{
}
/*void UpperTesterPort::Handle_Fd_Event(int fd, boolean is_readable,
boolean is_writable, boolean is_error) {}*/ 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_Readable(int /*fd*/)
{
}
/*void UpperTesterPort::Handle_Timeout(double time_since_last_call) {}*/
void UpperTesterPort::user_map(const char * /*system_port*/)
{
}
void UpperTesterPort::user_unmap(const char * /*system_port*/)
{
} void UpperTesterPort::Handle_Fd_Event_Writable(int /*fd*/) {}
void UpperTesterPort::user_start() void UpperTesterPort::Handle_Fd_Event_Readable(int /*fd*/) {}
{
} /*void UpperTesterPort::Handle_Timeout(double time_since_last_call) {}*/
void UpperTesterPort::user_stop() void UpperTesterPort::user_map(const char * /*system_port*/) {}
{
} void UpperTesterPort::user_unmap(const char * /*system_port*/) {}
void UpperTesterPort::outgoing_send(const LibItsBtp__TypesAndValues::UtBtpInitialize& /*send_par*/) void UpperTesterPort::user_start() {}
{
} void UpperTesterPort::user_stop() {}
void UpperTesterPort::outgoing_send(const LibItsBtp__TypesAndValues::UtBtpTrigger& /*send_par*/) void UpperTesterPort::outgoing_send(const LibItsBtp__TypesAndValues::UtBtpInitialize & /*send_par*/) {}
{
} void UpperTesterPort::outgoing_send(const LibItsBtp__TypesAndValues::UtBtpTrigger & /*send_par*/) {}
} /* end of namespace */ } // namespace LibItsBtp__TestSystem
...@@ -4,32 +4,31 @@ ...@@ -4,32 +4,31 @@
#include "LibItsBtp_TestSystem.hh" #include "LibItsBtp_TestSystem.hh"
namespace LibItsBtp__TestSystem { namespace LibItsBtp__TestSystem {
class UpperTesterPort : public UpperTesterPort_BASE { class UpperTesterPort : public UpperTesterPort_BASE {
public: public:
UpperTesterPort(const char *par_port_name = NULL); UpperTesterPort(const char *par_port_name = NULL);
~UpperTesterPort(); ~UpperTesterPort();
void set_parameter(const char *parameter_name, void set_parameter(const char *parameter_name, const char *parameter_value);
const char *parameter_value);
private: private:
/* void Handle_Fd_Event(int fd, boolean is_readable, /* void Handle_Fd_Event(int fd, boolean is_readable,
boolean is_writable, boolean is_error); */ boolean is_writable, boolean is_error); */
void Handle_Fd_Event_Error(int fd); void Handle_Fd_Event_Error(int fd);
void Handle_Fd_Event_Writable(int fd); void Handle_Fd_Event_Writable(int fd);
void Handle_Fd_Event_Readable(int fd); void Handle_Fd_Event_Readable(int fd);
/* void Handle_Timeout(double time_since_last_call); */ /* void Handle_Timeout(double time_since_last_call); */
protected: protected:
void user_map(const char *system_port); void user_map(const char *system_port);
void user_unmap(const char *system_port); void user_unmap(const char *system_port);
void user_start(); void user_start();
void user_stop(); void user_stop();
void outgoing_send(const LibItsBtp__TypesAndValues::UtBtpInitialize& send_par); void outgoing_send(const LibItsBtp__TypesAndValues::UtBtpInitialize &send_par);
void outgoing_send(const LibItsBtp__TypesAndValues::UtBtpTrigger& send_par); void outgoing_send(const LibItsBtp__TypesAndValues::UtBtpTrigger &send_par);
}; };
} /* end of namespace */ } // namespace LibItsBtp__TestSystem
#endif #endif
...@@ -5,33 +5,31 @@ ...@@ -5,33 +5,31 @@
namespace LibItsCam__TestSystem { namespace LibItsCam__TestSystem {
class AdapterControlPort : public AdapterControlPort_BASE { class AdapterControlPort : public AdapterControlPort_BASE {
public: public:
AdapterControlPort(const char *par_port_name = NULL); AdapterControlPort(const char *par_port_name = NULL);
~AdapterControlPort(); ~AdapterControlPort();
void set_parameter(const char *parameter_name, void set_parameter(const char *parameter_name, const char *parameter_value);
const char *parameter_value);
private: private:
/* void Handle_Fd_Event(int fd, boolean is_readable, /* void Handle_Fd_Event(int fd, boolean is_readable,
boolean is_writable, boolean is_error); */ boolean is_writable, boolean is_error); */
void Handle_Fd_Event_Error(int fd); void Handle_Fd_Event_Error(int fd);
void Handle_Fd_Event_Writable(int fd); void Handle_Fd_Event_Writable(int fd);
void Handle_Fd_Event_Readable(int fd); void Handle_Fd_Event_Readable(int fd);
/* void Handle_Timeout(double time_since_last_call); */ /* void Handle_Timeout(double time_since_last_call); */
protected: protected:
void user_map(const char *system_port); void user_map(const char *system_port);
void user_unmap(const char *system_port); void user_unmap(const char *system_port);
void user_start(); void user_start();
void user_stop(); 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);
};
}; } // namespace LibItsCam__TestSystem
} // end of namespace
#endif #endif
\ No newline at end of file
...@@ -20,16 +20,16 @@ namespace LibItsCam__TestSystem { ...@@ -20,16 +20,16 @@ namespace LibItsCam__TestSystem {
class CamPort : public CamPort_BASE { class CamPort : public CamPort_BASE {
params _cfg_params; params _cfg_params;
params _layer_params; params _layer_params;
layer* _layer; layer * _layer;
std::string _time_key; std::string _time_key;
public: public:
CamPort(const char *par_port_name = NULL); CamPort(const char *par_port_name = NULL);
~CamPort(); ~CamPort();
void set_parameter(const char *parameter_name, void set_parameter(const char *parameter_name, const char *parameter_value);
const char *parameter_value);
void receiveMsg (const LibItsCam__TestSystem::CamInd&, const params&); void receiveMsg(const LibItsCam__TestSystem::CamInd &, const params &);
private: private:
/* void Handle_Fd_Event(int fd, boolean is_readable, /* void Handle_Fd_Event(int fd, boolean is_readable,
...@@ -45,9 +45,9 @@ namespace LibItsCam__TestSystem { ...@@ -45,9 +45,9 @@ namespace LibItsCam__TestSystem {
void user_start(); void user_start();
void user_stop(); void user_stop();
void outgoing_send(const CamReq& send_par); void outgoing_send(const CamReq &send_par);
}; };
} /* end of namespace */ } // namespace LibItsCam__TestSystem
#endif #endif