Commit 5e429bf2 authored by ASN.1 Documenter's avatar ASN.1 Documenter
Browse files

Merge branch 'TTF0002' into cygwin

parents 4830388e 3c77bdb5

ccsrc/Protocols/BTP/btp_codec.cc

+26 −26
Original line number Diff line number Diff line
@@ -11,49 +11,49 @@ class TTCN_EncDec; 


int btp_codec::encode (const LibItsBtp__TypesAndValues::BtpPacket& msg, OCTETSTRING& data)

{

  loggers::get_instance().log_msg(">>> btp_codec::encode: ", (const Base_Type&)msg);

  //loggers::get_instance().log_msg(">>> btp_codec::encode: ", (const Base_Type&)msg);

  

  TTCN_EncDec::clear_error();

  TTCN_Buffer encoding_buffer;

  encode_(msg, *msg.get_descriptor(), encoding_buffer);

  data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data());



  loggers::get_instance().log_msg("<<< btp_codec::encode: data=", data);

  //loggers::get_instance().log_msg("<<< btp_codec::encode: data=", data);

  return 0;

}



int btp_codec::encode_ (const Base_Type& type, const TTCN_Typedescriptor_t& field_descriptor, TTCN_Buffer& encoding_buffer)

{

  loggers::get_instance().log(">>> btp_codec::encode_: processing %s/%s", type.get_descriptor()->name, field_descriptor.name);

  loggers::get_instance().log_msg(">>> btp_codec::encode_: ", type);

  //loggers::get_instance().log(">>> btp_codec::encode_: processing %s/%s", type.get_descriptor()->name, field_descriptor.name);

  //loggers::get_instance().log_msg(">>> btp_codec::encode_: ", type);



  if (dynamic_cast<const Record_Type *>(&type) != NULL) {

    const Record_Type& r = (const Record_Type &)type;

    loggers::get_instance().log("btp_codec::encode_: processing Record_Type %s", r.get_descriptor()->name);

    //loggers::get_instance().log("btp_codec::encode_: processing Record_Type %s", r.get_descriptor()->name);

    for(int i = 0; i < r.get_count(); i++) {

      loggers::get_instance().log("btp_codec::encode_: processing %s/%s/%s - %d (1 ==> use dynamic_cast<const OPTIONAL<...>) - %d", r.fld_name(i), r.fld_descr(i)->name, r.get_at(i)->get_descriptor()->name, r.get_at(i)->is_optional(), r.get_at(i)->is_present());

      //loggers::get_instance().log("btp_codec::encode_: processing %s/%s/%s - %d (1 ==> use dynamic_cast<const OPTIONAL<...>) - %d", r.fld_name(i), r.fld_descr(i)->name, r.get_at(i)->get_descriptor()->name, r.get_at(i)->is_optional(), r.get_at(i)->is_present());

      if (r.get_at(i)->is_present()) {

        if (encode_(*r.get_at(i), *r.fld_descr(i), encoding_buffer) == -1) {

          loggers::get_instance().warning("btp_codec::encode_: -1 result code returned");

          //loggers::get_instance().warning("btp_codec::encode_: -1 result code returned");

          return -1;

        }

      }

    } // End of 'for' statement

  } else if (std::string(field_descriptor.name).compare("@LibItsBtp_TypesAndValues.BtpPacket.payload") == 0) {

    const OPTIONAL<LibItsBtp__TypesAndValues::BtpRawPayload> &v = dynamic_cast<const OPTIONAL<LibItsBtp__TypesAndValues::BtpRawPayload> &>(type);

    loggers::get_instance().log("btp_codec::encode_: BtpRawPayload present: %d", v.is_present());

    //loggers::get_instance().log("btp_codec::encode_: BtpRawPayload present: %d", v.is_present());

    if (v.is_present()) {

      if (encode_(static_cast<const LibItsBtp__TypesAndValues::BtpRawPayload &>(*v.get_opt_value()), LibItsBtp__TypesAndValues::BtpRawPayload_descr_, encoding_buffer) == -1) {

        loggers::get_instance().warning("btp_codec::encode_: -1 result code returned");

        //loggers::get_instance().warning("btp_codec::encode_: -1 result code returned");

        return -1;

      }

    }

  } else {

    loggers::get_instance().log("btp_codec::encode_ (else): processing type %s/%s", type.get_descriptor()->name, field_descriptor.name);

    //loggers::get_instance().log("btp_codec::encode_ (else): processing type %s/%s", type.get_descriptor()->name, field_descriptor.name);

    type.encode(field_descriptor, encoding_buffer, TTCN_EncDec::CT_RAW);

  }



  loggers::get_instance().log_to_hexa("<<<btp_codec::encode_: encoding_buffer=", encoding_buffer);

  //loggers::get_instance().log_to_hexa("<<<btp_codec::encode_: encoding_buffer=", encoding_buffer);

  return 0;

}
@@ -63,30 +63,30 @@ int btp_codec::decode (const OCTETSTRING& data, LibItsBtp__TypesAndValues::BtpPa 
  TTCN_Buffer decoding_buffer(data);

  _params = params;

  

  loggers::get_instance().log_to_hexa(">>> btp_codec::decode: decoding_buffer=", decoding_buffer);

  //loggers::get_instance().log_to_hexa(">>> btp_codec::decode: decoding_buffer=", decoding_buffer);

  decode_(msg, *msg.get_descriptor(), decoding_buffer);

  

  loggers::get_instance().log_msg("<<< btp_codec::decode: ", (const Base_Type&)msg);

  //loggers::get_instance().log_msg("<<< btp_codec::decode: ", (const Base_Type&)msg);

  return 0;

}



int btp_codec::decode_ (Base_Type& type, const TTCN_Typedescriptor_t& field_descriptor, TTCN_Buffer& decoding_buffer)

{

  loggers::get_instance().log(">>> btp_codec::decode_: processing %s/%s (%d,%d,%p)", type.get_descriptor()->name, field_descriptor.name, decoding_buffer.get_len(), decoding_buffer.get_pos(), decoding_buffer.get_read_data());

  //loggers::get_instance().log(">>> btp_codec::decode_: processing %s/%s (%d,%d,%p)", type.get_descriptor()->name, field_descriptor.name, decoding_buffer.get_len(), decoding_buffer.get_pos(), decoding_buffer.get_read_data());



  if (dynamic_cast<Record_Type *>(&type) != NULL) {

    Record_Type& r = (Record_Type &)type;

    loggers::get_instance().log("btp_codec::decode_: processing Record_Type %s", r.get_descriptor()->name);

    //loggers::get_instance().log("btp_codec::decode_: processing Record_Type %s", r.get_descriptor()->name);

    for(int i = 0; i < r.get_count(); i++) {

      loggers::get_instance().log("btp_codec::decode_: processing %s/%s/%s", r.fld_name(i), r.fld_descr(i)->name, r.get_at(i)->get_descriptor()->name);

      //loggers::get_instance().log("btp_codec::decode_: processing %s/%s/%s", r.fld_name(i), r.fld_descr(i)->name, r.get_at(i)->get_descriptor()->name);

      if (decode_(*dynamic_cast<Base_Type *>(r.get_at(i)), *(r.fld_descr(i)), decoding_buffer) == -1) {

        return -1;

      }

    } // End of 'for' statement

  } else {

    loggers::get_instance().log("btp_codec::decode_ (else): processing type %s/%s - optional:%d", type.get_descriptor()->name, field_descriptor.name, type.is_optional());

    //loggers::get_instance().log("btp_codec::decode_ (else): processing type %s/%s - optional:%d", type.get_descriptor()->name, field_descriptor.name, type.is_optional());

    if (std::string(field_descriptor.name).compare("@LibItsBtp_TypesAndValues.BtpPacket.header") == 0) {

      loggers::get_instance().log("btp_codec::decode_: _type = %d", _type);

      //loggers::get_instance().log("btp_codec::decode_: _type = %d", _type);

      LibItsBtp__TypesAndValues::BtpHeader& b = static_cast<LibItsBtp__TypesAndValues::BtpHeader&>(type);

      if (_type == btp_codec::btpA) {

        decode_(b.btpAHeader(), *b.btpAHeader().get_descriptor(), decoding_buffer);
@@ -102,25 +102,25 @@ int btp_codec::decode_ (Base_Type& type, const TTCN_Typedescriptor_t& field_desc 
          (*_params)[params::btp_info] = std::to_string(static_cast<int>(b.btpBHeader().destinationPortInfo()));

        }

      } else {

        loggers::get_instance().error("btp_codec::decode_: Invalid BTP type"); // Cannot be reached

        //loggers::get_instance().error("btp_codec::decode_: Invalid BTP type"); // Cannot be reached

      }

      loggers::get_instance().log_msg("btp_codec::decode_: BtpHeader: ", type);

      //loggers::get_instance().log_msg("btp_codec::decode_: BtpHeader: ", type);

    } else if (std::string(field_descriptor.name).compare("@LibItsBtp_TypesAndValues.BtpPacket.payload") == 0) {

      if (decoding_buffer.get_len() == decoding_buffer.get_pos()) { // No payload, set it to omit

        loggers::get_instance().log("btp_codec::decode_: Set OPTIONAL<BtpRawPayload> to omit");

        //loggers::get_instance().log("btp_codec::decode_: Set OPTIONAL<BtpRawPayload> to omit");

        dynamic_cast<OPTIONAL<LibItsBtp__TypesAndValues::BtpRawPayload> &>(type).set_to_omit();

      } else {

        // Decode BtpRawPayload data structure

        OCTETSTRING os(decoding_buffer.get_len() - decoding_buffer.get_pos(), decoding_buffer.get_data() + decoding_buffer.get_pos());

        loggers::get_instance().log_msg("btp_codec::decode_: s=", os);

        //loggers::get_instance().log_msg("btp_codec::decode_: s=", os);

        if (_params != NULL) {

          (*_params)[params::btp_payload] = std::string(static_cast<const char *>(oct2str(os)));

        }

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

          dynamic_cast<OPTIONAL<LibItsBtp__TypesAndValues::BtpRawPayload> &>(type) = OPTIONAL<LibItsBtp__TypesAndValues::BtpRawPayload>(os);

          loggers::get_instance().log_msg("btp_codec::decode_: Set OPTIONAL to ", type);

          //loggers::get_instance().log_msg("btp_codec::decode_: Set OPTIONAL to ", type);

        } else {

          loggers::get_instance().log("btp_codec::decode_: Set OPTIONAL to omit");

          //loggers::get_instance().log("btp_codec::decode_: Set OPTIONAL to omit");

          dynamic_cast<OPTIONAL<LibItsBtp__TypesAndValues::BtpRawPayload> &>(type).set_to_omit();

        }

      }
@@ -129,8 +129,8 @@ int btp_codec::decode_ (Base_Type& type, const TTCN_Typedescriptor_t& field_desc 
    }

  }



  loggers::get_instance().log_msg("<<< btp_codec::decode_: ", type);

  loggers::get_instance().log_to_hexa("<<< btp_codec::decode_: decoding_buffer=", decoding_buffer);

  //loggers::get_instance().log_msg("<<< btp_codec::decode_: ", type);

  //loggers::get_instance().log_to_hexa("<<< btp_codec::decode_: decoding_buffer=", decoding_buffer);



  return 0;

}

ccsrc/Protocols/GeoNetworking/geonetworking_codec.cc

+46 −44

File changed.

Preview size limit exceeded, changes collapsed.

ccsrc/Protocols/GeoNetworking/geonetworking_layer.cc

+3 −3
Original line number Diff line number Diff line
@@ -1107,14 +1107,14 @@ int geonetworking_layer::build_secured_pdu(OCTETSTRING& data, params& params) { 
}



int geonetworking_layer::decode_basic_header(const OCTETSTRING& p_data, LibItsGeoNetworking__TypesAndValues::BasicHeader& p_basic_header) {

  loggers::get_instance().log_msg(">>> geonetworking_layer::decode_basic_header: ", p_data);

  //loggers::get_instance().log_msg(">>> geonetworking_layer::decode_basic_header: ", p_data);

  

  // Update security mode

  OCTETSTRING bh = OCTETSTRING(4, static_cast<const unsigned char*>(p_data)); // Extract the basic header as specified in ETSI EN 302 636-4-1 V1.3.1 (2017-08) Clause 9.6

  loggers::get_instance().log_msg("geonetworking_layer::decode_basic_header: bh: ", bh);

  //loggers::get_instance().log_msg("geonetworking_layer::decode_basic_header: bh: ", bh);

  TTCN_Buffer decoding_buffer(bh);

  p_basic_header.RAW_decode(*p_basic_header.get_descriptor(), decoding_buffer, decoding_buffer.get_len() * 8, raw_order_t::ORDER_MSB);

  loggers::get_instance().log_msg("geonetworking_layer::decode_basic_header: ", p_basic_header);

  //loggers::get_instance().log_msg("geonetworking_layer::decode_basic_header: ", p_basic_header);

  

  return 0;

}

data/v3/asn1c_cert.tar.bz2

+14 KiB (34.3 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

data/v3/profiles/CERT_IUT_IVI_SSP_1_AT.xml

100755 → 100644
+0 −0

File mode changed from 100755 to 100644.

View file