X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fngircd%2Fconn.h;h=f2ec823ea6ee25bed5af38149263cbd228a6a2f7;hb=8605e9c0fe7ffa42149271c9af31288bd4a0dfac;hp=ffbfe64a909d9813ebb05fc6aded31bf9cbe168f;hpb=59a0fb8cd999d07ce46b1c5d071d9765af9ddbe8;p=ngircd-alex.git diff --git a/src/ngircd/conn.h b/src/ngircd/conn.h index ffbfe64a..f2ec823e 100644 --- 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-2010 Alexander Barton * * 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.31 2003/03/27 01:20:22 alex Exp $ - * * Connection management (header) */ @@ -18,90 +16,115 @@ #define __conn_h__ -#include /* fro time_t, see below */ - +#include /* for time_t, see below */ -#define CONN_ISCLOSING 1 /* Conn_Close() already called */ - -#ifdef USE_ZLIB -#define CONN_ZIP 2 /* zlib compressed link */ +/* + * connection state flags. this is a bitmask -- all values must + * be unique and a power of two. + * + * If you introduce new ones in between, make sure to adjust all + * remaining ones. + */ +#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 8 /* zlib compressed link */ #endif +#include "conf-ssl.h" -typedef INT CONN_ID; +#ifdef SSL_SUPPORT +#define CONN_SSL_CONNECT 16 /* wait for ssl connect to finish */ +#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 long CONN_ID; +#include "client.h" #ifdef CONN_MODULE #include "defines.h" #include "resolve.h" +#include "array.h" +#include "tool.h" +#include "ng_ipaddr.h" -#ifdef USE_ZLIB +#ifdef ZLIB #include 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 */ - 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 */ + int sock; /* Socket handle */ + 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 */ 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 */ + UINT16 bps; /* bytes processed within last second */ + CLIENT *client; /* pointer to client structure */ +#ifdef ZLIB ZIPDATA zip; /* Compression information */ -#endif /* USE_ZLIB */ +#endif /* ZLIB */ +#ifdef SSL_SUPPORT + struct ConnSSL_State ssl_state; /* SSL/GNUTLS state information */ +#endif } 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 INT Conn_InitListeners PARAMS(( VOID )); -GLOBAL VOID Conn_ExitListeners PARAMS(( VOID )); - -GLOBAL BOOLEAN Conn_NewListener PARAMS(( CONST UINT Port )); +GLOBAL void Conn_Init PARAMS((void )); +GLOBAL void Conn_Exit PARAMS(( void )); -GLOBAL VOID Conn_Handler PARAMS(( VOID )); +GLOBAL unsigned int Conn_InitListeners PARAMS(( void )); +GLOBAL void Conn_ExitListeners PARAMS(( void )); -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_Handler PARAMS(( void )); -GLOBAL VOID Conn_Close PARAMS(( CONN_ID Idx, CHAR *LogMsg, CHAR *FwdMsg, BOOLEAN InformClient )); +GLOBAL bool Conn_WriteStr PARAMS(( CONN_ID Idx, char *Format, ... )); -GLOBAL VOID Conn_SyncServerStruct PARAMS(( VOID )); - -GLOBAL INT Conn_MaxFD; +GLOBAL void Conn_Close PARAMS(( CONN_ID Idx, const char *LogMsg, const char *FwdMsg, bool InformClient )); +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 +GLOBAL long Conn_Count PARAMS((void)); +GLOBAL long Conn_CountMax PARAMS((void)); +GLOBAL long Conn_CountAccepted PARAMS((void)); + /* -eof- */