Implement the IRC command "SERVLIST"

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

diff --git a/src/ngircd/conn.h b/src/ngircd/conn.h
index 9a794a1e2236cf351817816c75149aea57a63cab..08f6dde01766040d4cdd0b333de1a39be80ac273 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,2002 by Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2008 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
@@ -8,8 +8,6 @@
  * (at your option) any later version.
  * Please read the file COPYING, README and AUTHORS for more information.
  *
- * $Id: conn.h,v 1.43 2007/04/04 21:52:12 fw Exp $
- *
  * Connection management (header)
  */
 
@@ -23,12 +21,19 @@
 
 #define CONN_ISCLOSING         1       /* Conn_Close() already called */
 #define CONN_ISCONNECTING      2       /* connect() in progress */
-
+#define CONN_RFC1459           4       /* RFC 1459 compatibility mode */
 #ifdef ZLIB
-#define CONN_ZIP               4       /* zlib compressed link */
+#define CONN_ZIP               8       /* zlib compressed link */
 #endif
 
+#include "conf-ssl.h"
 
+#ifdef SSL_SUPPORT
+#define CONN_SSL_CONNECT       8       /* wait for ssl connect to finish */
+#define CONN_SSL               16      /* this connection is SSL encrypted */
+#define CONN_SSL_WANT_WRITE    32      /* SSL/TLS library needs to write protocol data */
+#define CONN_SSL_WANT_READ     64      /* SSL/TLS library needs to read protocol data */
+#endif
 typedef int CONN_ID;
 
 #include "client.h"
@@ -38,6 +43,8 @@ typedef int CONN_ID;
 #include "defines.h"
 #include "resolve.h"
 #include "array.h"
+#include "tool.h"
+#include "ng_ipaddr.h"
 
 #ifdef ZLIB
 #include <zlib.h>
@@ -54,11 +61,12 @@ typedef struct _ZipData
 typedef struct _Connection
 {
        int sock;                       /* Socket handle */
-       struct sockaddr_in addr;        /* Client address */
+       ng_ipaddr_t addr;               /* Client address */
        RES_STAT res_stat;              /* Status of resolver process */
        char host[HOST_LEN];            /* Hostname */
        array rbuf;                     /* Read buffer */
        array wbuf;                     /* Write buffer */
+       time_t signon;                  /* Signon ("connect") time */
        time_t lastdata;                /* Last activity */
        time_t lastping;                /* Last PING */
        time_t lastprivmsg;             /* Last PRIVMSG */
@@ -71,6 +79,9 @@ typedef struct _Connection
 #ifdef ZLIB
        ZIPDATA zip;                    /* Compression information */
 #endif  /* ZLIB */
+#ifdef SSL_SUPPORT
+       struct ConnSSL_State    ssl_state;      /* SSL/GNUTLS state information */
+#endif
 } CONNECTION;
 
 GLOBAL CONNECTION *My_Connections;
@@ -88,7 +99,6 @@ GLOBAL void Conn_ExitListeners PARAMS(( void ));
 
 GLOBAL void Conn_Handler PARAMS(( void ));
 
-GLOBAL bool Conn_Write PARAMS(( CONN_ID Idx, char *Data, size_t 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 ));
@@ -96,6 +106,12 @@ GLOBAL void Conn_Close PARAMS(( CONN_ID Idx, char *LogMsg, char *FwdMsg, bool In
 GLOBAL void Conn_SyncServerStruct PARAMS(( void ));
 
 GLOBAL CLIENT* Conn_GetClient PARAMS((CONN_ID i));
+#ifdef SSL_SUPPORT
+GLOBAL bool Conn_GetCipherInfo PARAMS((CONN_ID Idx, char *buf, size_t len));
+GLOBAL bool Conn_UsesSSL PARAMS((CONN_ID Idx));
+#else
+static inline bool Conn_UsesSSL(UNUSED CONN_ID Idx) { return false; }
+#endif
 #endif
 
 /* -eof- */