Commit 248c383e authored by Yann Garcia's avatar Yann Garcia
Browse files

Bug fixed in all Layers for ssp & ait_aid

parent 87e4a180

ccsrc/Protocols/CAM/cam_layer.cc

+2 −2
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ void cam_layer::receive_data(OCTETSTRING& data, params& params) 
    p.btpInfo().set_to_omit();

  }

  // ssp

  it = params.find(params[params::ssp]);

  it = params.find(params::ssp);

  if (it != params.cend()) {

    loggers::get_instance().log("cam_layer::receive_data: ssp=%s", it->second.c_str());

    p.ssp() = oct2bit(str2oct(CHARSTRING(it->second.c_str())));
@@ -115,7 +115,7 @@ void cam_layer::receive_data(OCTETSTRING& data, params& params) 
    p.ssp().set_to_omit();

  }

  // its_aid

  it = params.find(params[params::its_aid]);

  it = params.find(params::its_aid);

  if (it != params.cend()) {

    p.its__aid() = std::stoi(it->second);

  } else {

ccsrc/Protocols/DENM/denm_layer.cc

+2 −2
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ void denm_layer::receive_data(OCTETSTRING& data, params& params) 
    p.btpInfo().set_to_omit();

  }

  // ssp

  it = params.find(params[params::ssp]);

  it = params.find(params::ssp);

  if (it != params.cend()) {

    loggers::get_instance().log("denm_layer::receive_data: ssp=%s", it->second.c_str());

    p.ssp() = oct2bit(str2oct(CHARSTRING(it->second.c_str())));
@@ -115,7 +115,7 @@ void denm_layer::receive_data(OCTETSTRING& data, params& params) 
    p.ssp().set_to_omit();

  }

  // its_aid

  it = params.find(params[params::its_aid]);

  it = params.find(params::its_aid);

  if (it != params.cend()) {

    p.its__aid() = std::stoi(it->second);

  } else {

ccsrc/Protocols/GeoNetworking/geonetworking_layer.cc

+1 −1
Original line number Diff line number Diff line
@@ -371,7 +371,7 @@ void geonetworking_layer::receive_data(OCTETSTRING& data, params& params) { 
    ind.macDestinationAddress() = str2oct(CHARSTRING(_params["mac_bc"].c_str()));

  }

  // 2. ssp

  it = params.find(_params[params::ssp]);

  it = params.find(params::ssp);

  if (it != params.cend()) {

    loggers::get_instance().log("geonetworking_layer::receive_data: ssp=%s", it->second.c_str());

    ind.ssp() = oct2bit(str2oct(CHARSTRING(it->second.c_str())));

ccsrc/Protocols/IVIM/ivim_layer.cc

+3 −3
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ void ivim_layer::receive_data(OCTETSTRING& data, params& params) 
    p.btpInfo().set_to_omit();

  }

  // ssp

  it = params.find(params[params::ssp]);

  it = params.find(params::ssp);

  if (it != params.cend()) {

    loggers::get_instance().log("ivim_layer::receive_data: ssp=%s", it->second.c_str());

    p.ssp() = oct2bit(str2oct(CHARSTRING(it->second.c_str())));
@@ -115,7 +115,7 @@ void ivim_layer::receive_data(OCTETSTRING& data, params& params) 
    p.ssp().set_to_omit();

  }

  // its_aid

  it = params.find(params[params::its_aid]);

  it = params.find(params::its_aid);

  if (it != params.cend()) {

    p.its__aid() = std::stoi(it->second);

  } else {

ccsrc/Protocols/MapemSpatem/mapem_spatem_layer.cc

+4 −4
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ void mapem_spatem_layer::receive_data(OCTETSTRING& data, params& params) 
      p.btpInfo().set_to_omit();

    }

    // ssp

    it = params.find(params[params::ssp]);

    it = params.find(params::ssp);

    if (it != params.cend()) {

      loggers::get_instance().log("mapem_spatem_layer::receive_data: ssp=%s", it->second.c_str());

      p.ssp() = oct2bit(str2oct(CHARSTRING(it->second.c_str())));
@@ -119,7 +119,7 @@ void mapem_spatem_layer::receive_data(OCTETSTRING& data, params& params) 
      p.ssp().set_to_omit();

    }

    // its_aid

    it = params.find(params[params::its_aid]);

    it = params.find(params::its_aid);

    if (it != params.cend()) {

      p.its__aid() = std::stoi(it->second);

    } else {
@@ -187,7 +187,7 @@ void mapem_spatem_layer::receive_data(OCTETSTRING& data, params& params) 
      p.btpInfo().set_to_omit();

    }

    // ssp

    it = params.find(params[params::ssp]);

    it = params.find(params::ssp);

    if (it != params.cend()) {

      loggers::get_instance().log("mapem_spatem_layer::receive_data: ssp=%s", it->second.c_str());

      p.ssp() = oct2bit(str2oct(CHARSTRING(it->second.c_str())));
@@ -195,7 +195,7 @@ void mapem_spatem_layer::receive_data(OCTETSTRING& data, params& params) 
      p.ssp().set_to_omit();

    }

    // its_aid

    it = params.find(params[params::its_aid]);

    it = params.find(params::its_aid);

    if (it != params.cend()) {

      p.its__aid() = std::stoi(it->second);

    } else {