Commit 67983cb8 authored by Yann Garcia's avatar Yann Garcia
Browse files

Bug fixed in security_services_its::retrieve_ssps

parent 02fa652d

ccsrc/Protocols/Security/security_services_its.cc

+3 −1
Original line number Diff line number Diff line
@@ -368,11 +368,12 @@ int security_services_its::process_ieee_1609_dot2_signed_data(const Ieee1609Dot2 
int security_services_its::retrieve_ssps(const Ieee1609Dot2BaseTypes::SequenceOfPsidSsp& p_psid_ssps, params_its &p_params) {

  loggers::get_instance().log_msg(">>> security_services_its::retrieve_ssps: ", p_psid_ssps);

  loggers::get_instance().log(">>> security_services_its::retrieve_ssps: psid_ssps size: %d", p_psid_ssps.lengthof());

  loggers::get_instance().log(">>> security_services_its::retrieve_ssps: its_aid: %s", p_params[params_its::its_aid].c_str());

  for (int i = 0; i < p_psid_ssps.lengthof(); i++) {

    const Ieee1609Dot2BaseTypes::PsidSsp &psid_ssp = p_psid_ssps[i];

    loggers::get_instance().log_msg("security_services_its::retrieve_ssps: Processing psid_ssp ", psid_ssp);

    const OPTIONAL<Ieee1609Dot2BaseTypes::ServiceSpecificPermissions> &s = psid_ssp.ssp();

    if (s.is_present()) {

    if ((p_params[params_its::its_aid].compare(std::to_string(static_cast<int>(psid_ssp.psid()))) == 0) && (s.is_present())) {

      const Ieee1609Dot2BaseTypes::ServiceSpecificPermissions &ssp = static_cast<const Ieee1609Dot2BaseTypes::ServiceSpecificPermissions>(s);

      loggers::get_instance().log_msg("security_services_its::retrieve_ssps: Processing ssp ", ssp);

      params_its::const_iterator it = p_params.find(std::to_string(psid_ssp.psid()));
@@ -384,6 +385,7 @@ int security_services_its::retrieve_ssps(const Ieee1609Dot2BaseTypes::SequenceOf 
          os = ssp.bitmapSsp();

        }

        p_params[params_its::ssp] = std::string(static_cast<const char *>(oct2str(os)));

        break; // End of 'for' statement

      }

    }

  } // End of 'for' statement

etc/AtsCAM/AtsCAM.cfg

+5 −2
Original line number Diff line number Diff line
@@ -10,6 +10,9 @@ LibItsGeoNetworking_Pixits.PX_GN_UPPER_LAYER := e_btpB 
LibItsCam_Pics.PICS_DANGEROUSGOODS := true

LibItsCam_Pics.PICS_IS_IUT_SECURED := true



# Instruct the Test System to use this certificate. Comment to use the default one (CERT_IUT_A_AT)

LibItsCommon_Pixits.PX_CERT_FOR_TS := "CERT_TS_A_ATv2"



[LOGGING]

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

# you want to log into the file or display on console (standard error).
@@ -109,7 +112,7 @@ system.utPort.params := "UT_CAM/UDP(dst_ip=192.168.1.21,dst_port=12345,src_port= 
[EXECUTE]



# Check that protocolVersion is set to 2 and messageID is set to 2

#ItsCam_TestCases.TC_CAM_MSD_FMT_BV_01

ItsCam_TestCases.TC_CAM_MSD_FMT_BV_01

# Check that LF container is included in 1st CAM since CA basic service activation

#ItsCam_TestCases.TC_CAM_MSD_FMT_BV_02

# Check that LF container is included if time elapsed since the generation of the last CAM with the low frequency container generation is equal or larger than 500 ms
@@ -243,7 +246,7 @@ system.utPort.params := "UT_CAM/UDP(dst_ip=192.168.1.21,dst_port=12345,src_port= 
#ItsCam_TestCases.TC_CAM_MSP_SSP_BV_03



# Check that content of received CAM is transmitted to applications and other facilities

ItsCam_TestCases.TC_CAM_MSP_BV_01

#ItsCam_TestCases.TC_CAM_MSP_BV_01



[MAIN_CONTROLLER]

# The options herein control the behavior of MC.

AtsAVM @ bf4481fe

Compare be2bda49 to bf4481fe
Original line number Diff line number Diff line 
Subproject commit be2bda49ffda160a0258185d752dd989ebd51193
 
Subproject commit bf4481fe103e935e6b5c7260cc456cc1dbf85f39

AtsBTP @ fd2b43d3

Compare 35763863 to fd2b43d3
Original line number Diff line number Diff line 
Subproject commit 3576386312f9dff1afcccc8f96247876ab9a0865
 
Subproject commit fd2b43d30a404240b722c568a9249c1c9590fcea

AtsDENM @ 93717b76

Compare bb8dbabf to 93717b76
Original line number Diff line number Diff line 
Subproject commit bb8dbabf7eb22813383aaaa92292b736bf767510
 
Subproject commit 93717b763d11bc05b1840e13955f2003602c8a7f