Commit 29ebfc28 authored by Yann Garcia's avatar Yann Garcia
Browse files

Add its-ais in cfg file; Validate PC#5/Uu/MQTT interfaces; Bug fixed in AtIS layers

parent 8c781192

ccsrc/Protocols/Commsignia/commsignia_layer.cc

+2 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ commsignia_layer::commsignia_layer(const std::string &p_type, const std::string 
  //_params.log();

}



void commsignia_layer::send_data(OCTETSTRING &data, params_its &params) {

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

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



  OCTETSTRING buffer = OCTETSTRING(0, nullptr);
@@ -109,7 +109,7 @@ void commsignia_layer::send_data(OCTETSTRING &data, params_its &params) { 
  send_to_all_layers(buffer, params);

}



void commsignia_layer::receive_data(OCTETSTRING &data, params_its &params) {

void commsignia_layer::receive_data(OCTETSTRING &data, params &params) {

  loggers::get_instance().log_msg(">>> commsignia_layer::receive_data: ", data);



  const unsigned char *p       = static_cast<const unsigned char *>(data);

ccsrc/Protocols/Commsignia/commsignia_layer.hh

+2 −2
Original line number Diff line number Diff line
@@ -131,6 +131,6 @@ public: 
   */

  virtual ~commsignia_layer(){};



  virtual void send_data(OCTETSTRING &data, params_its &params);

  virtual void receive_data(OCTETSTRING &data, params_its &info);

  virtual void send_data(OCTETSTRING &data, params &params);

  virtual void receive_data(OCTETSTRING &data, params &info);

}; // End of class commsignia_layer

ccsrc/Protocols/IVIM_layers/ivim_layer.cc

+2 −2
Original line number Diff line number Diff line
@@ -45,13 +45,13 @@ void ivim_layer::sendMsg(const LibItsIvim__TypesAndValues::IvimInd &p, params_it 
  send_data(data, _params);

}



void ivim_layer::send_data(OCTETSTRING &data, params_its &params) {

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

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

  // params.log();

  send_to_all_layers(data, params);

}



void ivim_layer::receive_data(OCTETSTRING &data, params_its &params) {

void ivim_layer::receive_data(OCTETSTRING &data, params &params) {

  loggers::get_instance().log_msg(">>> ivim_layer::receive_data: ", data);

  params.log();

ccsrc/Protocols/IVIM_layers/ivim_layer.hh

+2 −2
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ public: 
  void sendMsg(const LibItsIvim__TypesAndValues::IvimReq &, params_its &params);

  void sendMsg(const LibItsIvim__TypesAndValues::IvimInd &, params_its &params);



  virtual void send_data(OCTETSTRING &data, params_its &params);

  virtual void receive_data(OCTETSTRING &data, params_its &info);

  virtual void send_data(OCTETSTRING &data, params &params);

  virtual void receive_data(OCTETSTRING &data, params &info);



  int enable_secured_mode(const std::string &p_certificate_id, const boolean p_enforce_security);

ccsrc/Protocols/LTE/lte_layer.cc

+9 −3
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 


lte_layer::lte_layer(const std::string &p_type, const std::string &params)

  : _uu_transport("udp"), _uu_protocol(""), _pc5_layer_id(""), _uu_layer{0}, _pc5_layer{0}, _pc5{0}, _time_key("lte_layer::Handle_Fd_Event_Readable") {

  loggers::get_instance().log(">>> lte_layer::lte_layer: %s, %s", to_string().c_str(), params.c_str());

  loggers::get_instance().log(">>> lte_layer::lte_layer: %s, %s, %p", to_string().c_str(), params.c_str(), this);



  params::convert(_params, params);
@@ -49,6 +49,9 @@ lte_layer::lte_layer(const std::string &p_type, const std::string &params) 
  loggers::get_instance().log("lte_layer::lte_layer: PC5 layers string: '%s'", s.c_str());

  _pc5_layer = layer_stack_builder::get_instance()->create_layer_stack(s.c_str());

  loggers::get_instance().log("lte_layer::lte_layer: _pc5_layer= %p", _pc5_layer);

  if (static_cast<qualcomm_layer *>(_pc5_layer) == NULL) {

    loggers::get_instance().error("lte_layer::lte_layer: Invalid stack configuration: %s", s.c_str());

  }

  _pc5 = registration<qualcomm_layer>::get_instance().get_item(_pc5_layer_id);

  if (_pc5 == NULL) {

    loggers::get_instance().error("lte_layer::lte_layer: Failed to get %s layer", _pc5_layer_id.c_str());
@@ -80,7 +83,7 @@ void lte_layer::close() { 
  }

}



void lte_layer::send_data(OCTETSTRING &data, params_its &params) {

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

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



  params::const_iterator it = params.find(std::string("its_aid"));
@@ -93,15 +96,18 @@ void lte_layer::send_data(OCTETSTRING &data, params_its &params) { 
  */

  loggers::get_instance().log("lte_layer::send_data: %s", it->second.c_str());

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

    loggers::get_instance().log("lte_layer::send_data: 1111111111111111111111111111111");

    _uu_layer->send_data(data, params);

  } else if ((it->second.compare("36") == 0) || (it->second.compare("141") == 0)) { // CAM and Beacons over PC#5

    loggers::get_instance().log("lte_layer::send_data: 2222222222222222222222222222222");

     _pc5_layer->send_data(data, params);

  } else {

    loggers::get_instance().log("lte_layer::send_data: 3333333333333333333333333333333");

    _uu_layer->send_data(data, params);

  }

}



void lte_layer::receive_data(OCTETSTRING &data, params_its &params) {

void lte_layer::receive_data(OCTETSTRING &data, params &params) {

  loggers::get_instance().log_msg(">>> lte_layer::receive_data: ", data);



  receive_to_all_layers(data, params);