ViewVC Help

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

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

Comparing:
ircd-hybrid-7.3/include/client.h (file contents), Revision 1113 by michael, Sat Dec 18 22:44:10 2010 UTC vs.
ircd-hybrid-8/include/client.h (file contents), Revision 1331 by michael, Sun Apr 1 12:23:21 2012 UTC

#	Line 1 | Line 1
1		/*
2		*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	–	*  client.h: The ircd client header.
3		*
4		*  Copyright (C) 2002 by the past and present ircd coders, and others.
5		*
#	Line 18 | Line 17
17		*  along with this program; if not, write to the Free Software
18		*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
19		*  USA
21	–	*
22	–	*  $Id$
20		*/
21
22	+	/*! \file client.h
23	+	* \brief Header including structures, macros and prototypes for client handling
24	+	* \version $Id$
25	+	*/
26	+
27	+
28		#ifndef INCLUDED_client_h
29		#define INCLUDED_client_h
30
#	Line 29 | Line 32
32		#include "fdlist.h"
33		#include "config.h"
34		#include "ircd_defs.h"
32	–	#include "ircd_handler.h"
35		#include "dbuf.h"
36		#include "channel.h"
35	–	#include "irc_res.h"
37
38	<	#define HOSTIPLEN       53 /* sizeof("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255.ipv6") */
38	>	#define HOSTIPLEN       53 /* sizeof("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255.ipv6") */
39		#define PASSWDLEN       20
39	–	#define CIPHERKEYLEN    64 /* 512bit */
40		#define IDLEN           12 /* this is the maximum length, not the actual
41		generated length; DO NOT CHANGE! */
42
#	Line 50 | Line 50 | struct Client;
50		struct LocalUser;
51
52
53	–	struct Server
54	–	{
55	–	struct ConfItem *sconf; /* ConfItem connect{} pointer for this server */
56	–	dlink_list server_list; /* Servers on this server            */
57	–	dlink_list client_list; /* Clients on this server            */
58	–	char by[NICKLEN];       /* who activated this connection     */
59	–	};
53
54	<	struct SlinkRpl
54	>	/*! \brief addr_mask_type enumeration */
55	>	enum addr_mask_type
56		{
57	<	int command;
58	<	int datalen;
59	<	int gotdatalen;
66	<	int readdata;
67	<	unsigned char *data;
57	>	HIDE_IP, /**< IP is hidden. Resolved hostname is shown instead */
58	>	SHOW_IP, /**< IP is shown. No parts of it are hidden or masked */
59	>	MASK_IP  /**< IP is masked. 255.255.255.255 is shown instead */
60		};
61
62	<	struct ZipStats
62	>	/*! \brief Server structure */
63	>	struct Server
64		{
65	<	uint64_t in;
66	<	uint64_t in_wire;
67	<	uint64_t out;
68	<	uint64_t out_wire;
76	<	double in_ratio;
77	<	double out_ratio;
65	>	struct ConfItem *sconf; /**< ConfItem connect{} pointer for this server */
66	>	dlink_list server_list; /**< Servers on this server */
67	>	dlink_list client_list; /**< Clients on this server */
68	>	char by[NICKLEN];       /**< who activated this connection */
69		};
70
71	+	/*! \brief ListTask structure */
72		struct ListTask
73		{
74	<	unsigned int hash_index; /* the bucket we are currently in */
75	<	dlink_list show_mask; /* show these channels..          */
76	<	dlink_list hide_mask; /* ..and hide these ones          */
77	<	unsigned int users_min, users_max;
78	<	unsigned int created_min, created_max;
79	<	unsigned int topicts_min, topicts_max;
74	>	dlink_list show_mask; /**< show these channels.. */
75	>	dlink_list hide_mask; /**< ..and hide these ones */
76	>
77	>	unsigned int hash_index; /**< the bucket we are currently in */
78	>	unsigned int users_min;
79	>	unsigned int users_max;
80	>	unsigned int created_min;
81	>	unsigned int created_max;
82	>	unsigned int topicts_min;
83	>	unsigned int topicts_max;
84		};
85
86	+	/*! \brief Client structure */
87		struct Client
88		{
89		dlink_node node;
90	<	dlink_node lnode;             /* Used for Server->servers/users */
90	>	dlink_node lnode;             /**< Used for Server->servers/users */
91
92		struct LocalUser *localClient;
93	<	struct Client    *hnext;              /* For client hash table lookups by name */
94	<	struct Client    *idhnext;    /* For SID hash table lookups by sid */
95	<	struct Server    *serv;       /* ...defined, if this is a server */
96	<	struct Client    *servptr;    /* Points to server this Client is on */
97	<	struct Client    *from;       /* == self, if Local Client, *NEVER* NULL! */
98	<	struct Whowas    *whowas;     /* Pointers to whowas structs */
99	<	char             *away;
100	<
101	<	time_t            lasttime;   /* ...should be only LOCAL clients? --msa */
102	<	time_t            firsttime;  /* time client was created */
103	<	time_t            since;      /* last time we parsed something */
104	<	time_t            tsinfo;     /* TS on the nick, SVINFO on server */
105	<	uint64_t          flags;      /* client flags */
106	<
107	<	unsigned int      umodes;     /* opers, normal users subset */
108	<	unsigned int      hopcount;   /* number of servers to this 0 = local */
112	<	unsigned int      status;     /* Client type */
113	<	unsigned int      handler;    /* Handler index */
93	>	struct Client    *hnext;      /**< For client hash table lookups by name */
94	>	struct Client    *idhnext;    /**< For SID hash table lookups by sid */
95	>	struct Server    *serv;       /**< ...defined, if this is a server */
96	>	struct Client    *servptr;    /**< Points to server this Client is on */
97	>	struct Client    *from;       /**< == self, if Local Client, *NEVER* NULL! */
98	>	struct Whowas    *whowas;     /**< Pointers to whowas structs */
99	>	char             *away;       /**< Client's AWAY message. Can be set/unset via AWAY command */
100	>
101	>	time_t            tsinfo;     /**< TS on the nick, SVINFO on server */
102	>	time_t            servicestamp; /**< Last time client has been identified for its nick */
103	>
104	>	unsigned int      flags;      /**< client flags */
105	>	unsigned int      umodes;     /**< opers, normal users subset */
106	>	unsigned int      hopcount;   /**< number of servers to this 0 = local */
107	>	unsigned int      status;     /**< Client type */
108	>	unsigned int      handler;    /**< Handler index */
109
110	<	dlink_list        channel;   /* chain of channel pointer blocks */
110	>	dlink_list        channel;   /**< chain of channel pointer blocks */
111
112	<	/*
113	<	* client->name is the unique name for a client nick or host
119	<	*/
120	<	char name[HOSTLEN + 1];
121	<	char id[IDLEN + 1];       /* client ID, unique ID per client */
112	>	char name[HOSTLEN + 1]; /**< unique name for a client nick or host */
113	>	char id[IDLEN + 1];       /**< client ID, unique ID per client */
114
115		/*
116		* client->username is the username from ident or the USER message,
117		* If the client is idented the USER message is ignored, otherwise
118		* the username part of the USER message is put here prefixed with a
119	<	* tilde depending on the I:line, Once a client has registered, this
120	<	* field should be considered read-only.
119	>	* tilde depending on the auth{} block. Once a client has registered,
120	>	* this field should be considered read-only.
121		*/
122		char              username[USERLEN + 1]; /* client's username */
123
#	Line 152 | Line 144 | struct Client
144		socket ip address as string */
145		};
146
147	+	/*! \brief LocalUser structure
148	+	*
149	+	* Allocated only for local clients, that are directly connected
150	+	* to \b this server with a socket.
151	+	*/
152		struct LocalUser
153		{
157	–	/*
158	–	* The following fields are allocated only for local clients
159	–	* (directly connected to *this* server with a socket.
160	–	*/
154		dlink_node   lclient_node;
155
156		char         client_host[HOSTLEN + 1];
157		char         client_server[HOSTLEN + 1];
158
159		unsigned int registration;
160	<	unsigned int cap_client;    /* Client capabilities (from us) */
161	<	unsigned int cap_active;    /* Active capabilities (to us) */
162	<
163	<	unsigned int operflags;     /* oper priv flags */
164	<	unsigned int random_ping;
165	<
166	<	unsigned int serial;     /* used to enforce 1 send per nick */
167	<
168	<	/* Anti flooding part, all because of lamers... */
169	<	time_t       last_knock;    /* time of last knock */
170	<	time_t       last_away; /* Away since... */
171	<	time_t       last_join_time;   /* when this client last
160	>	unsigned int cap_client;    /**< Client capabilities (from us) */
161	>	unsigned int cap_active;    /**< Active capabilities (to us) */
162	>	unsigned int       caps;       /**< capabilities bit-field */
163	>
164	>	unsigned int operflags;     /**< IRC Operator privilege flags */
165	>	unsigned int random_ping; /**< Holding a 32bit value used for PING cookies */
166	>
167	>	unsigned int serial;     /**< used to enforce 1 send per nick */
168	>
169	>	time_t       lasttime;   /**< ...should be only LOCAL clients? --msa */
170	>	time_t       firsttime;  /**< time client was created */
171	>	time_t       since;      /**< last time we parsed something */
172	>	time_t       last_knock;    /**< time of last knock */
173	>	time_t       last_away; /**< Away since... */
174	>	time_t       last_join_time;   /**< when this client last
175		joined a channel */
176	<	time_t       last_leave_time;  /* when this client last
176	>	time_t       last_leave_time;  /**< when this client last
177		* left a channel */
178	<	int          join_leave_count; /* count of JOIN/LEAVE in less than
178	>	int          join_leave_count; /**< count of JOIN/LEAVE in less than
179		MIN_JOIN_LEAVE_TIME seconds */
180	<	int          oper_warn_count_down; /* warn opers of this possible
180	>	int          oper_warn_count_down; /**< warn opers of this possible
181		spambot every time this gets to 0 */
182		time_t       reject_delay;
183		time_t       last_caller_id_time;
184		time_t       first_received_message_time;
185		time_t       last_nick_change;
186	+	time_t       last_privmsg; /**< Last time we got a PRIVMSG */
187
188		int          received_number_of_privmsgs;
189		unsigned int number_of_nick_changes;
190
191		struct ListTask  *list_task;
192	<	/* Send and receive dbufs .. */
192	>
193		struct dbuf_queue buf_sendq;
194		struct dbuf_queue buf_recvq;
195
196		struct {
197	<	unsigned int messages;      /* Statistics: protocol messages sent/received */
198	<	uint64_t bytes;             /* Statistics: total bytes sent/received */
197	>	unsigned int messages;      /**< Statistics: protocol messages sent/received */
198	>	uint64_t bytes;             /**< Statistics: total bytes sent/received */
199		} recv, send;
200
201		struct AuthRequest *auth;
202	<	struct Listener *listener;   /* listener accepted from */
203	<	dlink_list        acceptlist; /* clients I'll allow to talk to me */
204	<	dlink_list        watches;   /* chain of Watch pointer blocks */
205	<	dlink_list        confs;     /* Configuration record associated */
206	<	dlink_list        invited;   /* chain of invite pointer blocks */
202	>	struct Listener *listener;   /**< listener accepted from */
203	>	dlink_list        acceptlist; /**< clients I'll allow to talk to me */
204	>	dlink_list        watches;   /**< chain of Watch pointer blocks */
205	>	dlink_list        confs;     /**< Configuration record associated */
206	>	dlink_list        invited;   /**< chain of invite pointer blocks */
207		struct irc_ssaddr ip;
208	<	int               aftype;     /* Makes life easier for DNS res in IPV6 */
212	<	time_t last; /* Last time we got a PRIVMSG */
208	>	int               aftype;    /**< Makes life easier for DNS res in IPV6 */
209
210		char              *passwd;
215	–	unsigned int       caps;       /* capabilities bit-field */
216	–	unsigned int       enc_caps;   /* cipher capabilities bit-field */
217	–
218	–	#ifdef HAVE_LIBCRYPTO
219	–	struct EncCapability *in_cipher;
220	–	struct EncCapability *out_cipher;
221	–
222	–	char              in_key[CIPHERKEYLEN];
223	–	char              out_key[CIPHERKEYLEN];
224	–	#endif
225	–
211		fde_t             fd;
227	–	fde_t             ctrlfd;     /* For servers: control fd used for sending commands
228	–	to servlink */
229	–
230	–	struct SlinkRpl  slinkrpl;    /* slink reply being parsed */
231	–	char    *slinkq;              /* sendq for control data */
232	–	int              slinkq_ofs;  /* ofset into slinkq */
233	–	int              slinkq_len;  /* length remaining after slinkq_ofs */
234	–
235	–	struct ZipStats  zipstats;
212
213		/* Anti-flood stuff. We track how many messages were parsed and how
214		* many we were allowed in the current second, and apply a simple
215		* decay to avoid flooding.
216		*   -- adrian
217		*/
218	<	int allow_read;       /* how many we're allowed to read in this second */
219	<	int sent_parsed;      /* how many messages we've parsed in this second */
218	>	int allow_read;       /**< how many we're allowed to read in this second */
219	>	int sent_parsed;      /**< how many messages we've parsed in this second */
220
221	<	char*          response;  /* expected response from client */
222	<	char*          auth_oper; /* Operator to become if they supply the response.*/
221	>	char*          response;  /**< expected response from client */
222	>	char*          auth_oper; /**< Operator to become if they supply the response.*/
223		};
224
225		/*
#	Line 273 | Line 249 | struct LocalUser
249		#define IsServer(x)             ((x)->status == STAT_SERVER)
250		#define IsClient(x)             ((x)->status == STAT_CLIENT)
251
276	–	#define IsOper(x)               ((x)->umodes & UMODE_OPER)
277	–	#define IsAdmin(x)              ((x)->umodes & UMODE_ADMIN)
278	–
252		#define SetConnecting(x)        {(x)->status = STAT_CONNECTING; \
253		(x)->handler = UNREGISTERED_HANDLER; }
254
#	Line 292 | Line 265 | struct LocalUser
265		(x)->handler = SERVER_HANDLER; }
266
267		#define SetClient(x)            {(x)->status = STAT_CLIENT; \
268	<	(x)->handler = IsOper((x)) ? \
268	>	(x)->handler = HasUMode(x, UMODE_OPER) ? \
269		OPER_HANDLER : CLIENT_HANDLER; }
270
271	<	#define SetEob(x)               ((x)->flags |= FLAGS_EOB)
272	<	#define HasSentEob(x)           ((x)->flags & FLAGS_EOB)
271	>	#define MyConnect(x)            ((x)->localClient != NULL)
272	>	#define MyClient(x)             (MyConnect(x) && IsClient(x))
273
274		/*
275		* ts stuff
276		*/
277	<	#define TS_CURRENT      6       /* current TS protocol version */
278	<	#ifdef TS5_ONLY
306	<	#define TS_MIN          5
307	<	#else
308	<	#define TS_MIN          3       /* minimum supported TS protocol version */
309	<	#endif
277	>	#define TS_CURRENT      6       /**< current TS protocol version */
278	>	#define TS_MIN          5       /**< minimum supported TS protocol version */
279		#define TS_DOESTS       0x20000000
280		#define DoesTS(x)       ((x)->tsinfo == TS_DOESTS)
281
#	Line 314 | Line 283 | struct LocalUser
283
284		#define CAP_MULTI_PREFIX  0x00000001
285
286	+	#define HasCap(x, y) ((x)->localClient->cap_active & (y))
287	+
288		/* housekeeping flags */
289	<	#define FLAGS_PINGSENT      0x0000000000000001 /* Unreplied ping sent                      */
290	<	#define FLAGS_DEADSOCKET    0x0000000000000002 /* Local socket is dead--Exiting soon       */
291	<	#define FLAGS_KILLED        0x0000000000000004 /* Prevents "QUIT" from being sent for this */
292	<	#define FLAGS_CLOSING       0x0000000000000008 /* set when closing to suppress errors      */
293	<	#define FLAGS_GOTID         0x0000000000000010 /* successful ident lookup achieved         */
294	<	#define FLAGS_NEEDID        0x0000000000000020 /* I-lines say must use ident return        */
295	<	#define FLAGS_SENDQEX       0x0000000000000040 /* Sendq exceeded                           */
296	<	#define FLAGS_IPHASH        0x0000000000000080 /* iphashed this client                     */
297	<	#define FLAGS_CRYPTIN       0x0000000000000100 /* incoming data must be decrypted          */
298	<	#define FLAGS_CRYPTOUT      0x0000000000000200 /* outgoing data must be encrypted          */
299	<	#define FLAGS_WAITAUTH      0x0000000000000400 /* waiting for CRYPTLINK AUTH command       */
300	<	#define FLAGS_SERVLINK      0x0000000000000800 /* servlink has servlink process            */
301	<	#define FLAGS_MARK          0x0000000000001000 /* marked client                            */
302	<	#define FLAGS_CANFLOOD      0x0000000000002000 /* client has the ability to flood          */
303	<	#define FLAGS_EXEMPTGLINE   0x0000000000004000 /* client can't be G-lined                  */
304	<	#define FLAGS_EXEMPTKLINE   0x0000000000008000 /* client is exempt from kline              */
305	<	#define FLAGS_NOLIMIT       0x0000000000010000 /* client is exempt from limits             */
306	<	#define FLAGS_RESTRICTED    0x0000000000020000 /* client cannot op others                  */
307	<	#define FLAGS_PING_COOKIE   0x0000000000040000 /* PING Cookie                              */
308	<	#define FLAGS_IDLE_LINED    0x0000000000080000 /* client is exempt from idle-time limits   */
309	<	#define FLAGS_IP_SPOOFING   0x0000000000100000 /* client IP is spoofed                     */
310	<	#define FLAGS_FLOODDONE     0x0000000000200000 /* Flood grace period has been ended.       */
311	<	#define FLAGS_EOB           0x0000000000400000 /* server has received EOB                  */
312	<	#define FLAGS_HIDDEN        0x0000000000800000 /* a hidden server. not shown in /links     */
313	<	#define FLAGS_BLOCKED       0x0000000001000000 /* must wait for COMM_SELECT_WRITE          */
314	<	#define FLAGS_SBLOCKED      0x0000000002000000 /* slinkq is blocked                        */
315	<	#define FLAGS_USERHOST      0x0000000004000000 /* client is in userhost hash               */
316	<	#define FLAGS_BURSTED       0x0000000008000000 /* user was already bursted                 */
317	<	#define FLAGS_EXEMPTRESV    0x0000000010000000 /* client is exempt from RESV               */
318	<	#define FLAGS_GOTUSER       0x0000000020000000 /* if we received a USER command            */
319	<	#define FLAGS_PINGWARNING   0x0000000040000000 /* unreplied ping warning already sent      */
349	<	#define FLAGS_FINISHED_AUTH 0x0000000080000000 /* Client has been released from auth       */
350	<	#define FLAGS_FLOOD_NOTICED 0x0000000100000000
289	>	#define FLAGS_PINGSENT      0x00000001 /**< Unreplied ping sent */
290	>	#define FLAGS_DEADSOCKET    0x00000002 /**< Local socket is dead--Exiting soon */
291	>	#define FLAGS_KILLED        0x00000004 /**< Prevents "QUIT" from being sent for this */
292	>	#define FLAGS_CLOSING       0x00000008 /**< set when closing to suppress errors */
293	>	#define FLAGS_GOTID         0x00000010 /**< successful ident lookup achieved */
294	>	#define FLAGS_NEEDID        0x00000020 /**< auth{} block say must use ident return */
295	>	#define FLAGS_SENDQEX       0x00000040 /**< Sendq exceeded */
296	>	#define FLAGS_IPHASH        0x00000080 /**< iphashed this client */
297	>	#define FLAGS_MARK          0x00000100 /**< marked client */
298	>	#define FLAGS_CANFLOOD      0x00000200 /**< client has the ability to flood */
299	>	#define FLAGS_EXEMPTGLINE   0x00000400 /**< client can't be G-lined */
300	>	#define FLAGS_EXEMPTKLINE   0x00000800 /**< client is exempt from kline */
301	>	#define FLAGS_NOLIMIT       0x00001000 /**< client is exempt from limits */
302	>	#define FLAGS_PING_COOKIE   0x00002000 /**< PING Cookie */
303	>	#define FLAGS_IP_SPOOFING   0x00004000 /**< client IP is spoofed */
304	>	#define FLAGS_FLOODDONE     0x00008000 /**< Flood grace period has been ended. */
305	>	#define FLAGS_EOB           0x00010000 /**< server has sent us an EOB */
306	>	#define FLAGS_HIDDEN        0x00020000 /**< a hidden server. not shown in /links */
307	>	#define FLAGS_BLOCKED       0x00040000 /**< must wait for COMM_SELECT_WRITE */
308	>	#define FLAGS_USERHOST      0x00080000 /**< client is in userhost hash */
309	>	#define FLAGS_BURSTED       0x00100000 /**< user was already bursted */
310	>	#define FLAGS_EXEMPTRESV    0x00200000 /**< client is exempt from RESV */
311	>	#define FLAGS_GOTUSER       0x00400000 /**< if we received a USER command */
312	>	#define FLAGS_PINGWARNING   0x00800000 /**< unreplied ping warning already sent */
313	>	#define FLAGS_FINISHED_AUTH 0x01000000 /**< Client has been released from auth */
314	>	#define FLAGS_FLOOD_NOTICED 0x02000000 /**< Notice to opers about this flooder has been sent */
315	>	#define FLAGS_SERVICE       0x04000000 /**< Client/server is a network service */
316	>
317	>	#define HasFlag(x, y) ((x)->flags &   (y))
318	>	#define AddFlag(x, y) ((x)->flags |=  (y))
319	>	#define DelFlag(x, y) ((x)->flags &= ~(y))
320
321
353	–	/* umodes, settable flags */
354	–	#define UMODE_SERVNOTICE   0x00000001 /* server notices such as kill */
355	–	#define UMODE_CCONN        0x00000002 /* Client Connections */
356	–	#define UMODE_REJ          0x00000004 /* Bot Rejections */
357	–	#define UMODE_SKILL        0x00000008 /* Server Killed */
358	–	#define UMODE_FULL         0x00000010 /* Full messages */
359	–	#define UMODE_SPY          0x00000020 /* see STATS / LINKS */
360	–	#define UMODE_DEBUG        0x00000040 /* 'debugging' info */
361	–	#define UMODE_NCHANGE      0x00000080 /* Nick change notice */
362	–	#define UMODE_WALLOP       0x00000100 /* send wallops to them */
363	–	#define UMODE_OPERWALL     0x00000200 /* Operwalls */
364	–	#define UMODE_INVISIBLE    0x00000400 /* makes user invisible */
365	–	#define UMODE_BOTS         0x00000800 /* shows bots */
366	–	#define UMODE_EXTERNAL     0x00001000 /* show servers introduced and splitting */
367	–	#define UMODE_CALLERID     0x00002000 /* block unless caller id's */
368	–	#define UMODE_SOFTCALLERID 0x00004000 /* block unless on common channel */
369	–	#define UMODE_UNAUTH       0x00008000 /* show unauth connects here */
370	–	#define UMODE_LOCOPS       0x00010000 /* show locops */
371	–	#define UMODE_DEAF         0x00020000 /* don't receive channel messages */
372	–	#define UMODE_CCONN_FULL   0x00040000 /* add unused fields to connection monitoring */
373	–
374	–	/* user information flags, only settable by remote mode or local oper */
375	–	#define UMODE_OPER         0x40000000 /* Operator */
376	–	#define UMODE_ADMIN        0x80000000 /* Admin on server */
322
323	<	#define UMODE_ALL          UMODE_SERVNOTICE
323	>	/* umodes, settable flags */
324	>	#define UMODE_SERVNOTICE   0x00000001 /**< server notices such as kill */
325	>	#define UMODE_CCONN        0x00000002 /**< Client Connections */
326	>	#define UMODE_REJ          0x00000004 /**< Bot Rejections */
327	>	#define UMODE_SKILL        0x00000008 /**< Server Killed */
328	>	#define UMODE_FULL         0x00000010 /**< Full messages */
329	>	#define UMODE_SPY          0x00000020 /**< see STATS / LINKS */
330	>	#define UMODE_DEBUG        0x00000040 /**< 'debugging' info */
331	>	#define UMODE_NCHANGE      0x00000080 /**< Nick change notice */
332	>	#define UMODE_WALLOP       0x00000100 /**< send wallops to them */
333	>	#define UMODE_OPERWALL     0x00000200 /**< Operwalls */
334	>	#define UMODE_INVISIBLE    0x00000400 /**< makes user invisible */
335	>	#define UMODE_BOTS         0x00000800 /**< shows bots */
336	>	#define UMODE_EXTERNAL     0x00001000 /**< show servers introduced and splitting */
337	>	#define UMODE_CALLERID     0x00002000 /**< block unless caller id's */
338	>	#define UMODE_SOFTCALLERID 0x00004000 /**< block unless on common channel */
339	>	#define UMODE_UNAUTH       0x00008000 /**< show unauth connects here */
340	>	#define UMODE_LOCOPS       0x00010000 /**< show locops */
341	>	#define UMODE_DEAF         0x00020000 /**< don't receive channel messages */
342	>	#define UMODE_CCONN_FULL   0x00040000 /**< add unused fields to connection monitoring */
343	>	#define UMODE_REGISTERED   0x00080000 /**< User has identified for that nick. */
344	>	#define UMODE_REGONLY      0x00100000 /**< Only registered nicks may PM */
345	>	#define UMODE_HIDDEN       0x00200000 /**< Operator status is hidden */
346	>	#define UMODE_OPER         0x00400000 /**< Operator */
347	>	#define UMODE_ADMIN        0x00800000 /**< Admin on server */
348	>
349	>	#define UMODE_ALL          UMODE_SERVNOTICE
350	>
351	>	#define HasUMode(x, y) ((x)->umodes &   (y))
352	>	#define AddUMode(x, y) ((x)->umodes |=  (y))
353	>	#define DelUMode(x, y) ((x)->umodes &= ~(y))
354
355		#define SEND_UMODES  (UMODE_INVISIBLE | UMODE_OPER | UMODE_WALLOP | \
356	<	UMODE_ADMIN)
356	>	UMODE_REGISTERED | UMODE_ADMIN | UMODE_HIDDEN)
357	>
358
359
360		/* oper priv flags */
361	<	#define OPER_FLAG_GLOBAL_KILL  0x00000001 /* oper can global kill        */
362	<	#define OPER_FLAG_REMOTE       0x00000002 /* oper can do squits/connects */
363	<	#define OPER_FLAG_UNKLINE      0x00000004 /* oper can use unkline        */
364	<	#define OPER_FLAG_GLINE        0x00000008 /* oper can use gline          */
365	<	#define OPER_FLAG_N            0x00000010 /* oper can umode n            */
366	<	#define OPER_FLAG_K            0x00000020 /* oper can kill/kline         */
367	<	#define OPER_FLAG_X            0x00000040 /* oper can xline              */
368	<	#define OPER_FLAG_DIE          0x00000080 /* oper can die                */
369	<	#define OPER_FLAG_REHASH       0x00000100 /* oper can rehash             */
370	<	#define OPER_FLAG_ADMIN        0x00000200 /* oper can set umode +a       */
371	<	#define OPER_FLAG_HIDDEN_ADMIN 0x00000400 /* admin is hidden             */
372	<	#define OPER_FLAG_OPERWALL     0x00000800 /* */
373	<	#define OPER_FLAG_OPER_SPY     0x00001000 /* */
374	<	#define OPER_FLAG_REMOTEBAN    0x00002000 /* */
375	<	#define OPER_FLAG_HIDDEN_OPER  0x00004000 /* */
361	>	#define OPER_FLAG_GLOBAL_KILL  0x00000001 /**< Oper can global kill        */
362	>	#define OPER_FLAG_REMOTE       0x00000002 /**> Oper can do squits/connects */
363	>	#define OPER_FLAG_UNKLINE      0x00000004 /**< Oper can use unkline        */
364	>	#define OPER_FLAG_GLINE        0x00000008 /**< Oper can use gline          */
365	>	#define OPER_FLAG_N            0x00000010 /**< Oper can umode n            */
366	>	#define OPER_FLAG_K            0x00000020 /**< Oper can kill/kline         */
367	>	#define OPER_FLAG_X            0x00000040 /**< Oper can xline              */
368	>	#define OPER_FLAG_DIE          0x00000080 /**< Oper can die                */
369	>	#define OPER_FLAG_REHASH       0x00000100 /**< Oper can rehash             */
370	>	#define OPER_FLAG_ADMIN        0x00000200 /**< Oper can set umode +a       */
371	>	#define OPER_FLAG_OPERWALL     0x00000400 /**< Oper can use OPERWALL command */
372	>	#define OPER_FLAG_OPER_SPY     0x00000800 /* */
373	>	#define OPER_FLAG_REMOTEBAN    0x00001000 /**< Oper can set remote bans */
374	>	#define OPER_FLAG_GLOBOPS      0x00002000 /**< Oper can use GLOBOPS command */
375	>	#define OPER_FLAG_MODULE       0x00004000 /**< Oper can use MODULE commands */
376	>	#define OPER_FLAG_RESTART      0x00008000 /**< Oper can use RESTART command */
377	>	#define OPER_FLAG_DLINE        0x00010000 /**< Oper can use DLINE command   */
378	>	#define OPER_FLAG_UNDLINE      0x00020000 /**< Oper can use UNDLINE command */
379	>
380	>	#define HasOFlag(x, y) (MyConnect(x) ? (x)->localClient->operflags & (y) : 0)
381	>	#define AddOFlag(x, y) ((x)->localClient->operflags |=  (y))
382	>	#define DelOFlag(x, y) ((x)->localClient->operflags &= ~(y))
383	>	#define ClrOFlag(x)    ((x)->localClient->operflags = 0)
384
401	–	#define SetOFlag(x, y) ((x)->localClient->operflags |= (y))
385
386
387		/* flags macros. */
405	–	#define IsMsgFloodNoticed(x)       ((x)->flags & FLAGS_FLOOD_NOTICED)
406	–	#define SetMsgFloodNoticed(x)      ((x)->flags |= FLAGS_FLOOD_NOTICED)
407	–	#define ClearMsgFloodNoticed(x)    ((x)->flags &= ~FLAGS_FLOOD_NOTICED)
388		#define IsAuthFinished(x)       ((x)->flags & FLAGS_FINISHED_AUTH)
389		#define IsDead(x)               ((x)->flags & FLAGS_DEADSOCKET)
390		#define SetDead(x)              ((x)->flags |= FLAGS_DEADSOCKET)
391		#define IsClosing(x)            ((x)->flags & FLAGS_CLOSING)
392		#define SetClosing(x)           ((x)->flags |= FLAGS_CLOSING)
413	–	#define IsKilled(x)             ((x)->flags & FLAGS_KILLED)
414	–	#define SetKilled(x)            ((x)->flags |= FLAGS_KILLED)
415	–	#define IsCryptIn(x)            ((x)->flags &  FLAGS_CRYPTIN)
416	–	#define SetCryptIn(x)           ((x)->flags |= FLAGS_CRYPTIN)
417	–	#define IsCryptOut(x)           ((x)->flags &  FLAGS_CRYPTOUT)
418	–	#define SetCryptOut(x)          ((x)->flags |= FLAGS_CRYPTOUT)
419	–	#define IsWaitAuth(x)           ((x)->flags &  FLAGS_WAITAUTH)
420	–	#define SetWaitAuth(x)          ((x)->flags |= FLAGS_WAITAUTH)
421	–	#define ClearWaitAuth(x)        ((x)->flags &= ~FLAGS_WAITAUTH)
422	–	#define HasServlink(x)          ((x)->flags &  FLAGS_SERVLINK)
423	–	#define SetServlink(x)          ((x)->flags |= FLAGS_SERVLINK)
424	–	#define MyConnect(x)            ((x)->localClient != NULL)
425	–	#define MyClient(x)             (MyConnect(x) && IsClient(x))
426	–	#define SetMark(x)              ((x)->flags |= FLAGS_MARK)
427	–	#define ClearMark(x)            ((x)->flags &= ~FLAGS_MARK)
428	–	#define IsMarked(x)             ((x)->flags & FLAGS_MARK)
393		#define SetCanFlood(x)          ((x)->flags |= FLAGS_CANFLOOD)
394		#define IsCanFlood(x)           ((x)->flags & FLAGS_CANFLOOD)
395		#define IsDefunct(x)            ((x)->flags & (FLAGS_DEADSOCKET|FLAGS_CLOSING| \
396		FLAGS_KILLED))
397
398		/* oper flags */
399	<	#define MyOper(x)               (MyConnect(x) && IsOper(x))
399	>	#define MyOper(x)               (MyConnect(x) && HasUMode(x, UMODE_OPER))
400
401		#define SetOper(x)              {(x)->umodes |= UMODE_OPER; \
402		if (!IsServer((x))) (x)->handler = OPER_HANDLER;}
403
404		#define ClearOper(x)            {(x)->umodes &= ~(UMODE_OPER|UMODE_ADMIN); \
405	<	if (!IsOper((x)) && !IsServer((x))) \
405	>	if (!HasUMode(x, UMODE_OPER) && !IsServer((x))) \
406		(x)->handler = CLIENT_HANDLER; }
407
444	–	#define IsPrivileged(x)         (IsOper(x) || IsServer(x))
445	–
446	–	/* umode flags */
447	–	#define IsInvisible(x)          ((x)->umodes & UMODE_INVISIBLE)
448	–	#define SendWallops(x)          ((x)->umodes & UMODE_WALLOP)
449	–	#define IsSetCallerId(x)        ((x)->umodes & \
450	–	(UMODE_CALLERID|UMODE_SOFTCALLERID))
451	–	#define IsSoftCallerId(x)       ((x)->umodes & UMODE_SOFTCALLERID)
452	–	#define IsDeaf(x)               ((x)->umodes & UMODE_DEAF)
453	–	#define IsFull(x)               ((x)->umodes & UMODE_CCONN_FULL)
454	–
408		#define SetSendQExceeded(x)     ((x)->flags |= FLAGS_SENDQEX)
409		#define IsSendQExceeded(x)      ((x)->flags &  FLAGS_SENDQEX)
410
#	Line 488 | Line 441 | struct LocalUser
441		#define SetIPSpoof(x)           ((x)->flags |= FLAGS_IP_SPOOFING)
442		#define IsIPSpoof(x)            ((x)->flags & FLAGS_IP_SPOOFING)
443
491	–	#define IsIdlelined(x)          ((x)->flags &  FLAGS_IDLE_LINED)
492	–	#define SetIdlelined(x)         ((x)->flags |= FLAGS_IDLE_LINED)
493	–	#define IsRestricted(x)         ((x)->flags &  FLAGS_RESTRICTED)
494	–	#define SetRestricted(x)        ((x)->flags |= FLAGS_RESTRICTED)
495	–
444		#define IsFloodDone(x)          ((x)->flags &  FLAGS_FLOODDONE)
445		#define SetFloodDone(x)         ((x)->flags |= FLAGS_FLOODDONE)
446		#define HasPingCookie(x)        ((x)->flags & FLAGS_PING_COOKIE)
#	Line 503 | Line 451 | struct LocalUser
451		#define IsSendqBlocked(x)       ((x)->flags &  FLAGS_BLOCKED)
452		#define SetSendqBlocked(x)      ((x)->flags |= FLAGS_BLOCKED)
453		#define ClearSendqBlocked(x)    ((x)->flags &= ~FLAGS_BLOCKED)
506	–	#define IsSlinkqBlocked(x)      ((x)->flags &  FLAGS_SBLOCKED)
507	–	#define SetSlinkqBlocked(x)     ((x)->flags |= FLAGS_SBLOCKED)
508	–	#define ClearSlinkqBlocked(x)   ((x)->flags &= ~FLAGS_SBLOCKED)
509	–
510	–	#define IsBursted(x)            ((x)->flags &  FLAGS_BURSTED)
511	–	#define SetBursted(x)           ((x)->flags |= FLAGS_BURSTED)
512	–	#define ClearBursted(x)         ((x)->flags &= ~FLAGS_BURSTED)
454
455		#define IsCaptured(x)           ((x)->handler == DUMMY_HANDLER)
456		#define SetCaptured(x)          ((x)->handler = DUMMY_HANDLER)
457		#define ClearCaptured(x)        ((x)->handler = CLIENT_HANDLER)
458
518	–	/* operflags macros */
519	–	#define ClearOperFlags(x)       ((x)->localClient->operflags = 0)
520	–	#define IsOperGlobalKill(x)     (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_GLOBAL_KILL : 0)
521	–	#define IsOperRemote(x)         (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_REMOTE : 0)
522	–	#define IsOperUnkline(x)        (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_UNKLINE : 0)
523	–	#define IsOperGline(x)          (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_GLINE : 0)
524	–	#define IsOperN(x)              (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_N : 0)
525	–	#define IsOperK(x)              (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_K : 0)
526	–	#define IsOperDie(x)            (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_DIE : 0)
527	–	#define IsOperRehash(x)         (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_REHASH : 0)
528	–	#define IsOperAdmin(x)          (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_ADMIN : 0)
529	–	#define IsOperHiddenAdmin(x)    (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_HIDDEN_ADMIN : 0)
530	–	#define IsOperX(x)              (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_X : 0)
531	–	#define IsOperWall(x)           (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_OPERWALL : 0)
532	–	#define IsOperRemoteBan(x)      (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_REMOTEBAN : 0)
533	–	#define IsOperHidden(x)         (MyConnect(x) ? (x)->localClient->operflags & OPER_FLAG_HIDDEN_OPER : 0)
534	–
535	–	/*
536	–	* definitions for get_client_name
537	–	* TBD - make this an enum
538	–	*/
539	–	#define HIDE_IP 0
540	–	#define SHOW_IP 1
541	–	#define MASK_IP 2
459
460		extern struct Client me;
461		extern dlink_list listing_client_list;
#	Line 552 | Line 469 | extern void del_all_accepts(struct Clien
469		extern void exit_client(struct Client *, struct Client *, const char *);
470		extern void check_conf_klines(void);
471		extern void init_client(void);
555	–	extern void change_local_nick(struct Client *, struct Client *, const char *);
472		extern void dead_link_on_write(struct Client *, int);
473		extern void dead_link_on_read(struct Client *, int);
474		extern void exit_aborted_clients(void);
#	Line 560 | Line 476 | extern void free_exited_clients(void);
476		extern struct Client *make_client(struct Client *);
477		extern struct Client *find_chasing(struct Client *, struct Client *, const char *, int *);
478		extern struct Client *find_person(const struct Client *const, const char *);
479	<	extern const char *get_client_name(struct Client *, int);
479	>	extern const char *get_client_name(const struct Client *, enum addr_mask_type);
480
481		#endif /* INCLUDED_client_h */

Diff Legend

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