Commit fda63c59 authored by Yann Garcia's avatar Yann Garcia
Browse files

Bug fixed in ccsrc/Ports/LibIts_ports/UpperTesterPort.hh

parent adec5b13

ccsrc/EncDec/LibItsCps_Encdec.cc

+6 −1
Original line number Diff line number Diff line
@@ -195,12 +195,17 @@ namespace LibItsCps__EncdecDeclarations { 
    return 0;

  }



<<<<<<< HEAD

  BITSTRING fx__enc__UtCpmInitialize(const LibItsCps__TypesAndValues::UtCpmInitialize &p_utCpsInitialize) {

    loggers::get_instance().log_msg(">>> fx__enc__UtCpmInitialize: ", p_utCpsInitialize);

=======

  BITSTRING fx__enc__UtCpmInitialize(const LibItsCps__TypesAndValues::UtCpmInitialize &p_utCpmInitialize) {

    loggers::get_instance().log_msg(">>> fx__enc__UtCpmInitialize: ", p_utCpmInitialize);

>>>>>>> a676b01 (Bug fixed in ccsrc/Ports/LibIts_ports/UpperTesterPort.hh)



    uppertester_cps_codec codec;

    OCTETSTRING           os;

    codec.encode(p_utCpsInitialize, os);

    codec.encode(p_utCpmInitialize, os);

    return oct2bit(os);

  }

ccsrc/EncDec/LibItsVru_Encdec.cc

+3 −3
Original line number Diff line number Diff line
@@ -195,12 +195,12 @@ namespace LibItsVru__EncdecDeclarations { 
    return 0;

  }



  BITSTRING fx__enc__UtVamInitialize(const LibItsVru__TypesAndValues::UtVamInitialize &p_utVruInitialize) {

    loggers::get_instance().log_msg(">>> fx__enc__UtVamInitialize: ", p_utVruInitialize);

  BITSTRING fx__enc__UtVamInitialize(const LibItsVru__TypesAndValues::UtVamInitialize &p_utVamInitialize) {

    loggers::get_instance().log_msg(">>> fx__enc__UtVamInitialize: ", p_utVamInitialize);



    uppertester_vru_codec codec;

    OCTETSTRING           os;

    codec.encode(p_utVruInitialize, os);

    codec.encode(p_utVamInitialize, os);

    return oct2bit(os);

  }

ccsrc/Protocols/UpperTester/uppertester_cps_codec.cc

+2 −2
Original line number Diff line number Diff line
@@ -155,10 +155,10 @@ int uppertester_cps_codec::decode(const OCTETSTRING &data, LibItsCps__TypesAndVa 


  const unsigned char *ptr = static_cast<const unsigned char *>(data);

  if (*ptr == uppertester_cps_codec::c_utCpmInitializeResult) {

    msg.utCpsInitializeResult() = BOOLEAN(*(ptr + 1) == 0x01);

    msg.utCpmInitializeResult() = BOOLEAN(*(ptr + 1) == 0x01);

  } else if (*ptr == 0x24) { // TODO Use a constant for "Peer does not support is "Peer does not support the command"

    // Peer does not support the command

    msg.utCpsInitializeResult() = 0x00;

    msg.utCpmInitializeResult() = 0x00;

  } else {

    loggers::get_instance().warning("uppertester_cps_codec::decode: Unsupported result");

    return -1;

ccsrc/Protocols/UpperTester/uppertester_cps_layer.cc

+2 −1
Original line number Diff line number Diff line
@@ -16,12 +16,13 @@ uppertester_cps_layer::uppertester_cps_layer(const std::string &p_type, const st 
  }

}



void uppertester_cps_layer::sendMsg(const LibItsCps__TypesAndValues::UtCpmInitialize &send_par, params_its &p_params) {

void uppertester_cps_layer::sendMsg(const LibItsCps__TypesAndValues::UtCpmInitialize &send_par, params_its &p_params) {

  loggers::get_instance().log_msg(">>> uppertester_cps_layer::sendMsg", send_par);



  if (_params[params::loopback].compare("1") == 0) {

    LibItsCps__TypesAndValues::UtCpmResults ut_cps_results;

    ut_cps_results.utCpsInitializeResult() = BOOLEAN(true);

    ut_cps_results.utCpmInitializeResult() = BOOLEAN(true);

    to_all_upper_ports(ut_cps_results, p_params);

  } else {

    // Encode UpperTester PDU

ccsrc/Protocols/UpperTester/uppertester_vru_codec.cc

+6 −2
Original line number Diff line number Diff line
@@ -11,6 +11,9 @@ 
template <typename T_type> class OPTIONAL;

class TTCN_EncDec;



unsigned char uppertester_vru_codec::c_utVamInitialize              = 0x00;

unsigned char uppertester_vru_codec::c_utVamInitializeResult        = 0x01;

unsigned char uppertester_vru_codec::c_utVamEventInd                = 0x23;

unsigned char uppertester_vru_codec::c_utVamInitialize              = 0x00;

unsigned char uppertester_vru_codec::c_utVamInitializeResult        = 0x01;

unsigned char uppertester_vru_codec::c_utVamEventInd                = 0x23;
@@ -150,15 +153,16 @@ std::unique_ptr<Base_Type> uppertester_vru_codec::decode(const OCTETSTRING &data 
  return result;

}



int uppertester_vru_codec::decode(const OCTETSTRING &data, LibItsVru__TypesAndValues::UtVamResults &msg, params_its *params) {

int uppertester_vru_codec::decode(const OCTETSTRING &data, LibItsVru__TypesAndValues::UtVamResults &msg, params_its *params) {

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



  const unsigned char *ptr = static_cast<const unsigned char *>(data);

  if (*ptr == uppertester_vru_codec::c_utVamInitializeResult) {

    msg.utVruInitializeResult() = BOOLEAN(*(ptr + 1) == 0x01);

    msg.utVamInitializeResult() = BOOLEAN(*(ptr + 1) == 0x01);

  } else if (*ptr == 0x24) { // TODO Use a constant for "Peer does not support is "Peer does not support the command"

    // Peer does not support the command

    msg.utVruInitializeResult() = 0x00;

    msg.utVamInitializeResult() = 0x00;

  } else {

    loggers::get_instance().warning("uppertester_vru_codec::decode: Unsupported result");

    return -1;