PROPAGATE this fix

[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 c8cff3a21ef590f3b324d1ac63ecf330910b6719..477113543b575e8a0523d38cc47d6b3b2bb45bac 100644 (file)
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -90,7 +90,7 @@ class ModuleSSLGnuTLS : public Module
        ModuleSSLGnuTLS(InspIRCd* Me)
                : Module(Me)
        {
-               ServerInstance->PublishInterface("InspSocketHook", this);
+               ServerInstance->Modules->PublishInterface("InspSocketHook", this);
 
                // Not rehashable...because I cba to reduce all the sizes of existing buffers.
                inbufsize = ServerInstance->Config->NetBufferSize;
@@ -287,7 +287,7 @@ class ModuleSSLGnuTLS : public Module
        void Implements(char* List)
        {
                List[I_On005Numeric] = List[I_OnRawSocketConnect] = List[I_OnRawSocketAccept] = List[I_OnRawSocketClose] = List[I_OnRawSocketRead] = List[I_OnRawSocketWrite] = List[I_OnCleanup] = 1;
-               List[I_OnRequest] = List[I_OnSyncUserMetaData] = List[I_OnDecodeMetaData] = List[I_OnUnloadModule] = List[I_OnRehash] = List[I_OnWhois] = List[I_OnPostConnect] = 1;
+               List[I_OnBufferFlushed] = List[I_OnRequest] = List[I_OnSyncUserMetaData] = List[I_OnDecodeMetaData] = List[I_OnUnloadModule] = List[I_OnRehash] = List[I_OnWhois] = List[I_OnPostConnect] = 1;
        }
 
        virtual void On005Numeric(std::string &output)
@@ -432,6 +432,7 @@ class ModuleSSLGnuTLS : public Module
                else if (session->status == ISSL_HANDSHAKING_WRITE)
                {
                        errno = EAGAIN;
+                       MakePollWrite(session);
                        return -1;
                }
 
@@ -500,15 +501,11 @@ 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;
 
                if (!session->sess)
                {
-                       ServerInstance->Log(DEBUG,"No session");
                        CloseSession(session);
                        return 1;
                }
@@ -520,7 +517,6 @@ class ModuleSSLGnuTLS : public Module
                if (session->status == ISSL_HANDSHAKING_WRITE)
                {
                        // The handshake isn't finished, try to finish it.
-                       ServerInstance->Log(DEBUG,"Finishing handshake");
                        Handshake(session);
                        errno = EAGAIN;
                        return -1;
@@ -530,9 +526,7 @@ class ModuleSSLGnuTLS : public Module
 
                if (session->status == ISSL_HANDSHAKEN)
                {
-                       ServerInstance->Log(DEBUG,"Send record");
                        ret = gnutls_record_send(session->sess, sendbuffer, count);
-                       ServerInstance->Log(DEBUG,"Return: %d", ret);
 
                        if (ret == 0)
                        {
@@ -542,23 +536,21 @@ class ModuleSSLGnuTLS : public Module
                        {
                                if(ret != GNUTLS_E_AGAIN && ret != GNUTLS_E_INTERRUPTED)
                                {
-                                       ServerInstance->Log(DEBUG,"Not egain or interrupt, close session");
                                        CloseSession(session);
                                }
                                else
                                {
-                                       ServerInstance->Log(DEBUG,"Again please");
                                        errno = EAGAIN;
-                                       return -1;
                                }
                        }
                        else
                        {
-                               ServerInstance->Log(DEBUG,"Trim buffer");
                                session->outbuf = session->outbuf.substr(ret);
                        }
                }
 
+               MakePollWrite(session);
+
                /* Who's smart idea was it to return 1 when we havent written anything?
                 * This fucks the buffer up in InspSocket :p
                 */
@@ -662,7 +654,7 @@ class ModuleSSLGnuTLS : public Module
        virtual void OnPostConnect(userrec* user)
        {
                // This occurs AFTER OnUserConnect so we can be sure the
-               // protocol module has propogated the NICK message.
+               // protocol module has propagated the NICK message.
                if ((user->GetExt("ssl", dummy)) && (IS_LOCAL(user)))
                {
                        // Tell whatever protocol module we're using that we need to inform other servers of this metadata NOW.
@@ -688,7 +680,20 @@ class ModuleSSLGnuTLS : public Module
 
        void MakePollWrite(issl_session* session)
        {
-               OnRawSocketWrite(session->fd, NULL, 0);
+               //OnRawSocketWrite(session->fd, NULL, 0);
+               EventHandler* eh = ServerInstance->FindDescriptor(session->fd);
+               if (eh)
+                       ServerInstance->SE->WantWrite(eh);
+       }
+
+       virtual void OnBufferFlushed(userrec* user)
+       {
+               if (user->GetExt("ssl"))
+               {
+                       issl_session* session = &sessions[user->GetFd()];
+                       if (session && session->outbuf.size())
+                               OnRawSocketWrite(user->GetFd(), NULL, 0);
+               }
        }
 
        void CloseSession(issl_session* session)
@@ -840,4 +845,3 @@ class ModuleSSLGnuTLS : public Module
 };
 
 MODULE_INIT(ModuleSSLGnuTLS);
-