Commit f8c90757 authored by garciay's avatar garciay
Browse files

Review IVIM, MAPEM/SPATEM and SREM/SSEM

parent b7e9318c

ccsrc/EncDec/LibItsIvim_Encdec.cc

+41 −41
Changes for ccsrc/EncDec/LibItsIvim_Encdec.cc: 41 added lines, 41 removed lines.
Original line number Diff line number Diff line 
#include "LibItsIvim_EncdecDeclarations.hh"



#include "IVIMCodec.hh"

#include "UpperTesterCamCodec.hh"

#include "UpperTesterIvimCodec.hh"

#include "loggers.hh"



namespace LibItsIvim__EncdecDeclarations {
@@ -10,13 +10,13 @@ namespace LibItsIvim__EncdecDeclarations { 
   * @param   value to encode

   * @return  encoded value

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

  BITSTRING fx__enc__IvimReq(const LibItsIvim__TestSystem::IvimReq& p_camReq)

  BITSTRING fx__enc__IvimReq(const LibItsIvim__TestSystem::IvimReq& p_ivimReq)

  {

    loggers::get_instance().log_msg(">>> fx__enc__IvimReq: ", p_camReq);

    loggers::get_instance().log_msg(">>> fx__enc__IvimReq: ", p_ivimReq);

    

    IVIMCodec codec;

    OCTETSTRING os;

    if (codec.encode(p_camReq.msgOut(), os) == -1) {

    if (codec.encode(p_ivimReq.msgOut(), os) == -1) {

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

      return int2bit(0, 1);

    }
@@ -34,24 +34,24 @@ namespace LibItsIvim__EncdecDeclarations { 
    loggers::get_instance().log(">>> fx__dec__IvimReq");



    IVIMCodec codec;

    IVIM__PDU__Descriptions::IVIM cam;

    IVIM__PDU__Descriptions::IVIM ivim;

    OCTETSTRING is = bit2oct(b);



    if (codec.decode(is, cam) == -1) {

    if (codec.decode(is, ivim) == -1) {

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

      return -1;

    }

    p.msgOut() = cam;

    p.msgOut() = ivim;

    

    return 0;

  }



  INTEGER fx__dec__IvimInd(BITSTRING& b, LibItsIvim__TestSystem::IvimInd& p_camInd)

  INTEGER fx__dec__IvimInd(BITSTRING& b, LibItsIvim__TestSystem::IvimInd& p_ivimInd)

  {

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

    

    IVIMCodec codec;

    IVIM__PDU__Descriptions::IVIM cam;

    IVIM__PDU__Descriptions::IVIM ivim;

    OCTETSTRING is = bit2oct(b);



    // Calculate the size of the lower layers information
@@ -67,115 +67,115 @@ namespace LibItsIvim__EncdecDeclarations { 
	     LibItsIvim__TestSystem::IvimInd_its__aid_raw_.fieldlength

	     ) / 8;

    // Decode CA message

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

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

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

      return -1;

    }

    p_camInd.msgIn() = cam;

    p_ivimInd.msgIn() = ivim;

    // Decode lower layer data

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

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

    // gnNextHeader

    if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsIvim__TestSystem::IvimInd_gnNextHeader_raw_.fieldlength / 8)) {

      p_camInd.gnNextHeader().set_to_omit();

      p_ivimInd.gnNextHeader().set_to_omit();

    } else {

      OCTETSTRING os;

      os.decode(LibItsIvim__TestSystem::IvimInd_gnNextHeader_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);

      p_camInd.gnNextHeader() = oct2int(os);

      p_ivimInd.gnNextHeader() = oct2int(os);

    }

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

    loggers::get_instance().log_msg("fx__dec__IVIM: gnNextHeader=", p_ivimInd.gnNextHeader());

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

    // gnHeaderType

    if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsIvim__TestSystem::IvimInd_gnHeaderType_raw_.fieldlength / 8)) {

      p_camInd.gnHeaderType().set_to_omit();

      p_ivimInd.gnHeaderType().set_to_omit();

    } else {

      OCTETSTRING os;

      os.decode(LibItsIvim__TestSystem::IvimInd_gnHeaderType_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);

      p_camInd.gnHeaderType() = oct2int(os);

      p_ivimInd.gnHeaderType() = oct2int(os);

    }

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

    loggers::get_instance().log_msg("fx__dec__IVIM: gnHeaderType=", p_ivimInd.gnHeaderType());

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

    // gnHeaderSubtype

    if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsIvim__TestSystem::IvimInd_gnHeaderSubtype_raw_.fieldlength / 8)) {

      p_camInd.gnHeaderSubtype().set_to_omit();

      p_ivimInd.gnHeaderSubtype().set_to_omit();

    } else {

      OCTETSTRING os;

      os.decode(LibItsIvim__TestSystem::IvimInd_gnHeaderSubtype_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);

      p_camInd.gnHeaderSubtype() = oct2int(os);

      p_ivimInd.gnHeaderSubtype() = oct2int(os);

    }

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

    loggers::get_instance().log_msg("fx__dec__IVIM: gnHeaderSubtype=", p_ivimInd.gnHeaderSubtype());

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

    // gnLifetime

    if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsIvim__TestSystem::IvimInd_gnLifetime_raw_.fieldlength / 8)) {

      p_camInd.gnLifetime().set_to_omit();

      p_ivimInd.gnLifetime().set_to_omit();

    } else {

      INTEGER i;

      i.decode(LibItsIvim__TestSystem::IvimInd_gnLifetime_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);

      p_camInd.gnLifetime() = i;

      p_ivimInd.gnLifetime() = i;

    }

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

    loggers::get_instance().log_msg("fx__dec__IVIM: gnLifetime=", p_ivimInd.gnLifetime());

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

    // gnTrafficClass

    if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsIvim__TestSystem::IvimInd_gnTrafficClass_raw_.fieldlength / 8)) {

      p_camInd.gnTrafficClass().set_to_omit();

      p_ivimInd.gnTrafficClass().set_to_omit();

    } else {

      OCTETSTRING os;

      os.decode(LibItsIvim__TestSystem::IvimInd_gnTrafficClass_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);

      p_camInd.gnTrafficClass() = oct2int(os);

      p_ivimInd.gnTrafficClass() = oct2int(os);

    }

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

    loggers::get_instance().log_msg("fx__dec__IVIM: gnTrafficClass=", p_ivimInd.gnTrafficClass());

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

    // btpDestinationPort

    if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsIvim__TestSystem::IvimInd_btpDestinationPort_raw_.fieldlength / 8)) {

      p_camInd.btpDestinationPort().set_to_omit();

      p_ivimInd.btpDestinationPort().set_to_omit();

    } else {

      INTEGER i;

      i.decode(LibItsIvim__TestSystem::IvimInd_btpDestinationPort_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);

      p_camInd.btpDestinationPort() = i;

      p_ivimInd.btpDestinationPort() = i;

    }

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

    loggers::get_instance().log_msg("fx__dec__IVIM: btpDestinationPort=", p_ivimInd.btpDestinationPort());

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

    // btpInfo

    if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsIvim__TestSystem::IvimInd_btpInfo_raw_.fieldlength / 8)) {

      p_camInd.btpInfo().set_to_omit();

      p_ivimInd.btpInfo().set_to_omit();

    } else {

      INTEGER i;

      i.decode(LibItsIvim__TestSystem::IvimInd_btpInfo_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);

      p_camInd.btpInfo() = i;

      p_ivimInd.btpInfo() = i;

    }

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

    loggers::get_instance().log_msg("fx__dec__IVIM: btpInfo=", p_ivimInd.btpInfo());

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

    // ssp

    if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsIvim__TestSystem::IvimInd_ssp_raw_.fieldlength / 8)) {

      p_camInd.ssp().set_to_omit();

      p_ivimInd.ssp().set_to_omit();

    } else {

      BITSTRING bs;

      bs.decode(LibItsIvim__TestSystem::IvimInd_ssp_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);

      p_camInd.ssp() = bs;

      p_ivimInd.ssp() = bs;

    }

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

    loggers::get_instance().log_msg("fx__dec__IVIM: ssp=", p_ivimInd.ssp());

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

    // its__aid

    if (decoding_buffer.get_read_len() < static_cast<size_t>(LibItsIvim__TestSystem::IvimInd_its__aid_raw_.fieldlength / 8)) {

      p_camInd.its__aid().set_to_omit();

      p_ivimInd.its__aid().set_to_omit();

    } else {

      INTEGER i;

      i.decode(LibItsIvim__TestSystem::IvimInd_its__aid_descr_, decoding_buffer, TTCN_EncDec::CT_RAW);

      p_camInd.its__aid() = i;

      p_ivimInd.its__aid() = i;

    }

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

    loggers::get_instance().log_msg("fx__dec__IVIM: its_aid=", p_ivimInd.its__aid());

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

    

    return 0;

  }



  BITSTRING fx__enc__IVIM(const IVIM__PDU__Descriptions::IVIM& p_cam)

  BITSTRING fx__enc__IVIM(const IVIM__PDU__Descriptions::IVIM& p_ivim)

  {

    loggers::get_instance().log_msg(">>> fx__enc__IVIM: ", p_cam);

    loggers::get_instance().log_msg(">>> fx__enc__IVIM: ", p_ivim);

    

    IVIMCodec codec;

    OCTETSTRING os;

    codec.encode(p_cam, os);

    codec.encode(p_ivim, os);

    return oct2bit(os);

  }