Mercurial > irccd
changeset 540:d0e874fe2ef7
Irccd: fix WITH_SSL=Off
| author | David Demelier <markand@malikania.fr> |
|---|---|
| date | Mon, 20 Nov 2017 19:32:41 +0100 |
| parents | 63f504283797 |
| children | 1c2598716ffc |
| files | libirccd/irccd/transport_client.hpp libirccd/irccd/transport_server.cpp libirccd/irccd/transport_server.hpp |
| diffstat | 3 files changed, 24 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libirccd/irccd/transport_client.hpp Mon Nov 20 19:20:21 2017 +0100 +++ b/libirccd/irccd/transport_client.hpp Mon Nov 20 19:32:41 2017 +0100 @@ -19,6 +19,8 @@ #ifndef IRCCD_TRANSPORT_CLIENT_HPP #define IRCCD_TRANSPORT_CLIENT_HPP +#include "sysconfig.hpp" + #include <deque> #include <memory> #include <functional> @@ -26,7 +28,10 @@ #include <utility> #include <boost/asio.hpp> -#include <boost/asio/ssl.hpp> + +#if defined(HAVE_SSL) +# include <boost/asio/ssl.hpp> +#endif #include "json.hpp" @@ -334,6 +339,8 @@ }); } +#if defined(HAVE_SSL) + /** * \brief Secure layer client. */ @@ -354,6 +361,8 @@ } }; +#endif // !HAVE_SSL + } // !irccd #endif // !IRCCD_TRANSPORT_CLIENT_HPP
--- a/libirccd/irccd/transport_server.cpp Mon Nov 20 19:20:21 2017 +0100 +++ b/libirccd/irccd/transport_server.cpp Mon Nov 20 19:32:41 2017 +0100 @@ -102,6 +102,8 @@ }); } +#if defined(HAVE_SSL) + void tls_transport_server::do_handshake(std::shared_ptr<tls_transport_client> client, accept_t handler) { client->socket().async_handshake(boost::asio::ssl::stream_base::server, [client, handler] (auto code) { @@ -130,4 +132,6 @@ }); } +#endif // !HAVE_SSL + } // !irccd
--- a/libirccd/irccd/transport_server.hpp Mon Nov 20 19:20:21 2017 +0100 +++ b/libirccd/irccd/transport_server.hpp Mon Nov 20 19:32:41 2017 +0100 @@ -19,6 +19,8 @@ #ifndef IRCCD_TRANSPORT_SERVER_HPP #define IRCCD_TRANSPORT_SERVER_HPP +#include "sysconfig.hpp" + #include <cassert> #include <functional> #include <memory> @@ -26,7 +28,10 @@ #include <type_traits> #include <boost/asio.hpp> -#include <boost/asio/ssl.hpp> + +#if defined(HAVE_SSL) +# include <boost/asio/ssl.hpp> +#endif #include "transport_client.hpp" @@ -208,6 +213,8 @@ #endif // !_WIN32 +#if defined(HAVE_SSL) + /** * \brief Secure layer implementation. */ @@ -239,6 +246,8 @@ tls_transport_server(acceptor_t acceptor, context_t context); }; +#endif // !HAVE_SSL + } // !irccd #endif // !IRCCD_TRANSPORT_SERVER_HPP