X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fextra%2Fm_ssl_openssl.cpp;h=5355e18557135f4b6b9f0a2899e02776f5dd6819;hb=2e1f86fd0c9911210b79e6ac346672441eef18c4;hp=df47762af0516a39e0566cfdfe30fa289ecb56bd;hpb=2b68243097f98ace4a53b21520718874b0ed7db5;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 df47762af..5355e1855 100644
--- a/src/modules/extra/m_ssl_openssl.cpp
+++ b/src/modules/extra/m_ssl_openssl.cpp
@@ -510,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)
@@ -535,13 +531,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 +714,7 @@ class ModuleSSLOpenSSL : public Module
 		int ret;
 
 		if (session->outbound)
-		{
 			ret = SSL_connect(session->sess);
-		}
 		else
 			ret = SSL_accept(session->sess);
 
@@ -771,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;
 		}
@@ -809,7 +795,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 +891,4 @@ static int error_callback(const char *str, size_t len, void *u)
 	return 0;
 }
 
-MODULE_INIT(ModuleSSLOpenSSL);
+MODULE_INIT(ModuleSSLOpenSSL)