Commit a239bb00 authored by garciay's avatar garciay
Browse files

ASN.1 Changes due to latest asn1c github version 

Enhance UdpLayer
Bug fixed on CAM/DENM/BTP layers (TODO GeoNetworking LAYER)
Validation basic test cases for CAM/DENM/GeoNetworking
parent 4c8243dc

ccsrc/Asn1c/Asn1cEncDec.cc

+11 −17
Original line number Diff line number Diff line
@@ -107,16 +107,9 @@ BITSTRING asn1c2titan(const BIT_STRING_t& a) { 


extern "C" int asn1c_collect_encoded_data(const void *buffer, size_t size, void *application_specific_key)

{

	unsigned char* ptr;

	size_t s = size;

	TTCN_Buffer * tb = (TTCN_Buffer *)application_specific_key;

  tb->put_s(size, (unsigned char *)buffer);

  loggers::get_instance().log_to_hexa("asn1c_collect_encoded_data: Encoding=", *tb);

	/*tb->get_end(ptr, s);

	if(s >= size){

		memcpy(ptr, buffer, size);

		tb->increase_length(size);

    }*/

	return 0;

}
@@ -139,7 +132,7 @@ int asn1c_per2ber(asn_TYPE_descriptor_t &td, const TTCN_Buffer & per, TTCN_Buffe 
		asn_enc_rval_t rc_e;

		ber.clear();

		rc_e = der_encode(&td,

			ctx, 

                      (const asn_per_constraints_t*)ctx,

                      asn1c_collect_encoded_data,

                      &ber);

		rc = rc_e.encoded;
@@ -163,6 +156,7 @@ int asn1c_ber2per(asn_TYPE_descriptor_t &td, const TTCN_Buffer & ber, TTCN_Buffe 
		asn_enc_rval_t rc_e;

		//per.clear();

		rc_e = uper_encode(&td,

                       NULL,

                       ctx, 

                       asn1c_collect_encoded_data,

                       &per);

ccsrc/Framework/Params.hh

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ public: 
  static const std::string& longitude;

  static const std::string& expiry;

  

  static const std::string& packetize; /** Indicate to the lower layer to build packet */

  

  Params() : std::map<std::string, std::string>() {};

  Params(const Params& p_params) : std::map<std::string, std::string>(p_params.begin(), p_params.end()) {};

ccsrc/Framework/src/Params.cc

+1 −1
Original line number Diff line number Diff line
@@ -28,9 +28,9 @@ const std::string& Params::longitude = std::string("longitude"); 
const std::string& Params::ll_address = std::string("ll_address");

const std::string& Params::expiry = std::string("expiry");



const std::string& Params::packetize = std::string("packetize");



void Params::convert(Params& p_param, const std::string p_parameters) {

  //loggers::get_instance().log(">>> Params::convert: '%s'", p_parameters.c_str());

  // Sanity checks

  if (p_parameters.length() == 0) {

    return;

ccsrc/Ports/LibIts_ports/CAM_ports/UpperTesterPort_CAM.partC

+132 −81
Original line number Diff line number Diff line 
#include "UpperTesterCamLayer.hh"

#include "loggers.hh"



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

namespace LibItsCam__TestSystem {



  UpperTesterPort::UpperTesterPort(const char *par_port_name)

	: UpperTesterPort_BASE(par_port_name)

    : UpperTesterPort_BASE(par_port_name), _cfg_params(), _layer_params(), _layer(NULL), _time_key("UpperTesterPort_Cam::outgoing_send")

  {



    loggers::get_instance().log("UpperTesterPort_Cam::UpperTesterPort_Cam");

  }



  UpperTesterPort::~UpperTesterPort()

  {



    if (_layer != NULL) {

      delete _layer;

    }

  }



void UpperTesterPort::set_parameter(const char * /*parameter_name*/,

	const char * /*parameter_value*/)

  void UpperTesterPort::set_parameter(const char * parameter_name, const char * parameter_value)

  {



    loggers::get_instance().log("UpperTesterPort_Cam::set_parameter: %s=%s", parameter_name, parameter_value);

    _cfg_params.insert(std::pair<std::string, std::string>(std::string(parameter_name), std::string(parameter_value)));

    _cfg_params.log();

  }



  /*void UpperTesterPort::Handle_Fd_Event(int fd, boolean is_readable,
@@ -38,13 +44,30 @@ void UpperTesterPort::Handle_Fd_Event_Readable(int /*fd*/) 


  /*void UpperTesterPort::Handle_Timeout(double time_since_last_call) {}*/



void UpperTesterPort::user_map(const char * /*system_port*/)

  void UpperTesterPort::user_map(const char * system_port)

  {



    loggers::get_instance().log(">>> UpperTesterPort_Cam::user_map: %s", system_port);

    // Build layer stack

    Params::iterator it = _cfg_params.find(std::string("params"));

    if (it != _cfg_params.end()) {

      loggers::get_instance().log("UpperTesterPort_Cam::user_map: %s", it->second.c_str());

      _layer = LayerStackBuilder::GetInstance()->createLayerStack(it->second.c_str());

      if (static_cast<UpperTesterCamLayer *>(_layer) == NULL) {

        loggers::get_instance().error("UpperTesterPort_Cam::user_map: Invalid stack configuration: %s", it->second.c_str());

      }

      static_cast<UpperTesterCamLayer *>(_layer)->addUpperPort(this);

    } else {

      loggers::get_instance().error("UpperTesterPort_Cam::user_map: No layers defined in configuration file");

    }

  }



void UpperTesterPort::user_unmap(const char * /*system_port*/)

  void UpperTesterPort::user_unmap(const char * system_port)

  {

    loggers::get_instance().log(">>> UpperTesterPort_Cam::user_unmap: %s", system_port);

    if (_layer != NULL) {

      delete _layer;

      _layer = NULL;

    }



  }
@@ -58,19 +81,34 @@ void UpperTesterPort::user_stop() 


  }



void UpperTesterPort::outgoing_send(const LibItsCam__TypesAndValues::UtCamInitialize& /*send_par*/)

  void UpperTesterPort::outgoing_send(const LibItsCam__TypesAndValues::UtCamInitialize& send_par)

  {

    loggers::get_instance().log_msg(">>> UppertesterPort::outgoing_send: ", send_par);

    

    float duration;

    loggers::get_instance().set_start_time(_time_key);

    static_cast<UpperTesterCamLayer *>(_layer)->sendMsg(send_par, _layer_params);

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

  }



void UpperTesterPort::outgoing_send(const LibItsCam__TypesAndValues::UtCamTrigger& /*send_par*/)

  void UpperTesterPort::outgoing_send(const LibItsCam__TypesAndValues::UtCamChangePosition& send_par)

  {

    loggers::get_instance().log_msg(">>> UppertesterPort::outgoing_send: ", send_par);

    

    float duration;

    loggers::get_instance().set_start_time(_time_key);

    static_cast<UpperTesterCamLayer *>(_layer)->sendMsg(send_par, _layer_params);

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

  }



void UpperTesterPort::outgoing_send(const LibItsCam__TypesAndValues::UtCamChangePosition& /*send_par*/)

  void UpperTesterPort::outgoing_send(const LibItsCam__TypesAndValues::UtCamTrigger& send_par)

  {

    loggers::get_instance().log_msg(">>> UppertesterPort::outgoing_send: ", send_par);

    

    float duration;

    loggers::get_instance().set_start_time(_time_key);

    static_cast<UpperTesterCamLayer *>(_layer)->sendMsg(send_par, _layer_params);

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

  }



  void UpperTesterPort::outgoing_send(const LibItsCam__TypesAndValues::UtActivatePositionTime& /*send_par*/)
@@ -83,4 +121,17 @@ void UpperTesterPort::outgoing_send(const LibItsCam__TypesAndValues::UtDeactivat 


  }



  void UpperTesterPort::receiveMsg (const Base_Type& p_ind, const Params& p_params) {

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

    // Sanity check

    if (!p_ind.is_bound()) {

      return;

    }



    loggers::get_instance().log("UpperTesterPort_Cam::receive_msg: %s", p_ind.get_descriptor()->name);

    if (std::string(p_ind.get_descriptor()->name).compare("@LibItsCam_TypesAndValues.UtCamResults") == 0) { // TODO To be refined

      incoming_message((LibItsCam__TypesAndValues::UtCamResults&)p_ind);

    } // TODO Implement UtCamEventInd part

  }



} /* end of namespace */

ccsrc/Ports/LibIts_ports/CAM_ports/UpperTesterPort_CAM.partH

+37 −27
Original line number Diff line number Diff line 
#include "Layer.hh"

#include "Params.hh"



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

#include "LibItsCam_TestSystem.hh"

namespace LibItsCam__TestSystem {



  class UpperTesterPort : public UpperTesterPort_BASE {

    Params _cfg_params;

    Params _layer_params;

    Layer * _layer;

    std::string _time_key;

    

  public:

    UpperTesterPort(const char *par_port_name = NULL);

    ~UpperTesterPort();
@@ -10,6 +18,8 @@ public: 
    void set_parameter(const char *parameter_name,

                       const char *parameter_value);



    void receiveMsg (const Base_Type&, const Params&);



  private:

    /* void Handle_Fd_Event(int fd, boolean is_readable,

       boolean is_writable, boolean is_error); */
@@ -26,10 +36,10 @@ protected: 


    void outgoing_send(const LibItsCam__TypesAndValues::UtCamInitialize& send_par);

	

	void outgoing_send(const LibItsCam__TypesAndValues::UtCamTrigger& send_par);

	

    void outgoing_send(const LibItsCam__TypesAndValues::UtCamChangePosition& send_par);

	

    void outgoing_send(const LibItsCam__TypesAndValues::UtCamTrigger& send_par);

	

    void outgoing_send(const LibItsCam__TypesAndValues::UtActivatePositionTime& send_par);

  

    void outgoing_send(const LibItsCam__TypesAndValues::UtDeactivatePositionTime& send_par);