Commit 560a504e authored by garciay's avatar garciay
Browse files

First DENM test case validation

parent 6b380d03
Loading
Loading
Loading
Loading
+11 −11
Changes for ccsrc/Ports/LibIts_ports/DENM_ports/UpperTesterPort_DENM.partC: 11 added lines, 11 removed lines.
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@
namespace LibItsDenm__TestSystem {

  UpperTesterPort::UpperTesterPort(const char *par_port_name)
    : UpperTesterPort_BASE(par_port_name), _cfg_params(), _layer_params(), _layer(NULL), _time_key("UpperTesterPort::outgoing_send")
    : UpperTesterPort_BASE(par_port_name), _cfg_params(), _layer_params(), _layer(NULL), _time_key("UpperTesterPort_Denm::outgoing_send")
  {
    loggers::get_instance().log("UpperTesterPort_Denm::UpperTesterPort_Denm");

@@ -21,12 +21,12 @@ namespace LibItsDenm__TestSystem {

  void UpperTesterPort::set_parameter(const char * parameter_name, const char * parameter_value)
  {
    loggers::get_instance().log("UpperTesterPort::set_parameter: %s=%s", parameter_name, parameter_value);
    loggers::get_instance().log("UpperTesterPort_Denm::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();
  }

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

  void UpperTesterPort::Handle_Fd_Event_Error(int /*fd*/)
@@ -44,28 +44,28 @@ namespace LibItsDenm__TestSystem {

  }

  /*void UpperTesterPort::Handle_Timeout(double time_since_last_call) {}*/
  /*void UpperTesterPort_Denm::Handle_Timeout(double time_since_last_call) {}*/

  void UpperTesterPort::user_map(const char * system_port)
  {
    loggers::get_instance().log(">>> UpperTesterPort::user_map: %s", system_port);
    loggers::get_instance().log(">>> UpperTesterPort_Denm::user_map: %s", system_port);
    // Build layer stack
    Params::iterator it = _cfg_params.find(std::string("params"));
    if (it != _cfg_params.end()) {
      loggers::get_instance().log("UpperTesterPort::user_map: %s", it->second.c_str());
      loggers::get_instance().log("UpperTesterPort_Denm::user_map: %s", it->second.c_str());
      _layer = LayerStackBuilder::GetInstance()->createLayerStack(it->second.c_str());
      if (static_cast<UpperTesterDenmLayer *>(_layer) == NULL) {
        loggers::get_instance().error("UpperTesterPort::user_map: Invalid stack configuration: %s", it->second.c_str());
        loggers::get_instance().error("UpperTesterPort_Denm::user_map: Invalid stack configuration: %s", it->second.c_str());
      }
      static_cast<UpperTesterDenmLayer *>(_layer)->addUpperPort(this);
    } else {
      loggers::get_instance().error("UpperTesterPort::user_map: No layers defined in configuration file");
      loggers::get_instance().error("UpperTesterPort_Denm::user_map: No layers defined in configuration file");
    }
  }

  void UpperTesterPort::user_unmap(const char * system_port)
  {
    loggers::get_instance().log(">>> UpperTesterPort::user_unmap: %s", system_port);
    loggers::get_instance().log(">>> UpperTesterPort_Denm::user_unmap: %s", system_port);
    if (_layer != NULL) {
      delete _layer;
      _layer = NULL;
@@ -144,13 +144,13 @@ namespace LibItsDenm__TestSystem {
  }

  void UpperTesterPort::receiveMsg (const Base_Type& p_ind, const Params& p_params) {
    loggers::get_instance().log_msg(">>> UpperTesterPort::receive_msg: ", p_ind);
    loggers::get_instance().log_msg(">>> UpperTesterPort_Denm::receive_msg: ", p_ind);
    // Sanity check
    if (!p_ind.is_bound()) {
      return;
    }

    loggers::get_instance().log("UpperTesterPort::receive_msg: %s", p_ind.get_descriptor()->name);
    loggers::get_instance().log("UpperTesterPort_Denm::receive_msg: %s", p_ind.get_descriptor()->name);
    if (std::string(p_ind.get_descriptor()->name).compare("@LibItsDenm_TypesAndValues.UtDenmResults") == 0) { // TODO To be refined
      incoming_message((LibItsDenm__TypesAndValues::UtDenmResults&)p_ind);
    } // TODO Implement UtDenmEventInd part
+9 −9
Changes for ccsrc/Ports/LibIts_ports/GN_ports/UpperTesterPort_GN.partC: 9 added lines, 9 removed lines.
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@
namespace LibItsGeoNetworking__TestSystem {

  UpperTesterPort::UpperTesterPort(const char *par_port_name)
    : UpperTesterPort_BASE(par_port_name), _cfg_params(), _layer_params(), _layer(NULL), _time_key("UpperTesterPort::outgoing_send")
    : UpperTesterPort_BASE(par_port_name), _cfg_params(), _layer_params(), _layer(NULL), _time_key("UpperTesterPort_Gn::outgoing_send")
  {
    loggers::get_instance().log("UpperTesterPort_Gn::UpperTesterPort_Gn");

@@ -20,7 +20,7 @@ namespace LibItsGeoNetworking__TestSystem {

  void UpperTesterPort::set_parameter(const char * parameter_name, const char * parameter_value)
  {
    loggers::get_instance().log("UpperTesterPort::set_parameter: %s=%s", parameter_name, parameter_value);
    loggers::get_instance().log("UpperTesterPort_Gn::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();
  }
@@ -47,25 +47,25 @@ namespace LibItsGeoNetworking__TestSystem {

  void UpperTesterPort::user_map(const char * system_port)
  {
    loggers::get_instance().log(">>> UpperTesterPort::user_map: %s", system_port);
    loggers::get_instance().log(">>> UpperTesterPort_Gn::user_map: %s", system_port);
    // Build layer stack
    Params::iterator it = _cfg_params.find(std::string("params"));
    if (it != _cfg_params.end()) {
      loggers::get_instance().log("UpperTesterPort::user_map: %s", it->second.c_str());
      loggers::get_instance().log("UpperTesterPort_Gn::user_map: %s", it->second.c_str());
      _layer = LayerStackBuilder::GetInstance()->createLayerStack(it->second.c_str());
      if (static_cast<UpperTesterGnLayer *>(_layer) == NULL) {
        loggers::get_instance().error("UpperTesterPort::user_map: Invalid stack configuration: %s", it->second.c_str());
        loggers::get_instance().error("UpperTesterPort_Gn::user_map: Invalid stack configuration: %s", it->second.c_str());
      }
      static_cast<UpperTesterGnLayer *>(_layer)->addUpperPort(this);
    } else {
      loggers::get_instance().error("UpperTesterPort::user_map: No layers defined in configuration file");
      loggers::get_instance().error("UpperTesterPort_Gn::user_map: No layers defined in configuration file");
    }

  }

  void UpperTesterPort::user_unmap(const char * system_port)
  {
    loggers::get_instance().log(">>> UpperTesterPort::user_unmap: %s", system_port);
    loggers::get_instance().log(">>> UpperTesterPort_Gn::user_unmap: %s", system_port);
    if (_layer != NULL) {
      delete _layer;
      _layer = NULL;
@@ -113,13 +113,13 @@ namespace LibItsGeoNetworking__TestSystem {
  }

  void UpperTesterPort::receiveMsg (const Base_Type& p_ind, const Params& p_params) {
    loggers::get_instance().log_msg(">>> UpperTesterPort::receive_msg: ", p_ind);
    loggers::get_instance().log_msg(">>> UpperTesterPort_Gn::receive_msg: ", p_ind);
    // Sanity check
    if (!p_ind.is_bound()) {
      return;
    }

    //loggers::get_instance().log("UpperTesterPort::receive_msg: %s", p_ind.get_descriptor()->name);
    //loggers::get_instance().log("UpperTesterPort_Gn::receive_msg: %s", p_ind.get_descriptor()->name);
    if (std::string(p_ind.get_descriptor()->name).compare("@LibItsGeoNetworking_TypesAndValues.UtGnResults") == 0) { // TODO To be refined
      incoming_message((LibItsGeoNetworking__TypesAndValues::UtGnResults&)p_ind);
    }
+1 −0
Changes for ccsrc/Protocols/UDP/UdpLayer.cc: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ void UdpLayer::sendData(OCTETSTRING& data, Params& params) {
  // Set payload
  unsigned char *payload = buffer + sizeof(struct iphdr) + sizeof(struct udphdr);
  memcpy(payload, static_cast<const unsigned char *>(data), data.lengthof());
  // TODO Calculate UDP checksum
  // Send data lower layers
  OCTETSTRING udp(len, buffer);
  sendToAllLayers(udp, params);
+1 −1
Changes for ccsrc/Protocols/UpperTester/UpperTesterDenmLayer.cc: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ public:
UpperTesterDenmFactory::UpperTesterDenmFactory(){
  // Register factory
  loggers::get_instance().log(">>> UpperTesterDenmFactory::UpperTesterDenmFactory");
  LayerStackBuilder::RegisterLayerFactory("UT", this);
  LayerStackBuilder::RegisterLayerFactory("UT_DENM", this);
}

Layer * UpperTesterDenmFactory::createLayer(const std::string & p_type, const std::string & param){
+1 −1
Changes for ccsrc/Protocols/UpperTester/UpperTesterGnLayer.cc: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ public:
UpperTesterGnFactory::UpperTesterGnFactory(){
  // Register factory
  loggers::get_instance().log(">>> UpperTesterGnFactory::UpperTesterGnFactory");
  LayerStackBuilder::RegisterLayerFactory("UT", this);
  LayerStackBuilder::RegisterLayerFactory("UT_GN", this);
}

Layer * UpperTesterGnFactory::createLayer(const std::string & p_type, const std::string & param){