ccsrc/Ports/LibIts_ports/IVIM_ports/AdapterControlPort_IVIM.partH → ccsrc/Ports/LibIts_ports/IVIM_ports/AdapterControlPort_IVIM.hh

 //=============================================================================
+#ifndef AdapterControlPort_IVIM_HH
+#define AdapterControlPort_IVIM_HH
+
 #include "LibItsIvim_TestSystem.hh"
 
 namespace LibItsIvim__TestSystem {
@@ -32,3 +35,4 @@ protected:
 };
 
 } // end of namespace
+#endif

ccsrc/Ports/LibIts_ports/IVIM_ports/UpperTesterPort_IVIM.partC → ccsrc/Ports/LibIts_ports/IVIM_ports/UpperTesterPort_IVIM.cc

 #include "uppertester_ivim_factory.hh"
 
 #include "loggers.hh"
-
+#include "UpperTesterPort_IVIM.hh"
 //=============================================================================
 namespace LibItsIvim__TestSystem {
 

ccsrc/Ports/LibIts_ports/IVIM_ports/UpperTesterPort_IVIM.partH → ccsrc/Ports/LibIts_ports/IVIM_ports/UpperTesterPort_IVIM.hh

 //=============================================================================
+#ifndef UpperTesterPort_IVIM_HH
+#define UpperTesterPort_IVIM_HH
+
+#include "layer.hh"
+#include "params.hh"
+
 #include "LibItsIvim_TestSystem.hh"
 namespace LibItsIvim__TestSystem {
 
@@ -42,3 +48,4 @@ protected:
 };
 
 } /* end of namespace */
+#endif
\ No newline at end of file

ccsrc/Ports/LibIts_ports/IVIM_ports/module.mk

+sources := AdapterControlPort_IVIM.cc IvimPort.cc UpperTesterPort_IVIM.cc 
+includes := .
+

ccsrc/Ports/LibIts_ports/MapemSpatem_ports/AdapterControlPort_MapemSpatem.partC → ccsrc/Ports/LibIts_ports/MapemSpatem_ports/AdapterControlPort_MapemSpatem.cc

@@ -4,6 +4,7 @@
 #include "mapem_spatem_layer.hh"
 
 //=============================================================================
+#include "AdapterControlPort_MapemSpatem.hh"
 namespace LibItsMapemSpatem__TestSystem {
 
 AdapterControlPort::AdapterControlPort(const char *par_port_name)

ccsrc/Ports/LibIts_ports/MapemSpatem_ports/AdapterControlPort_MapemSpatem.partH → ccsrc/Ports/LibIts_ports/MapemSpatem_ports/AdapterControlPort_MapemSpatem.hh

 //=============================================================================
+#ifndef AdapterControlPort_MapemSpatem_HH
+#define AdapterControlPort_MapemSpatem_HH
+
 #include "LibItsMapemSpatem_TestSystem.hh"
 
 namespace LibItsMapemSpatem__TestSystem {
@@ -30,3 +33,4 @@ protected:
 };
 
 } // end of namespace
+#endif

ccsrc/Ports/LibIts_ports/MapemSpatem_ports/UpperTesterPort_MapemSpatem.partC → ccsrc/Ports/LibIts_ports/MapemSpatem_ports/UpperTesterPort_MapemSpatem.cc

 #include "uppertester_mapem_spatem_factory.hh"
 
 #include "loggers.hh"
-
+#include "UpperTesterPort_MapemSpatem.hh"
 //=============================================================================
 namespace LibItsMapemSpatem__TestSystem {
 

ccsrc/Ports/LibIts_ports/MapemSpatem_ports/UpperTesterPort_MapemSpatem.partH → ccsrc/Ports/LibIts_ports/MapemSpatem_ports/UpperTesterPort_MapemSpatem.hh

 //=============================================================================
+#ifndef UpperTesterPort_MapemSpatem_HH
+#define UpperTesterPort_MapemSpatem_HH
+
 #include "LibItsMapemSpatem_TestSystem.hh"
+
+#include "layer.hh"
+#include "params.hh"
+
 namespace LibItsMapemSpatem__TestSystem {
 
 class UpperTesterPort : public UpperTesterPort_BASE {
@@ -37,3 +44,4 @@ protected:
 };
 
 } /* end of namespace */
+#endif

ccsrc/Ports/LibIts_ports/MapemSpatem_ports/module.mk

+sources := AdapterControlPort_MapemSpatem.cc MapemSpatemPort.cc UpperTesterPort_MapemSpatem.cc 
+includes := .
+

ccsrc/Ports/LibIts_ports/Pki_ports/AdapterControlPort_Pki.partC → ccsrc/Ports/LibIts_ports/Pki_ports/AdapterControlPort_Pki.cc

@@ -3,8 +3,7 @@
 #include "loggers.hh"
 #include "registration.hh"
 
-//#include "pki_layer.hh"
-
+#include "AdapterControlPort_Pki.hh"
 //=============================================================================
 namespace LibItsPki__TestSystem {
 

ccsrc/Ports/LibIts_ports/Pki_ports/AdapterControlPort_Pki.partH → ccsrc/Ports/LibIts_ports/Pki_ports/AdapterControlPort_Pki.hh

 //=============================================================================
+#ifndef AdapterControlPort_Pki_HH
+#define AdapterControlPort_Pki_HH
+
 #include "LibItsPki_TestSystem.hh"
 
 #include "params.hh"
@@ -34,3 +37,4 @@ protected:
 };
 
 } /* end of namespace */
+#endif
\ No newline at end of file

ccsrc/Ports/LibIts_ports/Pki_ports/UpperTesterPkiPort.cc

 #include <TTCN3.hh>
 
-#include "LibItsPki_TestSystem.hh"
+#include "UpperTesterPkiPort.hh"
 
 #include "loggers.hh"
 

ccsrc/Ports/LibIts_ports/Pki_ports/UpperTesterPort_Pki.partC

-#include "uppertester_pki_layer_factory.hh"
-
-#include "loggers.hh"
-
-//=============================================================================
-namespace LibItsPki__TestSystem {
-
-  UpperTesterPort::UpperTesterPort(const char *par_port_name)
-    : UpperTesterPort_BASE(par_port_name), _cfg_params(), _layer_params(), _layer(NULL), _time_key("UpperTesterPort_Pki::outgoing_send")
-  {
-    loggers::get_instance().log("UpperTesterPort_Pki::UpperTesterPort_Pki");
-  }
-
-  UpperTesterPort::~UpperTesterPort()
-  {
-    if (_layer != NULL) {
-      delete _layer;
-    }
-  }
-
-  void UpperTesterPort::set_parameter(const char * parameter_name, const char * parameter_value)
-  {
-    loggers::get_instance().log("UpperTesterPort_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 UpperTesterPort::Handle_Fd_Event(int fd, boolean is_readable,
-    boolean is_writable, boolean is_error) {}*/
-
-  void UpperTesterPort::Handle_Fd_Event_Error(int /*fd*/)
-  {
-
-  }
-
-  void UpperTesterPort::Handle_Fd_Event_Writable(int /*fd*/)
-  {
-
-  }
-
-  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)
-  {
-    loggers::get_instance().log(">>> UpperTesterPort_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("UpperTesterPort_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("UpperTesterPort_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("UpperTesterPort_Pki::user_map: No layers defined in configuration file");
-    }
-  }
-
-  void UpperTesterPort::user_unmap(const char * system_port)
-  {
-    loggers::get_instance().log(">>> UpperTesterPort_Pki::user_unmap: %s", system_port);
-    if (_layer != NULL) {
-      delete _layer;
-      _layer = NULL;
-    }
-
-  }
-
-  void UpperTesterPort::user_start()
-  {
-
-  }
-
-  void UpperTesterPort::user_stop()
-  {
-
-  }
-
-  void UpperTesterPort::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 UpperTesterPort::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 UpperTesterPort::receiveMsg (const Base_Type& p_ind, const params& p_params) {
-    loggers::get_instance().log_msg(">>> UpperTesterPort_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("UpperTesterPort_Pki::receive_msg: Message not processed: %s", p_ind.get_descriptor()->name);
-    }
-  }
-
-} /* end of namespace */

ccsrc/Ports/LibIts_ports/Pki_ports/UpperTesterPort_Pki.partH

-#include "layer.hh"
-#include "params.hh"
-
-//=============================================================================
-#include "LibItsPki_TestSystem.hh"
-namespace LibItsPki__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();
-
-    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); */
-    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::UtPkiInitialize& send_par);
-	
-    void outgoing_send(const LibItsPki__TypesAndValues::UtPkiTrigger& send_par);
-	
-  };
-
-} /* end of namespace */

ccsrc/Ports/LibIts_ports/Pki_ports/module.mk

+sources := UpperTesterPkiPort.cc 
+includes := .
+

ccsrc/Ports/LibIts_ports/RSUsSimulator_ports/module.mk

+sources := ConfigRsuSimulatorCodec.cc ConfigRsuSimulatorLayer.cc ConfigRsuSimulatorPort.cc 
+includes := .
+

ccsrc/Ports/LibIts_ports/Rtcmem_ports/AdapterControlPort_Rtcmem.partC → ccsrc/Ports/LibIts_ports/Rtcmem_ports/AdapterControlPort_Rtcmem.cc

@@ -3,6 +3,7 @@
 
 #include "RtcmemLayer.hh"
 
+#include "AdapterControlPort_Rtcmem.hh"
 //=============================================================================
 namespace LibItsRtcmem__TestSystem {
 

ccsrc/Ports/LibIts_ports/Rtcmem_ports/AdapterControlPort_Rtcmem.partH → ccsrc/Ports/LibIts_ports/Rtcmem_ports/AdapterControlPort_Rtcmem.hh

+#ifndef AdapterControlPort_Rtcmem_HH
+#define AdapterControlPort_Rtcmem_HH
+
 //=============================================================================
 #include "LibItsRtcmem_TestSystem.hh"
 
@@ -30,3 +33,5 @@ protected:
 };
 
 } // end of namespace
+
+#endif

ccsrc/Ports/LibIts_ports/Rtcmem_ports/UpperTesterPort_Rtcmem.partC → ccsrc/Ports/LibIts_ports/Rtcmem_ports/UpperTesterPort_Rtcmem.cc

 #include "UpperTesterRtcmemFactory.hh"
 
 #include "loggers.hh"
-
+#include "UpperTesterPort_Rtcmem.hh"
 //=============================================================================
 namespace LibItsRtcmem__TestSystem {
 

ccsrc/Ports/LibIts_ports/Rtcmem_ports/UpperTesterPort_Rtcmem.partH → ccsrc/Ports/LibIts_ports/Rtcmem_ports/UpperTesterPort_Rtcmem.hh

+#ifndef UpperTesterPort_Rtcmem_HH
+#define UpperTesterPort_Rtcmem_HH
+
+#include "layer.hh"
+#include "params.hh"
+
 //=============================================================================
 #include "LibItsRtcmem_TestSystem.hh"
 namespace LibItsRtcmem__TestSystem {
@@ -42,3 +48,5 @@ protected:
 };
 
 } /* end of namespace */
+
+#endif