Removed CONNECTION[].starttime, now saved in CLIENT structure.

[ngircd.git] / src / ngircd / conn.h

diff --git a/src/ngircd/conn.h b/src/ngircd/conn.h
index d2edc4fa09a738a8f5b78bf4bfa5ca080927f475..e1f34f9fafd371933858241a50fdcd3a7678b499 100644 (file)
--- a/src/ngircd/conn.h
+++ b/src/ngircd/conn.h
@@ -8,7 +8,7 @@
  * (at your option) any later version.
  * Please read the file COPYING, README and AUTHORS for more information.
  *
- * $Id: conn.h,v 1.27 2002/12/30 00:01:45 alex Exp $
+ * $Id: conn.h,v 1.35 2005/06/12 16:28:55 alex Exp $
  *
  * Connection management (header)
  */
@@ -18,68 +18,87 @@
 #define __conn_h__
 
 
-#include <time.h>                      /* wg. time_t, s.u. */
+#include <time.h>                      /* for time_t, see below */
 
 
-#ifdef USE_ZLIB
-#define CONN_ZIP 4                     /* Kompression mit zlib */
+#define CONN_ISCLOSING         1U      /* Conn_Close() already called */
+#define CONN_ISCONNECTING      2U      /* connect() in progress */
+
+#ifdef ZLIB
+#define CONN_ZIP               4U      /* zlib compressed link */
 #endif
 
 
-typedef INT CONN_ID;
+typedef int CONN_ID;
 
 
-GLOBAL VOID Conn_Init PARAMS((VOID ));
-GLOBAL VOID Conn_Exit PARAMS(( VOID ));
+#ifdef CONN_MODULE
 
-GLOBAL INT Conn_InitListeners PARAMS(( VOID ));
-GLOBAL VOID Conn_ExitListeners PARAMS(( VOID ));
+#include "defines.h"
+#include "resolve.h"
 
-GLOBAL BOOLEAN Conn_NewListener PARAMS(( CONST UINT Port ));
+#ifdef ZLIB
+#include <zlib.h>
+typedef struct _ZipData
+{
+       z_stream in;                    /* "Handle" for input stream */
+       z_stream out;                   /* "Handle" for output stream */
+       char rbuf[READBUFFER_LEN];      /* Read buffer */
+       int rdatalen;                   /* Length of data in read buffer (compressed) */
+       char wbuf[WRITEBUFFER_LEN];     /* Write buffer */
+       int wdatalen;                   /* Length of data in write buffer (uncompressed) */
+       long bytes_in, bytes_out;       /* Counter for statistics (uncompressed!) */
+} ZIPDATA;
+#endif /* ZLIB */
 
-GLOBAL VOID Conn_Handler PARAMS(( VOID ));
+typedef struct _Connection
+{
+       int sock;                       /* Socket handle */
+       struct sockaddr_in addr;        /* Client address */
+       RES_STAT *res_stat;             /* Status of resolver process, if any */
+       char host[HOST_LEN];            /* Hostname */
+       char rbuf[READBUFFER_LEN];      /* Read buffer */
+       int rdatalen;                   /* Length of data in read buffer */
+       char wbuf[WRITEBUFFER_LEN];     /* Write buffer */
+       int wdatalen;                   /* Length of data in write buffer */
+       time_t lastdata;                /* Last activity */
+       time_t lastping;                /* Last PING */
+       time_t lastprivmsg;             /* Last PRIVMSG */
+       time_t delaytime;               /* Ignore link ("penalty") */
+       long bytes_in, bytes_out;       /* Received and sent bytes */
+       long msg_in, msg_out;           /* Received and sent IRC messages */
+       int flag;                       /* Flag (see "irc-write" module) */
+       UINT16 options;                 /* Link options / connection state */
+#ifdef ZLIB
+       ZIPDATA zip;                    /* Compression information */
+#endif  /* ZLIB */
+} CONNECTION;
 
-GLOBAL BOOLEAN Conn_Write PARAMS(( CONN_ID Idx, CHAR *Data, INT Len ));
-GLOBAL BOOLEAN Conn_WriteStr PARAMS(( CONN_ID Idx, CHAR *Format, ... ));
+GLOBAL CONNECTION *My_Connections;
+GLOBAL CONN_ID Pool_Size;
+GLOBAL long WCounter;
 
-GLOBAL VOID Conn_Close PARAMS(( CONN_ID Idx, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN InformClient ));
+#endif /* CONN_MODULE */
 
-GLOBAL VOID Conn_UpdateIdle PARAMS(( CONN_ID Idx ));
-GLOBAL time_t Conn_GetIdle PARAMS(( CONN_ID Idx ));
-GLOBAL time_t Conn_LastPing PARAMS(( CONN_ID Idx ));
-GLOBAL time_t Conn_StartTime PARAMS(( CONN_ID Idx ));
-GLOBAL INT Conn_SendQ PARAMS(( CONN_ID Idx ));
-GLOBAL INT Conn_RecvQ PARAMS(( CONN_ID Idx ));
-GLOBAL LONG Conn_SendMsg PARAMS(( CONN_ID Idx ));
-GLOBAL LONG Conn_RecvMsg PARAMS(( CONN_ID Idx ));
-GLOBAL LONG Conn_SendBytes PARAMS(( CONN_ID Idx ));
-GLOBAL LONG Conn_RecvBytes PARAMS(( CONN_ID Idx ));
 
-GLOBAL VOID Conn_SetPenalty PARAMS(( CONN_ID Idx, time_t Seconds ));
-GLOBAL VOID Conn_ResetPenalty PARAMS(( CONN_ID Idx ));
+GLOBAL void Conn_Init PARAMS((void ));
+GLOBAL void Conn_Exit PARAMS(( void ));
 
-GLOBAL VOID Conn_ClearFlags PARAMS(( VOID ));
-GLOBAL INT Conn_Flag PARAMS(( CONN_ID Idx ));
-GLOBAL VOID Conn_SetFlag PARAMS(( CONN_ID Idx, INT Flag ));
+GLOBAL int Conn_InitListeners PARAMS(( void ));
+GLOBAL void Conn_ExitListeners PARAMS(( void ));
 
-GLOBAL CONN_ID Conn_First PARAMS(( VOID ));
-GLOBAL CONN_ID Conn_Next PARAMS(( CONN_ID Idx ));
+GLOBAL bool Conn_NewListener PARAMS(( const UINT16 Port ));
 
-GLOBAL VOID Conn_SetOption PARAMS(( CONN_ID Idx, INT Option ));
-GLOBAL VOID Conn_UnsetOption PARAMS(( CONN_ID Idx, INT Option ));
-GLOBAL INT Conn_Options PARAMS(( CONN_ID Idx ));
+GLOBAL void Conn_Handler PARAMS(( void ));
 
-#ifdef USE_ZLIB
-GLOBAL BOOLEAN Conn_InitZip PARAMS(( CONN_ID Idx ));
-GLOBAL LONG Conn_SendBytesZip PARAMS(( CONN_ID Idx ));
-GLOBAL LONG Conn_RecvBytesZip PARAMS(( CONN_ID Idx ));
-#endif
+GLOBAL bool Conn_Write PARAMS(( CONN_ID Idx, char *Data, int Len ));
+GLOBAL bool Conn_WriteStr PARAMS(( CONN_ID Idx, char *Format, ... ));
 
-GLOBAL VOID Conn_ResetWCounter PARAMS(( VOID ));
-GLOBAL LONG Conn_WCounter PARAMS(( VOID ));
+GLOBAL void Conn_Close PARAMS(( CONN_ID Idx, char *LogMsg, char *FwdMsg, bool InformClient ));
 
+GLOBAL void Conn_SyncServerStruct PARAMS(( void ));
 
-GLOBAL INT Conn_MaxFD;
+GLOBAL int Conn_MaxFD;
 
 
 #endif