Fix "implicit conversion shortens 64-bit value" warning

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

diff --git a/src/ngircd/conn.h b/src/ngircd/conn.h
index bd332b63b394ef01cc989fcc1b580b419d4d8e9b..983c88448d9a9cb004c8b38dcd233c1a4696d923 100644 (file)
--- a/src/ngircd/conn.h
+++ b/src/ngircd/conn.h
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2008 by Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2009 by Alexander Barton (alex@barton.de)
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -39,8 +39,9 @@
 #define CONN_SSL               32      /* this connection is SSL encrypted */
 #define CONN_SSL_WANT_WRITE    64      /* SSL/TLS library needs to write protocol data */
 #define CONN_SSL_WANT_READ     128     /* SSL/TLS library needs to read protocol data */
+#define CONN_SSL_FLAGS_ALL     (CONN_SSL_CONNECT|CONN_SSL|CONN_SSL_WANT_WRITE|CONN_SSL_WANT_READ)
 #endif
-typedef int CONN_ID;
+typedef long CONN_ID;
 
 #include "client.h"
 
@@ -81,6 +82,7 @@ typedef struct _Connection
        long msg_in, msg_out;           /* Received and sent IRC messages */
        int flag;                       /* Flag (see "irc-write" module) */
        UINT16 options;                 /* Link options / connection state */
+       UINT16 bps;                     /* bytes processed within last second */
        CLIENT *client;                 /* pointer to client structure */
 #ifdef ZLIB
        ZIPDATA zip;                    /* Compression information */
@@ -107,7 +109,7 @@ GLOBAL void Conn_Handler PARAMS(( void ));
 
 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_Close PARAMS(( CONN_ID Idx, const char *LogMsg, const char *FwdMsg, bool InformClient ));
 
 GLOBAL void Conn_SyncServerStruct PARAMS(( void ));
 
@@ -120,4 +122,5 @@ static inline bool Conn_UsesSSL(UNUSED CONN_ID Idx) { return false; }
 #endif
 #endif
 
+
 /* -eof- */