Commit a9311be6 authored by YannGarcia's avatar YannGarcia
Browse files

Separate typing and test system

parent d6808612

ccsrc/EncDec/LibItsBtp_Encdec.cc

+4 −4
Original line number Original line Diff line number Diff line
@@ -10,7 +10,7 @@ namespace LibItsBtp__EncdecDeclarations { 
   * @param   value to encode

   * @param   value to encode

   * @return  encoded value

   * @return  encoded value

   ****************************************************/

   ****************************************************/

  BITSTRING fx__enc__BtpReq(LibItsBtp__TestSystem::BtpReq const &p_btpReq) {

  BITSTRING fx__enc__BtpReq(LibItsBtp__TypesAndValues::BtpReq const &p_btpReq) {

    loggers::get_instance().log_msg(">>> fx__enc__BtpReq: ", p_btpReq);

    loggers::get_instance().log_msg(">>> fx__enc__BtpReq: ", p_btpReq);





    btp_codec   codec;

    btp_codec   codec;
@@ -29,7 +29,7 @@ namespace LibItsBtp__EncdecDeclarations { 
   * @return  encoded value

   * @return  encoded value

   ****************************************************/

   ****************************************************/





  INTEGER fx__dec__BtpReq(BITSTRING &b, LibItsBtp__TestSystem::BtpReq &p) {

  INTEGER fx__dec__BtpReq(BITSTRING &b, LibItsBtp__TypesAndValues::BtpReq &p) {

    loggers::get_instance().log(">>> fx__dec__BtpReq");

    loggers::get_instance().log(">>> fx__dec__BtpReq");

    btp_codec                            codec;

    btp_codec                            codec;

    LibItsBtp__TypesAndValues::BtpPacket pdu;

    LibItsBtp__TypesAndValues::BtpPacket pdu;
@@ -49,7 +49,7 @@ namespace LibItsBtp__EncdecDeclarations { 
   * @param   value to encode

   * @param   value to encode

   * @return  encoded value

   * @return  encoded value

   ****************************************************/

   ****************************************************/

  BITSTRING fx__enc__BtpInd(LibItsBtp__TestSystem::BtpInd const &p_btpInd) {

  BITSTRING fx__enc__BtpInd(LibItsBtp__TypesAndValues::BtpInd const &p_btpInd) {

    loggers::get_instance().log_msg(">>> fx__enc__BtpInd: ", p_btpInd);

    loggers::get_instance().log_msg(">>> fx__enc__BtpInd: ", p_btpInd);





    btp_codec   codec;

    btp_codec   codec;
@@ -68,7 +68,7 @@ namespace LibItsBtp__EncdecDeclarations { 
   * @return  encoded value

   * @return  encoded value

   ****************************************************/

   ****************************************************/





  INTEGER fx__dec__BtpInd(BITSTRING &b, LibItsBtp__TestSystem::BtpInd &p_btpInd) {

  INTEGER fx__dec__BtpInd(BITSTRING &b, LibItsBtp__TypesAndValues::BtpInd &p_btpInd) {

    loggers::get_instance().log(">>> fx__dec__BtpInd");

    loggers::get_instance().log(">>> fx__dec__BtpInd");

    btp_codec                            codec;

    btp_codec                            codec;

    LibItsBtp__TypesAndValues::BtpPacket pdu;

    LibItsBtp__TypesAndValues::BtpPacket pdu;

ccsrc/EncDec/LibItsDenm_Encdec.cc

+26 −26
Original line number Original line Diff line number Diff line
@@ -12,7 +12,7 @@ namespace LibItsDenm__EncdecDeclarations { 
   * @param   value to encode

   * @param   value to encode

   * @return  encoded value

   * @return  encoded value

   ****************************************************/

   ****************************************************/

  BITSTRING fx__enc__DenmReq(const LibItsDenm__TestSystem::DenmReq &p_denmReq) {

  BITSTRING fx__enc__DenmReq(const LibItsDenm__TypesAndValues::DenmReq &p_denmReq) {

    loggers::get_instance().log_msg(">>> fx__enc__DenmReq: ", p_denmReq);

    loggers::get_instance().log_msg(">>> fx__enc__DenmReq: ", p_denmReq);





    denm_codec  codec;

    denm_codec  codec;
@@ -30,7 +30,7 @@ namespace LibItsDenm__EncdecDeclarations { 
   * @param   value to encode

   * @param   value to encode

   * @return  encoded value

   * @return  encoded value

   ****************************************************/

   ****************************************************/

  INTEGER fx__dec__DenmReq(BITSTRING &b, LibItsDenm__TestSystem::DenmReq &p) {

  INTEGER fx__dec__DenmReq(BITSTRING &b, LibItsDenm__TypesAndValues::DenmReq &p) {

    loggers::get_instance().log(">>> fx__dec__DenmReq");

    loggers::get_instance().log(">>> fx__dec__DenmReq");





    denm_codec                    codec;

    denm_codec                    codec;
@@ -46,18 +46,18 @@ namespace LibItsDenm__EncdecDeclarations { 
    return 0;

    return 0;

  }

  }





  INTEGER fx__dec__DenmInd(BITSTRING &b, LibItsDenm__TestSystem::DenmInd &p_denmInd) {

  INTEGER fx__dec__DenmInd(BITSTRING &b, LibItsDenm__TypesAndValues::DenmInd &p_denmInd) {

    loggers::get_instance().log(">>> fx__dec__DenmInd");

    loggers::get_instance().log(">>> fx__dec__DenmInd");





    denm_codec                    codec;

    denm_codec                    codec;

    DENM__PDU__Descriptions::DENM denm;

    DENM__PDU__Descriptions::DENM denm;

    OCTETSTRING                   is = bit2oct(b);

    OCTETSTRING                   is = bit2oct(b);





    int s = (LibItsDenm__TestSystem::DenmInd_gnNextHeader_raw_.fieldlength + LibItsDenm__TestSystem::DenmInd_gnHeaderType_raw_.fieldlength +

    int s = (LibItsDenm__TypesAndValues::DenmInd_gnNextHeader_raw_.fieldlength + LibItsDenm__TypesAndValues::DenmInd_gnHeaderType_raw_.fieldlength +

             LibItsDenm__TestSystem::DenmInd_gnHeaderSubtype_raw_.fieldlength + LibItsDenm__TestSystem::DenmInd_gnLifetime_raw_.fieldlength +

             LibItsDenm__TypesAndValues::DenmInd_gnHeaderSubtype_raw_.fieldlength + LibItsDenm__TypesAndValues::DenmInd_gnLifetime_raw_.fieldlength +

             LibItsDenm__TestSystem::DenmInd_gnTrafficClass_raw_.fieldlength + LibItsDenm__TestSystem::DenmInd_btpDestinationPort_raw_.fieldlength +

             LibItsDenm__TypesAndValues::DenmInd_gnTrafficClass_raw_.fieldlength + LibItsDenm__TypesAndValues::DenmInd_btpDestinationPort_raw_.fieldlength +

             LibItsDenm__TestSystem::DenmInd_btpInfo_raw_.fieldlength + LibItsDenm__TestSystem::DenmInd_ssp_raw_.fieldlength +

             LibItsDenm__TypesAndValues::DenmInd_btpInfo_raw_.fieldlength + LibItsDenm__TypesAndValues::DenmInd_ssp_raw_.fieldlength +

             LibItsDenm__TestSystem::DenmInd_its__aid_raw_.fieldlength) /

             LibItsDenm__TypesAndValues::DenmInd_its__aid_raw_.fieldlength) /

            8;

            8;

    // Decode DEN message

    // Decode DEN message

    if (codec.decode(OCTETSTRING(is.lengthof() - s, static_cast<const unsigned char *>(is)), denm) == -1) {

    if (codec.decode(OCTETSTRING(is.lengthof() - s, static_cast<const unsigned char *>(is)), denm) == -1) {
@@ -69,91 +69,91 @@ namespace LibItsDenm__EncdecDeclarations { 
    TTCN_Buffer decoding_buffer(OCTETSTRING(s, static_cast<const unsigned char *>(is) + is.lengthof() - s));

    TTCN_Buffer decoding_buffer(OCTETSTRING(s, static_cast<const unsigned char *>(is) + is.lengthof() - s));

    loggers::get_instance().log_to_hexa("fx__dec__DENM: ", decoding_buffer);

    loggers::get_instance().log_to_hexa("fx__dec__DENM: ", decoding_buffer);

    // gnNextHeader

    // gnNextHeader

    if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsDenm__TestSystem::DenmInd_gnNextHeader_raw_.fieldlength / 8)) {

    if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsDenm__TypesAndValues::DenmInd_gnNextHeader_raw_.fieldlength / 8)) {

      p_denmInd.gnNextHeader().set_to_omit();

      p_denmInd.gnNextHeader().set_to_omit();

    } else {

    } else {

      OCTETSTRING os;

      OCTETSTRING os;

      os.decode(LibItsDenm__TestSystem::DenmInd_gnNextHeader_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);

      os.decode(LibItsDenm__TypesAndValues::DenmInd_gnNextHeader_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);

      p_denmInd.gnNextHeader() = oct2int(os);

      p_denmInd.gnNextHeader() = oct2int(os);

    }

    }

    loggers::get_instance().log_msg("fx__dec__DENM: gnNextHeader=", p_denmInd.gnNextHeader());

    loggers::get_instance().log_msg("fx__dec__DENM: gnNextHeader=", p_denmInd.gnNextHeader());

    loggers::get_instance().log_to_hexa("fx__dec__DENM: ", decoding_buffer);

    loggers::get_instance().log_to_hexa("fx__dec__DENM: ", decoding_buffer);

    // gnHeaderType

    // gnHeaderType

    if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsDenm__TestSystem::DenmInd_gnHeaderType_raw_.fieldlength / 8)) {

    if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsDenm__TypesAndValues::DenmInd_gnHeaderType_raw_.fieldlength / 8)) {

      p_denmInd.gnHeaderType().set_to_omit();

      p_denmInd.gnHeaderType().set_to_omit();

    } else {

    } else {

      OCTETSTRING os;

      OCTETSTRING os;

      os.decode(LibItsDenm__TestSystem::DenmInd_gnHeaderType_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);

      os.decode(LibItsDenm__TypesAndValues::DenmInd_gnHeaderType_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);

      p_denmInd.gnHeaderType() = oct2int(os);

      p_denmInd.gnHeaderType() = oct2int(os);

    }

    }

    loggers::get_instance().log_msg("fx__dec__DENM: gnHeaderType=", p_denmInd.gnHeaderType());

    loggers::get_instance().log_msg("fx__dec__DENM: gnHeaderType=", p_denmInd.gnHeaderType());

    loggers::get_instance().log_to_hexa("fx__dec__DENM: ", decoding_buffer);

    loggers::get_instance().log_to_hexa("fx__dec__DENM: ", decoding_buffer);

    // gnHeaderSubtype

    // gnHeaderSubtype

    if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsDenm__TestSystem::DenmInd_gnHeaderSubtype_raw_.fieldlength / 8)) {

    if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsDenm__TypesAndValues::DenmInd_gnHeaderSubtype_raw_.fieldlength / 8)) {

      p_denmInd.gnHeaderSubtype().set_to_omit();

      p_denmInd.gnHeaderSubtype().set_to_omit();

    } else {

    } else {

      OCTETSTRING os;

      OCTETSTRING os;

      os.decode(LibItsDenm__TestSystem::DenmInd_gnHeaderSubtype_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);

      os.decode(LibItsDenm__TypesAndValues::DenmInd_gnHeaderSubtype_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);

      p_denmInd.gnHeaderSubtype() = oct2int(os);

      p_denmInd.gnHeaderSubtype() = oct2int(os);

    }

    }

    loggers::get_instance().log_msg("fx__dec__DENM: gnHeaderSubType=", p_denmInd.gnHeaderSubtype());

    loggers::get_instance().log_msg("fx__dec__DENM: gnHeaderSubType=", p_denmInd.gnHeaderSubtype());

    loggers::get_instance().log_to_hexa("fx__dec__DENM: ", decoding_buffer);

    loggers::get_instance().log_to_hexa("fx__dec__DENM: ", decoding_buffer);

    // gnLifetime

    // gnLifetime

    if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsDenm__TestSystem::DenmInd_gnLifetime_raw_.fieldlength / 8)) {

    if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsDenm__TypesAndValues::DenmInd_gnLifetime_raw_.fieldlength / 8)) {

      p_denmInd.gnLifetime().set_to_omit();

      p_denmInd.gnLifetime().set_to_omit();

    } else {

    } else {

      OCTETSTRING os;

      OCTETSTRING os;

      os.decode(LibItsDenm__TestSystem::DenmInd_gnLifetime_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);

      os.decode(LibItsDenm__TypesAndValues::DenmInd_gnLifetime_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);

      p_denmInd.gnLifetime() = oct2int(os);

      p_denmInd.gnLifetime() = oct2int(os);

    }

    }

    loggers::get_instance().log_msg("fx__dec__DENM: gnLifetime=", p_denmInd.gnLifetime());

    loggers::get_instance().log_msg("fx__dec__DENM: gnLifetime=", p_denmInd.gnLifetime());

    loggers::get_instance().log_to_hexa("fx__dec__DENM: ", decoding_buffer);

    loggers::get_instance().log_to_hexa("fx__dec__DENM: ", decoding_buffer);

    // gnTrafficClass

    // gnTrafficClass

    if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsDenm__TestSystem::DenmInd_gnTrafficClass_raw_.fieldlength / 8)) {

    if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsDenm__TypesAndValues::DenmInd_gnTrafficClass_raw_.fieldlength / 8)) {

      p_denmInd.gnTrafficClass().set_to_omit();

      p_denmInd.gnTrafficClass().set_to_omit();

    } else {

    } else {

      OCTETSTRING os;

      OCTETSTRING os;

      os.decode(LibItsDenm__TestSystem::DenmInd_gnTrafficClass_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);

      os.decode(LibItsDenm__TypesAndValues::DenmInd_gnTrafficClass_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);

      p_denmInd.gnTrafficClass() = oct2int(os);

      p_denmInd.gnTrafficClass() = oct2int(os);

    }

    }

    loggers::get_instance().log_msg("fx__dec__DENM: gnTrafficClass=", p_denmInd.gnTrafficClass());

    loggers::get_instance().log_msg("fx__dec__DENM: gnTrafficClass=", p_denmInd.gnTrafficClass());

    loggers::get_instance().log_to_hexa("fx__dec__DENM: ", decoding_buffer);

    loggers::get_instance().log_to_hexa("fx__dec__DENM: ", decoding_buffer);

    // btpDestinationPort

    // btpDestinationPort

    if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsDenm__TestSystem::DenmInd_btpDestinationPort_raw_.fieldlength / 8)) {

    if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsDenm__TypesAndValues::DenmInd_btpDestinationPort_raw_.fieldlength / 8)) {

      p_denmInd.btpDestinationPort().set_to_omit();

      p_denmInd.btpDestinationPort().set_to_omit();

    } else {

    } else {

      OCTETSTRING os;

      OCTETSTRING os;

      os.decode(LibItsDenm__TestSystem::DenmInd_btpDestinationPort_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);

      os.decode(LibItsDenm__TypesAndValues::DenmInd_btpDestinationPort_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);

      p_denmInd.btpDestinationPort() = oct2int(os);

      p_denmInd.btpDestinationPort() = oct2int(os);

    }

    }

    loggers::get_instance().log_msg("fx__dec__DENM: btpDestinationPort=", p_denmInd.btpDestinationPort());

    loggers::get_instance().log_msg("fx__dec__DENM: btpDestinationPort=", p_denmInd.btpDestinationPort());

    loggers::get_instance().log_to_hexa("fx__dec__DENM: ", decoding_buffer);

    loggers::get_instance().log_to_hexa("fx__dec__DENM: ", decoding_buffer);

    // btpInfo

    // btpInfo

    if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsDenm__TestSystem::DenmInd_btpInfo_raw_.fieldlength / 8)) {

    if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsDenm__TypesAndValues::DenmInd_btpInfo_raw_.fieldlength / 8)) {

      p_denmInd.btpInfo().set_to_omit();

      p_denmInd.btpInfo().set_to_omit();

    } else {

    } else {

      OCTETSTRING os;

      OCTETSTRING os;

      os.decode(LibItsDenm__TestSystem::DenmInd_btpInfo_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);

      os.decode(LibItsDenm__TypesAndValues::DenmInd_btpInfo_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);

      p_denmInd.btpInfo() = oct2int(os);

      p_denmInd.btpInfo() = oct2int(os);

    }

    }

    loggers::get_instance().log_msg("fx__dec__DENM: btpInfo=", p_denmInd.btpInfo());

    loggers::get_instance().log_msg("fx__dec__DENM: btpInfo=", p_denmInd.btpInfo());

    loggers::get_instance().log_to_hexa("fx__dec__DENM: ", decoding_buffer);

    loggers::get_instance().log_to_hexa("fx__dec__DENM: ", decoding_buffer);

    // ssp

    // ssp

    if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsDenm__TestSystem::DenmInd_ssp_raw_.fieldlength / 8)) {

    if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsDenm__TypesAndValues::DenmInd_ssp_raw_.fieldlength / 8)) {

      p_denmInd.ssp().set_to_omit();

      p_denmInd.ssp().set_to_omit();

    } else {

    } else {

      BITSTRING bs;

      BITSTRING bs;

      bs.decode(LibItsDenm__TestSystem::DenmInd_ssp_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);

      bs.decode(LibItsDenm__TypesAndValues::DenmInd_ssp_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);

      p_denmInd.ssp() = bs;

      p_denmInd.ssp() = bs;

    }

    }

    loggers::get_instance().log_msg("fx__dec__DENM: ssp=", p_denmInd.ssp());

    loggers::get_instance().log_msg("fx__dec__DENM: ssp=", p_denmInd.ssp());

    loggers::get_instance().log_to_hexa("fx__dec__DENM: ", decoding_buffer);

    loggers::get_instance().log_to_hexa("fx__dec__DENM: ", decoding_buffer);

    // its__aid

    // its__aid

    if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsDenm__TestSystem::DenmInd_its__aid_raw_.fieldlength / 8)) {

    if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsDenm__TypesAndValues::DenmInd_its__aid_raw_.fieldlength / 8)) {

      p_denmInd.its__aid().set_to_omit();

      p_denmInd.its__aid().set_to_omit();

    } else {

    } else {

      OCTETSTRING os;

      OCTETSTRING os;

      os.decode(LibItsDenm__TestSystem::DenmInd_its__aid_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);

      os.decode(LibItsDenm__TypesAndValues::DenmInd_its__aid_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);

      p_denmInd.its__aid() = oct2int(os);

      p_denmInd.its__aid() = oct2int(os);

    }

    }

    loggers::get_instance().log_msg("fx__dec__DENM: its_aid=", p_denmInd.its__aid());

    loggers::get_instance().log_msg("fx__dec__DENM: its_aid=", p_denmInd.its__aid());

ccsrc/EncDec/LibItsGeoNetworking_Encdec.cc

+8 −8
Original line number Original line Diff line number Diff line
@@ -21,7 +21,7 @@ namespace LibItsGeoNetworking__EncdecDeclarations { 
   * \param[in] p_geoNetworkingReq The value to encode

   * \param[in] p_geoNetworkingReq The value to encode

   * \return  encoded value

   * \return  encoded value

   ****************************************************/

   ****************************************************/

  BITSTRING fx__enc__GeoNetworkingReq(LibItsGeoNetworking__TestSystem::GeoNetworkingReq const &p_geoNetworkingReq) {

  BITSTRING fx__enc__GeoNetworkingReq(LibItsGeoNetworking__TypesAndValues::GeoNetworkingReq const &p_geoNetworkingReq) {

    loggers::get_instance().log_msg(">>> fx__enc__GeoNetworkingReq: ", p_geoNetworkingReq);

    loggers::get_instance().log_msg(">>> fx__enc__GeoNetworkingReq: ", p_geoNetworkingReq);





    float       duration;

    float       duration;
@@ -55,15 +55,15 @@ namespace LibItsGeoNetworking__EncdecDeclarations { 
   * @return  encoded value

   * @return  encoded value

   ****************************************************/

   ****************************************************/





  INTEGER fx__dec__GeoNetworkingReq(BITSTRING &b, LibItsGeoNetworking__TestSystem::GeoNetworkingReq &p) {

  INTEGER fx__dec__GeoNetworkingReq(BITSTRING &b, LibItsGeoNetworking__TypesAndValues::GeoNetworkingReq &p) {

    loggers::get_instance().log(">>> fx__dec__GeoNetworkingReq");

    loggers::get_instance().log(">>> fx__dec__GeoNetworkingReq");

    geonetworking_codec                                   codec;

    geonetworking_codec                                   codec;

    LibItsGeoNetworking__TypesAndValues::GeoNetworkingPdu pdu;

    LibItsGeoNetworking__TypesAndValues::GeoNetworkingPdu pdu;

    OCTETSTRING                                           is = bit2oct(b);

    OCTETSTRING                                           is = bit2oct(b);





    // Calculate the size of the lower layers information

    // Calculate the size of the lower layers information

    unsigned int s = (LibItsGeoNetworking__TestSystem::GeoNetworkingInd_macDestinationAddress_raw_.fieldlength +

    unsigned int s = (LibItsGeoNetworking__TypesAndValues::GeoNetworkingInd_macDestinationAddress_raw_.fieldlength +

                      LibItsGeoNetworking__TestSystem::GeoNetworkingInd_its__aid_raw_.fieldlength) /

                      LibItsGeoNetworking__TypesAndValues::GeoNetworkingInd_its__aid_raw_.fieldlength) /

                     8;

                     8;

    if (codec.decode(OCTETSTRING(is.lengthof() - s, static_cast<const unsigned char *>(is)), pdu) == -1) {

    if (codec.decode(OCTETSTRING(is.lengthof() - s, static_cast<const unsigned char *>(is)), pdu) == -1) {

      loggers::get_instance().warning("fx__dec__GeoNetworkingReq: -1 result code was returned");

      loggers::get_instance().warning("fx__dec__GeoNetworkingReq: -1 result code was returned");
@@ -85,7 +85,7 @@ namespace LibItsGeoNetworking__EncdecDeclarations { 
   * @param   value to encode

   * @param   value to encode

   * @return  encoded value

   * @return  encoded value

   ****************************************************/

   ****************************************************/

  BITSTRING fx__enc__GeoNetworkingInd(LibItsGeoNetworking__TestSystem::GeoNetworkingInd const &p_geoNetworkingInd) {

  BITSTRING fx__enc__GeoNetworkingInd(LibItsGeoNetworking__TypesAndValues::GeoNetworkingInd const &p_geoNetworkingInd) {

    loggers::get_instance().log_msg(">>> fx__enc__GeoNetworkingInd: ", p_geoNetworkingInd);

    loggers::get_instance().log_msg(">>> fx__enc__GeoNetworkingInd: ", p_geoNetworkingInd);





    geonetworking_codec codec;

    geonetworking_codec codec;
@@ -115,7 +115,7 @@ namespace LibItsGeoNetworking__EncdecDeclarations { 
   * @return  encoded value

   * @return  encoded value

   ****************************************************/

   ****************************************************/





  INTEGER fx__dec__GeoNetworkingInd(BITSTRING &b, LibItsGeoNetworking__TestSystem::GeoNetworkingInd &p_geoNetworkingInd) {

  INTEGER fx__dec__GeoNetworkingInd(BITSTRING &b, LibItsGeoNetworking__TypesAndValues::GeoNetworkingInd &p_geoNetworkingInd) {

    loggers::get_instance().log(">>> fx__dec__GeoNetworkingInd");

    loggers::get_instance().log(">>> fx__dec__GeoNetworkingInd");





    float       duration;

    float       duration;
@@ -128,8 +128,8 @@ namespace LibItsGeoNetworking__EncdecDeclarations { 




    // Calculate the size of the lower layers information

    // Calculate the size of the lower layers information

    unsigned int s =

    unsigned int s =

      (LibItsGeoNetworking__TestSystem::GeoNetworkingInd_macDestinationAddress_raw_.fieldlength +

      (LibItsGeoNetworking__TypesAndValues::GeoNetworkingInd_macDestinationAddress_raw_.fieldlength +

       LibItsGeoNetworking__TestSystem::GeoNetworkingInd_ssp_raw_.fieldlength + LibItsGeoNetworking__TestSystem::GeoNetworkingInd_its__aid_raw_.fieldlength) /

       LibItsGeoNetworking__TypesAndValues::GeoNetworkingInd_ssp_raw_.fieldlength + LibItsGeoNetworking__TypesAndValues::GeoNetworkingInd_its__aid_raw_.fieldlength) /

      8;

      8;

    if (codec.decode(OCTETSTRING(is.lengthof() - s, static_cast<const unsigned char *>(is)), pdu) == -1) {

    if (codec.decode(OCTETSTRING(is.lengthof() - s, static_cast<const unsigned char *>(is)), pdu) == -1) {

      loggers::get_instance().warning("fx__dec__GeoNetworkingInd: -1 result code was returned");

      loggers::get_instance().warning("fx__dec__GeoNetworkingInd: -1 result code was returned");

ccsrc/Externals/module.mk

+4 −0
Original line number Original line Diff line number Diff line
@@ -29,6 +29,10 @@ ifeq (AtsGeoNetworking, $(ATS)) 
sources +=  LibItsSecurity_externals.cc

sources +=  LibItsSecurity_externals.cc

endif

endif





ifeq (AtsIPv6OverGeoNetworking, $(ATS))

sources +=  LibItsSecurity_externals.cc

endif



ifeq (AtsBTP, $(ATS))

ifeq (AtsBTP, $(ATS))

sources +=  LibItsSecurity_externals.cc

sources +=  LibItsSecurity_externals.cc

endif

endif

ccsrc/Ports/LibIts_ports/BTP_ports/BtpPort.cc

+2 −2
Original line number Original line Diff line number Diff line
@@ -69,7 +69,7 @@ namespace LibItsBtp__TestSystem { 




  void BtpPort::user_stop() {}

  void BtpPort::user_stop() {}





  void BtpPort::outgoing_send(const BtpReq &send_par) {

  void BtpPort::outgoing_send(const LibItsBtp__TypesAndValues::BtpReq &send_par) {

    //    loggers::get_instance().log_msg(">>> BtpPort::outgoing_send: payload=", send_par);

    //    loggers::get_instance().log_msg(">>> BtpPort::outgoing_send: payload=", send_par);





    float duration;

    float duration;
@@ -78,7 +78,7 @@ namespace LibItsBtp__TestSystem { 
    loggers::get_instance().set_stop_time(_time_key, duration);

    loggers::get_instance().set_stop_time(_time_key, duration);

  }

  }





  void BtpPort::receiveMsg(const LibItsBtp__TestSystem::BtpInd &p_ind, const params &p_params) {

  void BtpPort::receiveMsg(const LibItsBtp__TypesAndValues::BtpInd &p_ind, const params &p_params) {

    //    loggers::get_instance().log_msg(">>> BtpPort::receive_msg: ", p_ind);

    //    loggers::get_instance().log_msg(">>> BtpPort::receive_msg: ", p_ind);





    incoming_message(p_ind);

    incoming_message(p_ind);