V2.1.1 dev

Yann Garciarequested to merge
v2.1.1-dev into master

Closing TTF T012

Merge request reports

ccsrc/EncDec/LibHttp/module.mk

0 → 100644
+1 −0
Changes for ccsrc/EncDec/LibHttp/module.mk: 1 added line, 0 removed lines.
Original line number Diff line number Diff line 
sources := LibItsHttp_Encdec.cc

ccsrc/EncDec/LibMec/LocationAPI/module.mk

0 → 100644
+1 −0
Changes for ccsrc/EncDec/LibMec/LocationAPI/module.mk: 1 added line, 0 removed lines.
Original line number Diff line number Diff line 
sources := LibMec_EncDec.cc

ccsrc/EncDec/LibMec/module.mk

0 → 100644
+1 −0
Changes for ccsrc/EncDec/LibMec/module.mk: 1 added line, 0 removed lines.
Original line number Diff line number Diff line 
sources := LocationAPI

ccsrc/Framework/include/params.hh

+44 −4
Changes for ccsrc/Framework/include/params.hh: 44 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#pragma once



#include <vector>

#include <string>

#include <map>



  /*!
@@ -29,10 +30,53 @@ public: //! \publicsection 
  static const std::string& mac_dst;               //! Destination MAC address parameter name

  static const std::string& mac_bc;                //! Broadcast MAC address parameter name

  static const std::string& eth_type;              //! Ethernet type parameter name

  static const std::string& beaconing;             //! Beaconing mode parameter name

  static const std::string& timestamp;             //! Packet reception timestamp

  static const std::string& station_type;

  static const std::string& country;

  static const std::string& type_of_address;

  static const std::string& ssp;                   //! SSP parameter name

  static const std::string& its_aid;               //! ITS-AID parameter name

  static const std::string& gn_payload;            //! GeoNetworking Payload parameter name

  static const std::string& gn_next_header;        //! GeoNetworking NextHeader parameter name

  static const std::string& gn_header_type;        //! GeoNetworking HeaderType parameter name

  static const std::string& gn_header_sub_type;    //! GeoNetworking HeaderSubType parameter name

  static const std::string& gn_lifetime;           //! GeoNetworking Lifetime parameter name

  static const std::string& gn_traffic_class;      //! GeoNetworking Traffic class parameter name

  static const std::string& btp_type;              //! BTP Type 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_info;              //! BTP Info 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& latitude;              //! Test system Latitude parameter name

  static const std::string& longitude;             //! Test system Longitude parameter name

  static const std::string& expiry;                //! Test system GeoNetworking Lifetime parameter name (in ms)



  static const std::string& station_id;            //! To indicate to the peer ITS_Container::stationID



  static const std::string& device_mode;           //! To indicate to the lower layer to act as a standalone device

  static const std::string& secured_mode;          //! To indicate to the lower layer to apply signature on message exchanges as defined in IEEE 1609.2 & ETSI TS 102 965

  static const std::string& encrypted_mode;        //! To indicate to the lower layer to apply encryption on message exchanges as defined in IEEE 1609.2 & ETSI TS 102 965

  static const std::string& enable_security_checks;//! To indicates if security check failures shall be treated as error or warning

  static const std::string& sec_db_path;           //! Path to the folder containing certificates

  static const std::string& certificate;           //! The certificate identifier the Test System shall use. E.g. CERT_TS_A

  static const std::string& peer_certificate;      //! The peer certificate identifier the Test System shall use for encryption. E.g. CERT_TS_A

  static const std::string& hash;                  //! The digest algorithm the Test System shall use, authorised values are SHA-256 or SHA-384. Default: SHA-256

  static const std::string& signature;             //! The signature algorithm the Test System shall use, authorised values are NISTP-256, BP-256 and BP-384. Default: NISTP-256

  static const std::string& cypher;                //! The encryption algorithm the Test System shall use, authorised values are NISTP-256 and BP-256. Default: NISTP-256

  static const std::string& distanceA;             //! Test system GeoNetworking DistanceA parameter name

  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

  

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



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

  static const std::string& port;                  //! HTTP server port. Default: 80
@@ -45,10 +89,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& sip_url;

  static const std::string& sip_version;

  static const std::string& payload;               //! UpperLayer Payload parameter name



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



  /*!

ccsrc/Framework/src/params.cc

+45 −4
Changes for ccsrc/Framework/src/params.cc: 45 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -22,12 +22,53 @@ const std::string& params::mac_src = std::string("mac_src"); 
const std::string& params::mac_dst = std::string("mac_dst");

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

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



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

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

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

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

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

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

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

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

const std::string& params::gn_next_header = std::string("gnNextHeader");

const std::string& params::gn_header_type = std::string("gnHeaderType");

const std::string& params::gn_header_sub_type = std::string("gnHeaderSubtype");

const std::string& params::gn_lifetime = std::string("gnLifetime");

const std::string& params::gn_traffic_class = std::string("gnTrafficClass");

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

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



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

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

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

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

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



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



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

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

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

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

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

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

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

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

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

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

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



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



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

const std::string& params::port = std::string("port");
@@ -40,9 +81,9 @@ 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::sip_url = std::string("sip_url");

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

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

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



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