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 1309 by michael, Sun Mar 25 11:24:18 2012 UTC vs.
ircd-hybrid/trunk/src/client.c (file contents), Revision 2229 by michael, Thu Jun 13 20:10:27 2013 UTC

#	Line 45 | Line 45
45		#include "s_user.h"
46		#include "dbuf.h"
47		#include "memory.h"
48	+	#include "mempool.h"
49		#include "hostmask.h"
49	–	#include "balloc.h"
50		#include "listener.h"
51		#include "irc_res.h"
52		#include "userhost.h"
53		#include "watch.h"
54	+	#include "rng_mt.h"
55
56		dlink_list listing_client_list = { NULL, NULL, 0 };
57		/* Pointer to beginning of Client list */
#	Line 64 | Line 65 | dlink_list oper_list = {NULL, NULL, 0};
65
66		static EVH check_pings;
67
68	<	static BlockHeap *client_heap  = NULL;
69	<	static BlockHeap *lclient_heap = NULL;
68	>	static mp_pool_t *client_pool  = NULL;
69	>	static mp_pool_t *lclient_pool = NULL;
70
71		static dlink_list dead_list  = { NULL, NULL, 0};
72		static dlink_list abort_list = { NULL, NULL, 0};
#	Line 74 | Line 75 | static dlink_node *eac_next;  /* next ab
75
76		static void check_pings_list(dlink_list *);
77		static void check_unknowns_list(void);
78	<	static void ban_them(struct Client *, struct ConfItem *);
78	>	static void ban_them(struct Client *, struct MaskItem *);
79
80
81	<	/* init_client()
81	>	/* client_init()
82		*
83		* inputs       - NONE
84		* output       - NONE
85		* side effects - initialize client free memory
86		*/
87		void
88	<	init_client(void)
88	>	client_init(void)
89		{
90		/* start off the check ping event ..  -- adrian
91		* Every 30 seconds is plenty -- db
92		*/
93	<	client_heap = BlockHeapCreate("client", sizeof(struct Client), CLIENT_HEAP_SIZE);
94	<	lclient_heap = BlockHeapCreate("local client", sizeof(struct LocalUser), LCLIENT_HEAP_SIZE);
93	>	client_pool = mp_pool_new(sizeof(struct Client), MP_CHUNK_SIZE_CLIENT);
94	>	lclient_pool = mp_pool_new(sizeof(struct LocalUser), MP_CHUNK_SIZE_LCLIENT);
95		eventAdd("check_pings", check_pings, NULL, 5);
96		}
97
#	Line 112 | Line 113 | init_client(void)
113		struct Client *
114		make_client(struct Client *from)
115		{
116	<	struct Client *client_p = BlockHeapAlloc(client_heap);
116	>	struct Client *client_p = mp_pool_get(client_pool);
117	>
118	>	memset(client_p, 0, sizeof(*client_p));
119
120		if (from == NULL)
121		{
122		client_p->from                      = client_p; /* 'from' of local client is self! */
123	<	client_p->localClient               = BlockHeapAlloc(lclient_heap);
123	>	client_p->localClient               = mp_pool_get(lclient_pool);
124	>
125	>	memset(client_p->localClient, 0, sizeof(*client_p->localClient));
126	>
127		client_p->localClient->since        = CurrentTime;
128		client_p->localClient->lasttime     = CurrentTime;
129		client_p->localClient->firsttime    = CurrentTime;
#	Line 129 | Line 135 | make_client(struct Client *from)
135		else
136		client_p->from = from; /* 'from' of local client is self! */
137
138	+	client_p->idhnext = client_p;
139		client_p->hnext  = client_p;
140		client_p->status = STAT_UNKNOWN;
141		strcpy(client_p->username, "unknown");
142	+	strcpy(client_p->svid, "0");
143
144		return client_p;
145		}
#	Line 149 | Line 157 | free_client(struct Client *client_p)
157		assert(client_p != NULL);
158		assert(client_p != &me);
159		assert(client_p->hnext == client_p);
160	+	assert(client_p->idhnext == client_p);
161		assert(client_p->channel.head == NULL);
162		assert(dlink_list_length(&client_p->channel) == 0);
163	+	assert(dlink_list_length(&client_p->whowas) == 0);
164	+	assert(!IsServer(client_p) || (IsServer(client_p) && client_p->serv));
165
155	–	MyFree(client_p->away);
166		MyFree(client_p->serv);
167	+	MyFree(client_p->certfp);
168
169		if (MyConnect(client_p))
170		{
171		assert(client_p->localClient->invited.head == NULL);
172		assert(dlink_list_length(&client_p->localClient->invited) == 0);
173	+	assert(dlink_list_length(&client_p->localClient->watches) == 0);
174		assert(IsClosing(client_p) && IsDead(client_p));
175
176		MyFree(client_p->localClient->response);
#	Line 178 | Line 190 | free_client(struct Client *client_p)
190		dbuf_clear(&client_p->localClient->buf_recvq);
191		dbuf_clear(&client_p->localClient->buf_sendq);
192
193	<	BlockHeapFree(lclient_heap, client_p->localClient);
193	>	mp_pool_release(client_p->localClient);
194		}
195
196	<	BlockHeapFree(client_heap, client_p);
196	>	mp_pool_release(client_p);
197		}
198
199		/*
#	Line 228 | Line 240 | static void
240		check_pings_list(dlink_list *list)
241		{
242		char scratch[32];        /* way too generous but... */
243	<	struct Client *client_p; /* current local client_p being examined */
244	<	int ping, pingwarn;      /* ping time value from client */
233	<	dlink_node *ptr, *next_ptr;
243	>	int ping = 0;      /* ping time value from client */
244	>	dlink_node *ptr = NULL, *next_ptr = NULL;
245
246		DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
247		{
248	<	client_p = ptr->data;
248	>	struct Client *client_p = ptr->data;
249
250		/*
251		** Note: No need to notify opers here. It's
#	Line 246 | Line 257 | check_pings_list(dlink_list *list)
257		continue;
258		}
259
249	–	if (client_p->localClient->reject_delay > 0)
250	–	{
251	–	if (client_p->localClient->reject_delay <= CurrentTime)
252	–	exit_client(client_p, &me, "Rejected");
253	–	continue;
254	–	}
255	–
260		if (!IsRegistered(client_p))
261	<	ping = CONNECTTIMEOUT, pingwarn = 0;
261	>	ping = CONNECTTIMEOUT;
262		else
263	<	ping = get_client_ping(client_p, &pingwarn);
263	>	ping = get_client_ping(&client_p->localClient->confs);
264
265		if (ping < CurrentTime - client_p->localClient->lasttime)
266		{
267		if (!IsPingSent(client_p))
268		{
269	<	/*
270	<	* if we havent PINGed the connection and we havent
271	<	* heard from it in a while, PING it to make sure
272	<	* it is still alive.
273	<	*/
274	<	SetPingSent(client_p);
275	<	ClearPingWarning(client_p);
276	<	client_p->localClient->lasttime = CurrentTime - ping;
273	<	sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
269	>	/*
270	>	* if we havent PINGed the connection and we havent
271	>	* heard from it in a while, PING it to make sure
272	>	* it is still alive.
273	>	*/
274	>	SetPingSent(client_p);
275	>	client_p->localClient->lasttime = CurrentTime - ping;
276	>	sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
277		}
278		else
279		{
#	Line 281 | Line 284 | check_pings_list(dlink_list *list)
284		* and it has a ping time, then close its connection.
285		*/
286		if (IsServer(client_p) || IsHandshake(client_p))
287	<	{
288	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
289	<	"No response from %s, closing link",
290	<	get_client_name(client_p, HIDE_IP));
291	<	sendto_realops_flags(UMODE_ALL, L_OPER,
292	<	"No response from %s, closing link",
293	<	get_client_name(client_p, MASK_IP));
294	<	ilog(LOG_TYPE_IRCD, "No response from %s, closing link",
295	<	get_client_name(client_p, HIDE_IP));
296	<	}
287	>	{
288	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
289	>	"No response from %s, closing link",
290	>	get_client_name(client_p, HIDE_IP));
291	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
292	>	"No response from %s, closing link",
293	>	get_client_name(client_p, MASK_IP));
294	>	ilog(LOG_TYPE_IRCD, "No response from %s, closing link",
295	>	get_client_name(client_p, HIDE_IP));
296	>	}
297
298		snprintf(scratch, sizeof(scratch), "Ping timeout: %d seconds",
299		(int)(CurrentTime - client_p->localClient->lasttime));
300		exit_client(client_p, &me, scratch);
301		}
299	–	else if (!IsPingWarning(client_p) && pingwarn > 0 &&
300	–	(IsServer(client_p) || IsHandshake(client_p)) &&
301	–	CurrentTime - client_p->localClient->lasttime >= ping + pingwarn)
302	–	{
303	–	/*
304	–	* If the server hasn't replied in pingwarn seconds after sending
305	–	* the PING, notify the opers so that they are aware of the problem.
306	–	*/
307	–	SetPingWarning(client_p);
308	–	sendto_realops_flags(UMODE_ALL, L_ADMIN,
309	–	"Warning, no response from %s in %d seconds",
310	–	get_client_name(client_p, HIDE_IP), pingwarn);
311	–	sendto_realops_flags(UMODE_ALL, L_OPER,
312	–	"Warning, no response from %s in %d seconds",
313	–	get_client_name(client_p, MASK_IP), pingwarn);
314	–	ilog(LOG_TYPE_IRCD, "No response from %s in %d seconds",
315	–	get_client_name(client_p, HIDE_IP), pingwarn);
316	–	}
302		}
303		}
304		}
#	Line 334 | Line 319 | check_unknowns_list(void)
319		{
320		struct Client *client_p = ptr->data;
321
337	–	if (client_p->localClient->reject_delay > 0)
338	–	{
339	–	if (client_p->localClient->reject_delay <= CurrentTime)
340	–	exit_client(client_p, &me, "Rejected");
341	–	continue;
342	–	}
343	–
322		/*
323		* Check UNKNOWN connections - if they have been in this state
324		* for > 30s, close them.
#	Line 361 | Line 339 | void
339		check_conf_klines(void)
340		{
341		struct Client *client_p = NULL;       /* current local client_p being examined */
342	<	struct AccessItem *aconf = NULL;
365	<	struct ConfItem *conf = NULL;
342	>	struct MaskItem *conf = NULL;
343		dlink_node *ptr, *next_ptr;
344
345		DLINK_FOREACH_SAFE(ptr, next_ptr, local_client_list.head)
#	Line 374 | Line 351 | check_conf_klines(void)
351		if (IsDead(client_p) || !IsClient(client_p))
352		continue;
353
354	<	/* if there is a returned struct ConfItem then kill it */
378	<	if ((aconf = find_dline_conf(&client_p->localClient->ip,
354	>	if ((conf = find_dline_conf(&client_p->localClient->ip,
355		client_p->localClient->aftype)) != NULL)
356		{
357	<	if (aconf->status & CONF_EXEMPTDLINE)
358	<	continue;
357	>	if (conf->type == CONF_EXEMPT)
358	>	continue;
359
384	–	conf = unmap_conf_item(aconf);
360		ban_them(client_p, conf);
361		continue; /* and go examine next fd/client_p */
362		}
363
364	<	if (ConfigFileEntry.glines && (aconf = find_gline(client_p)))
364	>	if (ConfigFileEntry.glines && (conf = find_gline(client_p)))
365		{
366		if (IsExemptKline(client_p) ||
367		IsExemptGline(client_p))
368		{
369	<	sendto_realops_flags(UMODE_ALL, L_ALL,
369	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
370		"GLINE over-ruled for %s, client is %sline_exempt",
371		get_client_name(client_p, HIDE_IP), IsExemptKline(client_p) ? "k" : "g");
372		continue;
373		}
374
400	–	conf = unmap_conf_item(aconf);
375		ban_them(client_p, conf);
376		/* and go examine next fd/client_p */
377		continue;
378		}
379
380	<	if ((aconf = find_kill(client_p)) != NULL)
380	>	if ((conf = find_kill(client_p)) != NULL)
381		{
408	–
409	–	/* if there is a returned struct AccessItem.. then kill it */
382		if (IsExemptKline(client_p))
383		{
384	<	sendto_realops_flags(UMODE_ALL, L_ALL,
384	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
385		"KLINE over-ruled for %s, client is kline_exempt",
386		get_client_name(client_p, HIDE_IP));
387		continue;
388		}
389
418	–	conf = unmap_conf_item(aconf);
390		ban_them(client_p, conf);
391		continue;
392		}
393
394	<	/* if there is a returned struct MatchItem then kill it */
395	<	if ((conf = find_matching_name_conf(XLINE_TYPE,  client_p->info,
425	<	NULL, NULL, 0)) != NULL ||
426	<	(conf = find_matching_name_conf(RXLINE_TYPE, client_p->info,
427	<	NULL, NULL, 0)) != NULL)
394	>	if ((conf = find_matching_name_conf(CONF_XLINE,  client_p->info,
395	>	NULL, NULL, 0)))
396		{
397		ban_them(client_p, conf);
398		continue;
#	Line 436 | 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 451 | 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 */
462	<	const char *channel_reason = NULL;    /* What is sent to channel */
463	<	struct AccessItem *aconf = NULL;
464	<	struct MatchItem *xconf = NULL;
429	>	const char *user_reason = NULL;  /* What is sent to user */
430		const char *type_string = NULL;
431		const char dline_string[] = "D-line";
432		const char kline_string[] = "K-line";
#	Line 470 | Line 435 | ban_them(struct Client *client_p, struct
435
436		switch (conf->type)
437		{
438	<	case RKLINE_TYPE:
474	<	case KLINE_TYPE:
438	>	case CONF_KLINE:
439		type_string = kline_string;
476	–	aconf = map_to_conf(conf);
440		break;
441	<	case DLINE_TYPE:
441	>	case CONF_DLINE:
442		type_string = dline_string;
480	–	aconf = map_to_conf(conf);
443		break;
444	<	case GLINE_TYPE:
444	>	case CONF_GLINE:
445		type_string = gline_string;
484	–	aconf = map_to_conf(conf);
446		break;
447	<	case RXLINE_TYPE:
487	<	case XLINE_TYPE:
447	>	case CONF_XLINE:
448		type_string = xline_string;
449	<	xconf = map_to_conf(conf);
490	<	++xconf->count;
449	>	++conf->count;
450		break;
451		default:
452		assert(0);
453		break;
454		}
455
456	<	if (ConfigFileEntry.kline_with_reason)
498	<	{
499	<	if (aconf != NULL)
500	<	user_reason = aconf->reason ? aconf->reason : type_string;
501	<	if (xconf != NULL)
502	<	user_reason = xconf->reason ? xconf->reason : type_string;
503	<	}
504	<	else
505	<	user_reason = type_string;
456	>	user_reason = conf->reason ? conf->reason : type_string;
457
458	<	if (ConfigFileEntry.kline_reason != NULL)
508	<	channel_reason = ConfigFileEntry.kline_reason;
509	<	else
510	<	channel_reason = user_reason;
511	<
512	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s active for %s",
458	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s active for %s",
459		type_string, get_client_name(client_p, HIDE_IP));
460
461		if (IsClient(client_p))
462		sendto_one(client_p, form_str(ERR_YOUREBANNEDCREEP),
463	<	me.name, client_p->name, user_reason);
463	>	me.name, client_p->name, user_reason);
464
465	<	exit_client(client_p, &me, channel_reason);
465	>	exit_client(client_p, &me, user_reason);
466		}
467
468		/* update_client_exit_stats()
#	Line 538 | Line 484 | update_client_exit_stats(struct Client *
484		--Count.invisi;
485		}
486		else if (IsServer(client_p))
487	<	sendto_realops_flags(UMODE_EXTERNAL, L_ALL, "Server %s split from %s",
487	>	sendto_realops_flags(UMODE_EXTERNAL, L_ALL, SEND_NOTICE,
488	>	"Server %s split from %s",
489		client_p->name, client_p->servptr->name);
490
491		if (splitchecking && !splitmode)
#	Line 551 | Line 498 | update_client_exit_stats(struct Client *
498		* output       - return client pointer
499		* side effects - find person by (nick)name
500		*/
554	–	/* XXX - ugly wrapper */
501		struct Client *
502		find_person(const struct Client *client_p, const char *name)
503		{
504	<	struct Client *c2ptr;
504	>	struct Client *c2ptr = NULL;
505
506		if (IsDigit(*name))
507		{
508		if ((c2ptr = hash_find_id(name)) != NULL)
509		{
510		/* invisible users shall not be found by UID guessing */
511	<	if (HasUMode(c2ptr, UMODE_INVISIBLE) && !IsServer(client_p))
512	<	c2ptr = NULL;
511	>	if (HasUMode(c2ptr, UMODE_INVISIBLE))
512	>	if (!IsServer(client_p) && !HasFlag(client_p, FLAGS_SERVICE))
513	>	c2ptr = NULL;
514		}
515		}
516		else
#	Line 593 | Line 540 | find_chasing(struct Client *client_p, st
540		return NULL;
541
542		if ((who = get_history(user,
543	<	(time_t)ConfigFileEntry.kill_chase_time_limit))
544	<	== NULL)
543	>	(time_t)ConfigFileEntry.kill_chase_time_limit))
544	>	== NULL)
545		{
546		sendto_one(source_p, form_str(ERR_NOSUCHNICK),
547		me.name, source_p->name, user);
#	Line 626 | Line 573 | find_chasing(struct Client *client_p, st
573		*        to modify what it points!!!
574		*/
575		const char *
576	<	get_client_name(const struct Client *client, int showip)
576	>	get_client_name(const struct Client *client, enum addr_mask_type type)
577		{
578		static char nbuf[HOSTLEN * 2 + USERLEN + 5];
579
580		assert(client != NULL);
581
582	<	if (irccmp(client->name, client->host) == 0)
582	>	if (!MyConnect(client))
583		return client->name;
584
585	<	if (ConfigServerHide.hide_server_ips)
586	<	if (IsServer(client) || IsConnecting(client) || IsHandshake(client))
587	<	showip = MASK_IP;
585	>	if (IsServer(client) || IsConnecting(client) || IsHandshake(client))
586	>	{
587	>	if (!irccmp(client->name, client->host))
588	>	return client->name;
589	>	else if (ConfigServerHide.hide_server_ips)
590	>	type = MASK_IP;
591	>	}
592
593		if (ConfigFileEntry.hide_spoof_ips)
594	<	if (showip == SHOW_IP && IsIPSpoof(client))
595	<	showip = MASK_IP;
594	>	if (type == SHOW_IP && IsIPSpoof(client))
595	>	type = MASK_IP;
596
597		/* And finally, let's get the host information, ip or name */
598	<	switch (showip)
598	>	switch (type)
599		{
600		case SHOW_IP:
601	<	if (MyConnect(client))
602	<	{
603	<	snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
604	<	client->name,
654	<	client->username, client->sockhost);
655	<	break;
656	<	}
601	>	snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
602	>	client->name,
603	>	client->username, client->sockhost);
604	>	break;
605		case MASK_IP:
606	<	snprintf(nbuf, sizeof(nbuf), "%s[%s@255.255.255.255]",
607	<	client->name, client->username);
606	>	if (client->localClient->aftype == AF_INET)
607	>	snprintf(nbuf, sizeof(nbuf), "%s[%s@255.255.255.255]",
608	>	client->name, client->username);
609	>	else
610	>	snprintf(nbuf, sizeof(nbuf), "%s[%s@ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]",
611	>	client->name, client->username);
612		break;
613		default:
614		snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
#	Line 704 | Line 656 | exit_one_client(struct Client *source_p,
656		* that the client can show the "**signoff" message).
657		* (Note: The notice is to the local clients *only*)
658		*/
659	<	sendto_common_channels_local(source_p, 0, ":%s!%s@%s QUIT :%s",
659	>	sendto_common_channels_local(source_p, 0, 0, ":%s!%s@%s QUIT :%s",
660		source_p->name, source_p->username,
661		source_p->host, quitmsg);
662		DLINK_FOREACH_SAFE(lp, next_lp, source_p->channel.head)
#	Line 774 | Line 726 | recurse_send_quits(struct Client *origin
726		{
727		dlink_node *ptr, *next;
728		struct Client *target_p;
777	–	int hidden = match(me.name, source_p->name); /* XXX */
729
730		assert(to != source_p);  /* should be already removed from serv_list */
731
732		/* If this server can handle quit storm (QS) removal
733		* of dependents, just send the SQUIT
783	–	*
784	–	* Always check *all* dependent servers if some of them are
785	–	* hidden behind fakename. If so, send out the QUITs -adx
734		*/
735	<	if (hidden || !IsCapable(to, CAP_QS))
735	>	if (!IsCapable(to, CAP_QS))
736		DLINK_FOREACH_SAFE(ptr, next, source_p->serv->client_list.head)
737		{
738		target_p = ptr->data;
#	Line 795 | Line 743 | recurse_send_quits(struct Client *origin
743		recurse_send_quits(original_source_p, ptr->data, from, to,
744		comment, splitstr);
745
746	<	if (!hidden && ((source_p == original_source_p && to != from) ||
747	<	!IsCapable(to, CAP_QS)))
746	>	if ((source_p == original_source_p && to != from) ||
747	>	!IsCapable(to, CAP_QS))
748		{
749		/* don't use a prefix here - we have to be 100% sure the message
750		* will be accepted without Unknown prefix etc.. */
#	Line 879 | Line 827 | exit_client(struct Client *source_p, str
827		if (IsIpHash(source_p))
828		remove_one_ip(&source_p->localClient->ip);
829
830	<	if (source_p->localClient->auth)
883	<	{
884	<	delete_auth(source_p->localClient->auth);
885	<	source_p->localClient->auth = NULL;
886	<	}
830	>	delete_auth(&source_p->localClient->auth);
831
832	<	/* This source_p could have status of one of STAT_UNKNOWN, STAT_CONNECTING
832	>	/*
833	>	* This source_p could have status of one of STAT_UNKNOWN, STAT_CONNECTING
834		* STAT_HANDSHAKE or STAT_UNKNOWN
835		* all of which are lumped together into unknown_list
836		*
#	Line 904 | Line 849 | exit_client(struct Client *source_p, str
849		Count.local--;
850
851		if (HasUMode(source_p, UMODE_OPER))
907	–	{
852		if ((m = dlinkFindDelete(&oper_list, source_p)) != NULL)
853		free_dlink_node(m);
910	–	}
854
855		assert(dlinkFind(&local_client_list, source_p));
856		dlinkDelete(&source_p->localClient->lclient_node, &local_client_list);
#	Line 916 | Line 859 | exit_client(struct Client *source_p, str
859		free_list_task(source_p->localClient->list_task, source_p);
860
861		watch_del_watch_list(source_p);
862	<	sendto_realops_flags(UMODE_CCONN, L_ALL, "Client exiting: %s (%s@%s) [%s] [%s]",
862	>	sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
863	>	"Client exiting: %s (%s@%s) [%s] [%s]",
864		source_p->name, source_p->username, source_p->host, comment,
865		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
866		"255.255.255.255" : source_p->sockhost);
923	–	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL, "CLIEXIT: %s %s %s %s 0 %s",
924	–	source_p->name,
925	–	source_p->username,
926	–	source_p->host,
927	–	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
928	–	"255.255.255.255" : source_p->sockhost,
929	–	comment);
867		ilog(LOG_TYPE_USER, "%s (%3u:%02u:%02u): %s!%s@%s %llu/%llu",
868		myctime(source_p->localClient->firsttime), (unsigned int)(on_for / 3600),
869		(unsigned int)((on_for % 3600)/60), (unsigned int)(on_for % 60),
#	Line 934 | Line 871 | exit_client(struct Client *source_p, str
871		source_p->localClient->send.bytes>>10,
872		source_p->localClient->recv.bytes>>10);
873		}
874	<
938	<	/* As soon as a client is known to be a server of some sort
939	<	* it has to be put on the serv_list, or SJOIN's to this new server
940	<	* from the connect burst will not be seen.
941	<	* XXX - TBV.  This is not true. The only place where we put a server on
942	<	* serv_list is in server_estab right now after registration process.
943	<	* And only after this, a burst is sent to the remote server, i.e. we never
944	<	* send a burst to STAT_CONNECTING, or STAT_HANDSHAKE. This will need
945	<	* more investigation later on, but for now, it's not a problem after all.
946	<	*/
947	<	if (IsServer(source_p) || IsConnecting(source_p) ||
948	<	IsHandshake(source_p))
874	>	else if (IsServer(source_p))
875		{
876	<	if (dlinkFind(&serv_list, source_p))
877	<	{
952	<	dlinkDelete(&source_p->localClient->lclient_node, &serv_list);
953	<	unset_chcap_usage_counts(source_p);
954	<	}
876	>	assert(Count.myserver > 0);
877	>	--Count.myserver;
878
879	<	if (IsServer(source_p))
880	<	Count.myserver--;
879	>	assert(dlinkFind(&serv_list, source_p));
880	>	dlinkDelete(&source_p->localClient->lclient_node, &serv_list);
881	>	unset_chcap_usage_counts(source_p);
882		}
883
884		if (!IsDead(source_p))
#	Line 963 | Line 887 | exit_client(struct Client *source_p, str
887		{
888		/* for them, we are exiting the network */
889		sendto_one(source_p, ":%s SQUIT %s :%s",
890	<	ID_or_name(from, source_p), me.name, comment);
890	>	ID_or_name(from, source_p), me.name, comment);
891		}
892
893		sendto_one(source_p, "ERROR :Closing Link: %s (%s)",
#	Line 983 | Line 907 | exit_client(struct Client *source_p, str
907		*/
908		close_connection(source_p);
909		}
910	+	else if (IsClient(source_p) && HasFlag(source_p->servptr, FLAGS_EOB))
911	+	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
912	+	"Client exiting at %s: %s (%s@%s) [%s]",
913	+	source_p->servptr->name, source_p->name,
914	+	source_p->username, source_p->host, comment);
915
916		if (IsServer(source_p))
917		{
#	Line 1005 | Line 934 | exit_client(struct Client *source_p, str
934
935		if (source_p->servptr == &me)
936		{
937	<	sendto_realops_flags(UMODE_ALL, L_ALL,
937	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
938		"%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
939		source_p->name, (int)(CurrentTime - source_p->localClient->firsttime),
940		source_p->localClient->send.bytes >> 10,
#	Line 1018 | Line 947 | exit_client(struct Client *source_p, str
947		}
948		else if (IsClient(source_p) && !HasFlag(source_p, FLAGS_KILLED))
949		{
950	<	sendto_server(from->from, NULL, CAP_TS6, NOCAPS,
950	>	sendto_server(from->from, CAP_TS6, NOCAPS,
951		":%s QUIT :%s", ID(source_p), comment);
952	<	sendto_server(from->from, NULL, NOCAPS, CAP_TS6,
952	>	sendto_server(from->from, NOCAPS, CAP_TS6,
953		":%s QUIT :%s", source_p->name, comment);
954		}
955
#	Line 1084 | Line 1013 | dead_link_on_read(struct Client *client_
1013		if (error == 0)
1014		{
1015		/* Admins get the real IP */
1016	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1017	<	"Server %s closed the connection",
1018	<	get_client_name(client_p, SHOW_IP));
1016	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1017	>	"Server %s closed the connection",
1018	>	get_client_name(client_p, SHOW_IP));
1019
1020		/* Opers get a masked IP */
1021	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1022	<	"Server %s closed the connection",
1023	<	get_client_name(client_p, MASK_IP));
1021	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1022	>	"Server %s closed the connection",
1023	>	get_client_name(client_p, MASK_IP));
1024
1025		ilog(LOG_TYPE_IRCD, "Server %s closed the connection",
1026	<	get_client_name(client_p, SHOW_IP));
1026	>	get_client_name(client_p, SHOW_IP));
1027		}
1028		else
1029		{
1030		report_error(L_ADMIN, "Lost connection to %s: %s",
1031	<	get_client_name(client_p, SHOW_IP), current_error);
1031	>	get_client_name(client_p, SHOW_IP), current_error);
1032		report_error(L_OPER, "Lost connection to %s: %s",
1033	<	get_client_name(client_p, MASK_IP), current_error);
1033	>	get_client_name(client_p, MASK_IP), current_error);
1034		}
1035
1036	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1037	<	"%s had been connected for %d day%s, %2d:%02d:%02d",
1038	<	client_p->name, connected/86400,
1039	<	(connected/86400 == 1) ? "" : "s",
1040	<	(connected % 86400) / 3600, (connected % 3600) / 60,
1041	<	connected % 60);
1036	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1037	>	"%s had been connected for %d day%s, %2d:%02d:%02d",
1038	>	client_p->name, connected/86400,
1039	>	(connected/86400 == 1) ? "" : "s",
1040	>	(connected % 86400) / 3600, (connected % 3600) / 60,
1041	>	connected % 60);
1042		}
1043
1044		if (error == 0)
#	Line 1136 | Line 1065 | exit_aborted_clients(void)
1065
1066		if (target_p == NULL)
1067		{
1068	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1068	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1069		"Warning: null client on abort_list!");
1070		dlinkDelete(ptr, &abort_list);
1071		free_dlink_node(ptr);
#	Line 1188 | Line 1117 | find_accept(const char *nick, const char
1117		{
1118		struct split_nuh_item *accept_p = ptr->data;
1119
1120	<	if (cmpfunc(accept_p->nickptr, nick) == do_match &&
1121	<	cmpfunc(accept_p->userptr, user) == do_match &&
1122	<	cmpfunc(accept_p->hostptr, host) == do_match)
1120	>	if (!cmpfunc(accept_p->nickptr, nick) &&
1121	>	!cmpfunc(accept_p->userptr, user) &&
1122	>	!cmpfunc(accept_p->hostptr, host))
1123		return accept_p;
1124		}
1125
#	Line 1236 | Line 1165 | del_all_accepts(struct Client *client_p)
1165		DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->acceptlist.head)
1166		del_accept(ptr->data, client_p);
1167		}
1168	+
1169	+	unsigned int
1170	+	idle_time_get(const struct Client *source_p, const struct Client *target_p)
1171	+	{
1172	+	unsigned int idle = 0;
1173	+	unsigned int min_idle = 0;
1174	+	unsigned int max_idle = 0;
1175	+	const struct ClassItem *class = get_class_ptr(&target_p->localClient->confs);
1176	+
1177	+	if (!(class->flags & CLASS_FLAGS_FAKE_IDLE) || target_p == source_p)
1178	+	return CurrentTime - target_p->localClient->last_privmsg;
1179	+	if (HasUMode(source_p, UMODE_OPER) &&
1180	+	!(class->flags & CLASS_FLAGS_HIDE_IDLE_FROM_OPERS))
1181	+	return CurrentTime - target_p->localClient->last_privmsg;
1182	+
1183	+	min_idle = class->min_idle;
1184	+	max_idle = class->max_idle;
1185	+
1186	+	if (min_idle == max_idle)
1187	+	return min_idle;
1188	+
1189	+	if (class->flags & CLASS_FLAGS_RANDOM_IDLE)
1190	+	idle = genrand_int32();
1191	+	else
1192	+	idle = CurrentTime - target_p->localClient->last_privmsg;
1193	+
1194	+	if (max_idle == 0)
1195	+	idle = 0;
1196	+	else
1197	+	idle %= max_idle;
1198	+
1199	+	if (idle < min_idle)
1200	+	idle = min_idle + (idle % (max_idle - min_idle));
1201	+
1202	+	return idle;
1203	+	}

Diff Legend

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