ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/svn/ircd-hybrid/trunk/include/client.h

Comparing:
ircd-hybrid-8/include/client.h (file contents), Revision 1559 by michael, Sun Oct 14 01:38:28 2012 UTC vs.
ircd-hybrid/trunk/include/client.h (file contents), Revision 3518 by michael, Mon May 12 19:06:39 2014 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2002 by the past and present ircd coders, and others.
4	>	*  Copyright (c) 1997-2014 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 34 | Line 34
34		#include "ircd_defs.h"
35		#include "dbuf.h"
36		#include "channel.h"
37	+	#include "auth.h"
38
39	<
39	<	/*! \brief addr_mask_type enumeration */
40	<	enum addr_mask_type
41	<	{
42	<	HIDE_IP, /**< IP is hidden. Resolved hostname is shown instead */
43	<	SHOW_IP, /**< IP is shown. No parts of it are hidden or masked */
44	<	MASK_IP  /**< IP is masked. 255.255.255.255 is shown instead */
45	<	};
46	<
47	<	/*! \brief Server structure */
48	<	struct Server
49	<	{
50	<	dlink_list server_list; /**< Servers on this server */
51	<	dlink_list client_list; /**< Clients on this server */
52	<	char by[NICKLEN + 1];   /**< who activated this connection */
53	<	};
54	<
55	<	/*! \brief ListTask structure */
56	<	struct ListTask
57	<	{
58	<	dlink_list show_mask; /**< show these channels.. */
59	<	dlink_list hide_mask; /**< ..and hide these ones */
60	<
61	<	unsigned int hash_index; /**< the bucket we are currently in */
62	<	unsigned int users_min;
63	<	unsigned int users_max;
64	<	unsigned int created_min;
65	<	unsigned int created_max;
66	<	unsigned int topicts_min;
67	<	unsigned int topicts_max;
68	<	};
69	<
70	<	/*! \brief LocalUser structure
71	<	*
72	<	* Allocated only for local clients, that are directly connected
73	<	* to \b this server with a socket.
74	<	*/
75	<	struct LocalUser
76	<	{
77	<	dlink_node   lclient_node;
78	<
79	<	char         client_host[HOSTLEN + 1];
80	<	char         client_server[HOSTLEN + 1];
81	<
82	<	unsigned int registration;
83	<	unsigned int cap_client;    /**< Client capabilities (from us) */
84	<	unsigned int cap_active;    /**< Active capabilities (to us) */
85	<	unsigned int       caps;       /**< capabilities bit-field */
86	<
87	<	unsigned int operflags;     /**< IRC Operator privilege flags */
88	<	unsigned int random_ping; /**< Holding a 32bit value used for PING cookies */
89	<
90	<	unsigned int serial;     /**< used to enforce 1 send per nick */
91	<
92	<	time_t       lasttime;   /**< ...should be only LOCAL clients? --msa */
93	<	time_t       firsttime;  /**< time client was created */
94	<	time_t       since;      /**< last time we parsed something */
95	<	time_t       last_knock;    /**< time of last knock */
96	<	time_t       last_join_time;   /**< when this client last
97	<	joined a channel */
98	<	time_t       last_leave_time;  /**< when this client last
99	<	* left a channel */
100	<	int          join_leave_count; /**< count of JOIN/LEAVE in less than
101	<	MIN_JOIN_LEAVE_TIME seconds */
102	<	int          oper_warn_count_down; /**< warn opers of this possible
103	<	spambot every time this gets to 0 */
104	<	time_t       last_caller_id_time;
105	<	time_t       first_received_message_time;
106	<	time_t       last_nick_change;
107	<	time_t       last_privmsg; /**< Last time we got a PRIVMSG */
108	<	time_t       last_away; /**< Away since... */
109	<
110	<	int          received_number_of_privmsgs;
111	<	unsigned int number_of_nick_changes;
112	<
113	<	struct ListTask  *list_task;
114	<
115	<	struct dbuf_queue buf_sendq;
116	<	struct dbuf_queue buf_recvq;
117	<
118	<	struct {
119	<	unsigned int messages;      /**< Statistics: protocol messages sent/received */
120	<	uint64_t bytes;             /**< Statistics: total bytes sent/received */
121	<	} recv, send;
122	<
123	<	struct AuthRequest *auth;
124	<	struct Listener *listener;   /**< listener accepted from */
125	<	dlink_list        acceptlist; /**< clients I'll allow to talk to me */
126	<	dlink_list        watches;   /**< chain of Watch pointer blocks */
127	<	dlink_list        confs;     /**< Configuration record associated */
128	<	dlink_list        invited;   /**< chain of invite pointer blocks */
129	<	struct irc_ssaddr ip;
130	<	int               aftype;    /**< Makes life easier for DNS res in IPV6 */
131	<
132	<	char              *passwd;
133	<	fde_t             fd;
134	<
135	<	/* Anti-flood stuff. We track how many messages were parsed and how
136	<	* many we were allowed in the current second, and apply a simple
137	<	* decay to avoid flooding.
138	<	*   -- adrian
139	<	*/
140	<	int allow_read;       /**< how many we're allowed to read in this second */
141	<	int sent_parsed;      /**< how many messages we've parsed in this second */
142	<
143	<	char*          response;  /**< expected response from client */
144	<	char*          auth_oper; /**< Operator to become if they supply the response.*/
145	<	};
146	<
147	<	/*! \brief Client structure */
148	<	struct Client
149	<	{
150	<	dlink_node node;
151	<	dlink_node lnode;             /**< Used for Server->servers/users */
152	<
153	<	struct LocalUser *localClient;
154	<	struct Client    *hnext;      /**< For client hash table lookups by name */
155	<	struct Client    *idhnext;    /**< For SID hash table lookups by sid */
156	<	struct Server    *serv;       /**< ...defined, if this is a server */
157	<	struct Client    *servptr;    /**< Points to server this Client is on */
158	<	struct Client    *from;       /**< == self, if Local Client, *NEVER* NULL! */
159	<
160	<	time_t            tsinfo;     /**< TS on the nick, SVINFO on server */
161	<
162	<	unsigned int      flags;      /**< client flags */
163	<	unsigned int      umodes;     /**< opers, normal users subset */
164	<	unsigned int      hopcount;   /**< number of servers to this 0 = local */
165	<	unsigned int      status;     /**< Client type */
166	<	unsigned int      handler;    /**< Handler index */
167	<
168	<	dlink_list        whowas;
169	<	dlink_list        channel;   /**< chain of channel pointer blocks */
170	<
171	<	char away[AWAYLEN + 1]; /**< Client's AWAY message. Can be set/unset via AWAY command */
172	<	char name[HOSTLEN + 1]; /**< unique name for a client nick or host */
173	<	char svid[HOSTLEN + 1]; /**< Services ID. XXX: Going with HOSTLEN for now. NICKLEN might be too small
174	<	if dealing with timestamps */
175	<	char id[IDLEN + 1];       /**< client ID, unique ID per client */
176	<	/*
177	<	* client->username is the username from ident or the USER message,
178	<	* If the client is idented the USER message is ignored, otherwise
179	<	* the username part of the USER message is put here prefixed with a
180	<	* tilde depending on the auth{} block. Once a client has registered,
181	<	* this field should be considered read-only.
182	<	*/
183	<	char              username[USERLEN + 1]; /* client's username */
184	<
185	<	/*
186	<	* client->host contains the resolved name or ip address
187	<	* as a string for the user, it may be fiddled with for oper spoofing etc.
188	<	* once it's changed the *real* address goes away. This should be
189	<	* considered a read-only field after the client has registered.
190	<	*/
191	<	char              host[HOSTLEN + 1];     /* client's hostname */
192	<
193	<	/*
194	<	* client->info for unix clients will normally contain the info from the
195	<	* gcos field in /etc/passwd but anything can go here.
196	<	*/
197	<	char              info[REALLEN + 1]; /* Free form additional client info */
198	<
199	<	/*
200	<	* client->sockhost contains the ip address gotten from the socket as a
201	<	* string, this field should be considered read-only once the connection
202	<	* has been made. (set in s_bsd.c only)
203	<	*/
204	<	char              sockhost[HOSTIPLEN + 1]; /* This is the host name from the
205	<	socket ip address as string */
206	<	};
39	>	struct MaskItem;
40
41		/*
42		* status macros.
#	Line 215 | Line 48 | struct Client
48		#define STAT_SERVER             0x10
49		#define STAT_CLIENT             0x20
50
51	<	#define REG_NEED_USER 0x1
52	<	#define REG_NEED_NICK 0x2
53	<	#define REG_NEED_CAP  0x4
51	>	#define REG_NEED_USER 0x1  /**< User must send USER command */
52	>	#define REG_NEED_NICK 0x2  /**< User must send NICK command */
53	>	#define REG_NEED_CAP  0x4  /**< In middle of CAP negotiations */
54		#define REG_INIT (REG_NEED_USER|REG_NEED_NICK)
55
56	<	#define HasID(x)                ((x)->id[0] != '\0')
224	<	#define ID(x)                   (HasID(x) ? (x)->id : (x)->name)
225	<	#define ID_or_name(x,client_p)  ((IsCapable(client_p, CAP_TS6) && HasID(x)) ? (x)->id : (x)->name)
56	>	#define ID_or_name(x,client_p)  ((IsCapable(client_p->from, CAP_TS6) && (x)->id[0]) ? (x)->id : (x)->name)
57
58		#define IsRegistered(x)         ((x)->status  > STAT_UNKNOWN)
59		#define IsConnecting(x)         ((x)->status == STAT_CONNECTING)
#	Line 233 | Line 64 | struct Client
64		#define IsClient(x)             ((x)->status == STAT_CLIENT)
65
66		#define SetConnecting(x)        {(x)->status = STAT_CONNECTING; \
67	<	(x)->handler = UNREGISTERED_HANDLER; }
67	>	(x)->handler = UNREGISTERED_HANDLER; }
68
69		#define SetHandshake(x)         {(x)->status = STAT_HANDSHAKE; \
70	<	(x)->handler = UNREGISTERED_HANDLER; }
70	>	(x)->handler = UNREGISTERED_HANDLER; }
71
72		#define SetMe(x)                {(x)->status = STAT_ME; \
73	<	(x)->handler = UNREGISTERED_HANDLER; }
73	>	(x)->handler = UNREGISTERED_HANDLER; }
74
75		#define SetUnknown(x)           {(x)->status = STAT_UNKNOWN; \
76	<	(x)->handler = UNREGISTERED_HANDLER; }
76	>	(x)->handler = UNREGISTERED_HANDLER; }
77
78		#define SetServer(x)            {(x)->status = STAT_SERVER; \
79	<	(x)->handler = SERVER_HANDLER; }
79	>	(x)->handler = SERVER_HANDLER; }
80
81		#define SetClient(x)            {(x)->status = STAT_CLIENT; \
82	<	(x)->handler = HasUMode(x, UMODE_OPER) ? \
83	<	OPER_HANDLER : CLIENT_HANDLER; }
82	>	(x)->handler = HasUMode(x, UMODE_OPER) ? \
83	>	OPER_HANDLER : CLIENT_HANDLER; }
84
85		#define MyConnect(x)            ((x)->localClient != NULL)
86		#define MyClient(x)             (MyConnect(x) && IsClient(x))
#	Line 257 | Line 88 | struct Client
88		/*
89		* ts stuff
90		*/
91	<	#define TS_CURRENT      6       /**< current TS protocol version */
92	<	#define TS_MIN          5       /**< minimum supported TS protocol version */
91	>	#define TS_CURRENT      6  /**< Current TS protocol version */
92	>	#define TS_MIN          6  /**< Minimum supported TS protocol version */
93		#define TS_DOESTS       0x20000000
94		#define DoesTS(x)       ((x)->tsinfo == TS_DOESTS)
95
96
97
98		#define CAP_MULTI_PREFIX  0x00000001
99	+	#define CAP_AWAY_NOTIFY   0x00000002
100	+	#define CAP_UHNAMES       0x00000004
101
102		#define HasCap(x, y) ((x)->localClient->cap_active & (y))
103
104	+
105		/* housekeeping flags */
106	<	#define FLAGS_PINGSENT      0x00000001 /**< Unreplied ping sent */
107	<	#define FLAGS_DEADSOCKET    0x00000002 /**< Local socket is dead--Exiting soon */
108	<	#define FLAGS_KILLED        0x00000004 /**< Prevents "QUIT" from being sent for this */
109	<	#define FLAGS_CLOSING       0x00000008 /**< set when closing to suppress errors */
110	<	#define FLAGS_GOTID         0x00000010 /**< successful ident lookup achieved */
111	<	#define FLAGS_NEEDID        0x00000020 /**< auth{} block say must use ident return */
112	<	#define FLAGS_SENDQEX       0x00000040 /**< Sendq exceeded */
113	<	#define FLAGS_IPHASH        0x00000080 /**< iphashed this client */
114	<	#define FLAGS_MARK          0x00000100 /**< marked client */
115	<	#define FLAGS_CANFLOOD      0x00000200 /**< client has the ability to flood */
116	<	#define FLAGS_EXEMPTGLINE   0x00000400 /**< client can't be G-lined */
117	<	#define FLAGS_EXEMPTKLINE   0x00000800 /**< client is exempt from kline */
118	<	#define FLAGS_NOLIMIT       0x00001000 /**< client is exempt from limits */
119	<	#define FLAGS_PING_COOKIE   0x00002000 /**< PING Cookie */
120	<	#define FLAGS_IP_SPOOFING   0x00004000 /**< client IP is spoofed */
121	<	#define FLAGS_FLOODDONE     0x00008000 /**< Flood grace period has been ended. */
122	<	#define FLAGS_EOB           0x00010000 /**< server has sent us an EOB */
123	<	#define FLAGS_HIDDEN        0x00020000 /**< a hidden server. not shown in /links */
124	<	#define FLAGS_BLOCKED       0x00040000 /**< must wait for COMM_SELECT_WRITE */
125	<	#define FLAGS_USERHOST      0x00080000 /**< client is in userhost hash */
126	<	#define FLAGS_BURSTED       0x00100000 /**< user was already bursted */
127	<	#define FLAGS_EXEMPTRESV    0x00200000 /**< client is exempt from RESV */
128	<	#define FLAGS_GOTUSER       0x00400000 /**< if we received a USER command */
129	<	#define FLAGS_PINGWARNING   0x00800000 /**< unreplied ping warning already sent */
130	<	#define FLAGS_FINISHED_AUTH 0x01000000 /**< Client has been released from auth */
131	<	#define FLAGS_FLOOD_NOTICED 0x02000000 /**< Notice to opers about this flooder has been sent */
132	<	#define FLAGS_SERVICE       0x04000000 /**< Client/server is a network service */
106	>	#define FLAGS_PINGSENT       0x00000001  /**< Unreplied ping sent */
107	>	#define FLAGS_DEADSOCKET     0x00000002  /**< Local socket is dead--Exiting soon */
108	>	#define FLAGS_KILLED         0x00000004  /**< Prevents "QUIT" from being sent for this */
109	>	#define FLAGS_CLOSING        0x00000008  /**< Set when closing to suppress errors */
110	>	#define FLAGS_GOTID          0x00000010  /**< Successful ident lookup achieved */
111	>	#define FLAGS_NEEDID         0x00000020  /**< auth{} block say must use ident return */
112	>	#define FLAGS_SENDQEX        0x00000040  /**< Sendq exceeded */
113	>	#define FLAGS_IPHASH         0x00000080  /**< Iphashed this client */
114	>	#define FLAGS_MARK           0x00000100  /**< Marked client */
115	>	#define FLAGS_CANFLOOD       0x00000200  /**< Client has the ability to flood */
116	>	#define FLAGS_EXEMPTGLINE    0x00000400  /**< Client can't be G-lined */
117	>	#define FLAGS_EXEMPTKLINE    0x00000800  /**< Client is exempt from kline */
118	>	#define FLAGS_NOLIMIT        0x00001000  /**< Client is exempt from limits */
119	>	#define FLAGS_PING_COOKIE    0x00002000  /**< PING Cookie */
120	>	#define FLAGS_IP_SPOOFING    0x00004000  /**< Client IP is spoofed */
121	>	#define FLAGS_FLOODDONE      0x00008000  /**< Flood grace period has been ended. */
122	>	#define FLAGS_EOB            0x00010000  /**< Server has sent us an EOB */
123	>	#define FLAGS_HIDDEN         0x00020000  /**< A hidden server. Not shown in /links */
124	>	#define FLAGS_BLOCKED        0x00040000  /**< Must wait for COMM_SELECT_WRITE */
125	>	#define FLAGS_USERHOST       0x00080000  /**< Client is in userhost hash */
126	>	#define FLAGS_BURSTED        0x00100000  /**< User was already bursted */
127	>	#define FLAGS_EXEMPTRESV     0x00200000  /**< Client is exempt from RESV */
128	>	#define FLAGS_GOTUSER        0x00400000  /**< If we received a USER command */
129	>	#define FLAGS_FINISHED_AUTH  0x00800000  /**< Client has been released from auth */
130	>	#define FLAGS_FLOOD_NOTICED  0x01000000  /**< Notice to opers about this flooder has been sent */
131	>	#define FLAGS_SERVICE        0x02000000  /**< Client/server is a network service */
132	>	#define FLAGS_AUTH_SPOOF     0x04000000  /**< User's hostname has been spoofed by an auth{} spoof */
133	>	#define FLAGS_SSL            0x08000000  /**< User is connected via TLS/SSL */
134	>	#define FLAGS_SQUIT          0x10000000
135
136		#define HasFlag(x, y) ((x)->flags &   (y))
137		#define AddFlag(x, y) ((x)->flags |=  (y))
#	Line 304 | Line 140 | struct Client
140
141
142		/* umodes, settable flags */
143	<	#define UMODE_SERVNOTICE   0x00000001 /**< server notices such as kill */
143	>	#define UMODE_SERVNOTICE   0x00000001 /**< Server notices such as kill */
144		#define UMODE_CCONN        0x00000002 /**< Client Connections */
145		#define UMODE_REJ          0x00000004 /**< Bot Rejections */
146		#define UMODE_SKILL        0x00000008 /**< Server Killed */
147		#define UMODE_FULL         0x00000010 /**< Full messages */
148	<	#define UMODE_SPY          0x00000020 /**< see STATS / LINKS */
148	>	#define UMODE_SPY          0x00000020 /**< See STATS / LINKS */
149		#define UMODE_DEBUG        0x00000040 /**< 'debugging' info */
150		#define UMODE_NCHANGE      0x00000080 /**< Nick change notice */
151	<	#define UMODE_WALLOP       0x00000100 /**< send wallops to them */
151	>	#define UMODE_WALLOP       0x00000100 /**< Send wallops to them */
152		#define UMODE_OPERWALL     0x00000200 /**< Operwalls */
153	<	#define UMODE_INVISIBLE    0x00000400 /**< makes user invisible */
154	<	#define UMODE_BOTS         0x00000800 /**< shows bots */
155	<	#define UMODE_EXTERNAL     0x00001000 /**< show servers introduced and splitting */
156	<	#define UMODE_CALLERID     0x00002000 /**< block unless caller id's */
157	<	#define UMODE_SOFTCALLERID 0x00004000 /**< block unless on common channel */
158	<	#define UMODE_UNAUTH       0x00008000 /**< show unauth connects here */
159	<	#define UMODE_LOCOPS       0x00010000 /**< show locops */
160	<	#define UMODE_DEAF         0x00020000 /**< don't receive channel messages */
161	<	#define UMODE_CCONN_FULL   0x00040000 /**< add unused fields to connection monitoring */
162	<	#define UMODE_REGISTERED   0x00080000 /**< User has identified for that nick. */
163	<	#define UMODE_REGONLY      0x00100000 /**< Only registered nicks may PM */
164	<	#define UMODE_HIDDEN       0x00200000 /**< Operator status is hidden */
165	<	#define UMODE_OPER         0x00400000 /**< Operator */
166	<	#define UMODE_ADMIN        0x00800000 /**< Admin on server */
153	>	#define UMODE_INVISIBLE    0x00000400 /**< Makes user invisible */
154	>	#define UMODE_BOTS         0x00000800 /**< Shows bots */
155	>	#define UMODE_EXTERNAL     0x00001000 /**< Show servers introduced and splitting */
156	>	#define UMODE_CALLERID     0x00002000 /**< Block unless caller id's */
157	>	#define UMODE_SOFTCALLERID 0x00004000 /**< Block unless on common channel */
158	>	#define UMODE_UNAUTH       0x00008000 /**< Show unauth connects here */
159	>	#define UMODE_LOCOPS       0x00010000 /**< Show locops */
160	>	#define UMODE_DEAF         0x00020000 /**< Don't receive channel messages */
161	>	#define UMODE_REGISTERED   0x00040000 /**< User has identified for that nick. */
162	>	#define UMODE_REGONLY      0x00080000 /**< Only registered nicks may PM */
163	>	#define UMODE_HIDDEN       0x00100000 /**< Operator status is hidden */
164	>	#define UMODE_OPER         0x00200000 /**< Operator */
165	>	#define UMODE_ADMIN        0x00400000 /**< Admin on server */
166	>	#define UMODE_FARCONNECT   0x00800000 /**< Can see remote client connects/exits */
167	>	#define UMODE_HIDDENHOST   0x01000000 /**< User's host is hidden */
168	>	#define UMODE_SSL          0x02000000 /**< User is connected via TLS/SSL */
169	>	#define UMODE_WEBIRC       0x04000000 /**< User connected via a webirc gateway */
170	>	#define UMODE_HIDEIDLE     0x08000000 /**< Hides idle and signon time in WHOIS */
171	>	#define UMODE_HIDECHANS    0x10000000 /**< Hides channel list in WHOIS */
172
173		#define UMODE_ALL          UMODE_SERVNOTICE
174
#	Line 337 | Line 178 | struct Client
178
179		#define SEND_UMODES  (UMODE_INVISIBLE | UMODE_OPER | UMODE_WALLOP |\
180		UMODE_REGONLY | UMODE_REGISTERED | UMODE_ADMIN |\
181	<	UMODE_HIDDEN)
181	>	UMODE_HIDDEN | UMODE_HIDDENHOST | UMODE_SSL |\
182	>	UMODE_WEBIRC | UMODE_CALLERID | UMODE_SOFTCALLERID|\
183	>	UMODE_HIDECHANS)
184
185
186
187		/* oper priv flags */
188	<	#define OPER_FLAG_GLOBAL_KILL  0x00000001 /**< Oper can global kill        */
189	<	#define OPER_FLAG_REMOTE       0x00000002 /**> Oper can do squits/connects */
190	<	#define OPER_FLAG_UNKLINE      0x00000004 /**< Oper can use unkline        */
191	<	#define OPER_FLAG_GLINE        0x00000008 /**< Oper can use gline          */
192	<	#define OPER_FLAG_N            0x00000010 /**< Oper can umode n            */
193	<	#define OPER_FLAG_K            0x00000020 /**< Oper can kill/kline         */
194	<	#define OPER_FLAG_X            0x00000040 /**< Oper can xline              */
195	<	#define OPER_FLAG_DIE          0x00000080 /**< Oper can die                */
196	<	#define OPER_FLAG_REHASH       0x00000100 /**< Oper can rehash             */
197	<	#define OPER_FLAG_ADMIN        0x00000200 /**< Oper can set umode +a       */
198	<	#define OPER_FLAG_OPERWALL     0x00000400 /**< Oper can use OPERWALL command */
199	<	#define OPER_FLAG_OPER_SPY     0x00000800 /* */
200	<	#define OPER_FLAG_REMOTEBAN    0x00001000 /**< Oper can set remote bans */
201	<	#define OPER_FLAG_GLOBOPS      0x00002000 /**< Oper can use GLOBOPS command */
202	<	#define OPER_FLAG_MODULE       0x00004000 /**< Oper can use MODULE commands */
203	<	#define OPER_FLAG_RESTART      0x00008000 /**< Oper can use RESTART command */
204	<	#define OPER_FLAG_DLINE        0x00010000 /**< Oper can use DLINE command   */
205	<	#define OPER_FLAG_UNDLINE      0x00020000 /**< Oper can use UNDLINE command */
206	<	#define OPER_FLAG_SET          0x00040000 /**< Oper can use SET command */
188	>	#define OPER_FLAG_KILL_REMOTE    0x00000001  /**< Oper can global KILL */
189	>	#define OPER_FLAG_KILL           0x00000002  /**< Oper can do local KILL */
190	>	#define OPER_FLAG_UNKLINE        0x00000004  /**< Oper can use use UNKLINE command */
191	>	#define OPER_FLAG_GLINE          0x00000008  /**< Oper can use GLINE command */
192	>	#define OPER_FLAG_K              0x00000010  /**< Oper can use KLINE command */
193	>	#define OPER_FLAG_XLINE          0x00000020  /**< Oper can use XLINE command */
194	>	#define OPER_FLAG_DIE            0x00000040  /**< Oper can use DIE command */
195	>	#define OPER_FLAG_REHASH         0x00000080  /**< Oper can use REHASH command */
196	>	#define OPER_FLAG_ADMIN          0x00000100  /**< Oper can set user mode +a*/
197	>	#define OPER_FLAG_OPERWALL       0x00000200  /**< Oper can use OPERWALL command */
198	>	#define OPER_FLAG_REMOTEBAN      0x00000400  /**< Oper can set remote bans */
199	>	#define OPER_FLAG_GLOBOPS        0x00000800  /**< Oper can use GLOBOPS command */
200	>	#define OPER_FLAG_MODULE         0x00001000  /**< Oper can use MODULE commands */
201	>	#define OPER_FLAG_RESTART        0x00002000  /**< Oper can use RESTART command */
202	>	#define OPER_FLAG_DLINE          0x00004000  /**< Oper can use DLINE command */
203	>	#define OPER_FLAG_UNDLINE        0x00008000  /**< Oper can use UNDLINE command */
204	>	#define OPER_FLAG_SET            0x00010000  /**< Oper can use SET command */
205	>	#define OPER_FLAG_SQUIT          0x00020000  /**< Oper can do local SQUIT */
206	>	#define OPER_FLAG_SQUIT_REMOTE   0x00040000  /**< Oper can do global SQUIT */
207	>	#define OPER_FLAG_CONNECT        0x00080000  /**< Oper can do local CONNECT */
208	>	#define OPER_FLAG_CONNECT_REMOTE 0x00100000  /**< Oper can do global CONNECT */
209	>	#define OPER_FLAG_WALLOPS        0x00200000  /**< Oper can use WALLOPS command */
210	>	#define OPER_FLAG_LOCOPS         0x00400000  /**< Oper can use LOCOPS command */
211	>	#define OPER_FLAG_UNXLINE        0x00800000  /**< Oper can use UNXLINE command */
212	>
213
214		#define HasOFlag(x, y) (MyConnect(x) ? (x)->localClient->operflags & (y) : 0)
215		#define AddOFlag(x, y) ((x)->localClient->operflags |=  (y))
#	Line 373 | Line 222 | struct Client
222		#define IsAuthFinished(x)       ((x)->flags & FLAGS_FINISHED_AUTH)
223		#define IsDead(x)               ((x)->flags & FLAGS_DEADSOCKET)
224		#define SetDead(x)              ((x)->flags |= FLAGS_DEADSOCKET)
225	<	#define IsClosing(x)            ((x)->flags & FLAGS_CLOSING)
226	<	#define SetClosing(x)           ((x)->flags |= FLAGS_CLOSING)
227	<	#define SetCanFlood(x)          ((x)->flags |= FLAGS_CANFLOOD)
228	<	#define IsCanFlood(x)           ((x)->flags & FLAGS_CANFLOOD)
229	<	#define IsDefunct(x)            ((x)->flags & (FLAGS_DEADSOCKET|FLAGS_CLOSING| \
381	<	FLAGS_KILLED))
225	>	#define IsClosing(x)            ((x)->flags & FLAGS_CLOSING)
226	>	#define SetClosing(x)           ((x)->flags |= FLAGS_CLOSING)
227	>	#define SetCanFlood(x)          ((x)->flags |= FLAGS_CANFLOOD)
228	>	#define IsCanFlood(x)           ((x)->flags & FLAGS_CANFLOOD)
229	>	#define IsDefunct(x)            ((x)->flags & (FLAGS_DEADSOCKET|FLAGS_CLOSING|FLAGS_KILLED))
230
231		/* oper flags */
232		#define MyOper(x)               (MyConnect(x) && HasUMode(x, UMODE_OPER))
233
234		#define SetOper(x)              {(x)->umodes |= UMODE_OPER; \
235	<	if (!IsServer((x))) (x)->handler = OPER_HANDLER;}
235	>	if (!IsServer((x))) (x)->handler = OPER_HANDLER;}
236
237		#define ClearOper(x)            {(x)->umodes &= ~(UMODE_OPER|UMODE_ADMIN); \
238	<	if (!HasUMode(x, UMODE_OPER) && !IsServer((x))) \
239	<	(x)->handler = CLIENT_HANDLER; }
238	>	if (!HasUMode(x, UMODE_OPER) && !IsServer((x))) \
239	>	(x)->handler = CLIENT_HANDLER; }
240
241	<	#define SetSendQExceeded(x)     ((x)->flags |= FLAGS_SENDQEX)
242	<	#define IsSendQExceeded(x)      ((x)->flags &  FLAGS_SENDQEX)
241	>	#define SetSendQExceeded(x)     ((x)->flags |= FLAGS_SENDQEX)
242	>	#define IsSendQExceeded(x)      ((x)->flags &  FLAGS_SENDQEX)
243
244		#define SetIpHash(x)            ((x)->flags |= FLAGS_IPHASH)
397	–	#define ClearIpHash(x)          ((x)->flags &= ~FLAGS_IPHASH)
245		#define IsIpHash(x)             ((x)->flags & FLAGS_IPHASH)
246
247		#define SetUserHost(x)          ((x)->flags |= FLAGS_USERHOST)
401	–	#define ClearUserHost(x)        ((x)->flags &= ~FLAGS_USERHOST)
248		#define IsUserHostIp(x)         ((x)->flags & FLAGS_USERHOST)
249
250	<	#define SetPingSent(x)          ((x)->flags |= FLAGS_PINGSENT)
251	<	#define IsPingSent(x)           ((x)->flags & FLAGS_PINGSENT)
252	<	#define ClearPingSent(x)        ((x)->flags &= ~FLAGS_PINGSENT)
407	<
408	<	#define SetPingWarning(x)       ((x)->flags |= FLAGS_PINGWARNING)
409	<	#define IsPingWarning(x)        ((x)->flags & FLAGS_PINGWARNING)
410	<	#define ClearPingWarning(x)     ((x)->flags &= ~FLAGS_PINGWARNING)
250	>	#define SetPingSent(x)          ((x)->flags |= FLAGS_PINGSENT)
251	>	#define IsPingSent(x)           ((x)->flags & FLAGS_PINGSENT)
252	>	#define ClearPingSent(x)        ((x)->flags &= ~FLAGS_PINGSENT)
253
254		#define SetNeedId(x)            ((x)->flags |= FLAGS_NEEDID)
255		#define IsNeedId(x)             ((x)->flags & FLAGS_NEEDID)
#	Line 433 | Line 275 | struct Client
275		#define IsHidden(x)             ((x)->flags &  FLAGS_HIDDEN)
276		#define SetHidden(x)            ((x)->flags |= FLAGS_HIDDEN)
277
278	<	#define IsSendqBlocked(x)       ((x)->flags &  FLAGS_BLOCKED)
279	<	#define SetSendqBlocked(x)      ((x)->flags |= FLAGS_BLOCKED)
280	<	#define ClearSendqBlocked(x)    ((x)->flags &= ~FLAGS_BLOCKED)
278	>
279	>	/*! \brief addr_mask_type enumeration */
280	>	enum addr_mask_type
281	>	{
282	>	HIDE_IP, /**< IP is hidden. Resolved hostname is shown instead */
283	>	SHOW_IP, /**< IP is shown. No parts of it are hidden or masked */
284	>	MASK_IP  /**< IP is masked. 255.255.255.255 is shown instead */
285	>	};
286	>
287	>	/*! \brief Server structure */
288	>	struct Server
289	>	{
290	>	dlink_list server_list; /**< Servers on this server */
291	>	dlink_list client_list; /**< Clients on this server */
292	>	char by[NICKLEN + 1];   /**< Who activated this connection */
293	>	};
294	>
295	>	/*! \brief ListTask structure */
296	>	struct ListTask
297	>	{
298	>	dlink_list show_mask; /**< Channels to show */
299	>	dlink_list hide_mask; /**< Channels to hide */
300	>
301	>	unsigned int hash_index; /**< The hash bucket we are currently in */
302	>	unsigned int users_min;
303	>	unsigned int users_max;
304	>	unsigned int created_min;
305	>	unsigned int created_max;
306	>	unsigned int topicts_min;
307	>	unsigned int topicts_max;
308	>	};
309	>
310	>	/*! \brief LocalUser structure
311	>	*
312	>	* Allocated only for local clients, that are directly connected
313	>	* to \b this server with a socket.
314	>	*/
315	>	struct LocalUser
316	>	{
317	>	dlink_node   lclient_node;
318	>
319	>	unsigned int registration;
320	>	unsigned int cap_client;  /**< Client capabilities (from us) */
321	>	unsigned int cap_active;  /**< Active capabilities (to us) */
322	>	unsigned int       caps;  /**< Capabilities bit-field */
323	>
324	>	unsigned int operflags;     /**< IRC Operator privilege flags */
325	>	unsigned int random_ping; /**< Holding a 32bit value used for PING cookies */
326	>
327	>	unsigned int serial;     /**< Used to enforce 1 send per nick */
328	>
329	>	time_t       lasttime;   /**< ...should be only LOCAL clients? --msa */
330	>	time_t       firsttime;  /**< Time client was created */
331	>	time_t       since;      /**< Last time we parsed something */
332	>	time_t       last_knock;    /**< Time of last knock */
333	>	time_t       last_join_time;   /**< When this client last joined a channel */
334	>	time_t       last_leave_time;  /**< When this client last left a channel */
335	>	int          join_leave_count; /**< Count of JOIN/LEAVE in less than
336	>	MIN_JOIN_LEAVE_TIME seconds */
337	>	int          oper_warn_count_down; /**< Warn opers of this possible
338	>	spambot every time this gets to 0 */
339	>	time_t       last_caller_id_time;
340	>	time_t       first_received_message_time;
341	>	time_t       last_nick_change;
342	>	time_t       last_privmsg;  /**< Last time we got a PRIVMSG */
343	>	time_t       last_away;  /**< Away since... */
344	>
345	>	int          received_number_of_privmsgs;
346	>	unsigned int number_of_nick_changes;
347	>
348	>	struct ListTask  *list_task;
349	>
350	>	struct dbuf_queue buf_sendq;
351	>	struct dbuf_queue buf_recvq;
352	>
353	>	struct
354	>	{
355	>	unsigned int messages;      /**< Statistics: protocol messages sent/received */
356	>	uint64_t bytes;             /**< Statistics: total bytes sent/received */
357	>	} recv, send;
358	>
359	>	struct AuthRequest auth;
360	>	struct Listener *listener;   /**< Listener accepted from */
361	>	dlink_list        acceptlist; /**< Clients I'll allow to talk to me */
362	>	dlink_list        watches;   /**< Chain of Watch pointer blocks */
363	>	dlink_list        confs;     /**< Configuration record associated */
364	>	dlink_list        invited;   /**< Chain of invite pointer blocks */
365	>	struct irc_ssaddr ip;
366	>	int               aftype;    /**< Makes life easier for DNS res in IPV6 */
367	>	int               country_id; /**< ID corresponding to a ISO 3166 country code */
368	>
369	>	char              *passwd;
370	>	fde_t             fd;
371	>	/* Anti-flood stuff. We track how many messages were parsed and how
372	>	* many we were allowed in the current second, and apply a simple
373	>	* decay to avoid flooding.
374	>	*   -- adrian
375	>	*/
376	>	int allow_read;       /**< How many we're allowed to read in this second */
377	>	int sent_parsed;      /**< How many messages we've parsed in this second */
378	>
379	>	char*          response;  /**< Expected CHALLENGE response from client */
380	>	char*          auth_oper; /**< Operator to become if they supply the response */
381	>	};
382	>
383	>	/*! \brief Client structure */
384	>	struct Client
385	>	{
386	>	dlink_node node;
387	>	dlink_node lnode;             /**< Used for Server->servers/users */
388	>
389	>	struct LocalUser *localClient;
390	>	struct Client    *hnext;      /**< For client hash table lookups by name */
391	>	struct Client    *idhnext;    /**< For SID hash table lookups by sid */
392	>	struct Server    *serv;       /**< ...defined, if this is a server */
393	>	struct Client    *servptr;    /**< Points to server this Client is on */
394	>	struct Client    *from;       /**< == self, if Local Client, *NEVER* NULL! */
395	>
396	>	time_t            tsinfo;     /**< TS on the nick, SVINFO on server */
397	>
398	>	unsigned int      flags;      /**< Client flags */
399	>	unsigned int      umodes;     /**< Opers, normal users subset */
400	>	unsigned int      hopcount;   /**< Number of servers to this 0 = local */
401	>	unsigned int      status;     /**< Client type */
402	>	unsigned int      handler;    /**< Handler index */
403	>
404	>	dlink_list        whowas;
405	>	dlink_list        channel;   /**< Chain of channel pointer blocks */
406	>
407	>	char away[AWAYLEN + 1]; /**< Client's AWAY message. Can be set/unset via AWAY command */
408	>	char name[HOSTLEN + 1]; /**< Unique name for a client nick or host */
409	>	char svid[SVIDLEN + 1]; /**< Services ID */
410	>	char id[IDLEN + 1];       /**< Client ID, unique ID per client */
411	>
412	>	/*
413	>	* client->username is the username from ident or the USER message,
414	>	* If the client is idented the USER message is ignored, otherwise
415	>	* the username part of the USER message is put here prefixed with a
416	>	* tilde depending on the auth{} block. Once a client has registered,
417	>	* this field should be considered read-only.
418	>	*/
419	>	char              username[USERLEN + 1]; /* client's username */
420	>
421	>	/*
422	>	* client->host contains the resolved name or ip address
423	>	* as a string for the user, it may be fiddled with for oper spoofing etc.
424	>	* once it's changed the *real* address goes away. This should be
425	>	* considered a read-only field after the client has registered.
426	>	*/
427	>	char              host[HOSTLEN + 1];     /* client's hostname */
428	>
429	>	/*
430	>	* client->info for unix clients will normally contain the info from the
431	>	* gcos field in /etc/passwd but anything can go here.
432	>	*/
433	>	char              info[REALLEN + 1]; /* Free form additional client info */
434	>
435	>	/*
436	>	* client->sockhost contains the ip address gotten from the socket as a
437	>	* string, this field should be considered read-only once the connection
438	>	* has been made. (set in s_bsd.c only)
439	>	*/
440	>	char              sockhost[HOSTIPLEN + 1]; /* This is the host name from the
441	>	socket ip address as string */
442	>	char             *certfp;
443	>	};
444
445
446		extern struct Client me;
447		extern dlink_list listing_client_list;
448		extern dlink_list global_client_list;
449	+	extern dlink_list unknown_list;       /* unknown clients ON this server only        */
450	+	extern dlink_list local_client_list;  /* local clients only ON this server          */
451	+	extern dlink_list serv_list;          /* local servers to this server ONLY          */
452	+	extern dlink_list global_serv_list;   /* global servers on the network              */
453	+	extern dlink_list oper_list;          /* our opers, duplicated in local_client_list */
454
455		extern int accept_message(struct Client *, struct Client *);
456	+	extern unsigned int idle_time_get(const struct Client *, const struct Client *);
457		extern struct split_nuh_item *find_accept(const char *, const char *,
458	<	const char *, struct Client *, int);
458	>	const char *, struct Client *,
459	>	int (*)(const char *, const char *));
460		extern void del_accept(struct split_nuh_item *, struct Client *);
461		extern void del_all_accepts(struct Client *);
462	<	extern void exit_client(struct Client *, struct Client *, const char *);
462	>	extern void exit_client(struct Client *, const char *);
463	>	extern void conf_try_ban(struct Client *, struct MaskItem *);
464		extern void check_conf_klines(void);
465	<	extern void init_client(void);
465	>	extern void client_init(void);
466		extern void dead_link_on_write(struct Client *, int);
467		extern void dead_link_on_read(struct Client *, int);
468		extern void exit_aborted_clients(void);
469		extern void free_exited_clients(void);
470		extern struct Client *make_client(struct Client *);
471	<	extern struct Client *find_chasing(struct Client *, struct Client *, const char *, int *);
471	>	extern struct Client *find_chasing(struct Client *, const char *);
472		extern struct Client *find_person(const struct Client *const, const char *);
473		extern const char *get_client_name(const struct Client *, enum addr_mask_type);
474

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)