X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=src%2Fngircd%2Fconn.h;h=4a8b6777e8d714843a74df818c33e7a81984df81;hp=65df14ca21756931c5bf3caea5706cd97bec6e31;hb=b68bb560e9140c0ec783ea02773aef50d11ac06d;hpb=4715b17106a3cf4181833670e713be2a307c6a62

diff --git a/src/ngircd/conn.h b/src/ngircd/conn.h
index 65df14ca..4a8b6777 100644
--- a/src/ngircd/conn.h
+++ b/src/ngircd/conn.h
@@ -1,42 +1,58 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2011 Alexander Barton (alex@barton.de) and Contributors.
  *
  * 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
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  * Please read the file COPYING, README and AUTHORS for more information.
- *
- * $Id: conn.h,v 1.37 2005/07/11 14:56:38 fw Exp $
- *
- * Connection management (header)
  */
 
-
 #ifndef __conn_h__
 #define __conn_h__
 
+/**
+ * @file
+ * Connection management (header)
+ */
 
 #include <time.h>			/* for time_t, see below */
 
-
-#define CONN_ISCLOSING		1U	/* Conn_Close() already called */
-#define CONN_ISCONNECTING	2U	/* connect() in progress */
-
+/*
+ * 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		4U	/* zlib compressed link */
+#define CONN_ZIP		8	/* zlib compressed link */
 #endif
 
+#include "conf-ssl.h"
 
+#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 int CONN_ID;
 
+#include "client.h"
+#include "proc.h"
 
 #ifdef CONN_MODULE
 
 #include "defines.h"
-#include "resolve.h"
 #include "array.h"
+#include "tool.h"
+#include "ng_ipaddr.h"
 
 #ifdef ZLIB
 #include <zlib.h>
@@ -53,11 +69,13 @@ typedef struct _ZipData
 typedef struct _Connection
 {
 	int sock;			/* Socket handle */
-	struct sockaddr_in addr;	/* Client address */
-	RES_STAT *res_stat;		/* Status of resolver process, if any */
+	ng_ipaddr_t addr;		/* Client address */
+	PROC_STAT proc_stat;		/* Status of resolver process */
 	char host[HOST_LEN];		/* Hostname */
+	char *pwd;			/* password received of the client */
 	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 */
@@ -66,9 +84,17 @@ 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 */
 #endif  /* ZLIB */
+#ifdef SSL_SUPPORT
+	struct ConnSSL_State ssl_state;	/* SSL/GNUTLS state information */
+#endif
+#ifndef STRICT_RFC
+	long auth_ping;			/** PING response expected on login */
+#endif
 } CONNECTION;
 
 GLOBAL CONNECTION *My_Connections;
@@ -81,24 +107,50 @@ GLOBAL long WCounter;
 GLOBAL void Conn_Init PARAMS((void ));
 GLOBAL void Conn_Exit PARAMS(( void ));
 
-GLOBAL int Conn_InitListeners PARAMS(( void ));
+GLOBAL void Conn_CloseAllSockets PARAMS((int ExceptOf));
+
+GLOBAL unsigned int Conn_InitListeners PARAMS(( void ));
 GLOBAL void Conn_ExitListeners PARAMS(( void ));
 
 GLOBAL void Conn_Handler PARAMS(( void ));
 
-GLOBAL bool Conn_Write PARAMS(( CONN_ID Idx, char *Data, unsigned int Len ));
-GLOBAL bool Conn_WriteStr PARAMS(( CONN_ID Idx, char *Format, ... ));
+GLOBAL bool Conn_WriteStr PARAMS(( CONN_ID Idx, const char *Format, ... ));
 
-GLOBAL void Conn_Close PARAMS(( CONN_ID Idx, char *LogMsg, char *FwdMsg, bool InformClient ));
+GLOBAL char* Conn_Password PARAMS(( CONN_ID Idx ));
+GLOBAL void Conn_SetPassword PARAMS(( CONN_ID Idx, const char *Pwd ));
+
+GLOBAL void Conn_Close PARAMS(( CONN_ID Idx, const char *LogMsg, const char *FwdMsg, bool InformClient ));
 
 GLOBAL void Conn_SyncServerStruct PARAMS(( void ));
 
-GLOBAL void Read_Resolver_Result PARAMS(( int x ));
+GLOBAL CONN_ID Conn_GetFromProc PARAMS((int fd));
+GLOBAL CLIENT* Conn_GetClient PARAMS((CONN_ID i));
+GLOBAL PROC_STAT* Conn_GetProcStat 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
 
-GLOBAL int Conn_MaxFD;
+GLOBAL const char *Conn_GetIPAInfo PARAMS((CONN_ID Idx));
 
+GLOBAL long Conn_Count PARAMS((void));
+GLOBAL long Conn_CountMax PARAMS((void));
+GLOBAL long Conn_CountAccepted PARAMS((void));
 
+#ifndef STRICT_RFC
+GLOBAL long Conn_GetAuthPing PARAMS((CONN_ID Idx));
+GLOBAL void Conn_SetAuthPing PARAMS((CONN_ID Idx, long ID));
 #endif
 
+#ifdef DEBUG
+GLOBAL void Conn_DebugDump PARAMS((void));
+#endif
+
+#endif
 
 /* -eof- */