ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/svn/ircd-hybrid/trunk/src/client.c

Comparing:
ircd-hybrid/src/client.c (file contents), Revision 33 by knight, Sun Oct 2 20:50:00 2005 UTC vs.
ircd-hybrid/trunk/src/client.c (file contents), Revision 2583 by michael, Wed Nov 20 23:01:19 2013 UTC

#	Line 23 | Line 23
23		*/
24
25		#include "stdinc.h"
26	<	#include "tools.h"
26	>	#include "list.h"
27		#include "client.h"
28		#include "channel_mode.h"
29	–	#include "common.h"
29		#include "event.h"
30		#include "fdlist.h"
31		#include "hash.h"
32		#include "irc_string.h"
34	–	#include "sprintf_irc.h"
33		#include "ircd.h"
36	–	#include "list.h"
34		#include "s_gline.h"
35		#include "numeric.h"
36		#include "packet.h"
37		#include "s_auth.h"
38		#include "s_bsd.h"
39	<	#include "s_conf.h"
40	<	#include "s_log.h"
39	>	#include "conf.h"
40	>	#include "log.h"
41		#include "s_misc.h"
42		#include "s_serv.h"
43		#include "send.h"
#	Line 48 | Line 45
45		#include "s_user.h"
46		#include "dbuf.h"
47		#include "memory.h"
48	+	#include "mempool.h"
49		#include "hostmask.h"
52	–	#include "balloc.h"
50		#include "listener.h"
51		#include "irc_res.h"
52		#include "userhost.h"
53	+	#include "watch.h"
54	+	#include "rng_mt.h"
55
56		dlink_list listing_client_list = { NULL, NULL, 0 };
57		/* Pointer to beginning of Client list */
#	Line 66 | Line 65 | dlink_list oper_list = {NULL, NULL, 0};
65
66		static EVH check_pings;
67
68	<	static BlockHeap *client_heap  = NULL;
69	<	static BlockHeap *lclient_heap = NULL;
68	>	static mp_pool_t *client_pool  = NULL;
69	>	static mp_pool_t *lclient_pool = NULL;
70
71		static dlink_list dead_list  = { NULL, NULL, 0};
72		static dlink_list abort_list = { NULL, NULL, 0};
#	Line 76 | Line 75 | static dlink_node *eac_next;  /* next ab
75
76		static void check_pings_list(dlink_list *);
77		static void check_unknowns_list(void);
78	<	static void ban_them(struct Client *client_p, struct ConfItem *conf);
78	>	static void ban_them(struct Client *, struct MaskItem *);
79
80
81	<	/* init_client()
81	>	/* client_init()
82		*
83		* inputs       - NONE
84		* output       - NONE
85		* side effects - initialize client free memory
86		*/
87		void
88	<	init_client(void)
88	>	client_init(void)
89		{
90		/* start off the check ping event ..  -- adrian
91		* Every 30 seconds is plenty -- db
92		*/
93	<	client_heap = BlockHeapCreate("client", sizeof(struct Client), CLIENT_HEAP_SIZE);
94	<	lclient_heap = BlockHeapCreate("local client", sizeof(struct LocalUser), LCLIENT_HEAP_SIZE);
93	>	client_pool = mp_pool_new(sizeof(struct Client), MP_CHUNK_SIZE_CLIENT);
94	>	lclient_pool = mp_pool_new(sizeof(struct LocalUser), MP_CHUNK_SIZE_LCLIENT);
95		eventAdd("check_pings", check_pings, NULL, 5);
96		}
97
#	Line 114 | Line 113 | init_client(void)
113		struct Client *
114		make_client(struct Client *from)
115		{
116	<	struct Client *client_p = BlockHeapAlloc(client_heap);
116	>	struct Client *client_p = mp_pool_get(client_pool);
117	>
118	>	memset(client_p, 0, sizeof(*client_p));
119
120		if (from == NULL)
121		{
122	<	client_p->from  = client_p; /* 'from' of local client is self! */
123	<	client_p->since = client_p->lasttime = client_p->firsttime = CurrentTime;
122	>	client_p->from                      = client_p; /* 'from' of local client is self! */
123	>	client_p->localClient               = mp_pool_get(lclient_pool);
124	>
125	>	memset(client_p->localClient, 0, sizeof(*client_p->localClient));
126	>
127	>	client_p->localClient->since        = CurrentTime;
128	>	client_p->localClient->lasttime     = CurrentTime;
129	>	client_p->localClient->firsttime    = CurrentTime;
130	>	client_p->localClient->registration = REG_INIT;
131
124	–	client_p->localClient = BlockHeapAlloc(lclient_heap);
132		/* as good a place as any... */
133	<	dlinkAdd(client_p, make_dlink_node(), &unknown_list);
133	>	dlinkAdd(client_p, &client_p->localClient->lclient_node, &unknown_list);
134		}
135		else
136		client_p->from = from; /* 'from' of local client is self! */
137
138	+	client_p->idhnext = client_p;
139		client_p->hnext  = client_p;
140		client_p->status = STAT_UNKNOWN;
141		strcpy(client_p->username, "unknown");
142	+	strcpy(client_p->svid, "0");
143
144		return client_p;
145		}
#	Line 148 | Line 157 | free_client(struct Client *client_p)
157		assert(client_p != NULL);
158		assert(client_p != &me);
159		assert(client_p->hnext == client_p);
160	<	assert(client_p->invited.head == NULL);
160	>	assert(client_p->idhnext == client_p);
161		assert(client_p->channel.head == NULL);
153	–	assert(dlink_list_length(&client_p->invited) == 0);
162		assert(dlink_list_length(&client_p->channel) == 0);
163	+	assert(dlink_list_length(&client_p->whowas) == 0);
164	+	assert(!IsServer(client_p) || (IsServer(client_p) && client_p->serv));
165
156	–	MyFree(client_p->away);
166		MyFree(client_p->serv);
167	+	MyFree(client_p->certfp);
168
169		if (MyConnect(client_p))
170		{
171	+	assert(client_p->localClient->invited.head == NULL);
172	+	assert(dlink_list_length(&client_p->localClient->invited) == 0);
173	+	assert(dlink_list_length(&client_p->localClient->watches) == 0);
174		assert(IsClosing(client_p) && IsDead(client_p));
175
176		MyFree(client_p->localClient->response);
#	Line 170 | Line 183 | free_client(struct Client *client_p)
183		{
184		assert(0 < client_p->localClient->listener->ref_count);
185		if (0 == --client_p->localClient->listener->ref_count &&
186	<	!client_p->localClient->listener->active)
186	>	!client_p->localClient->listener->active)
187		free_listener(client_p->localClient->listener);
188		}
189
190		dbuf_clear(&client_p->localClient->buf_recvq);
191		dbuf_clear(&client_p->localClient->buf_sendq);
192
193	<	BlockHeapFree(lclient_heap, client_p->localClient);
193	>	mp_pool_release(client_p->localClient);
194		}
195
196	<	BlockHeapFree(client_heap, client_p);
196	>	mp_pool_release(client_p);
197		}
198
199		/*
#	Line 189 | Line 202 | free_client(struct Client *client_p)
202		*
203		* inputs       - NOT USED (from event)
204		* output       - next time_t when check_pings() should be called again
205	<	* side effects -
205	>	* side effects -
206		*
207		*
208		* A PING can be sent to clients as necessary.
#	Line 211 | Line 224 | free_client(struct Client *client_p)
224
225		static void
226		check_pings(void *notused)
227	<	{
227	>	{
228		check_pings_list(&local_client_list);
229		check_pings_list(&serv_list);
230		check_unknowns_list();
#	Line 221 | Line 234 | check_pings(void *notused)
234		*
235		* inputs       - pointer to list to check
236		* output       - NONE
237	<	* side effects -
237	>	* side effects -
238		*/
239		static void
240		check_pings_list(dlink_list *list)
241		{
242		char scratch[32];        /* way too generous but... */
243	<	struct Client *client_p; /* current local client_p being examined */
244	<	int ping, pingwarn;      /* ping time value from client */
232	<	dlink_node *ptr, *next_ptr;
243	>	int ping = 0;      /* ping time value from client */
244	>	dlink_node *ptr = NULL, *next_ptr = NULL;
245
246		DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
247		{
248	<	client_p = ptr->data;
248	>	struct Client *client_p = ptr->data;
249
250		/*
251		** Note: No need to notify opers here. It's
#	Line 242 | Line 254 | check_pings_list(dlink_list *list)
254		if (IsDead(client_p))
255		{
256		/* 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");
257		continue;
258		}
259
255	–	if (GlobalSetOptions.idletime && IsClient(client_p))
256	–	{
257	–	if (!IsExemptKline(client_p) && !IsOper(client_p) &&
258	–	!IsIdlelined(client_p) &&
259	–	((CurrentTime - client_p->localClient->last) > GlobalSetOptions.idletime))
260	–	{
261	–	struct ConfItem *conf;
262	–	struct AccessItem *aconf;
263	–
264	–	conf = make_conf_item(KLINE_TYPE);
265	–	aconf = (struct AccessItem *)map_to_conf(conf);
266	–
267	–	DupString(aconf->host, client_p->host);
268	–	DupString(aconf->reason, "idle exceeder");
269	–	DupString(aconf->user, client_p->username);
270	–	aconf->hold = CurrentTime + 60;
271	–	add_temp_line(conf);
272	–
273	–	sendto_realops_flags(UMODE_ALL, L_ALL,
274	–	"Idle time limit exceeded for %s - temp k-lining",
275	–	get_client_name(client_p, HIDE_IP));
276	–	exit_client(client_p, &me, aconf->reason);
277	–	continue;
278	–	}
279	–	}
280	–
260		if (!IsRegistered(client_p))
261	<	ping = CONNECTTIMEOUT, pingwarn = 0;
261	>	ping = CONNECTTIMEOUT;
262		else
263	<	ping = get_client_ping(client_p, &pingwarn);
263	>	ping = get_client_ping(&client_p->localClient->confs);
264
265	<	if (ping < CurrentTime - client_p->lasttime)
265	>	if (ping < CurrentTime - client_p->localClient->lasttime)
266		{
267		if (!IsPingSent(client_p))
268		{
269	<	/*
270	<	* if we havent PINGed the connection and we havent
271	<	* heard from it in a while, PING it to make sure
272	<	* it is still alive.
273	<	*/
274	<	SetPingSent(client_p);
275	<	ClearPingWarning(client_p);
276	<	client_p->lasttime = CurrentTime - ping;
298	<	sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
269	>	/*
270	>	* if we havent PINGed the connection and we havent
271	>	* heard from it in a while, PING it to make sure
272	>	* it is still alive.
273	>	*/
274	>	SetPingSent(client_p);
275	>	client_p->localClient->lasttime = CurrentTime - ping;
276	>	sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
277		}
278		else
279		{
280	<	if (CurrentTime - client_p->lasttime >= 2 * ping)
280	>	if (CurrentTime - client_p->localClient->lasttime >= 2 * ping)
281		{
282		/*
283		* If the client/server hasn't talked to us in 2*ping seconds
284		* and it has a ping time, then close its connection.
285		*/
286		if (IsServer(client_p) || IsHandshake(client_p))
287	<	{
288	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
289	<	"No response from %s, closing link",
290	<	get_client_name(client_p, HIDE_IP));
291	<	sendto_realops_flags(UMODE_ALL, L_OPER,
292	<	"No response from %s, closing link",
293	<	get_client_name(client_p, MASK_IP));
294	<	ilog(L_NOTICE, "No response from %s, closing link",
295	<	get_client_name(client_p, HIDE_IP));
296	<	}
319	<	ircsprintf(scratch, "Ping timeout: %d seconds",
320	<	(int)(CurrentTime - client_p->lasttime));
287	>	{
288	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
289	>	"No response from %s, closing link",
290	>	get_client_name(client_p, HIDE_IP));
291	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
292	>	"No response from %s, closing link",
293	>	get_client_name(client_p, MASK_IP));
294	>	ilog(LOG_TYPE_IRCD, "No response from %s, closing link",
295	>	get_client_name(client_p, HIDE_IP));
296	>	}
297
298	+	snprintf(scratch, sizeof(scratch), "Ping timeout: %d seconds",
299	+	(int)(CurrentTime - client_p->localClient->lasttime));
300		exit_client(client_p, &me, scratch);
301		}
324	–	else if (!IsPingWarning(client_p) && pingwarn > 0 &&
325	–	(IsServer(client_p) || IsHandshake(client_p)) &&
326	–	CurrentTime - client_p->lasttime >= ping + pingwarn)
327	–	{
328	–	/*
329	–	* If the server hasn't replied in pingwarn seconds after sending
330	–	* the PING, notify the opers so that they are aware of the problem.
331	–	*/
332	–	SetPingWarning(client_p);
333	–	sendto_realops_flags(UMODE_ALL, L_ADMIN,
334	–	"Warning, no response from %s in %d seconds",
335	–	get_client_name(client_p, HIDE_IP), pingwarn);
336	–	sendto_realops_flags(UMODE_ALL, L_OPER,
337	–	"Warning, no response from %s in %d seconds",
338	–	get_client_name(client_p, MASK_IP), pingwarn);
339	–	ilog(L_NOTICE, "No response from %s in %d seconds",
340	–	get_client_name(client_p, HIDE_IP), pingwarn);
341	–	}
302		}
303		}
304		}
#	Line 359 | Line 319 | check_unknowns_list(void)
319		{
320		struct Client *client_p = ptr->data;
321
322	<	if (client_p->localClient->reject_delay > 0)
323	<	{
364	<	if (client_p->localClient->reject_delay <= CurrentTime)
365	<	exit_client(client_p, &me, "Rejected");
366	<	continue;
367	<	}
368	<
369	<	/* Check UNKNOWN connections - if they have been in this state
322	>	/*
323	>	* Check UNKNOWN connections - if they have been in this state
324		* for > 30s, close them.
325		*/
326	<	if (client_p->firsttime ? ((CurrentTime - client_p->firsttime) > 30) : 0)
327	<	exit_client(client_p, &me, "Connection timed out");
326	>	if (IsAuthFinished(client_p) && (CurrentTime - client_p->localClient->firsttime) > 30)
327	>	exit_client(client_p, &me, "Registration timed out");
328		}
329		}
330
#	Line 381 | Line 335 | check_unknowns_list(void)
335		* side effects - Check all connections for a pending kline against the
336		*                client, exit the client if a kline matches.
337		*/
338	<	void
338	>	void
339		check_conf_klines(void)
340	<	{
340	>	{
341		struct Client *client_p = NULL;       /* current local client_p being examined */
342	<	struct AccessItem *aconf = NULL;
389	<	struct ConfItem *conf = NULL;
342	>	struct MaskItem *conf = NULL;
343		dlink_node *ptr, *next_ptr;
344
345		DLINK_FOREACH_SAFE(ptr, next_ptr, local_client_list.head)
#	Line 398 | Line 351 | check_conf_klines(void)
351		if (IsDead(client_p) || !IsClient(client_p))
352		continue;
353
354	<	/* if there is a returned struct ConfItem then kill it */
402	<	if ((aconf = find_dline_conf(&client_p->localClient->ip,
354	>	if ((conf = find_dline_conf(&client_p->localClient->ip,
355		client_p->localClient->aftype)) != NULL)
356		{
357	<	if (aconf->status & CONF_EXEMPTDLINE)
358	<	continue;
357	>	if (conf->type == CONF_EXEMPT)
358	>	continue;
359
408	–	conf = unmap_conf_item(aconf);
360		ban_them(client_p, conf);
361		continue; /* and go examine next fd/client_p */
362		}
363
364	<	if (ConfigFileEntry.glines && (aconf = find_gline(client_p)))
364	>	if (ConfigFileEntry.glines)
365		{
366	+	if (!(conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
367	+	CONF_GLINE, client_p->localClient->aftype,
368	+	client_p->username, NULL, 1)))
369	+	continue;
370	+
371		if (IsExemptKline(client_p) ||
372		IsExemptGline(client_p))
373		{
374	<	sendto_realops_flags(UMODE_ALL, L_ALL,
374	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
375		"GLINE over-ruled for %s, client is %sline_exempt",
376		get_client_name(client_p, HIDE_IP), IsExemptKline(client_p) ? "k" : "g");
377		continue;
378		}
379
424	–	conf = unmap_conf_item(aconf);
380		ban_them(client_p, conf);
381	<	/* and go examine next fd/client_p */
381	>	/* and go examine next fd/client_p */
382		continue;
383	<	}
383	>	}
384
385	<	if ((aconf = find_kill(client_p)) != NULL)
385	>	if ((conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
386	>	CONF_KLINE, client_p->localClient->aftype,
387	>	client_p->username, NULL, 1)) != NULL)
388		{
432	–
433	–	/* if there is a returned struct AccessItem.. then kill it */
389		if (IsExemptKline(client_p))
390		{
391	<	sendto_realops_flags(UMODE_ALL, L_ALL,
391	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
392		"KLINE over-ruled for %s, client is kline_exempt",
393		get_client_name(client_p, HIDE_IP));
394		continue;
395		}
396
442	–	conf = unmap_conf_item(aconf);
397		ban_them(client_p, conf);
398	<	continue;
398	>	continue;
399		}
400
401	<	/* if there is a returned struct MatchItem then kill it */
402	<	if ((conf = find_matching_name_conf(XLINE_TYPE,  client_p->info,
449	<	NULL, NULL, 0)) != NULL ||
450	<	(conf = find_matching_name_conf(RXLINE_TYPE, client_p->info,
451	<	NULL, NULL, 0)) != NULL)
401	>	if ((conf = find_matching_name_conf(CONF_XLINE,  client_p->info,
402	>	NULL, NULL, 0)))
403		{
404		ban_them(client_p, conf);
405		continue;
#	Line 460 | Line 411 | check_conf_klines(void)
411		{
412		client_p = ptr->data;
413
414	<	if ((aconf = find_dline_conf(&client_p->localClient->ip,
415	<	client_p->localClient->aftype)))
414	>	if ((conf = find_dline_conf(&client_p->localClient->ip,
415	>	client_p->localClient->aftype)))
416		{
417	<	if (aconf->status & CONF_EXEMPTDLINE)
417	>	if (conf->type == CONF_EXEMPT)
418		continue;
419
420		exit_client(client_p, &me, "D-lined");
#	Line 475 | Line 426 | check_conf_klines(void)
426		* ban_them
427		*
428		* inputs       - pointer to client to ban
429	<	*              - pointer to ConfItem
429	>	*              - pointer to MaskItem
430		* output       - NONE
431		* side effects - given client_p is banned
432		*/
433		static void
434	<	ban_them(struct Client *client_p, struct ConfItem *conf)
434	>	ban_them(struct Client *client_p, struct MaskItem *conf)
435		{
436	<	const char *user_reason = NULL;       /* What is sent to user */
486	<	const char *channel_reason = NULL;    /* What is sent to channel */
487	<	struct AccessItem *aconf = NULL;
488	<	struct MatchItem *xconf = NULL;
436	>	const char *user_reason = NULL;  /* What is sent to user */
437		const char *type_string = NULL;
438		const char dline_string[] = "D-line";
439		const char kline_string[] = "K-line";
#	Line 494 | Line 442 | ban_them(struct Client *client_p, struct
442
443		switch (conf->type)
444		{
445	<	case RKLINE_TYPE:
498	<	case KLINE_TYPE:
445	>	case CONF_KLINE:
446		type_string = kline_string;
500	–	aconf = map_to_conf(conf);
447		break;
448	<	case DLINE_TYPE:
448	>	case CONF_DLINE:
449		type_string = dline_string;
504	–	aconf = map_to_conf(conf);
450		break;
451	<	case GLINE_TYPE:
451	>	case CONF_GLINE:
452		type_string = gline_string;
508	–	aconf = map_to_conf(conf);
453		break;
454	<	case RXLINE_TYPE:
511	<	case XLINE_TYPE:
454	>	case CONF_XLINE:
455		type_string = xline_string;
456	<	xconf = map_to_conf(conf);
514	<	++xconf->count;
456	>	++conf->count;
457		break;
458		default:
459		assert(0);
460		break;
461		}
462
463	<	if (ConfigFileEntry.kline_with_reason)
522	<	{
523	<	if (aconf != NULL)
524	<	user_reason = aconf->reason ? aconf->reason : type_string;
525	<	if (xconf != NULL)
526	<	user_reason = xconf->reason ? xconf->reason : type_string;
527	<	}
528	<	else
529	<	user_reason = type_string;
530	<
531	<	if (ConfigFileEntry.kline_reason != NULL)
532	<	channel_reason = ConfigFileEntry.kline_reason;
533	<	else
534	<	channel_reason = user_reason;
463	>	user_reason = conf->reason ? conf->reason : type_string;
464
465	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s active for %s",
465	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s active for %s",
466		type_string, get_client_name(client_p, HIDE_IP));
467
468		if (IsClient(client_p))
469		sendto_one(client_p, form_str(ERR_YOUREBANNEDCREEP),
470	<	me.name, client_p->name, user_reason);
470	>	me.name, client_p->name, user_reason);
471
472	<	exit_client(client_p, &me, channel_reason);
472	>	exit_client(client_p, &me, user_reason);
473		}
474
475		/* update_client_exit_stats()
476		*
477		* input        - pointer to client
478		* output       - NONE
479	<	* side effects -
479	>	* side effects -
480		*/
481		static void
482		update_client_exit_stats(struct Client *client_p)
483		{
484	<	if (IsServer(client_p))
556	<	{
557	<	sendto_realops_flags(UMODE_EXTERNAL, L_ALL,
558	<	"Server %s split from %s",
559	<	client_p->name, client_p->servptr->name);
560	<	}
561	<	else if (IsClient(client_p))
484	>	if (IsClient(client_p))
485		{
486	+	assert(Count.total > 0);
487		--Count.total;
488	<	if (IsOper(client_p))
488	>	if (HasUMode(client_p, UMODE_OPER))
489		--Count.oper;
490	<	if (IsInvisible(client_p))
490	>	if (HasUMode(client_p, UMODE_INVISIBLE))
491		--Count.invisi;
492		}
493	+	else if (IsServer(client_p))
494	+	sendto_realops_flags(UMODE_EXTERNAL, L_ALL, SEND_NOTICE,
495	+	"Server %s split from %s",
496	+	client_p->name, client_p->servptr->name);
497
498		if (splitchecking && !splitmode)
499		check_splitmode(NULL);
#	Line 577 | Line 505 | update_client_exit_stats(struct Client *
505		* output       - return client pointer
506		* side effects - find person by (nick)name
507		*/
580	–	/* XXX - ugly wrapper */
508		struct Client *
509		find_person(const struct Client *client_p, const char *name)
510		{
511	<	struct Client *c2ptr;
511	>	struct Client *target_p = NULL;
512
513		if (IsDigit(*name))
514		{
515	<	if ((c2ptr = hash_find_id(name)) != NULL)
516	<	{
517	<	/* invisible users shall not be found by UID guessing */
591	<	if (IsInvisible(c2ptr) && !IsServer(client_p))
592	<	c2ptr = NULL;
593	<	}
515	>	if ((target_p = hash_find_id(name)) != NULL)
516	>	if (!IsServer(client_p) && !HasFlag(client_p, FLAGS_SERVICE))
517	>	target_p = NULL;
518		}
519		else
520	<	c2ptr = 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->from, name);
535
536		if (chasing)
537		*chasing = 0;
538
539		if (who)
540	<	return(who);
540	>	return who;
541
542	<	if (IsDigit(*user))
543	<	return(NULL);
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),
550	<	me.name, source_p->name, user);
551	<	return(NULL);
550	>	me.name, source_p->name, name);
551	>	return NULL;
552		}
553
554		if (chasing)
555		*chasing = 1;
556
557	<	return(who);
557	>	return who;
558		}
559
560		/*
#	Line 652 | Line 576 | find_chasing(struct Client *client_p, st
576		*        to modify what it points!!!
577		*/
578		const char *
579	<	get_client_name(struct Client *client, int showip)
579	>	get_client_name(const struct Client *client, enum addr_mask_type type)
580		{
581		static char nbuf[HOSTLEN * 2 + USERLEN + 5];
582
583		assert(client != NULL);
584
585	<	if (irccmp(client->name, client->host) == 0)
586	<	return(client->name);
585	>	if (!MyConnect(client))
586	>	return client->name;
587
588	<	if (ConfigServerHide.hide_server_ips)
589	<	if (IsServer(client) || IsConnecting(client) || IsHandshake(client))
590	<	showip = MASK_IP;
588	>	if (IsServer(client) || IsConnecting(client) || IsHandshake(client))
589	>	{
590	>	if (!irccmp(client->name, client->host))
591	>	return client->name;
592	>	else if (ConfigServerHide.hide_server_ips)
593	>	type = MASK_IP;
594	>	}
595
596		if (ConfigFileEntry.hide_spoof_ips)
597	<	if (showip == SHOW_IP && IsIPSpoof(client))
598	<	showip = MASK_IP;
597	>	if (type == SHOW_IP && IsIPSpoof(client))
598	>	type = MASK_IP;
599
600		/* And finally, let's get the host information, ip or name */
601	<	switch (showip)
601	>	switch (type)
602		{
603		case SHOW_IP:
604	<	if (MyConnect(client))
605	<	{
606	<	ircsprintf(nbuf, "%s[%s@%s]", client->name, client->username,
607	<	client->sockhost);
680	<	break;
681	<	}
604	>	snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
605	>	client->name,
606	>	client->username, client->sockhost);
607	>	break;
608		case MASK_IP:
609	<	ircsprintf(nbuf, "%s[%s@255.255.255.255]", client->name,
610	<	client->username);
609	>	if (client->localClient->aftype == AF_INET)
610	>	snprintf(nbuf, sizeof(nbuf), "%s[%s@255.255.255.255]",
611	>	client->name, client->username);
612	>	else
613	>	snprintf(nbuf, sizeof(nbuf), "%s[%s@ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]",
614	>	client->name, client->username);
615		break;
616		default:
617	<	ircsprintf(nbuf, "%s[%s@%s]", client->name, client->username,
618	<	client->host);
617	>	snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
618	>	client->name,
619	>	client->username, client->host);
620		}
621
622	<	return(nbuf);
622	>	return nbuf;
623		}
624
625		void
626		free_exited_clients(void)
627		{
628	<	dlink_node *ptr, *next;
629	<	struct Client *target_p;
699	<
628	>	dlink_node *ptr = NULL, *next = NULL;
629	>
630		DLINK_FOREACH_SAFE(ptr, next, dead_list.head)
631		{
632	<	target_p = ptr->data;
703	<
704	<	if (ptr->data == NULL)
705	<	{
706	<	sendto_realops_flags(UMODE_ALL, L_ALL,
707	<	"Warning: null client on dead_list!");
708	<	dlinkDelete(ptr, &dead_list);
709	<	free_dlink_node(ptr);
710	<	continue;
711	<	}
712	<
713	<	free_client(target_p);
632	>	free_client(ptr->data);
633		dlinkDelete(ptr, &dead_list);
634		free_dlink_node(ptr);
635		}
#	Line 729 | Line 648 | exit_one_client(struct Client *source_p,
648
649		assert(!IsMe(source_p));
650
651	<	if (IsServer(source_p))
733	<	{
734	<	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->servers);
735	<
736	<	if ((lp = dlinkFindDelete(&global_serv_list, source_p)) != NULL)
737	<	free_dlink_node(lp);
738	<
739	<	if (!MyConnect(source_p))
740	<	{
741	<	source_p->from->serv->dep_servers--;
742	<	assert(source_p->from->serv->dep_servers > 0);
743	<	}
744	<	}
745	<	else if (IsClient(source_p))
651	>	if (IsClient(source_p))
652		{
653		if (source_p->servptr->serv != NULL)
654	<	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->users);
654	>	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->client_list);
655
656	<	/* If a person is on a channel, send a QUIT notice
657	<	** to every client (person) on the same channel (so
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",
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, 0, ":%s!%s@%s QUIT :%s",
663		source_p->name, source_p->username,
664		source_p->host, quitmsg);
665		DLINK_FOREACH_SAFE(lp, next_lp, source_p->channel.head)
666		remove_user_from_channel(lp->data);
667
668	<	/* Clean up invitefield */
669	<	DLINK_FOREACH_SAFE(lp, next_lp, source_p->invited.head)
670	<	del_invite(lp->data, source_p);
671	<
765	<	/* Clean up allow lists */
766	<	del_all_accepts(source_p);
767	<	add_history(source_p, 0);
768	<	off_history(source_p);
668	>	whowas_add_history(source_p, 0);
669	>	whowas_off_history(source_p);
670	>
671	>	watch_check_hash(source_p, RPL_LOGOFF);
672
673	<	if (!MyConnect(source_p))
673	>	if (MyConnect(source_p))
674		{
675	<	source_p->from->serv->dep_users--;
676	<	assert(source_p->from->serv->dep_users >= 0);
675	>	/* Clean up invitefield */
676	>	DLINK_FOREACH_SAFE(lp, next_lp, source_p->localClient->invited.head)
677	>	del_invite(lp->data, source_p);
678	>
679	>	del_all_accepts(source_p);
680		}
681		}
682	+	else if (IsServer(source_p))
683	+	{
684	+	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->server_list);
685	+
686	+	if ((lp = dlinkFindDelete(&global_serv_list, source_p)) != NULL)
687	+	free_dlink_node(lp);
688	+	}
689
690		/* Remove source_p from the client lists */
691		if (HasID(source_p))
#	Line 812 | Line 725 | exit_one_client(struct Client *source_p,
725		static void
726		recurse_send_quits(struct Client *original_source_p, struct Client *source_p,
727		struct Client *from, struct Client *to, const char *comment,
728	<	const char *splitstr, const char *myname)
728	>	const char *splitstr)
729		{
730		dlink_node *ptr, *next;
731		struct Client *target_p;
819	–	int hidden = match(myname, source_p->name);
732
733		assert(to != source_p);  /* should be already removed from serv_list */
734
735		/* If this server can handle quit storm (QS) removal
736		* of dependents, just send the SQUIT
825	–	*
826	–	* Always check *all* dependent servers if some of them are
827	–	* hidden behind fakename. If so, send out the QUITs -adx
737		*/
738	<	if (hidden || !IsCapable(to, CAP_QS))
739	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->users.head)
738	>	if (!IsCapable(to, CAP_QS))
739	>	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->client_list.head)
740		{
741		target_p = ptr->data;
742		sendto_one(to, ":%s QUIT :%s", target_p->name, splitstr);
743		}
744
745	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->servers.head)
745	>	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->server_list.head)
746		recurse_send_quits(original_source_p, ptr->data, from, to,
747	<	comment, splitstr, myname);
747	>	comment, splitstr);
748
749	<	if (!hidden && ((source_p == original_source_p && to != from) ||
750	<	!IsCapable(to, CAP_QS)))
749	>	if ((source_p == original_source_p && to != from) ||
750	>	!IsCapable(to, CAP_QS))
751		{
752		/* don't use a prefix here - we have to be 100% sure the message
753		* will be accepted without Unknown prefix etc.. */
#	Line 846 | Line 755 | recurse_send_quits(struct Client *origin
755		}
756		}
757
758	<	/*
758	>	/*
759		* Remove all clients that depend on source_p; assumes all (S)QUITs have
760	<	* already been sent.  we make sure to exit a server's dependent clients
761	<	* and servers before the server itself; exit_one_client takes care of
760	>	* already been sent.  we make sure to exit a server's dependent clients
761	>	* and servers before the server itself; exit_one_client takes care of
762		* actually removing things off llists.   tweaked from +CSr31  -orabidoo
763		*/
764		static void
#	Line 857 | Line 766 | recurse_remove_clients(struct Client *so
766		{
767		dlink_node *ptr, *next;
768
769	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->users.head)
769	>	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->client_list.head)
770		exit_one_client(ptr->data, quitmsg);
771
772	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->servers.head)
772	>	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->server_list.head)
773		{
774		recurse_remove_clients(ptr->data, quitmsg);
775		exit_one_client(ptr->data, quitmsg);
776		}
868	–
869	–	assert(source_p->serv->dep_servers == 1);
870	–	assert(source_p->serv->dep_users == 0);
777		}
778
779		/*
#	Line 879 | Line 785 | static void
785		remove_dependents(struct Client *source_p, struct Client *from,
786		const char *comment, const char *splitstr)
787		{
788	<	struct Client *to;
883	<	struct ConfItem *conf;
884	<	static char myname[HOSTLEN+1];
885	<	dlink_node *ptr;
788	>	dlink_node *ptr = NULL;
789
790		DLINK_FOREACH(ptr, serv_list.head)
791	<	{
792	<	to = ptr->data;
890	<
891	<	if ((conf = to->serv->sconf) != NULL)
892	<	strlcpy(myname, my_name_for_link(conf), sizeof(myname));
893	<	else
894	<	strlcpy(myname, me.name, sizeof(myname));
895	<	recurse_send_quits(source_p, source_p, from, to,
896	<	comment, splitstr, myname);
897	<	}
791	>	recurse_send_quits(source_p, source_p, from, ptr->data,
792	>	comment, splitstr);
793
794		recurse_remove_clients(source_p, splitstr);
795		}
#	Line 904 | Line 799 | remove_dependents(struct Client *source_
799		* this on any struct Client, regardless of its state.
800		*
801		* Note, you shouldn't exit remote _users_ without first doing
802	<	* SetKilled and propagating a kill or similar message. However,
803	<	* it is perfectly correct to call exit_client to force a _server_
802	>	* AddFlag(x, FLAGS_KILLED) and propagating a kill or similar message.
803	>	* However, it is perfectly correct to call exit_client to force a _server_
804		* quit (either local or remote one).
805		*
806		* inputs:       - a client pointer that is going to be exited
#	Line 920 | Line 815 | remove_dependents(struct Client *source_
815		void
816		exit_client(struct Client *source_p, struct Client *from, const char *comment)
817		{
818	<	dlink_node *m;
818	>	dlink_node *m = NULL;
819
820		if (MyConnect(source_p))
821		{
#	Line 935 | Line 830 | exit_client(struct Client *source_p, str
830		if (IsIpHash(source_p))
831		remove_one_ip(&source_p->localClient->ip);
832
833	<	delete_auth(source_p);
833	>	delete_auth(&source_p->localClient->auth);
834
835	<	/* This source_p could have status of one of STAT_UNKNOWN, STAT_CONNECTING
835	>	/*
836	>	* This source_p could have status of one of STAT_UNKNOWN, STAT_CONNECTING
837		* STAT_HANDSHAKE or STAT_UNKNOWN
838		* all of which are lumped together into unknown_list
839		*
#	Line 945 | Line 841 | exit_client(struct Client *source_p, str
841		*/
842		if (!IsRegistered(source_p))
843		{
844	<	if ((m = dlinkFindDelete(&unknown_list, source_p)) != NULL)
845	<	free_dlink_node(m);
844	>	assert(dlinkFind(&unknown_list, source_p));
845	>
846	>	dlinkDelete(&source_p->localClient->lclient_node, &unknown_list);
847		}
848		else if (IsClient(source_p))
849		{
850	+	time_t on_for = CurrentTime - source_p->localClient->firsttime;
851	+	assert(Count.local > 0);
852		Count.local--;
853
854	<	if (IsOper(source_p))
956	<	{
854	>	if (HasUMode(source_p, UMODE_OPER))
855		if ((m = dlinkFindDelete(&oper_list, source_p)) != NULL)
856		free_dlink_node(m);
959	–	}
857
858	+	assert(dlinkFind(&local_client_list, source_p));
859		dlinkDelete(&source_p->localClient->lclient_node, &local_client_list);
860	+
861		if (source_p->localClient->list_task != NULL)
862		free_list_task(source_p->localClient->list_task, source_p);
863
864	<	sendto_realops_flags(UMODE_CCONN, L_ALL, "Client exiting: %s (%s@%s) [%s] [%s]",
864	>	watch_del_watch_list(source_p);
865	>	sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
866	>	"Client exiting: %s (%s@%s) [%s] [%s]",
867		source_p->name, source_p->username, source_p->host, comment,
868		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
869		"255.255.255.255" : source_p->sockhost);
870	+	ilog(LOG_TYPE_USER, "%s (%3u:%02u:%02u): %s!%s@%s %llu/%llu",
871	+	myctime(source_p->localClient->firsttime), (unsigned int)(on_for / 3600),
872	+	(unsigned int)((on_for % 3600)/60), (unsigned int)(on_for % 60),
873	+	source_p->name, source_p->username, source_p->host,
874	+	source_p->localClient->send.bytes>>10,
875	+	source_p->localClient->recv.bytes>>10);
876	+	}
877	+	else if (IsServer(source_p))
878	+	{
879	+	assert(Count.myserver > 0);
880	+	--Count.myserver;
881	+
882	+	assert(dlinkFind(&serv_list, source_p));
883	+	dlinkDelete(&source_p->localClient->lclient_node, &serv_list);
884	+	unset_chcap_usage_counts(source_p);
885		}
886
971	–	/* As soon as a client is known to be a server of some sort
972	–	* it has to be put on the serv_list, or SJOIN's to this new server
973	–	* from the connect burst will not be seen.
974	–	*/
975	–	if (IsServer(source_p) || IsConnecting(source_p) ||
976	–	IsHandshake(source_p))
977	–	{
978	–	if ((m = dlinkFindDelete(&serv_list, source_p)) != NULL)
979	–	{
980	–	free_dlink_node(m);
981	–	unset_chcap_usage_counts(source_p);
982	–	}
983	–
984	–	if (IsServer(source_p))
985	–	{
986	–	Count.myserver--;
987	–	if (ServerInfo.hub)
988	–	remove_lazylink_flags(source_p->localClient->serverMask);
989	–	else
990	–	uplink = NULL;
991	–	}
992	–	}
993	–
994	–	log_user_exit(source_p);
995	–
887		if (!IsDead(source_p))
888		{
889		if (IsServer(source_p))
890		{
891		/* for them, we are exiting the network */
892		sendto_one(source_p, ":%s SQUIT %s :%s",
893	<	ID_or_name(from, source_p), me.name, comment);
893	>	ID_or_name(from, source_p), me.name, comment);
894		}
895
896		sendto_one(source_p, "ERROR :Closing Link: %s (%s)",
#	Line 1019 | Line 910 | exit_client(struct Client *source_p, str
910		*/
911		close_connection(source_p);
912		}
913	+	else if (IsClient(source_p) && HasFlag(source_p->servptr, FLAGS_EOB))
914	+	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
915	+	"Client exiting at %s: %s (%s@%s) [%s]",
916	+	source_p->servptr->name, source_p->name,
917	+	source_p->username, source_p->host, comment);
918
919		if (IsServer(source_p))
920		{
#	Line 1028 | Line 924 | exit_client(struct Client *source_p, str
924		assert(source_p->serv != NULL && source_p->servptr != NULL);
925
926		if (ConfigServerHide.hide_servers)
927	<	/* set netsplit message to "*.net *.split" to still show
927	>	/*
928	>	* Set netsplit message to "*.net *.split" to still show
929		* that its a split, but hide the servers splitting
930		*/
931		strcpy(splitstr, "*.net *.split");
#	Line 1040 | Line 937 | exit_client(struct Client *source_p, str
937
938		if (source_p->servptr == &me)
939		{
940	<	sendto_realops_flags(UMODE_ALL, L_ALL,
940	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
941		"%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
942	<	source_p->name, (int)(CurrentTime - source_p->firsttime),
942	>	source_p->name, (int)(CurrentTime - source_p->localClient->firsttime),
943		source_p->localClient->send.bytes >> 10,
944		source_p->localClient->recv.bytes >> 10);
945	<	ilog(L_NOTICE, "%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
946	<	source_p->name, (int)(CurrentTime - source_p->firsttime),
945	>	ilog(LOG_TYPE_IRCD, "%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
946	>	source_p->name, (int)(CurrentTime - source_p->localClient->firsttime),
947		source_p->localClient->send.bytes >> 10,
948		source_p->localClient->recv.bytes >> 10);
949		}
950		}
951	<	else if (IsClient(source_p) && !IsKilled(source_p))
951	>	else if (IsClient(source_p) && !HasFlag(source_p, FLAGS_KILLED))
952		{
953	<	sendto_server(NULL, source_p, NULL, CAP_TS6, NOCAPS, NOFLAGS,
953	>	sendto_server(from->from, CAP_TS6, NOCAPS,
954		":%s QUIT :%s", ID(source_p), comment);
955	<	sendto_server(NULL, source_p, NULL, NOCAPS, CAP_TS6, NOFLAGS,
955	>	sendto_server(from->from, NOCAPS, CAP_TS6,
956		":%s QUIT :%s", source_p->name, comment);
957		}
958
#	Line 1114 | Line 1011 | dead_link_on_read(struct Client *client_
1011
1012		if (IsServer(client_p) || IsHandshake(client_p))
1013		{
1014	<	int connected = CurrentTime - client_p->firsttime;
1015	<
1014	>	int connected = CurrentTime - client_p->localClient->firsttime;
1015	>
1016		if (error == 0)
1017		{
1018		/* Admins get the real IP */
1019	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1020	<	"Server %s closed the connection",
1021	<	get_client_name(client_p, SHOW_IP));
1019	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1020	>	"Server %s closed the connection",
1021	>	get_client_name(client_p, SHOW_IP));
1022
1023		/* Opers get a masked IP */
1024	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1025	<	"Server %s closed the connection",
1026	<	get_client_name(client_p, MASK_IP));
1024	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1025	>	"Server %s closed the connection",
1026	>	get_client_name(client_p, MASK_IP));
1027
1028	<	ilog(L_NOTICE, "Server %s closed the connection",
1029	<	get_client_name(client_p, SHOW_IP));
1028	>	ilog(LOG_TYPE_IRCD, "Server %s closed the connection",
1029	>	get_client_name(client_p, SHOW_IP));
1030		}
1031		else
1032		{
1033	<	report_error(L_ADMIN, "Lost connection to %s: %d",
1034	<	get_client_name(client_p, SHOW_IP), current_error);
1035	<	report_error(L_OPER, "Lost connection to %s: %d",
1036	<	get_client_name(client_p, MASK_IP), current_error);
1033	>	report_error(L_ADMIN, "Lost connection to %s: %s",
1034	>	get_client_name(client_p, SHOW_IP), current_error);
1035	>	report_error(L_OPER, "Lost connection to %s: %s",
1036	>	get_client_name(client_p, MASK_IP), current_error);
1037		}
1038
1039	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1040	<	"%s had been connected for %d day%s, %2d:%02d:%02d",
1041	<	client_p->name, connected/86400,
1042	<	(connected/86400 == 1) ? "" : "s",
1043	<	(connected % 86400) / 3600, (connected % 3600) / 60,
1044	<	connected % 60);
1039	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1040	>	"%s had been connected for %d day%s, %2d:%02d:%02d",
1041	>	client_p->name, connected/86400,
1042	>	(connected/86400 == 1) ? "" : "s",
1043	>	(connected % 86400) / 3600, (connected % 3600) / 60,
1044	>	connected % 60);
1045		}
1046
1047		if (error == 0)
1048		strlcpy(errmsg, "Remote host closed the connection",
1049		sizeof(errmsg));
1050		else
1051	<	ircsprintf(errmsg, "Read error: %s",
1052	<	strerror(current_error));
1051	>	snprintf(errmsg, sizeof(errmsg), "Read error: %s",
1052	>	strerror(current_error));
1053
1054		exit_client(client_p, &me, errmsg);
1055		}
#	Line 1171 | Line 1068 | exit_aborted_clients(void)
1068
1069		if (target_p == NULL)
1070		{
1071	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1071	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1072		"Warning: null client on abort_list!");
1073		dlinkDelete(ptr, &abort_list);
1074		free_dlink_node(ptr);
#	Line 1185 | Line 1082 | exit_aborted_clients(void)
1082		else
1083		notice = "Write error: connection closed";
1084
1085	<	exit_client(target_p, &me, notice);
1085	>	exit_client(target_p, &me, notice);
1086		free_dlink_node(ptr);
1087		}
1088		}
1089
1090		/*
1091		* accept processing, this adds a form of "caller ID" to ircd
1092	<	*
1092	>	*
1093		* If a client puts themselves into "caller ID only" mode,
1094	<	* only clients that match a client pointer they have put on
1094	>	* only clients that match a client pointer they have put on
1095		* the accept list will be allowed to message them.
1096		*
1097	<	* [ source.on_allow_list ] -> [ target1 ] -> [ target2 ]
1201	<	*
1202	<	* [target.allow_list] -> [ source1 ] -> [source2 ]
1203	<	*
1204	<	* i.e. a target will have a link list of source pointers it will allow
1205	<	* each source client then has a back pointer pointing back
1206	<	* to the client that has it on its accept list.
1207	<	* This allows for exit_one_client to remove these now bogus entries
1208	<	* from any client having an accept on them.
1097	>	* Diane Bruce, "Dianora" db@db.net
1098		*/
1099
1100	<	/* accept_message()
1101	<	*
1213	<	* inputs       - pointer to source client
1214	<	*              - pointer to target client
1215	<	* output       - 1 if accept this message 0 if not
1216	<	* side effects - See if source is on target's allow list
1217	<	*/
1218	<	int
1219	<	accept_message(struct Client *source, struct Client *target)
1100	>	void
1101	>	del_accept(struct split_nuh_item *accept_p, struct Client *client_p)
1102		{
1103	<	dlink_node *ptr;
1103	>	dlinkDelete(&accept_p->node, &client_p->localClient->acceptlist);
1104
1105	<	DLINK_FOREACH(ptr, target->allow_list.head)
1106	<	{
1107	<	struct Client *target_p = ptr->data;
1105	>	MyFree(accept_p->nickptr);
1106	>	MyFree(accept_p->userptr);
1107	>	MyFree(accept_p->hostptr);
1108	>	MyFree(accept_p);
1109	>	}
1110
1111	<	if (source == target_p)
1112	<	return (1);
1113	<	}
1111	>	struct split_nuh_item *
1112	>	find_accept(const char *nick, const char *user,
1113	>	const char *host, struct Client *client_p,
1114	>	int (*cmpfunc)(const char *, const char *))
1115	>	{
1116	>	dlink_node *ptr = NULL;
1117
1118	<	if (IsSoftCallerId(target))
1118	>	DLINK_FOREACH(ptr, client_p->localClient->acceptlist.head)
1119		{
1120	<	DLINK_FOREACH(ptr, target->channel.head)
1121	<	if (IsMember(source, ptr->data))
1122	<	return (1);
1120	>	struct split_nuh_item *accept_p = ptr->data;
1121	>
1122	>	if (!cmpfunc(accept_p->nickptr, nick) &&
1123	>	!cmpfunc(accept_p->userptr, user) &&
1124	>	!cmpfunc(accept_p->hostptr, host))
1125	>	return accept_p;
1126		}
1127
1128	<	return (0);
1128	>	return NULL;
1129		}
1130
1131	<	/* del_from_accept()
1242	<	*
1243	<	* inputs       - pointer to source client
1244	<	*              - pointer to target client
1245	<	* output       - NONE
1246	<	* side effects - Delete's source pointer to targets allow list
1131	>	/* accept_message()
1132		*
1133	<	* Walk through the target's accept list, remove if source is found,
1134	<	* Then walk through the source's on_accept_list remove target if found.
1133	>	* inputs       - pointer to source client
1134	>	*              - pointer to target client
1135	>	* output       - 1 if accept this message 0 if not
1136	>	* side effects - See if source is on target's allow list
1137		*/
1138	<	void
1139	<	del_from_accept(struct Client *source, struct Client *target)
1138	>	int
1139	>	accept_message(struct Client *source,
1140	>	struct Client *target)
1141		{
1142	<	dlink_node *ptr;
1255	<	dlink_node *ptr2;
1256	<	dlink_node *next_ptr;
1257	<	dlink_node *next_ptr2;
1258	<	struct Client *target_p;
1259	<
1260	<	DLINK_FOREACH_SAFE(ptr, next_ptr, target->allow_list.head)
1261	<	{
1262	<	target_p = ptr->data;
1142	>	dlink_node *ptr = NULL;
1143
1144	<	if (source == target_p)
1145	<	{
1146	<	dlinkDelete(ptr, &target->allow_list);
1267	<	free_dlink_node(ptr);
1144	>	if (source == target || find_accept(source->name, source->username,
1145	>	source->host, target, match))
1146	>	return 1;
1147
1148	<	DLINK_FOREACH_SAFE(ptr2, next_ptr2, source->on_allow_list.head)
1149	<	{
1150	<	target_p = ptr2->data;
1148	>	if (HasUMode(target, UMODE_SOFTCALLERID))
1149	>	DLINK_FOREACH(ptr, target->channel.head)
1150	>	if (IsMember(source, ((struct Membership *)ptr->data)->chptr))
1151	>	return 1;
1152
1153	<	if (target == target_p)
1274	<	{
1275	<	dlinkDelete(ptr2, &source->on_allow_list);
1276	<	free_dlink_node(ptr2);
1277	<	}
1278	<	}
1279	<	}
1280	<	}
1153	>	return 0;
1154		}
1155
1156		/* del_all_accepts()
1157		*
1158	<	* inputs       - pointer to exiting client
1159	<	* output       - NONE
1160	<	* side effects - Walk through given clients allow_list and on_allow_list
1288	<	*                remove all references to this client
1158	>	* inputs       - pointer to exiting client
1159	>	* output       - NONE
1160	>	* side effects - Walk through given clients acceptlist and remove all entries
1161		*/
1162		void
1163		del_all_accepts(struct Client *client_p)
1164		{
1165	<	dlink_node *ptr, *next_ptr;
1294	<
1295	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->allow_list.head)
1296	<	del_from_accept(ptr->data, client_p);
1297	<
1298	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->on_allow_list.head)
1299	<	del_from_accept(client_p, ptr->data);
1300	<	}
1301	<
1302	<	/* del_all_their_accepts()
1303	<	*
1304	<	* inputs       - pointer to exiting client
1305	<	* output       - NONE
1306	<	* side effects - Walk through given clients on_allow_list
1307	<	*                remove all references to this client,
1308	<	*                allow this client to keep their own allow_list
1309	<	*/
1310	<	void
1311	<	del_all_their_accepts(struct Client *client_p)
1312	<	{
1313	<	dlink_node *ptr, *next_ptr;
1165	>	dlink_node *ptr = NULL, *next_ptr = NULL;
1166
1167	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->on_allow_list.head)
1168	<	del_from_accept(client_p, ptr->data);
1167	>	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->acceptlist.head)
1168	>	del_accept(ptr->data, client_p);
1169		}
1170
1171	<	/* set_initial_nick()
1172	<	*
1321	<	* inputs
1322	<	* output
1323	<	* side effects -
1324	<	*
1325	<	* This function is only called to set up an initially registering
1326	<	* client.
1327	<	*/
1328	<	void
1329	<	set_initial_nick(struct Client *client_p, struct Client *source_p,
1330	<	const char *nick)
1171	>	unsigned int
1172	>	idle_time_get(const struct Client *source_p, const struct Client *target_p)
1173		{
1174	<	char buf[USERLEN + 1];
1175	<
1176	<	/* Client setting NICK the first time */
1177	<
1336	<	/* This had to be copied here to avoid problems.. */
1337	<	source_p->tsinfo = CurrentTime;
1338	<
1339	<	if (source_p->name[0])
1340	<	hash_del_client(source_p);
1174	>	unsigned int idle = 0;
1175	>	unsigned int min_idle = 0;
1176	>	unsigned int max_idle = 0;
1177	>	const struct ClassItem *class = get_class_ptr(&target_p->localClient->confs);
1178
1179	<	strlcpy(source_p->name, nick, sizeof(source_p->name));
1180	<	hash_add_client(source_p);
1179	>	if (!(class->flags & CLASS_FLAGS_FAKE_IDLE) || target_p == source_p)
1180	>	return CurrentTime - target_p->localClient->last_privmsg;
1181	>	if (HasUMode(source_p, UMODE_OPER) &&
1182	>	!(class->flags & CLASS_FLAGS_HIDE_IDLE_FROM_OPERS))
1183	>	return CurrentTime - target_p->localClient->last_privmsg;
1184
1185	<	/* fd_desc is long enough */
1186	<	fd_note(&client_p->localClient->fd, "Nick: %s", nick);
1347	<
1348	<	/* They have the nick they want now.. */
1349	<	client_p->llname[0] = '\0';
1185	>	min_idle = class->min_idle;
1186	>	max_idle = class->max_idle;
1187
1188	<	if (source_p->flags & FLAGS_GOTUSER)
1189	<	{
1353	<	strlcpy(buf, source_p->username, sizeof(buf));
1354	<
1355	<	/*
1356	<	* USER already received, now we have NICK.
1357	<	* *NOTE* For servers "NICK" *must* precede the
1358	<	* user message (giving USER before NICK is possible
1359	<	* only for local client connection!). register_user
1360	<	* may reject the client and call exit_client for it
1361	<	* --must test this and exit m_nick too!!!
1362	<	*/
1363	<	register_local_user(client_p, source_p, nick, buf);
1364	<	}
1365	<	}
1366	<
1367	<	/* change_local_nick()
1368	<	*
1369	<	* inputs       - pointer to server
1370	<	*              - pointer to client
1371	<	*              - nick
1372	<	* output       -
1373	<	* side effects - changes nick of a LOCAL user
1374	<	*/
1375	<	void
1376	<	change_local_nick(struct Client *client_p, struct Client *source_p, const char *nick)
1377	<	{
1378	<	/*
1379	<	** Client just changing his/her nick. If he/she is
1380	<	** on a channel, send note of change to all clients
1381	<	** on that channel. Propagate notice to other servers.
1382	<	*/
1383	<	if ((source_p->localClient->last_nick_change +
1384	<	ConfigFileEntry.max_nick_time) < CurrentTime)
1385	<	source_p->localClient->number_of_nick_changes = 0;
1386	<	source_p->localClient->last_nick_change = CurrentTime;
1387	<	source_p->localClient->number_of_nick_changes++;
1388	<
1389	<	if ((ConfigFileEntry.anti_nick_flood &&
1390	<	(source_p->localClient->number_of_nick_changes
1391	<	<= ConfigFileEntry.max_nick_changes)) ||
1392	<	!ConfigFileEntry.anti_nick_flood ||
1393	<	(IsOper(source_p) && ConfigFileEntry.no_oper_flood))
1394	<	{
1395	<	if (irccmp(source_p->name, nick))
1396	<	source_p->tsinfo = CurrentTime;
1188	>	if (min_idle == max_idle)
1189	>	return min_idle;
1190
1191	<	/* XXX - the format of this notice should eventually be changed
1192	<	* to either %s[%s@%s], or even better would be get_client_name() -bill
1400	<	*/
1401	<	sendto_realops_flags(UMODE_NCHANGE, L_ALL, "Nick change: From %s to %s [%s@%s]",
1402	<	source_p->name, nick, source_p->username, source_p->host);
1403	<	sendto_common_channels_local(source_p, 1, ":%s!%s@%s NICK :%s",
1404	<	source_p->name, source_p->username,
1405	<	source_p->host, nick);
1406	<
1407	<	add_history(source_p, 1);
1408	<
1409	<	/* Only hubs care about lazy link nicks not being sent on yet
1410	<	* lazylink leafs/leafs always send their nicks up to hub,
1411	<	* hence must always propagate nick changes.
1412	<	* hubs might not propagate a nick change, if the leaf
1413	<	* does not know about that client yet.
1414	<	*/
1415	<	sendto_server(client_p, source_p, NULL, CAP_TS6, NOCAPS, NOFLAGS,
1416	<	":%s NICK %s :%lu",
1417	<	ID(source_p), nick, (unsigned long)source_p->tsinfo);
1418	<	sendto_server(client_p, source_p, NULL, NOCAPS, CAP_TS6, NOFLAGS,
1419	<	":%s NICK %s :%lu",
1420	<	source_p->name, nick, (unsigned long)source_p->tsinfo);
1421	<	}
1191	>	if (class->flags & CLASS_FLAGS_RANDOM_IDLE)
1192	>	idle = genrand_int32();
1193		else
1194	<	{
1424	<	sendto_one(source_p, form_str(ERR_NICKTOOFAST),
1425	<	me.name, source_p->name, source_p->name,
1426	<	nick, ConfigFileEntry.max_nick_time);
1427	<	return;
1428	<	}
1429	<
1430	<	/* Finally, add to hash */
1431	<	if (source_p->name[0])
1432	<	hash_del_client(source_p);
1194	>	idle = CurrentTime - target_p->localClient->last_privmsg;
1195
1196	<	strcpy(source_p->name, nick);
1197	<	hash_add_client(source_p);
1196	>	if (max_idle == 0)
1197	>	idle = 0;
1198	>	else
1199	>	idle %= max_idle;
1200
1201	<	/* Make sure everyone that has this client on its accept list
1202	<	* loses that reference.
1439	<	*/
1440	<	del_all_their_accepts(source_p);
1201	>	if (idle < min_idle)
1202	>	idle = min_idle + (idle % (max_idle - min_idle));
1203
1204	<	/* fd_desc is long enough */
1443	<	fd_note(&client_p->localClient->fd, "Nick: %s", nick);
1204	>	return idle;
1205		}

Diff Legend

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