Commit 3d84577a authored by Denis Filatov's avatar Denis Filatov
Browse files

Merge branch 'STF525' of https://forge.etsi.org/gitlab/ITS/ITS into STF525

parents ed5c5b51 7ae9ec6a

STF525.tpd

+1 −1
Original line number Original line Diff line number Diff line
@@ -9,7 +9,7 @@ 
-->

-->

  <ProjectName>STF525</ProjectName>

  <ProjectName>STF525</ProjectName>

  <ReferencedProjects>

  <ReferencedProjects>

    <ReferencedProject name="Abstract_Socket_CNL113384" projectLocationURI="../../../Titan/titan.TestPorts.Common_Components.Abstract_Socket/Abstract_Socket_CNL113384.tpd" tpdName="Abstract_Socket_CNL113384.tpd"/>

    <ReferencedProject name="Abstract_Socket_CNL113384" projectLocationURI="../../frameworks/titan-modules/titan.TestPorts.Common_Components.Abstract_Socket/Abstract_Socket_CNL113384.tpd" tpdName="Abstract_Socket_CNL113384.tpd"/>

  </ReferencedProjects>

  </ReferencedProjects>

  <Folders>

  <Folders>

    <FolderResource projectRelativePath="asn1" relativeURI="asn1"/>

    <FolderResource projectRelativePath="asn1" relativeURI="asn1"/>

ccsrc/Protocols/GeoNetworking/geonetworking_codec.cc

+2 −4
Original line number Original line Diff line number Diff line
@@ -99,11 +99,9 @@ int geonetworking_codec::encode_ (const Base_Type& type, const TTCN_Typedescript 
        return -1;

        return -1;

      }

      }

      // Store playload length and continue encoding

      // Store playload length and continue encoding

      if (p.lengthof() != 0) {

      _ec.set_length(p.lengthof());

      _ec.set_length(p.lengthof());

      loggers::get_instance().log("geonetworking_codec::encode_: Storing payload length %d for %s", _ec.get_length(), p.get_descriptor()->name);

      loggers::get_instance().log("geonetworking_codec::encode_: Storing payload length %d for %s", _ec.get_length(), p.get_descriptor()->name);

    }

    }

    }

  } else if (std::string(field_descriptor.name).compare("@EtsiTs103097Module.EtsiTs103097Data") == 0) {

  } else if (std::string(field_descriptor.name).compare("@EtsiTs103097Module.EtsiTs103097Data") == 0) {

    const EtsiTs103097Module::EtsiTs103097Data& ieee_1609dot2_data = static_cast<const EtsiTs103097Module::EtsiTs103097Data&>(type);

    const EtsiTs103097Module::EtsiTs103097Data& ieee_1609dot2_data = static_cast<const EtsiTs103097Module::EtsiTs103097Data&>(type);

    loggers::get_instance().log_msg("geonetworking_codec::encode_: Encode secured message = ", ieee_1609dot2_data);

    loggers::get_instance().log_msg("geonetworking_codec::encode_: Encode secured message = ", ieee_1609dot2_data);

ccsrc/Protocols/Security/certificates_loader.cc

+2 −2
Original line number Original line Diff line number Diff line
@@ -376,7 +376,7 @@ void certificates_loader::fill_public_key_vectors(const ec_elliptic_curves p_ell 
    p_public_key_y = ecc.public_key_y();

    p_public_key_y = ecc.public_key_y();

  } else if (p_ecc_point.ischosen(IEEE1609dot2BaseTypes::EccP256CurvePoint::ALT_uncompressedP256)) {

  } else if (p_ecc_point.ischosen(IEEE1609dot2BaseTypes::EccP256CurvePoint::ALT_uncompressedP256)) {

    p_public_key_x = p_ecc_point.uncompressedP256().x();

    p_public_key_x = p_ecc_point.uncompressedP256().x();

    p_public_key_x = p_ecc_point.uncompressedP256().y();

    p_public_key_y = p_ecc_point.uncompressedP256().y();

    p_public_comp_key = int2oct(0, 33);

    p_public_comp_key = int2oct(0, 33);

  } else {

  } else {

    p_public_key_x = int2oct(0, 32);

    p_public_key_x = int2oct(0, 32);
@@ -399,7 +399,7 @@ void certificates_loader::fill_public_key_vectors(const ec_elliptic_curves p_ell 
    p_public_key_y = ecc.public_key_y();

    p_public_key_y = ecc.public_key_y();

  } else if (p_ecc_point.ischosen(IEEE1609dot2BaseTypes::EccP384CurvePoint::ALT_uncompressedP384)) {

  } else if (p_ecc_point.ischosen(IEEE1609dot2BaseTypes::EccP384CurvePoint::ALT_uncompressedP384)) {

    p_public_key_x = p_ecc_point.uncompressedP384().x();

    p_public_key_x = p_ecc_point.uncompressedP384().x();

    p_public_key_x = p_ecc_point.uncompressedP384().y();

    p_public_key_y = p_ecc_point.uncompressedP384().y();

    p_public_comp_key = int2oct(0, 49);

    p_public_comp_key = int2oct(0, 49);

  } else {

  } else {

    p_public_key_x = int2oct(0, 48);

    p_public_key_x = int2oct(0, 48);

ccsrc/Protocols/UDP/udp_layer.cc

+1 −1
Original line number Original line Diff line number Diff line
@@ -19,7 +19,7 @@ udp_layer::udp_layer(const std::string & p_type, const std::string & param) : la 
  }

  }

  it = _params.find("src_port");

  it = _params.find("src_port");

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

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

    _params.insert(std::pair<std::string, std::string>(std::string("src_port"), "12345"));

    _params.insert(std::pair<std::string, std::string>(std::string("src_port"), "0")); // Dynamic binding requested

  }

  }

  it = _params.find("dst_ip");

  it = _params.find("dst_ip");

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

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

etc/AtsGeoNetworking/AtsGeoNetworking.cfg

+20 −11
Original line number Original line Diff line number Diff line
@@ -3,14 +3,21 @@ 
# This section shall contain the values of all parameters that are defined in your TTCN-3 modules.

# This section shall contain the values of all parameters that are defined in your TTCN-3 modules.





# The GeoNetworking address of the IUT.

# The GeoNetworking address of the IUT.

LibItsGeoNetworking_Pics.PICS_GN_LOCAL_GN_ADDR := {

LibItsGeoNetworking_Pics.PICS_GN_LOCAL_GN_ADDR := {                                                                                                           typeOfAddress := e_manual,

  typeOfAddress := e_initial,

  stationType := e_passengerCar,

  stationType := e_unknown, #e_roadSideUnit,

  stationCountryCode := 0,

  stationCountryCode := 0, #33,

  mid := '000000000001'O

  mid := '4C5E0C14D2EA'O

#  typeOfAddress := e_initial,

#  stationType := e_unknown, #e_roadSideUnit,

#  stationCountryCode := 0, #33,

#  mid := '4C5E0C14D2EA'O

}

}





LibItsGeoNetworking_Pics.PICS_GN_IS_MOBILE := false

LibItsGeoNetworking_Pics.PICS_GN_DEFAULT_HOP_LIMIT := 1



LibItsGeoNetworking_Pixits.PX_GN_UPPER_LAYER := e_any

LibItsGeoNetworking_Pixits.PX_GN_UPPER_LAYER := e_any

LibItsGeoNetworking_Pixits.PX_NEIGHBOUR_DISCOVERY_DELAY := 3.0





[LOGGING]

[LOGGING]

# In this section you can specify the name of the log file and the classes of events

# In this section you can specify the name of the log file and the classes of events
@@ -93,18 +100,20 @@ LogEventTypes:= Yes 
#     save_mode   : Set to 1 to save sent packet, 0 otherwise

#     save_mode   : Set to 1 to save sent packet, 0 otherwise





# Single GeoNetworking component port

# Single GeoNetworking component port

system.geoNetworkingPort.params := "GN(ll_address=4C5E0C14D2EA,latitude=43551050,longitude=10298730,beaconing=0,expiry=1000)/ETH(mac_src=080027d2b658,mac_bc=FFFFFFFFFFFF,eth_type=8947)/PCAP(mac_src=0800275c4958,nic=eth1,filter=and ether proto 0x8947)"

system.geoNetworkingPort.params := "GN(ll_address=4C5E0C14D2EA,latitude=43551050,longitude=10298730,beaconing=0,expiry=1000)/ETH(mac_src=080027500f9b,mac_bc=FFFFFFFFFFFF,eth_type=8947)/PCAP(mac_src=080027500f9b,nic=tap0,filter=and ether proto 0x8947)"





# Multiple GeoNetworking component port

# Multiple GeoNetworking component port

Comp1.geoNetworkingPort.params := "GN(ll_address=F8CAB8083919,latitude=43551050,longitude=10298730,beaconing=1,expiry=1000,its_aid=38)/ETH(mac_src=F8CAB8083918,mac_bc=FFFFFFFFFFFF,eth_type=8947)/PCAP(mac_src=F8CAB8083919,nic=,file=/home/ubuntu/tmp/test_1_beacon.pcap,filter=ether proto 0x8947,frame_offset=0,save_mode=0)"

NodeB.geoNetworkingPort.params := "GN(ll_address=F8CAB8083919,latitude=43551050,longitude=10298730,beaconing=0,expiry=1000)/ETH(mac_src=080027500f9b,mac_bc=FFFFFFFFFFFF,eth_type=8947)/PCAP(mac_src=080027500f9b,nic=tap0,file=,filter=and ether proto 0x8947)"

Comp2.geoNetworkingPort.params := "GN(ll_address=F8CAB808391A,latitude=43551050,longitude=10298730,beaconing=1,expiry=1000,its_aid=38)/ETH(mac_src=F8CAB8083918,mac_bc=FFFFFFFFFFFF,eth_type=8947)/PCAP(mac_src=F8CAB808391A,nic=,file=/home/ubuntu/tmp/test_1_beacon.pcap,filter=ether proto 0x8947,frame_offset=0,save_mode=0)"

NodeC.geoNetworkingPort.params := "GN(ll_address=F8CAB808391A,latitude=43551050,longitude=10298730,beaconing=0,expiry=1000)/ETH(mac_src=080027500f9c,mac_bc=FFFFFFFFFFFF,eth_type=8947)/PCAP(mac_src=080027500f9b,nic=tap0,file=,filter=and ether proto 0x8947)"





# UpperTester port based on UDP

# UpperTester port based on UDP

system.utPort.params := "UT_GN(loopback=0)/UDP(dst_ip=192.168.1.250,dst_port=12345,src_ip=192.168.1.253,src_port=12345)/ETH(mac_src=080027d2b658,mac_dst=90fd61e61902,eth_type=0800)/PCAP(mac_src=080027d2b658,nic=eth1,filter=and udp port 12345)"

#system.utPort.params := "UT_GN/UDP(dst_ip=192.168.2.2)"

system.utPort.params := "UT_GN/UDP(dst_ip=172.23.0.1,dst_port=8000)"





[EXECUTE]

[EXECUTE]

#ItsGeoNetworking_TestCases.TC_GEONW_FDV_BAH_BV_01

ItsGeoNetworking_TestCases.TC_GEONW_FDV_BAH_BV_01

ItsGeoNetworking_TestCases.TC_GEONW_FDV_GUC_BV_01

#ItsGeoNetworking_TestCases.TC_GEONW_FDV_COH_BO_04

#ItsGeoNetworking_TestCases.TC_GEONW_FDV_GUC_BV_01





[MAIN_CONTROLLER]

[MAIN_CONTROLLER]

# The options herein control the behavior of MC.

# The options herein control the behavior of MC.