Commit 64be0b12 authored by garciay's avatar garciay
Browse files

Security support in the TA

parent 8d8548fa

ccsrc/Externals/LibItsSecurity_externals.cc

+1 −1
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ namespace LibItsSecurity__Functions 
                               const CHARSTRING& p__rootDirectory,

                               const CHARSTRING& p__configId

                               ) {

    loggers::get_instance().log("GeoNetworkingLayer::GeoNetworkingLayer: ###################");

    loggers::get_instance().log("fx__loadCertificates: '%s', '%s'", p__rootDirectory, p__configId);

    Params params;

    params.insert(std::pair<std::string, std::string>(std::string("sec_db_path"), std::string(static_cast<const char*>(p__rootDirectory))));

    if (security_services::get_instance().setup(params) == -1) {

ccsrc/Framework/Params.hh

+3 −1
Original line number Diff line number Diff line
@@ -57,6 +57,8 @@ public: 
  static const std::string& distanceB;             //! Test system GeoNetworking DistanceB parameter name

  static const std::string& angle;                 //! Test system GeoNetworking Angle parameter name



  static const std::string& payload_type;          //! Tyoe of payload, value is the ITS Conatainer message identifier or omitted in case of unknown payload



  static const std::string& next_header;           //! Upper layer settings

  static const std::string& header_type;           //! Upper layer settings

  static const std::string& header_sub_type;       //! Upper layer settings

ccsrc/Framework/src/Params.cc

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ const std::string& Params::distanceA = std::string("distanceA"); 
const std::string& Params::distanceB = std::string("distanceB");

const std::string& Params::angle = std::string("angle");



const std::string& Params::payload_type = std::string("payload_type");



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_sub_type = std::string("header_sub_type");

ccsrc/Protocols/CAM/CAMLayer.cc

+5 −3
Original line number Diff line number Diff line
@@ -8,16 +8,18 @@ CAMLayer::CAMLayer(const std::string & p_type, const std::string & param) : TLay 
  loggers::get_instance().log(">>> CAMLayer::CAMLayer: %s, %s", to_string().c_str(), param.c_str());

  // Setup parameters

  Params::convert(_params, param);

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

  _params.insert(std::make_pair<std::string, std::string>("payload_type", "2")); // CA message id - See ETSI TS 102 894

  //params.log();

}



void CAMLayer::sendMsg(const LibItsCam__TestSystem::CamReq& p, Params& params){

  loggers::get_instance().log_msg(">>> CAMLayer::sendMsg: ", p);

  params.log();

  

  // Encode CAM PDU

  OCTETSTRING data;

  if (_codec.encode(p.msgOut(), data) == -1) {

    loggers::get_instance().warning("CAMLayer::sendMsg: Encodeing failure");

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

    return;

  }
@@ -26,7 +28,7 @@ void CAMLayer::sendMsg(const LibItsCam__TestSystem::CamReq& p, Params& params){ 


void CAMLayer::sendData(OCTETSTRING& data, Params& params) {

  loggers::get_instance().log_msg(">>> CAMLayer::sendData: ", data);

  //params.log();

  

  sendToAllLayers(data, params);

}

ccsrc/Protocols/DENM/DENMLayer.cc

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ DENMLayer::DENMLayer(const std::string & p_type, const std::string & param) : TL 
  loggers::get_instance().log(">>> DENMLayer::DENMLayer: %s, %s", to_string().c_str(), param.c_str());

  // Setup parameters

  Params::convert(_params, param);

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

  _params.insert(std::make_pair<std::string, std::string>("payload_type", "1")); // DE message id - See ETSI TS 102 894

}



void DENMLayer::sendMsg(const LibItsDenm__TestSystem::DenmReq& p, Params& params){