Commit 17e1b442 authored by garciay's avatar garciay
Browse files

Bug fixed on decoding

parent 9c21944f

ccsrc/EncDec/LibItsCam_Encdec.cc

+10 −10
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ namespace LibItsCam__EncdecDeclarations { 
    }

    p_camInd.msgIn() = cam;

    // Decode lower layer data

    TTCN_Buffer decoding_buffer(OCTETSTRING(is.lengthof() - 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__CAM: ", decoding_buffer);

    // gnNextHeader

    if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsCam__TestSystem::CamInd_gnNextHeader_raw_.fieldlength / 8)) {
@@ -83,7 +83,7 @@ namespace LibItsCam__EncdecDeclarations { 
      os.decode(LibItsCam__TestSystem::CamInd_gnNextHeader_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);

      p_camInd.gnNextHeader() = oct2int(os);

    }

    loggers::get_instance().log_msg("fx__dec__CAM: ", p_camInd.gnNextHeader());

    loggers::get_instance().log_msg("fx__dec__CAM: gnNextHeader=", p_camInd.gnNextHeader());

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

    // gnHeaderType

    if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsCam__TestSystem::CamInd_gnHeaderType_raw_.fieldlength / 8)) {
@@ -93,7 +93,7 @@ namespace LibItsCam__EncdecDeclarations { 
      os.decode(LibItsCam__TestSystem::CamInd_gnHeaderType_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);

      p_camInd.gnHeaderType() = oct2int(os);

    }

    loggers::get_instance().log_msg("fx__dec__CAM: ", p_camInd.gnHeaderType());

    loggers::get_instance().log_msg("fx__dec__CAM: gnHeaderType=", p_camInd.gnHeaderType());

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

    // gnHeaderSubtype

    if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsCam__TestSystem::CamInd_gnHeaderSubtype_raw_.fieldlength / 8)) {
@@ -103,7 +103,7 @@ namespace LibItsCam__EncdecDeclarations { 
      os.decode(LibItsCam__TestSystem::CamInd_gnHeaderSubtype_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);

      p_camInd.gnHeaderSubtype() = oct2int(os);

    }

    loggers::get_instance().log_msg("fx__dec__CAM: ", p_camInd.gnHeaderSubtype());

    loggers::get_instance().log_msg("fx__dec__CAM: gnHeaderSubtype=", p_camInd.gnHeaderSubtype());

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

    // gnLifetime

    if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsCam__TestSystem::CamInd_gnLifetime_raw_.fieldlength / 8)) {
@@ -113,7 +113,7 @@ namespace LibItsCam__EncdecDeclarations { 
      i.decode(LibItsCam__TestSystem::CamInd_gnLifetime_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);

      p_camInd.gnLifetime() = i;

    }

    loggers::get_instance().log_msg("fx__dec__CAM: ", p_camInd.gnLifetime());

    loggers::get_instance().log_msg("fx__dec__CAM: gnLifetime=", p_camInd.gnLifetime());

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

    // gnTrafficClass

    if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsCam__TestSystem::CamInd_gnTrafficClass_raw_.fieldlength / 8)) {
@@ -123,7 +123,7 @@ namespace LibItsCam__EncdecDeclarations { 
      os.decode(LibItsCam__TestSystem::CamInd_gnTrafficClass_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);

      p_camInd.gnTrafficClass() = oct2int(os);

    }

    loggers::get_instance().log_msg("fx__dec__CAM: ", p_camInd.gnTrafficClass());

    loggers::get_instance().log_msg("fx__dec__CAM: gnTrafficClass=", p_camInd.gnTrafficClass());

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

    // btpDestinationPort

    if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsCam__TestSystem::CamInd_btpDestinationPort_raw_.fieldlength / 8)) {
@@ -133,7 +133,7 @@ namespace LibItsCam__EncdecDeclarations { 
      i.decode(LibItsCam__TestSystem::CamInd_btpDestinationPort_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);

      p_camInd.btpDestinationPort() = i;

    }

    loggers::get_instance().log_msg("fx__dec__CAM: ", p_camInd.btpDestinationPort());

    loggers::get_instance().log_msg("fx__dec__CAM: btpDestinationPort=", p_camInd.btpDestinationPort());

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

    // btpInfo

    if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsCam__TestSystem::CamInd_btpInfo_raw_.fieldlength / 8)) {
@@ -143,7 +143,7 @@ namespace LibItsCam__EncdecDeclarations { 
      i.decode(LibItsCam__TestSystem::CamInd_btpInfo_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);

      p_camInd.btpInfo() = i;

    }

    loggers::get_instance().log_msg("fx__dec__CAM: ", p_camInd.btpInfo());

    loggers::get_instance().log_msg("fx__dec__CAM: btpInfo=", p_camInd.btpInfo());

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

    // ssp

    if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsCam__TestSystem::CamInd_ssp_raw_.fieldlength / 8)) {
@@ -153,7 +153,7 @@ namespace LibItsCam__EncdecDeclarations { 
      bs.decode(LibItsCam__TestSystem::CamInd_ssp_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);

      p_camInd.ssp() = bs;

    }

    loggers::get_instance().log_msg("fx__dec__CAM: ", p_camInd.ssp());

    loggers::get_instance().log_msg("fx__dec__CAM: ssp=", p_camInd.ssp());

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

    // its__aid

    if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsCam__TestSystem::CamInd_its__aid_raw_.fieldlength / 8)) {
@@ -163,7 +163,7 @@ namespace LibItsCam__EncdecDeclarations { 
      i.decode(LibItsCam__TestSystem::CamInd_its__aid_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);

      p_camInd.its__aid() = i;

    }

    loggers::get_instance().log_msg("fx__dec__CAM: ", p_camInd.its__aid());

    loggers::get_instance().log_msg("fx__dec__CAM: its_aid=", p_camInd.its__aid());

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

    

    return 0;

ccsrc/EncDec/LibItsDenm_Encdec.cc

+10 −10
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ namespace LibItsDenm__EncdecDeclarations { 
    }

    p_denmInd.msgIn() = denm;

    // Decode lower layer data

    TTCN_Buffer decoding_buffer(OCTETSTRING(is.lengthof() - 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);

    // gnNextHeader

    if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsDenm__TestSystem::DenmInd_gnNextHeader_raw_.fieldlength / 8)) {
@@ -82,7 +82,7 @@ namespace LibItsDenm__EncdecDeclarations { 
      os.decode(LibItsDenm__TestSystem::DenmInd_gnNextHeader_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);

      p_denmInd.gnNextHeader() = oct2int(os);

    }

    loggers::get_instance().log_msg("fx__dec__DENM: ", 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);

    // gnHeaderType

    if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsDenm__TestSystem::DenmInd_gnHeaderType_raw_.fieldlength / 8)) {
@@ -92,7 +92,7 @@ namespace LibItsDenm__EncdecDeclarations { 
      os.decode(LibItsDenm__TestSystem::DenmInd_gnHeaderType_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);

      p_denmInd.gnHeaderType() = oct2int(os);

    }

    loggers::get_instance().log_msg("fx__dec__DENM: ", 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);

    // gnHeaderSubtype

    if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsDenm__TestSystem::DenmInd_gnHeaderSubtype_raw_.fieldlength / 8)) {
@@ -102,7 +102,7 @@ namespace LibItsDenm__EncdecDeclarations { 
      os.decode(LibItsDenm__TestSystem::DenmInd_gnHeaderSubtype_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);

      p_denmInd.gnHeaderSubtype() = oct2int(os);

    }

    loggers::get_instance().log_msg("fx__dec__DENM: ", 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);

    // gnLifetime

    if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsDenm__TestSystem::DenmInd_gnLifetime_raw_.fieldlength / 8)) {
@@ -112,7 +112,7 @@ namespace LibItsDenm__EncdecDeclarations { 
      os.decode(LibItsDenm__TestSystem::DenmInd_gnLifetime_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);

      p_denmInd.gnLifetime() = oct2int(os);

    }

    loggers::get_instance().log_msg("fx__dec__DENM: ", 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);

    // gnTrafficClass

    if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsDenm__TestSystem::DenmInd_gnTrafficClass_raw_.fieldlength / 8)) {
@@ -122,7 +122,7 @@ namespace LibItsDenm__EncdecDeclarations { 
      os.decode(LibItsDenm__TestSystem::DenmInd_gnTrafficClass_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);

      p_denmInd.gnTrafficClass() = oct2int(os);

    }

    loggers::get_instance().log_msg("fx__dec__DENM: ", 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);

    // btpDestinationPort

    if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsDenm__TestSystem::DenmInd_btpDestinationPort_raw_.fieldlength / 8)) {
@@ -132,7 +132,7 @@ namespace LibItsDenm__EncdecDeclarations { 
      os.decode(LibItsDenm__TestSystem::DenmInd_btpDestinationPort_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);

      p_denmInd.btpDestinationPort() = oct2int(os);

    }

    loggers::get_instance().log_msg("fx__dec__DENM: ", 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);

    // btpInfo

    if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsDenm__TestSystem::DenmInd_btpInfo_raw_.fieldlength / 8)) {
@@ -142,7 +142,7 @@ namespace LibItsDenm__EncdecDeclarations { 
      os.decode(LibItsDenm__TestSystem::DenmInd_btpInfo_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);

      p_denmInd.btpInfo() = oct2int(os);

    }

    loggers::get_instance().log_msg("fx__dec__DENM: ", 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);

    // ssp

    if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsDenm__TestSystem::DenmInd_ssp_raw_.fieldlength / 8)) {
@@ -152,7 +152,7 @@ namespace LibItsDenm__EncdecDeclarations { 
      bs.decode(LibItsDenm__TestSystem::DenmInd_ssp_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);

      p_denmInd.ssp() = bs;

    }

    loggers::get_instance().log_msg("fx__dec__DENM: ", 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);

    // its__aid

    if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsDenm__TestSystem::DenmInd_its__aid_raw_.fieldlength / 8)) {
@@ -162,7 +162,7 @@ namespace LibItsDenm__EncdecDeclarations { 
      os.decode(LibItsDenm__TestSystem::DenmInd_its__aid_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);

      p_denmInd.its__aid() = oct2int(os);

    }

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

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

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

    

    return 0;

ccsrc/Externals/LibItsCommon_externals.cc

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ void fx__computePositionUsingDistance( 
//    double ref_lon = ((double)p__refLongitude) * (M_PI / 180.0);



    p__latitude = asin(sin(ref_lat)*cos(distance) + cos(ref_lat)*sin(distance)*cos(angle)) * 180.0 / M_PI;

    p__longitude = ((double)p__refLongitude) + atan2(sin(angle)*sin(distance)*cos(ref_lat), cos(distance) - sin(ref_lat)*sin(p__latitude))*(180.0/M_PI);

    p__longitude = ((double)p__refLongitude) + atan2(sin(angle)*sin(distance)*cos(ref_lat), cos(distance) - sin(ref_lat)*sin((double)p__latitude))*(180.0/M_PI);

}



/*       * @desc    External function to compute radius of a given circular area

ccsrc/Ports/LibIts_ports/CAM_ports/UpperTesterPort_CAM.partC

+2 −1
Original line number Diff line number Diff line 
#include "UpperTesterCamLayer.hh"

#include "UpperTesterCamFactory.hh"



#include "loggers.hh"



//=============================================================================

ccsrc/Ports/LibIts_ports/DENM_ports/UpperTesterPort_DENM.partC

+2 −1
Original line number Diff line number Diff line 
#include "UpperTesterDenmLayer.hh"

#include "UpperTesterDenmFactory.hh"



#include "loggers.hh"



//=============================================================================