Commit 7c30021f authored by YannGarcia's avatar YannGarcia
Browse files

Start validation of AtsPki; Add missing AcSecurity primitive implementation in Facilities

parent f2e46419

ccsrc/Framework/include/layer.hh

+0 −19
Original line number Diff line number Diff line
@@ -81,25 +81,6 @@ public: //! \publicsection 
    };

  };



  /*!

   * \inline

   * \fn void get_lower_layer(const std::string& p_type);

   * \brief Retrieve a pointer to the lower layer identified by its type

   * \param[in] p_type The typeof the lower layer to retrieve

   * \return The pointer to the lower layer on success, nullptr otherwise

   */

  inline layer* get_lower_layer(const std::string& p_type) {

    if (!p_type.empty()) {

      for(auto it = lowerLayers.rbegin(); it != lowerLayers.rend(); ++it) {

        if ((*it)->type.compare(p_type) == 0) {

          return *it;

        }

      }

    }



    return nullptr;

  }



  /*!

   * \fn void remove_upper_layer(layer* p_layer);

   * \brief Remove the specified upper layer protocol from the list of the upper layer

ccsrc/Framework/include/params.hh

+5 −4
Original line number Diff line number Diff line
@@ -81,6 +81,11 @@ public: //! \publicsection 


  static const std::string& interface_id; //! Commsignia antenna selector



  static const std::string& uu_protocol; //! Uu interafce protocol (raw, MQTT, AMQP). Default: raw

  static const std::string& uu_transport;//! Uu interafce transport (TCP, UDP)

  static const std::string& pc5_layer;   //! Radio specific layer for PC5 (e.g. Qualcomm, Commsignia)

  static const std::string& mqtt_topics; //! Uu interafce MQTT topics



  static const std::string& server;      //! HTTP server address (e.g. www.etsi.org)

  static const std::string& port;        //! HTTP server port. Default: 80

  static const std::string& use_ssl;     //! Set to 1 to use SSL to communicate with the HTTP server. Default: false
@@ -94,10 +99,6 @@ public: //! \publicsection 
  static const std::string& host;         //! HTTP Host value. Default: 127.0.0.1

  static const std::string& content_type; //! HTTP Content-type value. Default: application/text



  static const std::string& uu_protocol; //! Uu interafce protocol (raw, MQTT, AMQP). Default: raw

  static const std::string& uu_transport;//! Uu interafce transport (TCP, UDP)

  static const std::string& mqtt_topics; //! Uu interafce MQTT topics



  static const std::string& codecs; //! List of codecs to use for HTTP application layers



  /*!

ccsrc/Framework/src/params.cc

+5 −5
Original line number Diff line number Diff line
@@ -72,6 +72,11 @@ 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::uu_protocol  = std::string("uu_protocol");

const std::string& params::uu_transport = std::string("uu_transport");

const std::string& params::pc5_layer = std::string("pc5_layer");

const std::string& params::mqtt_topics  = std::string("mqtt_topics");



const std::string& params::server      = std::string("server");

const std::string& params::port        = std::string("port");

const std::string& params::use_ssl     = std::string("use_ssl");
@@ -86,11 +91,6 @@ const std::string& params::uri = std::string("uri"); 
const std::string& params::host         = std::string("host");

const std::string& params::content_type = std::string("content_type");



const std::string& params::uu_protocol  = std::string("uu_protocol");

const std::string& params::uu_transport = std::string("uu_transport");



const std::string& params::mqtt_topics  = std::string("mqtt_topics");



// const std::string& params::sip_url = std::string("sip_url");

// const std::string& params::sip_version = std::string("sip_version");

// const std::string& params::payload = std::string("payload");

ccsrc/Protocols/GeoNetworking/geonetworking_layer.cc

+1 −1
Original line number Diff line number Diff line
@@ -551,7 +551,7 @@ int geonetworking_layer::enable_secured_mode(const std::string &p_certificate_id 
    _params[params::certificate] = p_certificate_id;

  }



  loggers::get_instance().log("geonetworking_layer::enable_secured_mode: Certificate to be used: '%s' - Signature: %s", _params[params::certificate].c_str());

  loggers::get_instance().log("geonetworking_layer::enable_secured_mode: Certificate to be used: '%s'", _params[params::certificate].c_str());



  return 0;

}

ccsrc/Protocols/Tcp/tcp_layer.cc

+17 −4
Original line number Diff line number Diff line
@@ -9,11 +9,24 @@ 
#include "loggers.hh"



tcp_layer::tcp_layer(const std::string & p_type, const std::string & param) : layer(p_type), SSL_Socket(), PORT(p_type.c_str()), _params(), _client_id{-1}, _time_key("tcp_layer::Handle_Fd_Event_Readable"), _reconnect_on_send{false} {

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

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

  // Setup parameters

  params::convert(_params, param);

  _params.log();



  init();                                                                                                                                                   }



tcp_layer::tcp_layer(const std::string & p_type, const params & param) : layer(p_type), SSL_Socket(), PORT(p_type.c_str()), _params(), _client_id{-1}, _time_key("tcp_layer::Handle_Fd_Event_Readable"), _reconnect_on_send{false} {

  loggers::get_instance().log(">>> tcp_layer::tcp_layer (2): %s", to_string().c_str());

  // Setup parameters

  _params = param;



  init();

}



void tcp_layer::init() {

  loggers::get_instance().log(">>> tcp_layer::init");



  set_socket_debugging(false);

  params::const_iterator it = _params.find(params::debug);

  if (it == _params.cend()) {
@@ -73,7 +86,7 @@ tcp_layer::tcp_layer(const std::string & p_type, const std::string & param) : la 


  parameter_set(use_connection_ASPs_name(), (!server_mode) ? "yes" : "no");

  parameter_set(server_backlog_name(), "1024");

  loggers::get_instance().log("tcp_layer::tcp_layer: server_mode=%x", server_mode);

  loggers::get_instance().log("tcp_layer::init: server_mode=%x", server_mode);

  set_server_mode(server_mode);

  if (server_mode) {

    parameter_set("serverPort", _params[params::local_port].c_str());
@@ -109,7 +122,7 @@ tcp_layer::tcp_layer(const std::string & p_type, const std::string & param) : la 
  parameter_set(client_TCP_reconnect_name(), "yes");



  if (server_mode == 0) {

    loggers::get_instance().log("tcp_layer::tcp_layer: Establish connection: %s/%s", _params[params::server].c_str(), _params[params::port].c_str());

    loggers::get_instance().log("tcp_layer::init: Establish connection: %s/%s", _params[params::server].c_str(), _params[params::port].c_str());

	  open_client_connection(_params[params::server].c_str(), _params[params::port].c_str(), NULL, NULL);

  }

}