ViewVC Help

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

root/svn/ircd-hybrid/branches/8.2.x/include/client.h

Comparing:
ircd-hybrid-8/include/client.h (file contents), Revision 1484 by michael, Thu Jul 26 18:38:56 2012 UTC vs.
ircd-hybrid/trunk/include/client.h (file contents), Revision 3241 by michael, Sun Mar 30 16:45:31 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 "s_auth.h"
38
39	<	#define HOSTIPLEN       45 /* sizeof("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255") */
40	<	#define PASSWDLEN       20
41	<	#define IDLEN           12 /* this is the maximum length, not the actual
42	<	generated length; DO NOT CHANGE! */
39	>	struct MaskItem;
40	>
41	>	/*
42	>	* status macros.
43	>	*/
44	>	#define STAT_CONNECTING         0x01
45	>	#define STAT_HANDSHAKE          0x02
46	>	#define STAT_ME                 0x04
47	>	#define STAT_UNKNOWN            0x08
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
54	>	#define REG_INIT (REG_NEED_USER|REG_NEED_NICK)
55	>
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)
60	>	#define IsHandshake(x)          ((x)->status == STAT_HANDSHAKE)
61	>	#define IsMe(x)                 ((x)->status == STAT_ME)
62	>	#define IsUnknown(x)            ((x)->status == STAT_UNKNOWN)
63	>	#define IsServer(x)             ((x)->status == STAT_SERVER)
64	>	#define IsClient(x)             ((x)->status == STAT_CLIENT)
65	>
66	>	#define SetConnecting(x)        {(x)->status = STAT_CONNECTING; \
67	>	(x)->handler = UNREGISTERED_HANDLER; }
68	>
69	>	#define SetHandshake(x)         {(x)->status = STAT_HANDSHAKE; \
70	>	(x)->handler = UNREGISTERED_HANDLER; }
71	>
72	>	#define SetMe(x)                {(x)->status = STAT_ME; \
73	>	(x)->handler = UNREGISTERED_HANDLER; }
74	>
75	>	#define SetUnknown(x)           {(x)->status = STAT_UNKNOWN; \
76	>	(x)->handler = UNREGISTERED_HANDLER; }
77	>
78	>	#define SetServer(x)            {(x)->status = STAT_SERVER; \
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; }
84	>
85	>	#define MyConnect(x)            ((x)->localClient != NULL)
86	>	#define MyClient(x)             (MyConnect(x) && IsClient(x))
87	>
88	>	/*
89	>	* ts stuff
90	>	*/
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_UNUSED___      0x00040000 /**<  */
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	>	#define FLAGS_CORK           0x20000000
136	>
137	>	#define HasFlag(x, y) ((x)->flags &   (y))
138	>	#define AddFlag(x, y) ((x)->flags |=  (y))
139	>	#define DelFlag(x, y) ((x)->flags &= ~(y))
140	>
141	>
142	>
143	>	/* umodes, settable flags */
144	>	#define UMODE_SERVNOTICE   0x00000001 /**< server notices such as kill */
145	>	#define UMODE_CCONN        0x00000002 /**< Client Connections */
146	>	#define UMODE_REJ          0x00000004 /**< Bot Rejections */
147	>	#define UMODE_SKILL        0x00000008 /**< Server Killed */
148	>	#define UMODE_FULL         0x00000010 /**< Full messages */
149	>	#define UMODE_SPY          0x00000020 /**< see STATS / LINKS */
150	>	#define UMODE_DEBUG        0x00000040 /**< 'debugging' info */
151	>	#define UMODE_NCHANGE      0x00000080 /**< Nick change notice */
152	>	#define UMODE_WALLOP       0x00000100 /**< send wallops to them */
153	>	#define UMODE_OPERWALL     0x00000200 /**< Operwalls */
154	>	#define UMODE_INVISIBLE    0x00000400 /**< makes user invisible */
155	>	#define UMODE_BOTS         0x00000800 /**< shows bots */
156	>	#define UMODE_EXTERNAL     0x00001000 /**< show servers introduced and splitting */
157	>	#define UMODE_CALLERID     0x00002000 /**< block unless caller id's */
158	>	#define UMODE_SOFTCALLERID 0x00004000 /**< block unless on common channel */
159	>	#define UMODE_UNAUTH       0x00008000 /**< show unauth connects here */
160	>	#define UMODE_LOCOPS       0x00010000 /**< show locops */
161	>	#define UMODE_DEAF         0x00020000 /**< don't receive channel messages */
162	>	#define UMODE_REGISTERED   0x00040000 /**< User has identified for that nick. */
163	>	#define UMODE_REGONLY      0x00080000 /**< Only registered nicks may PM */
164	>	#define UMODE_HIDDEN       0x00100000 /**< Operator status is hidden */
165	>	#define UMODE_OPER         0x00200000 /**< Operator */
166	>	#define UMODE_ADMIN        0x00400000 /**< Admin on server */
167	>	#define UMODE_FARCONNECT   0x00800000 /**< Can see remote client connects/exits */
168	>	#define UMODE_HIDDENHOST   0x01000000 /**< User's host is hidden */
169	>	#define UMODE_SSL          0x02000000 /**< User is connected via TLS/SSL */
170	>	#define UMODE_WEBIRC       0x04000000 /**< User connected via a webirc gateway */
171	>
172	>
173	>	#define UMODE_ALL          UMODE_SERVNOTICE
174	>
175	>	#define HasUMode(x, y) ((x)->umodes &   (y))
176	>	#define AddUMode(x, y) ((x)->umodes |=  (y))
177	>	#define DelUMode(x, y) ((x)->umodes &= ~(y))
178	>
179	>	#define SEND_UMODES  (UMODE_INVISIBLE | UMODE_OPER | UMODE_WALLOP |\
180	>	UMODE_REGONLY | UMODE_REGISTERED | UMODE_ADMIN |\
181	>	UMODE_HIDDEN | UMODE_HIDDENHOST | UMODE_SSL |\
182	>	UMODE_WEBIRC | UMODE_CALLERID | UMODE_SOFTCALLERID)
183	>
184	>
185	>
186	>	/* oper priv flags */
187	>	#define OPER_FLAG_KILL_REMOTE    0x00000001 /**< Oper can global kill        */
188	>	#define OPER_FLAG_KILL           0x00000002 /**< Oper can do local KILL      */
189	>	#define OPER_FLAG_UNKLINE        0x00000004 /**< Oper can use unkline        */
190	>	#define OPER_FLAG_GLINE          0x00000008 /**< Oper can use gline          */
191	>	#define OPER_FLAG_K              0x00000010 /**< Oper can kill/kline         */
192	>	#define OPER_FLAG_XLINE          0x00000020 /**< Oper can xline              */
193	>	#define OPER_FLAG_DIE            0x00000040 /**< Oper can die                */
194	>	#define OPER_FLAG_REHASH         0x00000080 /**< Oper can rehash             */
195	>	#define OPER_FLAG_ADMIN          0x00000100 /**< Oper can set umode +a       */
196	>	#define OPER_FLAG_OPERWALL       0x00000200 /**< Oper can use OPERWALL command */
197	>	#define OPER_FLAG_REMOTEBAN      0x00000400 /**< Oper can set remote bans */
198	>	#define OPER_FLAG_GLOBOPS        0x00000800 /**< Oper can use GLOBOPS command */
199	>	#define OPER_FLAG_MODULE         0x00001000 /**< Oper can use MODULE commands */
200	>	#define OPER_FLAG_RESTART        0x00002000 /**< Oper can use RESTART command */
201	>	#define OPER_FLAG_DLINE          0x00004000 /**< Oper can use DLINE command   */
202	>	#define OPER_FLAG_UNDLINE        0x00008000 /**< Oper can use UNDLINE command */
203	>	#define OPER_FLAG_SET            0x00010000 /**< Oper can use SET command */
204	>	#define OPER_FLAG_SQUIT          0x00020000 /**< Oper can do local SQUIT */
205	>	#define OPER_FLAG_SQUIT_REMOTE   0x00040000 /**< Oper can do global SQUIT */
206	>	#define OPER_FLAG_CONNECT        0x00080000 /**< Oper can do local CONNECT */
207	>	#define OPER_FLAG_CONNECT_REMOTE 0x00100000 /**< Oper can do global CONNECT */
208	>	#define OPER_FLAG_WALLOPS        0x00200000 /**< Oper can do WALLOPS */
209	>	#define OPER_FLAG_LOCOPS         0x00400000 /**< Oper can do LOCOPS */
210	>	#define OPER_FLAG_UNXLINE        0x00800000 /**< Oper can unxline            */
211	>
212	>
213	>	#define HasOFlag(x, y) (MyConnect(x) ? (x)->localClient->operflags & (y) : 0)
214	>	#define AddOFlag(x, y) ((x)->localClient->operflags |=  (y))
215	>	#define DelOFlag(x, y) ((x)->localClient->operflags &= ~(y))
216	>	#define ClrOFlag(x)    ((x)->localClient->operflags = 0)
217	>
218	>
219	>
220	>	/* flags macros. */
221	>	#define IsAuthFinished(x)       ((x)->flags & FLAGS_FINISHED_AUTH)
222	>	#define IsDead(x)               ((x)->flags & FLAGS_DEADSOCKET)
223	>	#define SetDead(x)              ((x)->flags |= FLAGS_DEADSOCKET)
224	>	#define IsClosing(x)            ((x)->flags & FLAGS_CLOSING)
225	>	#define SetClosing(x)           ((x)->flags |= FLAGS_CLOSING)
226	>	#define SetCanFlood(x)          ((x)->flags |= FLAGS_CANFLOOD)
227	>	#define IsCanFlood(x)           ((x)->flags & FLAGS_CANFLOOD)
228	>	#define IsDefunct(x)            ((x)->flags & (FLAGS_DEADSOCKET|FLAGS_CLOSING|FLAGS_KILLED))
229	>
230	>	/* oper flags */
231	>	#define MyOper(x)               (MyConnect(x) && HasUMode(x, UMODE_OPER))
232	>
233	>	#define SetOper(x)              {(x)->umodes |= UMODE_OPER; \
234	>	if (!IsServer((x))) (x)->handler = OPER_HANDLER;}
235	>
236	>	#define ClearOper(x)            {(x)->umodes &= ~(UMODE_OPER|UMODE_ADMIN); \
237	>	if (!HasUMode(x, UMODE_OPER) && !IsServer((x))) \
238	>	(x)->handler = CLIENT_HANDLER; }
239	>
240	>	#define SetSendQExceeded(x)     ((x)->flags |= FLAGS_SENDQEX)
241	>	#define IsSendQExceeded(x)      ((x)->flags &  FLAGS_SENDQEX)
242	>
243	>	#define SetIpHash(x)            ((x)->flags |= FLAGS_IPHASH)
244	>	#define ClearIpHash(x)          ((x)->flags &= ~FLAGS_IPHASH)
245	>	#define IsIpHash(x)             ((x)->flags & FLAGS_IPHASH)
246	>
247	>	#define SetUserHost(x)          ((x)->flags |= FLAGS_USERHOST)
248	>	#define ClearUserHost(x)        ((x)->flags &= ~FLAGS_USERHOST)
249	>	#define IsUserHostIp(x)         ((x)->flags & FLAGS_USERHOST)
250	>
251	>	#define SetPingSent(x)          ((x)->flags |= FLAGS_PINGSENT)
252	>	#define IsPingSent(x)           ((x)->flags & FLAGS_PINGSENT)
253	>	#define ClearPingSent(x)        ((x)->flags &= ~FLAGS_PINGSENT)
254	>
255	>	#define SetNeedId(x)            ((x)->flags |= FLAGS_NEEDID)
256	>	#define IsNeedId(x)             ((x)->flags & FLAGS_NEEDID)
257	>
258	>	#define SetGotId(x)             ((x)->flags |= FLAGS_GOTID)
259	>	#define IsGotId(x)              ((x)->flags & FLAGS_GOTID)
260	>
261	>	#define IsExemptKline(x)        ((x)->flags & FLAGS_EXEMPTKLINE)
262	>	#define SetExemptKline(x)       ((x)->flags |= FLAGS_EXEMPTKLINE)
263	>	#define IsExemptLimits(x)       ((x)->flags & FLAGS_NOLIMIT)
264	>	#define SetExemptLimits(x)      ((x)->flags |= FLAGS_NOLIMIT)
265	>	#define IsExemptGline(x)        ((x)->flags & FLAGS_EXEMPTGLINE)
266	>	#define SetExemptGline(x)       ((x)->flags |= FLAGS_EXEMPTGLINE)
267	>	#define IsExemptResv(x)         ((x)->flags & FLAGS_EXEMPTRESV)
268	>	#define SetExemptResv(x)        ((x)->flags |= FLAGS_EXEMPTRESV)
269	>	#define SetIPSpoof(x)           ((x)->flags |= FLAGS_IP_SPOOFING)
270	>	#define IsIPSpoof(x)            ((x)->flags & FLAGS_IP_SPOOFING)
271	>	#define DelIPSpoof(x)           ((x)->flags &= ~FLAGS_IP_SPOOFING)
272	>
273	>	#define IsFloodDone(x)          ((x)->flags &  FLAGS_FLOODDONE)
274	>	#define SetFloodDone(x)         ((x)->flags |= FLAGS_FLOODDONE)
275	>	#define HasPingCookie(x)        ((x)->flags & FLAGS_PING_COOKIE)
276	>	#define SetPingCookie(x)        ((x)->flags |= FLAGS_PING_COOKIE)
277	>	#define IsHidden(x)             ((x)->flags &  FLAGS_HIDDEN)
278	>	#define SetHidden(x)            ((x)->flags |= FLAGS_HIDDEN)
279
280
281		/*! \brief addr_mask_type enumeration */
#	Line 81 | Line 318 | struct LocalUser
318		{
319		dlink_node   lclient_node;
320
84	–	char         client_host[HOSTLEN + 1];
85	–	char         client_server[HOSTLEN + 1];
86	–
321		unsigned int registration;
322		unsigned int cap_client;    /**< Client capabilities (from us) */
323		unsigned int cap_active;    /**< Active capabilities (to us) */
#	Line 98 | Line 332 | struct LocalUser
332		time_t       firsttime;  /**< time client was created */
333		time_t       since;      /**< last time we parsed something */
334		time_t       last_knock;    /**< time of last knock */
335	<	time_t       last_join_time;   /**< when this client last
335	>	time_t       last_join_time;   /**< when this client last
336		joined a channel */
337	<	time_t       last_leave_time;  /**< when this client last
337	>	time_t       last_leave_time;  /**< when this client last
338		* left a channel */
339	<	int          join_leave_count; /**< count of JOIN/LEAVE in less than
339	>	int          join_leave_count; /**< count of JOIN/LEAVE in less than
340		MIN_JOIN_LEAVE_TIME seconds */
341	<	int          oper_warn_count_down; /**< warn opers of this possible
341	>	int          oper_warn_count_down; /**< warn opers of this possible
342		spambot every time this gets to 0 */
109	–	time_t       reject_delay;
343		time_t       last_caller_id_time;
344		time_t       first_received_message_time;
345		time_t       last_nick_change;
#	Line 126 | Line 359 | struct LocalUser
359		uint64_t bytes;             /**< Statistics: total bytes sent/received */
360		} recv, send;
361
362	<	struct AuthRequest *auth;
362	>	struct AuthRequest auth;
363		struct Listener *listener;   /**< listener accepted from */
364		dlink_list        acceptlist; /**< clients I'll allow to talk to me */
365		dlink_list        watches;   /**< chain of Watch pointer blocks */
#	Line 134 | Line 367 | struct LocalUser
367		dlink_list        invited;   /**< chain of invite pointer blocks */
368		struct irc_ssaddr ip;
369		int               aftype;    /**< Makes life easier for DNS res in IPV6 */
370	+	int               country_id; /**< ID corresponding to a ISO 3166 country code */
371
372		char              *passwd;
373		fde_t             fd;
140	–
374		/* Anti-flood stuff. We track how many messages were parsed and how
375		* many we were allowed in the current second, and apply a simple
376		* decay to avoid flooding.
#	Line 164 | Line 397 | struct Client
397		struct Client    *from;       /**< == self, if Local Client, *NEVER* NULL! */
398
399		time_t            tsinfo;     /**< TS on the nick, SVINFO on server */
167	–	time_t            servicestamp; /**< Last time client has been identified for its nick */
400
401		unsigned int      flags;      /**< client flags */
402		unsigned int      umodes;     /**< opers, normal users subset */
#	Line 177 | Line 409 | struct Client
409
410		char away[AWAYLEN + 1]; /**< Client's AWAY message. Can be set/unset via AWAY command */
411		char name[HOSTLEN + 1]; /**< unique name for a client nick or host */
412	+	char svid[SVIDLEN + 1]; /**< Services ID. */
413		char id[IDLEN + 1];       /**< client ID, unique ID per client */
414	<
415	<	/*
416	<	* client->username is the username from ident or the USER message,
417	<	* If the client is idented the USER message is ignored, otherwise
185	<	* the username part of the USER message is put here prefixed with a
414	>	/*
415	>	* client->username is the username from ident or the USER message,
416	>	* If the client is idented the USER message is ignored, otherwise
417	>	* the username part of the USER message is put here prefixed with a
418		* tilde depending on the auth{} block. Once a client has registered,
419		* this field should be considered read-only.
420	<	*/
420	>	*/
421		char              username[USERLEN + 1]; /* client's username */
190	–
422		/*
423		* client->host contains the resolved name or ip address
424		* as a string for the user, it may be fiddled with for oper spoofing etc.
#	Line 197 | Line 428 | struct Client
428		char              host[HOSTLEN + 1];     /* client's hostname */
429
430		/*
431	<	* client->info for unix clients will normally contain the info from the
431	>	* client->info for unix clients will normally contain the info from the
432		* gcos field in /etc/passwd but anything can go here.
433		*/
434		char              info[REALLEN + 1]; /* Free form additional client info */
#	Line 207 | Line 438 | struct Client
438		* string, this field should be considered read-only once the connection
439		* has been made. (set in s_bsd.c only)
440		*/
441	<	char              sockhost[HOSTIPLEN + 1]; /* This is the host name from the
441	>	char              sockhost[HOSTIPLEN + 1]; /* This is the host name from the
442		socket ip address as string */
443	+	char             *certfp;
444		};
445
214	–	/*
215	–	* status macros.
216	–	*/
217	–	#define STAT_CONNECTING         0x01
218	–	#define STAT_HANDSHAKE          0x02
219	–	#define STAT_ME                 0x04
220	–	#define STAT_UNKNOWN            0x08
221	–	#define STAT_SERVER             0x10
222	–	#define STAT_CLIENT             0x20
223	–
224	–	#define REG_NEED_USER 0x1
225	–	#define REG_NEED_NICK 0x2
226	–	#define REG_NEED_CAP  0x4
227	–	#define REG_INIT (REG_NEED_USER|REG_NEED_NICK)
228	–
229	–	#define HasID(x)                ((x)->id[0] != '\0')
230	–	#define ID(x)                   (HasID(x) ? (x)->id : (x)->name)
231	–	#define ID_or_name(x,client_p)  ((IsCapable(client_p, CAP_TS6) && HasID(x)) ? (x)->id : (x)->name)
232	–
233	–	#define IsRegistered(x)         ((x)->status  > STAT_UNKNOWN)
234	–	#define IsConnecting(x)         ((x)->status == STAT_CONNECTING)
235	–	#define IsHandshake(x)          ((x)->status == STAT_HANDSHAKE)
236	–	#define IsMe(x)                 ((x)->status == STAT_ME)
237	–	#define IsUnknown(x)            ((x)->status == STAT_UNKNOWN)
238	–	#define IsServer(x)             ((x)->status == STAT_SERVER)
239	–	#define IsClient(x)             ((x)->status == STAT_CLIENT)
240	–
241	–	#define SetConnecting(x)        {(x)->status = STAT_CONNECTING; \
242	–	(x)->handler = UNREGISTERED_HANDLER; }
243	–
244	–	#define SetHandshake(x)         {(x)->status = STAT_HANDSHAKE; \
245	–	(x)->handler = UNREGISTERED_HANDLER; }
246	–
247	–	#define SetMe(x)                {(x)->status = STAT_ME; \
248	–	(x)->handler = UNREGISTERED_HANDLER; }
249	–
250	–	#define SetUnknown(x)           {(x)->status = STAT_UNKNOWN; \
251	–	(x)->handler = UNREGISTERED_HANDLER; }
252	–
253	–	#define SetServer(x)            {(x)->status = STAT_SERVER; \
254	–	(x)->handler = SERVER_HANDLER; }
255	–
256	–	#define SetClient(x)            {(x)->status = STAT_CLIENT; \
257	–	(x)->handler = HasUMode(x, UMODE_OPER) ? \
258	–	OPER_HANDLER : CLIENT_HANDLER; }
259	–
260	–	#define MyConnect(x)            ((x)->localClient != NULL)
261	–	#define MyClient(x)             (MyConnect(x) && IsClient(x))
262	–
263	–	/*
264	–	* ts stuff
265	–	*/
266	–	#define TS_CURRENT      6       /**< current TS protocol version */
267	–	#define TS_MIN          5       /**< minimum supported TS protocol version */
268	–	#define TS_DOESTS       0x20000000
269	–	#define DoesTS(x)       ((x)->tsinfo == TS_DOESTS)
270	–
271	–
272	–
273	–	#define CAP_MULTI_PREFIX  0x00000001
274	–
275	–	#define HasCap(x, y) ((x)->localClient->cap_active & (y))
276	–
277	–	/* housekeeping flags */
278	–	#define FLAGS_PINGSENT      0x00000001 /**< Unreplied ping sent */
279	–	#define FLAGS_DEADSOCKET    0x00000002 /**< Local socket is dead--Exiting soon */
280	–	#define FLAGS_KILLED        0x00000004 /**< Prevents "QUIT" from being sent for this */
281	–	#define FLAGS_CLOSING       0x00000008 /**< set when closing to suppress errors */
282	–	#define FLAGS_GOTID         0x00000010 /**< successful ident lookup achieved */
283	–	#define FLAGS_NEEDID        0x00000020 /**< auth{} block say must use ident return */
284	–	#define FLAGS_SENDQEX       0x00000040 /**< Sendq exceeded */
285	–	#define FLAGS_IPHASH        0x00000080 /**< iphashed this client */
286	–	#define FLAGS_MARK          0x00000100 /**< marked client */
287	–	#define FLAGS_CANFLOOD      0x00000200 /**< client has the ability to flood */
288	–	#define FLAGS_EXEMPTGLINE   0x00000400 /**< client can't be G-lined */
289	–	#define FLAGS_EXEMPTKLINE   0x00000800 /**< client is exempt from kline */
290	–	#define FLAGS_NOLIMIT       0x00001000 /**< client is exempt from limits */
291	–	#define FLAGS_PING_COOKIE   0x00002000 /**< PING Cookie */
292	–	#define FLAGS_IP_SPOOFING   0x00004000 /**< client IP is spoofed */
293	–	#define FLAGS_FLOODDONE     0x00008000 /**< Flood grace period has been ended. */
294	–	#define FLAGS_EOB           0x00010000 /**< server has sent us an EOB */
295	–	#define FLAGS_HIDDEN        0x00020000 /**< a hidden server. not shown in /links */
296	–	#define FLAGS_BLOCKED       0x00040000 /**< must wait for COMM_SELECT_WRITE */
297	–	#define FLAGS_USERHOST      0x00080000 /**< client is in userhost hash */
298	–	#define FLAGS_BURSTED       0x00100000 /**< user was already bursted */
299	–	#define FLAGS_EXEMPTRESV    0x00200000 /**< client is exempt from RESV */
300	–	#define FLAGS_GOTUSER       0x00400000 /**< if we received a USER command */
301	–	#define FLAGS_PINGWARNING   0x00800000 /**< unreplied ping warning already sent */
302	–	#define FLAGS_FINISHED_AUTH 0x01000000 /**< Client has been released from auth */
303	–	#define FLAGS_FLOOD_NOTICED 0x02000000 /**< Notice to opers about this flooder has been sent */
304	–	#define FLAGS_SERVICE       0x04000000 /**< Client/server is a network service */
305	–
306	–	#define HasFlag(x, y) ((x)->flags &   (y))
307	–	#define AddFlag(x, y) ((x)->flags |=  (y))
308	–	#define DelFlag(x, y) ((x)->flags &= ~(y))
309	–
310	–
311	–
312	–	/* umodes, settable flags */
313	–	#define UMODE_SERVNOTICE   0x00000001 /**< server notices such as kill */
314	–	#define UMODE_CCONN        0x00000002 /**< Client Connections */
315	–	#define UMODE_REJ          0x00000004 /**< Bot Rejections */
316	–	#define UMODE_SKILL        0x00000008 /**< Server Killed */
317	–	#define UMODE_FULL         0x00000010 /**< Full messages */
318	–	#define UMODE_SPY          0x00000020 /**< see STATS / LINKS */
319	–	#define UMODE_DEBUG        0x00000040 /**< 'debugging' info */
320	–	#define UMODE_NCHANGE      0x00000080 /**< Nick change notice */
321	–	#define UMODE_WALLOP       0x00000100 /**< send wallops to them */
322	–	#define UMODE_OPERWALL     0x00000200 /**< Operwalls */
323	–	#define UMODE_INVISIBLE    0x00000400 /**< makes user invisible */
324	–	#define UMODE_BOTS         0x00000800 /**< shows bots */
325	–	#define UMODE_EXTERNAL     0x00001000 /**< show servers introduced and splitting */
326	–	#define UMODE_CALLERID     0x00002000 /**< block unless caller id's */
327	–	#define UMODE_SOFTCALLERID 0x00004000 /**< block unless on common channel */
328	–	#define UMODE_UNAUTH       0x00008000 /**< show unauth connects here */
329	–	#define UMODE_LOCOPS       0x00010000 /**< show locops */
330	–	#define UMODE_DEAF         0x00020000 /**< don't receive channel messages */
331	–	#define UMODE_CCONN_FULL   0x00040000 /**< add unused fields to connection monitoring */
332	–	#define UMODE_REGISTERED   0x00080000 /**< User has identified for that nick. */
333	–	#define UMODE_REGONLY      0x00100000 /**< Only registered nicks may PM */
334	–	#define UMODE_HIDDEN       0x00200000 /**< Operator status is hidden */
335	–	#define UMODE_OPER         0x00400000 /**< Operator */
336	–	#define UMODE_ADMIN        0x00800000 /**< Admin on server */
337	–
338	–	#define UMODE_ALL          UMODE_SERVNOTICE
339	–
340	–	#define HasUMode(x, y) ((x)->umodes &   (y))
341	–	#define AddUMode(x, y) ((x)->umodes |=  (y))
342	–	#define DelUMode(x, y) ((x)->umodes &= ~(y))
343	–
344	–	#define SEND_UMODES  (UMODE_INVISIBLE | UMODE_OPER | UMODE_WALLOP |\
345	–	UMODE_REGONLY | UMODE_REGISTERED | UMODE_ADMIN |\
346	–	UMODE_HIDDEN)
347	–
348	–
349	–
350	–	/* oper priv flags */
351	–	#define OPER_FLAG_GLOBAL_KILL  0x00000001 /**< Oper can global kill        */
352	–	#define OPER_FLAG_REMOTE       0x00000002 /**> Oper can do squits/connects */
353	–	#define OPER_FLAG_UNKLINE      0x00000004 /**< Oper can use unkline        */
354	–	#define OPER_FLAG_GLINE        0x00000008 /**< Oper can use gline          */
355	–	#define OPER_FLAG_N            0x00000010 /**< Oper can umode n            */
356	–	#define OPER_FLAG_K            0x00000020 /**< Oper can kill/kline         */
357	–	#define OPER_FLAG_X            0x00000040 /**< Oper can xline              */
358	–	#define OPER_FLAG_DIE          0x00000080 /**< Oper can die                */
359	–	#define OPER_FLAG_REHASH       0x00000100 /**< Oper can rehash             */
360	–	#define OPER_FLAG_ADMIN        0x00000200 /**< Oper can set umode +a       */
361	–	#define OPER_FLAG_OPERWALL     0x00000400 /**< Oper can use OPERWALL command */
362	–	#define OPER_FLAG_OPER_SPY     0x00000800 /* */
363	–	#define OPER_FLAG_REMOTEBAN    0x00001000 /**< Oper can set remote bans */
364	–	#define OPER_FLAG_GLOBOPS      0x00002000 /**< Oper can use GLOBOPS command */
365	–	#define OPER_FLAG_MODULE       0x00004000 /**< Oper can use MODULE commands */
366	–	#define OPER_FLAG_RESTART      0x00008000 /**< Oper can use RESTART command */
367	–	#define OPER_FLAG_DLINE        0x00010000 /**< Oper can use DLINE command   */
368	–	#define OPER_FLAG_UNDLINE      0x00020000 /**< Oper can use UNDLINE command */
369	–	#define OPER_FLAG_SET          0x00040000 /**< Oper can use SET command */
370	–
371	–	#define HasOFlag(x, y) (MyConnect(x) ? (x)->localClient->operflags & (y) : 0)
372	–	#define AddOFlag(x, y) ((x)->localClient->operflags |=  (y))
373	–	#define DelOFlag(x, y) ((x)->localClient->operflags &= ~(y))
374	–	#define ClrOFlag(x)    ((x)->localClient->operflags = 0)
375	–
376	–
377	–
378	–	/* flags macros. */
379	–	#define IsAuthFinished(x)       ((x)->flags & FLAGS_FINISHED_AUTH)
380	–	#define IsDead(x)               ((x)->flags & FLAGS_DEADSOCKET)
381	–	#define SetDead(x)              ((x)->flags |= FLAGS_DEADSOCKET)
382	–	#define IsClosing(x)            ((x)->flags & FLAGS_CLOSING)
383	–	#define SetClosing(x)           ((x)->flags |= FLAGS_CLOSING)
384	–	#define SetCanFlood(x)          ((x)->flags |= FLAGS_CANFLOOD)
385	–	#define IsCanFlood(x)           ((x)->flags & FLAGS_CANFLOOD)
386	–	#define IsDefunct(x)            ((x)->flags & (FLAGS_DEADSOCKET|FLAGS_CLOSING| \
387	–	FLAGS_KILLED))
388	–
389	–	/* oper flags */
390	–	#define MyOper(x)               (MyConnect(x) && HasUMode(x, UMODE_OPER))
391	–
392	–	#define SetOper(x)              {(x)->umodes |= UMODE_OPER; \
393	–	if (!IsServer((x))) (x)->handler = OPER_HANDLER;}
394	–
395	–	#define ClearOper(x)            {(x)->umodes &= ~(UMODE_OPER|UMODE_ADMIN); \
396	–	if (!HasUMode(x, UMODE_OPER) && !IsServer((x))) \
397	–	(x)->handler = CLIENT_HANDLER; }
398	–
399	–	#define SetSendQExceeded(x)     ((x)->flags |= FLAGS_SENDQEX)
400	–	#define IsSendQExceeded(x)      ((x)->flags &  FLAGS_SENDQEX)
401	–
402	–	#define SetIpHash(x)            ((x)->flags |= FLAGS_IPHASH)
403	–	#define ClearIpHash(x)          ((x)->flags &= ~FLAGS_IPHASH)
404	–	#define IsIpHash(x)             ((x)->flags & FLAGS_IPHASH)
405	–
406	–	#define SetUserHost(x)          ((x)->flags |= FLAGS_USERHOST)
407	–	#define ClearUserHost(x)        ((x)->flags &= ~FLAGS_USERHOST)
408	–	#define IsUserHostIp(x)         ((x)->flags & FLAGS_USERHOST)
409	–
410	–	#define SetPingSent(x)          ((x)->flags |= FLAGS_PINGSENT)
411	–	#define IsPingSent(x)           ((x)->flags & FLAGS_PINGSENT)
412	–	#define ClearPingSent(x)        ((x)->flags &= ~FLAGS_PINGSENT)
413	–
414	–	#define SetPingWarning(x)       ((x)->flags |= FLAGS_PINGWARNING)
415	–	#define IsPingWarning(x)        ((x)->flags & FLAGS_PINGWARNING)
416	–	#define ClearPingWarning(x)     ((x)->flags &= ~FLAGS_PINGWARNING)
417	–
418	–	#define SetNeedId(x)            ((x)->flags |= FLAGS_NEEDID)
419	–	#define IsNeedId(x)             ((x)->flags & FLAGS_NEEDID)
420	–
421	–	#define SetGotId(x)             ((x)->flags |= FLAGS_GOTID)
422	–	#define IsGotId(x)              ((x)->flags & FLAGS_GOTID)
423	–
424	–	#define IsExemptKline(x)        ((x)->flags & FLAGS_EXEMPTKLINE)
425	–	#define SetExemptKline(x)       ((x)->flags |= FLAGS_EXEMPTKLINE)
426	–	#define IsExemptLimits(x)       ((x)->flags & FLAGS_NOLIMIT)
427	–	#define SetExemptLimits(x)      ((x)->flags |= FLAGS_NOLIMIT)
428	–	#define IsExemptGline(x)        ((x)->flags & FLAGS_EXEMPTGLINE)
429	–	#define SetExemptGline(x)       ((x)->flags |= FLAGS_EXEMPTGLINE)
430	–	#define IsExemptResv(x)         ((x)->flags & FLAGS_EXEMPTRESV)
431	–	#define SetExemptResv(x)        ((x)->flags |= FLAGS_EXEMPTRESV)
432	–	#define SetIPSpoof(x)           ((x)->flags |= FLAGS_IP_SPOOFING)
433	–	#define IsIPSpoof(x)            ((x)->flags & FLAGS_IP_SPOOFING)
434	–
435	–	#define IsFloodDone(x)          ((x)->flags &  FLAGS_FLOODDONE)
436	–	#define SetFloodDone(x)         ((x)->flags |= FLAGS_FLOODDONE)
437	–	#define HasPingCookie(x)        ((x)->flags & FLAGS_PING_COOKIE)
438	–	#define SetPingCookie(x)        ((x)->flags |= FLAGS_PING_COOKIE)
439	–	#define IsHidden(x)             ((x)->flags &  FLAGS_HIDDEN)
440	–	#define SetHidden(x)            ((x)->flags |= FLAGS_HIDDEN)
441	–
442	–	#define IsSendqBlocked(x)       ((x)->flags &  FLAGS_BLOCKED)
443	–	#define SetSendqBlocked(x)      ((x)->flags |= FLAGS_BLOCKED)
444	–	#define ClearSendqBlocked(x)    ((x)->flags &= ~FLAGS_BLOCKED)
445	–
446	–	#define IsCaptured(x)           ((x)->handler == DUMMY_HANDLER)
447	–	#define SetCaptured(x)          ((x)->handler = DUMMY_HANDLER)
448	–	#define ClearCaptured(x)        ((x)->handler = CLIENT_HANDLER)
449	–
446
447		extern struct Client me;
448		extern dlink_list listing_client_list;
449		extern dlink_list global_client_list;
450	+	extern dlink_list unknown_list;       /* unknown clients ON this server only        */
451	+	extern dlink_list local_client_list;  /* local clients only ON this server          */
452	+	extern dlink_list serv_list;          /* local servers to this server ONLY          */
453	+	extern dlink_list global_serv_list;   /* global servers on the network              */
454	+	extern dlink_list oper_list;          /* our opers, duplicated in local_client_list */
455
456		extern int accept_message(struct Client *, struct Client *);
457	+	extern unsigned int idle_time_get(const struct Client *, const struct Client *);
458		extern struct split_nuh_item *find_accept(const char *, const char *,
459	<	const char *, struct Client *, int);
459	>	const char *, struct Client *,
460	>	int (*)(const char *, const char *));
461		extern void del_accept(struct split_nuh_item *, struct Client *);
462		extern void del_all_accepts(struct Client *);
463	<	extern void exit_client(struct Client *, struct Client *, const char *);
463	>	extern void exit_client(struct Client *, const char *);
464	>	extern void conf_try_ban(struct Client *, struct MaskItem *);
465		extern void check_conf_klines(void);
466	<	extern void init_client(void);
466	>	extern void client_init(void);
467		extern void dead_link_on_write(struct Client *, int);
468		extern void dead_link_on_read(struct Client *, int);
469		extern void exit_aborted_clients(void);
470		extern void free_exited_clients(void);
471		extern struct Client *make_client(struct Client *);
472	<	extern struct Client *find_chasing(struct Client *, struct Client *, const char *, int *);
472	>	extern struct Client *find_chasing(struct Client *, const char *);
473		extern struct Client *find_person(const struct Client *const, const char *);
474		extern const char *get_client_name(const struct Client *, enum addr_mask_type);
475

Diff Legend

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