X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fconn.c;h=6a1c056e21cf715128c2871f590af76cfdb01fce;hp=9daca8531b34bef97a30d63290fdd1eee7df4498;hb=1dca082fc6f0595d6bde431bf50132445340fb7f;hpb=79ca5fe04d0081468aa09cf0a7caca45a45b9864

diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c
index 9daca853..6a1c056e 100644
--- a/src/ngircd/conn.c
+++ b/src/ngircd/conn.c
@@ -82,6 +82,7 @@
 
 #define MAX_COMMANDS 3
 #define MAX_COMMANDS_SERVER 10
+#define MAX_COMMANDS_SERVICE MAX_COMMANDS_SERVER
 
 
 static bool Handle_Write PARAMS(( CONN_ID Idx ));
@@ -1380,10 +1381,10 @@ New_Connection(int Sock)
 
 	identsock = new_sock;
 #ifdef IDENTAUTH
-	if (Conf_NoIdent)
+	if (!Conf_Ident)
 		identsock = -1;
 #endif
-	if (!Conf_NoDNS)
+	if (Conf_DNS)
 		Resolve_Addr(&My_Connections[new_sock].proc_stat, &new_addr,
 			     identsock, cb_Read_Resolver_Result);
 
@@ -1517,6 +1518,8 @@ Read_Request( CONN_ID Idx )
 	/* Look at the data in the (read-) buffer of this connection */
 	My_Connections[Idx].bps += Handle_Buffer(Idx);
 	if (Client_Type(c) != CLIENT_SERVER
+	    && Client_Type(c) != CLIENT_UNKNOWNSERVER
+	    && Client_Type(c) != CLIENT_SERVICE
 	    && My_Connections[Idx].bps >= maxbps) {
 		LogDebug("Throttling connection %d: BPS exceeded! (%u >= %u)",
 			 Idx, My_Connections[Idx].bps, maxbps);
@@ -1528,7 +1531,7 @@ Read_Request( CONN_ID Idx )
 /**
  * Handle all data in the connection read-buffer.
  * Data is processed until no complete command is left in the read buffer,
- * or MAX_COMMANDS[_SERVER] commands were processed.
+ * or MAX_COMMANDS[_SERVER|_SERVICE] commands were processed.
  * When a fatal error occurs, the connection is shut down.
  * @param Idx Index of the connection.
  * @return number of bytes processed.
@@ -1553,8 +1556,12 @@ Handle_Buffer(CONN_ID Idx)
 
 	/* Servers do get special command limits, so they can process
 	 * all the messages that are required while peering. */
-	if (Client_Type(c) == CLIENT_SERVER)
-		maxcmd = MAX_COMMANDS_SERVER;
+	switch (Client_Type(c)) {
+	    case CLIENT_SERVER:
+		maxcmd = MAX_COMMANDS_SERVER; break;
+	    case CLIENT_SERVICE:
+		maxcmd = MAX_COMMANDS_SERVICE; break;
+	}
 
 	starttime = time(NULL);
 	for (i=0; i < maxcmd; i++) {