Removed "USE_" prefixes of configuration #defines.

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

diff --git a/src/ngircd/conn.h b/src/ngircd/conn.h
index 130cea06579e89a02ed196a84dd869e18d919cf3..91be9d622c5cc5c3953057e6cb315b15b9612832 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.28 2002/12/30 16:07:23 alex Exp $
+ * $Id: conn.h,v 1.32 2003/12/26 15:55:07 alex Exp $
  *
  * Connection management (header)
  */
@@ -18,23 +18,25 @@
 #define __conn_h__
 
 
-#include <time.h>                      /* wg. time_t, s.u. */
+#include <time.h>                      /* fro time_t, see below */
 
 
-#ifdef USE_ZLIB
-#define CONN_ZIP 4                     /* Kompression mit zlib */
+#define CONN_ISCLOSING 1               /* Conn_Close() already called */
+
+#ifdef ZLIB
+#define CONN_ZIP 2                     /* zlib compressed link */
 #endif
 
 
 typedef INT CONN_ID;
 
 
-#if defined(__conn_c__) || defined(__conn_zip_c__)
+#ifdef CONN_MODULE
 
 #include "defines.h"
 #include "resolve.h"
 
-#ifdef USE_ZLIB
+#ifdef ZLIB
 #include <zlib.h>
 typedef struct _ZipData
 {
@@ -46,7 +48,7 @@ typedef struct _ZipData
        INT wdatalen;                   /* Length of data in write buffer (uncompressed) */
        LONG bytes_in, bytes_out;       /* Counter for statistics (uncompressed!) */
 } ZIPDATA;
-#endif /* USE_ZLIB */
+#endif /* ZLIB */
 
 typedef struct _Connection
 {
@@ -67,15 +69,16 @@ typedef struct _Connection
        LONG msg_in, msg_out;           /* Received and sent IRC messages */
        INT flag;                       /* Flag (see "irc-write" module) */
        INT options;                    /* Link options */
-#ifdef USE_ZLIB
+#ifdef ZLIB
        ZIPDATA zip;                    /* Compression information */
-#endif  /* USE_ZLIB */
+#endif  /* ZLIB */
 } CONNECTION;
 
 GLOBAL CONNECTION *My_Connections;
 GLOBAL CONN_ID Pool_Size;
+GLOBAL LONG WCounter;
 
-#endif /* defined() */
+#endif /* CONN_MODULE */
 
 
 GLOBAL VOID Conn_Init PARAMS((VOID ));
@@ -93,34 +96,7 @@ GLOBAL BOOLEAN Conn_WriteStr PARAMS(( CONN_ID Idx, CHAR *Format, ... ));
 
 GLOBAL VOID Conn_Close PARAMS(( CONN_ID Idx, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN InformClient ));
 
-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_ClearFlags PARAMS(( VOID ));
-GLOBAL INT Conn_Flag PARAMS(( CONN_ID Idx ));
-GLOBAL VOID Conn_SetFlag PARAMS(( CONN_ID Idx, INT Flag ));
-
-GLOBAL CONN_ID Conn_First PARAMS(( VOID ));
-GLOBAL CONN_ID Conn_Next PARAMS(( CONN_ID Idx ));
-
-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_ResetWCounter PARAMS(( VOID ));
-GLOBAL LONG Conn_WCounter PARAMS(( VOID ));
-
+GLOBAL VOID Conn_SyncServerStruct PARAMS(( VOID ));
 
 GLOBAL INT Conn_MaxFD;