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 1192 by michael, Thu Aug 18 20:25:18 2011 UTC vs.
ircd-hybrid/trunk/src/client.c (file contents), Revision 3160 by michael, Sat Mar 15 17:47:46 2014 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  client.c: Controls clients.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2002 by the past and present ircd coders, and others.
4	>	*  Copyright (c) 1997-2014 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 18 | Line 17
17		*  along with this program; if not, write to the Free Software
18		*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
19		*  USA
20	<	*
21	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file client.c
23	>	* \brief Controls clients.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
28		#include "list.h"
29		#include "client.h"
30		#include "channel_mode.h"
29	–	#include "common.h"
31		#include "event.h"
32		#include "fdlist.h"
33		#include "hash.h"
#	Line 37 | Line 38
38		#include "packet.h"
39		#include "s_auth.h"
40		#include "s_bsd.h"
41	<	#include "s_conf.h"
42	<	#include "s_log.h"
41	>	#include "conf.h"
42	>	#include "log.h"
43		#include "s_misc.h"
44		#include "s_serv.h"
45		#include "send.h"
#	Line 46 | Line 47
47		#include "s_user.h"
48		#include "dbuf.h"
49		#include "memory.h"
50	+	#include "mempool.h"
51		#include "hostmask.h"
50	–	#include "balloc.h"
52		#include "listener.h"
53		#include "irc_res.h"
54		#include "userhost.h"
55		#include "watch.h"
56	+	#include "rng_mt.h"
57	+	#include "parse.h"
58
59		dlink_list listing_client_list = { NULL, NULL, 0 };
60		/* Pointer to beginning of Client list */
#	Line 65 | Line 68 | dlink_list oper_list = {NULL, NULL, 0};
68
69		static EVH check_pings;
70
71	<	static BlockHeap *client_heap  = NULL;
72	<	static BlockHeap *lclient_heap = NULL;
71	>	static mp_pool_t *client_pool  = NULL;
72	>	static mp_pool_t *lclient_pool = NULL;
73
74		static dlink_list dead_list  = { NULL, NULL, 0};
75		static dlink_list abort_list = { NULL, NULL, 0};
#	Line 75 | Line 78 | static dlink_node *eac_next;  /* next ab
78
79		static void check_pings_list(dlink_list *);
80		static void check_unknowns_list(void);
78	–	static void ban_them(struct Client *, struct ConfItem *);
81
82
83	<	/* init_client()
83	>	/* client_init()
84		*
85		* inputs       - NONE
86		* output       - NONE
87		* side effects - initialize client free memory
88		*/
89		void
90	<	init_client(void)
90	>	client_init(void)
91		{
92		/* start off the check ping event ..  -- adrian
93		* Every 30 seconds is plenty -- db
94		*/
95	<	client_heap = BlockHeapCreate("client", sizeof(struct Client), CLIENT_HEAP_SIZE);
96	<	lclient_heap = BlockHeapCreate("local client", sizeof(struct LocalUser), LCLIENT_HEAP_SIZE);
95	>	client_pool = mp_pool_new(sizeof(struct Client), MP_CHUNK_SIZE_CLIENT);
96	>	lclient_pool = mp_pool_new(sizeof(struct LocalUser), MP_CHUNK_SIZE_LCLIENT);
97		eventAdd("check_pings", check_pings, NULL, 5);
98		}
99
#	Line 113 | Line 115 | init_client(void)
115		struct Client *
116		make_client(struct Client *from)
117		{
118	<	struct Client *client_p = BlockHeapAlloc(client_heap);
118	>	struct Client *client_p = mp_pool_get(client_pool);
119	>
120	>	memset(client_p, 0, sizeof(*client_p));
121
122		if (from == NULL)
123		{
124	<	client_p->from  = client_p; /* 'from' of local client is self! */
125	<	client_p->since = client_p->lasttime = client_p->firsttime = CurrentTime;
124	>	client_p->from                      = client_p; /* 'from' of local client is self! */
125	>	client_p->localClient               = mp_pool_get(lclient_pool);
126
127	<	client_p->localClient = BlockHeapAlloc(lclient_heap);
127	>	memset(client_p->localClient, 0, sizeof(*client_p->localClient));
128	>
129	>	client_p->localClient->since        = CurrentTime;
130	>	client_p->localClient->lasttime     = CurrentTime;
131	>	client_p->localClient->firsttime    = CurrentTime;
132		client_p->localClient->registration = REG_INIT;
133	+
134		/* as good a place as any... */
135		dlinkAdd(client_p, &client_p->localClient->lclient_node, &unknown_list);
136		}
137		else
138		client_p->from = from; /* 'from' of local client is self! */
139
140	+	client_p->idhnext = client_p;
141		client_p->hnext  = client_p;
142	<	client_p->status = STAT_UNKNOWN;
142	>	SetUnknown(client_p);
143		strcpy(client_p->username, "unknown");
144	+	strcpy(client_p->svid, "0");
145
146		return client_p;
147		}
#	Line 148 | Line 159 | free_client(struct Client *client_p)
159		assert(client_p != NULL);
160		assert(client_p != &me);
161		assert(client_p->hnext == client_p);
162	+	assert(client_p->idhnext == client_p);
163		assert(client_p->channel.head == NULL);
164		assert(dlink_list_length(&client_p->channel) == 0);
165	+	assert(dlink_list_length(&client_p->whowas) == 0);
166	+	assert(!IsServer(client_p) || (IsServer(client_p) && client_p->serv));
167
154	–	MyFree(client_p->away);
168		MyFree(client_p->serv);
169	+	MyFree(client_p->certfp);
170
171		if (MyConnect(client_p))
172		{
173		assert(client_p->localClient->invited.head == NULL);
174		assert(dlink_list_length(&client_p->localClient->invited) == 0);
175	+	assert(dlink_list_length(&client_p->localClient->watches) == 0);
176		assert(IsClosing(client_p) && IsDead(client_p));
177
178		MyFree(client_p->localClient->response);
#	Line 170 | Line 185 | free_client(struct Client *client_p)
185		{
186		assert(0 < client_p->localClient->listener->ref_count);
187		if (0 == --client_p->localClient->listener->ref_count &&
188	<	!client_p->localClient->listener->active)
188	>	!client_p->localClient->listener->active)
189		free_listener(client_p->localClient->listener);
190		}
191
192		dbuf_clear(&client_p->localClient->buf_recvq);
193		dbuf_clear(&client_p->localClient->buf_sendq);
194
195	<	BlockHeapFree(lclient_heap, client_p->localClient);
195	>	mp_pool_release(client_p->localClient);
196		}
197
198	<	BlockHeapFree(client_heap, client_p);
198	>	mp_pool_release(client_p);
199		}
200
201		/*
#	Line 189 | Line 204 | free_client(struct Client *client_p)
204		*
205		* inputs       - NOT USED (from event)
206		* output       - next time_t when check_pings() should be called again
207	<	* side effects -
207	>	* side effects -
208		*
209		*
210		* A PING can be sent to clients as necessary.
#	Line 211 | Line 226 | free_client(struct Client *client_p)
226
227		static void
228		check_pings(void *notused)
229	<	{
229	>	{
230		check_pings_list(&local_client_list);
231		check_pings_list(&serv_list);
232		check_unknowns_list();
#	Line 221 | Line 236 | check_pings(void *notused)
236		*
237		* inputs       - pointer to list to check
238		* output       - NONE
239	<	* side effects -
239	>	* side effects -
240		*/
241		static void
242		check_pings_list(dlink_list *list)
243		{
244	<	char scratch[32];        /* way too generous but... */
245	<	struct Client *client_p; /* current local client_p being examined */
246	<	int ping, pingwarn;      /* ping time value from client */
232	<	dlink_node *ptr, *next_ptr;
244	>	char scratch[IRCD_BUFSIZE];
245	>	int ping = 0;      /* ping time value from client */
246	>	dlink_node *ptr = NULL, *next_ptr = NULL;
247
248		DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
249		{
250	<	client_p = ptr->data;
250	>	struct Client *client_p = ptr->data;
251
252		/*
253		** Note: No need to notify opers here. It's
#	Line 242 | Line 256 | check_pings_list(dlink_list *list)
256		if (IsDead(client_p))
257		{
258		/* Ignore it, its been exited already */
245	–	continue;
246	–	}
247	–
248	–	if (client_p->localClient->reject_delay > 0)
249	–	{
250	–	if (client_p->localClient->reject_delay <= CurrentTime)
251	–	exit_client(client_p, &me, "Rejected");
259		continue;
260		}
261
262		if (!IsRegistered(client_p))
263	<	ping = CONNECTTIMEOUT, pingwarn = 0;
263	>	ping = CONNECTTIMEOUT;
264		else
265	<	ping = get_client_ping(client_p, &pingwarn);
265	>	ping = get_client_ping(&client_p->localClient->confs);
266
267	<	if (ping < CurrentTime - client_p->lasttime)
267	>	if (ping < CurrentTime - client_p->localClient->lasttime)
268		{
269		if (!IsPingSent(client_p))
270		{
271	<	/*
272	<	* if we havent PINGed the connection and we havent
273	<	* heard from it in a while, PING it to make sure
274	<	* it is still alive.
275	<	*/
276	<	SetPingSent(client_p);
277	<	ClearPingWarning(client_p);
278	<	client_p->lasttime = CurrentTime - ping;
272	<	sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
271	>	/*
272	>	* if we havent PINGed the connection and we havent
273	>	* heard from it in a while, PING it to make sure
274	>	* it is still alive.
275	>	*/
276	>	SetPingSent(client_p);
277	>	client_p->localClient->lasttime = CurrentTime - ping;
278	>	sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
279		}
280		else
281		{
282	<	if (CurrentTime - client_p->lasttime >= 2 * ping)
282	>	if (CurrentTime - client_p->localClient->lasttime >= 2 * ping)
283		{
284		/*
285		* If the client/server hasn't talked to us in 2*ping seconds
286		* and it has a ping time, then close its connection.
287		*/
288		if (IsServer(client_p) || IsHandshake(client_p))
289	<	{
290	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
291	<	"No response from %s, closing link",
292	<	get_client_name(client_p, HIDE_IP));
293	<	sendto_realops_flags(UMODE_ALL, L_OPER,
294	<	"No response from %s, closing link",
295	<	get_client_name(client_p, MASK_IP));
296	<	ilog(L_NOTICE, "No response from %s, closing link",
297	<	get_client_name(client_p, HIDE_IP));
298	<	}
289	>	{
290	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
291	>	"No response from %s, closing link",
292	>	get_client_name(client_p, HIDE_IP));
293	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
294	>	"No response from %s, closing link",
295	>	get_client_name(client_p, MASK_IP));
296	>	ilog(LOG_TYPE_IRCD, "No response from %s, closing link",
297	>	get_client_name(client_p, HIDE_IP));
298	>	}
299
300		snprintf(scratch, sizeof(scratch), "Ping timeout: %d seconds",
301	<	(int)(CurrentTime - client_p->lasttime));
301	>	(int)(CurrentTime - client_p->localClient->lasttime));
302		exit_client(client_p, &me, scratch);
303		}
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	–	}
304		}
305		}
306		}
#	Line 333 | Line 321 | check_unknowns_list(void)
321		{
322		struct Client *client_p = ptr->data;
323
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	–
324		/*
325		* Check UNKNOWN connections - if they have been in this state
326		* for > 30s, close them.
327		*/
328	<	if (IsAuthFinished(client_p) && (CurrentTime - client_p->firsttime) > 30)
328	>	if (IsAuthFinished(client_p) && (CurrentTime - client_p->localClient->firsttime) > 30)
329		exit_client(client_p, &me, "Registration timed out");
330		}
331		}
#	Line 356 | Line 337 | check_unknowns_list(void)
337		* side effects - Check all connections for a pending kline against the
338		*                client, exit the client if a kline matches.
339		*/
340	<	void
340	>	void
341		check_conf_klines(void)
342	<	{
342	>	{
343		struct Client *client_p = NULL;       /* current local client_p being examined */
344	<	struct AccessItem *aconf = NULL;
364	<	struct ConfItem *conf = NULL;
344	>	struct MaskItem *conf = NULL;
345		dlink_node *ptr, *next_ptr;
346
347		DLINK_FOREACH_SAFE(ptr, next_ptr, local_client_list.head)
#	Line 373 | Line 353 | check_conf_klines(void)
353		if (IsDead(client_p) || !IsClient(client_p))
354		continue;
355
356	<	/* if there is a returned struct ConfItem then kill it */
377	<	if ((aconf = find_dline_conf(&client_p->localClient->ip,
356	>	if ((conf = find_dline_conf(&client_p->localClient->ip,
357		client_p->localClient->aftype)) != NULL)
358		{
359	<	if (aconf->status & CONF_EXEMPTDLINE)
360	<	continue;
359	>	if (conf->type == CONF_EXEMPT)
360	>	continue;
361
362	<	conf = unmap_conf_item(aconf);
384	<	ban_them(client_p, conf);
362	>	conf_try_ban(client_p, conf);
363		continue; /* and go examine next fd/client_p */
364		}
365
366	<	if (ConfigFileEntry.glines && (aconf = find_gline(client_p)))
366	>	if (ConfigFileEntry.glines)
367		{
368	<	if (IsExemptKline(client_p) ||
369	<	IsExemptGline(client_p))
368	>	if ((conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
369	>	CONF_GLINE, client_p->localClient->aftype,
370	>	client_p->username, NULL, 1)))
371		{
372	<	sendto_realops_flags(UMODE_ALL, L_ALL,
373	<	"GLINE over-ruled for %s, client is %sline_exempt",
395	<	get_client_name(client_p, HIDE_IP), IsExemptKline(client_p) ? "k" : "g");
372	>	conf_try_ban(client_p, conf);
373	>	/* and go examine next fd/client_p */
374		continue;
375		}
376	+	}
377
378	<	conf = unmap_conf_item(aconf);
379	<	ban_them(client_p, conf);
380	<	/* and go examine next fd/client_p */
402	<	continue;
403	<	}
404	<
405	<	if ((aconf = find_kill(client_p)) != NULL)
378	>	if ((conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
379	>	CONF_KLINE, client_p->localClient->aftype,
380	>	client_p->username, NULL, 1)))
381		{
382	<
383	<	/* if there is a returned struct AccessItem.. then kill it */
409	<	if (IsExemptKline(client_p))
410	<	{
411	<	sendto_realops_flags(UMODE_ALL, L_ALL,
412	<	"KLINE over-ruled for %s, client is kline_exempt",
413	<	get_client_name(client_p, HIDE_IP));
414	<	continue;
415	<	}
416	<
417	<	conf = unmap_conf_item(aconf);
418	<	ban_them(client_p, conf);
419	<	continue;
382	>	conf_try_ban(client_p, conf);
383	>	continue;
384		}
385
386	<	/* if there is a returned struct MatchItem then kill it */
387	<	if ((conf = find_matching_name_conf(XLINE_TYPE,  client_p->info,
424	<	NULL, NULL, 0)) != NULL ||
425	<	(conf = find_matching_name_conf(RXLINE_TYPE, client_p->info,
426	<	NULL, NULL, 0)) != NULL)
386	>	if ((conf = find_matching_name_conf(CONF_XLINE,  client_p->info,
387	>	NULL, NULL, 0)))
388		{
389	<	ban_them(client_p, conf);
389	>	conf_try_ban(client_p, conf);
390		continue;
391		}
392		}
#	Line 435 | Line 396 | check_conf_klines(void)
396		{
397		client_p = ptr->data;
398
399	<	if ((aconf = find_dline_conf(&client_p->localClient->ip,
400	<	client_p->localClient->aftype)))
399	>	if ((conf = find_dline_conf(&client_p->localClient->ip,
400	>	client_p->localClient->aftype)))
401		{
402	<	if (aconf->status & CONF_EXEMPTDLINE)
402	>	if (conf->type == CONF_EXEMPT)
403		continue;
404
405		exit_client(client_p, &me, "D-lined");
#	Line 447 | Line 408 | check_conf_klines(void)
408		}
409
410		/*
411	<	* ban_them
411	>	* conf_try_ban
412		*
413		* inputs       - pointer to client to ban
414	<	*              - pointer to ConfItem
414	>	*              - pointer to MaskItem
415		* output       - NONE
416		* side effects - given client_p is banned
417		*/
418	<	static void
419	<	ban_them(struct Client *client_p, struct ConfItem *conf)
418	>	void
419	>	conf_try_ban(struct Client *client_p, struct MaskItem *conf)
420		{
421	<	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;
421	>	const char *user_reason = NULL;  /* What is sent to user */
422		const char *type_string = NULL;
423		const char dline_string[] = "D-line";
424		const char kline_string[] = "K-line";
#	Line 469 | Line 427 | ban_them(struct Client *client_p, struct
427
428		switch (conf->type)
429		{
430	<	case RKLINE_TYPE:
431	<	case KLINE_TYPE:
430	>	case CONF_KLINE:
431	>	if (IsExemptKline(client_p))
432	>	{
433	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
434	>	"KLINE over-ruled for %s, client is kline_exempt",
435	>	get_client_name(client_p, HIDE_IP));
436	>	return;
437	>	}
438	>
439		type_string = kline_string;
475	–	aconf = map_to_conf(conf);
440		break;
441	<	case DLINE_TYPE:
441	>	case CONF_DLINE:
442		type_string = dline_string;
479	–	aconf = map_to_conf(conf);
443		break;
444	<	case GLINE_TYPE:
444	>	case CONF_GLINE:
445	>	if (IsExemptKline(client_p) ||
446	>	IsExemptGline(client_p))
447	>	{
448	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
449	>	"GLINE over-ruled for %s, client is %sline_exempt",
450	>	get_client_name(client_p, HIDE_IP), IsExemptKline(client_p) ? "k" : "g");
451	>	return;
452	>	}
453	>
454		type_string = gline_string;
483	–	aconf = map_to_conf(conf);
455		break;
456	<	case RXLINE_TYPE:
486	<	case XLINE_TYPE:
456	>	case CONF_XLINE:
457		type_string = xline_string;
458	<	xconf = map_to_conf(conf);
489	<	++xconf->count;
458	>	++conf->count;
459		break;
460		default:
461		assert(0);
462		break;
463		}
464
465	<	if (ConfigFileEntry.kline_with_reason)
497	<	{
498	<	if (aconf != NULL)
499	<	user_reason = aconf->reason ? aconf->reason : type_string;
500	<	if (xconf != NULL)
501	<	user_reason = xconf->reason ? xconf->reason : type_string;
502	<	}
503	<	else
504	<	user_reason = type_string;
505	<
506	<	if (ConfigFileEntry.kline_reason != NULL)
507	<	channel_reason = ConfigFileEntry.kline_reason;
508	<	else
509	<	channel_reason = user_reason;
465	>	user_reason = conf->reason ? conf->reason : type_string;
466
467	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s active for %s",
467	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s active for %s",
468		type_string, get_client_name(client_p, HIDE_IP));
469
470		if (IsClient(client_p))
471	<	sendto_one(client_p, form_str(ERR_YOUREBANNEDCREEP),
516	<	me.name, client_p->name, user_reason);
471	>	sendto_one_numeric(client_p, &me, ERR_YOUREBANNEDCREEP, user_reason);
472
473	<	exit_client(client_p, &me, channel_reason);
473	>	exit_client(client_p, &me, user_reason);
474		}
475
476		/* update_client_exit_stats()
477		*
478		* input        - pointer to client
479		* output       - NONE
480	<	* side effects -
480	>	* side effects -
481		*/
482		static void
483		update_client_exit_stats(struct Client *client_p)
#	Line 531 | Line 486 | update_client_exit_stats(struct Client *
486		{
487		assert(Count.total > 0);
488		--Count.total;
489	<	if (IsOper(client_p))
489	>	if (HasUMode(client_p, UMODE_OPER))
490		--Count.oper;
491	<	if (IsInvisible(client_p))
491	>	if (HasUMode(client_p, UMODE_INVISIBLE))
492		--Count.invisi;
493		}
494		else if (IsServer(client_p))
495	<	sendto_realops_flags(UMODE_EXTERNAL, L_ALL, "Server %s split from %s",
495	>	sendto_realops_flags(UMODE_EXTERNAL, L_ALL, SEND_NOTICE,
496	>	"Server %s split from %s",
497		client_p->name, client_p->servptr->name);
498
499		if (splitchecking && !splitmode)
#	Line 550 | Line 506 | update_client_exit_stats(struct Client *
506		* output       - return client pointer
507		* side effects - find person by (nick)name
508		*/
553	–	/* XXX - ugly wrapper */
509		struct Client *
510	<	find_person(const struct Client *client_p, const char *name)
510	>	find_person(const struct Client *const client_p, const char *name)
511		{
512	<	struct Client *c2ptr;
512	>	struct Client *target_p = NULL;
513
514		if (IsDigit(*name))
515		{
516	<	if ((c2ptr = hash_find_id(name)) != NULL)
517	<	{
563	<	/* invisible users shall not be found by UID guessing */
564	<	if (IsInvisible(c2ptr) && !IsServer(client_p))
565	<	c2ptr = NULL;
566	<	}
516	>	if (IsServer(client_p->from) || HasFlag(client_p->from, FLAGS_SERVICE))
517	>	target_p = hash_find_id(name);
518		}
519		else
520	<	c2ptr = hash_find_client(name);
520	>	target_p = hash_find_client(name);
521
522	<	return ((c2ptr != NULL && IsClient(c2ptr)) ? c2ptr : NULL);
522	>	return (target_p && IsClient(target_p)) ? target_p : NULL;
523		}
524
525		/*
526	<	* find_chasing - find the client structure for a nick name (user)
527	<	*      using history mechanism if necessary. If the client is not found,
526	>	* find_chasing - find the client structure for a nick name (name)
527	>	*      using history mechanism if necessary. If the client is not found,
528		*      an error message (NO SUCH NICK) is generated. If the client was found
529		*      through the history, chasing will be 1 and otherwise 0.
530		*/
531		struct Client *
532	<	find_chasing(struct Client *client_p, struct Client *source_p, const char *user, int *chasing)
532	>	find_chasing(struct Client *source_p, const char *name, int *const chasing)
533		{
534	<	struct Client *who = find_person(client_p, user);
534	>	struct Client *who = find_person(source_p, name);
535
536		if (chasing)
537		*chasing = 0;
#	Line 588 | Line 539 | find_chasing(struct Client *client_p, st
539		if (who)
540		return who;
541
542	<	if (IsDigit(*user))
542	>	if (IsDigit(*name))
543		return NULL;
544
545	<	if ((who = get_history(user,
546	<	(time_t)ConfigFileEntry.kill_chase_time_limit))
547	<	== NULL)
545	>	if ((who = whowas_get_history(name,
546	>	(time_t)ConfigFileEntry.kill_chase_time_limit))
547	>	== NULL)
548		{
549	<	sendto_one(source_p, form_str(ERR_NOSUCHNICK),
599	<	me.name, source_p->name, user);
549	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHNICK, name);
550		return NULL;
551		}
552
#	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 670 | Line 625 | void
625		free_exited_clients(void)
626		{
627		dlink_node *ptr = NULL, *next = NULL;
628	<
628	>
629		DLINK_FOREACH_SAFE(ptr, next, dead_list.head)
630		{
631		free_client(ptr->data);
#	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)
665		remove_user_from_channel(lp->data);
666
667	<	add_history(source_p, 0);
668	<	off_history(source_p);
667	>	whowas_add_history(source_p, 0);
668	>	whowas_off_history(source_p);
669
670		watch_check_hash(source_p, RPL_LOGOFF);
671
#	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 803 | Line 754 | recurse_send_quits(struct Client *origin
754		}
755		}
756
757	<	/*
757	>	/*
758		* Remove all clients that depend on source_p; assumes all (S)QUITs have
759	<	* already been sent.  we make sure to exit a server's dependent clients
760	<	* and servers before the server itself; exit_one_client takes care of
759	>	* already been sent.  we make sure to exit a server's dependent clients
760	>	* and servers before the server itself; exit_one_client takes care of
761		* actually removing things off llists.   tweaked from +CSr31  -orabidoo
762		*/
763		static void
#	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 878 | Line 829 | exit_client(struct Client *source_p, str
829		if (IsIpHash(source_p))
830		remove_one_ip(&source_p->localClient->ip);
831
832	<	if (source_p->localClient->auth)
882	<	{
883	<	delete_auth(source_p->localClient->auth);
884	<	source_p->localClient->auth = NULL;
885	<	}
832	>	delete_auth(&source_p->localClient->auth);
833
834	<	/* This source_p could have status of one of STAT_UNKNOWN, STAT_CONNECTING
834	>	/*
835	>	* This source_p could have status of one of STAT_UNKNOWN, STAT_CONNECTING
836		* STAT_HANDSHAKE or STAT_UNKNOWN
837		* all of which are lumped together into unknown_list
838		*
#	Line 898 | Line 846 | exit_client(struct Client *source_p, str
846		}
847		else if (IsClient(source_p))
848		{
849	+	time_t on_for = CurrentTime - source_p->localClient->firsttime;
850		assert(Count.local > 0);
851		Count.local--;
852
853	<	if (IsOper(source_p))
905	<	{
853	>	if (HasUMode(source_p, UMODE_OPER))
854		if ((m = dlinkFindDelete(&oper_list, source_p)) != NULL)
855		free_dlink_node(m);
908	–	}
856
857		assert(dlinkFind(&local_client_list, source_p));
858		dlinkDelete(&source_p->localClient->lclient_node, &local_client_list);
#	Line 914 | Line 861 | exit_client(struct Client *source_p, str
861		free_list_task(source_p->localClient->list_task, source_p);
862
863		watch_del_watch_list(source_p);
864	<	sendto_realops_flags(UMODE_CCONN, L_ALL, "Client exiting: %s (%s@%s) [%s] [%s]",
864	>	sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
865	>	"Client exiting: %s (%s@%s) [%s] [%s]",
866		source_p->name, source_p->username, source_p->host, comment,
867		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
868		"255.255.255.255" : source_p->sockhost);
869	<	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL, "CLIEXIT: %s %s %s %s 0 %s",
870	<	source_p->name,
871	<	source_p->username,
872	<	source_p->host,
873	<
874	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
927	<	"255.255.255.255" : source_p->sockhost,
928	<	comment);
869	>	ilog(LOG_TYPE_USER, "%s (%3u:%02u:%02u): %s!%s@%s %llu/%llu",
870	>	myctime(source_p->localClient->firsttime), (unsigned int)(on_for / 3600),
871	>	(unsigned int)((on_for % 3600)/60), (unsigned int)(on_for % 60),
872	>	source_p->name, source_p->username, source_p->host,
873	>	source_p->localClient->send.bytes>>10,
874	>	source_p->localClient->recv.bytes>>10);
875		}
876	<
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	<	* XXX - TBV.  This is not true. The only place where we put a server on
935	<	* serv_list is in server_estab right now after registration process.
936	<	* And only after this, a burst is sent to the remote server, i.e. we never
937	<	* send a burst to STAT_CONNECTING, or STAT_HANDSHAKE. This will need
938	<	* more investigation later on, but for now, it's not a problem after all.
939	<	*/
940	<	if (IsServer(source_p) || IsConnecting(source_p) ||
941	<	IsHandshake(source_p))
876	>	else if (IsServer(source_p))
877		{
878	<	if (dlinkFind(&serv_list, source_p))
879	<	{
945	<	dlinkDelete(&source_p->localClient->lclient_node, &serv_list);
946	<	unset_chcap_usage_counts(source_p);
947	<	}
878	>	assert(Count.myserver > 0);
879	>	--Count.myserver;
880
881	<	if (IsServer(source_p))
882	<	Count.myserver--;
881	>	assert(dlinkFind(&serv_list, source_p));
882	>	dlinkDelete(&source_p->localClient->lclient_node, &serv_list);
883		}
884
953	–	log_user_exit(source_p);
954	–
885		if (!IsDead(source_p))
886		{
887		if (IsServer(source_p))
888		{
889		/* for them, we are exiting the network */
890		sendto_one(source_p, ":%s SQUIT %s :%s",
891	<	ID_or_name(from, source_p), me.name, comment);
891	>	ID_or_name(from, source_p), me.name, comment);
892		}
893
894		sendto_one(source_p, "ERROR :Closing Link: %s (%s)",
#	Line 978 | Line 908 | exit_client(struct Client *source_p, str
908		*/
909		close_connection(source_p);
910		}
911	+	else if (IsClient(source_p) && HasFlag(source_p->servptr, FLAGS_EOB))
912	+	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
913	+	"Client exiting at %s: %s (%s@%s) [%s]",
914	+	source_p->servptr->name, source_p->name,
915	+	source_p->username, source_p->host, comment);
916
917		if (IsServer(source_p))
918		{
#	Line 988 | Line 923 | exit_client(struct Client *source_p, str
923
924		if (ConfigServerHide.hide_servers)
925		/*
926	<	* Set netsplit message to "*.net *.split" to still show
926	>	* Set netsplit message to "*.net *.split" to still show
927		* that its a split, but hide the servers splitting
928		*/
929		strcpy(splitstr, "*.net *.split");
#	Line 1000 | Line 935 | exit_client(struct Client *source_p, str
935
936		if (source_p->servptr == &me)
937		{
938	<	sendto_realops_flags(UMODE_ALL, L_ALL,
938	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
939		"%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
940	<	source_p->name, (int)(CurrentTime - source_p->firsttime),
940	>	source_p->name, (int)(CurrentTime - source_p->localClient->firsttime),
941		source_p->localClient->send.bytes >> 10,
942		source_p->localClient->recv.bytes >> 10);
943	<	ilog(L_NOTICE, "%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
944	<	source_p->name, (int)(CurrentTime - source_p->firsttime),
943	>	ilog(LOG_TYPE_IRCD, "%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
944	>	source_p->name, (int)(CurrentTime - source_p->localClient->firsttime),
945		source_p->localClient->send.bytes >> 10,
946		source_p->localClient->recv.bytes >> 10);
947		}
948		}
949	<	else if (IsClient(source_p) && !IsKilled(source_p))
950	<	{
951	<	sendto_server(from->from, NULL, CAP_TS6, NOCAPS,
1017	<	":%s QUIT :%s", ID(source_p), comment);
1018	<	sendto_server(from->from, NULL, NOCAPS, CAP_TS6,
1019	<	":%s QUIT :%s", source_p->name, comment);
1020	<	}
949	>	else if (IsClient(source_p) && !HasFlag(source_p, FLAGS_KILLED))
950	>	sendto_server(from->from, NOCAPS, NOCAPS, ":%s QUIT :%s",
951	>	ID(source_p), comment);
952
953		/* The client *better* be off all of the lists */
954		assert(dlinkFind(&unknown_list, source_p) == NULL);
#	Line 1061 | Line 992 | dead_link_on_write(struct Client *client
992		void
993		dead_link_on_read(struct Client *client_p, int error)
994		{
995	<	char errmsg[255];
995	>	char errmsg[IRCD_BUFSIZE];
996		int current_error;
997
998		if (IsDefunct(client_p))
#	Line 1074 | Line 1005 | dead_link_on_read(struct Client *client_
1005
1006		if (IsServer(client_p) || IsHandshake(client_p))
1007		{
1008	<	int connected = CurrentTime - client_p->firsttime;
1009	<
1008	>	int connected = CurrentTime - client_p->localClient->firsttime;
1009	>
1010		if (error == 0)
1011		{
1012		/* Admins get the real IP */
1013	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1014	<	"Server %s closed the connection",
1015	<	get_client_name(client_p, SHOW_IP));
1013	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1014	>	"Server %s closed the connection",
1015	>	get_client_name(client_p, SHOW_IP));
1016
1017		/* Opers get a masked IP */
1018	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1019	<	"Server %s closed the connection",
1020	<	get_client_name(client_p, MASK_IP));
1018	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1019	>	"Server %s closed the connection",
1020	>	get_client_name(client_p, MASK_IP));
1021
1022	<	ilog(L_NOTICE, "Server %s closed the connection",
1023	<	get_client_name(client_p, SHOW_IP));
1022	>	ilog(LOG_TYPE_IRCD, "Server %s closed the connection",
1023	>	get_client_name(client_p, SHOW_IP));
1024		}
1025		else
1026		{
1027		report_error(L_ADMIN, "Lost connection to %s: %s",
1028	<	get_client_name(client_p, SHOW_IP), current_error);
1028	>	get_client_name(client_p, SHOW_IP), current_error);
1029		report_error(L_OPER, "Lost connection to %s: %s",
1030	<	get_client_name(client_p, MASK_IP), current_error);
1030	>	get_client_name(client_p, MASK_IP), current_error);
1031		}
1032
1033	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1034	<	"%s had been connected for %d day%s, %2d:%02d:%02d",
1035	<	client_p->name, connected/86400,
1036	<	(connected/86400 == 1) ? "" : "s",
1037	<	(connected % 86400) / 3600, (connected % 3600) / 60,
1038	<	connected % 60);
1033	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1034	>	"%s had been connected for %d day%s, %2d:%02d:%02d",
1035	>	client_p->name, connected/86400,
1036	>	(connected/86400 == 1) ? "" : "s",
1037	>	(connected % 86400) / 3600, (connected % 3600) / 60,
1038	>	connected % 60);
1039		}
1040
1041		if (error == 0)
#	Line 1131 | Line 1062 | exit_aborted_clients(void)
1062
1063		if (target_p == NULL)
1064		{
1065	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1065	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1066		"Warning: null client on abort_list!");
1067		dlinkDelete(ptr, &abort_list);
1068		free_dlink_node(ptr);
#	Line 1145 | Line 1076 | exit_aborted_clients(void)
1076		else
1077		notice = "Write error: connection closed";
1078
1079	<	exit_client(target_p, &me, notice);
1079	>	exit_client(target_p, &me, notice);
1080		free_dlink_node(ptr);
1081		}
1082		}
#	Line 1173 | Line 1104 | del_accept(struct split_nuh_item *accept
1104
1105		struct split_nuh_item *
1106		find_accept(const char *nick, const char *user,
1107	<	const char *host, struct Client *client_p, int do_match)
1107	>	const char *host, struct Client *client_p,
1108	>	int (*cmpfunc)(const char *, const char *))
1109		{
1110		dlink_node *ptr = NULL;
1179	–	/* XXX We wouldn't need that if match() would return 0 on match */
1180	–	int (*cmpfunc)(const char *, const char *) = do_match ? match : irccmp;
1111
1112		DLINK_FOREACH(ptr, client_p->localClient->acceptlist.head)
1113		{
1114		struct split_nuh_item *accept_p = ptr->data;
1115
1116	<	if (cmpfunc(accept_p->nickptr, nick) == do_match &&
1117	<	cmpfunc(accept_p->userptr, user) == do_match &&
1118	<	cmpfunc(accept_p->hostptr, host) == do_match)
1116	>	if (!cmpfunc(accept_p->nickptr, nick) &&
1117	>	!cmpfunc(accept_p->userptr, user) &&
1118	>	!cmpfunc(accept_p->hostptr, host))
1119		return accept_p;
1120		}
1121
#	Line 1206 | Line 1136 | accept_message(struct Client *source,
1136		dlink_node *ptr = NULL;
1137
1138		if (source == target || find_accept(source->name, source->username,
1139	<	source->host, target, 1))
1139	>	source->host, target, match))
1140		return 1;
1141
1142	<	if (IsSoftCallerId(target))
1142	>	if (HasUMode(target, UMODE_SOFTCALLERID))
1143		DLINK_FOREACH(ptr, target->channel.head)
1144		if (IsMember(source, ((struct Membership *)ptr->data)->chptr))
1145		return 1;
#	Line 1231 | Line 1161 | del_all_accepts(struct Client *client_p)
1161		DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->acceptlist.head)
1162		del_accept(ptr->data, client_p);
1163		}
1164	+
1165	+	unsigned int
1166	+	idle_time_get(const struct Client *source_p, const struct Client *target_p)
1167	+	{
1168	+	unsigned int idle = 0;
1169	+	unsigned int min_idle = 0;
1170	+	unsigned int max_idle = 0;
1171	+	const struct ClassItem *class = get_class_ptr(&target_p->localClient->confs);
1172	+
1173	+	if (!(class->flags & CLASS_FLAGS_FAKE_IDLE) || target_p == source_p)
1174	+	return CurrentTime - target_p->localClient->last_privmsg;
1175	+	if (HasUMode(source_p, UMODE_OPER) &&
1176	+	!(class->flags & CLASS_FLAGS_HIDE_IDLE_FROM_OPERS))
1177	+	return CurrentTime - target_p->localClient->last_privmsg;
1178	+
1179	+	min_idle = class->min_idle;
1180	+	max_idle = class->max_idle;
1181	+
1182	+	if (min_idle == max_idle)
1183	+	return min_idle;
1184	+
1185	+	if (class->flags & CLASS_FLAGS_RANDOM_IDLE)
1186	+	idle = genrand_int32();
1187	+	else
1188	+	idle = CurrentTime - target_p->localClient->last_privmsg;
1189	+
1190	+	if (max_idle == 0)
1191	+	idle = 0;
1192	+	else
1193	+	idle %= max_idle;
1194	+
1195	+	if (idle < min_idle)
1196	+	idle = min_idle + (idle % (max_idle - min_idle));
1197	+
1198	+	return idle;
1199	+	}

Diff Legend

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