X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_ssl_openssl.cpp;h=5355e18557135f4b6b9f0a2899e02776f5dd6819;hb=2e1f86fd0c9911210b79e6ac346672441eef18c4;hp=2e86151cee3719ba744ab372d3a4508e9ea3914d;hpb=52a8a6d2bd1f015103f42eb7f1902f4f470f2318;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/extra/m_ssl_openssl.cpp b/src/modules/extra/m_ssl_openssl.cpp
index 2e86151ce..5355e1855 100644
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -414,8 +414,6 @@ class ModuleSSLOpenSSL : public Module
 			return;
 		}
 
-		ServerInstance->Log(DEBUG,"OnRawSocketAccept begin handshake");
-
  		Handshake(session);
 	}
 
@@ -448,7 +446,6 @@ class ModuleSSLOpenSSL : public Module
 
 	virtual void OnRawSocketClose(int fd)
 	{
-		ServerInstance->Log(DEBUG,"OnRawSocketClose %d", fd);
 		/* Are there any possibilities of an out of range fd? Hope not, but lets be paranoid */
 		if ((fd < 0) || (fd > MAX_DESCRIPTORS))
 			return;
@@ -468,7 +465,6 @@ class ModuleSSLOpenSSL : public Module
 
 	virtual int OnRawSocketRead(int fd, char* buffer, unsigned int count, int &readresult)
 	{
-		ServerInstance->Log(DEBUG,"OnRawSocketRead");
 		/* Are there any possibilities of an out of range fd? Hope not, but lets be paranoid */
 		if ((fd < 0) || (fd > MAX_DESCRIPTORS))
 			return 0;
@@ -514,10 +510,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)
@@ -539,7 +531,6 @@ class ModuleSSLOpenSSL : public Module
 						// Zero the offset, as there's nothing there..
 						session->inbufoffset = 0;
 					}
-					ServerInstance->Log(DEBUG,"Read result=%d",readresult);
 					return 1;
 				}
 				return ret;
@@ -733,14 +724,12 @@ class ModuleSSLOpenSSL : public Module
 
 			if (err == SSL_ERROR_WANT_READ)
 			{
-				ServerInstance->Log(DEBUG,"Handshake Want read");
 				session->rstat = ISSL_READ;
 				session->status = ISSL_HANDSHAKING;
 				return true;
 			}
 			else if (err == SSL_ERROR_WANT_WRITE)
 			{
-				ServerInstance->Log(DEBUG,"Handshake Want write");
 				session->wstat = ISSL_WRITE;
 				session->status = ISSL_HANDSHAKING;
 				MakePollWrite(session);
@@ -748,7 +737,6 @@ class ModuleSSLOpenSSL : public Module
 			}
 			else
 			{
-				ServerInstance->Log(DEBUG,"Handshake close session");
 				CloseSession(session);
 			}
 
@@ -756,7 +744,6 @@ class ModuleSSLOpenSSL : public Module
 		}
 		else if (ret > 0)
 		{
-			ServerInstance->Log(DEBUG,"Handshake complete");
 			// Handshake complete.
 			// This will do for setting the ssl flag...it could be done earlier if it's needed. But this seems neater.
 			User* u = ServerInstance->FindDescriptor(session->fd);
@@ -774,10 +761,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;
 		}
@@ -814,10 +797,7 @@ class ModuleSSLOpenSSL : public Module
 		if (eh)
 		{
 			ServerInstance->SE->WantWrite(eh);
-			ServerInstance->Log(DEBUG,"Made want write");
 		}
-		else
-			ServerInstance->Log(DEBUG,"Couldnt find descriptor to make writeable!");
 	}
 
 	virtual void OnBufferFlushed(User* user)
@@ -911,4 +891,4 @@ static int error_callback(const char *str, size_t len, void *u)
 	return 0;
 }
 
-MODULE_INIT(ModuleSSLOpenSSL);
+MODULE_INIT(ModuleSSLOpenSSL)