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 1013 by michael, Sun Oct 18 14:26:49 2009 UTC vs.
ircd-hybrid/trunk/src/client.c (file contents), Revision 1644 by michael, Tue Nov 6 22:20:16 2012 UTC

#	Line 26 | Line 26
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"
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 76 | Line 74 | static dlink_node *eac_next;  /* next ab
74
75		static void check_pings_list(dlink_list *);
76		static void check_unknowns_list(void);
77	<	static void ban_them(struct Client *client_p, struct ConfItem *conf);
77	>	static void ban_them(struct Client *, struct MaskItem *);
78
79
80		/* init_client()
#	Line 118 | Line 116 | make_client(struct Client *from)
116
117		if (from == NULL)
118		{
119	<	client_p->from  = client_p; /* 'from' of local client is self! */
120	<	client_p->since = client_p->lasttime = client_p->firsttime = CurrentTime;
121	<
122	<	client_p->localClient = BlockHeapAlloc(lclient_heap);
119	>	client_p->from                      = client_p; /* 'from' of local client is self! */
120	>	client_p->localClient               = BlockHeapAlloc(lclient_heap);
121	>	client_p->localClient->since        = CurrentTime;
122	>	client_p->localClient->lasttime     = CurrentTime;
123	>	client_p->localClient->firsttime    = CurrentTime;
124		client_p->localClient->registration = REG_INIT;
125	+
126		/* as good a place as any... */
127	<	dlinkAdd(client_p, make_dlink_node(), &unknown_list);
127	>	dlinkAdd(client_p, &client_p->localClient->lclient_node, &unknown_list);
128		}
129		else
130		client_p->from = from; /* 'from' of local client is self! */
131
132	+	client_p->idhnext = client_p;
133		client_p->hnext  = client_p;
134		client_p->status = STAT_UNKNOWN;
135		strcpy(client_p->username, "unknown");
136	+	strcpy(client_p->svid, "0");
137
138		return client_p;
139		}
#	Line 149 | Line 151 | free_client(struct Client *client_p)
151		assert(client_p != NULL);
152		assert(client_p != &me);
153		assert(client_p->hnext == client_p);
154	+	assert(client_p->idhnext == client_p);
155		assert(client_p->channel.head == NULL);
156		assert(dlink_list_length(&client_p->channel) == 0);
157	+	assert(dlink_list_length(&client_p->whowas) == 0);
158	+	assert(!IsServer(client_p) || IsServer(client_p) && client_p->serv);
159
155	–	MyFree(client_p->away);
160		MyFree(client_p->serv);
161
162		if (MyConnect(client_p))
163		{
164		assert(client_p->localClient->invited.head == NULL);
165		assert(dlink_list_length(&client_p->localClient->invited) == 0);
166	+	assert(dlink_list_length(&client_p->localClient->watches) == 0);
167		assert(IsClosing(client_p) && IsDead(client_p));
168
169		MyFree(client_p->localClient->response);
#	Line 228 | Line 233 | static void
233		check_pings_list(dlink_list *list)
234		{
235		char scratch[32];        /* way too generous but... */
236	<	struct Client *client_p; /* current local client_p being examined */
237	<	int ping, pingwarn;      /* ping time value from client */
233	<	dlink_node *ptr, *next_ptr;
236	>	int ping = 0;      /* ping time value from client */
237	>	dlink_node *ptr = NULL, *next_ptr = NULL;
238
239		DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
240		{
241	<	client_p = ptr->data;
241	>	struct Client *client_p = ptr->data;
242
243		/*
244		** Note: No need to notify opers here. It's
#	Line 246 | Line 250 | check_pings_list(dlink_list *list)
250		continue;
251		}
252
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 = 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	–
253		if (!IsRegistered(client_p))
254	<	ping = CONNECTTIMEOUT, pingwarn = 0;
254	>	ping = CONNECTTIMEOUT;
255		else
256	<	ping = get_client_ping(client_p, &pingwarn);
256	>	ping = get_client_ping(&client_p->localClient->confs);
257
258	<	if (ping < CurrentTime - client_p->lasttime)
258	>	if (ping < CurrentTime - client_p->localClient->lasttime)
259		{
260		if (!IsPingSent(client_p))
261		{
#	Line 294 | Line 265 | check_pings_list(dlink_list *list)
265		* it is still alive.
266		*/
267		SetPingSent(client_p);
268	<	ClearPingWarning(client_p);
298	<	client_p->lasttime = CurrentTime - ping;
268	>	client_p->localClient->lasttime = CurrentTime - ping;
269		sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
270		}
271		else
272		{
273	<	if (CurrentTime - client_p->lasttime >= 2 * ping)
273	>	if (CurrentTime - client_p->localClient->lasttime >= 2 * ping)
274		{
275		/*
276		* If the client/server hasn't talked to us in 2*ping seconds
#	Line 308 | Line 278 | check_pings_list(dlink_list *list)
278		*/
279		if (IsServer(client_p) || IsHandshake(client_p))
280		{
281	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
281	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
282		"No response from %s, closing link",
283		get_client_name(client_p, HIDE_IP));
284	<	sendto_realops_flags(UMODE_ALL, L_OPER,
284	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
285		"No response from %s, closing link",
286		get_client_name(client_p, MASK_IP));
287	<	ilog(L_NOTICE, "No response from %s, closing link",
287	>	ilog(LOG_TYPE_IRCD, "No response from %s, closing link",
288		get_client_name(client_p, HIDE_IP));
289		}
290
291	<	ircsprintf(scratch, "Ping timeout: %d seconds",
292	<	(int)(CurrentTime - client_p->lasttime));
291	>	snprintf(scratch, sizeof(scratch), "Ping timeout: %d seconds",
292	>	(int)(CurrentTime - client_p->localClient->lasttime));
293		exit_client(client_p, &me, scratch);
294		}
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	–	}
295		}
296		}
297		}
#	Line 360 | Line 312 | check_unknowns_list(void)
312		{
313		struct Client *client_p = ptr->data;
314
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	–
315		/*
316		* Check UNKNOWN connections - if they have been in this state
317		* for > 30s, close them.
318		*/
319	<	if (IsAuthFinished(client_p) && (CurrentTime - client_p->firsttime) > 30)
319	>	if (IsAuthFinished(client_p) && (CurrentTime - client_p->localClient->firsttime) > 30)
320		exit_client(client_p, &me, "Registration timed out");
321		}
322		}
#	Line 387 | Line 332 | void
332		check_conf_klines(void)
333		{
334		struct Client *client_p = NULL;       /* current local client_p being examined */
335	<	struct AccessItem *aconf = NULL;
391	<	struct ConfItem *conf = NULL;
335	>	struct MaskItem *conf = NULL;
336		dlink_node *ptr, *next_ptr;
337
338		DLINK_FOREACH_SAFE(ptr, next_ptr, local_client_list.head)
#	Line 400 | Line 344 | check_conf_klines(void)
344		if (IsDead(client_p) || !IsClient(client_p))
345		continue;
346
347	<	/* if there is a returned struct ConfItem then kill it */
404	<	if ((aconf = find_dline_conf(&client_p->localClient->ip,
347	>	if ((conf = find_dline_conf(&client_p->localClient->ip,
348		client_p->localClient->aftype)) != NULL)
349		{
350	<	if (aconf->status & CONF_EXEMPTDLINE)
350	>	if (conf->type == CONF_EXEMPT)
351		continue;
352
410	–	conf = unmap_conf_item(aconf);
353		ban_them(client_p, conf);
354		continue; /* and go examine next fd/client_p */
355		}
356
357	<	if (ConfigFileEntry.glines && (aconf = find_gline(client_p)))
357	>	if (ConfigFileEntry.glines && (conf = find_gline(client_p)))
358		{
359		if (IsExemptKline(client_p) ||
360		IsExemptGline(client_p))
361		{
362	<	sendto_realops_flags(UMODE_ALL, L_ALL,
362	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
363		"GLINE over-ruled for %s, client is %sline_exempt",
364		get_client_name(client_p, HIDE_IP), IsExemptKline(client_p) ? "k" : "g");
365		continue;
366		}
367
426	–	conf = unmap_conf_item(aconf);
368		ban_them(client_p, conf);
369		/* and go examine next fd/client_p */
370		continue;
371		}
372
373	<	if ((aconf = find_kill(client_p)) != NULL)
373	>	if ((conf = find_kill(client_p)) != NULL)
374		{
434	–
435	–	/* if there is a returned struct AccessItem.. then kill it */
375		if (IsExemptKline(client_p))
376		{
377	<	sendto_realops_flags(UMODE_ALL, L_ALL,
377	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
378		"KLINE over-ruled for %s, client is kline_exempt",
379		get_client_name(client_p, HIDE_IP));
380		continue;
381		}
382
444	–	conf = unmap_conf_item(aconf);
383		ban_them(client_p, conf);
384		continue;
385		}
386
387	<	/* if there is a returned struct MatchItem then kill it */
450	<	if ((conf = find_matching_name_conf(XLINE_TYPE,  client_p->info,
387	>	if ((conf = find_matching_name_conf(CONF_XLINE,  client_p->info,
388		NULL, NULL, 0)) != NULL ||
389	<	(conf = find_matching_name_conf(RXLINE_TYPE, client_p->info,
389	>	(conf = find_matching_name_conf(CONF_RXLINE, client_p->info,
390		NULL, NULL, 0)) != NULL)
391		{
392		ban_them(client_p, conf);
#	Line 462 | Line 399 | check_conf_klines(void)
399		{
400		client_p = ptr->data;
401
402	<	if ((aconf = find_dline_conf(&client_p->localClient->ip,
403	<	client_p->localClient->aftype)))
402	>	if ((conf = find_dline_conf(&client_p->localClient->ip,
403	>	client_p->localClient->aftype)))
404		{
405	<	if (aconf->status & CONF_EXEMPTDLINE)
405	>	if (conf->type == CONF_EXEMPT)
406		continue;
407
408		exit_client(client_p, &me, "D-lined");
#	Line 477 | Line 414 | check_conf_klines(void)
414		* ban_them
415		*
416		* inputs       - pointer to client to ban
417	<	*              - pointer to ConfItem
417	>	*              - pointer to MaskItem
418		* output       - NONE
419		* side effects - given client_p is banned
420		*/
421		static void
422	<	ban_them(struct Client *client_p, struct ConfItem *conf)
422	>	ban_them(struct Client *client_p, struct MaskItem *conf)
423		{
424		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;
425		const char *type_string = NULL;
426		const char dline_string[] = "D-line";
427		const char kline_string[] = "K-line";
#	Line 496 | Line 430 | ban_them(struct Client *client_p, struct
430
431		switch (conf->type)
432		{
433	<	case RKLINE_TYPE:
434	<	case KLINE_TYPE:
433	>	case CONF_RKLINE:
434	>	case CONF_KLINE:
435		type_string = kline_string;
502	–	aconf = map_to_conf(conf);
436		break;
437	<	case DLINE_TYPE:
437	>	case CONF_DLINE:
438		type_string = dline_string;
506	–	aconf = map_to_conf(conf);
439		break;
440	<	case GLINE_TYPE:
440	>	case CONF_GLINE:
441		type_string = gline_string;
510	–	aconf = map_to_conf(conf);
442		break;
443	<	case RXLINE_TYPE:
444	<	case XLINE_TYPE:
443	>	case CONF_RXLINE:
444	>	case CONF_XLINE:
445		type_string = xline_string;
446	<	xconf = map_to_conf(conf);
516	<	++xconf->count;
446	>	++conf->count;
447		break;
448		default:
449		assert(0);
450		break;
451		}
452
453	<	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;
453	>	user_reason = conf->reason ? conf->reason : type_string;
454
455	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s active for %s",
455	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s active for %s",
456		type_string, get_client_name(client_p, HIDE_IP));
457
458		if (IsClient(client_p))
459		sendto_one(client_p, form_str(ERR_YOUREBANNEDCREEP),
460		me.name, client_p->name, user_reason);
461
462	<	exit_client(client_p, &me, channel_reason);
462	>	exit_client(client_p, &me, user_reason);
463		}
464
465		/* update_client_exit_stats()
#	Line 554 | Line 471 | ban_them(struct Client *client_p, struct
471		static void
472		update_client_exit_stats(struct Client *client_p)
473		{
474	<	if (IsServer(client_p))
558	<	{
559	<	sendto_realops_flags(UMODE_EXTERNAL, L_ALL, "Server %s split from %s",
560	<	client_p->name, client_p->servptr->name);
561	<	}
562	<	else if (IsClient(client_p))
474	>	if (IsClient(client_p))
475		{
476		assert(Count.total > 0);
477		--Count.total;
478	<	if (IsOper(client_p))
478	>	if (HasUMode(client_p, UMODE_OPER))
479		--Count.oper;
480	<	if (IsInvisible(client_p))
480	>	if (HasUMode(client_p, UMODE_INVISIBLE))
481		--Count.invisi;
482		}
483	+	else if (IsServer(client_p))
484	+	sendto_realops_flags(UMODE_EXTERNAL, L_ALL, SEND_NOTICE,
485	+	"Server %s split from %s",
486	+	client_p->name, client_p->servptr->name);
487
488		if (splitchecking && !splitmode)
489		check_splitmode(NULL);
#	Line 579 | Line 495 | update_client_exit_stats(struct Client *
495		* output       - return client pointer
496		* side effects - find person by (nick)name
497		*/
582	–	/* XXX - ugly wrapper */
498		struct Client *
499		find_person(const struct Client *client_p, const char *name)
500		{
501	<	struct Client *c2ptr;
501	>	struct Client *c2ptr = NULL;
502
503		if (IsDigit(*name))
504		{
505		if ((c2ptr = hash_find_id(name)) != NULL)
506		{
507		/* invisible users shall not be found by UID guessing */
508	<	if (IsInvisible(c2ptr) && !IsServer(client_p))
509	<	c2ptr = NULL;
508	>	if (HasUMode(c2ptr, UMODE_INVISIBLE))
509	>	if (!IsServer(client_p) && !HasFlag(client_p, FLAGS_SERVICE))
510	>	c2ptr = NULL;
511		}
512		}
513		else
514	<	c2ptr = find_client(name);
514	>	c2ptr = hash_find_client(name);
515
516		return ((c2ptr != NULL && IsClient(c2ptr)) ? c2ptr : NULL);
517		}
#	Line 615 | Line 531 | find_chasing(struct Client *client_p, st
531		*chasing = 0;
532
533		if (who)
534	<	return(who);
534	>	return who;
535
536		if (IsDigit(*user))
537	<	return(NULL);
537	>	return NULL;
538
539		if ((who = get_history(user,
540		(time_t)ConfigFileEntry.kill_chase_time_limit))
#	Line 626 | Line 542 | find_chasing(struct Client *client_p, st
542		{
543		sendto_one(source_p, form_str(ERR_NOSUCHNICK),
544		me.name, source_p->name, user);
545	<	return(NULL);
545	>	return NULL;
546		}
547
548		if (chasing)
549		*chasing = 1;
550
551	<	return(who);
551	>	return who;
552		}
553
554		/*
#	Line 654 | Line 570 | find_chasing(struct Client *client_p, st
570		*        to modify what it points!!!
571		*/
572		const char *
573	<	get_client_name(struct Client *client, int showip)
573	>	get_client_name(const struct Client *client, enum addr_mask_type type)
574		{
575		static char nbuf[HOSTLEN * 2 + USERLEN + 5];
576
577		assert(client != NULL);
578
579	<	if (irccmp(client->name, client->host) == 0)
580	<	return(client->name);
579	>	if (!MyConnect(client))
580	>	return client->name;
581
582	<	if (ConfigServerHide.hide_server_ips)
583	<	if (IsServer(client) || IsConnecting(client) || IsHandshake(client))
584	<	showip = MASK_IP;
582	>	if (IsServer(client) || IsConnecting(client) || IsHandshake(client))
583	>	{
584	>	if (!irccmp(client->name, client->host))
585	>	return client->name;
586	>	else if (ConfigServerHide.hide_server_ips)
587	>	type = MASK_IP;
588	>	}
589
590		if (ConfigFileEntry.hide_spoof_ips)
591	<	if (showip == SHOW_IP && IsIPSpoof(client))
592	<	showip = MASK_IP;
591	>	if (type == SHOW_IP && IsIPSpoof(client))
592	>	type = MASK_IP;
593
594		/* And finally, let's get the host information, ip or name */
595	<	switch (showip)
595	>	switch (type)
596		{
597		case SHOW_IP:
598	<	if (MyConnect(client))
599	<	{
600	<	ircsprintf(nbuf, "%s[%s@%s]", client->name, client->username,
601	<	client->sockhost);
682	<	break;
683	<	}
598	>	snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
599	>	client->name,
600	>	client->username, client->sockhost);
601	>	break;
602		case MASK_IP:
603	<	ircsprintf(nbuf, "%s[%s@255.255.255.255]", client->name,
604	<	client->username);
603	>	if (client->localClient->aftype == AF_INET)
604	>	snprintf(nbuf, sizeof(nbuf), "%s[%s@255.255.255.255]",
605	>	client->name, client->username);
606	>	else
607	>	snprintf(nbuf, sizeof(nbuf), "%s[%s@ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]",
608	>	client->name, client->username);
609		break;
610		default:
611	<	ircsprintf(nbuf, "%s[%s@%s]", client->name, client->username,
612	<	client->host);
611	>	snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
612	>	client->name,
613	>	client->username, client->host);
614		}
615
616	<	return(nbuf);
616	>	return nbuf;
617		}
618
619		void
#	Line 719 | Line 642 | exit_one_client(struct Client *source_p,
642
643		assert(!IsMe(source_p));
644
645	<	if (IsServer(source_p))
723	<	{
724	<	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->server_list);
725	<
726	<	if ((lp = dlinkFindDelete(&global_serv_list, source_p)) != NULL)
727	<	free_dlink_node(lp);
728	<	}
729	<	else if (IsClient(source_p))
645	>	if (IsClient(source_p))
646		{
647		if (source_p->servptr->serv != NULL)
648		dlinkDelete(&source_p->lnode, &source_p->servptr->serv->client_list);
649
650	<	/* If a person is on a channel, send a QUIT notice
651	<	** to every client (person) on the same channel (so
652	<	** that the client can show the "**signoff" message).
653	<	** (Note: The notice is to the local clients *only*)
654	<	*/
650	>	/*
651	>	* If a person is on a channel, send a QUIT notice
652	>	* to every client (person) on the same channel (so
653	>	* that the client can show the "**signoff" message).
654	>	* (Note: The notice is to the local clients *only*)
655	>	*/
656		sendto_common_channels_local(source_p, 0, ":%s!%s@%s QUIT :%s",
657		source_p->name, source_p->username,
658		source_p->host, quitmsg);
#	Line 756 | Line 673 | exit_one_client(struct Client *source_p,
673		del_all_accepts(source_p);
674		}
675		}
676	+	else if (IsServer(source_p))
677	+	{
678	+	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->server_list);
679	+
680	+	if ((lp = dlinkFindDelete(&global_serv_list, source_p)) != NULL)
681	+	free_dlink_node(lp);
682	+	}
683
684		/* Remove source_p from the client lists */
685		if (HasID(source_p))
#	Line 795 | Line 719 | exit_one_client(struct Client *source_p,
719		static void
720		recurse_send_quits(struct Client *original_source_p, struct Client *source_p,
721		struct Client *from, struct Client *to, const char *comment,
722	<	const char *splitstr, const char *myname)
722	>	const char *splitstr)
723		{
724		dlink_node *ptr, *next;
725		struct Client *target_p;
802	–	int hidden = match(myname, source_p->name);
726
727		assert(to != source_p);  /* should be already removed from serv_list */
728
729		/* If this server can handle quit storm (QS) removal
730		* of dependents, just send the SQUIT
808	–	*
809	–	* Always check *all* dependent servers if some of them are
810	–	* hidden behind fakename. If so, send out the QUITs -adx
731		*/
732	<	if (hidden || !IsCapable(to, CAP_QS))
732	>	if (!IsCapable(to, CAP_QS))
733		DLINK_FOREACH_SAFE(ptr, next, source_p->serv->client_list.head)
734		{
735		target_p = ptr->data;
#	Line 818 | Line 738 | recurse_send_quits(struct Client *origin
738
739		DLINK_FOREACH_SAFE(ptr, next, source_p->serv->server_list.head)
740		recurse_send_quits(original_source_p, ptr->data, from, to,
741	<	comment, splitstr, myname);
741	>	comment, splitstr);
742
743	<	if (!hidden && ((source_p == original_source_p && to != from) ||
744	<	!IsCapable(to, CAP_QS)))
743	>	if ((source_p == original_source_p && to != from) ||
744	>	!IsCapable(to, CAP_QS))
745		{
746		/* don't use a prefix here - we have to be 100% sure the message
747		* will be accepted without Unknown prefix etc.. */
#	Line 859 | Line 779 | static void
779		remove_dependents(struct Client *source_p, struct Client *from,
780		const char *comment, const char *splitstr)
781		{
782	<	struct Client *to;
863	<	struct ConfItem *conf;
864	<	static char myname[HOSTLEN+1];
865	<	dlink_node *ptr;
782	>	dlink_node *ptr = NULL;
783
784		DLINK_FOREACH(ptr, serv_list.head)
785	<	{
786	<	to = ptr->data;
870	<
871	<	if ((conf = to->serv->sconf) != NULL)
872	<	strlcpy(myname, my_name_for_link(conf), sizeof(myname));
873	<	else
874	<	strlcpy(myname, me.name, sizeof(myname));
875	<	recurse_send_quits(source_p, source_p, from, to,
876	<	comment, splitstr, myname);
877	<	}
785	>	recurse_send_quits(source_p, source_p, from, ptr->data,
786	>	comment, splitstr);
787
788		recurse_remove_clients(source_p, splitstr);
789		}
#	Line 884 | Line 793 | remove_dependents(struct Client *source_
793		* this on any struct Client, regardless of its state.
794		*
795		* Note, you shouldn't exit remote _users_ without first doing
796	<	* SetKilled and propagating a kill or similar message. However,
797	<	* it is perfectly correct to call exit_client to force a _server_
796	>	* AddFlag(x, FLAGS_KILLED) and propagating a kill or similar message.
797	>	* However, it is perfectly correct to call exit_client to force a _server_
798		* quit (either local or remote one).
799		*
800		* inputs:       - a client pointer that is going to be exited
#	Line 900 | Line 809 | remove_dependents(struct Client *source_
809		void
810		exit_client(struct Client *source_p, struct Client *from, const char *comment)
811		{
812	<	dlink_node *m;
812	>	dlink_node *m = NULL;
813
814		if (MyConnect(source_p))
815		{
#	Line 921 | Line 830 | exit_client(struct Client *source_p, str
830		source_p->localClient->auth = NULL;
831		}
832
833	<	/* This source_p could have status of one of STAT_UNKNOWN, STAT_CONNECTING
833	>	/*
834	>	* This source_p could have status of one of STAT_UNKNOWN, STAT_CONNECTING
835		* STAT_HANDSHAKE or STAT_UNKNOWN
836		* all of which are lumped together into unknown_list
837		*
#	Line 929 | Line 839 | exit_client(struct Client *source_p, str
839		*/
840		if (!IsRegistered(source_p))
841		{
842	<	if ((m = dlinkFindDelete(&unknown_list, source_p)) != NULL)
843	<	free_dlink_node(m);
842	>	assert(dlinkFind(&unknown_list, source_p));
843	>
844	>	dlinkDelete(&source_p->localClient->lclient_node, &unknown_list);
845		}
846		else if (IsClient(source_p))
847		{
848	+	time_t on_for = CurrentTime - source_p->localClient->firsttime;
849		assert(Count.local > 0);
850		Count.local--;
851
852	<	if (IsOper(source_p))
941	<	{
852	>	if (HasUMode(source_p, UMODE_OPER))
853		if ((m = dlinkFindDelete(&oper_list, source_p)) != NULL)
854		free_dlink_node(m);
944	–	}
855
856	+	assert(dlinkFind(&local_client_list, source_p));
857		dlinkDelete(&source_p->localClient->lclient_node, &local_client_list);
858	+
859		if (source_p->localClient->list_task != NULL)
860		free_list_task(source_p->localClient->list_task, source_p);
861
862		watch_del_watch_list(source_p);
863	<	sendto_realops_flags(UMODE_CCONN, L_ALL, "Client exiting: %s (%s@%s) [%s] [%s]",
863	>	sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
864	>	"Client exiting: %s (%s@%s) [%s] [%s]",
865		source_p->name, source_p->username, source_p->host, comment,
866		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
867		"255.255.255.255" : source_p->sockhost);
868	<	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL, "CLIEXIT: %s %s %s %s 0 %s",
868	>	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL, SEND_NOTICE,
869	>	"CLIEXIT: %s %s %s %s 0 %s",
870		source_p->name,
871		source_p->username,
872		source_p->host,
959	–
873		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
874		"255.255.255.255" : source_p->sockhost,
875		comment);
876	+	ilog(LOG_TYPE_USER, "%s (%3u:%02u:%02u): %s!%s@%s %llu/%llu",
877	+	myctime(source_p->localClient->firsttime), (unsigned int)(on_for / 3600),
878	+	(unsigned int)((on_for % 3600)/60), (unsigned int)(on_for % 60),
879	+	source_p->name, source_p->username, source_p->host,
880	+	source_p->localClient->send.bytes>>10,
881	+	source_p->localClient->recv.bytes>>10);
882	+	}
883	+	else if (IsServer(source_p))
884	+	{
885	+	assert(Count.myserver > 0);
886	+	--Count.myserver;
887	+
888	+	assert(dlinkFind(&serv_list, source_p));
889	+	dlinkDelete(&source_p->localClient->lclient_node, &serv_list);
890	+	unset_chcap_usage_counts(source_p);
891		}
892
965	–	/* As soon as a client is known to be a server of some sort
966	–	* it has to be put on the serv_list, or SJOIN's to this new server
967	–	* from the connect burst will not be seen.
968	–	*/
969	–	if (IsServer(source_p) || IsConnecting(source_p) ||
970	–	IsHandshake(source_p))
971	–	{
972	–	if ((m = dlinkFindDelete(&serv_list, source_p)) != NULL)
973	–	{
974	–	free_dlink_node(m);
975	–	unset_chcap_usage_counts(source_p);
976	–	}
977	–
978	–	if (IsServer(source_p))
979	–	Count.myserver--;
980	–	}
981	–
982	–	log_user_exit(source_p);
983	–
893		if (!IsDead(source_p))
894		{
895		if (IsServer(source_p))
#	Line 1029 | Line 938 | exit_client(struct Client *source_p, str
938
939		if (source_p->servptr == &me)
940		{
941	<	sendto_realops_flags(UMODE_ALL, L_ALL,
941	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
942		"%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
943	<	source_p->name, (int)(CurrentTime - source_p->firsttime),
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	<	ilog(L_NOTICE, "%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
947	<	source_p->name, (int)(CurrentTime - source_p->firsttime),
946	>	ilog(LOG_TYPE_IRCD, "%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
947	>	source_p->name, (int)(CurrentTime - source_p->localClient->firsttime),
948		source_p->localClient->send.bytes >> 10,
949		source_p->localClient->recv.bytes >> 10);
950		}
951		}
952	<	else if (IsClient(source_p) && !IsKilled(source_p))
952	>	else if (IsClient(source_p) && !HasFlag(source_p, FLAGS_KILLED))
953		{
954	<	sendto_server(from->from, NULL, CAP_TS6, NOCAPS,
954	>	sendto_server(from->from, CAP_TS6, NOCAPS,
955		":%s QUIT :%s", ID(source_p), comment);
956	<	sendto_server(from->from, NULL, NOCAPS, CAP_TS6,
956	>	sendto_server(from->from, NOCAPS, CAP_TS6,
957		":%s QUIT :%s", source_p->name, comment);
958		}
959
#	Line 1103 | Line 1012 | dead_link_on_read(struct Client *client_
1012
1013		if (IsServer(client_p) || IsHandshake(client_p))
1014		{
1015	<	int connected = CurrentTime - client_p->firsttime;
1015	>	int connected = CurrentTime - client_p->localClient->firsttime;
1016
1017		if (error == 0)
1018		{
1019		/* Admins get the real IP */
1020	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1020	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1021		"Server %s closed the connection",
1022		get_client_name(client_p, SHOW_IP));
1023
1024		/* Opers get a masked IP */
1025	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1025	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1026		"Server %s closed the connection",
1027		get_client_name(client_p, MASK_IP));
1028
1029	<	ilog(L_NOTICE, "Server %s closed the connection",
1029	>	ilog(LOG_TYPE_IRCD, "Server %s closed the connection",
1030		get_client_name(client_p, SHOW_IP));
1031		}
1032		else
#	Line 1128 | Line 1037 | dead_link_on_read(struct Client *client_
1037		get_client_name(client_p, MASK_IP), current_error);
1038		}
1039
1040	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1040	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1041		"%s had been connected for %d day%s, %2d:%02d:%02d",
1042		client_p->name, connected/86400,
1043		(connected/86400 == 1) ? "" : "s",
#	Line 1140 | Line 1049 | dead_link_on_read(struct Client *client_
1049		strlcpy(errmsg, "Remote host closed the connection",
1050		sizeof(errmsg));
1051		else
1052	<	ircsprintf(errmsg, "Read error: %s",
1053	<	strerror(current_error));
1052	>	snprintf(errmsg, sizeof(errmsg), "Read error: %s",
1053	>	strerror(current_error));
1054
1055		exit_client(client_p, &me, errmsg);
1056		}
#	Line 1160 | Line 1069 | exit_aborted_clients(void)
1069
1070		if (target_p == NULL)
1071		{
1072	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1072	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1073		"Warning: null client on abort_list!");
1074		dlinkDelete(ptr, &abort_list);
1075		free_dlink_node(ptr);
#	Line 1238 | Line 1147 | accept_message(struct Client *source,
1147		source->host, target, 1))
1148		return 1;
1149
1150	<	if (IsSoftCallerId(target))
1150	>	if (HasUMode(target, UMODE_SOFTCALLERID))
1151		DLINK_FOREACH(ptr, target->channel.head)
1152		if (IsMember(source, ((struct Membership *)ptr->data)->chptr))
1153		return 1;
#	Line 1260 | Line 1169 | del_all_accepts(struct Client *client_p)
1169		DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->acceptlist.head)
1170		del_accept(ptr->data, client_p);
1171		}
1263	–
1264	–	/* change_local_nick()
1265	–	*
1266	–	* inputs       - pointer to server
1267	–	*              - pointer to client
1268	–	*              - nick
1269	–	* output       -
1270	–	* side effects - changes nick of a LOCAL user
1271	–	*/
1272	–	void
1273	–	change_local_nick(struct Client *client_p, struct Client *source_p, const char *nick)
1274	–	{
1275	–	int samenick = 0;
1276	–
1277	–	assert(source_p->name[0] && !EmptyString(nick));
1278	–
1279	–	/*
1280	–	* Client just changing his/her nick. If he/she is
1281	–	* on a channel, send note of change to all clients
1282	–	* on that channel. Propagate notice to other servers.
1283	–	*/
1284	–	if ((source_p->localClient->last_nick_change +
1285	–	ConfigFileEntry.max_nick_time) < CurrentTime)
1286	–	source_p->localClient->number_of_nick_changes = 0;
1287	–	source_p->localClient->last_nick_change = CurrentTime;
1288	–	source_p->localClient->number_of_nick_changes++;
1289	–
1290	–	if ((ConfigFileEntry.anti_nick_flood &&
1291	–	(source_p->localClient->number_of_nick_changes
1292	–	<= ConfigFileEntry.max_nick_changes)) ||
1293	–	!ConfigFileEntry.anti_nick_flood ||
1294	–	(IsOper(source_p) && ConfigFileEntry.no_oper_flood))
1295	–	{
1296	–	samenick = !irccmp(source_p->name, nick);
1297	–
1298	–	if (!samenick)
1299	–	{
1300	–	source_p->tsinfo = CurrentTime;
1301	–	clear_ban_cache_client(source_p);
1302	–	watch_check_hash(source_p, RPL_LOGOFF);
1303	–	}
1304	–
1305	–	/* XXX - the format of this notice should eventually be changed
1306	–	* to either %s[%s@%s], or even better would be get_client_name() -bill
1307	–	*/
1308	–	sendto_realops_flags(UMODE_NCHANGE, L_ALL, "Nick change: From %s to %s [%s@%s]",
1309	–	source_p->name, nick, source_p->username, source_p->host);
1310	–	sendto_common_channels_local(source_p, 1, ":%s!%s@%s NICK :%s",
1311	–	source_p->name, source_p->username,
1312	–	source_p->host, nick);
1313	–	add_history(source_p, 1);
1314	–
1315	–	sendto_server(client_p, NULL, CAP_TS6, NOCAPS,
1316	–	":%s NICK %s :%lu",
1317	–	ID(source_p), nick, (unsigned long)source_p->tsinfo);
1318	–	sendto_server(client_p, NULL, NOCAPS, CAP_TS6,
1319	–	":%s NICK %s :%lu",
1320	–	source_p->name, nick, (unsigned long)source_p->tsinfo);
1321	–
1322	–	hash_del_client(source_p);
1323	–	strcpy(source_p->name, nick);
1324	–	hash_add_client(source_p);
1325	–
1326	–	if (!samenick)
1327	–	watch_check_hash(source_p, RPL_LOGON);
1328	–
1329	–	/* fd_desc is long enough */
1330	–	fd_note(&client_p->localClient->fd, "Nick: %s", nick);
1331	–	}
1332	–	else
1333	–	sendto_one(source_p, form_str(ERR_NICKTOOFAST),
1334	–	me.name, source_p->name, source_p->name,
1335	–	nick, ConfigFileEntry.max_nick_time);
1336	–	}

Diff Legend

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