Commit 8b48620c authored by Yann Garcia's avatar Yann Garcia
Browse files

Review Pki Layer

parent 7e84e60a

ccsrc/Ports/LibIts_ports/AdapterControlPort.cc

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

#include "IVIM_ports/AdapterControlPort_IVIM.partC"

#include "MapemSpatem_ports/AdapterControlPort_MapemSpatem.partC"

#include "MapemSpatem_ports/AdapterControlPort_MapemSpatem.partC"

#include "SremSsem_ports/AdapterControlPort_SremSsem.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"

//#include "V2G_ports/AdapterControlPort_V2G.partC"





#else //_NO_SOFTLINKS_

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

#include "AdapterControlPort_MapemSpatem.partC"

#include "AdapterControlPort_SremSsem.partC"

#include "AdapterControlPort_SremSsem.partC"

#include "AdapterControlPort_GN.partC"

#include "AdapterControlPort_GN.partC"

//#include "AdapterControlPort_Pki.partC"

#include "AdapterControlPort_Pki.partC"

/*

/*

#include "AdapterControlPort_IVIM.partC"

#include "AdapterControlPort_IVIM.partC"

#include "AdapterControlPort_MapemSpatem.partC"

#include "AdapterControlPort_MapemSpatem.partC"

ccsrc/Ports/LibIts_ports/AdapterControlPort.hh

+2 −2
Original line number Original line Diff line number Diff line
@@ -9,7 +9,7 @@ 
#include "CAM_ports/AdapterControlPort_CAM.partH"

#include "CAM_ports/AdapterControlPort_CAM.partH"

#include "DENM_ports/AdapterControlPort_DENM.partH"

#include "DENM_ports/AdapterControlPort_DENM.partH"

#include "GN_ports/AdapterControlPort_GN.partH"

#include "GN_ports/AdapterControlPort_GN.partH"

//#include "Pki_ports/AdapterControlPort_Pki.partH"

#include "Pki_ports/AdapterControlPort_Pki.partH"

#include "IVIM_ports/AdapterControlPort_IVIM.partH"

#include "IVIM_ports/AdapterControlPort_IVIM.partH"

#include "MapemSpatem_ports/AdapterControlPort_MapemSpatem.partH"

#include "MapemSpatem_ports/AdapterControlPort_MapemSpatem.partH"

#include "SremSsem_ports/AdapterControlPort_SremSsem.partH"

#include "SremSsem_ports/AdapterControlPort_SremSsem.partH"
@@ -23,7 +23,7 @@ 
#include "AdapterControlPort_MapemSpatem.partH"

#include "AdapterControlPort_MapemSpatem.partH"

#include "AdapterControlPort_SremSsem.partH"

#include "AdapterControlPort_SremSsem.partH"

#include "AdapterControlPort_GN.partH"

#include "AdapterControlPort_GN.partH"

//#include "AdapterControlPort_Pki.partH"

#include "AdapterControlPort_Pki.partH"

/*

/*

#include "AdapterControlPort_IVIM.partH"

#include "AdapterControlPort_IVIM.partH"

#include "AdapterControlPort_MapemSpatem.partH"

#include "AdapterControlPort_MapemSpatem.partH"

ccsrc/Ports/LibIts_ports/Pki_ports/AdapterControlPort_Pki.partC

+11 −26
Original line number Original line Diff line number Diff line
@@ -69,41 +69,26 @@ namespace LibItsPki__TestSystem { 




  }

  }





  void AdapterControlPort::outgoing_send(const LibItsPki__TypesAndValues::AcGnPrimitive& send_par)

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

  {

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



  }



  void AdapterControlPort::outgoing_send(const LibItsCommon__TypesAndValues::AcSecPrimitive& send_par)

  {

  {

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

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

    

    

    // Register this object for AdapterControlPort

    // Register this object for AdapterControlPort

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

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

    if (p != NULL) {

    if (p != NULL) {

      loggers::get_instance().log("AdapterControlPort::outgoing_send: Got HTTP layer %p", p);

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

      LibItsCommon__TypesAndValues::AdapterControlResults response;

      LibItsPki__TypesAndValues::AcPkiResponse response;

      response.acSecResponse() = BOOLEAN(true);

      response.result() = LibItsPki__TypesAndValues::AcPkiResponse(BOOLEAN(false));

      if (send_par.ischosen(LibItsCommon__TypesAndValues::AcSecPrimitive::ALT_acEnableSecurity)) {

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

        loggers::get_instance().log("AdapterControlPort::outgoing_send: Enable secured mode");

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

        std::string str(static_cast<const char*>(send_par.acEnableSecurity().certificateId()));

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

        if (p->enable_secured_mode(str, send_par.acEnableSecurity().enforceSecurity()) == -1) {

        response.result() = LibItsPki__TypesAndValues::AcPkiResponse(BOOLEAN(true));

          response.acSecResponse() = BOOLEAN(false);

        }

      } else if (send_par.ischosen(LibItsCommon__TypesAndValues::AcSecPrimitive::ALT_acDisableSecurity)) {

        loggers::get_instance().log("AdapterControlPort::outgoing_send: Disable secured mode");

        if (p->disable_secured_mode() == -1) {

          response.acSecResponse() = BOOLEAN(false);

        }

      } else {

        response.acSecResponse() = BOOLEAN(false);

      }

      }

      // Send response

      // Send response

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

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

      incoming_message(response);

      incoming_message(response);

    } else {

    } else {

      loggers::get_instance().error("AdapterControlPort::outgoing_send: %s not registered", "geoNetworkingPort");

      loggers::get_instance().error("AdapterControlPort::outgoing_send: %s not registered", "pkiPort");

    }

    }

  }

  }

ccsrc/Ports/LibIts_ports/Pki_ports/AdapterControlPort_Pki.partH

+1 −3
Original line number Original line Diff line number Diff line
@@ -29,9 +29,7 @@ protected: 
	void user_start();

	void user_start();

	void user_stop();

	void user_stop();





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

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

	

    void outgoing_send(const LibItsCommon__TypesAndValues::AcSecPrimitive& send_par);

	

	

};

};

ccsrc/Ports/LibIts_ports/Pki_ports/PkiPort.cc

+0 −1
Original line number Original line Diff line number Diff line
@@ -16,7 +16,6 @@ namespace LibItsPki__TestSystem { 
  PkiPort::PkiPort(const char *par_port_name)

  PkiPort::PkiPort(const char *par_port_name)

    : PkiPort_BASE(par_port_name), _cfg_params(), _layer_params(), _layer(nullptr), _time_key("PkiPort::outgoing_send") {

    : PkiPort_BASE(par_port_name), _cfg_params(), _layer_params(), _layer(nullptr), _time_key("PkiPort::outgoing_send") {

    // Nothing to do

    // Nothing to do

    

  }

  }





  PkiPort::~PkiPort()

  PkiPort::~PkiPort()