Validate "ServerName" variable.

[ngircd-alex.git] / src / ngircd / conn-func.c

diff --git a/src/ngircd/conn-func.c b/src/ngircd/conn-func.c
index 84fe1e4ca929abcc269572a97df9a8c299c76c1d..6170a8cd58ae1d4c44d5aaad877dabdaf41e9708 100644 (file)
--- a/src/ngircd/conn-func.c
+++ b/src/ngircd/conn-func.c
@@ -16,7 +16,7 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: conn-func.c,v 1.6 2005/06/12 16:32:17 alex Exp $";
+static char UNUSED id[] = "$Id: conn-func.c,v 1.10 2006/05/10 21:24:01 alex Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -73,7 +73,13 @@ Conn_SetPenalty( CONN_ID Idx, time_t Seconds )
        assert( Seconds >= 0 );
 
        t = time( NULL ) + Seconds;
-       if( t > My_Connections[Idx].delaytime ) My_Connections[Idx].delaytime = t;
+       if (t > My_Connections[Idx].delaytime)
+               My_Connections[Idx].delaytime = t;
+
+#ifdef DEBUG
+       Log(LOG_DEBUG, "Add penalty time on connection %d: %ld second(s).",
+                       Idx, (long)Seconds);
+#endif
 } /* Conn_SetPenalty */
 
 
@@ -150,7 +156,7 @@ Conn_Next( CONN_ID Idx )
 } /* Conn_Next */
 
 
-GLOBAL int
+GLOBAL UINT16
 Conn_Options( CONN_ID Idx )
 {
        assert( Idx > NONE );
@@ -171,7 +177,7 @@ Conn_StartTime( CONN_ID Idx )
        assert(Idx > NONE);
 
        /* Search client structure for this link ... */
-       c = Client_GetFromConn(Idx);
+       c = Conn_GetClient(Idx);
        if(c != NULL)
                return Client_StartTime(c);
 
@@ -179,17 +185,18 @@ Conn_StartTime( CONN_ID Idx )
 } /* Conn_StartTime */
 
 
-GLOBAL int
+GLOBAL size_t
 Conn_SendQ( CONN_ID Idx )
 {
        /* Laenge der Daten im Schreibbuffer liefern */
 
        assert( Idx > NONE );
 #ifdef ZLIB
-       if( My_Connections[Idx].options & CONN_ZIP ) return My_Connections[Idx].zip.wdatalen;
+       if( My_Connections[Idx].options & CONN_ZIP )
+               return array_bytes(&My_Connections[Idx].zip.wbuf);
        else
 #endif
-       return My_Connections[Idx].wdatalen;
+       return array_bytes(&My_Connections[Idx].wbuf);
 } /* Conn_SendQ */
 
 
@@ -213,17 +220,18 @@ Conn_SendBytes( CONN_ID Idx )
 } /* Conn_SendBytes */
 
 
-GLOBAL int
+GLOBAL size_t
 Conn_RecvQ( CONN_ID Idx )
 {
        /* Laenge der Daten im Lesebuffer liefern */
 
        assert( Idx > NONE );
 #ifdef ZLIB
-       if( My_Connections[Idx].options & CONN_ZIP ) return My_Connections[Idx].zip.rdatalen;
+       if( My_Connections[Idx].options & CONN_ZIP )
+               return array_bytes(&My_Connections[Idx].zip.rbuf);
        else
 #endif
-       return My_Connections[Idx].rdatalen;
+       return array_bytes(&My_Connections[Idx].rbuf);
 } /* Conn_RecvQ */