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 889 by michael, Thu Nov 1 12:59:05 2007 UTC vs.
ircd-hybrid/trunk/src/client.c (file contents), Revision 2181 by michael, Tue Jun 4 11:03:41 2013 UTC

#	Line 23 | Line 23
23		*/
24
25		#include "stdinc.h"
26	<	#include "tools.h"
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"
36	–	#include "list.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 48 | Line 45
45		#include "s_user.h"
46		#include "dbuf.h"
47		#include "memory.h"
48	+	#include "mempool.h"
49		#include "hostmask.h"
52	–	#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 67 | 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 77 | 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 *client_p, struct ConfItem *conf);
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 115 | 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->since = client_p->lasttime = client_p->firsttime = CurrentTime;
122	>	client_p->from                      = client_p; /* 'from' of local client is self! */
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 = BlockHeapAlloc(lclient_heap);
127	>	client_p->localClient->since        = CurrentTime;
128	>	client_p->localClient->lasttime     = CurrentTime;
129	>	client_p->localClient->firsttime    = CurrentTime;
130		client_p->localClient->registration = REG_INIT;
131	+
132		/* as good a place as any... */
133	<	dlinkAdd(client_p, make_dlink_node(), &unknown_list);
133	>	dlinkAdd(client_p, &client_p->localClient->lclient_node, &unknown_list);
134		}
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 150 | 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
156	–	MyFree(client_p->away);
166		MyFree(client_p->serv);
167
168		if (MyConnect(client_p))
169		{
170		assert(client_p->localClient->invited.head == NULL);
171		assert(dlink_list_length(&client_p->localClient->invited) == 0);
172	+	assert(dlink_list_length(&client_p->localClient->watches) == 0);
173		assert(IsClosing(client_p) && IsDead(client_p));
174
175		MyFree(client_p->localClient->response);
#	Line 179 | Line 189 | free_client(struct Client *client_p)
189		dbuf_clear(&client_p->localClient->buf_recvq);
190		dbuf_clear(&client_p->localClient->buf_sendq);
191
192	<	BlockHeapFree(lclient_heap, client_p->localClient);
192	>	mp_pool_release(client_p->localClient);
193		}
194
195	<	BlockHeapFree(client_heap, client_p);
195	>	mp_pool_release(client_p);
196		}
197
198		/*
#	Line 229 | Line 239 | static void
239		check_pings_list(dlink_list *list)
240		{
241		char scratch[32];        /* way too generous but... */
242	<	struct Client *client_p; /* current local client_p being examined */
243	<	int ping, pingwarn;      /* ping time value from client */
234	<	dlink_node *ptr, *next_ptr;
242	>	int ping = 0;      /* ping time value from client */
243	>	dlink_node *ptr = NULL, *next_ptr = NULL;
244
245		DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
246		{
247	<	client_p = ptr->data;
247	>	struct Client *client_p = ptr->data;
248
249		/*
250		** Note: No need to notify opers here. It's
#	Line 247 | Line 256 | check_pings_list(dlink_list *list)
256		continue;
257		}
258
250	–	if (client_p->localClient->reject_delay > 0)
251	–	{
252	–	if (client_p->localClient->reject_delay <= CurrentTime)
253	–	exit_client(client_p, &me, "Rejected");
254	–	continue;
255	–	}
256	–
257	–	if (GlobalSetOptions.idletime && IsClient(client_p))
258	–	{
259	–	if (!IsExemptKline(client_p) && !IsOper(client_p) &&
260	–	!IsIdlelined(client_p) &&
261	–	((CurrentTime - client_p->localClient->last) > GlobalSetOptions.idletime))
262	–	{
263	–	struct ConfItem *conf;
264	–	struct AccessItem *aconf;
265	–
266	–	conf = make_conf_item(KLINE_TYPE);
267	–	aconf = (struct AccessItem *)map_to_conf(conf);
268	–
269	–	DupString(aconf->host, client_p->host);
270	–	DupString(aconf->reason, "idle exceeder");
271	–	DupString(aconf->user, client_p->username);
272	–	aconf->hold = CurrentTime + 60;
273	–	add_temp_line(conf);
274	–
275	–	sendto_realops_flags(UMODE_ALL, L_ALL,
276	–	"Idle time limit exceeded for %s - temp k-lining",
277	–	get_client_name(client_p, HIDE_IP));
278	–	exit_client(client_p, &me, aconf->reason);
279	–	continue;
280	–	}
281	–	}
282	–
259		if (!IsRegistered(client_p))
260	<	ping = CONNECTTIMEOUT, pingwarn = 0;
260	>	ping = CONNECTTIMEOUT;
261		else
262	<	ping = get_client_ping(client_p, &pingwarn);
262	>	ping = get_client_ping(&client_p->localClient->confs);
263
264	<	if (ping < CurrentTime - client_p->lasttime)
264	>	if (ping < CurrentTime - client_p->localClient->lasttime)
265		{
266		if (!IsPingSent(client_p))
267		{
#	Line 295 | Line 271 | check_pings_list(dlink_list *list)
271		* it is still alive.
272		*/
273		SetPingSent(client_p);
274	<	ClearPingWarning(client_p);
299	<	client_p->lasttime = CurrentTime - ping;
274	>	client_p->localClient->lasttime = CurrentTime - ping;
275		sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
276		}
277		else
278		{
279	<	if (CurrentTime - client_p->lasttime >= 2 * ping)
279	>	if (CurrentTime - client_p->localClient->lasttime >= 2 * ping)
280		{
281		/*
282		* If the client/server hasn't talked to us in 2*ping seconds
#	Line 309 | Line 284 | check_pings_list(dlink_list *list)
284		*/
285		if (IsServer(client_p) || IsHandshake(client_p))
286		{
287	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
287	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
288		"No response from %s, closing link",
289		get_client_name(client_p, HIDE_IP));
290	<	sendto_realops_flags(UMODE_ALL, L_OPER,
290	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
291		"No response from %s, closing link",
292		get_client_name(client_p, MASK_IP));
293	<	ilog(L_NOTICE, "No response from %s, closing link",
293	>	ilog(LOG_TYPE_IRCD, "No response from %s, closing link",
294		get_client_name(client_p, HIDE_IP));
295		}
296
297	<	ircsprintf(scratch, "Ping timeout: %d seconds",
298	<	(int)(CurrentTime - client_p->lasttime));
297	>	snprintf(scratch, sizeof(scratch), "Ping timeout: %d seconds",
298	>	(int)(CurrentTime - client_p->localClient->lasttime));
299		exit_client(client_p, &me, scratch);
300		}
326	–	else if (!IsPingWarning(client_p) && pingwarn > 0 &&
327	–	(IsServer(client_p) || IsHandshake(client_p)) &&
328	–	CurrentTime - client_p->lasttime >= ping + pingwarn)
329	–	{
330	–	/*
331	–	* If the server hasn't replied in pingwarn seconds after sending
332	–	* the PING, notify the opers so that they are aware of the problem.
333	–	*/
334	–	SetPingWarning(client_p);
335	–	sendto_realops_flags(UMODE_ALL, L_ADMIN,
336	–	"Warning, no response from %s in %d seconds",
337	–	get_client_name(client_p, HIDE_IP), pingwarn);
338	–	sendto_realops_flags(UMODE_ALL, L_OPER,
339	–	"Warning, no response from %s in %d seconds",
340	–	get_client_name(client_p, MASK_IP), pingwarn);
341	–	ilog(L_NOTICE, "No response from %s in %d seconds",
342	–	get_client_name(client_p, HIDE_IP), pingwarn);
343	–	}
301		}
302		}
303		}
#	Line 361 | Line 318 | check_unknowns_list(void)
318		{
319		struct Client *client_p = ptr->data;
320
364	–	if (client_p->localClient->reject_delay > 0)
365	–	{
366	–	if (client_p->localClient->reject_delay <= CurrentTime)
367	–	exit_client(client_p, &me, "Rejected");
368	–	continue;
369	–	}
370	–
321		/*
322		* Check UNKNOWN connections - if they have been in this state
323		* for > 30s, close them.
324		*/
325	<	if (IsAuthFinished(client_p) && (CurrentTime - client_p->firsttime) > 30)
325	>	if (IsAuthFinished(client_p) && (CurrentTime - client_p->localClient->firsttime) > 30)
326		exit_client(client_p, &me, "Registration timed out");
327		}
328		}
#	Line 388 | Line 338 | void
338		check_conf_klines(void)
339		{
340		struct Client *client_p = NULL;       /* current local client_p being examined */
341	<	struct AccessItem *aconf = NULL;
392	<	struct ConfItem *conf = NULL;
341	>	struct MaskItem *conf = NULL;
342		dlink_node *ptr, *next_ptr;
343
344		DLINK_FOREACH_SAFE(ptr, next_ptr, local_client_list.head)
#	Line 401 | Line 350 | check_conf_klines(void)
350		if (IsDead(client_p) || !IsClient(client_p))
351		continue;
352
353	<	/* if there is a returned struct ConfItem then kill it */
405	<	if ((aconf = find_dline_conf(&client_p->localClient->ip,
353	>	if ((conf = find_dline_conf(&client_p->localClient->ip,
354		client_p->localClient->aftype)) != NULL)
355		{
356	<	if (aconf->status & CONF_EXEMPTDLINE)
356	>	if (conf->type == CONF_EXEMPT)
357		continue;
358
411	–	conf = unmap_conf_item(aconf);
359		ban_them(client_p, conf);
360		continue; /* and go examine next fd/client_p */
361		}
362
363	<	if (ConfigFileEntry.glines && (aconf = find_gline(client_p)))
363	>	if (ConfigFileEntry.glines && (conf = find_gline(client_p)))
364		{
365		if (IsExemptKline(client_p) ||
366		IsExemptGline(client_p))
367		{
368	<	sendto_realops_flags(UMODE_ALL, L_ALL,
368	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
369		"GLINE over-ruled for %s, client is %sline_exempt",
370		get_client_name(client_p, HIDE_IP), IsExemptKline(client_p) ? "k" : "g");
371		continue;
372		}
373
427	–	conf = unmap_conf_item(aconf);
374		ban_them(client_p, conf);
375		/* and go examine next fd/client_p */
376		continue;
377		}
378
379	<	if ((aconf = find_kill(client_p)) != NULL)
379	>	if ((conf = find_kill(client_p)) != NULL)
380		{
435	–
436	–	/* if there is a returned struct AccessItem.. then kill it */
381		if (IsExemptKline(client_p))
382		{
383	<	sendto_realops_flags(UMODE_ALL, L_ALL,
383	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
384		"KLINE over-ruled for %s, client is kline_exempt",
385		get_client_name(client_p, HIDE_IP));
386		continue;
387		}
388
445	–	conf = unmap_conf_item(aconf);
389		ban_them(client_p, conf);
390		continue;
391		}
392
393	<	/* if there is a returned struct MatchItem then kill it */
394	<	if ((conf = find_matching_name_conf(XLINE_TYPE,  client_p->info,
452	<	NULL, NULL, 0)) != NULL ||
453	<	(conf = find_matching_name_conf(RXLINE_TYPE, client_p->info,
454	<	NULL, NULL, 0)) != NULL)
393	>	if ((conf = find_matching_name_conf(CONF_XLINE,  client_p->info,
394	>	NULL, NULL, 0)))
395		{
396		ban_them(client_p, conf);
397		continue;
#	Line 463 | Line 403 | check_conf_klines(void)
403		{
404		client_p = ptr->data;
405
406	<	if ((aconf = find_dline_conf(&client_p->localClient->ip,
407	<	client_p->localClient->aftype)))
406	>	if ((conf = find_dline_conf(&client_p->localClient->ip,
407	>	client_p->localClient->aftype)))
408		{
409	<	if (aconf->status & CONF_EXEMPTDLINE)
409	>	if (conf->type == CONF_EXEMPT)
410		continue;
411
412		exit_client(client_p, &me, "D-lined");
#	Line 478 | Line 418 | check_conf_klines(void)
418		* ban_them
419		*
420		* inputs       - pointer to client to ban
421	<	*              - pointer to ConfItem
421	>	*              - pointer to MaskItem
422		* output       - NONE
423		* side effects - given client_p is banned
424		*/
425		static void
426	<	ban_them(struct Client *client_p, struct ConfItem *conf)
426	>	ban_them(struct Client *client_p, struct MaskItem *conf)
427		{
428		const char *user_reason = NULL;       /* What is sent to user */
489	–	const char *channel_reason = NULL;    /* What is sent to channel */
490	–	struct AccessItem *aconf = NULL;
491	–	struct MatchItem *xconf = NULL;
429		const char *type_string = NULL;
430		const char dline_string[] = "D-line";
431		const char kline_string[] = "K-line";
#	Line 497 | Line 434 | ban_them(struct Client *client_p, struct
434
435		switch (conf->type)
436		{
437	<	case RKLINE_TYPE:
501	<	case KLINE_TYPE:
437	>	case CONF_KLINE:
438		type_string = kline_string;
503	–	aconf = map_to_conf(conf);
439		break;
440	<	case DLINE_TYPE:
440	>	case CONF_DLINE:
441		type_string = dline_string;
507	–	aconf = map_to_conf(conf);
442		break;
443	<	case GLINE_TYPE:
443	>	case CONF_GLINE:
444		type_string = gline_string;
511	–	aconf = map_to_conf(conf);
445		break;
446	<	case RXLINE_TYPE:
514	<	case XLINE_TYPE:
446	>	case CONF_XLINE:
447		type_string = xline_string;
448	<	xconf = map_to_conf(conf);
517	<	++xconf->count;
448	>	++conf->count;
449		break;
450		default:
451		assert(0);
452		break;
453		}
454
455	<	if (ConfigFileEntry.kline_with_reason)
525	<	{
526	<	if (aconf != NULL)
527	<	user_reason = aconf->reason ? aconf->reason : type_string;
528	<	if (xconf != NULL)
529	<	user_reason = xconf->reason ? xconf->reason : type_string;
530	<	}
531	<	else
532	<	user_reason = type_string;
533	<
534	<	if (ConfigFileEntry.kline_reason != NULL)
535	<	channel_reason = ConfigFileEntry.kline_reason;
536	<	else
537	<	channel_reason = user_reason;
455	>	user_reason = conf->reason ? conf->reason : type_string;
456
457	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s active for %s",
457	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s active for %s",
458		type_string, get_client_name(client_p, HIDE_IP));
459
460		if (IsClient(client_p))
461		sendto_one(client_p, form_str(ERR_YOUREBANNEDCREEP),
462		me.name, client_p->name, user_reason);
463
464	<	exit_client(client_p, &me, channel_reason);
464	>	exit_client(client_p, &me, user_reason);
465		}
466
467		/* update_client_exit_stats()
#	Line 555 | Line 473 | ban_them(struct Client *client_p, struct
473		static void
474		update_client_exit_stats(struct Client *client_p)
475		{
476	<	if (IsServer(client_p))
559	<	{
560	<	sendto_realops_flags(UMODE_EXTERNAL, L_ALL,
561	<	"Server %s split from %s",
562	<	client_p->name, client_p->servptr->name);
563	<	}
564	<	else if (IsClient(client_p))
476	>	if (IsClient(client_p))
477		{
478	+	assert(Count.total > 0);
479		--Count.total;
480	<	if (IsOper(client_p))
480	>	if (HasUMode(client_p, UMODE_OPER))
481		--Count.oper;
482	<	if (IsInvisible(client_p))
482	>	if (HasUMode(client_p, UMODE_INVISIBLE))
483		--Count.invisi;
484		}
485	+	else if (IsServer(client_p))
486	+	sendto_realops_flags(UMODE_EXTERNAL, L_ALL, SEND_NOTICE,
487	+	"Server %s split from %s",
488	+	client_p->name, client_p->servptr->name);
489
490		if (splitchecking && !splitmode)
491		check_splitmode(NULL);
#	Line 580 | Line 497 | update_client_exit_stats(struct Client *
497		* output       - return client pointer
498		* side effects - find person by (nick)name
499		*/
583	–	/* XXX - ugly wrapper */
500		struct Client *
501		find_person(const struct Client *client_p, const char *name)
502		{
503	<	struct Client *c2ptr;
503	>	struct Client *c2ptr = NULL;
504
505		if (IsDigit(*name))
506		{
507		if ((c2ptr = hash_find_id(name)) != NULL)
508		{
509		/* invisible users shall not be found by UID guessing */
510	<	if (IsInvisible(c2ptr) && !IsServer(client_p))
511	<	c2ptr = NULL;
510	>	if (HasUMode(c2ptr, UMODE_INVISIBLE))
511	>	if (!IsServer(client_p) && !HasFlag(client_p, FLAGS_SERVICE))
512	>	c2ptr = NULL;
513		}
514		}
515		else
516	<	c2ptr = find_client(name);
516	>	c2ptr = hash_find_client(name);
517
518		return ((c2ptr != NULL && IsClient(c2ptr)) ? c2ptr : NULL);
519		}
#	Line 616 | Line 533 | find_chasing(struct Client *client_p, st
533		*chasing = 0;
534
535		if (who)
536	<	return(who);
536	>	return who;
537
538		if (IsDigit(*user))
539	<	return(NULL);
539	>	return NULL;
540
541		if ((who = get_history(user,
542		(time_t)ConfigFileEntry.kill_chase_time_limit))
#	Line 627 | Line 544 | find_chasing(struct Client *client_p, st
544		{
545		sendto_one(source_p, form_str(ERR_NOSUCHNICK),
546		me.name, source_p->name, user);
547	<	return(NULL);
547	>	return NULL;
548		}
549
550		if (chasing)
551		*chasing = 1;
552
553	<	return(who);
553	>	return who;
554		}
555
556		/*
#	Line 655 | Line 572 | find_chasing(struct Client *client_p, st
572		*        to modify what it points!!!
573		*/
574		const char *
575	<	get_client_name(struct Client *client, int showip)
575	>	get_client_name(const struct Client *client, enum addr_mask_type type)
576		{
577		static char nbuf[HOSTLEN * 2 + USERLEN + 5];
578
579		assert(client != NULL);
580
581	<	if (irccmp(client->name, client->host) == 0)
582	<	return(client->name);
581	>	if (!MyConnect(client))
582	>	return client->name;
583
584	<	if (ConfigServerHide.hide_server_ips)
585	<	if (IsServer(client) || IsConnecting(client) || IsHandshake(client))
586	<	showip = MASK_IP;
584	>	if (IsServer(client) || IsConnecting(client) || IsHandshake(client))
585	>	{
586	>	if (!irccmp(client->name, client->host))
587	>	return client->name;
588	>	else if (ConfigServerHide.hide_server_ips)
589	>	type = MASK_IP;
590	>	}
591
592		if (ConfigFileEntry.hide_spoof_ips)
593	<	if (showip == SHOW_IP && IsIPSpoof(client))
594	<	showip = MASK_IP;
593	>	if (type == SHOW_IP && IsIPSpoof(client))
594	>	type = MASK_IP;
595
596		/* And finally, let's get the host information, ip or name */
597	<	switch (showip)
597	>	switch (type)
598		{
599		case SHOW_IP:
600	<	if (MyConnect(client))
601	<	{
602	<	ircsprintf(nbuf, "%s[%s@%s]", client->name, client->username,
603	<	client->sockhost);
683	<	break;
684	<	}
600	>	snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
601	>	client->name,
602	>	client->username, client->sockhost);
603	>	break;
604		case MASK_IP:
605	<	ircsprintf(nbuf, "%s[%s@255.255.255.255]", client->name,
606	<	client->username);
605	>	if (client->localClient->aftype == AF_INET)
606	>	snprintf(nbuf, sizeof(nbuf), "%s[%s@255.255.255.255]",
607	>	client->name, client->username);
608	>	else
609	>	snprintf(nbuf, sizeof(nbuf), "%s[%s@ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]",
610	>	client->name, client->username);
611		break;
612		default:
613	<	ircsprintf(nbuf, "%s[%s@%s]", client->name, client->username,
614	<	client->host);
613	>	snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
614	>	client->name,
615	>	client->username, client->host);
616		}
617
618	<	return(nbuf);
618	>	return nbuf;
619		}
620
621		void
#	Line 720 | Line 644 | exit_one_client(struct Client *source_p,
644
645		assert(!IsMe(source_p));
646
647	<	if (IsServer(source_p))
724	<	{
725	<	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->server_list);
726	<
727	<	if ((lp = dlinkFindDelete(&global_serv_list, source_p)) != NULL)
728	<	free_dlink_node(lp);
729	<	}
730	<	else if (IsClient(source_p))
647	>	if (IsClient(source_p))
648		{
649		if (source_p->servptr->serv != NULL)
650		dlinkDelete(&source_p->lnode, &source_p->servptr->serv->client_list);
651
652	<	/* If a person is on a channel, send a QUIT notice
653	<	** to every client (person) on the same channel (so
654	<	** that the client can show the "**signoff" message).
655	<	** (Note: The notice is to the local clients *only*)
656	<	*/
657	<	sendto_common_channels_local(source_p, 0, ":%s!%s@%s QUIT :%s",
652	>	/*
653	>	* If a person is on a channel, send a QUIT notice
654	>	* to every client (person) on the same channel (so
655	>	* that the client can show the "**signoff" message).
656	>	* (Note: The notice is to the local clients *only*)
657	>	*/
658	>	sendto_common_channels_local(source_p, 0, 0, ":%s!%s@%s QUIT :%s",
659		source_p->name, source_p->username,
660		source_p->host, quitmsg);
661		DLINK_FOREACH_SAFE(lp, next_lp, source_p->channel.head)
#	Line 757 | Line 675 | exit_one_client(struct Client *source_p,
675		del_all_accepts(source_p);
676		}
677		}
678	+	else if (IsServer(source_p))
679	+	{
680	+	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->server_list);
681	+
682	+	if ((lp = dlinkFindDelete(&global_serv_list, source_p)) != NULL)
683	+	free_dlink_node(lp);
684	+	}
685
686		/* Remove source_p from the client lists */
687		if (HasID(source_p))
#	Line 796 | Line 721 | exit_one_client(struct Client *source_p,
721		static void
722		recurse_send_quits(struct Client *original_source_p, struct Client *source_p,
723		struct Client *from, struct Client *to, const char *comment,
724	<	const char *splitstr, const char *myname)
724	>	const char *splitstr)
725		{
726		dlink_node *ptr, *next;
727		struct Client *target_p;
803	–	int hidden = match(myname, source_p->name);
728
729		assert(to != source_p);  /* should be already removed from serv_list */
730
731		/* If this server can handle quit storm (QS) removal
732		* of dependents, just send the SQUIT
809	–	*
810	–	* Always check *all* dependent servers if some of them are
811	–	* hidden behind fakename. If so, send out the QUITs -adx
733		*/
734	<	if (hidden || !IsCapable(to, CAP_QS))
734	>	if (!IsCapable(to, CAP_QS))
735		DLINK_FOREACH_SAFE(ptr, next, source_p->serv->client_list.head)
736		{
737		target_p = ptr->data;
#	Line 819 | Line 740 | recurse_send_quits(struct Client *origin
740
741		DLINK_FOREACH_SAFE(ptr, next, source_p->serv->server_list.head)
742		recurse_send_quits(original_source_p, ptr->data, from, to,
743	<	comment, splitstr, myname);
743	>	comment, splitstr);
744
745	<	if (!hidden && ((source_p == original_source_p && to != from) ||
746	<	!IsCapable(to, CAP_QS)))
745	>	if ((source_p == original_source_p && to != from) ||
746	>	!IsCapable(to, CAP_QS))
747		{
748		/* don't use a prefix here - we have to be 100% sure the message
749		* will be accepted without Unknown prefix etc.. */
#	Line 860 | Line 781 | static void
781		remove_dependents(struct Client *source_p, struct Client *from,
782		const char *comment, const char *splitstr)
783		{
784	<	struct Client *to;
864	<	struct ConfItem *conf;
865	<	static char myname[HOSTLEN+1];
866	<	dlink_node *ptr;
784	>	dlink_node *ptr = NULL;
785
786		DLINK_FOREACH(ptr, serv_list.head)
787	<	{
788	<	to = ptr->data;
871	<
872	<	if ((conf = to->serv->sconf) != NULL)
873	<	strlcpy(myname, my_name_for_link(conf), sizeof(myname));
874	<	else
875	<	strlcpy(myname, me.name, sizeof(myname));
876	<	recurse_send_quits(source_p, source_p, from, to,
877	<	comment, splitstr, myname);
878	<	}
787	>	recurse_send_quits(source_p, source_p, from, ptr->data,
788	>	comment, splitstr);
789
790		recurse_remove_clients(source_p, splitstr);
791		}
#	Line 885 | Line 795 | remove_dependents(struct Client *source_
795		* this on any struct Client, regardless of its state.
796		*
797		* Note, you shouldn't exit remote _users_ without first doing
798	<	* SetKilled and propagating a kill or similar message. However,
799	<	* it is perfectly correct to call exit_client to force a _server_
798	>	* AddFlag(x, FLAGS_KILLED) and propagating a kill or similar message.
799	>	* However, it is perfectly correct to call exit_client to force a _server_
800		* quit (either local or remote one).
801		*
802		* inputs:       - a client pointer that is going to be exited
#	Line 901 | Line 811 | remove_dependents(struct Client *source_
811		void
812		exit_client(struct Client *source_p, struct Client *from, const char *comment)
813		{
814	<	dlink_node *m;
814	>	dlink_node *m = NULL;
815
816		if (MyConnect(source_p))
817		{
#	Line 916 | Line 826 | exit_client(struct Client *source_p, str
826		if (IsIpHash(source_p))
827		remove_one_ip(&source_p->localClient->ip);
828
829	<	delete_auth(source_p);
829	>	delete_auth(&source_p->localClient->auth);
830
831	<	/* This source_p could have status of one of STAT_UNKNOWN, STAT_CONNECTING
831	>	/*
832	>	* This source_p could have status of one of STAT_UNKNOWN, STAT_CONNECTING
833		* STAT_HANDSHAKE or STAT_UNKNOWN
834		* all of which are lumped together into unknown_list
835		*
#	Line 926 | Line 837 | exit_client(struct Client *source_p, str
837		*/
838		if (!IsRegistered(source_p))
839		{
840	<	if ((m = dlinkFindDelete(&unknown_list, source_p)) != NULL)
841	<	free_dlink_node(m);
840	>	assert(dlinkFind(&unknown_list, source_p));
841	>
842	>	dlinkDelete(&source_p->localClient->lclient_node, &unknown_list);
843		}
844		else if (IsClient(source_p))
845		{
846	+	time_t on_for = CurrentTime - source_p->localClient->firsttime;
847	+	assert(Count.local > 0);
848		Count.local--;
849
850	<	if (IsOper(source_p))
937	<	{
850	>	if (HasUMode(source_p, UMODE_OPER))
851		if ((m = dlinkFindDelete(&oper_list, source_p)) != NULL)
852		free_dlink_node(m);
940	–	}
853
854	+	assert(dlinkFind(&local_client_list, source_p));
855		dlinkDelete(&source_p->localClient->lclient_node, &local_client_list);
856	+
857		if (source_p->localClient->list_task != NULL)
858		free_list_task(source_p->localClient->list_task, source_p);
859
860		watch_del_watch_list(source_p);
861	<	sendto_realops_flags(UMODE_CCONN, L_ALL, "Client exiting: %s (%s@%s) [%s] [%s]",
861	>	sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
862	>	"Client exiting: %s (%s@%s) [%s] [%s]",
863		source_p->name, source_p->username, source_p->host, comment,
864		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
865		"255.255.255.255" : source_p->sockhost);
866	<	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL, "CLIEXIT: %s %s %s %s 0 %s",
866	>	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL, SEND_NOTICE,
867	>	"CLIEXIT: %s %s %s %s 0 %s",
868		source_p->name,
869		source_p->username,
870		source_p->host,
955	–
871		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
872		"255.255.255.255" : source_p->sockhost,
873		comment);
874	+	ilog(LOG_TYPE_USER, "%s (%3u:%02u:%02u): %s!%s@%s %llu/%llu",
875	+	myctime(source_p->localClient->firsttime), (unsigned int)(on_for / 3600),
876	+	(unsigned int)((on_for % 3600)/60), (unsigned int)(on_for % 60),
877	+	source_p->name, source_p->username, source_p->host,
878	+	source_p->localClient->send.bytes>>10,
879	+	source_p->localClient->recv.bytes>>10);
880	+	}
881	+	else if (IsServer(source_p))
882	+	{
883	+	assert(Count.myserver > 0);
884	+	--Count.myserver;
885	+
886	+	assert(dlinkFind(&serv_list, source_p));
887	+	dlinkDelete(&source_p->localClient->lclient_node, &serv_list);
888	+	unset_chcap_usage_counts(source_p);
889		}
890
961	–	/* As soon as a client is known to be a server of some sort
962	–	* it has to be put on the serv_list, or SJOIN's to this new server
963	–	* from the connect burst will not be seen.
964	–	*/
965	–	if (IsServer(source_p) || IsConnecting(source_p) ||
966	–	IsHandshake(source_p))
967	–	{
968	–	if ((m = dlinkFindDelete(&serv_list, source_p)) != NULL)
969	–	{
970	–	free_dlink_node(m);
971	–	unset_chcap_usage_counts(source_p);
972	–	}
973	–
974	–	if (IsServer(source_p))
975	–	Count.myserver--;
976	–	}
977	–
978	–	log_user_exit(source_p);
979	–
891		if (!IsDead(source_p))
892		{
893		if (IsServer(source_p))
#	Line 1003 | Line 914 | exit_client(struct Client *source_p, str
914		*/
915		close_connection(source_p);
916		}
917	+	else if (IsClient(source_p) && HasFlag(source_p->servptr, FLAGS_EOB))
918	+	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
919	+	"Client exiting at %s: %s (%s@%s) [%s]",
920	+	source_p->servptr->name, source_p->name,
921	+	source_p->username, source_p->host, comment);
922
923		if (IsServer(source_p))
924		{
#	Line 1025 | Line 941 | exit_client(struct Client *source_p, str
941
942		if (source_p->servptr == &me)
943		{
944	<	sendto_realops_flags(UMODE_ALL, L_ALL,
944	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
945		"%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
946	<	source_p->name, (int)(CurrentTime - source_p->firsttime),
946	>	source_p->name, (int)(CurrentTime - source_p->localClient->firsttime),
947		source_p->localClient->send.bytes >> 10,
948		source_p->localClient->recv.bytes >> 10);
949	<	ilog(L_NOTICE, "%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
950	<	source_p->name, (int)(CurrentTime - source_p->firsttime),
949	>	ilog(LOG_TYPE_IRCD, "%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
950	>	source_p->name, (int)(CurrentTime - source_p->localClient->firsttime),
951		source_p->localClient->send.bytes >> 10,
952		source_p->localClient->recv.bytes >> 10);
953		}
954		}
955	<	else if (IsClient(source_p) && !IsKilled(source_p))
955	>	else if (IsClient(source_p) && !HasFlag(source_p, FLAGS_KILLED))
956		{
957	<	sendto_server(from->from, NULL, CAP_TS6, NOCAPS,
957	>	sendto_server(from->from, CAP_TS6, NOCAPS,
958		":%s QUIT :%s", ID(source_p), comment);
959	<	sendto_server(from->from, NULL, NOCAPS, CAP_TS6,
959	>	sendto_server(from->from, NOCAPS, CAP_TS6,
960		":%s QUIT :%s", source_p->name, comment);
961		}
962
#	Line 1099 | Line 1015 | dead_link_on_read(struct Client *client_
1015
1016		if (IsServer(client_p) || IsHandshake(client_p))
1017		{
1018	<	int connected = CurrentTime - client_p->firsttime;
1018	>	int connected = CurrentTime - client_p->localClient->firsttime;
1019
1020		if (error == 0)
1021		{
1022		/* Admins get the real IP */
1023	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1023	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1024		"Server %s closed the connection",
1025		get_client_name(client_p, SHOW_IP));
1026
1027		/* Opers get a masked IP */
1028	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1028	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1029		"Server %s closed the connection",
1030		get_client_name(client_p, MASK_IP));
1031
1032	<	ilog(L_NOTICE, "Server %s closed the connection",
1032	>	ilog(LOG_TYPE_IRCD, "Server %s closed the connection",
1033		get_client_name(client_p, SHOW_IP));
1034		}
1035		else
#	Line 1124 | Line 1040 | dead_link_on_read(struct Client *client_
1040		get_client_name(client_p, MASK_IP), current_error);
1041		}
1042
1043	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1043	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1044		"%s had been connected for %d day%s, %2d:%02d:%02d",
1045		client_p->name, connected/86400,
1046		(connected/86400 == 1) ? "" : "s",
#	Line 1136 | Line 1052 | dead_link_on_read(struct Client *client_
1052		strlcpy(errmsg, "Remote host closed the connection",
1053		sizeof(errmsg));
1054		else
1055	<	ircsprintf(errmsg, "Read error: %s",
1056	<	strerror(current_error));
1055	>	snprintf(errmsg, sizeof(errmsg), "Read error: %s",
1056	>	strerror(current_error));
1057
1058		exit_client(client_p, &me, errmsg);
1059		}
#	Line 1156 | Line 1072 | exit_aborted_clients(void)
1072
1073		if (target_p == NULL)
1074		{
1075	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1075	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1076		"Warning: null client on abort_list!");
1077		dlinkDelete(ptr, &abort_list);
1078		free_dlink_node(ptr);
#	Line 1208 | Line 1124 | find_accept(const char *nick, const char
1124		{
1125		struct split_nuh_item *accept_p = ptr->data;
1126
1127	<	if (cmpfunc(accept_p->nickptr, nick) == do_match &&
1128	<	cmpfunc(accept_p->userptr, user) == do_match &&
1129	<	cmpfunc(accept_p->hostptr, host) == do_match)
1127	>	if (!cmpfunc(accept_p->nickptr, nick) &&
1128	>	!cmpfunc(accept_p->userptr, user) &&
1129	>	!cmpfunc(accept_p->hostptr, host))
1130		return accept_p;
1131		}
1132
#	Line 1234 | Line 1150 | accept_message(struct Client *source,
1150		source->host, target, 1))
1151		return 1;
1152
1153	<	if (IsSoftCallerId(target))
1153	>	if (HasUMode(target, UMODE_SOFTCALLERID))
1154		DLINK_FOREACH(ptr, target->channel.head)
1155		if (IsMember(source, ((struct Membership *)ptr->data)->chptr))
1156		return 1;
#	Line 1257 | Line 1173 | del_all_accepts(struct Client *client_p)
1173		del_accept(ptr->data, client_p);
1174		}
1175
1176	<	/* set_initial_nick()
1177	<	*
1262	<	* inputs
1263	<	* output
1264	<	* side effects -
1265	<	*
1266	<	* This function is only called to set up an initially registering
1267	<	* client.
1268	<	*/
1269	<	void
1270	<	set_initial_nick(struct Client *client_p, struct Client *source_p,
1271	<	const char *nick)
1176	>	unsigned int
1177	>	idle_time_get(const struct Client *source_p, const struct Client *target_p)
1178		{
1179	<	char buf[USERLEN + 1];
1179	>	unsigned int idle = 0;
1180	>	unsigned int min_idle = 0;
1181	>	unsigned int max_idle = 0;
1182	>	const struct ClassItem *class = get_class_ptr(&target_p->localClient->confs);
1183	>
1184	>	if (!(class->flags & CLASS_FLAGS_FAKE_IDLE) || target_p == source_p)
1185	>	return CurrentTime - target_p->localClient->last_privmsg;
1186	>	if (HasUMode(source_p, UMODE_OPER) &&
1187	>	!(class->flags & CLASS_FLAGS_HIDE_IDLE_FROM_OPERS))
1188	>	return CurrentTime - target_p->localClient->last_privmsg;
1189
1190	<	/* Client setting NICK the first time */
1191	<
1277	<	/* This had to be copied here to avoid problems.. */
1278	<	source_p->tsinfo = CurrentTime;
1279	<	source_p->localClient->registration &= ~REG_NEED_NICK;
1190	>	min_idle = class->min_idle;
1191	>	max_idle = class->max_idle;
1192
1193	<	if (source_p->name[0])
1194	<	hash_del_client(source_p);
1193	>	if (min_idle == max_idle)
1194	>	return min_idle;
1195
1196	<	strlcpy(source_p->name, nick, sizeof(source_p->name));
1197	<	hash_add_client(source_p);
1198	<
1199	<	/* fd_desc is long enough */
1288	<	fd_note(&client_p->localClient->fd, "Nick: %s", nick);
1289	<
1290	<	if (!source_p->localClient->registration)
1291	<	{
1292	<	strlcpy(buf, source_p->username, sizeof(buf));
1293	<
1294	<	/*
1295	<	* USER already received, now we have NICK.
1296	<	* *NOTE* For servers "NICK" *must* precede the
1297	<	* user message (giving USER before NICK is possible
1298	<	* only for local client connection!). register_user
1299	<	* may reject the client and call exit_client for it
1300	<	* --must test this and exit m_nick too!!!
1301	<	*/
1302	<	register_local_user(client_p, source_p, nick, buf);
1303	<	}
1304	<	}
1305	<
1306	<	/* change_local_nick()
1307	<	*
1308	<	* inputs       - pointer to server
1309	<	*              - pointer to client
1310	<	*              - nick
1311	<	* output       -
1312	<	* side effects - changes nick of a LOCAL user
1313	<	*/
1314	<	void
1315	<	change_local_nick(struct Client *client_p, struct Client *source_p, const char *nick)
1316	<	{
1317	<	int samenick = 0;
1318	<
1319	<	assert(source_p->name[0] && !EmptyString(nick));
1320	<
1321	<	/*
1322	<	* Client just changing his/her nick. If he/she is
1323	<	* on a channel, send note of change to all clients
1324	<	* on that channel. Propagate notice to other servers.
1325	<	*/
1326	<	if ((source_p->localClient->last_nick_change +
1327	<	ConfigFileEntry.max_nick_time) < CurrentTime)
1328	<	source_p->localClient->number_of_nick_changes = 0;
1329	<	source_p->localClient->last_nick_change = CurrentTime;
1330	<	source_p->localClient->number_of_nick_changes++;
1331	<
1332	<	if ((ConfigFileEntry.anti_nick_flood &&
1333	<	(source_p->localClient->number_of_nick_changes
1334	<	<= ConfigFileEntry.max_nick_changes)) ||
1335	<	!ConfigFileEntry.anti_nick_flood ||
1336	<	(IsOper(source_p) && ConfigFileEntry.no_oper_flood))
1337	<	{
1338	<	samenick = !irccmp(source_p->name, nick);
1339	<
1340	<	if (!samenick)
1341	<	{
1342	<	source_p->tsinfo = CurrentTime;
1343	<	clear_ban_cache_client(source_p);
1344	<	watch_check_hash(source_p, RPL_LOGOFF);
1345	<	}
1346	<
1347	<	/* XXX - the format of this notice should eventually be changed
1348	<	* to either %s[%s@%s], or even better would be get_client_name() -bill
1349	<	*/
1350	<	sendto_realops_flags(UMODE_NCHANGE, L_ALL, "Nick change: From %s to %s [%s@%s]",
1351	<	source_p->name, nick, source_p->username, source_p->host);
1352	<	sendto_common_channels_local(source_p, 1, ":%s!%s@%s NICK :%s",
1353	<	source_p->name, source_p->username,
1354	<	source_p->host, nick);
1355	<	add_history(source_p, 1);
1356	<
1357	<	sendto_server(client_p, NULL, CAP_TS6, NOCAPS,
1358	<	":%s NICK %s :%lu",
1359	<	ID(source_p), nick, (unsigned long)source_p->tsinfo);
1360	<	sendto_server(client_p, NULL, NOCAPS, CAP_TS6,
1361	<	":%s NICK %s :%lu",
1362	<	source_p->name, nick, (unsigned long)source_p->tsinfo);
1196	>	if (class->flags & CLASS_FLAGS_RANDOM_IDLE)
1197	>	idle = genrand_int32();
1198	>	else
1199	>	idle = CurrentTime - target_p->localClient->last_privmsg;
1200
1201	<	hash_del_client(source_p);
1202	<	strcpy(source_p->name, nick);
1203	<	hash_add_client(source_p);
1201	>	if (max_idle == 0)
1202	>	idle = 0;
1203	>	else
1204	>	idle %= max_idle;
1205
1206	<	if (!samenick)
1207	<	watch_check_hash(source_p, RPL_LOGON);
1206	>	if (idle < min_idle)
1207	>	idle = min_idle + (idle % (max_idle - min_idle));
1208
1209	<	/* fd_desc is long enough */
1372	<	fd_note(&client_p->localClient->fd, "Nick: %s", nick);
1373	<	}
1374	<	else
1375	<	sendto_one(source_p, form_str(ERR_NICKTOOFAST),
1376	<	me.name, source_p->name, source_p->name,
1377	<	nick, ConfigFileEntry.max_nick_time);
1209	>	return idle;
1210		}

Diff Legend

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