/usr/local/include/openssl/pqueue.h:73: error: ISO C++ does not support `long long'

[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 4ce21c80520e91c2c54ba1260ea5aba5c29a6032..4696f035780b961093420050f5ed59ea4625e1a2 100644 (file)
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -41,6 +41,7 @@
 /* $CompileFlags: pkgconfversion("openssl","0.9.7") pkgconfincludes("openssl","/openssl/ssl.h","") */
 /* $LinkerFlags: rpath("pkg-config --libs openssl") pkgconflibs("openssl","/libssl.so","-lssl -lcrypto -ldl") */
 /* $ModDep: transport.h */
+/* $NoPedantic */
 
 enum issl_status { ISSL_NONE, ISSL_HANDSHAKING, ISSL_OPEN };
 enum issl_io_status { ISSL_WRITE, ISSL_READ };
@@ -130,7 +131,7 @@ class ModuleSSLOpenSSL : public Module
        ModuleSSLOpenSSL(InspIRCd* Me)
        : Module(Me), PublicInstance(Me)
        {
-               ServerInstance->Modules->PublishInterface("InspSocketHook", this);
+               ServerInstance->Modules->PublishInterface("BufferedSocketHook", this);
 
                // Not rehashable...because I cba to reduce all the sizes of existing buffers.
                inbufsize = ServerInstance->Config->NetBufferSize;
@@ -356,7 +357,7 @@ class ModuleSSLOpenSSL : public Module
                        char* ret = "OK";
                        try
                        {
-                               ret = ServerInstance->Config->AddIOHook((Module*)this, (InspSocket*)ISR->Sock) ? (char*)"OK" : NULL;
+                               ret = ServerInstance->Config->AddIOHook((Module*)this, (BufferedSocket*)ISR->Sock) ? (char*)"OK" : NULL;
                        }
                        catch (ModuleException &e)
                        {
@@ -367,7 +368,7 @@ class ModuleSSLOpenSSL : public Module
                }
                else if (strcmp("IS_UNHOOK", request->GetId()) == 0)
                {
-                       return ServerInstance->Config->DelIOHook((InspSocket*)ISR->Sock) ? (char*)"OK" : NULL;
+                       return ServerInstance->Config->DelIOHook((BufferedSocket*)ISR->Sock) ? (char*)"OK" : NULL;
                }
                else if (strcmp("IS_HSDONE", request->GetId()) == 0)
                {
@@ -382,7 +383,7 @@ class ModuleSSLOpenSSL : public Module
                        issl_session* session = &sessions[ISR->Sock->GetFd()];
                        if (session->sess)
                        {
-                               VerifyCertificate(session, (InspSocket*)ISR->Sock);
+                               VerifyCertificate(session, (BufferedSocket*)ISR->Sock);
                                return "OK";
                        }
                }
@@ -510,10 +511,6 @@ class ModuleSSLOpenSSL : public Module
                        {
                                int ret = DoRead(session);
 
-                               ServerInstance->Log(DEBUG, "<***> DoRead count: " + ConvToStr(count));
-                               ServerInstance->Log(DEBUG, "<***> DoRead ret: " + ConvToStr(ret));
-                               ServerInstance->Log(DEBUG, "<***> DoRead session->inbufoffset: " + ConvToStr(session->inbufoffset));
-
                                if (ret > 0)
                                {
                                        if (count <= session->inbufoffset)
@@ -535,13 +532,9 @@ class ModuleSSLOpenSSL : public Module
                                                // Zero the offset, as there's nothing there..
                                                session->inbufoffset = 0;
                                        }
-
                                        return 1;
                                }
-                               else
-                               {
-                                       return ret;
-                               }
+                               return ret;
                        }
                }
 
@@ -722,9 +715,7 @@ class ModuleSSLOpenSSL : public Module
                int ret;
 
                if (session->outbound)
-               {
                        ret = SSL_connect(session->sess);
-               }
                else
                        ret = SSL_accept(session->sess);
 
@@ -771,10 +762,6 @@ class ModuleSSLOpenSSL : public Module
                }
                else if (ret == 0)
                {
-                       int ssl_err = SSL_get_error(session->sess, ret);
-                       char buf[1024];
-                       ERR_print_errors_fp(stderr);
-                       ServerInstance->Log(DEBUG,"Handshake fail 2: %d: %s", ssl_err, ERR_error_string(ssl_err,buf));
                        CloseSession(session);
                        return true;
                }
@@ -809,7 +796,9 @@ class ModuleSSLOpenSSL : public Module
                //OnRawSocketWrite(session->fd, NULL, 0);
                EventHandler* eh = ServerInstance->FindDescriptor(session->fd);
                if (eh)
+               {
                        ServerInstance->SE->WantWrite(eh);
+               }
        }
 
        virtual void OnBufferFlushed(User* user)
@@ -903,4 +892,4 @@ static int error_callback(const char *str, size_t len, void *u)
        return 0;
 }
 
-MODULE_INIT(ModuleSSLOpenSSL);
+MODULE_INIT(ModuleSSLOpenSSL)