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 849 by db, Mon Feb 19 19:41:59 2007 UTC vs.
ircd-hybrid/trunk/src/client.c (file contents), Revision 2229 by michael, Thu Jun 13 20:10:27 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	+	MyFree(client_p->certfp);
168
169		if (MyConnect(client_p))
170		{
171		assert(client_p->localClient->invited.head == NULL);
172		assert(dlink_list_length(&client_p->localClient->invited) == 0);
173	+	assert(dlink_list_length(&client_p->localClient->watches) == 0);
174		assert(IsClosing(client_p) && IsDead(client_p));
175
176		MyFree(client_p->localClient->response);
#	Line 178 | Line 190 | free_client(struct Client *client_p)
190		dbuf_clear(&client_p->localClient->buf_recvq);
191		dbuf_clear(&client_p->localClient->buf_sendq);
192
193	<	BlockHeapFree(lclient_heap, client_p->localClient);
193	>	mp_pool_release(client_p->localClient);
194		}
195
196	<	BlockHeapFree(client_heap, client_p);
196	>	mp_pool_release(client_p);
197		}
198
199		/*
#	Line 228 | Line 240 | static void
240		check_pings_list(dlink_list *list)
241		{
242		char scratch[32];        /* way too generous but... */
243	<	struct Client *client_p; /* current local client_p being examined */
244	<	int ping, pingwarn;      /* ping time value from client */
233	<	dlink_node *ptr, *next_ptr;
243	>	int ping = 0;      /* ping time value from client */
244	>	dlink_node *ptr = NULL, *next_ptr = NULL;
245
246		DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
247		{
248	<	client_p = ptr->data;
248	>	struct Client *client_p = ptr->data;
249
250		/*
251		** Note: No need to notify opers here. It's
#	Line 246 | Line 257 | check_pings_list(dlink_list *list)
257		continue;
258		}
259
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	–
260		if (!IsRegistered(client_p))
261	<	ping = CONNECTTIMEOUT, pingwarn = 0;
261	>	ping = CONNECTTIMEOUT;
262		else
263	<	ping = get_client_ping(client_p, &pingwarn);
263	>	ping = get_client_ping(&client_p->localClient->confs);
264
265	<	if (ping < CurrentTime - client_p->lasttime)
265	>	if (ping < CurrentTime - client_p->localClient->lasttime)
266		{
267		if (!IsPingSent(client_p))
268		{
269	<	/*
270	<	* if we havent PINGed the connection and we havent
271	<	* heard from it in a while, PING it to make sure
272	<	* it is still alive.
273	<	*/
274	<	SetPingSent(client_p);
275	<	ClearPingWarning(client_p);
276	<	client_p->lasttime = CurrentTime - ping;
299	<	sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
269	>	/*
270	>	* if we havent PINGed the connection and we havent
271	>	* heard from it in a while, PING it to make sure
272	>	* it is still alive.
273	>	*/
274	>	SetPingSent(client_p);
275	>	client_p->localClient->lasttime = CurrentTime - ping;
276	>	sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
277		}
278		else
279		{
280	<	if (CurrentTime - client_p->lasttime >= 2 * ping)
280	>	if (CurrentTime - client_p->localClient->lasttime >= 2 * ping)
281		{
282		/*
283		* If the client/server hasn't talked to us in 2*ping seconds
284		* and it has a ping time, then close its connection.
285		*/
286		if (IsServer(client_p) || IsHandshake(client_p))
287	<	{
288	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
289	<	"No response from %s, closing link",
290	<	get_client_name(client_p, HIDE_IP));
291	<	sendto_realops_flags(UMODE_ALL, L_OPER,
292	<	"No response from %s, closing link",
293	<	get_client_name(client_p, MASK_IP));
294	<	ilog(L_NOTICE, "No response from %s, closing link",
295	<	get_client_name(client_p, HIDE_IP));
296	<	}
287	>	{
288	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
289	>	"No response from %s, closing link",
290	>	get_client_name(client_p, HIDE_IP));
291	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
292	>	"No response from %s, closing link",
293	>	get_client_name(client_p, MASK_IP));
294	>	ilog(LOG_TYPE_IRCD, "No response from %s, closing link",
295	>	get_client_name(client_p, HIDE_IP));
296	>	}
297
298	<	ircsprintf(scratch, "Ping timeout: %d seconds",
299	<	(int)(CurrentTime - client_p->lasttime));
298	>	snprintf(scratch, sizeof(scratch), "Ping timeout: %d seconds",
299	>	(int)(CurrentTime - client_p->localClient->lasttime));
300		exit_client(client_p, &me, scratch);
301		}
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	–	}
302		}
303		}
304		}
#	Line 360 | Line 319 | check_unknowns_list(void)
319		{
320		struct Client *client_p = ptr->data;
321
363	–	if (client_p->localClient->reject_delay > 0)
364	–	{
365	–	if (client_p->localClient->reject_delay <= CurrentTime)
366	–	exit_client(client_p, &me, "Rejected");
367	–	continue;
368	–	}
369	–
322		/*
323		* Check UNKNOWN connections - if they have been in this state
324		* for > 30s, close them.
325		*/
326	<	if (IsAuthFinished(client_p) && (CurrentTime - client_p->firsttime) > 30)
326	>	if (IsAuthFinished(client_p) && (CurrentTime - client_p->localClient->firsttime) > 30)
327		exit_client(client_p, &me, "Registration timed out");
328		}
329		}
#	Line 387 | Line 339 | void
339		check_conf_klines(void)
340		{
341		struct Client *client_p = NULL;       /* current local client_p being examined */
342	<	struct AccessItem *aconf = NULL;
391	<	struct ConfItem *conf = NULL;
342	>	struct MaskItem *conf = NULL;
343		dlink_node *ptr, *next_ptr;
344
345		DLINK_FOREACH_SAFE(ptr, next_ptr, local_client_list.head)
#	Line 400 | Line 351 | check_conf_klines(void)
351		if (IsDead(client_p) || !IsClient(client_p))
352		continue;
353
354	<	/* if there is a returned struct ConfItem then kill it */
404	<	if ((aconf = find_dline_conf(&client_p->localClient->ip,
354	>	if ((conf = find_dline_conf(&client_p->localClient->ip,
355		client_p->localClient->aftype)) != NULL)
356		{
357	<	if (aconf->status & CONF_EXEMPTDLINE)
358	<	continue;
357	>	if (conf->type == CONF_EXEMPT)
358	>	continue;
359
410	–	conf = unmap_conf_item(aconf);
360		ban_them(client_p, conf);
361		continue; /* and go examine next fd/client_p */
362		}
363
364	<	if (ConfigFileEntry.glines && (aconf = find_gline(client_p)))
364	>	if (ConfigFileEntry.glines && (conf = find_gline(client_p)))
365		{
366		if (IsExemptKline(client_p) ||
367		IsExemptGline(client_p))
368		{
369	<	sendto_realops_flags(UMODE_ALL, L_ALL,
369	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
370		"GLINE over-ruled for %s, client is %sline_exempt",
371		get_client_name(client_p, HIDE_IP), IsExemptKline(client_p) ? "k" : "g");
372		continue;
373		}
374
426	–	conf = unmap_conf_item(aconf);
375		ban_them(client_p, conf);
376		/* and go examine next fd/client_p */
377		continue;
378		}
379
380	<	if ((aconf = find_kill(client_p)) != NULL)
380	>	if ((conf = find_kill(client_p)) != NULL)
381		{
434	–
435	–	/* if there is a returned struct AccessItem.. then kill it */
382		if (IsExemptKline(client_p))
383		{
384	<	sendto_realops_flags(UMODE_ALL, L_ALL,
384	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
385		"KLINE over-ruled for %s, client is kline_exempt",
386		get_client_name(client_p, HIDE_IP));
387		continue;
388		}
389
444	–	conf = unmap_conf_item(aconf);
390		ban_them(client_p, conf);
391		continue;
392		}
393
394	<	/* if there is a returned struct MatchItem then kill it */
395	<	if ((conf = find_matching_name_conf(XLINE_TYPE,  client_p->info,
451	<	NULL, NULL, 0)) != NULL ||
452	<	(conf = find_matching_name_conf(RXLINE_TYPE, client_p->info,
453	<	NULL, NULL, 0)) != NULL)
394	>	if ((conf = find_matching_name_conf(CONF_XLINE,  client_p->info,
395	>	NULL, NULL, 0)))
396		{
397		ban_them(client_p, conf);
398		continue;
#	Line 462 | Line 404 | check_conf_klines(void)
404		{
405		client_p = ptr->data;
406
407	<	if ((aconf = find_dline_conf(&client_p->localClient->ip,
408	<	client_p->localClient->aftype)))
407	>	if ((conf = find_dline_conf(&client_p->localClient->ip,
408	>	client_p->localClient->aftype)))
409		{
410	<	if (aconf->status & CONF_EXEMPTDLINE)
410	>	if (conf->type == CONF_EXEMPT)
411		continue;
412
413		exit_client(client_p, &me, "D-lined");
#	Line 477 | Line 419 | check_conf_klines(void)
419		* ban_them
420		*
421		* inputs       - pointer to client to ban
422	<	*              - pointer to ConfItem
422	>	*              - pointer to MaskItem
423		* output       - NONE
424		* side effects - given client_p is banned
425		*/
426		static void
427	<	ban_them(struct Client *client_p, struct ConfItem *conf)
427	>	ban_them(struct Client *client_p, struct MaskItem *conf)
428		{
429	<	const char *user_reason = NULL;       /* What is sent to user */
488	<	const char *channel_reason = NULL;    /* What is sent to channel */
489	<	struct AccessItem *aconf = NULL;
490	<	struct MatchItem *xconf = NULL;
429	>	const char *user_reason = NULL;  /* What is sent to user */
430		const char *type_string = NULL;
431		const char dline_string[] = "D-line";
432		const char kline_string[] = "K-line";
#	Line 496 | Line 435 | ban_them(struct Client *client_p, struct
435
436		switch (conf->type)
437		{
438	<	case RKLINE_TYPE:
500	<	case KLINE_TYPE:
438	>	case CONF_KLINE:
439		type_string = kline_string;
502	–	aconf = map_to_conf(conf);
440		break;
441	<	case DLINE_TYPE:
441	>	case CONF_DLINE:
442		type_string = dline_string;
506	–	aconf = map_to_conf(conf);
443		break;
444	<	case GLINE_TYPE:
444	>	case CONF_GLINE:
445		type_string = gline_string;
510	–	aconf = map_to_conf(conf);
446		break;
447	<	case RXLINE_TYPE:
513	<	case XLINE_TYPE:
447	>	case CONF_XLINE:
448		type_string = xline_string;
449	<	xconf = map_to_conf(conf);
516	<	++xconf->count;
449	>	++conf->count;
450		break;
451		default:
452		assert(0);
453		break;
454		}
455
456	<	if (ConfigFileEntry.kline_with_reason)
524	<	{
525	<	if (aconf != NULL)
526	<	user_reason = aconf->reason ? aconf->reason : type_string;
527	<	if (xconf != NULL)
528	<	user_reason = xconf->reason ? xconf->reason : type_string;
529	<	}
530	<	else
531	<	user_reason = type_string;
532	<
533	<	if (ConfigFileEntry.kline_reason != NULL)
534	<	channel_reason = ConfigFileEntry.kline_reason;
535	<	else
536	<	channel_reason = user_reason;
456	>	user_reason = conf->reason ? conf->reason : type_string;
457
458	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s active for %s",
458	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s active for %s",
459		type_string, get_client_name(client_p, HIDE_IP));
460
461		if (IsClient(client_p))
462		sendto_one(client_p, form_str(ERR_YOUREBANNEDCREEP),
463	<	me.name, client_p->name, user_reason);
463	>	me.name, client_p->name, user_reason);
464
465	<	exit_client(client_p, &me, channel_reason);
465	>	exit_client(client_p, &me, user_reason);
466		}
467
468		/* update_client_exit_stats()
#	Line 554 | Line 474 | ban_them(struct Client *client_p, struct
474		static void
475		update_client_exit_stats(struct Client *client_p)
476		{
477	<	if (IsServer(client_p))
558	<	{
559	<	sendto_realops_flags(UMODE_EXTERNAL, L_ALL,
560	<	"Server %s split from %s",
561	<	client_p->name, client_p->servptr->name);
562	<	}
563	<	else if (IsClient(client_p))
477	>	if (IsClient(client_p))
478		{
479	+	assert(Count.total > 0);
480		--Count.total;
481	<	if (IsOper(client_p))
481	>	if (HasUMode(client_p, UMODE_OPER))
482		--Count.oper;
483	<	if (IsInvisible(client_p))
483	>	if (HasUMode(client_p, UMODE_INVISIBLE))
484		--Count.invisi;
485		}
486	+	else if (IsServer(client_p))
487	+	sendto_realops_flags(UMODE_EXTERNAL, L_ALL, SEND_NOTICE,
488	+	"Server %s split from %s",
489	+	client_p->name, client_p->servptr->name);
490
491		if (splitchecking && !splitmode)
492		check_splitmode(NULL);
#	Line 579 | Line 498 | update_client_exit_stats(struct Client *
498		* output       - return client pointer
499		* side effects - find person by (nick)name
500		*/
582	–	/* XXX - ugly wrapper */
501		struct Client *
502		find_person(const struct Client *client_p, const char *name)
503		{
504	<	struct Client *c2ptr;
504	>	struct Client *c2ptr = NULL;
505
506		if (IsDigit(*name))
507		{
508		if ((c2ptr = hash_find_id(name)) != NULL)
509		{
510		/* invisible users shall not be found by UID guessing */
511	<	if (IsInvisible(c2ptr) && !IsServer(client_p))
512	<	c2ptr = NULL;
511	>	if (HasUMode(c2ptr, UMODE_INVISIBLE))
512	>	if (!IsServer(client_p) && !HasFlag(client_p, FLAGS_SERVICE))
513	>	c2ptr = NULL;
514		}
515		}
516		else
517	<	c2ptr = find_client(name);
517	>	c2ptr = hash_find_client(name);
518
519		return ((c2ptr != NULL && IsClient(c2ptr)) ? c2ptr : NULL);
520		}
#	Line 615 | Line 534 | find_chasing(struct Client *client_p, st
534		*chasing = 0;
535
536		if (who)
537	<	return(who);
537	>	return who;
538
539		if (IsDigit(*user))
540	<	return(NULL);
540	>	return NULL;
541
542		if ((who = get_history(user,
543	<	(time_t)ConfigFileEntry.kill_chase_time_limit))
544	<	== NULL)
543	>	(time_t)ConfigFileEntry.kill_chase_time_limit))
544	>	== NULL)
545		{
546		sendto_one(source_p, form_str(ERR_NOSUCHNICK),
547		me.name, source_p->name, user);
548	<	return(NULL);
548	>	return NULL;
549		}
550
551		if (chasing)
552		*chasing = 1;
553
554	<	return(who);
554	>	return who;
555		}
556
557		/*
#	Line 654 | Line 573 | find_chasing(struct Client *client_p, st
573		*        to modify what it points!!!
574		*/
575		const char *
576	<	get_client_name(struct Client *client, int showip)
576	>	get_client_name(const struct Client *client, enum addr_mask_type type)
577		{
578		static char nbuf[HOSTLEN * 2 + USERLEN + 5];
579
580		assert(client != NULL);
581
582	<	if (irccmp(client->name, client->host) == 0)
583	<	return(client->name);
582	>	if (!MyConnect(client))
583	>	return client->name;
584
585	<	if (ConfigServerHide.hide_server_ips)
586	<	if (IsServer(client) || IsConnecting(client) || IsHandshake(client))
587	<	showip = MASK_IP;
585	>	if (IsServer(client) || IsConnecting(client) || IsHandshake(client))
586	>	{
587	>	if (!irccmp(client->name, client->host))
588	>	return client->name;
589	>	else if (ConfigServerHide.hide_server_ips)
590	>	type = MASK_IP;
591	>	}
592
593		if (ConfigFileEntry.hide_spoof_ips)
594	<	if (showip == SHOW_IP && IsIPSpoof(client))
595	<	showip = MASK_IP;
594	>	if (type == SHOW_IP && IsIPSpoof(client))
595	>	type = MASK_IP;
596
597		/* And finally, let's get the host information, ip or name */
598	<	switch (showip)
598	>	switch (type)
599		{
600		case SHOW_IP:
601	<	if (MyConnect(client))
602	<	{
603	<	ircsprintf(nbuf, "%s[%s@%s]", client->name, client->username,
604	<	client->sockhost);
682	<	break;
683	<	}
601	>	snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
602	>	client->name,
603	>	client->username, client->sockhost);
604	>	break;
605		case MASK_IP:
606	<	ircsprintf(nbuf, "%s[%s@255.255.255.255]", client->name,
607	<	client->username);
606	>	if (client->localClient->aftype == AF_INET)
607	>	snprintf(nbuf, sizeof(nbuf), "%s[%s@255.255.255.255]",
608	>	client->name, client->username);
609	>	else
610	>	snprintf(nbuf, sizeof(nbuf), "%s[%s@ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]",
611	>	client->name, client->username);
612		break;
613		default:
614	<	ircsprintf(nbuf, "%s[%s@%s]", client->name, client->username,
615	<	client->host);
614	>	snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
615	>	client->name,
616	>	client->username, client->host);
617		}
618
619	<	return(nbuf);
619	>	return nbuf;
620		}
621
622		void
623		free_exited_clients(void)
624		{
625	<	dlink_node *ptr, *next;
700	<	struct Client *target_p;
625	>	dlink_node *ptr = NULL, *next = NULL;
626
627		DLINK_FOREACH_SAFE(ptr, next, dead_list.head)
628		{
629	<	target_p = ptr->data;
705	<
706	<	if (ptr->data == NULL)
707	<	{
708	<	sendto_realops_flags(UMODE_ALL, L_ALL,
709	<	"Warning: null client on dead_list!");
710	<	dlinkDelete(ptr, &dead_list);
711	<	free_dlink_node(ptr);
712	<	continue;
713	<	}
714	<
715	<	free_client(target_p);
629	>	free_client(ptr->data);
630		dlinkDelete(ptr, &dead_list);
631		free_dlink_node(ptr);
632		}
#	Line 731 | Line 645 | exit_one_client(struct Client *source_p,
645
646		assert(!IsMe(source_p));
647
648	<	if (IsServer(source_p))
735	<	{
736	<	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->servers);
737	<
738	<	if ((lp = dlinkFindDelete(&global_serv_list, source_p)) != NULL)
739	<	free_dlink_node(lp);
740	<
741	<	if (!MyConnect(source_p))
742	<	{
743	<	source_p->from->serv->dep_servers--;
744	<	assert(source_p->from->serv->dep_servers > 0);
745	<	}
746	<	}
747	<	else if (IsClient(source_p))
648	>	if (IsClient(source_p))
649		{
650		if (source_p->servptr->serv != NULL)
651	<	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->users);
651	>	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->client_list);
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, ":%s!%s@%s QUIT :%s",
653	>	/*
654	>	* If a person is on a channel, send a QUIT notice
655	>	* to every client (person) on the same channel (so
656	>	* that the client can show the "**signoff" message).
657	>	* (Note: The notice is to the local clients *only*)
658	>	*/
659	>	sendto_common_channels_local(source_p, 0, 0, ":%s!%s@%s QUIT :%s",
660		source_p->name, source_p->username,
661		source_p->host, quitmsg);
662		DLINK_FOREACH_SAFE(lp, next_lp, source_p->channel.head)
663		remove_user_from_channel(lp->data);
664
763	–	/* Clean up allow lists */
764	–	del_all_accepts(source_p);
665		add_history(source_p, 0);
666		off_history(source_p);
667
668	<	if (!MyConnect(source_p))
669	<	{
670	<	source_p->from->serv->dep_users--;
771	<	assert(source_p->from->serv->dep_users >= 0);
772	<	}
773	<	else
668	>	watch_check_hash(source_p, RPL_LOGOFF);
669	>
670	>	if (MyConnect(source_p))
671		{
672		/* Clean up invitefield */
673		DLINK_FOREACH_SAFE(lp, next_lp, source_p->localClient->invited.head)
674		del_invite(lp->data, source_p);
675	+
676	+	del_all_accepts(source_p);
677		}
678		}
679	+	else if (IsServer(source_p))
680	+	{
681	+	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->server_list);
682	+
683	+	if ((lp = dlinkFindDelete(&global_serv_list, source_p)) != NULL)
684	+	free_dlink_node(lp);
685	+	}
686
687		/* Remove source_p from the client lists */
688		if (HasID(source_p))
#	Line 816 | Line 722 | exit_one_client(struct Client *source_p,
722		static void
723		recurse_send_quits(struct Client *original_source_p, struct Client *source_p,
724		struct Client *from, struct Client *to, const char *comment,
725	<	const char *splitstr, const char *myname)
725	>	const char *splitstr)
726		{
727		dlink_node *ptr, *next;
728		struct Client *target_p;
823	–	int hidden = match(myname, source_p->name);
729
730		assert(to != source_p);  /* should be already removed from serv_list */
731
732		/* If this server can handle quit storm (QS) removal
733		* of dependents, just send the SQUIT
829	–	*
830	–	* Always check *all* dependent servers if some of them are
831	–	* hidden behind fakename. If so, send out the QUITs -adx
734		*/
735	<	if (hidden || !IsCapable(to, CAP_QS))
736	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->users.head)
735	>	if (!IsCapable(to, CAP_QS))
736	>	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->client_list.head)
737		{
738		target_p = ptr->data;
739		sendto_one(to, ":%s QUIT :%s", target_p->name, splitstr);
740		}
741
742	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->servers.head)
742	>	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->server_list.head)
743		recurse_send_quits(original_source_p, ptr->data, from, to,
744	<	comment, splitstr, myname);
744	>	comment, splitstr);
745
746	<	if (!hidden && ((source_p == original_source_p && to != from) ||
747	<	!IsCapable(to, CAP_QS)))
746	>	if ((source_p == original_source_p && to != from) ||
747	>	!IsCapable(to, CAP_QS))
748		{
749		/* don't use a prefix here - we have to be 100% sure the message
750		* will be accepted without Unknown prefix etc.. */
#	Line 861 | Line 763 | recurse_remove_clients(struct Client *so
763		{
764		dlink_node *ptr, *next;
765
766	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->users.head)
766	>	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->client_list.head)
767		exit_one_client(ptr->data, quitmsg);
768
769	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->servers.head)
769	>	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->server_list.head)
770		{
771		recurse_remove_clients(ptr->data, quitmsg);
772		exit_one_client(ptr->data, quitmsg);
773		}
872	–
873	–	assert(source_p->serv->dep_servers == 1);
874	–	assert(source_p->serv->dep_users == 0);
774		}
775
776		/*
#	Line 883 | Line 782 | static void
782		remove_dependents(struct Client *source_p, struct Client *from,
783		const char *comment, const char *splitstr)
784		{
785	<	struct Client *to;
887	<	struct ConfItem *conf;
888	<	static char myname[HOSTLEN+1];
889	<	dlink_node *ptr;
785	>	dlink_node *ptr = NULL;
786
787		DLINK_FOREACH(ptr, serv_list.head)
788	<	{
789	<	to = ptr->data;
894	<
895	<	if ((conf = to->serv->sconf) != NULL)
896	<	strlcpy(myname, my_name_for_link(conf), sizeof(myname));
897	<	else
898	<	strlcpy(myname, me.name, sizeof(myname));
899	<	recurse_send_quits(source_p, source_p, from, to,
900	<	comment, splitstr, myname);
901	<	}
788	>	recurse_send_quits(source_p, source_p, from, ptr->data,
789	>	comment, splitstr);
790
791		recurse_remove_clients(source_p, splitstr);
792		}
#	Line 908 | Line 796 | remove_dependents(struct Client *source_
796		* this on any struct Client, regardless of its state.
797		*
798		* Note, you shouldn't exit remote _users_ without first doing
799	<	* SetKilled and propagating a kill or similar message. However,
800	<	* it is perfectly correct to call exit_client to force a _server_
799	>	* AddFlag(x, FLAGS_KILLED) and propagating a kill or similar message.
800	>	* However, it is perfectly correct to call exit_client to force a _server_
801		* quit (either local or remote one).
802		*
803		* inputs:       - a client pointer that is going to be exited
#	Line 924 | Line 812 | remove_dependents(struct Client *source_
812		void
813		exit_client(struct Client *source_p, struct Client *from, const char *comment)
814		{
815	<	dlink_node *m;
815	>	dlink_node *m = NULL;
816
817		if (MyConnect(source_p))
818		{
#	Line 939 | Line 827 | exit_client(struct Client *source_p, str
827		if (IsIpHash(source_p))
828		remove_one_ip(&source_p->localClient->ip);
829
830	<	delete_auth(source_p);
830	>	delete_auth(&source_p->localClient->auth);
831
832	<	/* This source_p could have status of one of STAT_UNKNOWN, STAT_CONNECTING
832	>	/*
833	>	* This source_p could have status of one of STAT_UNKNOWN, STAT_CONNECTING
834		* STAT_HANDSHAKE or STAT_UNKNOWN
835		* all of which are lumped together into unknown_list
836		*
#	Line 949 | Line 838 | exit_client(struct Client *source_p, str
838		*/
839		if (!IsRegistered(source_p))
840		{
841	<	if ((m = dlinkFindDelete(&unknown_list, source_p)) != NULL)
842	<	free_dlink_node(m);
841	>	assert(dlinkFind(&unknown_list, source_p));
842	>
843	>	dlinkDelete(&source_p->localClient->lclient_node, &unknown_list);
844		}
845		else if (IsClient(source_p))
846		{
847	+	time_t on_for = CurrentTime - source_p->localClient->firsttime;
848	+	assert(Count.local > 0);
849		Count.local--;
850
851	<	if (IsOper(source_p))
960	<	{
851	>	if (HasUMode(source_p, UMODE_OPER))
852		if ((m = dlinkFindDelete(&oper_list, source_p)) != NULL)
853		free_dlink_node(m);
963	–	}
854
855	+	assert(dlinkFind(&local_client_list, source_p));
856		dlinkDelete(&source_p->localClient->lclient_node, &local_client_list);
857	+
858		if (source_p->localClient->list_task != NULL)
859		free_list_task(source_p->localClient->list_task, source_p);
860
861	<	sendto_realops_flags(UMODE_CCONN, L_ALL, "Client exiting: %s (%s@%s) [%s] [%s]",
862	<	source_p->name, source_p->username, source_p->host, comment,
863	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
972	<	"255.255.255.255" : source_p->sockhost);
973	<	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL, "CLIEXIT: %s %s %s %s %s",
861	>	watch_del_watch_list(source_p);
862	>	sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
863	>	"Client exiting: %s (%s@%s) [%s] [%s]",
864		source_p->name, source_p->username, source_p->host, comment,
865		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
866		"255.255.255.255" : source_p->sockhost);
867	+	ilog(LOG_TYPE_USER, "%s (%3u:%02u:%02u): %s!%s@%s %llu/%llu",
868	+	myctime(source_p->localClient->firsttime), (unsigned int)(on_for / 3600),
869	+	(unsigned int)((on_for % 3600)/60), (unsigned int)(on_for % 60),
870	+	source_p->name, source_p->username, source_p->host,
871	+	source_p->localClient->send.bytes>>10,
872	+	source_p->localClient->recv.bytes>>10);
873	+	}
874	+	else if (IsServer(source_p))
875	+	{
876	+	assert(Count.myserver > 0);
877	+	--Count.myserver;
878	+
879	+	assert(dlinkFind(&serv_list, source_p));
880	+	dlinkDelete(&source_p->localClient->lclient_node, &serv_list);
881	+	unset_chcap_usage_counts(source_p);
882		}
883
979	–	/* As soon as a client is known to be a server of some sort
980	–	* it has to be put on the serv_list, or SJOIN's to this new server
981	–	* from the connect burst will not be seen.
982	–	*/
983	–	if (IsServer(source_p) || IsConnecting(source_p) ||
984	–	IsHandshake(source_p))
985	–	{
986	–	if ((m = dlinkFindDelete(&serv_list, source_p)) != NULL)
987	–	{
988	–	free_dlink_node(m);
989	–	unset_chcap_usage_counts(source_p);
990	–	}
991	–
992	–	if (IsServer(source_p))
993	–	{
994	–	Count.myserver--;
995	–	if (ServerInfo.hub)
996	–	remove_lazylink_flags(source_p->localClient->serverMask);
997	–	else
998	–	uplink = NULL;
999	–	}
1000	–	}
1001	–
1002	–	log_user_exit(source_p);
1003	–
884		if (!IsDead(source_p))
885		{
886		if (IsServer(source_p))
887		{
888		/* for them, we are exiting the network */
889		sendto_one(source_p, ":%s SQUIT %s :%s",
890	<	ID_or_name(from, source_p), me.name, comment);
890	>	ID_or_name(from, source_p), me.name, comment);
891		}
892
893		sendto_one(source_p, "ERROR :Closing Link: %s (%s)",
#	Line 1027 | Line 907 | exit_client(struct Client *source_p, str
907		*/
908		close_connection(source_p);
909		}
910	+	else if (IsClient(source_p) && HasFlag(source_p->servptr, FLAGS_EOB))
911	+	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
912	+	"Client exiting at %s: %s (%s@%s) [%s]",
913	+	source_p->servptr->name, source_p->name,
914	+	source_p->username, source_p->host, comment);
915
916		if (IsServer(source_p))
917		{
#	Line 1036 | Line 921 | exit_client(struct Client *source_p, str
921		assert(source_p->serv != NULL && source_p->servptr != NULL);
922
923		if (ConfigServerHide.hide_servers)
924	<	/* set netsplit message to "*.net *.split" to still show
924	>	/*
925	>	* Set netsplit message to "*.net *.split" to still show
926		* that its a split, but hide the servers splitting
927		*/
928		strcpy(splitstr, "*.net *.split");
#	Line 1048 | Line 934 | exit_client(struct Client *source_p, str
934
935		if (source_p->servptr == &me)
936		{
937	<	sendto_realops_flags(UMODE_ALL, L_ALL,
937	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
938		"%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
939	<	source_p->name, (int)(CurrentTime - source_p->firsttime),
939	>	source_p->name, (int)(CurrentTime - source_p->localClient->firsttime),
940		source_p->localClient->send.bytes >> 10,
941		source_p->localClient->recv.bytes >> 10);
942	<	ilog(L_NOTICE, "%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
943	<	source_p->name, (int)(CurrentTime - source_p->firsttime),
942	>	ilog(LOG_TYPE_IRCD, "%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
943	>	source_p->name, (int)(CurrentTime - source_p->localClient->firsttime),
944		source_p->localClient->send.bytes >> 10,
945		source_p->localClient->recv.bytes >> 10);
946		}
947		}
948	<	else if (IsClient(source_p) && !IsKilled(source_p))
948	>	else if (IsClient(source_p) && !HasFlag(source_p, FLAGS_KILLED))
949		{
950	<	sendto_server(from->from, source_p, NULL, CAP_TS6, NOCAPS, NOFLAGS,
950	>	sendto_server(from->from, CAP_TS6, NOCAPS,
951		":%s QUIT :%s", ID(source_p), comment);
952	<	sendto_server(from->from, source_p, NULL, NOCAPS, CAP_TS6, NOFLAGS,
952	>	sendto_server(from->from, NOCAPS, CAP_TS6,
953		":%s QUIT :%s", source_p->name, comment);
954		}
955
#	Line 1122 | Line 1008 | dead_link_on_read(struct Client *client_
1008
1009		if (IsServer(client_p) || IsHandshake(client_p))
1010		{
1011	<	int connected = CurrentTime - client_p->firsttime;
1011	>	int connected = CurrentTime - client_p->localClient->firsttime;
1012
1013		if (error == 0)
1014		{
1015		/* Admins get the real IP */
1016	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1017	<	"Server %s closed the connection",
1018	<	get_client_name(client_p, SHOW_IP));
1016	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1017	>	"Server %s closed the connection",
1018	>	get_client_name(client_p, SHOW_IP));
1019
1020		/* Opers get a masked IP */
1021	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1022	<	"Server %s closed the connection",
1023	<	get_client_name(client_p, MASK_IP));
1021	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1022	>	"Server %s closed the connection",
1023	>	get_client_name(client_p, MASK_IP));
1024
1025	<	ilog(L_NOTICE, "Server %s closed the connection",
1026	<	get_client_name(client_p, SHOW_IP));
1025	>	ilog(LOG_TYPE_IRCD, "Server %s closed the connection",
1026	>	get_client_name(client_p, SHOW_IP));
1027		}
1028		else
1029		{
1030		report_error(L_ADMIN, "Lost connection to %s: %s",
1031	<	get_client_name(client_p, SHOW_IP), current_error);
1031	>	get_client_name(client_p, SHOW_IP), current_error);
1032		report_error(L_OPER, "Lost connection to %s: %s",
1033	<	get_client_name(client_p, MASK_IP), current_error);
1033	>	get_client_name(client_p, MASK_IP), current_error);
1034		}
1035
1036	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1037	<	"%s had been connected for %d day%s, %2d:%02d:%02d",
1038	<	client_p->name, connected/86400,
1039	<	(connected/86400 == 1) ? "" : "s",
1040	<	(connected % 86400) / 3600, (connected % 3600) / 60,
1041	<	connected % 60);
1036	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1037	>	"%s had been connected for %d day%s, %2d:%02d:%02d",
1038	>	client_p->name, connected/86400,
1039	>	(connected/86400 == 1) ? "" : "s",
1040	>	(connected % 86400) / 3600, (connected % 3600) / 60,
1041	>	connected % 60);
1042		}
1043
1044		if (error == 0)
1045		strlcpy(errmsg, "Remote host closed the connection",
1046		sizeof(errmsg));
1047		else
1048	<	ircsprintf(errmsg, "Read error: %s",
1049	<	strerror(current_error));
1048	>	snprintf(errmsg, sizeof(errmsg), "Read error: %s",
1049	>	strerror(current_error));
1050
1051		exit_client(client_p, &me, errmsg);
1052		}
#	Line 1179 | Line 1065 | exit_aborted_clients(void)
1065
1066		if (target_p == NULL)
1067		{
1068	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1068	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1069		"Warning: null client on abort_list!");
1070		dlinkDelete(ptr, &abort_list);
1071		free_dlink_node(ptr);
#	Line 1200 | Line 1086 | exit_aborted_clients(void)
1086
1087		/*
1088		* accept processing, this adds a form of "caller ID" to ircd
1089	<	*
1089	>	*
1090		* If a client puts themselves into "caller ID only" mode,
1091	<	* only clients that match a client pointer they have put on
1091	>	* only clients that match a client pointer they have put on
1092		* the accept list will be allowed to message them.
1093		*
1094	<	* [ source.on_allow_list ] -> [ target1 ] -> [ target2 ]
1209	<	*
1210	<	* [target.allow_list] -> [ source1 ] -> [source2 ]
1211	<	*
1212	<	* i.e. a target will have a link list of source pointers it will allow
1213	<	* each source client then has a back pointer pointing back
1214	<	* to the client that has it on its accept list.
1215	<	* This allows for exit_one_client to remove these now bogus entries
1216	<	* from any client having an accept on them.
1094	>	* Diane Bruce, "Dianora" db@db.net
1095		*/
1096
1097	<	/* accept_message()
1098	<	*
1221	<	* inputs       - pointer to source client
1222	<	*              - pointer to target client
1223	<	* output       - 1 if accept this message 0 if not
1224	<	* side effects - See if source is on target's allow list
1225	<	*/
1226	<	int
1227	<	accept_message(struct Client *source, struct Client *target)
1097	>	void
1098	>	del_accept(struct split_nuh_item *accept_p, struct Client *client_p)
1099		{
1100	<	dlink_node *ptr;
1100	>	dlinkDelete(&accept_p->node, &client_p->localClient->acceptlist);
1101
1102	<	DLINK_FOREACH(ptr, target->allow_list.head)
1103	<	{
1104	<	struct Client *target_p = ptr->data;
1102	>	MyFree(accept_p->nickptr);
1103	>	MyFree(accept_p->userptr);
1104	>	MyFree(accept_p->hostptr);
1105	>	MyFree(accept_p);
1106	>	}
1107
1108	<	if (source == target_p)
1109	<	return (1);
1110	<	}
1108	>	struct split_nuh_item *
1109	>	find_accept(const char *nick, const char *user,
1110	>	const char *host, struct Client *client_p, int do_match)
1111	>	{
1112	>	dlink_node *ptr = NULL;
1113	>	/* XXX We wouldn't need that if match() would return 0 on match */
1114	>	int (*cmpfunc)(const char *, const char *) = do_match ? match : irccmp;
1115
1116	<	if (IsSoftCallerId(target))
1116	>	DLINK_FOREACH(ptr, client_p->localClient->acceptlist.head)
1117		{
1118	<	DLINK_FOREACH(ptr, target->channel.head)
1119	<	if (IsMember(source, ((struct Membership *)ptr->data)->chptr))
1120	<	return (1);
1118	>	struct split_nuh_item *accept_p = ptr->data;
1119	>
1120	>	if (!cmpfunc(accept_p->nickptr, nick) &&
1121	>	!cmpfunc(accept_p->userptr, user) &&
1122	>	!cmpfunc(accept_p->hostptr, host))
1123	>	return accept_p;
1124		}
1125
1126	<	return (0);
1126	>	return NULL;
1127		}
1128
1129	<	/* del_from_accept()
1250	<	*
1251	<	* inputs       - pointer to source client
1252	<	*              - pointer to target client
1253	<	* output       - NONE
1254	<	* side effects - Delete's source pointer to targets allow list
1129	>	/* accept_message()
1130		*
1131	<	* Walk through the target's accept list, remove if source is found,
1132	<	* Then walk through the source's on_accept_list remove target if found.
1131	>	* inputs       - pointer to source client
1132	>	*              - pointer to target client
1133	>	* output       - 1 if accept this message 0 if not
1134	>	* side effects - See if source is on target's allow list
1135		*/
1136	<	void
1137	<	del_from_accept(struct Client *source, struct Client *target)
1136	>	int
1137	>	accept_message(struct Client *source,
1138	>	struct Client *target)
1139		{
1140	<	dlink_node *ptr;
1263	<	dlink_node *ptr2;
1264	<	dlink_node *next_ptr;
1265	<	dlink_node *next_ptr2;
1266	<	struct Client *target_p;
1267	<
1268	<	DLINK_FOREACH_SAFE(ptr, next_ptr, target->allow_list.head)
1269	<	{
1270	<	target_p = ptr->data;
1140	>	dlink_node *ptr = NULL;
1141
1142	<	if (source == target_p)
1143	<	{
1144	<	dlinkDelete(ptr, &target->allow_list);
1275	<	free_dlink_node(ptr);
1142	>	if (source == target || find_accept(source->name, source->username,
1143	>	source->host, target, 1))
1144	>	return 1;
1145
1146	<	DLINK_FOREACH_SAFE(ptr2, next_ptr2, source->on_allow_list.head)
1147	<	{
1148	<	target_p = ptr2->data;
1146	>	if (HasUMode(target, UMODE_SOFTCALLERID))
1147	>	DLINK_FOREACH(ptr, target->channel.head)
1148	>	if (IsMember(source, ((struct Membership *)ptr->data)->chptr))
1149	>	return 1;
1150
1151	<	if (target == target_p)
1282	<	{
1283	<	dlinkDelete(ptr2, &source->on_allow_list);
1284	<	free_dlink_node(ptr2);
1285	<	}
1286	<	}
1287	<	}
1288	<	}
1151	>	return 0;
1152		}
1153
1154		/* del_all_accepts()
1155		*
1156	<	* inputs       - pointer to exiting client
1157	<	* output       - NONE
1158	<	* side effects - Walk through given clients allow_list and on_allow_list
1296	<	*                remove all references to this client
1156	>	* inputs       - pointer to exiting client
1157	>	* output       - NONE
1158	>	* side effects - Walk through given clients acceptlist and remove all entries
1159		*/
1160		void
1161		del_all_accepts(struct Client *client_p)
1162		{
1163	<	dlink_node *ptr, *next_ptr;
1302	<
1303	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->allow_list.head)
1304	<	del_from_accept(ptr->data, client_p);
1305	<
1306	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->on_allow_list.head)
1307	<	del_from_accept(client_p, ptr->data);
1308	<	}
1309	<
1310	<	/* del_all_their_accepts()
1311	<	*
1312	<	* inputs       - pointer to exiting client
1313	<	* output       - NONE
1314	<	* side effects - Walk through given clients on_allow_list
1315	<	*                remove all references to this client,
1316	<	*                allow this client to keep their own allow_list
1317	<	*/
1318	<	void
1319	<	del_all_their_accepts(struct Client *client_p)
1320	<	{
1321	<	dlink_node *ptr, *next_ptr;
1163	>	dlink_node *ptr = NULL, *next_ptr = NULL;
1164
1165	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->on_allow_list.head)
1166	<	del_from_accept(client_p, ptr->data);
1165	>	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->acceptlist.head)
1166	>	del_accept(ptr->data, client_p);
1167		}
1168
1169	<	/* set_initial_nick()
1170	<	*
1329	<	* inputs
1330	<	* output
1331	<	* side effects -
1332	<	*
1333	<	* This function is only called to set up an initially registering
1334	<	* client.
1335	<	*/
1336	<	void
1337	<	set_initial_nick(struct Client *client_p, struct Client *source_p,
1338	<	const char *nick)
1169	>	unsigned int
1170	>	idle_time_get(const struct Client *source_p, const struct Client *target_p)
1171		{
1172	<	char buf[USERLEN + 1];
1173	<
1174	<	/* Client setting NICK the first time */
1175	<
1344	<	/* This had to be copied here to avoid problems.. */
1345	<	source_p->tsinfo = CurrentTime;
1346	<	source_p->localClient->registration &= ~REG_NEED_NICK;
1347	<
1348	<	if (source_p->name[0])
1349	<	hash_del_client(source_p);
1350	<
1351	<	strlcpy(source_p->name, nick, sizeof(source_p->name));
1352	<	hash_add_client(source_p);
1353	<
1354	<	/* fd_desc is long enough */
1355	<	fd_note(&client_p->localClient->fd, "Nick: %s", nick);
1356	<
1357	<	/* They have the nick they want now.. */
1358	<	client_p->llname[0] = '\0';
1359	<
1360	<	if (!source_p->localClient->registration)
1361	<	{
1362	<	strlcpy(buf, source_p->username, sizeof(buf));
1172	>	unsigned int idle = 0;
1173	>	unsigned int min_idle = 0;
1174	>	unsigned int max_idle = 0;
1175	>	const struct ClassItem *class = get_class_ptr(&target_p->localClient->confs);
1176
1177	<	/*
1178	<	* USER already received, now we have NICK.
1179	<	* *NOTE* For servers "NICK" *must* precede the
1180	<	* user message (giving USER before NICK is possible
1181	<	* only for local client connection!). register_user
1369	<	* may reject the client and call exit_client for it
1370	<	* --must test this and exit m_nick too!!!
1371	<	*/
1372	<	register_local_user(client_p, source_p, nick, buf);
1373	<	}
1374	<	}
1177	>	if (!(class->flags & CLASS_FLAGS_FAKE_IDLE) || target_p == source_p)
1178	>	return CurrentTime - target_p->localClient->last_privmsg;
1179	>	if (HasUMode(source_p, UMODE_OPER) &&
1180	>	!(class->flags & CLASS_FLAGS_HIDE_IDLE_FROM_OPERS))
1181	>	return CurrentTime - target_p->localClient->last_privmsg;
1182
1183	<	/* change_local_nick()
1184	<	*
1378	<	* inputs       - pointer to server
1379	<	*              - pointer to client
1380	<	*              - nick
1381	<	* output       -
1382	<	* side effects - changes nick of a LOCAL user
1383	<	*/
1384	<	void
1385	<	change_local_nick(struct Client *client_p, struct Client *source_p, const char *nick)
1386	<	{
1387	<	/*
1388	<	** Client just changing his/her nick. If he/she is
1389	<	** on a channel, send note of change to all clients
1390	<	** on that channel. Propagate notice to other servers.
1391	<	*/
1392	<	if ((source_p->localClient->last_nick_change +
1393	<	ConfigFileEntry.max_nick_time) < CurrentTime)
1394	<	source_p->localClient->number_of_nick_changes = 0;
1395	<	source_p->localClient->last_nick_change = CurrentTime;
1396	<	source_p->localClient->number_of_nick_changes++;
1397	<
1398	<	if ((ConfigFileEntry.anti_nick_flood &&
1399	<	(source_p->localClient->number_of_nick_changes
1400	<	<= ConfigFileEntry.max_nick_changes)) ||
1401	<	!ConfigFileEntry.anti_nick_flood ||
1402	<	(IsOper(source_p) && ConfigFileEntry.no_oper_flood))
1403	<	{
1404	<	if (irccmp(source_p->name, nick))
1405	<	{
1406	<	/*
1407	<	* Make sure everyone that has this client on its accept list
1408	<	* loses that reference.
1409	<	*/
1410	<	del_all_their_accepts(source_p);
1411	<	source_p->tsinfo = CurrentTime;
1412	<	clear_ban_cache_client(source_p);
1413	<	}
1183	>	min_idle = class->min_idle;
1184	>	max_idle = class->max_idle;
1185
1186	<	/* XXX - the format of this notice should eventually be changed
1187	<	* to either %s[%s@%s], or even better would be get_client_name() -bill
1417	<	*/
1418	<	sendto_realops_flags(UMODE_NCHANGE, L_ALL, "Nick change: From %s to %s [%s@%s]",
1419	<	source_p->name, nick, source_p->username, source_p->host);
1420	<	sendto_common_channels_local(source_p, 1, ":%s!%s@%s NICK :%s",
1421	<	source_p->name, source_p->username,
1422	<	source_p->host, nick);
1423	<	add_history(source_p, 1);
1186	>	if (min_idle == max_idle)
1187	>	return min_idle;
1188
1189	<	/*
1190	<	* Only hubs care about lazy link nicks not being sent on yet
1427	<	* lazylink leafs/leafs always send their nicks up to hub,
1428	<	* hence must always propagate nick changes.
1429	<	* hubs might not propagate a nick change, if the leaf
1430	<	* does not know about that client yet.
1431	<	*/
1432	<	sendto_server(client_p, source_p, NULL, CAP_TS6, NOCAPS, NOFLAGS,
1433	<	":%s NICK %s :%lu",
1434	<	ID(source_p), nick, (unsigned long)source_p->tsinfo);
1435	<	sendto_server(client_p, source_p, NULL, NOCAPS, CAP_TS6, NOFLAGS,
1436	<	":%s NICK %s :%lu",
1437	<	source_p->name, nick, (unsigned long)source_p->tsinfo);
1438	<	}
1189	>	if (class->flags & CLASS_FLAGS_RANDOM_IDLE)
1190	>	idle = genrand_int32();
1191		else
1192	<	{
1441	<	sendto_one(source_p, form_str(ERR_NICKTOOFAST),
1442	<	me.name, source_p->name, source_p->name,
1443	<	nick, ConfigFileEntry.max_nick_time);
1444	<	return;
1445	<	}
1192	>	idle = CurrentTime - target_p->localClient->last_privmsg;
1193
1194	<	/* Finally, add to hash */
1195	<	if (source_p->name[0])
1196	<	hash_del_client(source_p);
1194	>	if (max_idle == 0)
1195	>	idle = 0;
1196	>	else
1197	>	idle %= max_idle;
1198
1199	<	strcpy(source_p->name, nick);
1200	<	hash_add_client(source_p);
1199	>	if (idle < min_idle)
1200	>	idle = min_idle + (idle % (max_idle - min_idle));
1201
1202	<	/* fd_desc is long enough */
1455	<	fd_note(&client_p->localClient->fd, "Nick: %s", nick);
1202	>	return idle;
1203		}

Diff Legend

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