X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Fconn.c;h=35d740051f8822a4d8976154ae399e83ceb2a3b5;hb=b6f19ea8feceeb2246995222f03790e6f00b0dfd;hp=3350e208760fcd0480a2462c9909e894a7982bd2;hpb=42b32f8a2adcbe0d7b011083cc0549ae89139449;p=ngircd-alex.git

diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c
index 3350e208..35d74005 100644
--- a/src/ngircd/conn.c
+++ b/src/ngircd/conn.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2010 Alexander Barton <alex@barton.de>
+ * Copyright (c)2001-2011 Alexander Barton (alex@barton.de) and Contributors.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -9,6 +9,8 @@
  * Please read the file COPYING, README and AUTHORS for more information.
  */
 
+#undef DEBUG_BUFFER
+
 #define CONN_MODULE
 
 #include "portab.h"
@@ -63,6 +65,7 @@
 #include "ngircd.h"
 #include "array.h"
 #include "client.h"
+#include "class.h"
 #include "conf.h"
 #include "conn-ssl.h"
 #include "conn-zip.h"
@@ -367,7 +370,7 @@ cb_clientserver_ssl(int sock, short what)
 
 
 /**
- * Initialite connecion module.
+ * Initialize connecion module.
  */
 GLOBAL void
 Conn_Init( void )
@@ -433,12 +436,13 @@ Conn_Exit( void )
  * they don't hold connections open that the main process wants to close.
  */
 GLOBAL void
-Conn_CloseAllSockets(void)
+Conn_CloseAllSockets(int ExceptOf)
 {
 	CONN_ID idx;
 
 	for(idx = 0; idx < Pool_Size; idx++) {
-		if(My_Connections[idx].sock > NONE)
+		if(My_Connections[idx].sock > NONE &&
+		   My_Connections[idx].sock != ExceptOf)
 			close(My_Connections[idx].sock);
 	}
 }
@@ -739,6 +743,9 @@ Conn_Handler(void)
 		Check_Servers();
 		Check_Connections();
 
+		/* Expire outdated class/list items */
+		Class_Expire();
+
 		/* Look for non-empty read buffers ... */
 		for (i = 0; i < Pool_Size; i++) {
 			if ((My_Connections[i].sock > NONE)
@@ -929,22 +936,25 @@ Conn_Write( CONN_ID Idx, char *Data, size_t Len )
 	assert( Data != NULL );
 	assert( Len > 0 );
 
-	c = Conn_GetClient(Idx);
-	assert( c != NULL);
-
-	/* Servers do get special write buffer limits, so they can generate
-	 * all the messages that are required while peering. */
-	if (Client_Type(c) == CLIENT_SERVER)
-		writebuf_limit = WRITEBUFFER_SLINK_LEN;
-
 	/* Is the socket still open? A previous call to Conn_Write()
 	 * may have closed the connection due to a fatal error.
 	 * In this case it is sufficient to return an error, as well. */
-	if( My_Connections[Idx].sock <= NONE ) {
+	if (My_Connections[Idx].sock <= NONE) {
 		LogDebug("Skipped write on closed socket (connection %d).", Idx);
 		return false;
 	}
 
+	/* Make sure that there still exists a CLIENT structure associated
+	 * with this connection and check if this is a server or not: */
+	c = Conn_GetClient(Idx);
+	if (c) {
+		/* Servers do get special write buffer limits, so they can
+		 * generate all the messages that are required while peering. */
+		if (Client_Type(c) == CLIENT_SERVER)
+			writebuf_limit = WRITEBUFFER_SLINK_LEN;
+	} else
+		LogDebug("Write on socket without client (connection %d)!?", Idx);
+
 #ifdef ZLIB
 	if ( Conn_OPTION_ISSET( &My_Connections[Idx], CONN_ZIP )) {
 		/* Compressed link:
@@ -1007,7 +1017,7 @@ Conn_Write( CONN_ID Idx, char *Data, size_t Len )
 GLOBAL void
 Conn_Close( CONN_ID Idx, const char *LogMsg, const char *FwdMsg, bool InformClient )
 {
-	/* Close connection. Open pipes of asyncronous resolver
+	/* Close connection. Open pipes of asynchronous resolver
 	 * sub-processes are closed down. */
 
 	CLIENT *c;
@@ -1216,6 +1226,20 @@ Conn_SyncServerStruct(void)
 } /* SyncServerStruct */
 
 
+/**
+ * Get IP address string of a connection.
+ *
+ * @param Idx Connection index.
+ * @return Pointer to a global buffer containing the IP address as string.
+ */
+GLOBAL const char *
+Conn_GetIPAInfo(CONN_ID Idx)
+{
+	assert(Idx > NONE);
+	return ng_ipaddr_tostr(&My_Connections[Idx].addr);
+}
+
+
 /**
  * Send out data of write buffer; connect new sockets.
  *
@@ -1255,9 +1279,11 @@ Handle_Write( CONN_ID Idx )
 		return true;
 	}
 
+#ifdef DEBUG_BUFFER
 	LogDebug
 	    ("Handle_Write() called for connection %d, %ld bytes pending ...",
 	     Idx, wdatalen);
+#endif
 
 #ifdef SSL_SUPPORT
 	if ( Conn_OPTION_ISSET( &My_Connections[Idx], CONN_SSL )) {
@@ -1326,6 +1352,8 @@ New_Connection(int Sock)
 
 	assert(Sock > NONE);
 
+	LogDebug("Accepting new connection on socket %d ...", Sock);
+
 	new_sock_len = (int)sizeof(new_addr);
 	new_sock = accept(Sock, (struct sockaddr *)&new_addr,
 			  (socklen_t *)&new_sock_len);
@@ -1561,7 +1589,7 @@ Read_Request( CONN_ID Idx )
 		if (!array_catb(&My_Connections[Idx].zip.rbuf, readbuf,
 				(size_t) len)) {
 			Log(LOG_ERR,
-			    "Could not append recieved data to zip input buffer (connn %d): %d bytes!",
+			    "Could not append recieved data to zip input buffer (connection %d): %d bytes!",
 			    Idx, len);
 			Conn_Close(Idx, "Receive buffer space exhausted", NULL,
 				   false);
@@ -1571,7 +1599,9 @@ Read_Request( CONN_ID Idx )
 #endif
 	{
 		if (!array_catb( &My_Connections[Idx].rbuf, readbuf, len)) {
-			Log( LOG_ERR, "Could not append recieved data to input buffer (connn %d): %d bytes!", Idx, len );
+			Log(LOG_ERR,
+			    "Could not append recieved data to input buffer (connection %d): %d bytes!",
+			    Idx, len);
 			Conn_Close(Idx, "Receive buffer space exhausted", NULL, false );
 		}
 	}
@@ -1753,8 +1783,10 @@ Handle_Buffer(CONN_ID Idx)
 			return 0; /* error -> connection has been closed */
 
 		array_moveleft(&My_Connections[Idx].rbuf, 1, len);
+#ifdef DEBUG_BUFFER
 		LogDebug("Connection %d: %d bytes left in read buffer.",
 			 Idx, array_bytes(&My_Connections[Idx].rbuf));
+#endif
 #ifdef ZLIB
 		if ((!old_z) && (My_Connections[Idx].options & CONN_ZIP) &&
 		    (array_bytes(&My_Connections[Idx].rbuf) > 0)) {
@@ -2051,13 +2083,14 @@ Init_Socket( int Sock )
 	/* Set type of service (TOS) */
 #if defined(IPPROTO_IP) && defined(IPTOS_LOWDELAY)
 	value = IPTOS_LOWDELAY;
-	LogDebug("Setting IP_TOS on socket %d to IPTOS_LOWDELAY.", Sock);
 	if (setsockopt(Sock, IPPROTO_IP, IP_TOS, &value,
 		       (socklen_t) sizeof(value))) {
 		LogDebug("Can't set socket option IP_TOS: %s!",
 			 strerror(errno));
 		/* ignore this error */
-	}
+	} else
+		LogDebug("IP_TOS on socket %d has been set to IPTOS_LOWDELAY.",
+			 Sock);
 #endif
 
 	return true;
@@ -2098,6 +2131,7 @@ cb_Connect_to_Server(int fd, UNUSED short events)
 
 	/* Read result from pipe */
 	len = Proc_Read(&Conf_Server[i].res_stat, dest_addrs, sizeof(dest_addrs));
+	Proc_Close(&Conf_Server[i].res_stat);
 	if (len == 0) {
 		/* Error resolving hostname: reset server structure */
 		Conf_Server[i].conn_id = NONE;
@@ -2157,6 +2191,7 @@ cb_Read_Resolver_Result( int r_fd, UNUSED short events )
 
 	/* Read result from pipe */
 	len = Proc_Read(&My_Connections[i].proc_stat, readbuf, sizeof readbuf -1);
+	Proc_Close(&My_Connections[i].proc_stat);
 	if (len == 0)
 		return;
 
@@ -2204,6 +2239,7 @@ cb_Read_Resolver_Result( int r_fd, UNUSED short events )
 					"NOTICE AUTH :*** No ident response");
 		}
 #endif
+		Class_HandleServerBans(c);
 	}
 #ifdef DEBUG
 		else Log( LOG_DEBUG, "Resolver: discarding result for already registered connection %d.", i );