X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Fconn.c;h=75b77942d966858da2200fd6e7cb660b981b141b;hb=3d7aa9f90626bb16ef9db9c9c739ba748976448c;hp=6056355f0d5d253b3fbac01c090d157498c72bdf;hpb=43fb18f2f5a506c4d78967e4b6e961b7339c98dc;p=ngircd-alex.git

diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c
index 6056355f..75b77942 100644
--- a/src/ngircd/conn.c
+++ b/src/ngircd/conn.c
@@ -14,15 +14,12 @@
 #define CONN_MODULE
 
 #include "portab.h"
-#include "conf-ssl.h"
-#include "io.h"
 
 /**
  * @file
  * Connection management
  */
 
-#include "imp.h"
 #include <assert.h>
 #ifdef PROTOTYPES
 # include <stdarg.h>
@@ -34,8 +31,9 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
+#include <strings.h>
 #include <sys/socket.h>
-#include <sys/time.h>
+#include <sys/stat.h>
 #include <sys/types.h>
 #include <time.h>
 #include <netinet/in.h>
@@ -51,30 +49,21 @@
 # include <tcpd.h>			/* for TCP Wrappers */
 #endif
 
-#include "array.h"
-#include "defines.h"
-
-#include "exp.h"
 #include "conn.h"
 
-#include "imp.h"
 #include "ngircd.h"
-#include "array.h"
-#include "client.h"
 #include "class.h"
-#include "conf.h"
-#include "conn-encoding.h"
+#ifdef ICONV
+# include "conn-encoding.h"
+#endif
 #include "conn-ssl.h"
 #include "conn-zip.h"
 #include "conn-func.h"
+#include "io.h"
 #include "log.h"
 #include "ng_ipaddr.h"
 #include "parse.h"
 #include "resolve.h"
-#include "tool.h"
-
-#include "exp.h"
-
 
 #define SERVER_WAIT (NONE - 1)
 
@@ -809,16 +798,6 @@ SSL_WantWrite(const CONNECTION *c)
 	return false;
 }
 
-#else
-
-static inline bool
-SSL_WantRead(UNUSED const CONNECTION *c)
-{ return false; }
-
-static inline bool
-SSL_WantWrite(UNUSED const CONNECTION *c)
-{ return false; }
-
 #endif
 
 
@@ -881,8 +860,10 @@ Conn_Handler(void)
 			if (wdatalen > 0)
 #endif
 			{
+#ifdef SSL_SUPPORT
 				if (SSL_WantRead(&My_Connections[i]))
 					continue;
+#endif
 				io_event_add(My_Connections[i].sock,
 					     IO_WANTWRITE);
 			}