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 503 by michael, Fri Mar 3 19:53:47 2006 UTC vs.
ircd-hybrid/trunk/src/client.c (file contents), Revision 1991 by michael, Thu May 9 16:01:15 2013 UTC

#	Line 23 | Line 23
23		*/
24
25		#include "stdinc.h"
26	<	#include "tools.h"
26	>	#include "list.h"
27		#include "client.h"
28		#include "channel_mode.h"
29	–	#include "common.h"
29		#include "event.h"
30		#include "fdlist.h"
31		#include "hash.h"
32		#include "irc_string.h"
34	–	#include "sprintf_irc.h"
33		#include "ircd.h"
36	–	#include "list.h"
34		#include "s_gline.h"
35		#include "numeric.h"
36		#include "packet.h"
37		#include "s_auth.h"
38		#include "s_bsd.h"
39	<	#include "s_conf.h"
40	<	#include "s_log.h"
39	>	#include "conf.h"
40	>	#include "log.h"
41		#include "s_misc.h"
42		#include "s_serv.h"
43		#include "send.h"
#	Line 48 | Line 45
45		#include "s_user.h"
46		#include "dbuf.h"
47		#include "memory.h"
48	+	#include "mempool.h"
49		#include "hostmask.h"
52	–	#include "balloc.h"
50		#include "listener.h"
51		#include "irc_res.h"
52		#include "userhost.h"
53	+	#include "watch.h"
54	+	#include "rng_mt.h"
55
56		dlink_list listing_client_list = { NULL, NULL, 0 };
57		/* Pointer to beginning of Client list */
#	Line 66 | Line 65 | dlink_list oper_list = {NULL, NULL, 0};
65
66		static EVH check_pings;
67
68	<	static BlockHeap *client_heap  = NULL;
69	<	static BlockHeap *lclient_heap = NULL;
68	>	static mp_pool_t *client_pool  = NULL;
69	>	static mp_pool_t *lclient_pool = NULL;
70
71		static dlink_list dead_list  = { NULL, NULL, 0};
72		static dlink_list abort_list = { NULL, NULL, 0};
#	Line 76 | Line 75 | static dlink_node *eac_next;  /* next ab
75
76		static void check_pings_list(dlink_list *);
77		static void check_unknowns_list(void);
78	<	static void ban_them(struct Client *client_p, struct ConfItem *conf);
78	>	static void ban_them(struct Client *, struct MaskItem *);
79
80
81	<	/* init_client()
81	>	/* client_init()
82		*
83		* inputs       - NONE
84		* output       - NONE
85		* side effects - initialize client free memory
86		*/
87		void
88	<	init_client(void)
88	>	client_init(void)
89		{
90		/* start off the check ping event ..  -- adrian
91		* Every 30 seconds is plenty -- db
92		*/
93	<	client_heap = BlockHeapCreate("client", sizeof(struct Client), CLIENT_HEAP_SIZE);
94	<	lclient_heap = BlockHeapCreate("local client", sizeof(struct LocalUser), LCLIENT_HEAP_SIZE);
93	>	client_pool = mp_pool_new(sizeof(struct Client), MP_CHUNK_SIZE_CLIENT);
94	>	lclient_pool = mp_pool_new(sizeof(struct LocalUser), MP_CHUNK_SIZE_LCLIENT);
95		eventAdd("check_pings", check_pings, NULL, 5);
96		}
97
#	Line 114 | Line 113 | init_client(void)
113		struct Client *
114		make_client(struct Client *from)
115		{
116	<	struct Client *client_p = BlockHeapAlloc(client_heap);
116	>	struct Client *client_p = mp_pool_get(client_pool);
117	>
118	>	memset(client_p, 0, sizeof(*client_p));
119
120		if (from == NULL)
121		{
122	<	client_p->from  = client_p; /* 'from' of local client is self! */
123	<	client_p->since = client_p->lasttime = client_p->firsttime = CurrentTime;
122	>	client_p->from                      = client_p; /* 'from' of local client is self! */
123	>	client_p->localClient               = mp_pool_get(lclient_pool);
124
125	<	client_p->localClient = BlockHeapAlloc(lclient_heap);
125	>	memset(client_p->localClient, 0, sizeof(*client_p->localClient));
126	>
127	>	client_p->localClient->since        = CurrentTime;
128	>	client_p->localClient->lasttime     = CurrentTime;
129	>	client_p->localClient->firsttime    = CurrentTime;
130		client_p->localClient->registration = REG_INIT;
131	+
132		/* as good a place as any... */
133	<	dlinkAdd(client_p, make_dlink_node(), &unknown_list);
133	>	dlinkAdd(client_p, &client_p->localClient->lclient_node, &unknown_list);
134		}
135		else
136		client_p->from = from; /* 'from' of local client is self! */
137
138	+	client_p->idhnext = client_p;
139		client_p->hnext  = client_p;
140		client_p->status = STAT_UNKNOWN;
141		strcpy(client_p->username, "unknown");
142	+	strcpy(client_p->svid, "0");
143
144		return client_p;
145		}
#	Line 149 | Line 157 | free_client(struct Client *client_p)
157		assert(client_p != NULL);
158		assert(client_p != &me);
159		assert(client_p->hnext == client_p);
160	+	assert(client_p->idhnext == client_p);
161		assert(client_p->channel.head == NULL);
162		assert(dlink_list_length(&client_p->channel) == 0);
163	+	assert(dlink_list_length(&client_p->whowas) == 0);
164	+	assert(!IsServer(client_p) || (IsServer(client_p) && client_p->serv));
165
155	–	MyFree(client_p->away);
166		MyFree(client_p->serv);
167
168		if (MyConnect(client_p))
169		{
170		assert(client_p->localClient->invited.head == NULL);
171		assert(dlink_list_length(&client_p->localClient->invited) == 0);
172	+	assert(dlink_list_length(&client_p->localClient->watches) == 0);
173		assert(IsClosing(client_p) && IsDead(client_p));
174
175		MyFree(client_p->localClient->response);
#	Line 178 | Line 189 | free_client(struct Client *client_p)
189		dbuf_clear(&client_p->localClient->buf_recvq);
190		dbuf_clear(&client_p->localClient->buf_sendq);
191
192	<	BlockHeapFree(lclient_heap, client_p->localClient);
192	>	mp_pool_release(client_p->localClient);
193		}
194
195	<	BlockHeapFree(client_heap, client_p);
195	>	mp_pool_release(client_p);
196		}
197
198		/*
#	Line 228 | Line 239 | static void
239		check_pings_list(dlink_list *list)
240		{
241		char scratch[32];        /* way too generous but... */
242	<	struct Client *client_p; /* current local client_p being examined */
243	<	int ping, pingwarn;      /* ping time value from client */
233	<	dlink_node *ptr, *next_ptr;
242	>	int ping = 0;      /* ping time value from client */
243	>	dlink_node *ptr = NULL, *next_ptr = NULL;
244
245		DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
246		{
247	<	client_p = ptr->data;
247	>	struct Client *client_p = ptr->data;
248
249		/*
250		** Note: No need to notify opers here. It's
#	Line 246 | Line 256 | check_pings_list(dlink_list *list)
256		continue;
257		}
258
249	–	if (client_p->localClient->reject_delay > 0)
250	–	{
251	–	if (client_p->localClient->reject_delay <= CurrentTime)
252	–	exit_client(client_p, &me, "Rejected");
253	–	continue;
254	–	}
255	–
256	–	if (GlobalSetOptions.idletime && IsClient(client_p))
257	–	{
258	–	if (!IsExemptKline(client_p) && !IsOper(client_p) &&
259	–	!IsIdlelined(client_p) &&
260	–	((CurrentTime - client_p->localClient->last) > GlobalSetOptions.idletime))
261	–	{
262	–	struct ConfItem *conf;
263	–	struct AccessItem *aconf;
264	–
265	–	conf = make_conf_item(KLINE_TYPE);
266	–	aconf = (struct AccessItem *)map_to_conf(conf);
267	–
268	–	DupString(aconf->host, client_p->host);
269	–	DupString(aconf->reason, "idle exceeder");
270	–	DupString(aconf->user, client_p->username);
271	–	aconf->hold = CurrentTime + 60;
272	–	add_temp_line(conf);
273	–
274	–	sendto_realops_flags(UMODE_ALL, L_ALL,
275	–	"Idle time limit exceeded for %s - temp k-lining",
276	–	get_client_name(client_p, HIDE_IP));
277	–	exit_client(client_p, &me, aconf->reason);
278	–	continue;
279	–	}
280	–	}
281	–
259		if (!IsRegistered(client_p))
260	<	ping = CONNECTTIMEOUT, pingwarn = 0;
260	>	ping = CONNECTTIMEOUT;
261		else
262	<	ping = get_client_ping(client_p, &pingwarn);
262	>	ping = get_client_ping(&client_p->localClient->confs);
263
264	<	if (ping < CurrentTime - client_p->lasttime)
264	>	if (ping < CurrentTime - client_p->localClient->lasttime)
265		{
266		if (!IsPingSent(client_p))
267		{
#	Line 294 | Line 271 | check_pings_list(dlink_list *list)
271		* it is still alive.
272		*/
273		SetPingSent(client_p);
274	<	ClearPingWarning(client_p);
298	<	client_p->lasttime = CurrentTime - ping;
274	>	client_p->localClient->lasttime = CurrentTime - ping;
275		sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
276		}
277		else
278		{
279	<	if (CurrentTime - client_p->lasttime >= 2 * ping)
279	>	if (CurrentTime - client_p->localClient->lasttime >= 2 * ping)
280		{
281		/*
282		* If the client/server hasn't talked to us in 2*ping seconds
#	Line 308 | Line 284 | check_pings_list(dlink_list *list)
284		*/
285		if (IsServer(client_p) || IsHandshake(client_p))
286		{
287	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
287	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
288		"No response from %s, closing link",
289		get_client_name(client_p, HIDE_IP));
290	<	sendto_realops_flags(UMODE_ALL, L_OPER,
290	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
291		"No response from %s, closing link",
292		get_client_name(client_p, MASK_IP));
293	<	ilog(L_NOTICE, "No response from %s, closing link",
293	>	ilog(LOG_TYPE_IRCD, "No response from %s, closing link",
294		get_client_name(client_p, HIDE_IP));
295		}
320	–	ircsprintf(scratch, "Ping timeout: %d seconds",
321	–	(int)(CurrentTime - client_p->lasttime));
296
297	+	snprintf(scratch, sizeof(scratch), "Ping timeout: %d seconds",
298	+	(int)(CurrentTime - client_p->localClient->lasttime));
299		exit_client(client_p, &me, scratch);
300		}
325	–	else if (!IsPingWarning(client_p) && pingwarn > 0 &&
326	–	(IsServer(client_p) || IsHandshake(client_p)) &&
327	–	CurrentTime - client_p->lasttime >= ping + pingwarn)
328	–	{
329	–	/*
330	–	* If the server hasn't replied in pingwarn seconds after sending
331	–	* the PING, notify the opers so that they are aware of the problem.
332	–	*/
333	–	SetPingWarning(client_p);
334	–	sendto_realops_flags(UMODE_ALL, L_ADMIN,
335	–	"Warning, no response from %s in %d seconds",
336	–	get_client_name(client_p, HIDE_IP), pingwarn);
337	–	sendto_realops_flags(UMODE_ALL, L_OPER,
338	–	"Warning, no response from %s in %d seconds",
339	–	get_client_name(client_p, MASK_IP), pingwarn);
340	–	ilog(L_NOTICE, "No response from %s in %d seconds",
341	–	get_client_name(client_p, HIDE_IP), pingwarn);
342	–	}
301		}
302		}
303		}
#	Line 360 | Line 318 | check_unknowns_list(void)
318		{
319		struct Client *client_p = ptr->data;
320
321	<	if (client_p->localClient->reject_delay > 0)
322	<	{
365	<	if (client_p->localClient->reject_delay <= CurrentTime)
366	<	exit_client(client_p, &me, "Rejected");
367	<	continue;
368	<	}
369	<
370	<	/* Check UNKNOWN connections - if they have been in this state
321	>	/*
322	>	* Check UNKNOWN connections - if they have been in this state
323		* for > 30s, close them.
324		*/
325	<	if (client_p->firsttime ? ((CurrentTime - client_p->firsttime) > 30) : 0)
326	<	exit_client(client_p, &me, "Connection timed out");
325	>	if (IsAuthFinished(client_p) && (CurrentTime - client_p->localClient->firsttime) > 30)
326	>	exit_client(client_p, &me, "Registration timed out");
327		}
328		}
329
#	Line 386 | Line 338 | void
338		check_conf_klines(void)
339		{
340		struct Client *client_p = NULL;       /* current local client_p being examined */
341	<	struct AccessItem *aconf = NULL;
390	<	struct ConfItem *conf = NULL;
341	>	struct MaskItem *conf = NULL;
342		dlink_node *ptr, *next_ptr;
343
344		DLINK_FOREACH_SAFE(ptr, next_ptr, local_client_list.head)
#	Line 399 | Line 350 | check_conf_klines(void)
350		if (IsDead(client_p) || !IsClient(client_p))
351		continue;
352
353	<	/* if there is a returned struct ConfItem then kill it */
403	<	if ((aconf = find_dline_conf(&client_p->localClient->ip,
353	>	if ((conf = find_dline_conf(&client_p->localClient->ip,
354		client_p->localClient->aftype)) != NULL)
355		{
356	<	if (aconf->status & CONF_EXEMPTDLINE)
356	>	if (conf->type == CONF_EXEMPT)
357		continue;
358
409	–	conf = unmap_conf_item(aconf);
359		ban_them(client_p, conf);
360		continue; /* and go examine next fd/client_p */
361		}
362
363	<	if (ConfigFileEntry.glines && (aconf = find_gline(client_p)))
363	>	if (ConfigFileEntry.glines && (conf = find_gline(client_p)))
364		{
365		if (IsExemptKline(client_p) ||
366		IsExemptGline(client_p))
367		{
368	<	sendto_realops_flags(UMODE_ALL, L_ALL,
368	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
369		"GLINE over-ruled for %s, client is %sline_exempt",
370		get_client_name(client_p, HIDE_IP), IsExemptKline(client_p) ? "k" : "g");
371		continue;
372		}
373
425	–	conf = unmap_conf_item(aconf);
374		ban_them(client_p, conf);
375		/* and go examine next fd/client_p */
376		continue;
377		}
378
379	<	if ((aconf = find_kill(client_p)) != NULL)
379	>	if ((conf = find_kill(client_p)) != NULL)
380		{
433	–
434	–	/* if there is a returned struct AccessItem.. then kill it */
381		if (IsExemptKline(client_p))
382		{
383	<	sendto_realops_flags(UMODE_ALL, L_ALL,
383	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
384		"KLINE over-ruled for %s, client is kline_exempt",
385		get_client_name(client_p, HIDE_IP));
386		continue;
387		}
388
443	–	conf = unmap_conf_item(aconf);
389		ban_them(client_p, conf);
390		continue;
391		}
392
393	<	/* if there is a returned struct MatchItem then kill it */
394	<	if ((conf = find_matching_name_conf(XLINE_TYPE,  client_p->info,
450	<	NULL, NULL, 0)) != NULL ||
451	<	(conf = find_matching_name_conf(RXLINE_TYPE, client_p->info,
452	<	NULL, NULL, 0)) != NULL)
393	>	if ((conf = find_matching_name_conf(CONF_XLINE,  client_p->info,
394	>	NULL, NULL, 0)))
395		{
396		ban_them(client_p, conf);
397		continue;
#	Line 461 | Line 403 | check_conf_klines(void)
403		{
404		client_p = ptr->data;
405
406	<	if ((aconf = find_dline_conf(&client_p->localClient->ip,
407	<	client_p->localClient->aftype)))
406	>	if ((conf = find_dline_conf(&client_p->localClient->ip,
407	>	client_p->localClient->aftype)))
408		{
409	<	if (aconf->status & CONF_EXEMPTDLINE)
409	>	if (conf->type == CONF_EXEMPT)
410		continue;
411
412		exit_client(client_p, &me, "D-lined");
#	Line 476 | Line 418 | check_conf_klines(void)
418		* ban_them
419		*
420		* inputs       - pointer to client to ban
421	<	*              - pointer to ConfItem
421	>	*              - pointer to MaskItem
422		* output       - NONE
423		* side effects - given client_p is banned
424		*/
425		static void
426	<	ban_them(struct Client *client_p, struct ConfItem *conf)
426	>	ban_them(struct Client *client_p, struct MaskItem *conf)
427		{
428		const char *user_reason = NULL;       /* What is sent to user */
487	–	const char *channel_reason = NULL;    /* What is sent to channel */
488	–	struct AccessItem *aconf = NULL;
489	–	struct MatchItem *xconf = NULL;
429		const char *type_string = NULL;
430		const char dline_string[] = "D-line";
431		const char kline_string[] = "K-line";
#	Line 495 | Line 434 | ban_them(struct Client *client_p, struct
434
435		switch (conf->type)
436		{
437	<	case RKLINE_TYPE:
499	<	case KLINE_TYPE:
437	>	case CONF_KLINE:
438		type_string = kline_string;
501	–	aconf = map_to_conf(conf);
439		break;
440	<	case DLINE_TYPE:
440	>	case CONF_DLINE:
441		type_string = dline_string;
505	–	aconf = map_to_conf(conf);
442		break;
443	<	case GLINE_TYPE:
443	>	case CONF_GLINE:
444		type_string = gline_string;
509	–	aconf = map_to_conf(conf);
445		break;
446	<	case RXLINE_TYPE:
512	<	case XLINE_TYPE:
446	>	case CONF_XLINE:
447		type_string = xline_string;
448	<	xconf = map_to_conf(conf);
515	<	++xconf->count;
448	>	++conf->count;
449		break;
450		default:
451		assert(0);
452		break;
453		}
454
455	<	if (ConfigFileEntry.kline_with_reason)
523	<	{
524	<	if (aconf != NULL)
525	<	user_reason = aconf->reason ? aconf->reason : type_string;
526	<	if (xconf != NULL)
527	<	user_reason = xconf->reason ? xconf->reason : type_string;
528	<	}
529	<	else
530	<	user_reason = type_string;
455	>	user_reason = conf->reason ? conf->reason : type_string;
456
457	<	if (ConfigFileEntry.kline_reason != NULL)
533	<	channel_reason = ConfigFileEntry.kline_reason;
534	<	else
535	<	channel_reason = user_reason;
536	<
537	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s active for %s",
457	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s active for %s",
458		type_string, get_client_name(client_p, HIDE_IP));
459
460		if (IsClient(client_p))
461		sendto_one(client_p, form_str(ERR_YOUREBANNEDCREEP),
462		me.name, client_p->name, user_reason);
463
464	<	exit_client(client_p, &me, channel_reason);
464	>	exit_client(client_p, &me, user_reason);
465		}
466
467		/* update_client_exit_stats()
#	Line 553 | Line 473 | ban_them(struct Client *client_p, struct
473		static void
474		update_client_exit_stats(struct Client *client_p)
475		{
476	<	if (IsServer(client_p))
557	<	{
558	<	sendto_realops_flags(UMODE_EXTERNAL, L_ALL,
559	<	"Server %s split from %s",
560	<	client_p->name, client_p->servptr->name);
561	<	}
562	<	else if (IsClient(client_p))
476	>	if (IsClient(client_p))
477		{
478	+	assert(Count.total > 0);
479		--Count.total;
480	<	if (IsOper(client_p))
480	>	if (HasUMode(client_p, UMODE_OPER))
481		--Count.oper;
482	<	if (IsInvisible(client_p))
482	>	if (HasUMode(client_p, UMODE_INVISIBLE))
483		--Count.invisi;
484		}
485	+	else if (IsServer(client_p))
486	+	sendto_realops_flags(UMODE_EXTERNAL, L_ALL, SEND_NOTICE,
487	+	"Server %s split from %s",
488	+	client_p->name, client_p->servptr->name);
489
490		if (splitchecking && !splitmode)
491		check_splitmode(NULL);
#	Line 578 | Line 497 | update_client_exit_stats(struct Client *
497		* output       - return client pointer
498		* side effects - find person by (nick)name
499		*/
581	–	/* XXX - ugly wrapper */
500		struct Client *
501		find_person(const struct Client *client_p, const char *name)
502		{
503	<	struct Client *c2ptr;
503	>	struct Client *c2ptr = NULL;
504
505		if (IsDigit(*name))
506		{
507		if ((c2ptr = hash_find_id(name)) != NULL)
508		{
509		/* invisible users shall not be found by UID guessing */
510	<	if (IsInvisible(c2ptr) && !IsServer(client_p))
511	<	c2ptr = NULL;
510	>	if (HasUMode(c2ptr, UMODE_INVISIBLE))
511	>	if (!IsServer(client_p) && !HasFlag(client_p, FLAGS_SERVICE))
512	>	c2ptr = NULL;
513		}
514		}
515		else
516	<	c2ptr = find_client(name);
516	>	c2ptr = hash_find_client(name);
517
518		return ((c2ptr != NULL && IsClient(c2ptr)) ? c2ptr : NULL);
519		}
#	Line 614 | Line 533 | find_chasing(struct Client *client_p, st
533		*chasing = 0;
534
535		if (who)
536	<	return(who);
536	>	return who;
537
538		if (IsDigit(*user))
539	<	return(NULL);
539	>	return NULL;
540
541		if ((who = get_history(user,
542		(time_t)ConfigFileEntry.kill_chase_time_limit))
#	Line 625 | Line 544 | find_chasing(struct Client *client_p, st
544		{
545		sendto_one(source_p, form_str(ERR_NOSUCHNICK),
546		me.name, source_p->name, user);
547	<	return(NULL);
547	>	return NULL;
548		}
549
550		if (chasing)
551		*chasing = 1;
552
553	<	return(who);
553	>	return who;
554		}
555
556		/*
#	Line 653 | Line 572 | find_chasing(struct Client *client_p, st
572		*        to modify what it points!!!
573		*/
574		const char *
575	<	get_client_name(struct Client *client, int showip)
575	>	get_client_name(const struct Client *client, enum addr_mask_type type)
576		{
577		static char nbuf[HOSTLEN * 2 + USERLEN + 5];
578
579		assert(client != NULL);
580
581	<	if (irccmp(client->name, client->host) == 0)
582	<	return(client->name);
581	>	if (!MyConnect(client))
582	>	return client->name;
583
584	<	if (ConfigServerHide.hide_server_ips)
585	<	if (IsServer(client) || IsConnecting(client) || IsHandshake(client))
586	<	showip = MASK_IP;
584	>	if (IsServer(client) || IsConnecting(client) || IsHandshake(client))
585	>	{
586	>	if (!irccmp(client->name, client->host))
587	>	return client->name;
588	>	else if (ConfigServerHide.hide_server_ips)
589	>	type = MASK_IP;
590	>	}
591
592		if (ConfigFileEntry.hide_spoof_ips)
593	<	if (showip == SHOW_IP && IsIPSpoof(client))
594	<	showip = MASK_IP;
593	>	if (type == SHOW_IP && IsIPSpoof(client))
594	>	type = MASK_IP;
595
596		/* And finally, let's get the host information, ip or name */
597	<	switch (showip)
597	>	switch (type)
598		{
599		case SHOW_IP:
600	<	if (MyConnect(client))
601	<	{
602	<	ircsprintf(nbuf, "%s[%s@%s]", client->name, client->username,
603	<	client->sockhost);
681	<	break;
682	<	}
600	>	snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
601	>	client->name,
602	>	client->username, client->sockhost);
603	>	break;
604		case MASK_IP:
605	<	ircsprintf(nbuf, "%s[%s@255.255.255.255]", client->name,
606	<	client->username);
605	>	if (client->localClient->aftype == AF_INET)
606	>	snprintf(nbuf, sizeof(nbuf), "%s[%s@255.255.255.255]",
607	>	client->name, client->username);
608	>	else
609	>	snprintf(nbuf, sizeof(nbuf), "%s[%s@ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]",
610	>	client->name, client->username);
611		break;
612		default:
613	<	ircsprintf(nbuf, "%s[%s@%s]", client->name, client->username,
614	<	client->host);
613	>	snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
614	>	client->name,
615	>	client->username, client->host);
616		}
617
618	<	return(nbuf);
618	>	return nbuf;
619		}
620
621		void
622		free_exited_clients(void)
623		{
624	<	dlink_node *ptr, *next;
699	<	struct Client *target_p;
624	>	dlink_node *ptr = NULL, *next = NULL;
625
626		DLINK_FOREACH_SAFE(ptr, next, dead_list.head)
627		{
628	<	target_p = ptr->data;
704	<
705	<	if (ptr->data == NULL)
706	<	{
707	<	sendto_realops_flags(UMODE_ALL, L_ALL,
708	<	"Warning: null client on dead_list!");
709	<	dlinkDelete(ptr, &dead_list);
710	<	free_dlink_node(ptr);
711	<	continue;
712	<	}
713	<
714	<	free_client(target_p);
628	>	free_client(ptr->data);
629		dlinkDelete(ptr, &dead_list);
630		free_dlink_node(ptr);
631		}
#	Line 730 | Line 644 | exit_one_client(struct Client *source_p,
644
645		assert(!IsMe(source_p));
646
647	<	if (IsServer(source_p))
734	<	{
735	<	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->servers);
736	<
737	<	if ((lp = dlinkFindDelete(&global_serv_list, source_p)) != NULL)
738	<	free_dlink_node(lp);
739	<
740	<	if (!MyConnect(source_p))
741	<	{
742	<	source_p->from->serv->dep_servers--;
743	<	assert(source_p->from->serv->dep_servers > 0);
744	<	}
745	<	}
746	<	else if (IsClient(source_p))
647	>	if (IsClient(source_p))
648		{
649		if (source_p->servptr->serv != NULL)
650	<	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->users);
650	>	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->client_list);
651
652	<	/* If a person is on a channel, send a QUIT notice
653	<	** to every client (person) on the same channel (so
654	<	** that the client can show the "**signoff" message).
655	<	** (Note: The notice is to the local clients *only*)
656	<	*/
657	<	sendto_common_channels_local(source_p, 0, ":%s!%s@%s QUIT :%s",
652	>	/*
653	>	* If a person is on a channel, send a QUIT notice
654	>	* to every client (person) on the same channel (so
655	>	* that the client can show the "**signoff" message).
656	>	* (Note: The notice is to the local clients *only*)
657	>	*/
658	>	sendto_common_channels_local(source_p, 0, 0, ":%s!%s@%s QUIT :%s",
659		source_p->name, source_p->username,
660		source_p->host, quitmsg);
661		DLINK_FOREACH_SAFE(lp, next_lp, source_p->channel.head)
662		remove_user_from_channel(lp->data);
663
762	–	/* Clean up allow lists */
763	–	del_all_accepts(source_p);
664		add_history(source_p, 0);
665		off_history(source_p);
666
667	<	if (!MyConnect(source_p))
668	<	{
669	<	source_p->from->serv->dep_users--;
770	<	assert(source_p->from->serv->dep_users >= 0);
771	<	}
772	<	else
667	>	watch_check_hash(source_p, RPL_LOGOFF);
668	>
669	>	if (MyConnect(source_p))
670		{
671		/* Clean up invitefield */
672		DLINK_FOREACH_SAFE(lp, next_lp, source_p->localClient->invited.head)
673		del_invite(lp->data, source_p);
674	+
675	+	del_all_accepts(source_p);
676		}
677		}
678	+	else if (IsServer(source_p))
679	+	{
680	+	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->server_list);
681	+
682	+	if ((lp = dlinkFindDelete(&global_serv_list, source_p)) != NULL)
683	+	free_dlink_node(lp);
684	+	}
685
686		/* Remove source_p from the client lists */
687		if (HasID(source_p))
#	Line 815 | Line 721 | exit_one_client(struct Client *source_p,
721		static void
722		recurse_send_quits(struct Client *original_source_p, struct Client *source_p,
723		struct Client *from, struct Client *to, const char *comment,
724	<	const char *splitstr, const char *myname)
724	>	const char *splitstr)
725		{
726		dlink_node *ptr, *next;
727		struct Client *target_p;
822	–	int hidden = match(myname, source_p->name);
728
729		assert(to != source_p);  /* should be already removed from serv_list */
730
731		/* If this server can handle quit storm (QS) removal
732		* of dependents, just send the SQUIT
828	–	*
829	–	* Always check *all* dependent servers if some of them are
830	–	* hidden behind fakename. If so, send out the QUITs -adx
733		*/
734	<	if (hidden || !IsCapable(to, CAP_QS))
735	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->users.head)
734	>	if (!IsCapable(to, CAP_QS))
735	>	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->client_list.head)
736		{
737		target_p = ptr->data;
738		sendto_one(to, ":%s QUIT :%s", target_p->name, splitstr);
739		}
740
741	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->servers.head)
741	>	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->server_list.head)
742		recurse_send_quits(original_source_p, ptr->data, from, to,
743	<	comment, splitstr, myname);
743	>	comment, splitstr);
744
745	<	if (!hidden && ((source_p == original_source_p && to != from) ||
746	<	!IsCapable(to, CAP_QS)))
745	>	if ((source_p == original_source_p && to != from) ||
746	>	!IsCapable(to, CAP_QS))
747		{
748		/* don't use a prefix here - we have to be 100% sure the message
749		* will be accepted without Unknown prefix etc.. */
#	Line 860 | Line 762 | recurse_remove_clients(struct Client *so
762		{
763		dlink_node *ptr, *next;
764
765	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->users.head)
765	>	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->client_list.head)
766		exit_one_client(ptr->data, quitmsg);
767
768	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->servers.head)
768	>	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->server_list.head)
769		{
770		recurse_remove_clients(ptr->data, quitmsg);
771		exit_one_client(ptr->data, quitmsg);
772		}
871	–
872	–	assert(source_p->serv->dep_servers == 1);
873	–	assert(source_p->serv->dep_users == 0);
773		}
774
775		/*
#	Line 882 | Line 781 | static void
781		remove_dependents(struct Client *source_p, struct Client *from,
782		const char *comment, const char *splitstr)
783		{
784	<	struct Client *to;
886	<	struct ConfItem *conf;
887	<	static char myname[HOSTLEN+1];
888	<	dlink_node *ptr;
784	>	dlink_node *ptr = NULL;
785
786		DLINK_FOREACH(ptr, serv_list.head)
787	<	{
788	<	to = ptr->data;
893	<
894	<	if ((conf = to->serv->sconf) != NULL)
895	<	strlcpy(myname, my_name_for_link(conf), sizeof(myname));
896	<	else
897	<	strlcpy(myname, me.name, sizeof(myname));
898	<	recurse_send_quits(source_p, source_p, from, to,
899	<	comment, splitstr, myname);
900	<	}
787	>	recurse_send_quits(source_p, source_p, from, ptr->data,
788	>	comment, splitstr);
789
790		recurse_remove_clients(source_p, splitstr);
791		}
#	Line 907 | Line 795 | remove_dependents(struct Client *source_
795		* this on any struct Client, regardless of its state.
796		*
797		* Note, you shouldn't exit remote _users_ without first doing
798	<	* SetKilled and propagating a kill or similar message. However,
799	<	* it is perfectly correct to call exit_client to force a _server_
798	>	* AddFlag(x, FLAGS_KILLED) and propagating a kill or similar message.
799	>	* However, it is perfectly correct to call exit_client to force a _server_
800		* quit (either local or remote one).
801		*
802		* inputs:       - a client pointer that is going to be exited
#	Line 923 | Line 811 | remove_dependents(struct Client *source_
811		void
812		exit_client(struct Client *source_p, struct Client *from, const char *comment)
813		{
814	<	dlink_node *m;
814	>	dlink_node *m = NULL;
815
816		if (MyConnect(source_p))
817		{
#	Line 938 | Line 826 | exit_client(struct Client *source_p, str
826		if (IsIpHash(source_p))
827		remove_one_ip(&source_p->localClient->ip);
828
829	<	delete_auth(source_p);
829	>	if (source_p->localClient->auth)
830	>	{
831	>	delete_auth(source_p->localClient->auth);
832	>	source_p->localClient->auth = NULL;
833	>	}
834
835	<	/* This source_p could have status of one of STAT_UNKNOWN, STAT_CONNECTING
835	>	/*
836	>	* This source_p could have status of one of STAT_UNKNOWN, STAT_CONNECTING
837		* STAT_HANDSHAKE or STAT_UNKNOWN
838		* all of which are lumped together into unknown_list
839		*
#	Line 948 | Line 841 | exit_client(struct Client *source_p, str
841		*/
842		if (!IsRegistered(source_p))
843		{
844	<	if ((m = dlinkFindDelete(&unknown_list, source_p)) != NULL)
845	<	free_dlink_node(m);
844	>	assert(dlinkFind(&unknown_list, source_p));
845	>
846	>	dlinkDelete(&source_p->localClient->lclient_node, &unknown_list);
847		}
848		else if (IsClient(source_p))
849		{
850	+	time_t on_for = CurrentTime - source_p->localClient->firsttime;
851	+	assert(Count.local > 0);
852		Count.local--;
853
854	<	if (IsOper(source_p))
959	<	{
854	>	if (HasUMode(source_p, UMODE_OPER))
855		if ((m = dlinkFindDelete(&oper_list, source_p)) != NULL)
856		free_dlink_node(m);
962	–	}
857
858	+	assert(dlinkFind(&local_client_list, source_p));
859		dlinkDelete(&source_p->localClient->lclient_node, &local_client_list);
860	+
861		if (source_p->localClient->list_task != NULL)
862		free_list_task(source_p->localClient->list_task, source_p);
863
864	<	sendto_realops_flags(UMODE_CCONN, L_ALL, "Client exiting: %s (%s@%s) [%s] [%s]",
864	>	watch_del_watch_list(source_p);
865	>	sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
866	>	"Client exiting: %s (%s@%s) [%s] [%s]",
867		source_p->name, source_p->username, source_p->host, comment,
868		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
869		"255.255.255.255" : source_p->sockhost);
870	+	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL, SEND_NOTICE,
871	+	"CLIEXIT: %s %s %s %s 0 %s",
872	+	source_p->name,
873	+	source_p->username,
874	+	source_p->host,
875	+	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
876	+	"255.255.255.255" : source_p->sockhost,
877	+	comment);
878	+	ilog(LOG_TYPE_USER, "%s (%3u:%02u:%02u): %s!%s@%s %llu/%llu",
879	+	myctime(source_p->localClient->firsttime), (unsigned int)(on_for / 3600),
880	+	(unsigned int)((on_for % 3600)/60), (unsigned int)(on_for % 60),
881	+	source_p->name, source_p->username, source_p->host,
882	+	source_p->localClient->send.bytes>>10,
883	+	source_p->localClient->recv.bytes>>10);
884	+	}
885	+	else if (IsServer(source_p))
886	+	{
887	+	assert(Count.myserver > 0);
888	+	--Count.myserver;
889	+
890	+	assert(dlinkFind(&serv_list, source_p));
891	+	dlinkDelete(&source_p->localClient->lclient_node, &serv_list);
892	+	unset_chcap_usage_counts(source_p);
893		}
894
974	–	/* As soon as a client is known to be a server of some sort
975	–	* it has to be put on the serv_list, or SJOIN's to this new server
976	–	* from the connect burst will not be seen.
977	–	*/
978	–	if (IsServer(source_p) || IsConnecting(source_p) ||
979	–	IsHandshake(source_p))
980	–	{
981	–	if ((m = dlinkFindDelete(&serv_list, source_p)) != NULL)
982	–	{
983	–	free_dlink_node(m);
984	–	unset_chcap_usage_counts(source_p);
985	–	}
986	–
987	–	if (IsServer(source_p))
988	–	{
989	–	Count.myserver--;
990	–	if (ServerInfo.hub)
991	–	remove_lazylink_flags(source_p->localClient->serverMask);
992	–	else
993	–	uplink = NULL;
994	–	}
995	–	}
996	–
997	–	log_user_exit(source_p);
998	–
895		if (!IsDead(source_p))
896		{
897		if (IsServer(source_p))
#	Line 1022 | Line 918 | exit_client(struct Client *source_p, str
918		*/
919		close_connection(source_p);
920		}
921	+	else if (IsClient(source_p) && HasFlag(source_p->servptr, FLAGS_EOB))
922	+	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
923	+	"Client exiting at %s: %s (%s@%s) [%s]",
924	+	source_p->servptr->name, source_p->name,
925	+	source_p->username, source_p->host, comment);
926
927		if (IsServer(source_p))
928		{
#	Line 1031 | Line 932 | exit_client(struct Client *source_p, str
932		assert(source_p->serv != NULL && source_p->servptr != NULL);
933
934		if (ConfigServerHide.hide_servers)
935	<	/* set netsplit message to "*.net *.split" to still show
935	>	/*
936	>	* Set netsplit message to "*.net *.split" to still show
937		* that its a split, but hide the servers splitting
938		*/
939		strcpy(splitstr, "*.net *.split");
#	Line 1043 | Line 945 | exit_client(struct Client *source_p, str
945
946		if (source_p->servptr == &me)
947		{
948	<	sendto_realops_flags(UMODE_ALL, L_ALL,
948	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
949		"%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
950	<	source_p->name, (int)(CurrentTime - source_p->firsttime),
950	>	source_p->name, (int)(CurrentTime - source_p->localClient->firsttime),
951		source_p->localClient->send.bytes >> 10,
952		source_p->localClient->recv.bytes >> 10);
953	<	ilog(L_NOTICE, "%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
954	<	source_p->name, (int)(CurrentTime - source_p->firsttime),
953	>	ilog(LOG_TYPE_IRCD, "%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
954	>	source_p->name, (int)(CurrentTime - source_p->localClient->firsttime),
955		source_p->localClient->send.bytes >> 10,
956		source_p->localClient->recv.bytes >> 10);
957		}
958		}
959	<	else if (IsClient(source_p) && !IsKilled(source_p))
959	>	else if (IsClient(source_p) && !HasFlag(source_p, FLAGS_KILLED))
960		{
961	<	sendto_server(from->from, source_p, NULL, CAP_TS6, NOCAPS, NOFLAGS,
961	>	sendto_server(from->from, CAP_TS6, NOCAPS,
962		":%s QUIT :%s", ID(source_p), comment);
963	<	sendto_server(from->from, source_p, NULL, NOCAPS, CAP_TS6, NOFLAGS,
963	>	sendto_server(from->from, NOCAPS, CAP_TS6,
964		":%s QUIT :%s", source_p->name, comment);
965		}
966
#	Line 1117 | Line 1019 | dead_link_on_read(struct Client *client_
1019
1020		if (IsServer(client_p) || IsHandshake(client_p))
1021		{
1022	<	int connected = CurrentTime - client_p->firsttime;
1022	>	int connected = CurrentTime - client_p->localClient->firsttime;
1023
1024		if (error == 0)
1025		{
1026		/* Admins get the real IP */
1027	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1027	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1028		"Server %s closed the connection",
1029		get_client_name(client_p, SHOW_IP));
1030
1031		/* Opers get a masked IP */
1032	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1032	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1033		"Server %s closed the connection",
1034		get_client_name(client_p, MASK_IP));
1035
1036	<	ilog(L_NOTICE, "Server %s closed the connection",
1036	>	ilog(LOG_TYPE_IRCD, "Server %s closed the connection",
1037		get_client_name(client_p, SHOW_IP));
1038		}
1039		else
1040		{
1041	<	report_error(L_ADMIN, "Lost connection to %s: %d",
1041	>	report_error(L_ADMIN, "Lost connection to %s: %s",
1042		get_client_name(client_p, SHOW_IP), current_error);
1043	<	report_error(L_OPER, "Lost connection to %s: %d",
1043	>	report_error(L_OPER, "Lost connection to %s: %s",
1044		get_client_name(client_p, MASK_IP), current_error);
1045		}
1046
1047	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1047	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1048		"%s had been connected for %d day%s, %2d:%02d:%02d",
1049		client_p->name, connected/86400,
1050		(connected/86400 == 1) ? "" : "s",
#	Line 1154 | Line 1056 | dead_link_on_read(struct Client *client_
1056		strlcpy(errmsg, "Remote host closed the connection",
1057		sizeof(errmsg));
1058		else
1059	<	ircsprintf(errmsg, "Read error: %s",
1060	<	strerror(current_error));
1059	>	snprintf(errmsg, sizeof(errmsg), "Read error: %s",
1060	>	strerror(current_error));
1061
1062		exit_client(client_p, &me, errmsg);
1063		}
#	Line 1174 | Line 1076 | exit_aborted_clients(void)
1076
1077		if (target_p == NULL)
1078		{
1079	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1079	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1080		"Warning: null client on abort_list!");
1081		dlinkDelete(ptr, &abort_list);
1082		free_dlink_node(ptr);
#	Line 1195 | Line 1097 | exit_aborted_clients(void)
1097
1098		/*
1099		* accept processing, this adds a form of "caller ID" to ircd
1100	<	*
1100	>	*
1101		* If a client puts themselves into "caller ID only" mode,
1102	<	* only clients that match a client pointer they have put on
1102	>	* only clients that match a client pointer they have put on
1103		* the accept list will be allowed to message them.
1104		*
1105	<	* [ source.on_allow_list ] -> [ target1 ] -> [ target2 ]
1204	<	*
1205	<	* [target.allow_list] -> [ source1 ] -> [source2 ]
1206	<	*
1207	<	* i.e. a target will have a link list of source pointers it will allow
1208	<	* each source client then has a back pointer pointing back
1209	<	* to the client that has it on its accept list.
1210	<	* This allows for exit_one_client to remove these now bogus entries
1211	<	* from any client having an accept on them.
1105	>	* Diane Bruce, "Dianora" db@db.net
1106		*/
1107
1108	<	/* accept_message()
1109	<	*
1216	<	* inputs       - pointer to source client
1217	<	*              - pointer to target client
1218	<	* output       - 1 if accept this message 0 if not
1219	<	* side effects - See if source is on target's allow list
1220	<	*/
1221	<	int
1222	<	accept_message(struct Client *source, struct Client *target)
1108	>	void
1109	>	del_accept(struct split_nuh_item *accept_p, struct Client *client_p)
1110		{
1111	<	dlink_node *ptr;
1111	>	dlinkDelete(&accept_p->node, &client_p->localClient->acceptlist);
1112
1113	<	DLINK_FOREACH(ptr, target->allow_list.head)
1114	<	{
1115	<	struct Client *target_p = ptr->data;
1113	>	MyFree(accept_p->nickptr);
1114	>	MyFree(accept_p->userptr);
1115	>	MyFree(accept_p->hostptr);
1116	>	MyFree(accept_p);
1117	>	}
1118
1119	<	if (source == target_p)
1120	<	return (1);
1121	<	}
1119	>	struct split_nuh_item *
1120	>	find_accept(const char *nick, const char *user,
1121	>	const char *host, struct Client *client_p, int do_match)
1122	>	{
1123	>	dlink_node *ptr = NULL;
1124	>	/* XXX We wouldn't need that if match() would return 0 on match */
1125	>	int (*cmpfunc)(const char *, const char *) = do_match ? match : irccmp;
1126
1127	<	if (IsSoftCallerId(target))
1127	>	DLINK_FOREACH(ptr, client_p->localClient->acceptlist.head)
1128		{
1129	<	DLINK_FOREACH(ptr, target->channel.head)
1130	<	if (IsMember(source, ((struct Membership *)ptr->data)->chptr))
1131	<	return (1);
1129	>	struct split_nuh_item *accept_p = ptr->data;
1130	>
1131	>	if (!cmpfunc(accept_p->nickptr, nick) &&
1132	>	!cmpfunc(accept_p->userptr, user) &&
1133	>	!cmpfunc(accept_p->hostptr, host))
1134	>	return accept_p;
1135		}
1136
1137	<	return (0);
1137	>	return NULL;
1138		}
1139
1140	<	/* del_from_accept()
1245	<	*
1246	<	* inputs       - pointer to source client
1247	<	*              - pointer to target client
1248	<	* output       - NONE
1249	<	* side effects - Delete's source pointer to targets allow list
1140	>	/* accept_message()
1141		*
1142	<	* Walk through the target's accept list, remove if source is found,
1143	<	* Then walk through the source's on_accept_list remove target if found.
1142	>	* inputs       - pointer to source client
1143	>	*              - pointer to target client
1144	>	* output       - 1 if accept this message 0 if not
1145	>	* side effects - See if source is on target's allow list
1146		*/
1147	<	void
1148	<	del_from_accept(struct Client *source, struct Client *target)
1147	>	int
1148	>	accept_message(struct Client *source,
1149	>	struct Client *target)
1150		{
1151	<	dlink_node *ptr;
1258	<	dlink_node *ptr2;
1259	<	dlink_node *next_ptr;
1260	<	dlink_node *next_ptr2;
1261	<	struct Client *target_p;
1151	>	dlink_node *ptr = NULL;
1152
1153	<	DLINK_FOREACH_SAFE(ptr, next_ptr, target->allow_list.head)
1154	<	{
1155	<	target_p = ptr->data;
1153	>	if (source == target || find_accept(source->name, source->username,
1154	>	source->host, target, 1))
1155	>	return 1;
1156
1157	<	if (source == target_p)
1158	<	{
1159	<	dlinkDelete(ptr, &target->allow_list);
1160	<	free_dlink_node(ptr);
1271	<
1272	<	DLINK_FOREACH_SAFE(ptr2, next_ptr2, source->on_allow_list.head)
1273	<	{
1274	<	target_p = ptr2->data;
1157	>	if (HasUMode(target, UMODE_SOFTCALLERID))
1158	>	DLINK_FOREACH(ptr, target->channel.head)
1159	>	if (IsMember(source, ((struct Membership *)ptr->data)->chptr))
1160	>	return 1;
1161
1162	<	if (target == target_p)
1277	<	{
1278	<	dlinkDelete(ptr2, &source->on_allow_list);
1279	<	free_dlink_node(ptr2);
1280	<	}
1281	<	}
1282	<	}
1283	<	}
1162	>	return 0;
1163		}
1164
1165		/* del_all_accepts()
1166		*
1167	<	* inputs       - pointer to exiting client
1168	<	* output       - NONE
1169	<	* side effects - Walk through given clients allow_list and on_allow_list
1291	<	*                remove all references to this client
1167	>	* inputs       - pointer to exiting client
1168	>	* output       - NONE
1169	>	* side effects - Walk through given clients acceptlist and remove all entries
1170		*/
1171		void
1172		del_all_accepts(struct Client *client_p)
1173		{
1174	<	dlink_node *ptr, *next_ptr;
1297	<
1298	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->allow_list.head)
1299	<	del_from_accept(ptr->data, client_p);
1174	>	dlink_node *ptr = NULL, *next_ptr = NULL;
1175
1176	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->on_allow_list.head)
1177	<	del_from_accept(client_p, ptr->data);
1176	>	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->acceptlist.head)
1177	>	del_accept(ptr->data, client_p);
1178		}
1179
1180	<	/* del_all_their_accepts()
1181	<	*
1307	<	* inputs       - pointer to exiting client
1308	<	* output       - NONE
1309	<	* side effects - Walk through given clients on_allow_list
1310	<	*                remove all references to this client,
1311	<	*                allow this client to keep their own allow_list
1312	<	*/
1313	<	void
1314	<	del_all_their_accepts(struct Client *client_p)
1180	>	unsigned int
1181	>	idle_time_get(const struct Client *source_p, const struct Client *target_p)
1182		{
1183	<	dlink_node *ptr, *next_ptr;
1184	<
1185	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->on_allow_list.head)
1186	<	del_from_accept(client_p, ptr->data);
1320	<	}
1321	<
1322	<	/* set_initial_nick()
1323	<	*
1324	<	* inputs
1325	<	* output
1326	<	* side effects -
1327	<	*
1328	<	* This function is only called to set up an initially registering
1329	<	* client.
1330	<	*/
1331	<	void
1332	<	set_initial_nick(struct Client *client_p, struct Client *source_p,
1333	<	const char *nick)
1334	<	{
1335	<	char buf[USERLEN + 1];
1336	<
1337	<	/* Client setting NICK the first time */
1338	<
1339	<	/* This had to be copied here to avoid problems.. */
1340	<	source_p->tsinfo = CurrentTime;
1341	<	source_p->localClient->registration &= ~REG_NEED_NICK;
1342	<
1343	<	if (source_p->name[0])
1344	<	hash_del_client(source_p);
1345	<
1346	<	strlcpy(source_p->name, nick, sizeof(source_p->name));
1347	<	hash_add_client(source_p);
1348	<
1349	<	/* fd_desc is long enough */
1350	<	fd_note(&client_p->localClient->fd, "Nick: %s", nick);
1351	<
1352	<	/* They have the nick they want now.. */
1353	<	client_p->llname[0] = '\0';
1183	>	unsigned int idle = 0;
1184	>	unsigned int min_idle = 0;
1185	>	unsigned int max_idle = 0;
1186	>	const struct ClassItem *class = get_class_ptr(&target_p->localClient->confs);
1187
1188	<	if (!source_p->localClient->registration)
1189	<	{
1190	<	strlcpy(buf, source_p->username, sizeof(buf));
1188	>	if (!(class->flags & CLASS_FLAGS_FAKE_IDLE) || target_p == source_p)
1189	>	return CurrentTime - target_p->localClient->last_privmsg;
1190	>	if (HasUMode(source_p, UMODE_OPER) &&
1191	>	!(class->flags & CLASS_FLAGS_HIDE_IDLE_FROM_OPERS))
1192	>	return CurrentTime - target_p->localClient->last_privmsg;
1193
1194	<	/*
1195	<	* USER already received, now we have NICK.
1361	<	* *NOTE* For servers "NICK" *must* precede the
1362	<	* user message (giving USER before NICK is possible
1363	<	* only for local client connection!). register_user
1364	<	* may reject the client and call exit_client for it
1365	<	* --must test this and exit m_nick too!!!
1366	<	*/
1367	<	register_local_user(client_p, source_p, nick, buf);
1368	<	}
1369	<	}
1194	>	min_idle = class->min_idle;
1195	>	max_idle = class->max_idle;
1196
1197	<	/* change_local_nick()
1198	<	*
1373	<	* inputs       - pointer to server
1374	<	*              - pointer to client
1375	<	*              - nick
1376	<	* output       -
1377	<	* side effects - changes nick of a LOCAL user
1378	<	*/
1379	<	void
1380	<	change_local_nick(struct Client *client_p, struct Client *source_p, const char *nick)
1381	<	{
1382	<	/*
1383	<	** Client just changing his/her nick. If he/she is
1384	<	** on a channel, send note of change to all clients
1385	<	** on that channel. Propagate notice to other servers.
1386	<	*/
1387	<	if ((source_p->localClient->last_nick_change +
1388	<	ConfigFileEntry.max_nick_time) < CurrentTime)
1389	<	source_p->localClient->number_of_nick_changes = 0;
1390	<	source_p->localClient->last_nick_change = CurrentTime;
1391	<	source_p->localClient->number_of_nick_changes++;
1392	<
1393	<	if ((ConfigFileEntry.anti_nick_flood &&
1394	<	(source_p->localClient->number_of_nick_changes
1395	<	<= ConfigFileEntry.max_nick_changes)) ||
1396	<	!ConfigFileEntry.anti_nick_flood ||
1397	<	(IsOper(source_p) && ConfigFileEntry.no_oper_flood))
1398	<	{
1399	<	if (irccmp(source_p->name, nick))
1400	<	source_p->tsinfo = CurrentTime;
1197	>	if (min_idle == max_idle)
1198	>	return min_idle;
1199
1200	<	/* XXX - the format of this notice should eventually be changed
1201	<	* to either %s[%s@%s], or even better would be get_client_name() -bill
1404	<	*/
1405	<	sendto_realops_flags(UMODE_NCHANGE, L_ALL, "Nick change: From %s to %s [%s@%s]",
1406	<	source_p->name, nick, source_p->username, source_p->host);
1407	<	sendto_common_channels_local(source_p, 1, ":%s!%s@%s NICK :%s",
1408	<	source_p->name, source_p->username,
1409	<	source_p->host, nick);
1410	<
1411	<	add_history(source_p, 1);
1412	<
1413	<	/* Only hubs care about lazy link nicks not being sent on yet
1414	<	* lazylink leafs/leafs always send their nicks up to hub,
1415	<	* hence must always propagate nick changes.
1416	<	* hubs might not propagate a nick change, if the leaf
1417	<	* does not know about that client yet.
1418	<	*/
1419	<	sendto_server(client_p, source_p, NULL, CAP_TS6, NOCAPS, NOFLAGS,
1420	<	":%s NICK %s :%lu",
1421	<	ID(source_p), nick, (unsigned long)source_p->tsinfo);
1422	<	sendto_server(client_p, source_p, NULL, NOCAPS, CAP_TS6, NOFLAGS,
1423	<	":%s NICK %s :%lu",
1424	<	source_p->name, nick, (unsigned long)source_p->tsinfo);
1425	<	}
1200	>	if (class->flags & CLASS_FLAGS_RANDOM_IDLE)
1201	>	idle = genrand_int32();
1202		else
1203	<	{
1428	<	sendto_one(source_p, form_str(ERR_NICKTOOFAST),
1429	<	me.name, source_p->name, source_p->name,
1430	<	nick, ConfigFileEntry.max_nick_time);
1431	<	return;
1432	<	}
1203	>	idle = CurrentTime - target_p->localClient->last_privmsg;
1204
1205	<	/* Finally, add to hash */
1206	<	if (source_p->name[0])
1207	<	hash_del_client(source_p);
1208	<
1438	<	strcpy(source_p->name, nick);
1439	<	hash_add_client(source_p);
1205	>	if (max_idle == 0)
1206	>	idle = 0;
1207	>	else
1208	>	idle %= max_idle;
1209
1210	<	/* Make sure everyone that has this client on its accept list
1211	<	* loses that reference.
1443	<	*/
1444	<	del_all_their_accepts(source_p);
1210	>	if (idle < min_idle)
1211	>	idle = min_idle + (idle % (max_idle - min_idle));
1212
1213	<	/* fd_desc is long enough */
1447	<	fd_note(&client_p->localClient->fd, "Nick: %s", nick);
1213	>	return idle;
1214		}

Diff Legend

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