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 bce42371ea8117b6c6dedb01385b6977a759cd21..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.34 2005/04/18 21:08:31 fw Exp $
+ * $Id: conn.h,v 1.38 2005/07/30 22:53:16 alex Exp $
  *
  * Connection management (header)
  */
@@ -21,11 +21,11 @@
 #include <time.h>                      /* for time_t, see below */
 
 
-#define CONN_ISCLOSING         1U      /* Conn_Close() already called */
-#define CONN_ISCONNECTING      2U      /* connect() in progress */
+#define CONN_ISCLOSING         1       /* Conn_Close() already called */
+#define CONN_ISCONNECTING      2       /* connect() in progress */
 
 #ifdef ZLIB
-#define CONN_ZIP               4U      /* zlib compressed link */
+#define CONN_ZIP               4       /* zlib compressed link */
 #endif
 
 
@@ -36,6 +36,7 @@ typedef int CONN_ID;
 
 #include "defines.h"
 #include "resolve.h"
+#include "array.h"
 
 #ifdef ZLIB
 #include <zlib.h>
@@ -43,10 +44,8 @@ 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) */
+       array rbuf;                     /* Read buffer (compressed) */
+       array wbuf;                     /* Write buffer (uncompressed) */
        long bytes_in, bytes_out;       /* Counter for statistics (uncompressed!) */
 } ZIPDATA;
 #endif /* ZLIB */
@@ -57,11 +56,8 @@ typedef struct _Connection
        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 */
+       array rbuf;                     /* Read buffer */
+       array wbuf;                     /* Write buffer */
        time_t lastdata;                /* Last activity */
        time_t lastping;                /* Last PING */
        time_t lastprivmsg;             /* Last PRIVMSG */
@@ -88,17 +84,17 @@ GLOBAL void Conn_Exit PARAMS(( void ));
 GLOBAL int Conn_InitListeners PARAMS(( void ));
 GLOBAL void Conn_ExitListeners PARAMS(( void ));
 
-GLOBAL bool Conn_NewListener PARAMS(( const UINT16 Port ));
-
 GLOBAL void Conn_Handler PARAMS(( void ));
 
-GLOBAL bool Conn_Write PARAMS(( CONN_ID Idx, char *Data, int Len ));
+GLOBAL bool Conn_Write PARAMS(( CONN_ID Idx, char *Data, unsigned int Len ));
 GLOBAL bool 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_SyncServerStruct PARAMS(( void ));
 
+GLOBAL void Read_Resolver_Result PARAMS(( int x ));
+
 GLOBAL int Conn_MaxFD;