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 61516d68c6f34da4eb0f4d2065a1a40f30e77175..6170a8cd58ae1d4c44d5aaad877dabdaf41e9708 100644 (file)
--- a/src/ngircd/conn-func.c
+++ b/src/ngircd/conn-func.c
@@ -16,13 +16,14 @@
 
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: conn-func.c,v 1.4 2005/03/19 18:43:48 fw 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>
 #include <log.h>
 
 #include "conn.h"
+#include "client.h"
 
 #include "exp.h"
 #include "conn-func.h"
@@ -72,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 */
 
 
@@ -149,32 +156,7 @@ Conn_Next( CONN_ID Idx )
 } /* Conn_Next */
 
 
-GLOBAL void
-Conn_SetOption( CONN_ID Idx, int Option )
-{
-       /* Option fuer Verbindung setzen.
-        * Initial sind alle Optionen _nicht_ gesetzt. */
-
-       assert( Idx > NONE );
-       assert( Option != 0 );
-
-       My_Connections[Idx].options |= Option;
-} /* Conn_SetOption */
-
-
-GLOBAL void
-Conn_UnsetOption( CONN_ID Idx, int Option )
-{
-       /* Option fuer Verbindung loeschen */
-
-       assert( Idx > NONE );
-       assert( Option != 0 );
-
-       My_Connections[Idx].options &= ~Option;
-} /* Conn_UnsetOption */
-
-
-GLOBAL int
+GLOBAL UINT16
 Conn_Options( CONN_ID Idx )
 {
        assert( Idx > NONE );
@@ -182,27 +164,39 @@ Conn_Options( CONN_ID Idx )
 } /* Conn_Options */
 
 
+/**
+ * Get the start time of the connection.
+ * The result is the start time in seconds since 1970-01-01, as reported
+ * by the C function time(NULL).
+ */
 GLOBAL time_t
 Conn_StartTime( CONN_ID Idx )
 {
-       /* Zeitpunkt des Link-Starts liefern (in Sekunden) */
+       CLIENT *c;
 
-       assert( Idx > NONE );
-       return My_Connections[Idx].starttime;
-} /* Conn_Uptime */
+       assert(Idx > NONE);
 
+       /* Search client structure for this link ... */
+       c = Conn_GetClient(Idx);
+       if(c != NULL)
+               return Client_StartTime(c);
 
-GLOBAL int
+       return 0;
+} /* Conn_StartTime */
+
+
+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 */
 
 
@@ -226,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 */