ViewVC Help

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

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

Comparing:
ircd-hybrid-8/src/client.c (file contents), Revision 1176 by michael, Sun Aug 14 11:24:24 2011 UTC vs.
ircd-hybrid/trunk/src/client.c (file contents), Revision 1632 by michael, Sun Nov 4 15:37:10 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"
#	Line 37 | Line 36
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 75 | 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 *, struct ConfItem *);
77	>	static void ban_them(struct Client *, struct MaskItem *);
78
79
80		/* init_client()
#	Line 117 | 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, &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 148 | 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
154	–	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 245 | Line 251 | check_pings_list(dlink_list *list)
251		continue;
252		}
253
248	–	if (client_p->localClient->reject_delay > 0)
249	–	{
250	–	if (client_p->localClient->reject_delay <= CurrentTime)
251	–	exit_client(client_p, &me, "Rejected");
252	–	continue;
253	–	}
254	–
254		if (!IsRegistered(client_p))
255		ping = CONNECTTIMEOUT, pingwarn = 0;
256		else
257	<	ping = get_client_ping(client_p, &pingwarn);
257	>	ping = get_client_ping(&client_p->localClient->confs, &pingwarn);
258
259	<	if (ping < CurrentTime - client_p->lasttime)
259	>	if (ping < CurrentTime - client_p->localClient->lasttime)
260		{
261		if (!IsPingSent(client_p))
262		{
#	Line 268 | Line 267 | check_pings_list(dlink_list *list)
267		*/
268		SetPingSent(client_p);
269		ClearPingWarning(client_p);
270	<	client_p->lasttime = CurrentTime - ping;
270	>	client_p->localClient->lasttime = CurrentTime - ping;
271		sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
272		}
273		else
274		{
275	<	if (CurrentTime - client_p->lasttime >= 2 * ping)
275	>	if (CurrentTime - client_p->localClient->lasttime >= 2 * ping)
276		{
277		/*
278		* If the client/server hasn't talked to us in 2*ping seconds
#	Line 281 | Line 280 | check_pings_list(dlink_list *list)
280		*/
281		if (IsServer(client_p) || IsHandshake(client_p))
282		{
283	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
283	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
284		"No response from %s, closing link",
285		get_client_name(client_p, HIDE_IP));
286	<	sendto_realops_flags(UMODE_ALL, L_OPER,
286	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
287		"No response from %s, closing link",
288		get_client_name(client_p, MASK_IP));
289	<	ilog(L_NOTICE, "No response from %s, closing link",
289	>	ilog(LOG_TYPE_IRCD, "No response from %s, closing link",
290		get_client_name(client_p, HIDE_IP));
291		}
292
293		snprintf(scratch, sizeof(scratch), "Ping timeout: %d seconds",
294	<	(int)(CurrentTime - client_p->lasttime));
294	>	(int)(CurrentTime - client_p->localClient->lasttime));
295		exit_client(client_p, &me, scratch);
296		}
297		else if (!IsPingWarning(client_p) && pingwarn > 0 &&
298		(IsServer(client_p) || IsHandshake(client_p)) &&
299	<	CurrentTime - client_p->lasttime >= ping + pingwarn)
299	>	CurrentTime - client_p->localClient->lasttime >= ping + pingwarn)
300		{
301		/*
302		* If the server hasn't replied in pingwarn seconds after sending
303		* the PING, notify the opers so that they are aware of the problem.
304		*/
305		SetPingWarning(client_p);
306	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
306	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
307		"Warning, no response from %s in %d seconds",
308		get_client_name(client_p, HIDE_IP), pingwarn);
309	<	sendto_realops_flags(UMODE_ALL, L_OPER,
309	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
310		"Warning, no response from %s in %d seconds",
311		get_client_name(client_p, MASK_IP), pingwarn);
312	<	ilog(L_NOTICE, "No response from %s in %d seconds",
312	>	ilog(LOG_TYPE_IRCD, "No response from %s in %d seconds",
313		get_client_name(client_p, HIDE_IP), pingwarn);
314		}
315		}
#	Line 333 | Line 332 | check_unknowns_list(void)
332		{
333		struct Client *client_p = ptr->data;
334
336	–	if (client_p->localClient->reject_delay > 0)
337	–	{
338	–	if (client_p->localClient->reject_delay <= CurrentTime)
339	–	exit_client(client_p, &me, "Rejected");
340	–	continue;
341	–	}
342	–
335		/*
336		* Check UNKNOWN connections - if they have been in this state
337		* for > 30s, close them.
338		*/
339	<	if (IsAuthFinished(client_p) && (CurrentTime - client_p->firsttime) > 30)
339	>	if (IsAuthFinished(client_p) && (CurrentTime - client_p->localClient->firsttime) > 30)
340		exit_client(client_p, &me, "Registration timed out");
341		}
342		}
#	Line 360 | Line 352 | void
352		check_conf_klines(void)
353		{
354		struct Client *client_p = NULL;       /* current local client_p being examined */
355	<	struct AccessItem *aconf = NULL;
364	<	struct ConfItem *conf = NULL;
355	>	struct MaskItem *conf = NULL;
356		dlink_node *ptr, *next_ptr;
357
358		DLINK_FOREACH_SAFE(ptr, next_ptr, local_client_list.head)
#	Line 373 | Line 364 | check_conf_klines(void)
364		if (IsDead(client_p) || !IsClient(client_p))
365		continue;
366
367	<	/* if there is a returned struct ConfItem then kill it */
377	<	if ((aconf = find_dline_conf(&client_p->localClient->ip,
367	>	if ((conf = find_dline_conf(&client_p->localClient->ip,
368		client_p->localClient->aftype)) != NULL)
369		{
370	<	if (aconf->status & CONF_EXEMPTDLINE)
370	>	if (conf->status & CONF_EXEMPT)
371		continue;
372
383	–	conf = unmap_conf_item(aconf);
373		ban_them(client_p, conf);
374		continue; /* and go examine next fd/client_p */
375		}
376
377	<	if (ConfigFileEntry.glines && (aconf = find_gline(client_p)))
377	>	if (ConfigFileEntry.glines && (conf = find_gline(client_p)))
378		{
379		if (IsExemptKline(client_p) ||
380		IsExemptGline(client_p))
381		{
382	<	sendto_realops_flags(UMODE_ALL, L_ALL,
382	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
383		"GLINE over-ruled for %s, client is %sline_exempt",
384		get_client_name(client_p, HIDE_IP), IsExemptKline(client_p) ? "k" : "g");
385		continue;
386		}
387
399	–	conf = unmap_conf_item(aconf);
388		ban_them(client_p, conf);
389		/* and go examine next fd/client_p */
390		continue;
391		}
392
393	<	if ((aconf = find_kill(client_p)) != NULL)
393	>	if ((conf = find_kill(client_p)) != NULL)
394		{
407	–
408	–	/* if there is a returned struct AccessItem.. then kill it */
395		if (IsExemptKline(client_p))
396		{
397	<	sendto_realops_flags(UMODE_ALL, L_ALL,
397	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
398		"KLINE over-ruled for %s, client is kline_exempt",
399		get_client_name(client_p, HIDE_IP));
400		continue;
401		}
402
417	–	conf = unmap_conf_item(aconf);
403		ban_them(client_p, conf);
404		continue;
405		}
406
407	<	/* if there is a returned struct MatchItem then kill it */
423	<	if ((conf = find_matching_name_conf(XLINE_TYPE,  client_p->info,
407	>	if ((conf = find_matching_name_conf(CONF_XLINE,  client_p->info,
408		NULL, NULL, 0)) != NULL ||
409	<	(conf = find_matching_name_conf(RXLINE_TYPE, client_p->info,
409	>	(conf = find_matching_name_conf(CONF_RXLINE, client_p->info,
410		NULL, NULL, 0)) != NULL)
411		{
412		ban_them(client_p, conf);
#	Line 435 | Line 419 | check_conf_klines(void)
419		{
420		client_p = ptr->data;
421
422	<	if ((aconf = find_dline_conf(&client_p->localClient->ip,
423	<	client_p->localClient->aftype)))
422	>	if ((conf = find_dline_conf(&client_p->localClient->ip,
423	>	client_p->localClient->aftype)))
424		{
425	<	if (aconf->status & CONF_EXEMPTDLINE)
425	>	if (conf->status & CONF_EXEMPT)
426		continue;
427
428		exit_client(client_p, &me, "D-lined");
#	Line 450 | Line 434 | check_conf_klines(void)
434		* ban_them
435		*
436		* inputs       - pointer to client to ban
437	<	*              - pointer to ConfItem
437	>	*              - pointer to MaskItem
438		* output       - NONE
439		* side effects - given client_p is banned
440		*/
441		static void
442	<	ban_them(struct Client *client_p, struct ConfItem *conf)
442	>	ban_them(struct Client *client_p, struct MaskItem *conf)
443		{
444		const char *user_reason = NULL;       /* What is sent to user */
461	–	const char *channel_reason = NULL;    /* What is sent to channel */
462	–	struct AccessItem *aconf = NULL;
463	–	struct MatchItem *xconf = NULL;
445		const char *type_string = NULL;
446		const char dline_string[] = "D-line";
447		const char kline_string[] = "K-line";
#	Line 469 | Line 450 | ban_them(struct Client *client_p, struct
450
451		switch (conf->type)
452		{
453	<	case RKLINE_TYPE:
454	<	case KLINE_TYPE:
453	>	case CONF_RKLINE:
454	>	case CONF_KLINE:
455		type_string = kline_string;
475	–	aconf = map_to_conf(conf);
456		break;
457	<	case DLINE_TYPE:
457	>	case CONF_DLINE:
458		type_string = dline_string;
479	–	aconf = map_to_conf(conf);
459		break;
460	<	case GLINE_TYPE:
460	>	case CONF_GLINE:
461		type_string = gline_string;
483	–	aconf = map_to_conf(conf);
462		break;
463	<	case RXLINE_TYPE:
464	<	case XLINE_TYPE:
463	>	case CONF_RXLINE:
464	>	case CONF_XLINE:
465		type_string = xline_string;
466	<	xconf = map_to_conf(conf);
489	<	++xconf->count;
466	>	++conf->count;
467		break;
468		default:
469		assert(0);
470		break;
471		}
472
473	<	if (ConfigFileEntry.kline_with_reason)
497	<	{
498	<	if (aconf != NULL)
499	<	user_reason = aconf->reason ? aconf->reason : type_string;
500	<	if (xconf != NULL)
501	<	user_reason = xconf->reason ? xconf->reason : type_string;
502	<	}
503	<	else
504	<	user_reason = type_string;
505	<
506	<	if (ConfigFileEntry.kline_reason != NULL)
507	<	channel_reason = ConfigFileEntry.kline_reason;
508	<	else
509	<	channel_reason = user_reason;
473	>	user_reason = conf->reason ? conf->reason : type_string;
474
475	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s active for %s",
475	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s active for %s",
476		type_string, get_client_name(client_p, HIDE_IP));
477
478		if (IsClient(client_p))
479		sendto_one(client_p, form_str(ERR_YOUREBANNEDCREEP),
480		me.name, client_p->name, user_reason);
481
482	<	exit_client(client_p, &me, channel_reason);
482	>	exit_client(client_p, &me, user_reason);
483		}
484
485		/* update_client_exit_stats()
#	Line 531 | Line 495 | update_client_exit_stats(struct Client *
495		{
496		assert(Count.total > 0);
497		--Count.total;
498	<	if (IsOper(client_p))
498	>	if (HasUMode(client_p, UMODE_OPER))
499		--Count.oper;
500	<	if (IsInvisible(client_p))
500	>	if (HasUMode(client_p, UMODE_INVISIBLE))
501		--Count.invisi;
502		}
503		else if (IsServer(client_p))
504	<	sendto_realops_flags(UMODE_EXTERNAL, L_ALL, "Server %s split from %s",
504	>	sendto_realops_flags(UMODE_EXTERNAL, L_ALL, SEND_NOTICE,
505	>	"Server %s split from %s",
506		client_p->name, client_p->servptr->name);
507
508		if (splitchecking && !splitmode)
#	Line 550 | Line 515 | update_client_exit_stats(struct Client *
515		* output       - return client pointer
516		* side effects - find person by (nick)name
517		*/
553	–	/* XXX - ugly wrapper */
518		struct Client *
519		find_person(const struct Client *client_p, const char *name)
520		{
521	<	struct Client *c2ptr;
521	>	struct Client *c2ptr = NULL;
522
523		if (IsDigit(*name))
524		{
525		if ((c2ptr = hash_find_id(name)) != NULL)
526		{
527		/* invisible users shall not be found by UID guessing */
528	<	if (IsInvisible(c2ptr) && !IsServer(client_p))
529	<	c2ptr = NULL;
528	>	if (HasUMode(c2ptr, UMODE_INVISIBLE))
529	>	if (!IsServer(client_p) && !HasFlag(client_p, FLAGS_SERVICE))
530	>	c2ptr = NULL;
531		}
532		}
533		else
#	Line 625 | Line 590 | find_chasing(struct Client *client_p, st
590		*        to modify what it points!!!
591		*/
592		const char *
593	<	get_client_name(const struct Client *client, int showip)
593	>	get_client_name(const struct Client *client, enum addr_mask_type type)
594		{
595		static char nbuf[HOSTLEN * 2 + USERLEN + 5];
596
597		assert(client != NULL);
598
599	<	if (irccmp(client->name, client->host) == 0)
599	>	if (!MyConnect(client))
600		return client->name;
601
602	<	if (ConfigServerHide.hide_server_ips)
603	<	if (IsServer(client) || IsConnecting(client) || IsHandshake(client))
604	<	showip = MASK_IP;
602	>	if (IsServer(client) || IsConnecting(client) || IsHandshake(client))
603	>	{
604	>	if (!irccmp(client->name, client->host))
605	>	return client->name;
606	>	else if (ConfigServerHide.hide_server_ips)
607	>	type = MASK_IP;
608	>	}
609
610		if (ConfigFileEntry.hide_spoof_ips)
611	<	if (showip == SHOW_IP && IsIPSpoof(client))
612	<	showip = MASK_IP;
611	>	if (type == SHOW_IP && IsIPSpoof(client))
612	>	type = MASK_IP;
613
614		/* And finally, let's get the host information, ip or name */
615	<	switch (showip)
615	>	switch (type)
616		{
617		case SHOW_IP:
618	<	if (MyConnect(client))
619	<	{
620	<	snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
621	<	client->name,
653	<	client->username, client->sockhost);
654	<	break;
655	<	}
618	>	snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
619	>	client->name,
620	>	client->username, client->sockhost);
621	>	break;
622		case MASK_IP:
623	<	snprintf(nbuf, sizeof(nbuf), "%s[%s@255.255.255.255]",
624	<	client->name, client->username);
623	>	if (client->localClient->aftype == AF_INET)
624	>	snprintf(nbuf, sizeof(nbuf), "%s[%s@255.255.255.255]",
625	>	client->name, client->username);
626	>	else
627	>	snprintf(nbuf, sizeof(nbuf), "%s[%s@ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]",
628	>	client->name, client->username);
629		break;
630		default:
631		snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
#	Line 773 | Line 743 | recurse_send_quits(struct Client *origin
743		{
744		dlink_node *ptr, *next;
745		struct Client *target_p;
776	–	int hidden = match(me.name, source_p->name); /* XXX */
746
747		assert(to != source_p);  /* should be already removed from serv_list */
748
749		/* If this server can handle quit storm (QS) removal
750		* of dependents, just send the SQUIT
782	–	*
783	–	* Always check *all* dependent servers if some of them are
784	–	* hidden behind fakename. If so, send out the QUITs -adx
751		*/
752	<	if (hidden || !IsCapable(to, CAP_QS))
752	>	if (!IsCapable(to, CAP_QS))
753		DLINK_FOREACH_SAFE(ptr, next, source_p->serv->client_list.head)
754		{
755		target_p = ptr->data;
#	Line 794 | Line 760 | recurse_send_quits(struct Client *origin
760		recurse_send_quits(original_source_p, ptr->data, from, to,
761		comment, splitstr);
762
763	<	if (!hidden && ((source_p == original_source_p && to != from) ||
764	<	!IsCapable(to, CAP_QS)))
763	>	if ((source_p == original_source_p && to != from) ||
764	>	!IsCapable(to, CAP_QS))
765		{
766		/* don't use a prefix here - we have to be 100% sure the message
767		* will be accepted without Unknown prefix etc.. */
#	Line 847 | Line 813 | remove_dependents(struct Client *source_
813		* this on any struct Client, regardless of its state.
814		*
815		* Note, you shouldn't exit remote _users_ without first doing
816	<	* SetKilled and propagating a kill or similar message. However,
817	<	* it is perfectly correct to call exit_client to force a _server_
816	>	* AddFlag(x, FLAGS_KILLED) and propagating a kill or similar message.
817	>	* However, it is perfectly correct to call exit_client to force a _server_
818		* quit (either local or remote one).
819		*
820		* inputs:       - a client pointer that is going to be exited
#	Line 884 | Line 850 | exit_client(struct Client *source_p, str
850		source_p->localClient->auth = NULL;
851		}
852
853	<	/* This source_p could have status of one of STAT_UNKNOWN, STAT_CONNECTING
853	>	/*
854	>	* This source_p could have status of one of STAT_UNKNOWN, STAT_CONNECTING
855		* STAT_HANDSHAKE or STAT_UNKNOWN
856		* all of which are lumped together into unknown_list
857		*
#	Line 898 | Line 865 | exit_client(struct Client *source_p, str
865		}
866		else if (IsClient(source_p))
867		{
868	+	time_t on_for = CurrentTime - source_p->localClient->firsttime;
869		assert(Count.local > 0);
870		Count.local--;
871
872	<	if (IsOper(source_p))
905	<	{
872	>	if (HasUMode(source_p, UMODE_OPER))
873		if ((m = dlinkFindDelete(&oper_list, source_p)) != NULL)
874		free_dlink_node(m);
908	–	}
875
876		assert(dlinkFind(&local_client_list, source_p));
877		dlinkDelete(&source_p->localClient->lclient_node, &local_client_list);
#	Line 914 | Line 880 | exit_client(struct Client *source_p, str
880		free_list_task(source_p->localClient->list_task, source_p);
881
882		watch_del_watch_list(source_p);
883	<	sendto_realops_flags(UMODE_CCONN, L_ALL, "Client exiting: %s (%s@%s) [%s] [%s]",
883	>	sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
884	>	"Client exiting: %s (%s@%s) [%s] [%s]",
885		source_p->name, source_p->username, source_p->host, comment,
886		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
887		"255.255.255.255" : source_p->sockhost);
888	<	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL, "CLIEXIT: %s %s %s %s 0 %s",
888	>	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL, SEND_NOTICE,
889	>	"CLIEXIT: %s %s %s %s 0 %s",
890		source_p->name,
891		source_p->username,
892		source_p->host,
925	–
893		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
894		"255.255.255.255" : source_p->sockhost,
895		comment);
896	+	ilog(LOG_TYPE_USER, "%s (%3u:%02u:%02u): %s!%s@%s %llu/%llu",
897	+	myctime(source_p->localClient->firsttime), (unsigned int)(on_for / 3600),
898	+	(unsigned int)((on_for % 3600)/60), (unsigned int)(on_for % 60),
899	+	source_p->name, source_p->username, source_p->host,
900	+	source_p->localClient->send.bytes>>10,
901	+	source_p->localClient->recv.bytes>>10);
902	+	}
903	+	else if (IsServer(source_p))
904	+	{
905	+	assert(Count.myserver > 0);
906	+	--Count.myserver;
907	+
908	+	assert(dlinkFind(&serv_list, source_p));
909	+	dlinkDelete(&source_p->localClient->lclient_node, &serv_list);
910	+	unset_chcap_usage_counts(source_p);
911		}
912
931	–	/* As soon as a client is known to be a server of some sort
932	–	* it has to be put on the serv_list, or SJOIN's to this new server
933	–	* from the connect burst will not be seen.
934	–	*/
935	–	if (IsServer(source_p) || IsConnecting(source_p) ||
936	–	IsHandshake(source_p))
937	–	{
938	–	if ((m = dlinkFindDelete(&serv_list, source_p)) != NULL)
939	–	{
940	–	free_dlink_node(m);
941	–	unset_chcap_usage_counts(source_p);
942	–	}
943	–
944	–	if (IsServer(source_p))
945	–	Count.myserver--;
946	–	}
947	–
948	–	log_user_exit(source_p);
949	–
913		if (!IsDead(source_p))
914		{
915		if (IsServer(source_p))
#	Line 995 | Line 958 | exit_client(struct Client *source_p, str
958
959		if (source_p->servptr == &me)
960		{
961	<	sendto_realops_flags(UMODE_ALL, L_ALL,
961	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
962		"%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
963	<	source_p->name, (int)(CurrentTime - source_p->firsttime),
963	>	source_p->name, (int)(CurrentTime - source_p->localClient->firsttime),
964		source_p->localClient->send.bytes >> 10,
965		source_p->localClient->recv.bytes >> 10);
966	<	ilog(L_NOTICE, "%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
967	<	source_p->name, (int)(CurrentTime - source_p->firsttime),
966	>	ilog(LOG_TYPE_IRCD, "%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
967	>	source_p->name, (int)(CurrentTime - source_p->localClient->firsttime),
968		source_p->localClient->send.bytes >> 10,
969		source_p->localClient->recv.bytes >> 10);
970		}
971		}
972	<	else if (IsClient(source_p) && !IsKilled(source_p))
972	>	else if (IsClient(source_p) && !HasFlag(source_p, FLAGS_KILLED))
973		{
974	<	sendto_server(from->from, NULL, CAP_TS6, NOCAPS,
974	>	sendto_server(from->from, CAP_TS6, NOCAPS,
975		":%s QUIT :%s", ID(source_p), comment);
976	<	sendto_server(from->from, NULL, NOCAPS, CAP_TS6,
976	>	sendto_server(from->from, NOCAPS, CAP_TS6,
977		":%s QUIT :%s", source_p->name, comment);
978		}
979
#	Line 1069 | Line 1032 | dead_link_on_read(struct Client *client_
1032
1033		if (IsServer(client_p) || IsHandshake(client_p))
1034		{
1035	<	int connected = CurrentTime - client_p->firsttime;
1035	>	int connected = CurrentTime - client_p->localClient->firsttime;
1036
1037		if (error == 0)
1038		{
1039		/* Admins get the real IP */
1040	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1040	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1041		"Server %s closed the connection",
1042		get_client_name(client_p, SHOW_IP));
1043
1044		/* Opers get a masked IP */
1045	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1045	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1046		"Server %s closed the connection",
1047		get_client_name(client_p, MASK_IP));
1048
1049	<	ilog(L_NOTICE, "Server %s closed the connection",
1049	>	ilog(LOG_TYPE_IRCD, "Server %s closed the connection",
1050		get_client_name(client_p, SHOW_IP));
1051		}
1052		else
#	Line 1094 | Line 1057 | dead_link_on_read(struct Client *client_
1057		get_client_name(client_p, MASK_IP), current_error);
1058		}
1059
1060	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1060	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1061		"%s had been connected for %d day%s, %2d:%02d:%02d",
1062		client_p->name, connected/86400,
1063		(connected/86400 == 1) ? "" : "s",
#	Line 1126 | Line 1089 | exit_aborted_clients(void)
1089
1090		if (target_p == NULL)
1091		{
1092	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1092	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1093		"Warning: null client on abort_list!");
1094		dlinkDelete(ptr, &abort_list);
1095		free_dlink_node(ptr);
#	Line 1204 | Line 1167 | accept_message(struct Client *source,
1167		source->host, target, 1))
1168		return 1;
1169
1170	<	if (IsSoftCallerId(target))
1170	>	if (HasUMode(target, UMODE_SOFTCALLERID))
1171		DLINK_FOREACH(ptr, target->channel.head)
1172		if (IsMember(source, ((struct Membership *)ptr->data)->chptr))
1173		return 1;
#	Line 1226 | Line 1189 | del_all_accepts(struct Client *client_p)
1189		DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->acceptlist.head)
1190		del_accept(ptr->data, client_p);
1191		}
1229	–
1230	–	/* change_local_nick()
1231	–	*
1232	–	* inputs       - pointer to server
1233	–	*              - pointer to client
1234	–	*              - nick
1235	–	* output       -
1236	–	* side effects - changes nick of a LOCAL user
1237	–	*/
1238	–	void
1239	–	change_local_nick(struct Client *client_p, struct Client *source_p, const char *nick)
1240	–	{
1241	–	int samenick = 0;
1242	–
1243	–	assert(source_p->name[0] && !EmptyString(nick));
1244	–
1245	–	/*
1246	–	* Client just changing his/her nick. If he/she is
1247	–	* on a channel, send note of change to all clients
1248	–	* on that channel. Propagate notice to other servers.
1249	–	*/
1250	–	if ((source_p->localClient->last_nick_change +
1251	–	ConfigFileEntry.max_nick_time) < CurrentTime)
1252	–	source_p->localClient->number_of_nick_changes = 0;
1253	–	source_p->localClient->last_nick_change = CurrentTime;
1254	–	source_p->localClient->number_of_nick_changes++;
1255	–
1256	–	if ((ConfigFileEntry.anti_nick_flood &&
1257	–	(source_p->localClient->number_of_nick_changes
1258	–	<= ConfigFileEntry.max_nick_changes)) ||
1259	–	!ConfigFileEntry.anti_nick_flood ||
1260	–	(IsOper(source_p) && ConfigFileEntry.no_oper_flood))
1261	–	{
1262	–	samenick = !irccmp(source_p->name, nick);
1263	–
1264	–	if (!samenick)
1265	–	{
1266	–	source_p->tsinfo = CurrentTime;
1267	–	clear_ban_cache_client(source_p);
1268	–	watch_check_hash(source_p, RPL_LOGOFF);
1269	–
1270	–	if (HasUMode(source_p, UMODE_REGISTERED))
1271	–	{
1272	–	unsigned int oldmodes = source_p->umodes;
1273	–	char modebuf[IRCD_BUFSIZE] = { '\0' };
1274	–
1275	–	DelUMode(source_p, UMODE_REGISTERED);
1276	–	send_umode(source_p, source_p, oldmodes, 0xffffffff, modebuf);
1277	–	}
1278	–	}
1279	–
1280	–	/* XXX - the format of this notice should eventually be changed
1281	–	* to either %s[%s@%s], or even better would be get_client_name() -bill
1282	–	*/
1283	–	sendto_realops_flags(UMODE_NCHANGE, L_ALL, "Nick change: From %s to %s [%s@%s]",
1284	–	source_p->name, nick, source_p->username, source_p->host);
1285	–	sendto_common_channels_local(source_p, 1, ":%s!%s@%s NICK :%s",
1286	–	source_p->name, source_p->username,
1287	–	source_p->host, nick);
1288	–	add_history(source_p, 1);
1289	–
1290	–	sendto_server(client_p, NULL, CAP_TS6, NOCAPS,
1291	–	":%s NICK %s :%lu",
1292	–	ID(source_p), nick, (unsigned long)source_p->tsinfo);
1293	–	sendto_server(client_p, NULL, NOCAPS, CAP_TS6,
1294	–	":%s NICK %s :%lu",
1295	–	source_p->name, nick, (unsigned long)source_p->tsinfo);
1296	–
1297	–	hash_del_client(source_p);
1298	–	strcpy(source_p->name, nick);
1299	–	hash_add_client(source_p);
1300	–
1301	–	if (!samenick)
1302	–	watch_check_hash(source_p, RPL_LOGON);
1303	–
1304	–	/* fd_desc is long enough */
1305	–	fd_note(&client_p->localClient->fd, "Nick: %s", nick);
1306	–	}
1307	–	else
1308	–	sendto_one(source_p, form_str(ERR_NICKTOOFAST),
1309	–	me.name, source_p->name, source_p->name,
1310	–	nick, ConfigFileEntry.max_nick_time);
1311	–	}

Diff Legend

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