Attach to events and register services in init()

[user/henk/code/inspircd.git] / src / modules / extra / m_ssl_openssl.cpp

diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp
index 36fe2941e5bed8ecc98f4eba46ec4100353a86df..b741c67b568d38ce5cb2768b431d6bf1457fc1a3 100644 (file)
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -21,13 +21,21 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
+ /* HACK: This prevents OpenSSL on OS X 10.7 and later from spewing deprecation
+  * warnings for every single function call. As far as I (SaberUK) know, Apple
+  * have no plans to remove OpenSSL so this warning just causes needless spam.
+  */
+#ifdef __APPLE__
+# define __AVAILABILITYMACROS__
+# define DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER
+#endif
+ 
 #include "inspircd.h"
 #include <openssl/ssl.h>
 #include <openssl/err.h>
 #include "ssl.h"
 
-#ifdef WINDOWS
+#ifdef _WIN32
 # pragma comment(lib, "libcrypto.lib")
 # pragma comment(lib, "libssl.lib")
 # pragma comment(lib, "user32.lib")
@@ -68,7 +76,6 @@ public:
        issl_status status;
        reference<ssl_cert> cert;
 
-       int fd;
        bool outbound;
        bool data_to_write;
 
@@ -95,14 +102,11 @@ static int OnVerify(int preverify_ok, X509_STORE_CTX *ctx)
 
 class ModuleSSLOpenSSL : public Module
 {
-       int inbufsize;
        issl_session* sessions;
 
        SSL_CTX* ctx;
        SSL_CTX* clictx;
 
-       char cipher[MAXBUF];
-
        std::string sslports;
        bool use_sha;
 
@@ -113,9 +117,6 @@ class ModuleSSLOpenSSL : public Module
        {
                sessions = new issl_session[ServerInstance->SE->GetMaxFds()];
 
-               // Not rehashable...because I cba to reduce all the sizes of existing buffers.
-               inbufsize = ServerInstance->Config->NetBufferSize;
-
                /* Global SSL library initialization*/
                SSL_library_init();
                SSL_load_error_strings();
@@ -156,7 +157,7 @@ class ModuleSSLOpenSSL : public Module
                sslports.clear();
 
                ConfigTag* Conf = ServerInstance->Config->ConfValue("openssl");
-               
+
                if (Conf->getBool("showports", true))
                {
                        sslports = Conf->getString("advertisedports");
@@ -332,7 +333,6 @@ class ModuleSSLOpenSSL : public Module
 
                issl_session* session = &sessions[fd];
 
-               session->fd = fd;
                session->sess = SSL_new(ctx);
                session->status = ISSL_NONE;
                session->outbound = false;
@@ -359,7 +359,6 @@ class ModuleSSLOpenSSL : public Module
 
                issl_session* session = &sessions[fd];
 
-               session->fd = fd;
                session->sess = SSL_new(clictx);
                session->status = ISSL_NONE;
                session->outbound = true;
@@ -432,6 +431,7 @@ class ModuleSSLOpenSSL : public Module
                        {
                                // Client closed connection.
                                CloseSession(session);
+                               user->SetError("Connection closed");
                                return -1;
                        }
                        else if (ret < 0)