Commit 3c844b70 authored by Yann Garcia's avatar Yann Garcia
Browse files

Validate AtsSsem against TTwb 1.1.30

parent 23bcbd59

ccsrc/Framework/params.hh

+0 −2
Original line number Original line Diff line number Diff line
@@ -47,8 +47,6 @@ public: //! \publicsection 
  static const std::string& btp_payload;           //! BTP Payload parameter name

  static const std::string& btp_payload;           //! BTP Payload parameter name

  static const std::string& btp_destination_port;  //! BTP DestinationPort parameter name

  static const std::string& btp_destination_port;  //! BTP DestinationPort parameter name

  static const std::string& btp_info;              //! BTP Info parameter name

  static const std::string& btp_info;              //! BTP Info parameter name

  static const std::string& ssem_destination_port; //! BTP Destination port for SSEM

  static const std::string& spatem_destination_port;//! BTP Destination port for SPATEM





  static const std::string& nic;                   //! Network Interface Card parameter name

  static const std::string& nic;                   //! Network Interface Card parameter name

  static const std::string& ll_address;            //! Test system GeoNetworking LL-Address parameter name

  static const std::string& ll_address;            //! Test system GeoNetworking LL-Address parameter name

ccsrc/Framework/src/params.cc

+0 −2
Original line number Original line Diff line number Diff line
@@ -39,8 +39,6 @@ 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::ssem_destination_port = std::string("ssem_port");

const std::string& params::spatem_destination_port = std::string("spatem_port");





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");

ccsrc/Protocols/BTP/btp_layer.cc

+7 −11
Original line number Original line Diff line number Diff line
@@ -54,15 +54,11 @@ void btp_layer::send_data(OCTETSTRING& data, params& params) { 
    } else {

    } else {

      btp_type = _params[params::btp_type];

      btp_type = _params[params::btp_type];

    }

    }

    int btp_destination_port = std::stoi(_params[params::btp_destination_port]);

    loggers::get_instance().log("btp_layer::send_data: btp_type=%s", btp_type.c_str());

    it = _params.find(params::ssem_destination_port);

    int btp_destination_port = std::stoi(_params[params::btp_destination_port]); // Default value

    if  (it != _params.cend()) {

    it = params.find(params::btp_destination_port);

      btp_destination_port = std::stoi(_params[params::ssem_destination_port]);

    if (it != params.cend()) {

    } else {

      btp_destination_port = std::stoi(params[params::btp_destination_port]); // Overwritting default value

      it = _params.find(params::spatem_destination_port);

      if  (it != _params.cend()) {

        btp_destination_port = std::stoi(_params[params::spatem_destination_port]);

      }

    }

    }

    loggers::get_instance().log("btp_layer::send_data: btp_destination_port=%d", btp_destination_port);

    loggers::get_instance().log("btp_layer::send_data: btp_destination_port=%d", btp_destination_port);

    if (btp_type.compare("btpA") == 0) {

    if (btp_type.compare("btpA") == 0) {

ccsrc/Protocols/Rtcmem/RtcmemLayer.cc

+0 −1
Original line number Original line Diff line number Diff line
@@ -32,7 +32,6 @@ void RtcmemLayer::sendMsg(const LibItsRtcmem__TestSystem::RtcmemReq& p, params& 




void RtcmemLayer::send_data(OCTETSTRING& data, params& params) {

void RtcmemLayer::send_data(OCTETSTRING& data, params& params) {

  loggers::get_instance().log_msg(">>> RtcmemLayer::send_data: ", data);

  loggers::get_instance().log_msg(">>> RtcmemLayer::send_data: ", data);

  //params.log();

  send_to_all_layers(data, params);

  send_to_all_layers(data, params);

}

}

ccsrc/Protocols/SremSsem/SremSsemLayer.cc

+13 −1
Original line number Original line Diff line number Diff line
@@ -10,6 +10,9 @@ SremSsemLayer::SremSsemLayer(const std::string & p_type, const std::string & par 
  loggers::get_instance().log(">>> SremSsemLayer::SremSsemLayer: %s, %s", to_string().c_str(), param.c_str());

  loggers::get_instance().log(">>> SremSsemLayer::SremSsemLayer: %s, %s", to_string().c_str(), param.c_str());

  // Setup parameters

  // Setup parameters

  params::convert(_params, param);

  params::convert(_params, param);

  _params.insert(std::make_pair<std::string, std::string>("its_aid", "140")); // ETSI TS 102 965 V1.2.1 (2015-06)

  _params.insert(std::make_pair<std::string, std::string>("payload_type", "2"));

  _params.insert(std::make_pair<std::string, std::string>("dst_port", "2007"));





  // Register this object for AdapterControlPort

  // Register this object for AdapterControlPort

  loggers::get_instance().log("SremSsemLayer::SremSsemLayer: Register %s/%p", p_type.c_str(), this);

  loggers::get_instance().log("SremSsemLayer::SremSsemLayer: Register %s/%p", p_type.c_str(), this);
@@ -25,6 +28,8 @@ void SremSsemLayer::sendMsg(const LibItsSremSsem__TestSystem::SremReq& p, params 
    loggers::get_instance().warning("SremSsemLayer::sendMsg: Encoding failure");

    loggers::get_instance().warning("SremSsemLayer::sendMsg: Encoding failure");

    return;

    return;

  }

  }



  _params[params::btp_destination_port] = "2007";

  send_data(data, _params);

  send_data(data, _params);

}

}
@@ -37,6 +42,7 @@ void SremSsemLayer::sendMsg(const LibItsSremSsem__TestSystem::SsemReq& p, params 
    loggers::get_instance().warning("SremSsemLayer::sendMsg: Encoding failure");

    loggers::get_instance().warning("SremSsemLayer::sendMsg: Encoding failure");

    return;

    return;

  }

  }

  _params[params::btp_destination_port] = "2008";

  send_data(data, _params);

  send_data(data, _params);

}

}
@@ -143,8 +149,14 @@ void SremSsemLayer::receive_data(OCTETSTRING& data, params& params) 
      return;

      return;

    } // else, continue

    } // else, continue

    // Process lower layer data

    // Process lower layer data

    params::const_iterator it = params.find(params::timestamp);

    if (it != params.cend()) {

      p.recvTime() = std::stoll(it->second);

    } else {

      p.recvTime().set_to_omit();

    }

    // gnNextHeader

    // gnNextHeader

    params::const_iterator it = params.find(params::gn_next_header);

    it = params.find(params::gn_next_header);

    if (it != params.cend()) {

    if (it != params.cend()) {

      p.gnNextHeader() = std::stoi(it->second);

      p.gnNextHeader() = std::stoi(it->second);

    } else {

    } else {