ViewVC Help

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

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

Comparing ircd-hybrid/trunk/src/client.c (file contents):
Revision 2583 by michael, Wed Nov 20 23:01:19 2013 UTC vs.
Revision 4187 by michael, Sun Jul 6 16:14:34 2014 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  client.c: Controls clients.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2002 by the past and present ircd coders, and others.
4	>	*  Copyright (c) 1997-2014 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 18 | Line 17
17		*  along with this program; if not, write to the Free Software
18		*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
19		*  USA
20	<	*
21	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file client.c
23	>	* \brief Controls clients.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
28		#include "list.h"
29		#include "client.h"
28	–	#include "channel_mode.h"
30		#include "event.h"
30	–	#include "fdlist.h"
31		#include "hash.h"
32		#include "irc_string.h"
33		#include "ircd.h"
34	–	#include "s_gline.h"
34		#include "numeric.h"
35	<	#include "packet.h"
37	<	#include "s_auth.h"
35	>	#include "auth.h"
36		#include "s_bsd.h"
37		#include "conf.h"
38		#include "log.h"
39	<	#include "s_misc.h"
40	<	#include "s_serv.h"
39	>	#include "misc.h"
40	>	#include "server.h"
41		#include "send.h"
42		#include "whowas.h"
43	<	#include "s_user.h"
46	<	#include "dbuf.h"
43	>	#include "user.h"
44		#include "memory.h"
45		#include "mempool.h"
46		#include "hostmask.h"
47		#include "listener.h"
51	–	#include "irc_res.h"
48		#include "userhost.h"
49		#include "watch.h"
50		#include "rng_mt.h"
51	+	#include "parse.h"
52
53		dlink_list listing_client_list = { NULL, NULL, 0 };
54		/* Pointer to beginning of Client list */
#	Line 63 | Line 60 | dlink_list serv_list = {NULL, NULL, 0};
60		dlink_list global_serv_list = {NULL, NULL, 0};
61		dlink_list oper_list = {NULL, NULL, 0};
62
63	<	static EVH check_pings;
63	>	static void check_pings(void *);
64
65		static mp_pool_t *client_pool  = NULL;
66		static mp_pool_t *lclient_pool = NULL;
#	Line 75 | Line 72 | static dlink_node *eac_next;  /* next ab
72
73		static void check_pings_list(dlink_list *);
74		static void check_unknowns_list(void);
78	–	static void ban_them(struct Client *, struct MaskItem *);
75
76
77		/* client_init()
#	Line 87 | Line 83 | static void ban_them(struct Client *, st
83		void
84		client_init(void)
85		{
86	<	/* start off the check ping event ..  -- adrian
87	<	* Every 30 seconds is plenty -- db
88	<	*/
86	>	static struct event event_ping =
87	>	{
88	>	.name = "check_pings",
89	>	.handler = check_pings,
90	>	.when = 5
91	>	};
92	>
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);
95	>	event_add(&event_ping, NULL);
96		}
97
98		/*
#	Line 115 | Line 115 | make_client(struct Client *from)
115		{
116		struct Client *client_p = mp_pool_get(client_pool);
117
118	<	memset(client_p, 0, sizeof(*client_p));
119	<
120	<	if (from == NULL)
118	>	if (!from)
119		{
120		client_p->from                      = client_p; /* 'from' of local client is self! */
121		client_p->localClient               = mp_pool_get(lclient_pool);
124	–
125	–	memset(client_p->localClient, 0, sizeof(*client_p->localClient));
126	–
122		client_p->localClient->since        = CurrentTime;
123		client_p->localClient->lasttime     = CurrentTime;
124		client_p->localClient->firsttime    = CurrentTime;
#	Line 137 | Line 132 | make_client(struct Client *from)
132
133		client_p->idhnext = client_p;
134		client_p->hnext  = client_p;
135	<	client_p->status = STAT_UNKNOWN;
135	>	SetUnknown(client_p);
136		strcpy(client_p->username, "unknown");
137		strcpy(client_p->svid, "0");
138
#	Line 154 | Line 149 | make_client(struct Client *from)
149		static void
150		free_client(struct Client *client_p)
151		{
152	<	assert(client_p != NULL);
152	>	assert(client_p);
153		assert(client_p != &me);
154		assert(client_p->hnext == client_p);
155		assert(client_p->idhnext == client_p);
156		assert(client_p->channel.head == NULL);
157		assert(dlink_list_length(&client_p->channel) == 0);
158		assert(dlink_list_length(&client_p->whowas) == 0);
159	<	assert(!IsServer(client_p) || (IsServer(client_p) && client_p->serv));
159	>	assert(!IsServer(client_p) || client_p->serv);
160
161		MyFree(client_p->serv);
162		MyFree(client_p->certfp);
#	Line 239 | Line 234 | check_pings(void *notused)
234		static void
235		check_pings_list(dlink_list *list)
236		{
237	<	char scratch[32];        /* way too generous but... */
237	>	char scratch[IRCD_BUFSIZE];
238		int ping = 0;      /* ping time value from client */
239		dlink_node *ptr = NULL, *next_ptr = NULL;
240
#	Line 297 | Line 292 | check_pings_list(dlink_list *list)
292
293		snprintf(scratch, sizeof(scratch), "Ping timeout: %d seconds",
294		(int)(CurrentTime - client_p->localClient->lasttime));
295	<	exit_client(client_p, &me, scratch);
295	>	exit_client(client_p, scratch);
296		}
297		}
298		}
#	Line 313 | Line 308 | check_pings_list(dlink_list *list)
308		static void
309		check_unknowns_list(void)
310		{
311	<	dlink_node *ptr, *next_ptr;
311	>	dlink_node *ptr = NULL, *ptr_next = NULL;
312
313	<	DLINK_FOREACH_SAFE(ptr, next_ptr, unknown_list.head)
313	>	DLINK_FOREACH_SAFE(ptr, ptr_next, unknown_list.head)
314		{
315		struct Client *client_p = ptr->data;
316
#	Line 324 | Line 319 | check_unknowns_list(void)
319		* for > 30s, close them.
320		*/
321		if (IsAuthFinished(client_p) && (CurrentTime - client_p->localClient->firsttime) > 30)
322	<	exit_client(client_p, &me, "Registration timed out");
322	>	exit_client(client_p, "Registration timed out");
323		}
324		}
325
#	Line 338 | Line 333 | check_unknowns_list(void)
333		void
334		check_conf_klines(void)
335		{
341	–	struct Client *client_p = NULL;       /* current local client_p being examined */
336		struct MaskItem *conf = NULL;
337	<	dlink_node *ptr, *next_ptr;
337	>	dlink_node *ptr = NULL, *ptr_next = NULL;
338
339	<	DLINK_FOREACH_SAFE(ptr, next_ptr, local_client_list.head)
339	>	DLINK_FOREACH_SAFE(ptr, ptr_next, local_client_list.head)
340		{
341	<	client_p = ptr->data;
341	>	struct Client *client_p = ptr->data;
342
343		/* If a client is already being exited
344		*/
345		if (IsDead(client_p) || !IsClient(client_p))
346		continue;
347
348	<	if ((conf = find_dline_conf(&client_p->localClient->ip,
349	<	client_p->localClient->aftype)) != NULL)
348	>	if ((conf = find_conf_by_address(NULL, &client_p->localClient->ip, CONF_DLINE,
349	>	client_p->localClient->aftype, NULL, NULL, 1)))
350		{
351	<	if (conf->type == CONF_EXEMPT)
358	<	continue;
359	<
360	<	ban_them(client_p, conf);
351	>	conf_try_ban(client_p, conf);
352		continue; /* and go examine next fd/client_p */
353		}
354
355		if (ConfigFileEntry.glines)
356		{
357	<	if (!(conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
358	<	CONF_GLINE, client_p->localClient->aftype,
359	<	client_p->username, NULL, 1)))
369	<	continue;
370	<
371	<	if (IsExemptKline(client_p) ||
372	<	IsExemptGline(client_p))
357	>	if ((conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
358	>	CONF_GLINE, client_p->localClient->aftype,
359	>	client_p->username, NULL, 1)))
360		{
361	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
362	<	"GLINE over-ruled for %s, client is %sline_exempt",
376	<	get_client_name(client_p, HIDE_IP), IsExemptKline(client_p) ? "k" : "g");
361	>	conf_try_ban(client_p, conf);
362	>	/* and go examine next fd/client_p */
363		continue;
364		}
379	–
380	–	ban_them(client_p, conf);
381	–	/* and go examine next fd/client_p */
382	–	continue;
365		}
366
367		if ((conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
368		CONF_KLINE, client_p->localClient->aftype,
369	<	client_p->username, NULL, 1)) != NULL)
369	>	client_p->username, NULL, 1)))
370		{
371	<	if (IsExemptKline(client_p))
390	<	{
391	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
392	<	"KLINE over-ruled for %s, client is kline_exempt",
393	<	get_client_name(client_p, HIDE_IP));
394	<	continue;
395	<	}
396	<
397	<	ban_them(client_p, conf);
371	>	conf_try_ban(client_p, conf);
372		continue;
373		}
374
375		if ((conf = find_matching_name_conf(CONF_XLINE,  client_p->info,
376		NULL, NULL, 0)))
377		{
378	<	ban_them(client_p, conf);
378	>	conf_try_ban(client_p, conf);
379		continue;
380		}
381		}
382
383		/* also check the unknowns list for new dlines */
384	<	DLINK_FOREACH_SAFE(ptr, next_ptr, unknown_list.head)
384	>	DLINK_FOREACH_SAFE(ptr, ptr_next, unknown_list.head)
385		{
386	<	client_p = ptr->data;
386	>	struct Client *client_p = ptr->data;
387
388	<	if ((conf = find_dline_conf(&client_p->localClient->ip,
389	<	client_p->localClient->aftype)))
388	>	if ((conf = find_conf_by_address(NULL, &client_p->localClient->ip, CONF_DLINE,
389	>	client_p->localClient->aftype, NULL, NULL, 1)))
390		{
391	<	if (conf->type == CONF_EXEMPT)
392	<	continue;
419	<
420	<	exit_client(client_p, &me, "D-lined");
391	>	conf_try_ban(client_p, conf);
392	>	continue; /* and go examine next fd/client_p */
393		}
394		}
395		}
396
397		/*
398	<	* ban_them
398	>	* conf_try_ban
399		*
400		* inputs       - pointer to client to ban
401		*              - pointer to MaskItem
402		* output       - NONE
403		* side effects - given client_p is banned
404		*/
405	<	static void
406	<	ban_them(struct Client *client_p, struct MaskItem *conf)
405	>	void
406	>	conf_try_ban(struct Client *client_p, struct MaskItem *conf)
407		{
408		const char *user_reason = NULL;  /* What is sent to user */
409		const char *type_string = NULL;
#	Line 443 | Line 415 | ban_them(struct Client *client_p, struct
415		switch (conf->type)
416		{
417		case CONF_KLINE:
418	+	if (IsExemptKline(client_p))
419	+	{
420	+	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
421	+	"KLINE over-ruled for %s, client is kline_exempt",
422	+	get_client_name(client_p, HIDE_IP));
423	+	return;
424	+	}
425	+
426		type_string = kline_string;
427		break;
428		case CONF_DLINE:
429	+	if (find_conf_by_address(NULL, &client_p->localClient->ip, CONF_EXEMPT,
430	+	client_p->localClient->aftype, NULL, NULL, 1))
431	+	return;
432		type_string = dline_string;
433		break;
434		case CONF_GLINE:
435	+	if (IsExemptKline(client_p) ||
436	+	IsExemptGline(client_p))
437	+	{
438	+	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
439	+	"GLINE over-ruled for %s, client is %sline_exempt",
440	+	get_client_name(client_p, HIDE_IP), IsExemptKline(client_p) ? "k" : "g");
441	+	return;
442	+	}
443	+
444		type_string = gline_string;
445		break;
446		case CONF_XLINE:
#	Line 466 | Line 458 | ban_them(struct Client *client_p, struct
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),
470	<	me.name, client_p->name, user_reason);
461	>	sendto_one_numeric(client_p, &me, ERR_YOUREBANNEDCREEP, user_reason);
462
463	<	exit_client(client_p, &me, user_reason);
463	>	exit_client(client_p, user_reason);
464		}
465
466		/* update_client_exit_stats()
#	Line 506 | Line 497 | update_client_exit_stats(struct Client *
497		* side effects - find person by (nick)name
498		*/
499		struct Client *
500	<	find_person(const struct Client *client_p, const char *name)
500	>	find_person(const struct Client *const source_p, const char *name)
501		{
502		struct Client *target_p = NULL;
503
504		if (IsDigit(*name))
505		{
506	<	if ((target_p = hash_find_id(name)) != NULL)
507	<	if (!IsServer(client_p) && !HasFlag(client_p, FLAGS_SERVICE))
517	<	target_p = NULL;
506	>	if (IsServer(source_p->from))
507	>	target_p = hash_find_id(name);
508		}
509		else
510		target_p = hash_find_client(name);
#	Line 525 | Line 515 | find_person(const struct Client *client_
515		/*
516		* find_chasing - find the client structure for a nick name (name)
517		*      using history mechanism if necessary. If the client is not found,
518	<	*      an error message (NO SUCH NICK) is generated. If the client was found
529	<	*      through the history, chasing will be 1 and otherwise 0.
518	>	*      an error message (NO SUCH NICK) is generated.
519		*/
520		struct Client *
521	<	find_chasing(struct Client *source_p, const char *name, int *const chasing)
521	>	find_chasing(struct Client *source_p, const char *name)
522		{
523	<	struct Client *who = find_person(source_p->from, name);
535	<
536	<	if (chasing)
537	<	*chasing = 0;
523	>	struct Client *who = find_person(source_p, name);
524
525		if (who)
526		return who;
#	Line 546 | Line 532 | find_chasing(struct Client *source_p, co
532		(time_t)ConfigFileEntry.kill_chase_time_limit))
533		== NULL)
534		{
535	<	sendto_one(source_p, form_str(ERR_NOSUCHNICK),
550	<	me.name, source_p->name, name);
535	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHNICK, name);
536		return NULL;
537		}
538
554	–	if (chasing)
555	–	*chasing = 1;
556	–
539		return who;
540		}
541
#	Line 576 | Line 558 | find_chasing(struct Client *source_p, co
558		*        to modify what it points!!!
559		*/
560		const char *
561	<	get_client_name(const struct Client *client, enum addr_mask_type type)
561	>	get_client_name(const struct Client *client_p, enum addr_mask_type type)
562		{
563		static char nbuf[HOSTLEN * 2 + USERLEN + 5];
564
565	<	assert(client != NULL);
565	>	assert(client_p);
566
567	<	if (!MyConnect(client))
568	<	return client->name;
567	>	if (!MyConnect(client_p))
568	>	return client_p->name;
569
570	<	if (IsServer(client) || IsConnecting(client) || IsHandshake(client))
570	>	if (IsServer(client_p) || IsConnecting(client_p) || IsHandshake(client_p))
571		{
572	<	if (!irccmp(client->name, client->host))
573	<	return client->name;
572	>	if (!irccmp(client_p->name, client_p->host))
573	>	return client_p->name;
574		else if (ConfigServerHide.hide_server_ips)
575		type = MASK_IP;
576		}
577
578		if (ConfigFileEntry.hide_spoof_ips)
579	<	if (type == SHOW_IP && IsIPSpoof(client))
579	>	if (IsIPSpoof(client_p) && type == SHOW_IP)
580		type = MASK_IP;
581
582		/* And finally, let's get the host information, ip or name */
#	Line 602 | Line 584 | get_client_name(const struct Client *cli
584		{
585		case SHOW_IP:
586		snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
587	<	client->name,
588	<	client->username, client->sockhost);
587	>	client_p->name,
588	>	client_p->username, client_p->sockhost);
589		break;
590		case MASK_IP:
591	<	if (client->localClient->aftype == AF_INET)
591	>	if (client_p->localClient->aftype == AF_INET)
592		snprintf(nbuf, sizeof(nbuf), "%s[%s@255.255.255.255]",
593	<	client->name, client->username);
593	>	client_p->name, client_p->username);
594		else
595		snprintf(nbuf, sizeof(nbuf), "%s[%s@ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]",
596	<	client->name, client->username);
596	>	client_p->name, client_p->username);
597		break;
598		default:
599		snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
600	<	client->name,
601	<	client->username, client->host);
600	>	client_p->name,
601	>	client_p->username, client_p->host);
602		}
603
604		return nbuf;
#	Line 644 | Line 626 | free_exited_clients(void)
626		static void
627		exit_one_client(struct Client *source_p, const char *quitmsg)
628		{
629	<	dlink_node *lp = NULL, *next_lp = NULL;
629	>	dlink_node *ptr = NULL, *ptr_next = NULL;
630
631		assert(!IsMe(source_p));
632
633		if (IsClient(source_p))
634		{
635	<	if (source_p->servptr->serv != NULL)
654	<	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->client_list);
635	>	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->client_list);
636
637		/*
638		* If a person is on a channel, send a QUIT notice
#	Line 662 | Line 643 | exit_one_client(struct Client *source_p,
643		sendto_common_channels_local(source_p, 0, 0, ":%s!%s@%s QUIT :%s",
644		source_p->name, source_p->username,
645		source_p->host, quitmsg);
646	<	DLINK_FOREACH_SAFE(lp, next_lp, source_p->channel.head)
647	<	remove_user_from_channel(lp->data);
646	>	DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->channel.head)
647	>	remove_user_from_channel(ptr->data);
648
649		whowas_add_history(source_p, 0);
650		whowas_off_history(source_p);
#	Line 673 | Line 654 | exit_one_client(struct Client *source_p,
654		if (MyConnect(source_p))
655		{
656		/* Clean up invitefield */
657	<	DLINK_FOREACH_SAFE(lp, next_lp, source_p->localClient->invited.head)
658	<	del_invite(lp->data, source_p);
657	>	DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->localClient->invited.head)
658	>	del_invite(ptr->data, source_p);
659
660		del_all_accepts(source_p);
661		}
#	Line 683 | Line 664 | exit_one_client(struct Client *source_p,
664		{
665		dlinkDelete(&source_p->lnode, &source_p->servptr->serv->server_list);
666
667	<	if ((lp = dlinkFindDelete(&global_serv_list, source_p)) != NULL)
668	<	free_dlink_node(lp);
667	>	if ((ptr = dlinkFindDelete(&global_serv_list, source_p)))
668	>	free_dlink_node(ptr);
669		}
670
671		/* Remove source_p from the client lists */
672	<	if (HasID(source_p))
672	>	if (source_p->id[0])
673		hash_del_id(source_p);
674		if (source_p->name[0])
675		hash_del_client(source_p);
#	Line 696 | Line 677 | exit_one_client(struct Client *source_p,
677		if (IsUserHostIp(source_p))
678		delete_user_host(source_p->username, source_p->host, !MyConnect(source_p));
679
680	<	/* remove from global client list
700	<	* NOTE: source_p->node.next cannot be NULL if the client is added
701	<	*       to global_client_list (there is always &me at its end)
702	<	*/
703	<	if (source_p != NULL && source_p->node.next != NULL)
680	>	if (source_p->node.next)
681		dlinkDelete(&source_p->node, &global_client_list);
682
683		update_client_exit_stats(source_p);
#	Line 713 | Line 690 | exit_one_client(struct Client *source_p,
690		dlinkAdd(source_p, make_dlink_node(), &dead_list);
691		}
692
716	–	/* Recursively send QUITs and SQUITs for source_p and all its dependent clients
717	–	* and servers to those servers that need them.  A server needs the client
718	–	* QUITs if it can't figure them out from the SQUIT (ie pre-TS4) or if it
719	–	* isn't getting the SQUIT because of @#(*&@)# hostmasking.  With TS4, once
720	–	* a link gets a SQUIT, it doesn't need any QUIT/SQUITs for clients depending
721	–	* on that one -orabidoo
722	–	*
723	–	* This is now called on each local server -adx
724	–	*/
725	–	static void
726	–	recurse_send_quits(struct Client *original_source_p, struct Client *source_p,
727	–	struct Client *from, struct Client *to, const char *comment,
728	–	const char *splitstr)
729	–	{
730	–	dlink_node *ptr, *next;
731	–	struct Client *target_p;
732	–
733	–	assert(to != source_p);  /* should be already removed from serv_list */
734	–
735	–	/* If this server can handle quit storm (QS) removal
736	–	* of dependents, just send the SQUIT
737	–	*/
738	–	if (!IsCapable(to, CAP_QS))
739	–	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->client_list.head)
740	–	{
741	–	target_p = ptr->data;
742	–	sendto_one(to, ":%s QUIT :%s", target_p->name, splitstr);
743	–	}
744	–
745	–	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->server_list.head)
746	–	recurse_send_quits(original_source_p, ptr->data, from, to,
747	–	comment, splitstr);
748	–
749	–	if ((source_p == original_source_p && to != from) ||
750	–	!IsCapable(to, CAP_QS))
751	–	{
752	–	/* don't use a prefix here - we have to be 100% sure the message
753	–	* will be accepted without Unknown prefix etc.. */
754	–	sendto_one(to, "SQUIT %s :%s", ID_or_name(source_p, to), comment);
755	–	}
756	–	}
757	–
693		/*
694		* Remove all clients that depend on source_p; assumes all (S)QUITs have
695		* already been sent.  we make sure to exit a server's dependent clients
#	Line 764 | Line 699 | recurse_send_quits(struct Client *origin
699		static void
700		recurse_remove_clients(struct Client *source_p, const char *quitmsg)
701		{
702	<	dlink_node *ptr, *next;
702	>	dlink_node *ptr = NULL, *ptr_next = NULL;
703
704	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->client_list.head)
704	>	DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->serv->client_list.head)
705		exit_one_client(ptr->data, quitmsg);
706
707	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->server_list.head)
707	>	DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->serv->server_list.head)
708		{
709		recurse_remove_clients(ptr->data, quitmsg);
710		exit_one_client(ptr->data, quitmsg);
#	Line 777 | Line 712 | recurse_remove_clients(struct Client *so
712		}
713
714		/*
780	–	** Remove *everything* that depends on source_p, from all lists, and sending
781	–	** all necessary QUITs and SQUITs.  source_p itself is still on the lists,
782	–	** and its SQUITs have been sent except for the upstream one  -orabidoo
783	–	*/
784	–	static void
785	–	remove_dependents(struct Client *source_p, struct Client *from,
786	–	const char *comment, const char *splitstr)
787	–	{
788	–	dlink_node *ptr = NULL;
789	–
790	–	DLINK_FOREACH(ptr, serv_list.head)
791	–	recurse_send_quits(source_p, source_p, from, ptr->data,
792	–	comment, splitstr);
793	–
794	–	recurse_remove_clients(source_p, splitstr);
795	–	}
796	–
797	–	/*
715		* exit_client - exit a client of any type. Generally, you can use
716		* this on any struct Client, regardless of its state.
717		*
718		* Note, you shouldn't exit remote _users_ without first doing
719		* AddFlag(x, FLAGS_KILLED) and propagating a kill or similar message.
720	+	*
721		* However, it is perfectly correct to call exit_client to force a _server_
722		* quit (either local or remote one).
723		*
724	+	*
725		* inputs:       - a client pointer that is going to be exited
807	–	*               - for servers, the second argument is a pointer to who
808	–	*                 is firing the server. This side won't get any generated
809	–	*                 messages. NEVER NULL!
726		* output:       none
727		* side effects: the client is delinked from all lists, disconnected,
728		*               and the rest of IRC network is notified of the exit.
729		*               Client memory is scheduled to be freed
730		*/
731		void
732	<	exit_client(struct Client *source_p, struct Client *from, const char *comment)
732	>	exit_client(struct Client *source_p, const char *comment)
733		{
734		dlink_node *m = NULL;
735
#	Line 852 | Line 768 | exit_client(struct Client *source_p, str
768		Count.local--;
769
770		if (HasUMode(source_p, UMODE_OPER))
771	<	if ((m = dlinkFindDelete(&oper_list, source_p)) != NULL)
771	>	if ((m = dlinkFindDelete(&oper_list, source_p)))
772		free_dlink_node(m);
773
774		assert(dlinkFind(&local_client_list, source_p));
775		dlinkDelete(&source_p->localClient->lclient_node, &local_client_list);
776
777	<	if (source_p->localClient->list_task != NULL)
778	<	free_list_task(source_p->localClient->list_task, source_p);
777	>	if (source_p->localClient->list_task)
778	>	free_list_task(source_p);
779
780		watch_del_watch_list(source_p);
781		sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
#	Line 881 | Line 797 | exit_client(struct Client *source_p, str
797
798		assert(dlinkFind(&serv_list, source_p));
799		dlinkDelete(&source_p->localClient->lclient_node, &serv_list);
884	–	unset_chcap_usage_counts(source_p);
800		}
801
802		if (!IsDead(source_p))
803		{
804		if (IsServer(source_p))
805		{
806	<	/* for them, we are exiting the network */
807	<	sendto_one(source_p, ":%s SQUIT %s :%s",
808	<	ID_or_name(from, source_p), me.name, comment);
806	>	if (!HasFlag(source_p, FLAGS_SQUIT))
807	>	{
808	>	/* for them, we are exiting the network */
809	>	sendto_one(source_p, ":%s SQUIT %s :%s",
810	>	me.id, me.id, comment);
811	>	}
812		}
813
814		sendto_one(source_p, "ERROR :Closing Link: %s (%s)",
815		source_p->host, comment);
816		}
817
900	–	/*
901	–	** Currently only server connections can have
902	–	** depending remote clients here, but it does no
903	–	** harm to check for all local clients. In
904	–	** future some other clients than servers might
905	–	** have remotes too...
906	–	**
907	–	** Close the Client connection first and mark it
908	–	** so that no messages are attempted to send to it.
909	–	** Remember it makes source_p->from == NULL.
910	–	*/
818		close_connection(source_p);
819		}
820		else if (IsClient(source_p) && HasFlag(source_p->servptr, FLAGS_EOB))
#	Line 918 | Line 825 | exit_client(struct Client *source_p, str
825
826		if (IsServer(source_p))
827		{
828	<	char splitstr[HOSTLEN + HOSTLEN + 2];
828	>	char splitstr[HOSTLEN + HOSTLEN + 2] = "";
829
830		/* This shouldn't ever happen */
831	<	assert(source_p->serv != NULL && source_p->servptr != NULL);
831	>	assert(source_p->serv && source_p->servptr);
832
833		if (ConfigServerHide.hide_servers)
834		/*
835		* Set netsplit message to "*.net *.split" to still show
836		* that its a split, but hide the servers splitting
837		*/
838	<	strcpy(splitstr, "*.net *.split");
838	>	strlcpy(splitstr, "*.net *.split", sizeof(splitstr));
839		else
840		snprintf(splitstr, sizeof(splitstr), "%s %s",
841		source_p->servptr->name, source_p->name);
842
843	<	remove_dependents(source_p, from->from, comment, splitstr);
843	>	/* Send SQUIT for source_p in every direction. source_p is already off of serv_list here */
844	>	if (!HasFlag(source_p, FLAGS_SQUIT))
845	>	sendto_server(NULL, NOCAPS, NOCAPS, "SQUIT %s :%s", source_p->id, comment);
846
847	<	if (source_p->servptr == &me)
847	>	/* Now exit the clients internally */
848	>	recurse_remove_clients(source_p, splitstr);
849	>
850	>	if (MyConnect(source_p))
851		{
852		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
853		"%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
#	Line 949 | Line 861 | exit_client(struct Client *source_p, str
861		}
862		}
863		else if (IsClient(source_p) && !HasFlag(source_p, FLAGS_KILLED))
864	<	{
865	<	sendto_server(from->from, CAP_TS6, NOCAPS,
954	<	":%s QUIT :%s", ID(source_p), comment);
955	<	sendto_server(from->from, NOCAPS, CAP_TS6,
956	<	":%s QUIT :%s", source_p->name, comment);
957	<	}
864	>	sendto_server(source_p->from, NOCAPS, NOCAPS, ":%s QUIT :%s",
865	>	source_p->id, comment);
866
867		/* The client *better* be off all of the lists */
868		assert(dlinkFind(&unknown_list, source_p) == NULL);
#	Line 998 | Line 906 | dead_link_on_write(struct Client *client
906		void
907		dead_link_on_read(struct Client *client_p, int error)
908		{
909	<	char errmsg[255];
909	>	char errmsg[IRCD_BUFSIZE];
910		int current_error;
911
912		if (IsDefunct(client_p))
#	Line 1051 | Line 959 | dead_link_on_read(struct Client *client_
959		snprintf(errmsg, sizeof(errmsg), "Read error: %s",
960		strerror(current_error));
961
962	<	exit_client(client_p, &me, errmsg);
962	>	exit_client(client_p, errmsg);
963		}
964
965		void
#	Line 1082 | Line 990 | exit_aborted_clients(void)
990		else
991		notice = "Write error: connection closed";
992
993	<	exit_client(target_p, &me, notice);
993	>	exit_client(target_p, notice);
994		free_dlink_node(ptr);
995		}
996		}
#	Line 1162 | Line 1070 | accept_message(struct Client *source,
1070		void
1071		del_all_accepts(struct Client *client_p)
1072		{
1073	<	dlink_node *ptr = NULL, *next_ptr = NULL;
1073	>	dlink_node *ptr = NULL, *ptr_next = NULL;
1074
1075	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->acceptlist.head)
1075	>	DLINK_FOREACH_SAFE(ptr, ptr_next, client_p->localClient->acceptlist.head)
1076		del_accept(ptr->data, client_p);
1077		}
1078
#	Line 1193 | Line 1101 | idle_time_get(const struct Client *sourc
1101		else
1102		idle = CurrentTime - target_p->localClient->last_privmsg;
1103
1104	<	if (max_idle == 0)
1104	>	if (!max_idle)
1105		idle = 0;
1106		else
1107		idle %= max_idle;

Diff Legend

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