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 876 by michael, Wed Oct 24 21:51:21 2007 UTC vs.
ircd-hybrid/trunk/src/client.c (file contents), Revision 3024 by michael, Mon Feb 24 22:31:48 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 "tools.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"
34		#include "irc_string.h"
34	–	#include "sprintf_irc.h"
35		#include "ircd.h"
36	–	#include "list.h"
36		#include "s_gline.h"
37		#include "numeric.h"
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 48 | Line 47
47		#include "s_user.h"
48		#include "dbuf.h"
49		#include "memory.h"
50	+	#include "mempool.h"
51		#include "hostmask.h"
52	–	#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 67 | 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 77 | 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);
80	–	static void ban_them(struct Client *client_p, struct ConfItem *conf);
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 115 | 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, make_dlink_node(), &unknown_list);
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 150 | 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
156	–	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 172 | 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 191 | 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 213 | 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 223 | 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 */
234	<	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 244 | Line 256 | check_pings_list(dlink_list *list)
256		if (IsDead(client_p))
257		{
258		/* Ignore it, its been exited already */
247	–	continue;
248	–	}
249	–
250	–	if (client_p->localClient->reject_delay > 0)
251	–	{
252	–	if (client_p->localClient->reject_delay <= CurrentTime)
253	–	exit_client(client_p, &me, "Rejected");
259		continue;
260		}
261
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	–
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;
300	<	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	<	ircsprintf(scratch, "Ping timeout: %d seconds",
301	<	(int)(CurrentTime - client_p->lasttime));
300	>	snprintf(scratch, sizeof(scratch), "Ping timeout: %d seconds",
301	>	(int)(CurrentTime - client_p->localClient->lasttime));
302		exit_client(client_p, &me, scratch);
303		}
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	–	}
304		}
305		}
306		}
#	Line 361 | Line 321 | check_unknowns_list(void)
321		{
322		struct Client *client_p = ptr->data;
323
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	–
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 384 | 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;
392	<	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 401 | 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 */
405	<	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);
412	<	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",
423	<	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 */
430	<	continue;
431	<	}
432	<
433	<	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 */
437	<	if (IsExemptKline(client_p))
438	<	{
439	<	sendto_realops_flags(UMODE_ALL, L_ALL,
440	<	"KLINE over-ruled for %s, client is kline_exempt",
441	<	get_client_name(client_p, HIDE_IP));
442	<	continue;
443	<	}
444	<
445	<	conf = unmap_conf_item(aconf);
446	<	ban_them(client_p, conf);
447	<	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,
452	<	NULL, NULL, 0)) != NULL ||
453	<	(conf = find_matching_name_conf(RXLINE_TYPE, client_p->info,
454	<	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 463 | 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 475 | 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 */
489	<	const char *channel_reason = NULL;    /* What is sent to channel */
490	<	struct AccessItem *aconf = NULL;
491	<	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 497 | 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;
503	–	aconf = map_to_conf(conf);
440		break;
441	<	case DLINE_TYPE:
441	>	case CONF_DLINE:
442		type_string = dline_string;
507	–	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;
511	–	aconf = map_to_conf(conf);
455		break;
456	<	case RXLINE_TYPE:
514	<	case XLINE_TYPE:
456	>	case CONF_XLINE:
457		type_string = xline_string;
458	<	xconf = map_to_conf(conf);
517	<	++xconf->count;
458	>	++conf->count;
459		break;
460		default:
461		assert(0);
462		break;
463		}
464
465	<	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;
465	>	user_reason = conf->reason ? conf->reason : type_string;
466
467	<	if (ConfigFileEntry.kline_reason != NULL)
535	<	channel_reason = ConfigFileEntry.kline_reason;
536	<	else
537	<	channel_reason = user_reason;
538	<
539	<	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),
472	<	me.name, client_p->name, user_reason);
472	>	me.name, client_p->name, user_reason);
473
474	<	exit_client(client_p, &me, channel_reason);
474	>	exit_client(client_p, &me, user_reason);
475		}
476
477		/* update_client_exit_stats()
478		*
479		* input        - pointer to client
480		* output       - NONE
481	<	* side effects -
481	>	* side effects -
482		*/
483		static void
484		update_client_exit_stats(struct Client *client_p)
485		{
486	<	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))
486	>	if (IsClient(client_p))
487		{
488	+	assert(Count.total > 0);
489		--Count.total;
490	<	if (IsOper(client_p))
490	>	if (HasUMode(client_p, UMODE_OPER))
491		--Count.oper;
492	<	if (IsInvisible(client_p))
492	>	if (HasUMode(client_p, UMODE_INVISIBLE))
493		--Count.invisi;
494		}
495	+	else if (IsServer(client_p))
496	+	sendto_realops_flags(UMODE_EXTERNAL, L_ALL, SEND_NOTICE,
497	+	"Server %s split from %s",
498	+	client_p->name, client_p->servptr->name);
499
500		if (splitchecking && !splitmode)
501		check_splitmode(NULL);
#	Line 580 | Line 507 | update_client_exit_stats(struct Client *
507		* output       - return client pointer
508		* side effects - find person by (nick)name
509		*/
583	–	/* XXX - ugly wrapper */
510		struct Client *
511	<	find_person(const struct Client *client_p, const char *name)
511	>	find_person(const struct Client *const client_p, const char *name)
512		{
513	<	struct Client *c2ptr;
513	>	struct Client *target_p = NULL;
514
515		if (IsDigit(*name))
516		{
517	<	if ((c2ptr = hash_find_id(name)) != NULL)
518	<	{
593	<	/* invisible users shall not be found by UID guessing */
594	<	if (IsInvisible(c2ptr) && !IsServer(client_p))
595	<	c2ptr = NULL;
596	<	}
517	>	if (IsServer(client_p) || HasFlag(client_p, FLAGS_SERVICE))
518	>	target_p = hash_find_id(name);
519		}
520		else
521	<	c2ptr = find_client(name);
521	>	target_p = hash_find_client(name);
522
523	<	return ((c2ptr != NULL && IsClient(c2ptr)) ? c2ptr : NULL);
523	>	return (target_p && IsClient(target_p)) ? target_p : NULL;
524		}
525
526		/*
527	<	* find_chasing - find the client structure for a nick name (user)
528	<	*      using history mechanism if necessary. If the client is not found,
527	>	* find_chasing - find the client structure for a nick name (name)
528	>	*      using history mechanism if necessary. If the client is not found,
529		*      an error message (NO SUCH NICK) is generated. If the client was found
530		*      through the history, chasing will be 1 and otherwise 0.
531		*/
532		struct Client *
533	<	find_chasing(struct Client *client_p, struct Client *source_p, const char *user, int *chasing)
533	>	find_chasing(struct Client *source_p, const char *name, int *const chasing)
534		{
535	<	struct Client *who = find_person(client_p, user);
535	>	struct Client *who = find_person(source_p->from, name);
536
537		if (chasing)
538		*chasing = 0;
539
540		if (who)
541	<	return(who);
541	>	return who;
542
543	<	if (IsDigit(*user))
544	<	return(NULL);
543	>	if (IsDigit(*name))
544	>	return NULL;
545
546	<	if ((who = get_history(user,
547	<	(time_t)ConfigFileEntry.kill_chase_time_limit))
548	<	== NULL)
546	>	if ((who = whowas_get_history(name,
547	>	(time_t)ConfigFileEntry.kill_chase_time_limit))
548	>	== NULL)
549		{
550		sendto_one(source_p, form_str(ERR_NOSUCHNICK),
551	<	me.name, source_p->name, user);
552	<	return(NULL);
551	>	me.name, source_p->name, name);
552	>	return NULL;
553		}
554
555		if (chasing)
556		*chasing = 1;
557
558	<	return(who);
558	>	return who;
559		}
560
561		/*
#	Line 655 | Line 577 | find_chasing(struct Client *client_p, st
577		*        to modify what it points!!!
578		*/
579		const char *
580	<	get_client_name(struct Client *client, int showip)
580	>	get_client_name(const struct Client *client, enum addr_mask_type type)
581		{
582		static char nbuf[HOSTLEN * 2 + USERLEN + 5];
583
584		assert(client != NULL);
585
586	<	if (irccmp(client->name, client->host) == 0)
587	<	return(client->name);
586	>	if (!MyConnect(client))
587	>	return client->name;
588
589	<	if (ConfigServerHide.hide_server_ips)
590	<	if (IsServer(client) || IsConnecting(client) || IsHandshake(client))
591	<	showip = MASK_IP;
589	>	if (IsServer(client) || IsConnecting(client) || IsHandshake(client))
590	>	{
591	>	if (!irccmp(client->name, client->host))
592	>	return client->name;
593	>	else if (ConfigServerHide.hide_server_ips)
594	>	type = MASK_IP;
595	>	}
596
597		if (ConfigFileEntry.hide_spoof_ips)
598	<	if (showip == SHOW_IP && IsIPSpoof(client))
599	<	showip = MASK_IP;
598	>	if (type == SHOW_IP && IsIPSpoof(client))
599	>	type = MASK_IP;
600
601		/* And finally, let's get the host information, ip or name */
602	<	switch (showip)
602	>	switch (type)
603		{
604		case SHOW_IP:
605	<	if (MyConnect(client))
606	<	{
607	<	ircsprintf(nbuf, "%s[%s@%s]", client->name, client->username,
608	<	client->sockhost);
683	<	break;
684	<	}
605	>	snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
606	>	client->name,
607	>	client->username, client->sockhost);
608	>	break;
609		case MASK_IP:
610	<	ircsprintf(nbuf, "%s[%s@255.255.255.255]", client->name,
611	<	client->username);
610	>	if (client->localClient->aftype == AF_INET)
611	>	snprintf(nbuf, sizeof(nbuf), "%s[%s@255.255.255.255]",
612	>	client->name, client->username);
613	>	else
614	>	snprintf(nbuf, sizeof(nbuf), "%s[%s@ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]",
615	>	client->name, client->username);
616		break;
617		default:
618	<	ircsprintf(nbuf, "%s[%s@%s]", client->name, client->username,
619	<	client->host);
618	>	snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
619	>	client->name,
620	>	client->username, client->host);
621		}
622
623	<	return(nbuf);
623	>	return nbuf;
624		}
625
626		void
627		free_exited_clients(void)
628		{
629	<	dlink_node *ptr, *next;
630	<	struct Client *target_p;
702	<
629	>	dlink_node *ptr = NULL, *next = NULL;
630	>
631		DLINK_FOREACH_SAFE(ptr, next, dead_list.head)
632		{
633	<	target_p = ptr->data;
706	<
707	<	if (ptr->data == NULL)
708	<	{
709	<	sendto_realops_flags(UMODE_ALL, L_ALL,
710	<	"Warning: null client on dead_list!");
711	<	dlinkDelete(ptr, &dead_list);
712	<	free_dlink_node(ptr);
713	<	continue;
714	<	}
715	<
716	<	free_client(target_p);
633	>	free_client(ptr->data);
634		dlinkDelete(ptr, &dead_list);
635		free_dlink_node(ptr);
636		}
#	Line 732 | Line 649 | exit_one_client(struct Client *source_p,
649
650		assert(!IsMe(source_p));
651
652	<	if (IsServer(source_p))
736	<	{
737	<	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->servers);
738	<
739	<	if ((lp = dlinkFindDelete(&global_serv_list, source_p)) != NULL)
740	<	free_dlink_node(lp);
741	<
742	<	if (!MyConnect(source_p))
743	<	{
744	<	source_p->from->serv->dep_servers--;
745	<	assert(source_p->from->serv->dep_servers > 0);
746	<	}
747	<	}
748	<	else if (IsClient(source_p))
652	>	if (IsClient(source_p))
653		{
654		if (source_p->servptr->serv != NULL)
655	<	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->users);
655	>	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->client_list);
656
657	<	/* If a person is on a channel, send a QUIT notice
658	<	** to every client (person) on the same channel (so
659	<	** that the client can show the "**signoff" message).
660	<	** (Note: The notice is to the local clients *only*)
661	<	*/
662	<	sendto_common_channels_local(source_p, 0, ":%s!%s@%s QUIT :%s",
657	>	/*
658	>	* If a person is on a channel, send a QUIT notice
659	>	* to every client (person) on the same channel (so
660	>	* that the client can show the "**signoff" message).
661	>	* (Note: The notice is to the local clients *only*)
662	>	*/
663	>	sendto_common_channels_local(source_p, 0, 0, ":%s!%s@%s QUIT :%s",
664		source_p->name, source_p->username,
665		source_p->host, quitmsg);
666		DLINK_FOREACH_SAFE(lp, next_lp, source_p->channel.head)
667		remove_user_from_channel(lp->data);
668
669	<	/* Clean up allow lists */
670	<	del_all_accepts(source_p);
766	<	add_history(source_p, 0);
767	<	off_history(source_p);
669	>	whowas_add_history(source_p, 0);
670	>	whowas_off_history(source_p);
671
672		watch_check_hash(source_p, RPL_LOGOFF);
673
674	<	if (!MyConnect(source_p))
772	<	{
773	<	source_p->from->serv->dep_users--;
774	<	assert(source_p->from->serv->dep_users >= 0);
775	<	}
776	<	else
674	>	if (MyConnect(source_p))
675		{
676		/* Clean up invitefield */
677		DLINK_FOREACH_SAFE(lp, next_lp, source_p->localClient->invited.head)
678		del_invite(lp->data, source_p);
679	+
680	+	del_all_accepts(source_p);
681		}
682		}
683	+	else if (IsServer(source_p))
684	+	{
685	+	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->server_list);
686	+
687	+	if ((lp = dlinkFindDelete(&global_serv_list, source_p)) != NULL)
688	+	free_dlink_node(lp);
689	+	}
690
691		/* Remove source_p from the client lists */
692		if (HasID(source_p))
#	Line 819 | Line 726 | exit_one_client(struct Client *source_p,
726		static void
727		recurse_send_quits(struct Client *original_source_p, struct Client *source_p,
728		struct Client *from, struct Client *to, const char *comment,
729	<	const char *splitstr, const char *myname)
729	>	const char *splitstr)
730		{
731		dlink_node *ptr, *next;
732		struct Client *target_p;
826	–	int hidden = match(myname, source_p->name);
733
734		assert(to != source_p);  /* should be already removed from serv_list */
735
736		/* If this server can handle quit storm (QS) removal
737		* of dependents, just send the SQUIT
832	–	*
833	–	* Always check *all* dependent servers if some of them are
834	–	* hidden behind fakename. If so, send out the QUITs -adx
738		*/
739	<	if (hidden || !IsCapable(to, CAP_QS))
740	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->users.head)
739	>	if (!IsCapable(to, CAP_QS))
740	>	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->client_list.head)
741		{
742		target_p = ptr->data;
743		sendto_one(to, ":%s QUIT :%s", target_p->name, splitstr);
744		}
745
746	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->servers.head)
746	>	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->server_list.head)
747		recurse_send_quits(original_source_p, ptr->data, from, to,
748	<	comment, splitstr, myname);
748	>	comment, splitstr);
749
750	<	if (!hidden && ((source_p == original_source_p && to != from) ||
751	<	!IsCapable(to, CAP_QS)))
750	>	if ((source_p == original_source_p && to != from) ||
751	>	!IsCapable(to, CAP_QS))
752		{
753		/* don't use a prefix here - we have to be 100% sure the message
754		* will be accepted without Unknown prefix etc.. */
#	Line 853 | Line 756 | recurse_send_quits(struct Client *origin
756		}
757		}
758
759	<	/*
759	>	/*
760		* Remove all clients that depend on source_p; assumes all (S)QUITs have
761	<	* already been sent.  we make sure to exit a server's dependent clients
762	<	* and servers before the server itself; exit_one_client takes care of
761	>	* already been sent.  we make sure to exit a server's dependent clients
762	>	* and servers before the server itself; exit_one_client takes care of
763		* actually removing things off llists.   tweaked from +CSr31  -orabidoo
764		*/
765		static void
#	Line 864 | Line 767 | recurse_remove_clients(struct Client *so
767		{
768		dlink_node *ptr, *next;
769
770	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->users.head)
770	>	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->client_list.head)
771		exit_one_client(ptr->data, quitmsg);
772
773	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->servers.head)
773	>	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->server_list.head)
774		{
775		recurse_remove_clients(ptr->data, quitmsg);
776		exit_one_client(ptr->data, quitmsg);
777		}
875	–
876	–	assert(source_p->serv->dep_servers == 1);
877	–	assert(source_p->serv->dep_users == 0);
778		}
779
780		/*
#	Line 886 | Line 786 | static void
786		remove_dependents(struct Client *source_p, struct Client *from,
787		const char *comment, const char *splitstr)
788		{
789	<	struct Client *to;
890	<	struct ConfItem *conf;
891	<	static char myname[HOSTLEN+1];
892	<	dlink_node *ptr;
789	>	dlink_node *ptr = NULL;
790
791		DLINK_FOREACH(ptr, serv_list.head)
792	<	{
793	<	to = ptr->data;
897	<
898	<	if ((conf = to->serv->sconf) != NULL)
899	<	strlcpy(myname, my_name_for_link(conf), sizeof(myname));
900	<	else
901	<	strlcpy(myname, me.name, sizeof(myname));
902	<	recurse_send_quits(source_p, source_p, from, to,
903	<	comment, splitstr, myname);
904	<	}
792	>	recurse_send_quits(source_p, source_p, from, ptr->data,
793	>	comment, splitstr);
794
795		recurse_remove_clients(source_p, splitstr);
796		}
#	Line 911 | Line 800 | remove_dependents(struct Client *source_
800		* this on any struct Client, regardless of its state.
801		*
802		* Note, you shouldn't exit remote _users_ without first doing
803	<	* SetKilled and propagating a kill or similar message. However,
804	<	* it is perfectly correct to call exit_client to force a _server_
803	>	* AddFlag(x, FLAGS_KILLED) and propagating a kill or similar message.
804	>	* However, it is perfectly correct to call exit_client to force a _server_
805		* quit (either local or remote one).
806		*
807		* inputs:       - a client pointer that is going to be exited
#	Line 927 | Line 816 | remove_dependents(struct Client *source_
816		void
817		exit_client(struct Client *source_p, struct Client *from, const char *comment)
818		{
819	<	dlink_node *m;
819	>	dlink_node *m = NULL;
820
821		if (MyConnect(source_p))
822		{
#	Line 942 | Line 831 | exit_client(struct Client *source_p, str
831		if (IsIpHash(source_p))
832		remove_one_ip(&source_p->localClient->ip);
833
834	<	delete_auth(source_p);
834	>	delete_auth(&source_p->localClient->auth);
835
836	<	/* This source_p could have status of one of STAT_UNKNOWN, STAT_CONNECTING
836	>	/*
837	>	* This source_p could have status of one of STAT_UNKNOWN, STAT_CONNECTING
838		* STAT_HANDSHAKE or STAT_UNKNOWN
839		* all of which are lumped together into unknown_list
840		*
#	Line 952 | Line 842 | exit_client(struct Client *source_p, str
842		*/
843		if (!IsRegistered(source_p))
844		{
845	<	if ((m = dlinkFindDelete(&unknown_list, source_p)) != NULL)
846	<	free_dlink_node(m);
845	>	assert(dlinkFind(&unknown_list, source_p));
846	>
847	>	dlinkDelete(&source_p->localClient->lclient_node, &unknown_list);
848		}
849		else if (IsClient(source_p))
850		{
851	+	time_t on_for = CurrentTime - source_p->localClient->firsttime;
852	+	assert(Count.local > 0);
853		Count.local--;
854
855	<	if (IsOper(source_p))
963	<	{
855	>	if (HasUMode(source_p, UMODE_OPER))
856		if ((m = dlinkFindDelete(&oper_list, source_p)) != NULL)
857		free_dlink_node(m);
966	–	}
858
859	+	assert(dlinkFind(&local_client_list, source_p));
860		dlinkDelete(&source_p->localClient->lclient_node, &local_client_list);
861	+
862		if (source_p->localClient->list_task != NULL)
863		free_list_task(source_p->localClient->list_task, source_p);
864
865		watch_del_watch_list(source_p);
866	<	sendto_realops_flags(UMODE_CCONN, L_ALL, "Client exiting: %s (%s@%s) [%s] [%s]",
866	>	sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
867	>	"Client exiting: %s (%s@%s) [%s] [%s]",
868		source_p->name, source_p->username, source_p->host, comment,
869		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
870		"255.255.255.255" : source_p->sockhost);
871	<	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL, "CLIEXIT: %s %s %s %s 0 %s",
872	<	source_p->name,
873	<	source_p->username,
874	<	source_p->host,
875	<
876	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
877	<	"255.255.255.255" : source_p->sockhost,
878	<	comment);
879	<	}
880	<
881	<	/* As soon as a client is known to be a server of some sort
882	<	* it has to be put on the serv_list, or SJOIN's to this new server
883	<	* from the connect burst will not be seen.
884	<	*/
885	<	if (IsServer(source_p) || IsConnecting(source_p) ||
992	<	IsHandshake(source_p))
993	<	{
994	<	if ((m = dlinkFindDelete(&serv_list, source_p)) != NULL)
995	<	{
996	<	free_dlink_node(m);
997	<	unset_chcap_usage_counts(source_p);
998	<	}
999	<
1000	<	if (IsServer(source_p))
1001	<	{
1002	<	Count.myserver--;
1003	<	if (ServerInfo.hub)
1004	<	remove_lazylink_flags(source_p->localClient->serverMask);
1005	<	else
1006	<	uplink = NULL;
1007	<	}
871	>	ilog(LOG_TYPE_USER, "%s (%3u:%02u:%02u): %s!%s@%s %llu/%llu",
872	>	myctime(source_p->localClient->firsttime), (unsigned int)(on_for / 3600),
873	>	(unsigned int)((on_for % 3600)/60), (unsigned int)(on_for % 60),
874	>	source_p->name, source_p->username, source_p->host,
875	>	source_p->localClient->send.bytes>>10,
876	>	source_p->localClient->recv.bytes>>10);
877	>	}
878	>	else if (IsServer(source_p))
879	>	{
880	>	assert(Count.myserver > 0);
881	>	--Count.myserver;
882	>
883	>	assert(dlinkFind(&serv_list, source_p));
884	>	dlinkDelete(&source_p->localClient->lclient_node, &serv_list);
885	>	unset_chcap_usage_counts(source_p);
886		}
887
1010	–	log_user_exit(source_p);
1011	–
888		if (!IsDead(source_p))
889		{
890		if (IsServer(source_p))
891		{
892		/* for them, we are exiting the network */
893		sendto_one(source_p, ":%s SQUIT %s :%s",
894	<	ID_or_name(from, source_p), me.name, comment);
894	>	ID_or_name(from, source_p), me.name, comment);
895		}
896
897		sendto_one(source_p, "ERROR :Closing Link: %s (%s)",
#	Line 1035 | Line 911 | exit_client(struct Client *source_p, str
911		*/
912		close_connection(source_p);
913		}
914	+	else if (IsClient(source_p) && HasFlag(source_p->servptr, FLAGS_EOB))
915	+	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
916	+	"Client exiting at %s: %s (%s@%s) [%s]",
917	+	source_p->servptr->name, source_p->name,
918	+	source_p->username, source_p->host, comment);
919
920		if (IsServer(source_p))
921		{
#	Line 1044 | Line 925 | exit_client(struct Client *source_p, str
925		assert(source_p->serv != NULL && source_p->servptr != NULL);
926
927		if (ConfigServerHide.hide_servers)
928	<	/* set netsplit message to "*.net *.split" to still show
928	>	/*
929	>	* Set netsplit message to "*.net *.split" to still show
930		* that its a split, but hide the servers splitting
931		*/
932		strcpy(splitstr, "*.net *.split");
#	Line 1056 | Line 938 | exit_client(struct Client *source_p, str
938
939		if (source_p->servptr == &me)
940		{
941	<	sendto_realops_flags(UMODE_ALL, L_ALL,
941	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
942		"%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
943	<	source_p->name, (int)(CurrentTime - source_p->firsttime),
943	>	source_p->name, (int)(CurrentTime - source_p->localClient->firsttime),
944		source_p->localClient->send.bytes >> 10,
945		source_p->localClient->recv.bytes >> 10);
946	<	ilog(L_NOTICE, "%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
947	<	source_p->name, (int)(CurrentTime - source_p->firsttime),
946	>	ilog(LOG_TYPE_IRCD, "%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
947	>	source_p->name, (int)(CurrentTime - source_p->localClient->firsttime),
948		source_p->localClient->send.bytes >> 10,
949		source_p->localClient->recv.bytes >> 10);
950		}
951		}
952	<	else if (IsClient(source_p) && !IsKilled(source_p))
952	>	else if (IsClient(source_p) && !HasFlag(source_p, FLAGS_KILLED))
953		{
954	<	sendto_server(from->from, source_p, NULL, CAP_TS6, NOCAPS, NOFLAGS,
954	>	sendto_server(from->from, CAP_TS6, NOCAPS,
955		":%s QUIT :%s", ID(source_p), comment);
956	<	sendto_server(from->from, source_p, NULL, NOCAPS, CAP_TS6, NOFLAGS,
956	>	sendto_server(from->from, NOCAPS, CAP_TS6,
957		":%s QUIT :%s", source_p->name, comment);
958		}
959
#	Line 1117 | Line 999 | dead_link_on_write(struct Client *client
999		void
1000		dead_link_on_read(struct Client *client_p, int error)
1001		{
1002	<	char errmsg[255];
1002	>	char errmsg[IRCD_BUFSIZE];
1003		int current_error;
1004
1005		if (IsDefunct(client_p))
#	Line 1130 | Line 1012 | dead_link_on_read(struct Client *client_
1012
1013		if (IsServer(client_p) || IsHandshake(client_p))
1014		{
1015	<	int connected = CurrentTime - client_p->firsttime;
1016	<
1015	>	int connected = CurrentTime - client_p->localClient->firsttime;
1016	>
1017		if (error == 0)
1018		{
1019		/* Admins get the real IP */
1020	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1021	<	"Server %s closed the connection",
1022	<	get_client_name(client_p, SHOW_IP));
1020	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1021	>	"Server %s closed the connection",
1022	>	get_client_name(client_p, SHOW_IP));
1023
1024		/* Opers get a masked IP */
1025	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1026	<	"Server %s closed the connection",
1027	<	get_client_name(client_p, MASK_IP));
1025	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1026	>	"Server %s closed the connection",
1027	>	get_client_name(client_p, MASK_IP));
1028
1029	<	ilog(L_NOTICE, "Server %s closed the connection",
1030	<	get_client_name(client_p, SHOW_IP));
1029	>	ilog(LOG_TYPE_IRCD, "Server %s closed the connection",
1030	>	get_client_name(client_p, SHOW_IP));
1031		}
1032		else
1033		{
1034		report_error(L_ADMIN, "Lost connection to %s: %s",
1035	<	get_client_name(client_p, SHOW_IP), current_error);
1035	>	get_client_name(client_p, SHOW_IP), current_error);
1036		report_error(L_OPER, "Lost connection to %s: %s",
1037	<	get_client_name(client_p, MASK_IP), current_error);
1037	>	get_client_name(client_p, MASK_IP), current_error);
1038		}
1039
1040	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1041	<	"%s had been connected for %d day%s, %2d:%02d:%02d",
1042	<	client_p->name, connected/86400,
1043	<	(connected/86400 == 1) ? "" : "s",
1044	<	(connected % 86400) / 3600, (connected % 3600) / 60,
1045	<	connected % 60);
1040	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1041	>	"%s had been connected for %d day%s, %2d:%02d:%02d",
1042	>	client_p->name, connected/86400,
1043	>	(connected/86400 == 1) ? "" : "s",
1044	>	(connected % 86400) / 3600, (connected % 3600) / 60,
1045	>	connected % 60);
1046		}
1047
1048		if (error == 0)
1049		strlcpy(errmsg, "Remote host closed the connection",
1050		sizeof(errmsg));
1051		else
1052	<	ircsprintf(errmsg, "Read error: %s",
1053	<	strerror(current_error));
1052	>	snprintf(errmsg, sizeof(errmsg), "Read error: %s",
1053	>	strerror(current_error));
1054
1055		exit_client(client_p, &me, errmsg);
1056		}
#	Line 1187 | Line 1069 | exit_aborted_clients(void)
1069
1070		if (target_p == NULL)
1071		{
1072	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1072	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1073		"Warning: null client on abort_list!");
1074		dlinkDelete(ptr, &abort_list);
1075		free_dlink_node(ptr);
#	Line 1201 | Line 1083 | exit_aborted_clients(void)
1083		else
1084		notice = "Write error: connection closed";
1085
1086	<	exit_client(target_p, &me, notice);
1086	>	exit_client(target_p, &me, notice);
1087		free_dlink_node(ptr);
1088		}
1089		}
1090
1091		/*
1092		* accept processing, this adds a form of "caller ID" to ircd
1093	<	*
1093	>	*
1094		* If a client puts themselves into "caller ID only" mode,
1095	<	* only clients that match a client pointer they have put on
1095	>	* only clients that match a client pointer they have put on
1096		* the accept list will be allowed to message them.
1097		*
1098	<	* [ source.on_allow_list ] -> [ target1 ] -> [ target2 ]
1217	<	*
1218	<	* [target.allow_list] -> [ source1 ] -> [source2 ]
1219	<	*
1220	<	* i.e. a target will have a link list of source pointers it will allow
1221	<	* each source client then has a back pointer pointing back
1222	<	* to the client that has it on its accept list.
1223	<	* This allows for exit_one_client to remove these now bogus entries
1224	<	* from any client having an accept on them.
1098	>	* Diane Bruce, "Dianora" db@db.net
1099		*/
1100
1101	<	/* accept_message()
1102	<	*
1229	<	* inputs       - pointer to source client
1230	<	*              - pointer to target client
1231	<	* output       - 1 if accept this message 0 if not
1232	<	* side effects - See if source is on target's allow list
1233	<	*/
1234	<	int
1235	<	accept_message(struct Client *source, struct Client *target)
1101	>	void
1102	>	del_accept(struct split_nuh_item *accept_p, struct Client *client_p)
1103		{
1104	<	dlink_node *ptr;
1238	<
1239	<	DLINK_FOREACH(ptr, target->allow_list.head)
1240	<	{
1241	<	struct Client *target_p = ptr->data;
1242	<
1243	<	if (source == target_p)
1244	<	return (1);
1245	<	}
1104	>	dlinkDelete(&accept_p->node, &client_p->localClient->acceptlist);
1105
1106	<	if (IsSoftCallerId(target))
1107	<	{
1108	<	DLINK_FOREACH(ptr, target->channel.head)
1109	<	if (IsMember(source, ((struct Membership *)ptr->data)->chptr))
1251	<	return (1);
1252	<	}
1253	<
1254	<	return (0);
1106	>	MyFree(accept_p->nickptr);
1107	>	MyFree(accept_p->userptr);
1108	>	MyFree(accept_p->hostptr);
1109	>	MyFree(accept_p);
1110		}
1111
1112	<	/* del_from_accept()
1113	<	*
1114	<	* inputs       - pointer to source client
1115	<	*              - pointer to target client
1261	<	* output       - NONE
1262	<	* side effects - Delete's source pointer to targets allow list
1263	<	*
1264	<	* Walk through the target's accept list, remove if source is found,
1265	<	* Then walk through the source's on_accept_list remove target if found.
1266	<	*/
1267	<	void
1268	<	del_from_accept(struct Client *source, struct Client *target)
1112	>	struct split_nuh_item *
1113	>	find_accept(const char *nick, const char *user,
1114	>	const char *host, struct Client *client_p,
1115	>	int (*cmpfunc)(const char *, const char *))
1116		{
1117	<	dlink_node *ptr;
1271	<	dlink_node *ptr2;
1272	<	dlink_node *next_ptr;
1273	<	dlink_node *next_ptr2;
1274	<	struct Client *target_p;
1117	>	dlink_node *ptr = NULL;
1118
1119	<	DLINK_FOREACH_SAFE(ptr, next_ptr, target->allow_list.head)
1119	>	DLINK_FOREACH(ptr, client_p->localClient->acceptlist.head)
1120		{
1121	<	target_p = ptr->data;
1121	>	struct split_nuh_item *accept_p = ptr->data;
1122
1123	<	if (source == target_p)
1124	<	{
1125	<	dlinkDelete(ptr, &target->allow_list);
1126	<	free_dlink_node(ptr);
1284	<
1285	<	DLINK_FOREACH_SAFE(ptr2, next_ptr2, source->on_allow_list.head)
1286	<	{
1287	<	target_p = ptr2->data;
1288	<
1289	<	if (target == target_p)
1290	<	{
1291	<	dlinkDelete(ptr2, &source->on_allow_list);
1292	<	free_dlink_node(ptr2);
1293	<	}
1294	<	}
1295	<	}
1123	>	if (!cmpfunc(accept_p->nickptr, nick) &&
1124	>	!cmpfunc(accept_p->userptr, user) &&
1125	>	!cmpfunc(accept_p->hostptr, host))
1126	>	return accept_p;
1127		}
1128	+
1129	+	return NULL;
1130		}
1131
1132	<	/* del_all_accepts()
1132	>	/* accept_message()
1133		*
1134	<	* inputs       - pointer to exiting client
1135	<	* output       - NONE
1136	<	* side effects - Walk through given clients allow_list and on_allow_list
1137	<	*                remove all references to this client
1134	>	* inputs       - pointer to source client
1135	>	*              - pointer to target client
1136	>	* output       - 1 if accept this message 0 if not
1137	>	* side effects - See if source is on target's allow list
1138		*/
1139	<	void
1140	<	del_all_accepts(struct Client *client_p)
1139	>	int
1140	>	accept_message(struct Client *source,
1141	>	struct Client *target)
1142		{
1143	<	dlink_node *ptr, *next_ptr;
1310	<
1311	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->allow_list.head)
1312	<	del_from_accept(ptr->data, client_p);
1143	>	dlink_node *ptr = NULL;
1144
1145	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->on_allow_list.head)
1146	<	del_from_accept(client_p, ptr->data);
1147	<	}
1145	>	if (source == target || find_accept(source->name, source->username,
1146	>	source->host, target, match))
1147	>	return 1;
1148
1149	<	/* del_all_their_accepts()
1150	<	*
1151	<	* inputs       - pointer to exiting client
1152	<	* output       - NONE
1322	<	* side effects - Walk through given clients on_allow_list
1323	<	*                remove all references to this client,
1324	<	*                allow this client to keep their own allow_list
1325	<	*/
1326	<	void
1327	<	del_all_their_accepts(struct Client *client_p)
1328	<	{
1329	<	dlink_node *ptr, *next_ptr;
1149	>	if (HasUMode(target, UMODE_SOFTCALLERID))
1150	>	DLINK_FOREACH(ptr, target->channel.head)
1151	>	if (IsMember(source, ((struct Membership *)ptr->data)->chptr))
1152	>	return 1;
1153
1154	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->on_allow_list.head)
1332	<	del_from_accept(client_p, ptr->data);
1154	>	return 0;
1155		}
1156
1157	<	/* set_initial_nick()
1336	<	*
1337	<	* inputs
1338	<	* output
1339	<	* side effects -
1157	>	/* del_all_accepts()
1158		*
1159	<	* This function is only called to set up an initially registering
1160	<	* client.
1159	>	* inputs       - pointer to exiting client
1160	>	* output       - NONE
1161	>	* side effects - Walk through given clients acceptlist and remove all entries
1162		*/
1163		void
1164	<	set_initial_nick(struct Client *client_p, struct Client *source_p,
1346	<	const char *nick)
1164	>	del_all_accepts(struct Client *client_p)
1165		{
1166	<	char buf[USERLEN + 1];
1349	<
1350	<	/* Client setting NICK the first time */
1351	<
1352	<	/* This had to be copied here to avoid problems.. */
1353	<	source_p->tsinfo = CurrentTime;
1354	<	source_p->localClient->registration &= ~REG_NEED_NICK;
1355	<
1356	<	if (source_p->name[0])
1357	<	hash_del_client(source_p);
1358	<
1359	<	strlcpy(source_p->name, nick, sizeof(source_p->name));
1360	<	hash_add_client(source_p);
1361	<
1362	<	/* fd_desc is long enough */
1363	<	fd_note(&client_p->localClient->fd, "Nick: %s", nick);
1364	<
1365	<	/* They have the nick they want now.. */
1366	<	client_p->llname[0] = '\0';
1166	>	dlink_node *ptr = NULL, *next_ptr = NULL;
1167
1168	<	if (!source_p->localClient->registration)
1169	<	{
1370	<	strlcpy(buf, source_p->username, sizeof(buf));
1371	<
1372	<	/*
1373	<	* USER already received, now we have NICK.
1374	<	* *NOTE* For servers "NICK" *must* precede the
1375	<	* user message (giving USER before NICK is possible
1376	<	* only for local client connection!). register_user
1377	<	* may reject the client and call exit_client for it
1378	<	* --must test this and exit m_nick too!!!
1379	<	*/
1380	<	register_local_user(client_p, source_p, nick, buf);
1381	<	}
1168	>	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->acceptlist.head)
1169	>	del_accept(ptr->data, client_p);
1170		}
1171
1172	<	/* change_local_nick()
1173	<	*
1386	<	* inputs       - pointer to server
1387	<	*              - pointer to client
1388	<	*              - nick
1389	<	* output       -
1390	<	* side effects - changes nick of a LOCAL user
1391	<	*/
1392	<	void
1393	<	change_local_nick(struct Client *client_p, struct Client *source_p, const char *nick)
1172	>	unsigned int
1173	>	idle_time_get(const struct Client *source_p, const struct Client *target_p)
1174		{
1175	<	int samenick = 0;
1175	>	unsigned int idle = 0;
1176	>	unsigned int min_idle = 0;
1177	>	unsigned int max_idle = 0;
1178	>	const struct ClassItem *class = get_class_ptr(&target_p->localClient->confs);
1179
1180	<	/*
1181	<	** Client just changing his/her nick. If he/she is
1182	<	** on a channel, send note of change to all clients
1183	<	** on that channel. Propagate notice to other servers.
1184	<	*/
1402	<	if ((source_p->localClient->last_nick_change +
1403	<	ConfigFileEntry.max_nick_time) < CurrentTime)
1404	<	source_p->localClient->number_of_nick_changes = 0;
1405	<	source_p->localClient->last_nick_change = CurrentTime;
1406	<	source_p->localClient->number_of_nick_changes++;
1407	<
1408	<	if ((ConfigFileEntry.anti_nick_flood &&
1409	<	(source_p->localClient->number_of_nick_changes
1410	<	<= ConfigFileEntry.max_nick_changes)) ||
1411	<	!ConfigFileEntry.anti_nick_flood ||
1412	<	(IsOper(source_p) && ConfigFileEntry.no_oper_flood))
1413	<	{
1414	<	samenick = !irccmp(source_p->name, nick);
1180	>	if (!(class->flags & CLASS_FLAGS_FAKE_IDLE) || target_p == source_p)
1181	>	return CurrentTime - target_p->localClient->last_privmsg;
1182	>	if (HasUMode(source_p, UMODE_OPER) &&
1183	>	!(class->flags & CLASS_FLAGS_HIDE_IDLE_FROM_OPERS))
1184	>	return CurrentTime - target_p->localClient->last_privmsg;
1185
1186	<	if (!samenick)
1187	<	{
1418	<	/*
1419	<	* Make sure everyone that has this client on its accept list
1420	<	* loses that reference.
1421	<	*/
1422	<	del_all_their_accepts(source_p);
1423	<	source_p->tsinfo = CurrentTime;
1424	<	clear_ban_cache_client(source_p);
1425	<	}
1186	>	min_idle = class->min_idle;
1187	>	max_idle = class->max_idle;
1188
1189	<	/* XXX - the format of this notice should eventually be changed
1190	<	* to either %s[%s@%s], or even better would be get_client_name() -bill
1429	<	*/
1430	<	sendto_realops_flags(UMODE_NCHANGE, L_ALL, "Nick change: From %s to %s [%s@%s]",
1431	<	source_p->name, nick, source_p->username, source_p->host);
1432	<	sendto_common_channels_local(source_p, 1, ":%s!%s@%s NICK :%s",
1433	<	source_p->name, source_p->username,
1434	<	source_p->host, nick);
1435	<	add_history(source_p, 1);
1189	>	if (min_idle == max_idle)
1190	>	return min_idle;
1191
1192	<	/*
1193	<	* Only hubs care about lazy link nicks not being sent on yet
1439	<	* lazylink leafs/leafs always send their nicks up to hub,
1440	<	* hence must always propagate nick changes.
1441	<	* hubs might not propagate a nick change, if the leaf
1442	<	* does not know about that client yet.
1443	<	*/
1444	<	sendto_server(client_p, source_p, NULL, CAP_TS6, NOCAPS, NOFLAGS,
1445	<	":%s NICK %s :%lu",
1446	<	ID(source_p), nick, (unsigned long)source_p->tsinfo);
1447	<	sendto_server(client_p, source_p, NULL, NOCAPS, CAP_TS6, NOFLAGS,
1448	<	":%s NICK %s :%lu",
1449	<	source_p->name, nick, (unsigned long)source_p->tsinfo);
1450	<	}
1192	>	if (class->flags & CLASS_FLAGS_RANDOM_IDLE)
1193	>	idle = genrand_int32();
1194		else
1195	<	{
1453	<	sendto_one(source_p, form_str(ERR_NICKTOOFAST),
1454	<	me.name, source_p->name, source_p->name,
1455	<	nick, ConfigFileEntry.max_nick_time);
1456	<	return;
1457	<	}
1458	<
1459	<	/* Finally, add to hash */
1460	<	if (source_p->name[0])
1461	<	hash_del_client(source_p);
1195	>	idle = CurrentTime - target_p->localClient->last_privmsg;
1196
1197	<	if (!samenick)
1198	<	{
1199	<	clear_ban_cache_client(source_p);
1200	<	watch_check_hash(source_p, RPL_LOGOFF);
1467	<	}
1468	<
1469	<	strcpy(source_p->name, nick);
1470	<	hash_add_client(source_p);
1197	>	if (max_idle == 0)
1198	>	idle = 0;
1199	>	else
1200	>	idle %= max_idle;
1201
1202	<	if (!samenick)
1203	<	watch_check_hash(source_p, RPL_LOGON);
1202	>	if (idle < min_idle)
1203	>	idle = min_idle + (idle % (max_idle - min_idle));
1204
1205	<	/* fd_desc is long enough */
1476	<	fd_note(&client_p->localClient->fd, "Nick: %s", nick);
1205	>	return idle;
1206		}

Diff Legend

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