Commit 50b768f2 authored by YannGarcia's avatar YannGarcia
Browse files

Enhance TLS support

parent 78962c1f

ccsrc/Protocols/Tcp/tcp_layer.cc

+10 −4
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ void tcp_layer::init() { 
  }



  parameter_set(use_connection_ASPs_name(), (!server_mode) ? "yes" : "no");

  loggers::get_instance().warning("tcp_layer::set_parameter: Limit to one simultanneous accepted connection (server_backlog == 1");

  loggers::get_instance().warning("tcp_layer::set_parameter: Limit to one simultanneous accepted connection (server_backlog == 1)");

  parameter_set(server_backlog_name(), "1"); // Limit to one simultanneous accepted connection 

  loggers::get_instance().log("tcp_layer::init: server_mode=%x", server_mode);

  set_server_mode(server_mode);
@@ -108,20 +108,26 @@ void tcp_layer::init() { 
    if (it != _params.cend()) {

      parameter_set(ssl_trustedCAlist_file_name(), it->second.c_str());

    } else {

      parameter_set(ssl_trustedCAlist_file_name(), "/home/yann/var/ssl/archive/yanngarcia.ddns.net/fullchain1.pem");

      // Use Let's Encrypt to generate your certificates

      // https://manpages.ubuntu.com/manpages/impish/en/man1/certbot.1.html

      loggers::get_instance().error("tcp_layer::set_parameter: Trusted CA list is required for TLS");

    }

    // Set additional certificates

    it = _params.find(params::privkey);

    if (it != _params.cend()) {

      parameter_set(ssl_private_key_file_name(), it->second.c_str());

    } else {

      parameter_set(ssl_private_key_file_name(), "/home/yann/var/ssl/archive/yanngarcia.ddns.net/privkey1.pem");

      // Use Let's Encrypt to generate your certificates

      // https://manpages.ubuntu.com/manpages/impish/en/man1/certbot.1.html

      loggers::get_instance().error("tcp_layer::set_parameter: Certificate private key is required for TLS");

    }

    it = _params.find(params::certificate);

    if (it != _params.cend()) {

      parameter_set(ssl_certificate_file_name(), it->second.c_str());

    } else {

      parameter_set(ssl_certificate_file_name(), "/home/yann/var/ssl/archive/yanngarcia.ddns.net/fullchain1.pem");

      // Use Let's Encrypt to generate your certificates

      // https://manpages.ubuntu.com/manpages/impish/en/man1/certbot.1.html

      loggers::get_instance().error("tcp_layer::set_parameter: Certificate is required for TLS");

    }

  }

  set_ttcn_buffer_usercontrol(false);

ccsrc/Protocols/UDP/udp_layer.hh

+0 −9
Original line number Diff line number Diff line
@@ -17,11 +17,6 @@ 


#include "layer.hh"



<<<<<<< HEAD

=======

#include "params.hh"



>>>>>>> Bug fixed on params type

using namespace std; // Required for isnan()

#include "Abstract_Socket.hh"
@@ -32,11 +27,7 @@ using namespace std; // Required for isnan() 
 * \brief  This class provides description of ITS UDP/IP protocol layer

 */

class udp_layer : public layer, public PORT {

<<<<<<< HEAD

  params             _params; //! Layer parameters

=======

  params             _params; //! Layer parameters

>>>>>>> Bug fixed on params type

  struct sockaddr_in _saddr;  //! Source socket address description

  struct sockaddr_in _daddr;  //! Destination socket address description

  bool               _reuse_incoming_source_adddress;