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 1734 by michael, Fri Jan 11 12:59:24 2013 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 46 | Line 45
45		#include "s_user.h"
46		#include "dbuf.h"
47		#include "memory.h"
48	+	#include "mempool.h"
49		#include "hostmask.h"
50	–	#include "balloc.h"
50		#include "listener.h"
51		#include "irc_res.h"
52		#include "userhost.h"
#	Line 65 | Line 64 | dlink_list oper_list = {NULL, NULL, 0};
64
65		static EVH check_pings;
66
67	<	static BlockHeap *client_heap  = NULL;
68	<	static BlockHeap *lclient_heap = NULL;
67	>	static mp_pool_t *client_pool  = NULL;
68	>	static mp_pool_t *lclient_pool = NULL;
69
70		static dlink_list dead_list  = { NULL, NULL, 0};
71		static dlink_list abort_list = { NULL, NULL, 0};
#	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 90 | Line 89 | init_client(void)
89		/* start off the check ping event ..  -- adrian
90		* Every 30 seconds is plenty -- db
91		*/
92	<	client_heap = BlockHeapCreate("client", sizeof(struct Client), CLIENT_HEAP_SIZE);
93	<	lclient_heap = BlockHeapCreate("local client", sizeof(struct LocalUser), LCLIENT_HEAP_SIZE);
92	>	client_pool = mp_pool_new(sizeof(struct Client), MP_CHUNK_SIZE_CLIENT);
93	>	lclient_pool = mp_pool_new(sizeof(struct LocalUser), MP_CHUNK_SIZE_LCLIENT);
94		eventAdd("check_pings", check_pings, NULL, 5);
95		}
96
#	Line 113 | Line 112 | init_client(void)
112		struct Client *
113		make_client(struct Client *from)
114		{
115	<	struct Client *client_p = BlockHeapAlloc(client_heap);
115	>	struct Client *client_p = mp_pool_get(client_pool);
116	>
117	>	memset(client_p, 0, sizeof(*client_p));
118
119		if (from == NULL)
120		{
121	<	client_p->from  = client_p; /* 'from' of local client is self! */
122	<	client_p->since = client_p->lasttime = client_p->firsttime = CurrentTime;
121	>	client_p->from                      = client_p; /* 'from' of local client is self! */
122	>	client_p->localClient               = mp_pool_get(lclient_pool);
123	>
124	>	memset(client_p->localClient, 0, sizeof(*client_p->localClient));
125
126	<	client_p->localClient = BlockHeapAlloc(lclient_heap);
126	>	client_p->localClient->since        = CurrentTime;
127	>	client_p->localClient->lasttime     = CurrentTime;
128	>	client_p->localClient->firsttime    = CurrentTime;
129		client_p->localClient->registration = REG_INIT;
130	+
131		/* as good a place as any... */
132		dlinkAdd(client_p, &client_p->localClient->lclient_node, &unknown_list);
133		}
134		else
135		client_p->from = from; /* 'from' of local client is self! */
136
137	+	client_p->idhnext = client_p;
138		client_p->hnext  = client_p;
139		client_p->status = STAT_UNKNOWN;
140		strcpy(client_p->username, "unknown");
141	+	strcpy(client_p->svid, "0");
142
143		return client_p;
144		}
#	Line 148 | Line 156 | free_client(struct Client *client_p)
156		assert(client_p != NULL);
157		assert(client_p != &me);
158		assert(client_p->hnext == client_p);
159	+	assert(client_p->idhnext == client_p);
160		assert(client_p->channel.head == NULL);
161		assert(dlink_list_length(&client_p->channel) == 0);
162	+	assert(dlink_list_length(&client_p->whowas) == 0);
163	+	assert(!IsServer(client_p) || (IsServer(client_p) && client_p->serv));
164
154	–	MyFree(client_p->away);
165		MyFree(client_p->serv);
166
167		if (MyConnect(client_p))
168		{
169		assert(client_p->localClient->invited.head == NULL);
170		assert(dlink_list_length(&client_p->localClient->invited) == 0);
171	+	assert(dlink_list_length(&client_p->localClient->watches) == 0);
172		assert(IsClosing(client_p) && IsDead(client_p));
173
174		MyFree(client_p->localClient->response);
#	Line 177 | Line 188 | free_client(struct Client *client_p)
188		dbuf_clear(&client_p->localClient->buf_recvq);
189		dbuf_clear(&client_p->localClient->buf_sendq);
190
191	<	BlockHeapFree(lclient_heap, client_p->localClient);
191	>	mp_pool_release(client_p->localClient);
192		}
193
194	<	BlockHeapFree(client_heap, client_p);
194	>	mp_pool_release(client_p);
195		}
196
197		/*
#	Line 227 | Line 238 | static void
238		check_pings_list(dlink_list *list)
239		{
240		char scratch[32];        /* way too generous but... */
241	<	struct Client *client_p; /* current local client_p being examined */
242	<	int ping, pingwarn;      /* ping time value from client */
232	<	dlink_node *ptr, *next_ptr;
241	>	int ping = 0;      /* ping time value from client */
242	>	dlink_node *ptr = NULL, *next_ptr = NULL;
243
244		DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
245		{
246	<	client_p = ptr->data;
246	>	struct Client *client_p = ptr->data;
247
248		/*
249		** Note: No need to notify opers here. It's
#	Line 245 | Line 255 | check_pings_list(dlink_list *list)
255		continue;
256		}
257
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	–
258		if (!IsRegistered(client_p))
259	<	ping = CONNECTTIMEOUT, pingwarn = 0;
259	>	ping = CONNECTTIMEOUT;
260		else
261	<	ping = get_client_ping(client_p, &pingwarn);
261	>	ping = get_client_ping(&client_p->localClient->confs);
262
263	<	if (ping < CurrentTime - client_p->lasttime)
263	>	if (ping < CurrentTime - client_p->localClient->lasttime)
264		{
265		if (!IsPingSent(client_p))
266		{
#	Line 267 | Line 270 | check_pings_list(dlink_list *list)
270		* it is still alive.
271		*/
272		SetPingSent(client_p);
273	<	ClearPingWarning(client_p);
271	<	client_p->lasttime = CurrentTime - ping;
273	>	client_p->localClient->lasttime = CurrentTime - ping;
274		sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
275		}
276		else
277		{
278	<	if (CurrentTime - client_p->lasttime >= 2 * ping)
278	>	if (CurrentTime - client_p->localClient->lasttime >= 2 * ping)
279		{
280		/*
281		* If the client/server hasn't talked to us in 2*ping seconds
#	Line 281 | Line 283 | check_pings_list(dlink_list *list)
283		*/
284		if (IsServer(client_p) || IsHandshake(client_p))
285		{
286	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
286	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
287		"No response from %s, closing link",
288		get_client_name(client_p, HIDE_IP));
289	<	sendto_realops_flags(UMODE_ALL, L_OPER,
289	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
290		"No response from %s, closing link",
291		get_client_name(client_p, MASK_IP));
292	<	ilog(L_NOTICE, "No response from %s, closing link",
292	>	ilog(LOG_TYPE_IRCD, "No response from %s, closing link",
293		get_client_name(client_p, HIDE_IP));
294		}
295
296		snprintf(scratch, sizeof(scratch), "Ping timeout: %d seconds",
297	<	(int)(CurrentTime - client_p->lasttime));
297	>	(int)(CurrentTime - client_p->localClient->lasttime));
298		exit_client(client_p, &me, scratch);
299		}
298	–	else if (!IsPingWarning(client_p) && pingwarn > 0 &&
299	–	(IsServer(client_p) || IsHandshake(client_p)) &&
300	–	CurrentTime - client_p->lasttime >= ping + pingwarn)
301	–	{
302	–	/*
303	–	* If the server hasn't replied in pingwarn seconds after sending
304	–	* the PING, notify the opers so that they are aware of the problem.
305	–	*/
306	–	SetPingWarning(client_p);
307	–	sendto_realops_flags(UMODE_ALL, L_ADMIN,
308	–	"Warning, no response from %s in %d seconds",
309	–	get_client_name(client_p, HIDE_IP), pingwarn);
310	–	sendto_realops_flags(UMODE_ALL, L_OPER,
311	–	"Warning, no response from %s in %d seconds",
312	–	get_client_name(client_p, MASK_IP), pingwarn);
313	–	ilog(L_NOTICE, "No response from %s in %d seconds",
314	–	get_client_name(client_p, HIDE_IP), pingwarn);
315	–	}
300		}
301		}
302		}
#	Line 333 | Line 317 | check_unknowns_list(void)
317		{
318		struct Client *client_p = ptr->data;
319
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	–
320		/*
321		* Check UNKNOWN connections - if they have been in this state
322		* for > 30s, close them.
323		*/
324	<	if (IsAuthFinished(client_p) && (CurrentTime - client_p->firsttime) > 30)
324	>	if (IsAuthFinished(client_p) && (CurrentTime - client_p->localClient->firsttime) > 30)
325		exit_client(client_p, &me, "Registration timed out");
326		}
327		}
#	Line 360 | Line 337 | void
337		check_conf_klines(void)
338		{
339		struct Client *client_p = NULL;       /* current local client_p being examined */
340	<	struct AccessItem *aconf = NULL;
364	<	struct ConfItem *conf = NULL;
340	>	struct MaskItem *conf = NULL;
341		dlink_node *ptr, *next_ptr;
342
343		DLINK_FOREACH_SAFE(ptr, next_ptr, local_client_list.head)
#	Line 373 | Line 349 | check_conf_klines(void)
349		if (IsDead(client_p) || !IsClient(client_p))
350		continue;
351
352	<	/* if there is a returned struct ConfItem then kill it */
377	<	if ((aconf = find_dline_conf(&client_p->localClient->ip,
352	>	if ((conf = find_dline_conf(&client_p->localClient->ip,
353		client_p->localClient->aftype)) != NULL)
354		{
355	<	if (aconf->status & CONF_EXEMPTDLINE)
355	>	if (conf->type == CONF_EXEMPT)
356		continue;
357
383	–	conf = unmap_conf_item(aconf);
358		ban_them(client_p, conf);
359		continue; /* and go examine next fd/client_p */
360		}
361
362	<	if (ConfigFileEntry.glines && (aconf = find_gline(client_p)))
362	>	if (ConfigFileEntry.glines && (conf = find_gline(client_p)))
363		{
364		if (IsExemptKline(client_p) ||
365		IsExemptGline(client_p))
366		{
367	<	sendto_realops_flags(UMODE_ALL, L_ALL,
367	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
368		"GLINE over-ruled for %s, client is %sline_exempt",
369		get_client_name(client_p, HIDE_IP), IsExemptKline(client_p) ? "k" : "g");
370		continue;
371		}
372
399	–	conf = unmap_conf_item(aconf);
373		ban_them(client_p, conf);
374		/* and go examine next fd/client_p */
375		continue;
376		}
377
378	<	if ((aconf = find_kill(client_p)) != NULL)
378	>	if ((conf = find_kill(client_p)) != NULL)
379		{
407	–
408	–	/* if there is a returned struct AccessItem.. then kill it */
380		if (IsExemptKline(client_p))
381		{
382	<	sendto_realops_flags(UMODE_ALL, L_ALL,
382	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
383		"KLINE over-ruled for %s, client is kline_exempt",
384		get_client_name(client_p, HIDE_IP));
385		continue;
386		}
387
417	–	conf = unmap_conf_item(aconf);
388		ban_them(client_p, conf);
389		continue;
390		}
391
392	<	/* if there is a returned struct MatchItem then kill it */
423	<	if ((conf = find_matching_name_conf(XLINE_TYPE,  client_p->info,
392	>	if ((conf = find_matching_name_conf(CONF_XLINE,  client_p->info,
393		NULL, NULL, 0)) != NULL ||
394	<	(conf = find_matching_name_conf(RXLINE_TYPE, client_p->info,
394	>	(conf = find_matching_name_conf(CONF_RXLINE, client_p->info,
395		NULL, NULL, 0)) != NULL)
396		{
397		ban_them(client_p, conf);
#	Line 435 | 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 450 | 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 */
461	–	const char *channel_reason = NULL;    /* What is sent to channel */
462	–	struct AccessItem *aconf = NULL;
463	–	struct MatchItem *xconf = NULL;
430		const char *type_string = NULL;
431		const char dline_string[] = "D-line";
432		const char kline_string[] = "K-line";
#	Line 469 | Line 435 | ban_them(struct Client *client_p, struct
435
436		switch (conf->type)
437		{
438	<	case RKLINE_TYPE:
439	<	case KLINE_TYPE:
438	>	case CONF_RKLINE:
439	>	case CONF_KLINE:
440		type_string = kline_string;
475	–	aconf = map_to_conf(conf);
441		break;
442	<	case DLINE_TYPE:
442	>	case CONF_DLINE:
443		type_string = dline_string;
479	–	aconf = map_to_conf(conf);
444		break;
445	<	case GLINE_TYPE:
445	>	case CONF_GLINE:
446		type_string = gline_string;
483	–	aconf = map_to_conf(conf);
447		break;
448	<	case RXLINE_TYPE:
449	<	case XLINE_TYPE:
448	>	case CONF_RXLINE:
449	>	case CONF_XLINE:
450		type_string = xline_string;
451	<	xconf = map_to_conf(conf);
489	<	++xconf->count;
451	>	++conf->count;
452		break;
453		default:
454		assert(0);
455		break;
456		}
457
458	<	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;
458	>	user_reason = conf->reason ? conf->reason : type_string;
459
460	<	if (ConfigFileEntry.kline_reason != NULL)
507	<	channel_reason = ConfigFileEntry.kline_reason;
508	<	else
509	<	channel_reason = user_reason;
510	<
511	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s active for %s",
460	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s active for %s",
461		type_string, get_client_name(client_p, HIDE_IP));
462
463		if (IsClient(client_p))
464		sendto_one(client_p, form_str(ERR_YOUREBANNEDCREEP),
465		me.name, client_p->name, user_reason);
466
467	<	exit_client(client_p, &me, channel_reason);
467	>	exit_client(client_p, &me, user_reason);
468		}
469
470		/* update_client_exit_stats()
#	Line 531 | Line 480 | update_client_exit_stats(struct Client *
480		{
481		assert(Count.total > 0);
482		--Count.total;
483	<	if (IsOper(client_p))
483	>	if (HasUMode(client_p, UMODE_OPER))
484		--Count.oper;
485	<	if (IsInvisible(client_p))
485	>	if (HasUMode(client_p, UMODE_INVISIBLE))
486		--Count.invisi;
487		}
488		else if (IsServer(client_p))
489	<	sendto_realops_flags(UMODE_EXTERNAL, L_ALL, "Server %s split from %s",
489	>	sendto_realops_flags(UMODE_EXTERNAL, L_ALL, SEND_NOTICE,
490	>	"Server %s split from %s",
491		client_p->name, client_p->servptr->name);
492
493		if (splitchecking && !splitmode)
#	Line 550 | Line 500 | update_client_exit_stats(struct Client *
500		* output       - return client pointer
501		* side effects - find person by (nick)name
502		*/
553	–	/* XXX - ugly wrapper */
503		struct Client *
504		find_person(const struct Client *client_p, const char *name)
505		{
506	<	struct Client *c2ptr;
506	>	struct Client *c2ptr = NULL;
507
508		if (IsDigit(*name))
509		{
510		if ((c2ptr = hash_find_id(name)) != NULL)
511		{
512		/* invisible users shall not be found by UID guessing */
513	<	if (IsInvisible(c2ptr) && !IsServer(client_p))
514	<	c2ptr = NULL;
513	>	if (HasUMode(c2ptr, UMODE_INVISIBLE))
514	>	if (!IsServer(client_p) && !HasFlag(client_p, FLAGS_SERVICE))
515	>	c2ptr = NULL;
516		}
517		}
518		else
#	Line 625 | Line 575 | find_chasing(struct Client *client_p, st
575		*        to modify what it points!!!
576		*/
577		const char *
578	<	get_client_name(const struct Client *client, int showip)
578	>	get_client_name(const struct Client *client, enum addr_mask_type type)
579		{
580		static char nbuf[HOSTLEN * 2 + USERLEN + 5];
581
582		assert(client != NULL);
583
584	<	if (irccmp(client->name, client->host) == 0)
584	>	if (!MyConnect(client))
585		return client->name;
586
587	<	if (ConfigServerHide.hide_server_ips)
588	<	if (IsServer(client) || IsConnecting(client) || IsHandshake(client))
589	<	showip = MASK_IP;
587	>	if (IsServer(client) || IsConnecting(client) || IsHandshake(client))
588	>	{
589	>	if (!irccmp(client->name, client->host))
590	>	return client->name;
591	>	else if (ConfigServerHide.hide_server_ips)
592	>	type = MASK_IP;
593	>	}
594
595		if (ConfigFileEntry.hide_spoof_ips)
596	<	if (showip == SHOW_IP && IsIPSpoof(client))
597	<	showip = MASK_IP;
596	>	if (type == SHOW_IP && IsIPSpoof(client))
597	>	type = MASK_IP;
598
599		/* And finally, let's get the host information, ip or name */
600	<	switch (showip)
600	>	switch (type)
601		{
602		case SHOW_IP:
603	<	if (MyConnect(client))
604	<	{
605	<	snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
606	<	client->name,
653	<	client->username, client->sockhost);
654	<	break;
655	<	}
603	>	snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
604	>	client->name,
605	>	client->username, client->sockhost);
606	>	break;
607		case MASK_IP:
608	<	snprintf(nbuf, sizeof(nbuf), "%s[%s@255.255.255.255]",
609	<	client->name, client->username);
608	>	if (client->localClient->aftype == AF_INET)
609	>	snprintf(nbuf, sizeof(nbuf), "%s[%s@255.255.255.255]",
610	>	client->name, client->username);
611	>	else
612	>	snprintf(nbuf, sizeof(nbuf), "%s[%s@ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]",
613	>	client->name, client->username);
614		break;
615		default:
616		snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
#	Line 703 | Line 658 | exit_one_client(struct Client *source_p,
658		* that the client can show the "**signoff" message).
659		* (Note: The notice is to the local clients *only*)
660		*/
661	<	sendto_common_channels_local(source_p, 0, ":%s!%s@%s QUIT :%s",
661	>	sendto_common_channels_local(source_p, 0, 0, ":%s!%s@%s QUIT :%s",
662		source_p->name, source_p->username,
663		source_p->host, quitmsg);
664		DLINK_FOREACH_SAFE(lp, next_lp, source_p->channel.head)
#	Line 773 | Line 728 | recurse_send_quits(struct Client *origin
728		{
729		dlink_node *ptr, *next;
730		struct Client *target_p;
776	–	int hidden = match(me.name, source_p->name); /* XXX */
731
732		assert(to != source_p);  /* should be already removed from serv_list */
733
734		/* If this server can handle quit storm (QS) removal
735		* 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
736		*/
737	<	if (hidden || !IsCapable(to, CAP_QS))
737	>	if (!IsCapable(to, CAP_QS))
738		DLINK_FOREACH_SAFE(ptr, next, source_p->serv->client_list.head)
739		{
740		target_p = ptr->data;
#	Line 794 | Line 745 | recurse_send_quits(struct Client *origin
745		recurse_send_quits(original_source_p, ptr->data, from, to,
746		comment, splitstr);
747
748	<	if (!hidden && ((source_p == original_source_p && to != from) ||
749	<	!IsCapable(to, CAP_QS)))
748	>	if ((source_p == original_source_p && to != from) ||
749	>	!IsCapable(to, CAP_QS))
750		{
751		/* don't use a prefix here - we have to be 100% sure the message
752		* will be accepted without Unknown prefix etc.. */
#	Line 847 | Line 798 | remove_dependents(struct Client *source_
798		* this on any struct Client, regardless of its state.
799		*
800		* Note, you shouldn't exit remote _users_ without first doing
801	<	* SetKilled and propagating a kill or similar message. However,
802	<	* it is perfectly correct to call exit_client to force a _server_
801	>	* AddFlag(x, FLAGS_KILLED) and propagating a kill or similar message.
802	>	* However, it is perfectly correct to call exit_client to force a _server_
803		* quit (either local or remote one).
804		*
805		* inputs:       - a client pointer that is going to be exited
#	Line 884 | Line 835 | exit_client(struct Client *source_p, str
835		source_p->localClient->auth = NULL;
836		}
837
838	<	/* This source_p could have status of one of STAT_UNKNOWN, STAT_CONNECTING
838	>	/*
839	>	* This source_p could have status of one of STAT_UNKNOWN, STAT_CONNECTING
840		* STAT_HANDSHAKE or STAT_UNKNOWN
841		* all of which are lumped together into unknown_list
842		*
#	Line 898 | Line 850 | exit_client(struct Client *source_p, str
850		}
851		else if (IsClient(source_p))
852		{
853	+	time_t on_for = CurrentTime - source_p->localClient->firsttime;
854		assert(Count.local > 0);
855		Count.local--;
856
857	<	if (IsOper(source_p))
905	<	{
857	>	if (HasUMode(source_p, UMODE_OPER))
858		if ((m = dlinkFindDelete(&oper_list, source_p)) != NULL)
859		free_dlink_node(m);
908	–	}
860
861		assert(dlinkFind(&local_client_list, source_p));
862		dlinkDelete(&source_p->localClient->lclient_node, &local_client_list);
#	Line 914 | Line 865 | exit_client(struct Client *source_p, str
865		free_list_task(source_p->localClient->list_task, source_p);
866
867		watch_del_watch_list(source_p);
868	<	sendto_realops_flags(UMODE_CCONN, L_ALL, "Client exiting: %s (%s@%s) [%s] [%s]",
868	>	sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
869	>	"Client exiting: %s (%s@%s) [%s] [%s]",
870		source_p->name, source_p->username, source_p->host, comment,
871		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
872		"255.255.255.255" : source_p->sockhost);
873	<	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL, "CLIEXIT: %s %s %s %s 0 %s",
873	>	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL, SEND_NOTICE,
874	>	"CLIEXIT: %s %s %s %s 0 %s",
875		source_p->name,
876		source_p->username,
877		source_p->host,
925	–
878		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
879		"255.255.255.255" : source_p->sockhost,
880		comment);
881	+	ilog(LOG_TYPE_USER, "%s (%3u:%02u:%02u): %s!%s@%s %llu/%llu",
882	+	myctime(source_p->localClient->firsttime), (unsigned int)(on_for / 3600),
883	+	(unsigned int)((on_for % 3600)/60), (unsigned int)(on_for % 60),
884	+	source_p->name, source_p->username, source_p->host,
885	+	source_p->localClient->send.bytes>>10,
886	+	source_p->localClient->recv.bytes>>10);
887	+	}
888	+	else if (IsServer(source_p))
889	+	{
890	+	assert(Count.myserver > 0);
891	+	--Count.myserver;
892	+
893	+	assert(dlinkFind(&serv_list, source_p));
894	+	dlinkDelete(&source_p->localClient->lclient_node, &serv_list);
895	+	unset_chcap_usage_counts(source_p);
896		}
897
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	–
898		if (!IsDead(source_p))
899		{
900		if (IsServer(source_p))
#	Line 995 | Line 943 | exit_client(struct Client *source_p, str
943
944		if (source_p->servptr == &me)
945		{
946	<	sendto_realops_flags(UMODE_ALL, L_ALL,
946	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
947		"%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
948	<	source_p->name, (int)(CurrentTime - source_p->firsttime),
948	>	source_p->name, (int)(CurrentTime - source_p->localClient->firsttime),
949		source_p->localClient->send.bytes >> 10,
950		source_p->localClient->recv.bytes >> 10);
951	<	ilog(L_NOTICE, "%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
952	<	source_p->name, (int)(CurrentTime - source_p->firsttime),
951	>	ilog(LOG_TYPE_IRCD, "%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
952	>	source_p->name, (int)(CurrentTime - source_p->localClient->firsttime),
953		source_p->localClient->send.bytes >> 10,
954		source_p->localClient->recv.bytes >> 10);
955		}
956		}
957	<	else if (IsClient(source_p) && !IsKilled(source_p))
957	>	else if (IsClient(source_p) && !HasFlag(source_p, FLAGS_KILLED))
958		{
959	<	sendto_server(from->from, NULL, CAP_TS6, NOCAPS,
959	>	sendto_server(from->from, CAP_TS6, NOCAPS,
960		":%s QUIT :%s", ID(source_p), comment);
961	<	sendto_server(from->from, NULL, NOCAPS, CAP_TS6,
961	>	sendto_server(from->from, NOCAPS, CAP_TS6,
962		":%s QUIT :%s", source_p->name, comment);
963		}
964
#	Line 1069 | Line 1017 | dead_link_on_read(struct Client *client_
1017
1018		if (IsServer(client_p) || IsHandshake(client_p))
1019		{
1020	<	int connected = CurrentTime - client_p->firsttime;
1020	>	int connected = CurrentTime - client_p->localClient->firsttime;
1021
1022		if (error == 0)
1023		{
1024		/* Admins get the real IP */
1025	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1025	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1026		"Server %s closed the connection",
1027		get_client_name(client_p, SHOW_IP));
1028
1029		/* Opers get a masked IP */
1030	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1030	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1031		"Server %s closed the connection",
1032		get_client_name(client_p, MASK_IP));
1033
1034	<	ilog(L_NOTICE, "Server %s closed the connection",
1034	>	ilog(LOG_TYPE_IRCD, "Server %s closed the connection",
1035		get_client_name(client_p, SHOW_IP));
1036		}
1037		else
#	Line 1094 | Line 1042 | dead_link_on_read(struct Client *client_
1042		get_client_name(client_p, MASK_IP), current_error);
1043		}
1044
1045	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1045	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1046		"%s had been connected for %d day%s, %2d:%02d:%02d",
1047		client_p->name, connected/86400,
1048		(connected/86400 == 1) ? "" : "s",
#	Line 1126 | Line 1074 | exit_aborted_clients(void)
1074
1075		if (target_p == NULL)
1076		{
1077	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1077	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1078		"Warning: null client on abort_list!");
1079		dlinkDelete(ptr, &abort_list);
1080		free_dlink_node(ptr);
#	Line 1178 | Line 1126 | find_accept(const char *nick, const char
1126		{
1127		struct split_nuh_item *accept_p = ptr->data;
1128
1129	<	if (cmpfunc(accept_p->nickptr, nick) == do_match &&
1130	<	cmpfunc(accept_p->userptr, user) == do_match &&
1131	<	cmpfunc(accept_p->hostptr, host) == do_match)
1129	>	if (!cmpfunc(accept_p->nickptr, nick) &&
1130	>	!cmpfunc(accept_p->userptr, user) &&
1131	>	!cmpfunc(accept_p->hostptr, host))
1132		return accept_p;
1133		}
1134
#	Line 1204 | Line 1152 | accept_message(struct Client *source,
1152		source->host, target, 1))
1153		return 1;
1154
1155	<	if (IsSoftCallerId(target))
1155	>	if (HasUMode(target, UMODE_SOFTCALLERID))
1156		DLINK_FOREACH(ptr, target->channel.head)
1157		if (IsMember(source, ((struct Membership *)ptr->data)->chptr))
1158		return 1;
#	Line 1226 | Line 1174 | del_all_accepts(struct Client *client_p)
1174		DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->acceptlist.head)
1175		del_accept(ptr->data, client_p);
1176		}
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)