Commit 6d7e5ebb authored by garciay's avatar garciay
Browse files

Merge branch 'master' of https://forge.etsi.org/gitlab/emergency-communications/NG112

parents 011f93cf bb31fbca

ccsrc/Protocols/Lost/lost_codec.cc

+14 −2
Original line number Diff line number Diff line
@@ -32,8 +32,20 @@ int lost_codec::encode (const LibItsHttp__XmlMessageBodyTypes::XmlBody& msg, OCT 
    loggers::get_instance().warning("lost_codec::encode: Unsupported variant");

    return -1;

  }

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

  loggers::get_instance().log_msg("lost_codec::decode: After encoding: ", data);

  

  // Work-around to be removed when fixed in urn_ietf..._lost.ttcn

  std::string str((const char*)encoding_buffer.get_data(), (const char*)(encoding_buffer.get_data() + encoding_buffer.get_len()));

  loggers::get_instance().log("lost_codec::encode: Before work-around: %s", str.c_str());

  std::size_t it = str.find("pointType");

  if (it != std::string::npos) {

    str = str.substr(0, it + 5) + str.substr(it + 9);

    it = str.find("pointType");

    str = str.substr(0, it + 5) + str.substr(it + 9);

  }

  

  data = OCTETSTRING(str.length(), (const unsigned char*)str.c_str());

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

  loggers::get_instance().log_msg("lost_codec::encode: After encoding: ", data);



  loggers::get_instance().log("<<< lost_codec::encode");

  return 0;

docker/Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ RUN chown -R etsi /home/etsi/dev/STF549_Ng112/ && cd /home/etsi/dev/STF549_Ng112 
USER etsi

 

RUN cd /home/etsi/frameworks \

    && git clone https://github.com/YannGarcia/osip.git ./osip \

    && git clone git://git.savannah.gnu.org/osip.git ./osip \

    && cd osip \

    && ./autogen.sh \

    && ./configure --prefix=/home/etsi \

vagrant/provisioner.bash

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ ln -sf /home/vagrant/dev/STF549_Ng112/scripts/devenv.bash.ubuntu /home/vagrant/d 


# Install osip

cd ${HOME_FRAMEWORKS}

git clone https://github.com/YannGarcia/osip.git ./osip 

git clone git://git.savannah.gnu.org/osip.git ./osip 

cd ./osip 

./autogen.sh 

./configure --prefix=/home/vagrant