Eliminate some compiler warnings ("unused parameter").

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

diff --git a/src/ngircd/conn-func.c b/src/ngircd/conn-func.c
index 974c151a698e71a7b0f1ad68027f58497bd35eb8..5f998985f6befe5dc83ae3eed95b3f3b7da4126d 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.5 2005/04/25 18:37:16 fw Exp $";
+static char UNUSED id[] = "$Id: conn-func.c,v 1.7 2005/07/07 18:39:45 fw Exp $";
 
 #include "imp.h"
 #include <assert.h>
 #include <log.h>
 
 #include "conn.h"
+#include "client.h"
 
 #include "exp.h"
 #include "conn-func.h"
@@ -157,14 +158,25 @@ 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 = Client_GetFromConn(Idx);
+       if(c != NULL)
+               return Client_StartTime(c);
+
+       return 0;
+} /* Conn_StartTime */
 
 
 GLOBAL int
@@ -174,10 +186,11 @@ Conn_SendQ( CONN_ID Idx )
 
        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 */
 
 
@@ -208,10 +221,11 @@ Conn_RecvQ( CONN_ID Idx )
 
        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 */