From: Attila Molnar Date: Thu, 5 Mar 2015 16:28:51 +0000 (+0100) Subject: m_ssl_gnutls Pass client/server role to GnuTLSIOHook constructor as a GNUTLS_* constant X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=a881ff7a322aa8307dc8152206f27c4fd29281cd;p=user%2Fhenk%2Fcode%2Finspircd.git m_ssl_gnutls Pass client/server role to GnuTLSIOHook constructor as a GNUTLS_* constant --- diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp index 0bc7060b8..12a776b06 100644 --- a/src/modules/extra/m_ssl_gnutls.cpp +++ b/src/modules/extra/m_ssl_gnutls.cpp @@ -870,13 +870,13 @@ info_done_dealloc: } public: - GnuTLSIOHook(IOHookProvider* hookprov, StreamSocket* sock, bool outbound, const reference& sslprofile) + GnuTLSIOHook(IOHookProvider* hookprov, StreamSocket* sock, inspircd_gnutls_session_init_flags_t flags, const reference& sslprofile) : SSLIOHook(hookprov) , sess(NULL) , status(ISSL_NONE) , profile(sslprofile) { - gnutls_init(&sess, outbound ? GNUTLS_SERVER : GNUTLS_CLIENT); + gnutls_init(&sess, flags); gnutls_transport_set_ptr(sess, reinterpret_cast(sock)); gnutls_transport_set_push_function(sess, gnutls_push_wrapper); gnutls_transport_set_pull_function(sess, gnutls_pull_wrapper); @@ -1027,12 +1027,12 @@ class GnuTLSIOHookProvider : public refcountbase, public IOHookProvider void OnAccept(StreamSocket* sock, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) CXX11_OVERRIDE { - new GnuTLSIOHook(this, sock, true, profile); + new GnuTLSIOHook(this, sock, GNUTLS_SERVER, profile); } void OnConnect(StreamSocket* sock) CXX11_OVERRIDE { - new GnuTLSIOHook(this, sock, false, profile); + new GnuTLSIOHook(this, sock, GNUTLS_CLIENT, profile); } };