The KILL command killed much more than desired (including server links!)

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

diff --git a/src/ngircd/conn.h b/src/ngircd/conn.h
index ffbfe64a909d9813ebb05fc6aded31bf9cbe168f..d9c81a8cb259724716bea94c2a693a3b3e543c7a 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.31 2003/03/27 01:20:22 alex Exp $
+ * $Id: conn.h,v 1.38 2005/07/30 22:53:16 alex Exp $
  *
  * Connection management (header)
  */
@@ -18,87 +18,84 @@
 #define __conn_h__
 
 
-#include <time.h>                      /* fro time_t, see below */
+#include <time.h>                      /* for time_t, see below */
 
 
-#define CONN_ISCLOSING 1               /* Conn_Close() already called */
+#define CONN_ISCLOSING         1       /* Conn_Close() already called */
+#define CONN_ISCONNECTING      2       /* connect() in progress */
 
-#ifdef USE_ZLIB
-#define CONN_ZIP 2                     /* zlib compressed link */
+#ifdef ZLIB
+#define CONN_ZIP               4       /* zlib compressed link */
 #endif
 
 
-typedef INT CONN_ID;
+typedef int CONN_ID;
 
 
 #ifdef CONN_MODULE
 
 #include "defines.h"
 #include "resolve.h"
+#include "array.h"
 
-#ifdef USE_ZLIB
+#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!) */
+       array rbuf;                     /* Read buffer (compressed) */
+       array wbuf;                     /* Write buffer (uncompressed) */
+       long bytes_in, bytes_out;       /* Counter for statistics (uncompressed!) */
 } ZIPDATA;
-#endif /* USE_ZLIB */
+#endif /* ZLIB */
 
 typedef struct _Connection
 {
-       INT sock;                       /* Socket handle */
+       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 starttime;               /* Start time of link */
+       char host[HOST_LEN];            /* Hostname */
+       array rbuf;                     /* Read buffer */
+       array wbuf;                     /* 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) */
-       INT options;                    /* Link options */
-#ifdef USE_ZLIB
+       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  /* USE_ZLIB */
+#endif  /* ZLIB */
 } CONNECTION;
 
 GLOBAL CONNECTION *My_Connections;
 GLOBAL CONN_ID Pool_Size;
-GLOBAL LONG WCounter;
+GLOBAL long WCounter;
 
 #endif /* CONN_MODULE */
 
 
-GLOBAL VOID Conn_Init PARAMS((VOID ));
-GLOBAL VOID Conn_Exit PARAMS(( VOID ));
+GLOBAL void Conn_Init PARAMS((void ));
+GLOBAL void Conn_Exit PARAMS(( void ));
 
-GLOBAL INT Conn_InitListeners PARAMS(( VOID ));
-GLOBAL VOID Conn_ExitListeners PARAMS(( VOID ));
+GLOBAL int Conn_InitListeners PARAMS(( void ));
+GLOBAL void Conn_ExitListeners PARAMS(( void ));
 
-GLOBAL BOOLEAN Conn_NewListener PARAMS(( CONST UINT Port ));
+GLOBAL void Conn_Handler PARAMS(( void ));
 
-GLOBAL VOID Conn_Handler PARAMS(( VOID ));
+GLOBAL bool Conn_Write PARAMS(( CONN_ID Idx, char *Data, unsigned int Len ));
+GLOBAL bool Conn_WriteStr PARAMS(( CONN_ID Idx, char *Format, ... ));
 
-GLOBAL BOOLEAN Conn_Write PARAMS(( CONN_ID Idx, CHAR *Data, INT Len ));
-GLOBAL BOOLEAN Conn_WriteStr PARAMS(( CONN_ID Idx, CHAR *Format, ... ));
+GLOBAL void Conn_Close PARAMS(( CONN_ID Idx, char *LogMsg, char *FwdMsg, bool InformClient ));
 
-GLOBAL VOID Conn_Close PARAMS(( CONN_ID Idx, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN InformClient ));
+GLOBAL void Conn_SyncServerStruct PARAMS(( void ));
 
-GLOBAL VOID Conn_SyncServerStruct PARAMS(( VOID ));
+GLOBAL void Read_Resolver_Result PARAMS(( int x ));
 
-GLOBAL INT Conn_MaxFD;
+GLOBAL int Conn_MaxFD;
 
 
 #endif