Change the SQLutils and SQL providers to also use interfaces for proper unload order...

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

diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index 4f22a5e70421f6cf43e95075d1888268ca1947d5..1e6208b660e96ab38977a8d624c5ec9bcf761071 100644 (file)
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -1,3 +1,16 @@
+/*       +------------------------------------+
+ *       | Inspire Internet Relay Chat Daemon |
+ *       +------------------------------------+
+ *
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
+ * This program is free but copyrighted software; see
+ *            the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
 #include <string>
 #include <vector>
 
@@ -14,12 +27,12 @@
 #include "hashcomp.h"
 #include "inspircd.h"
 
-#include "ssl.h"
+#include "transport.h"
 
 /* $ModDesc: Provides SSL support for clients */
 /* $CompileFlags: `libgnutls-config --cflags` */
 /* $LinkerFlags: `perl extra/gnutls_rpath.pl` */
-/* $ModDep: ssl.h */
+/* $ModDep: transport.h */
 
 
 enum issl_status { ISSL_NONE, ISSL_HANDSHAKING_READ, ISSL_HANDSHAKING_WRITE, ISSL_HANDSHAKEN, ISSL_CLOSING, ISSL_CLOSED };
@@ -267,12 +280,35 @@ class ModuleSSLGnuTLS : public Module
                }
                else if (strcmp("IS_HOOK", request->GetId()) == 0)
                {
-                       return ServerInstance->Config->AddIOHook((Module*)this, (InspSocket*)ISR->Sock) ? (char*)"OK" : NULL;
+                       char* ret = "OK";
+                       try
+                       {
+                               ret = ServerInstance->Config->AddIOHook((Module*)this, (InspSocket*)ISR->Sock) ? (char*)"OK" : NULL;
+                       }
+                       catch (ModuleException &e)
+                       {
+                               return NULL;
+                       }
+                       return ret;
                }
                else if (strcmp("IS_UNHOOK", request->GetId()) == 0)
                {
                        return ServerInstance->Config->DelIOHook((InspSocket*)ISR->Sock) ? (char*)"OK" : NULL;
                }
+               else if (strcmp("IS_HSDONE", request->GetId()) == 0)
+               {
+                       issl_session* session = &sessions[ISR->Sock->GetFd()];
+                       return (session->status == ISSL_HANDSHAKING_READ || session->status == ISSL_HANDSHAKING_WRITE) ? NULL : (char*)"OK";
+               }
+               else if (strcmp("IS_ATTACH", request->GetId()) == 0)
+               {
+                       issl_session* session = &sessions[ISR->Sock->GetFd()];
+                       if (session)
+                       {
+                               VerifyCertificate(session, (InspSocket*)ISR->Sock);
+                               return "OK";
+                       }
+               }
                return NULL;
        }
 
@@ -445,7 +481,10 @@ class ModuleSSLGnuTLS : public Module
        }
        
        virtual int OnRawSocketWrite(int fd, const char* buffer, int count)
-       {               
+       {
+               if (!count)
+                       return 0;
+
                issl_session* session = &sessions[fd];
                const char* sendbuffer = buffer;