ViewVC Help

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

root/svn/ircd-hybrid/trunk/src/client.c

Comparing:
ircd-hybrid-7.2/src/client.c (file contents), Revision 889 by michael, Thu Nov 1 12:59:05 2007 UTC vs.
ircd-hybrid/trunk/src/client.c (file contents), Revision 3247 by michael, Sun Mar 30 17:54:34 2014 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  client.c: Controls clients.
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 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
20	<	*
21	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file client.c
23	>	* \brief Controls clients.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
28	<	#include "tools.h"
28	>	#include "list.h"
29		#include "client.h"
30		#include "channel_mode.h"
29	–	#include "common.h"
31		#include "event.h"
32		#include "fdlist.h"
33		#include "hash.h"
34		#include "irc_string.h"
34	–	#include "sprintf_irc.h"
35		#include "ircd.h"
36	–	#include "list.h"
36		#include "s_gline.h"
37		#include "numeric.h"
38		#include "packet.h"
39		#include "s_auth.h"
40		#include "s_bsd.h"
41	<	#include "s_conf.h"
42	<	#include "s_log.h"
41	>	#include "conf.h"
42	>	#include "log.h"
43		#include "s_misc.h"
44		#include "s_serv.h"
45		#include "send.h"
#	Line 48 | Line 47
47		#include "s_user.h"
48		#include "dbuf.h"
49		#include "memory.h"
50	+	#include "mempool.h"
51		#include "hostmask.h"
52	–	#include "balloc.h"
52		#include "listener.h"
53		#include "irc_res.h"
54		#include "userhost.h"
55		#include "watch.h"
56	+	#include "rng_mt.h"
57	+	#include "parse.h"
58
59		dlink_list listing_client_list = { NULL, NULL, 0 };
60		/* Pointer to beginning of Client list */
#	Line 67 | Line 68 | dlink_list oper_list = {NULL, NULL, 0};
68
69		static EVH check_pings;
70
71	<	static BlockHeap *client_heap  = NULL;
72	<	static BlockHeap *lclient_heap = NULL;
71	>	static mp_pool_t *client_pool  = NULL;
72	>	static mp_pool_t *lclient_pool = NULL;
73
74		static dlink_list dead_list  = { NULL, NULL, 0};
75		static dlink_list abort_list = { NULL, NULL, 0};
#	Line 77 | Line 78 | static dlink_node *eac_next;  /* next ab
78
79		static void check_pings_list(dlink_list *);
80		static void check_unknowns_list(void);
80	–	static void ban_them(struct Client *client_p, struct ConfItem *conf);
81
82
83	<	/* init_client()
83	>	/* client_init()
84		*
85		* inputs       - NONE
86		* output       - NONE
87		* side effects - initialize client free memory
88		*/
89		void
90	<	init_client(void)
90	>	client_init(void)
91		{
92		/* start off the check ping event ..  -- adrian
93		* Every 30 seconds is plenty -- db
94		*/
95	<	client_heap = BlockHeapCreate("client", sizeof(struct Client), CLIENT_HEAP_SIZE);
96	<	lclient_heap = BlockHeapCreate("local client", sizeof(struct LocalUser), LCLIENT_HEAP_SIZE);
95	>	client_pool = mp_pool_new(sizeof(struct Client), MP_CHUNK_SIZE_CLIENT);
96	>	lclient_pool = mp_pool_new(sizeof(struct LocalUser), MP_CHUNK_SIZE_LCLIENT);
97		eventAdd("check_pings", check_pings, NULL, 5);
98		}
99
#	Line 115 | Line 115 | init_client(void)
115		struct Client *
116		make_client(struct Client *from)
117		{
118	<	struct Client *client_p = BlockHeapAlloc(client_heap);
118	>	struct Client *client_p = mp_pool_get(client_pool);
119	>
120	>	memset(client_p, 0, sizeof(*client_p));
121
122	<	if (from == NULL)
122	>	if (!from)
123		{
124	<	client_p->from  = client_p; /* 'from' of local client is self! */
125	<	client_p->since = client_p->lasttime = client_p->firsttime = CurrentTime;
124	>	client_p->from                      = client_p; /* 'from' of local client is self! */
125	>	client_p->localClient               = mp_pool_get(lclient_pool);
126	>
127	>	memset(client_p->localClient, 0, sizeof(*client_p->localClient));
128
129	<	client_p->localClient = BlockHeapAlloc(lclient_heap);
129	>	client_p->localClient->since        = CurrentTime;
130	>	client_p->localClient->lasttime     = CurrentTime;
131	>	client_p->localClient->firsttime    = CurrentTime;
132		client_p->localClient->registration = REG_INIT;
133	+
134		/* as good a place as any... */
135	<	dlinkAdd(client_p, make_dlink_node(), &unknown_list);
135	>	dlinkAdd(client_p, &client_p->localClient->lclient_node, &unknown_list);
136		}
137		else
138		client_p->from = from; /* 'from' of local client is self! */
139
140	+	client_p->idhnext = client_p;
141		client_p->hnext  = client_p;
142	<	client_p->status = STAT_UNKNOWN;
142	>	SetUnknown(client_p);
143		strcpy(client_p->username, "unknown");
144	+	strcpy(client_p->svid, "0");
145
146		return client_p;
147		}
#	Line 147 | Line 156 | make_client(struct Client *from)
156		static void
157		free_client(struct Client *client_p)
158		{
159	<	assert(client_p != NULL);
159	>	assert(client_p);
160		assert(client_p != &me);
161		assert(client_p->hnext == client_p);
162	+	assert(client_p->idhnext == client_p);
163		assert(client_p->channel.head == NULL);
164		assert(dlink_list_length(&client_p->channel) == 0);
165	+	assert(dlink_list_length(&client_p->whowas) == 0);
166	+	assert(!IsServer(client_p) || (IsServer(client_p) && client_p->serv));
167
156	–	MyFree(client_p->away);
168		MyFree(client_p->serv);
169	+	MyFree(client_p->certfp);
170
171		if (MyConnect(client_p))
172		{
173		assert(client_p->localClient->invited.head == NULL);
174		assert(dlink_list_length(&client_p->localClient->invited) == 0);
175	+	assert(dlink_list_length(&client_p->localClient->watches) == 0);
176		assert(IsClosing(client_p) && IsDead(client_p));
177
178		MyFree(client_p->localClient->response);
#	Line 172 | Line 185 | free_client(struct Client *client_p)
185		{
186		assert(0 < client_p->localClient->listener->ref_count);
187		if (0 == --client_p->localClient->listener->ref_count &&
188	<	!client_p->localClient->listener->active)
188	>	!client_p->localClient->listener->active)
189		free_listener(client_p->localClient->listener);
190		}
191
192		dbuf_clear(&client_p->localClient->buf_recvq);
193		dbuf_clear(&client_p->localClient->buf_sendq);
194
195	<	BlockHeapFree(lclient_heap, client_p->localClient);
195	>	mp_pool_release(client_p->localClient);
196		}
197
198	<	BlockHeapFree(client_heap, client_p);
198	>	mp_pool_release(client_p);
199		}
200
201		/*
#	Line 191 | Line 204 | free_client(struct Client *client_p)
204		*
205		* inputs       - NOT USED (from event)
206		* output       - next time_t when check_pings() should be called again
207	<	* side effects -
207	>	* side effects -
208		*
209		*
210		* A PING can be sent to clients as necessary.
#	Line 213 | Line 226 | free_client(struct Client *client_p)
226
227		static void
228		check_pings(void *notused)
229	<	{
229	>	{
230		check_pings_list(&local_client_list);
231		check_pings_list(&serv_list);
232		check_unknowns_list();
#	Line 223 | Line 236 | check_pings(void *notused)
236		*
237		* inputs       - pointer to list to check
238		* output       - NONE
239	<	* side effects -
239	>	* side effects -
240		*/
241		static void
242		check_pings_list(dlink_list *list)
243		{
244	<	char scratch[32];        /* way too generous but... */
245	<	struct Client *client_p; /* current local client_p being examined */
246	<	int ping, pingwarn;      /* ping time value from client */
234	<	dlink_node *ptr, *next_ptr;
244	>	char scratch[IRCD_BUFSIZE];
245	>	int ping = 0;      /* ping time value from client */
246	>	dlink_node *ptr = NULL, *next_ptr = NULL;
247
248		DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
249		{
250	<	client_p = ptr->data;
250	>	struct Client *client_p = ptr->data;
251
252		/*
253		** Note: No need to notify opers here. It's
#	Line 244 | Line 256 | check_pings_list(dlink_list *list)
256		if (IsDead(client_p))
257		{
258		/* Ignore it, its been exited already */
247	–	continue;
248	–	}
249	–
250	–	if (client_p->localClient->reject_delay > 0)
251	–	{
252	–	if (client_p->localClient->reject_delay <= CurrentTime)
253	–	exit_client(client_p, &me, "Rejected");
259		continue;
260		}
261
257	–	if (GlobalSetOptions.idletime && IsClient(client_p))
258	–	{
259	–	if (!IsExemptKline(client_p) && !IsOper(client_p) &&
260	–	!IsIdlelined(client_p) &&
261	–	((CurrentTime - client_p->localClient->last) > GlobalSetOptions.idletime))
262	–	{
263	–	struct ConfItem *conf;
264	–	struct AccessItem *aconf;
265	–
266	–	conf = make_conf_item(KLINE_TYPE);
267	–	aconf = (struct AccessItem *)map_to_conf(conf);
268	–
269	–	DupString(aconf->host, client_p->host);
270	–	DupString(aconf->reason, "idle exceeder");
271	–	DupString(aconf->user, client_p->username);
272	–	aconf->hold = CurrentTime + 60;
273	–	add_temp_line(conf);
274	–
275	–	sendto_realops_flags(UMODE_ALL, L_ALL,
276	–	"Idle time limit exceeded for %s - temp k-lining",
277	–	get_client_name(client_p, HIDE_IP));
278	–	exit_client(client_p, &me, aconf->reason);
279	–	continue;
280	–	}
281	–	}
282	–
262		if (!IsRegistered(client_p))
263	<	ping = CONNECTTIMEOUT, pingwarn = 0;
263	>	ping = CONNECTTIMEOUT;
264		else
265	<	ping = get_client_ping(client_p, &pingwarn);
265	>	ping = get_client_ping(&client_p->localClient->confs);
266
267	<	if (ping < CurrentTime - client_p->lasttime)
267	>	if (ping < CurrentTime - client_p->localClient->lasttime)
268		{
269		if (!IsPingSent(client_p))
270		{
271	<	/*
272	<	* if we havent PINGed the connection and we havent
273	<	* heard from it in a while, PING it to make sure
274	<	* it is still alive.
275	<	*/
276	<	SetPingSent(client_p);
277	<	ClearPingWarning(client_p);
278	<	client_p->lasttime = CurrentTime - ping;
300	<	sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
271	>	/*
272	>	* if we havent PINGed the connection and we havent
273	>	* heard from it in a while, PING it to make sure
274	>	* it is still alive.
275	>	*/
276	>	SetPingSent(client_p);
277	>	client_p->localClient->lasttime = CurrentTime - ping;
278	>	sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
279		}
280		else
281		{
282	<	if (CurrentTime - client_p->lasttime >= 2 * ping)
282	>	if (CurrentTime - client_p->localClient->lasttime >= 2 * ping)
283		{
284		/*
285		* If the client/server hasn't talked to us in 2*ping seconds
286		* and it has a ping time, then close its connection.
287		*/
288		if (IsServer(client_p) || IsHandshake(client_p))
289	<	{
290	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
291	<	"No response from %s, closing link",
292	<	get_client_name(client_p, HIDE_IP));
293	<	sendto_realops_flags(UMODE_ALL, L_OPER,
294	<	"No response from %s, closing link",
295	<	get_client_name(client_p, MASK_IP));
296	<	ilog(L_NOTICE, "No response from %s, closing link",
297	<	get_client_name(client_p, HIDE_IP));
298	<	}
299	<
300	<	ircsprintf(scratch, "Ping timeout: %d seconds",
301	<	(int)(CurrentTime - client_p->lasttime));
302	<	exit_client(client_p, &me, scratch);
325	<	}
326	<	else if (!IsPingWarning(client_p) && pingwarn > 0 &&
327	<	(IsServer(client_p) || IsHandshake(client_p)) &&
328	<	CurrentTime - client_p->lasttime >= ping + pingwarn)
329	<	{
330	<	/*
331	<	* If the server hasn't replied in pingwarn seconds after sending
332	<	* the PING, notify the opers so that they are aware of the problem.
333	<	*/
334	<	SetPingWarning(client_p);
335	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
336	<	"Warning, no response from %s in %d seconds",
337	<	get_client_name(client_p, HIDE_IP), pingwarn);
338	<	sendto_realops_flags(UMODE_ALL, L_OPER,
339	<	"Warning, no response from %s in %d seconds",
340	<	get_client_name(client_p, MASK_IP), pingwarn);
341	<	ilog(L_NOTICE, "No response from %s in %d seconds",
342	<	get_client_name(client_p, HIDE_IP), pingwarn);
289	>	{
290	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
291	>	"No response from %s, closing link",
292	>	get_client_name(client_p, HIDE_IP));
293	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
294	>	"No response from %s, closing link",
295	>	get_client_name(client_p, MASK_IP));
296	>	ilog(LOG_TYPE_IRCD, "No response from %s, closing link",
297	>	get_client_name(client_p, HIDE_IP));
298	>	}
299	>
300	>	snprintf(scratch, sizeof(scratch), "Ping timeout: %d seconds",
301	>	(int)(CurrentTime - client_p->localClient->lasttime));
302	>	exit_client(client_p, scratch);
303		}
304		}
305		}
#	Line 355 | Line 315 | check_pings_list(dlink_list *list)
315		static void
316		check_unknowns_list(void)
317		{
318	<	dlink_node *ptr, *next_ptr;
318	>	dlink_node *ptr = NULL, *ptr_next = NULL;
319
320	<	DLINK_FOREACH_SAFE(ptr, next_ptr, unknown_list.head)
320	>	DLINK_FOREACH_SAFE(ptr, ptr_next, unknown_list.head)
321		{
322		struct Client *client_p = ptr->data;
323
364	–	if (client_p->localClient->reject_delay > 0)
365	–	{
366	–	if (client_p->localClient->reject_delay <= CurrentTime)
367	–	exit_client(client_p, &me, "Rejected");
368	–	continue;
369	–	}
370	–
324		/*
325		* Check UNKNOWN connections - if they have been in this state
326		* for > 30s, close them.
327		*/
328	<	if (IsAuthFinished(client_p) && (CurrentTime - client_p->firsttime) > 30)
329	<	exit_client(client_p, &me, "Registration timed out");
328	>	if (IsAuthFinished(client_p) && (CurrentTime - client_p->localClient->firsttime) > 30)
329	>	exit_client(client_p, "Registration timed out");
330		}
331		}
332
#	Line 384 | Line 337 | check_unknowns_list(void)
337		* side effects - Check all connections for a pending kline against the
338		*                client, exit the client if a kline matches.
339		*/
340	<	void
340	>	void
341		check_conf_klines(void)
342	<	{
342	>	{
343		struct Client *client_p = NULL;       /* current local client_p being examined */
344	<	struct AccessItem *aconf = NULL;
392	<	struct ConfItem *conf = NULL;
344	>	struct MaskItem *conf = NULL;
345		dlink_node *ptr, *next_ptr;
346
347		DLINK_FOREACH_SAFE(ptr, next_ptr, local_client_list.head)
#	Line 401 | Line 353 | check_conf_klines(void)
353		if (IsDead(client_p) || !IsClient(client_p))
354		continue;
355
356	<	/* if there is a returned struct ConfItem then kill it */
357	<	if ((aconf = find_dline_conf(&client_p->localClient->ip,
406	<	client_p->localClient->aftype)) != NULL)
356	>	if ((conf = find_dline_conf(&client_p->localClient->ip,
357	>	client_p->localClient->aftype)))
358		{
359	<	if (aconf->status & CONF_EXEMPTDLINE)
360	<	continue;
359	>	if (conf->type == CONF_EXEMPT)
360	>	continue;
361
362	<	conf = unmap_conf_item(aconf);
412	<	ban_them(client_p, conf);
362	>	conf_try_ban(client_p, conf);
363		continue; /* and go examine next fd/client_p */
364		}
365
366	<	if (ConfigFileEntry.glines && (aconf = find_gline(client_p)))
366	>	if (ConfigFileEntry.glines)
367		{
368	<	if (IsExemptKline(client_p) ||
369	<	IsExemptGline(client_p))
368	>	if ((conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
369	>	CONF_GLINE, client_p->localClient->aftype,
370	>	client_p->username, NULL, 1)))
371		{
372	<	sendto_realops_flags(UMODE_ALL, L_ALL,
373	<	"GLINE over-ruled for %s, client is %sline_exempt",
423	<	get_client_name(client_p, HIDE_IP), IsExemptKline(client_p) ? "k" : "g");
372	>	conf_try_ban(client_p, conf);
373	>	/* and go examine next fd/client_p */
374		continue;
375		}
376	+	}
377
378	<	conf = unmap_conf_item(aconf);
379	<	ban_them(client_p, conf);
380	<	/* and go examine next fd/client_p */
430	<	continue;
431	<	}
432	<
433	<	if ((aconf = find_kill(client_p)) != NULL)
378	>	if ((conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
379	>	CONF_KLINE, client_p->localClient->aftype,
380	>	client_p->username, NULL, 1)))
381		{
382	<
383	<	/* if there is a returned struct AccessItem.. then kill it */
437	<	if (IsExemptKline(client_p))
438	<	{
439	<	sendto_realops_flags(UMODE_ALL, L_ALL,
440	<	"KLINE over-ruled for %s, client is kline_exempt",
441	<	get_client_name(client_p, HIDE_IP));
442	<	continue;
443	<	}
444	<
445	<	conf = unmap_conf_item(aconf);
446	<	ban_them(client_p, conf);
447	<	continue;
382	>	conf_try_ban(client_p, conf);
383	>	continue;
384		}
385
386	<	/* if there is a returned struct MatchItem then kill it */
387	<	if ((conf = find_matching_name_conf(XLINE_TYPE,  client_p->info,
452	<	NULL, NULL, 0)) != NULL ||
453	<	(conf = find_matching_name_conf(RXLINE_TYPE, client_p->info,
454	<	NULL, NULL, 0)) != NULL)
386	>	if ((conf = find_matching_name_conf(CONF_XLINE,  client_p->info,
387	>	NULL, NULL, 0)))
388		{
389	<	ban_them(client_p, conf);
389	>	conf_try_ban(client_p, conf);
390		continue;
391		}
392		}
#	Line 463 | Line 396 | check_conf_klines(void)
396		{
397		client_p = ptr->data;
398
399	<	if ((aconf = find_dline_conf(&client_p->localClient->ip,
400	<	client_p->localClient->aftype)))
399	>	if ((conf = find_dline_conf(&client_p->localClient->ip,
400	>	client_p->localClient->aftype)))
401		{
402	<	if (aconf->status & CONF_EXEMPTDLINE)
402	>	if (conf->type == CONF_EXEMPT)
403		continue;
404
405	<	exit_client(client_p, &me, "D-lined");
405	>	exit_client(client_p, "D-lined");
406		}
407		}
408		}
409
410		/*
411	<	* ban_them
411	>	* conf_try_ban
412		*
413		* inputs       - pointer to client to ban
414	<	*              - pointer to ConfItem
414	>	*              - pointer to MaskItem
415		* output       - NONE
416		* side effects - given client_p is banned
417		*/
418	<	static void
419	<	ban_them(struct Client *client_p, struct ConfItem *conf)
418	>	void
419	>	conf_try_ban(struct Client *client_p, struct MaskItem *conf)
420		{
421	<	const char *user_reason = NULL;       /* What is sent to user */
489	<	const char *channel_reason = NULL;    /* What is sent to channel */
490	<	struct AccessItem *aconf = NULL;
491	<	struct MatchItem *xconf = NULL;
421	>	const char *user_reason = NULL;  /* What is sent to user */
422		const char *type_string = NULL;
423		const char dline_string[] = "D-line";
424		const char kline_string[] = "K-line";
#	Line 497 | Line 427 | ban_them(struct Client *client_p, struct
427
428		switch (conf->type)
429		{
430	<	case RKLINE_TYPE:
431	<	case KLINE_TYPE:
430	>	case CONF_KLINE:
431	>	if (IsExemptKline(client_p))
432	>	{
433	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
434	>	"KLINE over-ruled for %s, client is kline_exempt",
435	>	get_client_name(client_p, HIDE_IP));
436	>	return;
437	>	}
438	>
439		type_string = kline_string;
503	–	aconf = map_to_conf(conf);
440		break;
441	<	case DLINE_TYPE:
441	>	case CONF_DLINE:
442		type_string = dline_string;
507	–	aconf = map_to_conf(conf);
443		break;
444	<	case GLINE_TYPE:
444	>	case CONF_GLINE:
445	>	if (IsExemptKline(client_p) ||
446	>	IsExemptGline(client_p))
447	>	{
448	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
449	>	"GLINE over-ruled for %s, client is %sline_exempt",
450	>	get_client_name(client_p, HIDE_IP), IsExemptKline(client_p) ? "k" : "g");
451	>	return;
452	>	}
453	>
454		type_string = gline_string;
511	–	aconf = map_to_conf(conf);
455		break;
456	<	case RXLINE_TYPE:
514	<	case XLINE_TYPE:
456	>	case CONF_XLINE:
457		type_string = xline_string;
458	<	xconf = map_to_conf(conf);
517	<	++xconf->count;
458	>	++conf->count;
459		break;
460		default:
461		assert(0);
462		break;
463		}
464
465	<	if (ConfigFileEntry.kline_with_reason)
525	<	{
526	<	if (aconf != NULL)
527	<	user_reason = aconf->reason ? aconf->reason : type_string;
528	<	if (xconf != NULL)
529	<	user_reason = xconf->reason ? xconf->reason : type_string;
530	<	}
531	<	else
532	<	user_reason = type_string;
465	>	user_reason = conf->reason ? conf->reason : type_string;
466
467	<	if (ConfigFileEntry.kline_reason != NULL)
535	<	channel_reason = ConfigFileEntry.kline_reason;
536	<	else
537	<	channel_reason = user_reason;
538	<
539	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s active for %s",
467	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s active for %s",
468		type_string, get_client_name(client_p, HIDE_IP));
469
470		if (IsClient(client_p))
471	<	sendto_one(client_p, form_str(ERR_YOUREBANNEDCREEP),
544	<	me.name, client_p->name, user_reason);
471	>	sendto_one_numeric(client_p, &me, ERR_YOUREBANNEDCREEP, user_reason);
472
473	<	exit_client(client_p, &me, channel_reason);
473	>	exit_client(client_p, user_reason);
474		}
475
476		/* update_client_exit_stats()
477		*
478		* input        - pointer to client
479		* output       - NONE
480	<	* side effects -
480	>	* side effects -
481		*/
482		static void
483		update_client_exit_stats(struct Client *client_p)
484		{
485	<	if (IsServer(client_p))
559	<	{
560	<	sendto_realops_flags(UMODE_EXTERNAL, L_ALL,
561	<	"Server %s split from %s",
562	<	client_p->name, client_p->servptr->name);
563	<	}
564	<	else if (IsClient(client_p))
485	>	if (IsClient(client_p))
486		{
487	+	assert(Count.total > 0);
488		--Count.total;
489	<	if (IsOper(client_p))
489	>	if (HasUMode(client_p, UMODE_OPER))
490		--Count.oper;
491	<	if (IsInvisible(client_p))
491	>	if (HasUMode(client_p, UMODE_INVISIBLE))
492		--Count.invisi;
493		}
494	+	else if (IsServer(client_p))
495	+	sendto_realops_flags(UMODE_EXTERNAL, L_ALL, SEND_NOTICE,
496	+	"Server %s split from %s",
497	+	client_p->name, client_p->servptr->name);
498
499		if (splitchecking && !splitmode)
500		check_splitmode(NULL);
#	Line 580 | Line 506 | update_client_exit_stats(struct Client *
506		* output       - return client pointer
507		* side effects - find person by (nick)name
508		*/
583	–	/* XXX - ugly wrapper */
509		struct Client *
510	<	find_person(const struct Client *client_p, const char *name)
510	>	find_person(const struct Client *const source_p, const char *name)
511		{
512	<	struct Client *c2ptr;
512	>	struct Client *target_p = NULL;
513
514		if (IsDigit(*name))
515		{
516	<	if ((c2ptr = hash_find_id(name)) != NULL)
517	<	{
593	<	/* invisible users shall not be found by UID guessing */
594	<	if (IsInvisible(c2ptr) && !IsServer(client_p))
595	<	c2ptr = NULL;
596	<	}
516	>	if (IsServer(source_p->from))
517	>	target_p = hash_find_id(name);
518		}
519		else
520	<	c2ptr = find_client(name);
520	>	target_p = hash_find_client(name);
521
522	<	return ((c2ptr != NULL && IsClient(c2ptr)) ? c2ptr : NULL);
522	>	return (target_p && IsClient(target_p)) ? target_p : NULL;
523		}
524
525		/*
526	<	* find_chasing - find the client structure for a nick name (user)
527	<	*      using history mechanism if necessary. If the client is not found,
528	<	*      an error message (NO SUCH NICK) is generated. If the client was found
608	<	*      through the history, chasing will be 1 and otherwise 0.
526	>	* find_chasing - find the client structure for a nick name (name)
527	>	*      using history mechanism if necessary. If the client is not found,
528	>	*      an error message (NO SUCH NICK) is generated.
529		*/
530		struct Client *
531	<	find_chasing(struct Client *client_p, struct Client *source_p, const char *user, int *chasing)
531	>	find_chasing(struct Client *source_p, const char *name)
532		{
533	<	struct Client *who = find_person(client_p, user);
614	<
615	<	if (chasing)
616	<	*chasing = 0;
533	>	struct Client *who = find_person(source_p, name);
534
535		if (who)
536	<	return(who);
536	>	return who;
537
538	<	if (IsDigit(*user))
539	<	return(NULL);
538	>	if (IsDigit(*name))
539	>	return NULL;
540
541	<	if ((who = get_history(user,
542	<	(time_t)ConfigFileEntry.kill_chase_time_limit))
543	<	== NULL)
541	>	if ((who = whowas_get_history(name,
542	>	(time_t)ConfigFileEntry.kill_chase_time_limit))
543	>	== NULL)
544		{
545	<	sendto_one(source_p, form_str(ERR_NOSUCHNICK),
546	<	me.name, source_p->name, user);
630	<	return(NULL);
545	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHNICK, name);
546	>	return NULL;
547		}
548
549	<	if (chasing)
634	<	*chasing = 1;
635	<
636	<	return(who);
549	>	return who;
550		}
551
552		/*
#	Line 655 | Line 568 | find_chasing(struct Client *client_p, st
568		*        to modify what it points!!!
569		*/
570		const char *
571	<	get_client_name(struct Client *client, int showip)
571	>	get_client_name(const struct Client *client_p, enum addr_mask_type type)
572		{
573		static char nbuf[HOSTLEN * 2 + USERLEN + 5];
574
575	<	assert(client != NULL);
575	>	assert(client_p);
576
577	<	if (irccmp(client->name, client->host) == 0)
578	<	return(client->name);
577	>	if (!MyConnect(client_p))
578	>	return client_p->name;
579
580	<	if (ConfigServerHide.hide_server_ips)
581	<	if (IsServer(client) || IsConnecting(client) || IsHandshake(client))
582	<	showip = MASK_IP;
580	>	if (IsServer(client_p) || IsConnecting(client_p) || IsHandshake(client_p))
581	>	{
582	>	if (!irccmp(client_p->name, client_p->host))
583	>	return client_p->name;
584	>	else if (ConfigServerHide.hide_server_ips)
585	>	type = MASK_IP;
586	>	}
587
588		if (ConfigFileEntry.hide_spoof_ips)
589	<	if (showip == SHOW_IP && IsIPSpoof(client))
590	<	showip = MASK_IP;
589	>	if (type == SHOW_IP && IsIPSpoof(client_p))
590	>	type = MASK_IP;
591
592		/* And finally, let's get the host information, ip or name */
593	<	switch (showip)
593	>	switch (type)
594		{
595		case SHOW_IP:
596	<	if (MyConnect(client))
597	<	{
598	<	ircsprintf(nbuf, "%s[%s@%s]", client->name, client->username,
599	<	client->sockhost);
683	<	break;
684	<	}
596	>	snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
597	>	client_p->name,
598	>	client_p->username, client_p->sockhost);
599	>	break;
600		case MASK_IP:
601	<	ircsprintf(nbuf, "%s[%s@255.255.255.255]", client->name,
602	<	client->username);
601	>	if (client_p->localClient->aftype == AF_INET)
602	>	snprintf(nbuf, sizeof(nbuf), "%s[%s@255.255.255.255]",
603	>	client_p->name, client_p->username);
604	>	else
605	>	snprintf(nbuf, sizeof(nbuf), "%s[%s@ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]",
606	>	client_p->name, client_p->username);
607		break;
608		default:
609	<	ircsprintf(nbuf, "%s[%s@%s]", client->name, client->username,
610	<	client->host);
609	>	snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
610	>	client_p->name,
611	>	client_p->username, client_p->host);
612		}
613
614	<	return(nbuf);
614	>	return nbuf;
615		}
616
617		void
618		free_exited_clients(void)
619		{
620		dlink_node *ptr = NULL, *next = NULL;
621	<
621	>
622		DLINK_FOREACH_SAFE(ptr, next, dead_list.head)
623		{
624		free_client(ptr->data);
#	Line 716 | Line 636 | free_exited_clients(void)
636		static void
637		exit_one_client(struct Client *source_p, const char *quitmsg)
638		{
639	<	dlink_node *lp = NULL, *next_lp = NULL;
639	>	dlink_node *ptr = NULL, *ptr_next = NULL;
640
641		assert(!IsMe(source_p));
642
643	<	if (IsServer(source_p))
724	<	{
725	<	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->server_list);
726	<
727	<	if ((lp = dlinkFindDelete(&global_serv_list, source_p)) != NULL)
728	<	free_dlink_node(lp);
729	<	}
730	<	else if (IsClient(source_p))
643	>	if (IsClient(source_p))
644		{
645	<	if (source_p->servptr->serv != NULL)
733	<	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->client_list);
645	>	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->client_list);
646
647	<	/* If a person is on a channel, send a QUIT notice
648	<	** to every client (person) on the same channel (so
649	<	** that the client can show the "**signoff" message).
650	<	** (Note: The notice is to the local clients *only*)
651	<	*/
652	<	sendto_common_channels_local(source_p, 0, ":%s!%s@%s QUIT :%s",
647	>	/*
648	>	* If a person is on a channel, send a QUIT notice
649	>	* to every client (person) on the same channel (so
650	>	* that the client can show the "**signoff" message).
651	>	* (Note: The notice is to the local clients *only*)
652	>	*/
653	>	sendto_common_channels_local(source_p, 0, 0, ":%s!%s@%s QUIT :%s",
654		source_p->name, source_p->username,
655		source_p->host, quitmsg);
656	<	DLINK_FOREACH_SAFE(lp, next_lp, source_p->channel.head)
657	<	remove_user_from_channel(lp->data);
656	>	DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->channel.head)
657	>	remove_user_from_channel(ptr->data);
658
659	<	add_history(source_p, 0);
660	<	off_history(source_p);
659	>	whowas_add_history(source_p, 0);
660	>	whowas_off_history(source_p);
661
662		watch_check_hash(source_p, RPL_LOGOFF);
663
664		if (MyConnect(source_p))
665		{
666		/* Clean up invitefield */
667	<	DLINK_FOREACH_SAFE(lp, next_lp, source_p->localClient->invited.head)
668	<	del_invite(lp->data, source_p);
667	>	DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->localClient->invited.head)
668	>	del_invite(ptr->data, source_p);
669
670		del_all_accepts(source_p);
671		}
672		}
673	+	else if (IsServer(source_p))
674	+	{
675	+	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->server_list);
676	+
677	+	if ((ptr = dlinkFindDelete(&global_serv_list, source_p)))
678	+	free_dlink_node(ptr);
679	+	}
680
681		/* Remove source_p from the client lists */
682	<	if (HasID(source_p))
682	>	if (source_p->id[0])
683		hash_del_id(source_p);
684		if (source_p->name[0])
685		hash_del_client(source_p);
#	Line 771 | Line 691 | exit_one_client(struct Client *source_p,
691		* NOTE: source_p->node.next cannot be NULL if the client is added
692		*       to global_client_list (there is always &me at its end)
693		*/
694	<	if (source_p != NULL && source_p->node.next != NULL)
694	>	if (source_p->node.next) /* XXX: not needed? */
695		dlinkDelete(&source_p->node, &global_client_list);
696
697		update_client_exit_stats(source_p);
#	Line 784 | Line 704 | exit_one_client(struct Client *source_p,
704		dlinkAdd(source_p, make_dlink_node(), &dead_list);
705		}
706
707	<	/* Recursively send QUITs and SQUITs for source_p and all its dependent clients
788	<	* and servers to those servers that need them.  A server needs the client
789	<	* QUITs if it can't figure them out from the SQUIT (ie pre-TS4) or if it
790	<	* isn't getting the SQUIT because of @#(*&@)# hostmasking.  With TS4, once
791	<	* a link gets a SQUIT, it doesn't need any QUIT/SQUITs for clients depending
792	<	* on that one -orabidoo
793	<	*
794	<	* This is now called on each local server -adx
795	<	*/
796	<	static void
797	<	recurse_send_quits(struct Client *original_source_p, struct Client *source_p,
798	<	struct Client *from, struct Client *to, const char *comment,
799	<	const char *splitstr, const char *myname)
800	<	{
801	<	dlink_node *ptr, *next;
802	<	struct Client *target_p;
803	<	int hidden = match(myname, source_p->name);
804	<
805	<	assert(to != source_p);  /* should be already removed from serv_list */
806	<
807	<	/* If this server can handle quit storm (QS) removal
808	<	* of dependents, just send the SQUIT
809	<	*
810	<	* Always check *all* dependent servers if some of them are
811	<	* hidden behind fakename. If so, send out the QUITs -adx
812	<	*/
813	<	if (hidden || !IsCapable(to, CAP_QS))
814	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->client_list.head)
815	<	{
816	<	target_p = ptr->data;
817	<	sendto_one(to, ":%s QUIT :%s", target_p->name, splitstr);
818	<	}
819	<
820	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->server_list.head)
821	<	recurse_send_quits(original_source_p, ptr->data, from, to,
822	<	comment, splitstr, myname);
823	<
824	<	if (!hidden && ((source_p == original_source_p && to != from) ||
825	<	!IsCapable(to, CAP_QS)))
826	<	{
827	<	/* don't use a prefix here - we have to be 100% sure the message
828	<	* will be accepted without Unknown prefix etc.. */
829	<	sendto_one(to, "SQUIT %s :%s", ID_or_name(source_p, to), comment);
830	<	}
831	<	}
832	<
833	<	/*
707	>	/*
708		* Remove all clients that depend on source_p; assumes all (S)QUITs have
709	<	* already been sent.  we make sure to exit a server's dependent clients
710	<	* and servers before the server itself; exit_one_client takes care of
709	>	* already been sent.  we make sure to exit a server's dependent clients
710	>	* and servers before the server itself; exit_one_client takes care of
711		* actually removing things off llists.   tweaked from +CSr31  -orabidoo
712		*/
713		static void
714		recurse_remove_clients(struct Client *source_p, const char *quitmsg)
715		{
716	<	dlink_node *ptr, *next;
716	>	dlink_node *ptr = NULL, *ptr_next = NULL;
717
718	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->client_list.head)
718	>	DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->serv->client_list.head)
719		exit_one_client(ptr->data, quitmsg);
720
721	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->server_list.head)
721	>	DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->serv->server_list.head)
722		{
723		recurse_remove_clients(ptr->data, quitmsg);
724		exit_one_client(ptr->data, quitmsg);
#	Line 852 | Line 726 | recurse_remove_clients(struct Client *so
726		}
727
728		/*
855	–	** Remove *everything* that depends on source_p, from all lists, and sending
856	–	** all necessary QUITs and SQUITs.  source_p itself is still on the lists,
857	–	** and its SQUITs have been sent except for the upstream one  -orabidoo
858	–	*/
859	–	static void
860	–	remove_dependents(struct Client *source_p, struct Client *from,
861	–	const char *comment, const char *splitstr)
862	–	{
863	–	struct Client *to;
864	–	struct ConfItem *conf;
865	–	static char myname[HOSTLEN+1];
866	–	dlink_node *ptr;
867	–
868	–	DLINK_FOREACH(ptr, serv_list.head)
869	–	{
870	–	to = ptr->data;
871	–
872	–	if ((conf = to->serv->sconf) != NULL)
873	–	strlcpy(myname, my_name_for_link(conf), sizeof(myname));
874	–	else
875	–	strlcpy(myname, me.name, sizeof(myname));
876	–	recurse_send_quits(source_p, source_p, from, to,
877	–	comment, splitstr, myname);
878	–	}
879	–
880	–	recurse_remove_clients(source_p, splitstr);
881	–	}
882	–
883	–	/*
729		* exit_client - exit a client of any type. Generally, you can use
730		* this on any struct Client, regardless of its state.
731		*
732		* Note, you shouldn't exit remote _users_ without first doing
733	<	* SetKilled and propagating a kill or similar message. However,
734	<	* it is perfectly correct to call exit_client to force a _server_
733	>	* AddFlag(x, FLAGS_KILLED) and propagating a kill or similar message.
734	>	*
735	>	* However, it is perfectly correct to call exit_client to force a _server_
736		* quit (either local or remote one).
737		*
738	+	*
739		* inputs:       - a client pointer that is going to be exited
893	–	*               - for servers, the second argument is a pointer to who
894	–	*                 is firing the server. This side won't get any generated
895	–	*                 messages. NEVER NULL!
740		* output:       none
741		* side effects: the client is delinked from all lists, disconnected,
742		*               and the rest of IRC network is notified of the exit.
743		*               Client memory is scheduled to be freed
744		*/
745		void
746	<	exit_client(struct Client *source_p, struct Client *from, const char *comment)
746	>	exit_client(struct Client *source_p, const char *comment)
747		{
748	<	dlink_node *m;
748	>	dlink_node *m = NULL;
749
750		if (MyConnect(source_p))
751		{
#	Line 916 | Line 760 | exit_client(struct Client *source_p, str
760		if (IsIpHash(source_p))
761		remove_one_ip(&source_p->localClient->ip);
762
763	<	delete_auth(source_p);
763	>	delete_auth(&source_p->localClient->auth);
764
765	<	/* This source_p could have status of one of STAT_UNKNOWN, STAT_CONNECTING
765	>	/*
766	>	* This source_p could have status of one of STAT_UNKNOWN, STAT_CONNECTING
767		* STAT_HANDSHAKE or STAT_UNKNOWN
768		* all of which are lumped together into unknown_list
769		*
#	Line 926 | Line 771 | exit_client(struct Client *source_p, str
771		*/
772		if (!IsRegistered(source_p))
773		{
774	<	if ((m = dlinkFindDelete(&unknown_list, source_p)) != NULL)
775	<	free_dlink_node(m);
774	>	assert(dlinkFind(&unknown_list, source_p));
775	>
776	>	dlinkDelete(&source_p->localClient->lclient_node, &unknown_list);
777		}
778		else if (IsClient(source_p))
779		{
780	+	time_t on_for = CurrentTime - source_p->localClient->firsttime;
781	+	assert(Count.local > 0);
782		Count.local--;
783
784	<	if (IsOper(source_p))
785	<	{
938	<	if ((m = dlinkFindDelete(&oper_list, source_p)) != NULL)
784	>	if (HasUMode(source_p, UMODE_OPER))
785	>	if ((m = dlinkFindDelete(&oper_list, source_p)))
786		free_dlink_node(m);
940	–	}
787
788	+	assert(dlinkFind(&local_client_list, source_p));
789		dlinkDelete(&source_p->localClient->lclient_node, &local_client_list);
790	<	if (source_p->localClient->list_task != NULL)
790	>
791	>	if (source_p->localClient->list_task)
792		free_list_task(source_p->localClient->list_task, source_p);
793
794		watch_del_watch_list(source_p);
795	<	sendto_realops_flags(UMODE_CCONN, L_ALL, "Client exiting: %s (%s@%s) [%s] [%s]",
795	>	sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
796	>	"Client exiting: %s (%s@%s) [%s] [%s]",
797		source_p->name, source_p->username, source_p->host, comment,
798		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
799		"255.255.255.255" : source_p->sockhost);
800	<	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL, "CLIEXIT: %s %s %s %s 0 %s",
801	<	source_p->name,
802	<	source_p->username,
803	<	source_p->host,
804	<
805	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
957	<	"255.255.255.255" : source_p->sockhost,
958	<	comment);
800	>	ilog(LOG_TYPE_USER, "%s (%3u:%02u:%02u): %s!%s@%s %llu/%llu",
801	>	myctime(source_p->localClient->firsttime), (unsigned int)(on_for / 3600),
802	>	(unsigned int)((on_for % 3600)/60), (unsigned int)(on_for % 60),
803	>	source_p->name, source_p->username, source_p->host,
804	>	source_p->localClient->send.bytes>>10,
805	>	source_p->localClient->recv.bytes>>10);
806		}
807	<
961	<	/* As soon as a client is known to be a server of some sort
962	<	* it has to be put on the serv_list, or SJOIN's to this new server
963	<	* from the connect burst will not be seen.
964	<	*/
965	<	if (IsServer(source_p) || IsConnecting(source_p) ||
966	<	IsHandshake(source_p))
807	>	else if (IsServer(source_p))
808		{
809	<	if ((m = dlinkFindDelete(&serv_list, source_p)) != NULL)
810	<	{
970	<	free_dlink_node(m);
971	<	unset_chcap_usage_counts(source_p);
972	<	}
809	>	assert(Count.myserver > 0);
810	>	--Count.myserver;
811
812	<	if (IsServer(source_p))
813	<	Count.myserver--;
812	>	assert(dlinkFind(&serv_list, source_p));
813	>	dlinkDelete(&source_p->localClient->lclient_node, &serv_list);
814		}
815
978	–	log_user_exit(source_p);
979	–
816		if (!IsDead(source_p))
817		{
818		if (IsServer(source_p))
819		{
820	<	/* for them, we are exiting the network */
821	<	sendto_one(source_p, ":%s SQUIT %s :%s",
822	<	ID_or_name(from, source_p), me.name, comment);
820	>	if (!HasFlag(source_p, FLAGS_SQUIT))
821	>	{
822	>	/* for them, we are exiting the network */
823	>	sendto_one(source_p, ":%s SQUIT %s :%s",
824	>	me.id, me.id, comment);
825	>	}
826		}
827
828		sendto_one(source_p, "ERROR :Closing Link: %s (%s)",
#	Line 1003 | Line 842 | exit_client(struct Client *source_p, str
842		*/
843		close_connection(source_p);
844		}
845	+	else if (IsClient(source_p) && HasFlag(source_p->servptr, FLAGS_EOB))
846	+	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
847	+	"Client exiting at %s: %s (%s@%s) [%s]",
848	+	source_p->servptr->name, source_p->name,
849	+	source_p->username, source_p->host, comment);
850
851		if (IsServer(source_p))
852		{
853	<	char splitstr[HOSTLEN + HOSTLEN + 2];
853	>	char splitstr[HOSTLEN + HOSTLEN + 2] = "";
854
855		/* This shouldn't ever happen */
856	<	assert(source_p->serv != NULL && source_p->servptr != NULL);
856	>	assert(source_p->serv && source_p->servptr);
857
858		if (ConfigServerHide.hide_servers)
859		/*
860	<	* Set netsplit message to "*.net *.split" to still show
860	>	* Set netsplit message to "*.net *.split" to still show
861		* that its a split, but hide the servers splitting
862		*/
863	<	strcpy(splitstr, "*.net *.split");
863	>	strlcpy(splitstr, "*.net *.split", sizeof(splitstr));
864		else
865		snprintf(splitstr, sizeof(splitstr), "%s %s",
866		source_p->servptr->name, source_p->name);
867
868	<	remove_dependents(source_p, from->from, comment, splitstr);
868	>	/* Send SQUIT for source_p in every direction. source_p is already off of serv_list here */
869	>	if (!HasFlag(source_p, FLAGS_SQUIT))
870	>	sendto_server(NULL, NOCAPS, NOCAPS, "SQUIT %s :%s", source_p->id, comment);
871	>
872	>	/* Now exit the clients internally */
873	>	recurse_remove_clients(source_p, splitstr);
874
875	<	if (source_p->servptr == &me)
875	>	if (MyConnect(source_p))
876		{
877	<	sendto_realops_flags(UMODE_ALL, L_ALL,
877	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
878		"%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
879	<	source_p->name, (int)(CurrentTime - source_p->firsttime),
879	>	source_p->name, (int)(CurrentTime - source_p->localClient->firsttime),
880		source_p->localClient->send.bytes >> 10,
881		source_p->localClient->recv.bytes >> 10);
882	<	ilog(L_NOTICE, "%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
883	<	source_p->name, (int)(CurrentTime - source_p->firsttime),
882	>	ilog(LOG_TYPE_IRCD, "%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
883	>	source_p->name, (int)(CurrentTime - source_p->localClient->firsttime),
884		source_p->localClient->send.bytes >> 10,
885		source_p->localClient->recv.bytes >> 10);
886		}
887		}
888	<	else if (IsClient(source_p) && !IsKilled(source_p))
889	<	{
890	<	sendto_server(from->from, NULL, CAP_TS6, NOCAPS,
1042	<	":%s QUIT :%s", ID(source_p), comment);
1043	<	sendto_server(from->from, NULL, NOCAPS, CAP_TS6,
1044	<	":%s QUIT :%s", source_p->name, comment);
1045	<	}
888	>	else if (IsClient(source_p) && !HasFlag(source_p, FLAGS_KILLED))
889	>	sendto_server(source_p->from, NOCAPS, NOCAPS, ":%s QUIT :%s",
890	>	source_p->id, comment);
891
892		/* The client *better* be off all of the lists */
893		assert(dlinkFind(&unknown_list, source_p) == NULL);
#	Line 1086 | Line 931 | dead_link_on_write(struct Client *client
931		void
932		dead_link_on_read(struct Client *client_p, int error)
933		{
934	<	char errmsg[255];
934	>	char errmsg[IRCD_BUFSIZE];
935		int current_error;
936
937		if (IsDefunct(client_p))
#	Line 1099 | Line 944 | dead_link_on_read(struct Client *client_
944
945		if (IsServer(client_p) || IsHandshake(client_p))
946		{
947	<	int connected = CurrentTime - client_p->firsttime;
948	<
947	>	int connected = CurrentTime - client_p->localClient->firsttime;
948	>
949		if (error == 0)
950		{
951		/* Admins get the real IP */
952	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
953	<	"Server %s closed the connection",
954	<	get_client_name(client_p, SHOW_IP));
952	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
953	>	"Server %s closed the connection",
954	>	get_client_name(client_p, SHOW_IP));
955
956		/* Opers get a masked IP */
957	<	sendto_realops_flags(UMODE_ALL, L_OPER,
958	<	"Server %s closed the connection",
959	<	get_client_name(client_p, MASK_IP));
957	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
958	>	"Server %s closed the connection",
959	>	get_client_name(client_p, MASK_IP));
960
961	<	ilog(L_NOTICE, "Server %s closed the connection",
962	<	get_client_name(client_p, SHOW_IP));
961	>	ilog(LOG_TYPE_IRCD, "Server %s closed the connection",
962	>	get_client_name(client_p, SHOW_IP));
963		}
964		else
965		{
966		report_error(L_ADMIN, "Lost connection to %s: %s",
967	<	get_client_name(client_p, SHOW_IP), current_error);
967	>	get_client_name(client_p, SHOW_IP), current_error);
968		report_error(L_OPER, "Lost connection to %s: %s",
969	<	get_client_name(client_p, MASK_IP), current_error);
969	>	get_client_name(client_p, MASK_IP), current_error);
970		}
971
972	<	sendto_realops_flags(UMODE_ALL, L_ALL,
973	<	"%s had been connected for %d day%s, %2d:%02d:%02d",
974	<	client_p->name, connected/86400,
975	<	(connected/86400 == 1) ? "" : "s",
976	<	(connected % 86400) / 3600, (connected % 3600) / 60,
977	<	connected % 60);
972	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
973	>	"%s had been connected for %d day%s, %2d:%02d:%02d",
974	>	client_p->name, connected/86400,
975	>	(connected/86400 == 1) ? "" : "s",
976	>	(connected % 86400) / 3600, (connected % 3600) / 60,
977	>	connected % 60);
978		}
979
980		if (error == 0)
981		strlcpy(errmsg, "Remote host closed the connection",
982		sizeof(errmsg));
983		else
984	<	ircsprintf(errmsg, "Read error: %s",
985	<	strerror(current_error));
984	>	snprintf(errmsg, sizeof(errmsg), "Read error: %s",
985	>	strerror(current_error));
986
987	<	exit_client(client_p, &me, errmsg);
987	>	exit_client(client_p, errmsg);
988		}
989
990		void
#	Line 1156 | Line 1001 | exit_aborted_clients(void)
1001
1002		if (target_p == NULL)
1003		{
1004	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1004	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1005		"Warning: null client on abort_list!");
1006		dlinkDelete(ptr, &abort_list);
1007		free_dlink_node(ptr);
#	Line 1170 | Line 1015 | exit_aborted_clients(void)
1015		else
1016		notice = "Write error: connection closed";
1017
1018	<	exit_client(target_p, &me, notice);
1018	>	exit_client(target_p, notice);
1019		free_dlink_node(ptr);
1020		}
1021		}
#	Line 1198 | Line 1043 | del_accept(struct split_nuh_item *accept
1043
1044		struct split_nuh_item *
1045		find_accept(const char *nick, const char *user,
1046	<	const char *host, struct Client *client_p, int do_match)
1046	>	const char *host, struct Client *client_p,
1047	>	int (*cmpfunc)(const char *, const char *))
1048		{
1049		dlink_node *ptr = NULL;
1204	–	/* XXX We wouldn't need that if match() would return 0 on match */
1205	–	int (*cmpfunc)(const char *, const char *) = do_match ? match : irccmp;
1050
1051		DLINK_FOREACH(ptr, client_p->localClient->acceptlist.head)
1052		{
1053		struct split_nuh_item *accept_p = ptr->data;
1054
1055	<	if (cmpfunc(accept_p->nickptr, nick) == do_match &&
1056	<	cmpfunc(accept_p->userptr, user) == do_match &&
1057	<	cmpfunc(accept_p->hostptr, host) == do_match)
1055	>	if (!cmpfunc(accept_p->nickptr, nick) &&
1056	>	!cmpfunc(accept_p->userptr, user) &&
1057	>	!cmpfunc(accept_p->hostptr, host))
1058		return accept_p;
1059		}
1060
#	Line 1231 | Line 1075 | accept_message(struct Client *source,
1075		dlink_node *ptr = NULL;
1076
1077		if (source == target || find_accept(source->name, source->username,
1078	<	source->host, target, 1))
1078	>	source->host, target, match))
1079		return 1;
1080
1081	<	if (IsSoftCallerId(target))
1081	>	if (HasUMode(target, UMODE_SOFTCALLERID))
1082		DLINK_FOREACH(ptr, target->channel.head)
1083		if (IsMember(source, ((struct Membership *)ptr->data)->chptr))
1084		return 1;
#	Line 1251 | Line 1095 | accept_message(struct Client *source,
1095		void
1096		del_all_accepts(struct Client *client_p)
1097		{
1098	<	dlink_node *ptr = NULL, *next_ptr = NULL;
1098	>	dlink_node *ptr = NULL, *ptr_next = NULL;
1099
1100	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->acceptlist.head)
1100	>	DLINK_FOREACH_SAFE(ptr, ptr_next, client_p->localClient->acceptlist.head)
1101		del_accept(ptr->data, client_p);
1102		}
1103
1104	<	/* set_initial_nick()
1105	<	*
1262	<	* inputs
1263	<	* output
1264	<	* side effects -
1265	<	*
1266	<	* This function is only called to set up an initially registering
1267	<	* client.
1268	<	*/
1269	<	void
1270	<	set_initial_nick(struct Client *client_p, struct Client *source_p,
1271	<	const char *nick)
1272	<	{
1273	<	char buf[USERLEN + 1];
1274	<
1275	<	/* Client setting NICK the first time */
1276	<
1277	<	/* This had to be copied here to avoid problems.. */
1278	<	source_p->tsinfo = CurrentTime;
1279	<	source_p->localClient->registration &= ~REG_NEED_NICK;
1280	<
1281	<	if (source_p->name[0])
1282	<	hash_del_client(source_p);
1283	<
1284	<	strlcpy(source_p->name, nick, sizeof(source_p->name));
1285	<	hash_add_client(source_p);
1286	<
1287	<	/* fd_desc is long enough */
1288	<	fd_note(&client_p->localClient->fd, "Nick: %s", nick);
1289	<
1290	<	if (!source_p->localClient->registration)
1291	<	{
1292	<	strlcpy(buf, source_p->username, sizeof(buf));
1293	<
1294	<	/*
1295	<	* USER already received, now we have NICK.
1296	<	* *NOTE* For servers "NICK" *must* precede the
1297	<	* user message (giving USER before NICK is possible
1298	<	* only for local client connection!). register_user
1299	<	* may reject the client and call exit_client for it
1300	<	* --must test this and exit m_nick too!!!
1301	<	*/
1302	<	register_local_user(client_p, source_p, nick, buf);
1303	<	}
1304	<	}
1305	<
1306	<	/* change_local_nick()
1307	<	*
1308	<	* inputs       - pointer to server
1309	<	*              - pointer to client
1310	<	*              - nick
1311	<	* output       -
1312	<	* side effects - changes nick of a LOCAL user
1313	<	*/
1314	<	void
1315	<	change_local_nick(struct Client *client_p, struct Client *source_p, const char *nick)
1104	>	unsigned int
1105	>	idle_time_get(const struct Client *source_p, const struct Client *target_p)
1106		{
1107	<	int samenick = 0;
1108	<
1109	<	assert(source_p->name[0] && !EmptyString(nick));
1107	>	unsigned int idle = 0;
1108	>	unsigned int min_idle = 0;
1109	>	unsigned int max_idle = 0;
1110	>	const struct ClassItem *class = get_class_ptr(&target_p->localClient->confs);
1111	>
1112	>	if (!(class->flags & CLASS_FLAGS_FAKE_IDLE) || target_p == source_p)
1113	>	return CurrentTime - target_p->localClient->last_privmsg;
1114	>	if (HasUMode(source_p, UMODE_OPER) &&
1115	>	!(class->flags & CLASS_FLAGS_HIDE_IDLE_FROM_OPERS))
1116	>	return CurrentTime - target_p->localClient->last_privmsg;
1117
1118	<	/*
1119	<	* Client just changing his/her nick. If he/she is
1323	<	* on a channel, send note of change to all clients
1324	<	* on that channel. Propagate notice to other servers.
1325	<	*/
1326	<	if ((source_p->localClient->last_nick_change +
1327	<	ConfigFileEntry.max_nick_time) < CurrentTime)
1328	<	source_p->localClient->number_of_nick_changes = 0;
1329	<	source_p->localClient->last_nick_change = CurrentTime;
1330	<	source_p->localClient->number_of_nick_changes++;
1331	<
1332	<	if ((ConfigFileEntry.anti_nick_flood &&
1333	<	(source_p->localClient->number_of_nick_changes
1334	<	<= ConfigFileEntry.max_nick_changes)) ||
1335	<	!ConfigFileEntry.anti_nick_flood ||
1336	<	(IsOper(source_p) && ConfigFileEntry.no_oper_flood))
1337	<	{
1338	<	samenick = !irccmp(source_p->name, nick);
1339	<
1340	<	if (!samenick)
1341	<	{
1342	<	source_p->tsinfo = CurrentTime;
1343	<	clear_ban_cache_client(source_p);
1344	<	watch_check_hash(source_p, RPL_LOGOFF);
1345	<	}
1118	>	min_idle = class->min_idle;
1119	>	max_idle = class->max_idle;
1120
1121	<	/* XXX - the format of this notice should eventually be changed
1122	<	* to either %s[%s@%s], or even better would be get_client_name() -bill
1349	<	*/
1350	<	sendto_realops_flags(UMODE_NCHANGE, L_ALL, "Nick change: From %s to %s [%s@%s]",
1351	<	source_p->name, nick, source_p->username, source_p->host);
1352	<	sendto_common_channels_local(source_p, 1, ":%s!%s@%s NICK :%s",
1353	<	source_p->name, source_p->username,
1354	<	source_p->host, nick);
1355	<	add_history(source_p, 1);
1121	>	if (min_idle == max_idle)
1122	>	return min_idle;
1123
1124	<	sendto_server(client_p, NULL, CAP_TS6, NOCAPS,
1125	<	":%s NICK %s :%lu",
1126	<	ID(source_p), nick, (unsigned long)source_p->tsinfo);
1127	<	sendto_server(client_p, NULL, NOCAPS, CAP_TS6,
1361	<	":%s NICK %s :%lu",
1362	<	source_p->name, nick, (unsigned long)source_p->tsinfo);
1124	>	if (class->flags & CLASS_FLAGS_RANDOM_IDLE)
1125	>	idle = genrand_int32();
1126	>	else
1127	>	idle = CurrentTime - target_p->localClient->last_privmsg;
1128
1129	<	hash_del_client(source_p);
1130	<	strcpy(source_p->name, nick);
1131	<	hash_add_client(source_p);
1129	>	if (!max_idle)
1130	>	idle = 0;
1131	>	else
1132	>	idle %= max_idle;
1133
1134	<	if (!samenick)
1135	<	watch_check_hash(source_p, RPL_LOGON);
1134	>	if (idle < min_idle)
1135	>	idle = min_idle + (idle % (max_idle - min_idle));
1136
1137	<	/* fd_desc is long enough */
1372	<	fd_note(&client_p->localClient->fd, "Nick: %s", nick);
1373	<	}
1374	<	else
1375	<	sendto_one(source_p, form_str(ERR_NICKTOOFAST),
1376	<	me.name, source_p->name, source_p->name,
1377	<	nick, ConfigFileEntry.max_nick_time);
1137	>	return idle;
1138		}

Diff Legend

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