X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_ssl_gnutls.cpp;h=2f4acf3f05edbb14454642940bf70fa37ae2759a;hb=86c3fde2fedfe9270eeaa1a93c0ea15d6fb9962d;hp=3b67a61802b51106ede6db1e20421340381bfa72;hpb=680e9e0809d8569c8268122e3fecd2b6b62b2e65;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/extra/m_ssl_gnutls.cpp b/src/modules/extra/m_ssl_gnutls.cpp
index 3b67a6180..2f4acf3f0 100644
--- a/src/modules/extra/m_ssl_gnutls.cpp
+++ b/src/modules/extra/m_ssl_gnutls.cpp
@@ -28,7 +28,7 @@
 #include "m_cap.h"
 
 #ifdef _WIN32
-# pragma comment(lib, "libgnutls-28.lib")
+# pragma comment(lib, "libgnutls-30.lib")
 #endif
 
 /* $ModDesc: Provides SSL support for clients */
@@ -316,7 +316,7 @@ class ModuleSSLGnuTLS : public Module
 		ServerInstance->GenRandom = &randhandler;
 
 		Implementation eventlist[] = { I_On005Numeric, I_OnRehash, I_OnModuleRehash, I_OnUserConnect,
-			I_OnEvent, I_OnHookIO };
+			I_OnEvent, I_OnHookIO, I_OnCheckReady };
 		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
 
 		ServerInstance->Modules->AddService(iohook);
@@ -703,6 +703,9 @@ class ModuleSSLGnuTLS : public Module
 			if (ret > 0)
 			{
 				recvq.append(buffer, ret);
+				// Schedule a read if there is still data in the GnuTLS buffer
+				if (gnutls_record_check_pending(session->sess) > 0)
+					ServerInstance->SE->ChangeEventMask(user, FD_ADD_TRIAL_READ);
 				return 1;
 			}
 			else if (ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED)
@@ -974,6 +977,13 @@ info_done_dealloc:
 		if (starttls.enabled)
 			capHandler.HandleEvent(ev);
 	}
+
+	ModResult OnCheckReady(LocalUser* user)
+	{
+		if ((user->eh.GetIOHook() == this) && (sessions[user->eh.GetFd()].status != ISSL_HANDSHAKEN))
+			return MOD_RES_DENY;
+		return MOD_RES_PASSTHRU;
+	}
 };
 
 MODULE_INIT(ModuleSSLGnuTLS)