Commit 633a23d0 authored by garciay's avatar garciay
Browse files

Add work-around for PKI AdanpterControlPort and UpperTesterPort due to... 

Add work-around for PKI AdanpterControlPort and UpperTesterPort due to incomplete _BASE class declaration
parent 23f49acb

ccsrc/Ports/LibIts_ports/AdapterControlPort.cc

+2 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#include "IVIM_ports/AdapterControlPort_IVIM.partC"

#include "MapemSpatem_ports/AdapterControlPort_MapemSpatem.partC"

#include "SremSsem_ports/AdapterControlPort_SremSsem.partC"

#include "Pki_ports/AdapterControlPort_Pki.partC"

//#include "Pki_ports/AdapterControlPort_Pki.partC"

//#include "V2G_ports/AdapterControlPort_V2G.partC"



#else //_NO_SOFTLINKS_
@@ -20,7 +20,7 @@ 
#include "AdapterControlPort_MapemSpatem.partC"

#include "AdapterControlPort_SremSsem.partC"

#include "AdapterControlPort_GN.partC"

#include "AdapterControlPort_Pki.partC"

//#include "AdapterControlPort_Pki.partC"

/*

#include "AdapterControlPort_IVIM.partC"

#include "AdapterControlPort_MapemSpatem.partC"

ccsrc/Ports/LibIts_ports/AdapterControlPort.hh

+2 −2
Original line number Diff line number Diff line
@@ -6,24 +6,24 @@ 
#ifdef _NO_SOFTLINKS_

/* to be used when built without generating softlinks to the working directory */

//#include "CALM_ports/AdapterControlPort_CALM.partH"

#include "Pki_ports/AdapterControlPort_Pki.partH"

#include "CAM_ports/AdapterControlPort_CAM.partH"

#include "DENM_ports/AdapterControlPort_DENM.partH"

#include "GN_ports/AdapterControlPort_GN.partH"

#include "IVIM_ports/AdapterControlPort_IVIM.partH"

#include "MapemSpatem_ports/AdapterControlPort_MapemSpatem.partH"

#include "SremSsem_ports/AdapterControlPort_SremSsem.partH"

//#include "Pki_ports/AdapterControlPort_Pki.partH"

//#include "V2G_ports/AdapterControlPort_V2G.partH"



#else //_NO_SOFTLINKS_



#include "AdapterControlPort_Pki.partH"

#include "AdapterControlPort_CAM.partH"

#include "AdapterControlPort_DENM.partH"

#include "AdapterControlPort_IVIM.partH"

#include "AdapterControlPort_MapemSpatem.partH"

#include "AdapterControlPort_SremSsem.partH"

#include "AdapterControlPort_GN.partH"

//#include "AdapterControlPort_Pki.partH"

/*

#include "AdapterControlPort_IVIM.partH"

#include "AdapterControlPort_MapemSpatem.partH"

ccsrc/Ports/LibIts_ports/Pki_ports/AdapterControlPkiPort.cc

0 → 100644
+97 −0
Original line number Diff line number Diff line 
#include <TTCN3.hh>



#include "LibItsPki_TestSystem.hh"



#include "loggers.hh"

#include "registration.hh"



#include "pki_layer.hh"



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

namespace LibItsPki__TestSystem {



  AdapterControlPkiPort::AdapterControlPkiPort(const char *par_port_name)

    : AdapterControlPkiPort_BASE(par_port_name), _params()

  {

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





  }



  AdapterControlPkiPort::~AdapterControlPkiPort()

  {



  }



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

  {

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



  }



  /*void AdapterControlPkiPort::Handle_Fd_Event(int fd, boolean is_readable,

    boolean is_writable, boolean is_error) {}*/



  void AdapterControlPkiPort::Handle_Fd_Event_Error(int /*fd*/)

  {



  }



  void AdapterControlPkiPort::Handle_Fd_Event_Writable(int /*fd*/)

  {



  }



  void AdapterControlPkiPort::Handle_Fd_Event_Readable(int /*fd*/)

  {



  }



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



  void AdapterControlPkiPort::user_map(const char * system_port)

  {

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



  }



  void AdapterControlPkiPort::user_unmap(const char * system_port)

  {

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



  }



  void AdapterControlPkiPort::user_start()

  {



  }



  void AdapterControlPkiPort::user_stop()

  {



  }



  void AdapterControlPkiPort::outgoing_send(const LibItsPki__TypesAndValues::AcPkiPrimitive& send_par)

  {

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

    

    // Register this object for AdapterControlPkiPort

    pki_layer* p = registration<pki_layer>::get_instance().get_item(std::string("PKI"));

    if (p != NULL) {

      loggers::get_instance().log("AdapterControlPkiPort::outgoing_send: Got PKI layer %p", p);

      LibItsPki__TypesAndValues::AcPkiResponse response;

      response.result() = BOOLEAN(false);

      if (send_par.ischosen(LibItsPki__TypesAndValues::AcPkiPrimitive::ALT_acSetSecurityData)) {

        loggers::get_instance().log("AdapterControlPkiPort::outgoing_send: AcSetSecurityData");

        p->set_pki_keys(send_par.acSetSecurityData());

        response.result() = BOOLEAN(true);

      }

      // Send response

      loggers::get_instance().log_msg("AdapterControlPkiPort::outgoing_send: Send response: ", response);

      incoming_message(response);

    } else {

      loggers::get_instance().error("AdapterControlPkiPort::outgoing_send: pkiPort not registered");

    }

  }



} /* end of namespace */

ccsrc/Ports/LibIts_ports/Pki_ports/AdapterControlPkiPort.hh

0 → 100644
+41 −0
Original line number Diff line number Diff line 
//=============================================================================

#include "LibItsPki_TestSystem.hh"



#include "params.hh"



namespace LibItsPki__TypesAndValues {

  class AcPkiPrimitive;

}



namespace LibItsPki__TestSystem {



class AdapterControlPkiPort : public AdapterControlPkiPort_BASE {

  params _params;

	

public:

	AdapterControlPkiPort(const char *par_port_name = NULL);

	~AdapterControlPkiPort();



	void set_parameter(const char *parameter_name,

		const char *parameter_value);



private:

	/* void Handle_Fd_Event(int fd, boolean is_readable,

		boolean is_writable, boolean is_error); */

	void Handle_Fd_Event_Error(int fd);

	void Handle_Fd_Event_Writable(int fd);

	void Handle_Fd_Event_Readable(int fd);

	/* void Handle_Timeout(double time_since_last_call); */

protected:

	void user_map(const char *system_port);

	void user_unmap(const char *system_port);



	void user_start();

	void user_stop();



	void outgoing_send(const LibItsPki__TypesAndValues::AcPkiPrimitive& send_par);

	

};



} /* end of namespace */

ccsrc/Ports/LibIts_ports/Pki_ports/UpperTesterPkiPort.cc

0 → 100644
+124 −0
Original line number Diff line number Diff line 
#include <TTCN3.hh>



#include "LibItsPki_TestSystem.hh"



#include "loggers.hh"



#include "uppertester_pki_layer_factory.hh"

#include "uppertester_pki_layer.hh"



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

namespace LibItsPki__TestSystem {



  UpperTesterPkiPort::UpperTesterPkiPort(const char *par_port_name)

    : UpperTesterPkiPort_BASE(par_port_name), _cfg_params(), _layer_params(), _layer(NULL), _time_key("UpperTesterPkiPort_Pki::outgoing_send")

  {

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

  }



  UpperTesterPkiPort::~UpperTesterPkiPort()

  {

    if (_layer != NULL) {

      delete _layer;

    }

  }



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

  {

    loggers::get_instance().log("UpperTesterPkiPort_Pki::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 UpperTesterPkiPort::Handle_Fd_Event(int fd, boolean is_readable,

    boolean is_writable, boolean is_error) {}*/



  void UpperTesterPkiPort::Handle_Fd_Event_Error(int /*fd*/)

  {



  }



  void UpperTesterPkiPort::Handle_Fd_Event_Writable(int /*fd*/)

  {



  }



  void UpperTesterPkiPort::Handle_Fd_Event_Readable(int /*fd*/)

  {



  }



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



  void UpperTesterPkiPort::user_map(const char * system_port)

  {

    loggers::get_instance().log(">>> UpperTesterPkiPort_Pki::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("UpperTesterPkiPort_Pki::user_map: %s", it->second.c_str());

      _layer = layer_stack_builder::get_instance()->create_layer_stack(it->second.c_str());

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

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

      }

      static_cast<uppertester_pki_layer *>(_layer)->add_upper_port(this);

    } else {

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

    }

  }



  void UpperTesterPkiPort::user_unmap(const char * system_port)

  {

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

    if (_layer != NULL) {

      delete _layer;

      _layer = NULL;

    }



  }



  void UpperTesterPkiPort::user_start()

  {



  }



  void UpperTesterPkiPort::user_stop()

  {



  }



  void UpperTesterPkiPort::outgoing_send(const LibItsPki__TypesAndValues::UtPkiInitialize& send_par)

  {

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

    

    float duration;

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

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

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

  }



  void UpperTesterPkiPort::outgoing_send(const LibItsPki__TypesAndValues::UtPkiTrigger& send_par)

  {

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

    

    float duration;

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

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

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

  }



  void UpperTesterPkiPort::receiveMsg (const Base_Type& p_ind, const params& p_params) {

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

    // Sanity check

    if (!p_ind.is_bound()) {

      return;

    }



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

      incoming_message(static_cast<const LibItsPki__TypesAndValues::UtPkiResults&>(p_ind));

    } else {

      loggers::get_instance().warning("UpperTesterPkiPort_Pki::receive_msg: Message not processed: %s", p_ind.get_descriptor()->name);

    }

  }



} /* end of namespace */