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 2811 by michael, Sun Jan 12 19:39:33 2014 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	+	#include "parse.h"
56
57		dlink_list listing_client_list = { NULL, NULL, 0 };
58		/* Pointer to beginning of Client list */
#	Line 67 | Line 66 | dlink_list oper_list = {NULL, NULL, 0};
66
67		static EVH check_pings;
68
69	<	static BlockHeap *client_heap  = NULL;
70	<	static BlockHeap *lclient_heap = NULL;
69	>	static mp_pool_t *client_pool  = NULL;
70	>	static mp_pool_t *lclient_pool = NULL;
71
72		static dlink_list dead_list  = { NULL, NULL, 0};
73		static dlink_list abort_list = { NULL, NULL, 0};
#	Line 77 | Line 76 | static dlink_node *eac_next;  /* next ab
76
77		static void check_pings_list(dlink_list *);
78		static void check_unknowns_list(void);
80	–	static void ban_them(struct Client *client_p, struct ConfItem *conf);
79
80
81	<	/* init_client()
81	>	/* client_init()
82		*
83		* inputs       - NONE
84		* output       - NONE
85		* side effects - initialize client free memory
86		*/
87		void
88	<	init_client(void)
88	>	client_init(void)
89		{
90		/* start off the check ping event ..  -- adrian
91		* Every 30 seconds is plenty -- db
92		*/
93	<	client_heap = BlockHeapCreate("client", sizeof(struct Client), CLIENT_HEAP_SIZE);
94	<	lclient_heap = BlockHeapCreate("local client", sizeof(struct LocalUser), LCLIENT_HEAP_SIZE);
93	>	client_pool = mp_pool_new(sizeof(struct Client), MP_CHUNK_SIZE_CLIENT);
94	>	lclient_pool = mp_pool_new(sizeof(struct LocalUser), MP_CHUNK_SIZE_LCLIENT);
95		eventAdd("check_pings", check_pings, NULL, 5);
96		}
97
#	Line 115 | Line 113 | init_client(void)
113		struct Client *
114		make_client(struct Client *from)
115		{
116	<	struct Client *client_p = BlockHeapAlloc(client_heap);
116	>	struct Client *client_p = mp_pool_get(client_pool);
117	>
118	>	memset(client_p, 0, sizeof(*client_p));
119
120		if (from == NULL)
121		{
122	<	client_p->from  = client_p; /* 'from' of local client is self! */
123	<	client_p->since = client_p->lasttime = client_p->firsttime = CurrentTime;
122	>	client_p->from                      = client_p; /* 'from' of local client is self! */
123	>	client_p->localClient               = mp_pool_get(lclient_pool);
124	>
125	>	memset(client_p->localClient, 0, sizeof(*client_p->localClient));
126
127	<	client_p->localClient = BlockHeapAlloc(lclient_heap);
127	>	client_p->localClient->since        = CurrentTime;
128	>	client_p->localClient->lasttime     = CurrentTime;
129	>	client_p->localClient->firsttime    = CurrentTime;
130		client_p->localClient->registration = REG_INIT;
131	+
132		/* as good a place as any... */
133	<	dlinkAdd(client_p, make_dlink_node(), &unknown_list);
133	>	dlinkAdd(client_p, &client_p->localClient->lclient_node, &unknown_list);
134		}
135		else
136		client_p->from = from; /* 'from' of local client is self! */
137
138	+	client_p->idhnext = client_p;
139		client_p->hnext  = client_p;
140	<	client_p->status = STAT_UNKNOWN;
140	>	SetUnknown(client_p);
141		strcpy(client_p->username, "unknown");
142	+	strcpy(client_p->svid, "0");
143
144		return client_p;
145		}
#	Line 150 | Line 157 | free_client(struct Client *client_p)
157		assert(client_p != NULL);
158		assert(client_p != &me);
159		assert(client_p->hnext == client_p);
160	+	assert(client_p->idhnext == client_p);
161		assert(client_p->channel.head == NULL);
162		assert(dlink_list_length(&client_p->channel) == 0);
163	+	assert(dlink_list_length(&client_p->whowas) == 0);
164	+	assert(!IsServer(client_p) || (IsServer(client_p) && client_p->serv));
165
156	–	MyFree(client_p->away);
166		MyFree(client_p->serv);
167	+	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 172 | 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 191 | 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 213 | 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 223 | 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 */
234	<	dlink_node *ptr, *next_ptr;
242	>	char scratch[IRCD_BUFSIZE];
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 244 | Line 254 | check_pings_list(dlink_list *list)
254		if (IsDead(client_p))
255		{
256		/* 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");
257		continue;
258		}
259
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	–
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;
300	<	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	<	}
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	<	ircsprintf(scratch, "Ping timeout: %d seconds",
299	<	(int)(CurrentTime - client_p->lasttime));
298	>	snprintf(scratch, sizeof(scratch), "Ping timeout: %d seconds",
299	>	(int)(CurrentTime - client_p->localClient->lasttime));
300		exit_client(client_p, &me, scratch);
301		}
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	–	}
302		}
303		}
304		}
#	Line 361 | Line 319 | check_unknowns_list(void)
319		{
320		struct Client *client_p = ptr->data;
321
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	–
322		/*
323		* Check UNKNOWN connections - if they have been in this state
324		* for > 30s, close them.
325		*/
326	<	if (IsAuthFinished(client_p) && (CurrentTime - client_p->firsttime) > 30)
326	>	if (IsAuthFinished(client_p) && (CurrentTime - client_p->localClient->firsttime) > 30)
327		exit_client(client_p, &me, "Registration timed out");
328		}
329		}
#	Line 384 | 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;
392	<	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 401 | 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 */
405	<	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
411	–	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 (IsExemptKline(client_p) ||
367	<	IsExemptGline(client_p))
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		{
370	<	sendto_realops_flags(UMODE_ALL, L_ALL,
371	<	"GLINE over-ruled for %s, client is %sline_exempt",
372	<	get_client_name(client_p, HIDE_IP), IsExemptKline(client_p) ? "k" : "g");
370	>	if (IsExemptKline(client_p) ||
371	>	IsExemptGline(client_p))
372	>	{
373	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
374	>	"GLINE over-ruled for %s, client is %sline_exempt",
375	>	get_client_name(client_p, HIDE_IP), IsExemptKline(client_p) ? "k" : "g");
376	>	continue;
377	>	}
378	>
379	>	ban_them(client_p, conf);
380	>	/* and go examine next fd/client_p */
381		continue;
382		}
383	+	}
384
385	<	conf = unmap_conf_item(aconf);
386	<	ban_them(client_p, conf);
387	<	/* and go examine next fd/client_p */
430	<	continue;
431	<	}
432	<
433	<	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)))
388		{
435	–
436	–	/* 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
445	–	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,
452	<	NULL, NULL, 0)) != NULL ||
453	<	(conf = find_matching_name_conf(RXLINE_TYPE, client_p->info,
454	<	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 463 | 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 478 | 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)
433	>	void
434	>	ban_them(struct Client *client_p, struct MaskItem *conf)
435		{
436	<	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;
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 497 | Line 442 | ban_them(struct Client *client_p, struct
442
443		switch (conf->type)
444		{
445	<	case RKLINE_TYPE:
446	<	case KLINE_TYPE:
445	>	case CONF_KLINE:
446	>	if (IsExemptKline(client_p))
447	>	{
448	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
449	>	"KLINE over-ruled for %s, client is kline_exempt",
450	>	get_client_name(client_p, HIDE_IP));
451	>	return;
452	>	}
453	>
454		type_string = kline_string;
503	–	aconf = map_to_conf(conf);
455		break;
456	<	case DLINE_TYPE:
456	>	case CONF_DLINE:
457		type_string = dline_string;
507	–	aconf = map_to_conf(conf);
458		break;
459	<	case GLINE_TYPE:
459	>	case CONF_GLINE:
460	>	if (IsExemptKline(client_p) ||
461	>	IsExemptGline(client_p))
462	>	{
463	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
464	>	"GLINE over-ruled for %s, client is %sline_exempt",
465	>	get_client_name(client_p, HIDE_IP), IsExemptKline(client_p) ? "k" : "g");
466	>	return;
467	>	}
468	>
469		type_string = gline_string;
511	–	aconf = map_to_conf(conf);
470		break;
471	<	case RXLINE_TYPE:
514	<	case XLINE_TYPE:
471	>	case CONF_XLINE:
472		type_string = xline_string;
473	<	xconf = map_to_conf(conf);
517	<	++xconf->count;
473	>	++conf->count;
474		break;
475		default:
476		assert(0);
477		break;
478		}
479
480	<	if (ConfigFileEntry.kline_with_reason)
525	<	{
526	<	if (aconf != NULL)
527	<	user_reason = aconf->reason ? aconf->reason : type_string;
528	<	if (xconf != NULL)
529	<	user_reason = xconf->reason ? xconf->reason : type_string;
530	<	}
531	<	else
532	<	user_reason = type_string;
533	<
534	<	if (ConfigFileEntry.kline_reason != NULL)
535	<	channel_reason = ConfigFileEntry.kline_reason;
536	<	else
537	<	channel_reason = user_reason;
480	>	user_reason = conf->reason ? conf->reason : type_string;
481
482	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s active for %s",
482	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s active for %s",
483		type_string, get_client_name(client_p, HIDE_IP));
484
485		if (IsClient(client_p))
486		sendto_one(client_p, form_str(ERR_YOUREBANNEDCREEP),
487	<	me.name, client_p->name, user_reason);
487	>	me.name, client_p->name, user_reason);
488
489	<	exit_client(client_p, &me, channel_reason);
489	>	exit_client(client_p, &me, user_reason);
490		}
491
492		/* update_client_exit_stats()
493		*
494		* input        - pointer to client
495		* output       - NONE
496	<	* side effects -
496	>	* side effects -
497		*/
498		static void
499		update_client_exit_stats(struct Client *client_p)
500		{
501	<	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))
501	>	if (IsClient(client_p))
502		{
503	+	assert(Count.total > 0);
504		--Count.total;
505	<	if (IsOper(client_p))
505	>	if (HasUMode(client_p, UMODE_OPER))
506		--Count.oper;
507	<	if (IsInvisible(client_p))
507	>	if (HasUMode(client_p, UMODE_INVISIBLE))
508		--Count.invisi;
509		}
510	+	else if (IsServer(client_p))
511	+	sendto_realops_flags(UMODE_EXTERNAL, L_ALL, SEND_NOTICE,
512	+	"Server %s split from %s",
513	+	client_p->name, client_p->servptr->name);
514
515		if (splitchecking && !splitmode)
516		check_splitmode(NULL);
#	Line 580 | Line 522 | update_client_exit_stats(struct Client *
522		* output       - return client pointer
523		* side effects - find person by (nick)name
524		*/
583	–	/* XXX - ugly wrapper */
525		struct Client *
526		find_person(const struct Client *client_p, const char *name)
527		{
528	<	struct Client *c2ptr;
528	>	struct Client *target_p = NULL;
529
530		if (IsDigit(*name))
531		{
532	<	if ((c2ptr = hash_find_id(name)) != NULL)
533	<	{
593	<	/* invisible users shall not be found by UID guessing */
594	<	if (IsInvisible(c2ptr) && !IsServer(client_p))
595	<	c2ptr = NULL;
596	<	}
532	>	if (IsServer(client_p) || HasFlag(client_p, FLAGS_SERVICE))
533	>	target_p = hash_find_id(name);
534		}
535		else
536	<	c2ptr = find_client(name);
536	>	target_p = hash_find_client(name);
537
538	<	return ((c2ptr != NULL && IsClient(c2ptr)) ? c2ptr : NULL);
538	>	return (target_p && IsClient(target_p)) ? target_p : NULL;
539		}
540
541		/*
542	<	* find_chasing - find the client structure for a nick name (user)
543	<	*      using history mechanism if necessary. If the client is not found,
542	>	* find_chasing - find the client structure for a nick name (name)
543	>	*      using history mechanism if necessary. If the client is not found,
544		*      an error message (NO SUCH NICK) is generated. If the client was found
545		*      through the history, chasing will be 1 and otherwise 0.
546		*/
547		struct Client *
548	<	find_chasing(struct Client *client_p, struct Client *source_p, const char *user, int *chasing)
548	>	find_chasing(struct Client *source_p, const char *name, int *const chasing)
549		{
550	<	struct Client *who = find_person(client_p, user);
550	>	struct Client *who = find_person(source_p->from, name);
551
552		if (chasing)
553		*chasing = 0;
554
555		if (who)
556	<	return(who);
556	>	return who;
557
558	<	if (IsDigit(*user))
559	<	return(NULL);
558	>	if (IsDigit(*name))
559	>	return NULL;
560
561	<	if ((who = get_history(user,
562	<	(time_t)ConfigFileEntry.kill_chase_time_limit))
563	<	== NULL)
561	>	if ((who = whowas_get_history(name,
562	>	(time_t)ConfigFileEntry.kill_chase_time_limit))
563	>	== NULL)
564		{
565		sendto_one(source_p, form_str(ERR_NOSUCHNICK),
566	<	me.name, source_p->name, user);
567	<	return(NULL);
566	>	me.name, source_p->name, name);
567	>	return NULL;
568		}
569
570		if (chasing)
571		*chasing = 1;
572
573	<	return(who);
573	>	return who;
574		}
575
576		/*
#	Line 655 | Line 592 | find_chasing(struct Client *client_p, st
592		*        to modify what it points!!!
593		*/
594		const char *
595	<	get_client_name(struct Client *client, int showip)
595	>	get_client_name(const struct Client *client, enum addr_mask_type type)
596		{
597		static char nbuf[HOSTLEN * 2 + USERLEN + 5];
598
599		assert(client != NULL);
600
601	<	if (irccmp(client->name, client->host) == 0)
602	<	return(client->name);
601	>	if (!MyConnect(client))
602	>	return client->name;
603
604	<	if (ConfigServerHide.hide_server_ips)
605	<	if (IsServer(client) || IsConnecting(client) || IsHandshake(client))
606	<	showip = MASK_IP;
604	>	if (IsServer(client) || IsConnecting(client) || IsHandshake(client))
605	>	{
606	>	if (!irccmp(client->name, client->host))
607	>	return client->name;
608	>	else if (ConfigServerHide.hide_server_ips)
609	>	type = MASK_IP;
610	>	}
611
612		if (ConfigFileEntry.hide_spoof_ips)
613	<	if (showip == SHOW_IP && IsIPSpoof(client))
614	<	showip = MASK_IP;
613	>	if (type == SHOW_IP && IsIPSpoof(client))
614	>	type = MASK_IP;
615
616		/* And finally, let's get the host information, ip or name */
617	<	switch (showip)
617	>	switch (type)
618		{
619		case SHOW_IP:
620	<	if (MyConnect(client))
621	<	{
622	<	ircsprintf(nbuf, "%s[%s@%s]", client->name, client->username,
623	<	client->sockhost);
683	<	break;
684	<	}
620	>	snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
621	>	client->name,
622	>	client->username, client->sockhost);
623	>	break;
624		case MASK_IP:
625	<	ircsprintf(nbuf, "%s[%s@255.255.255.255]", client->name,
626	<	client->username);
625	>	if (client->localClient->aftype == AF_INET)
626	>	snprintf(nbuf, sizeof(nbuf), "%s[%s@255.255.255.255]",
627	>	client->name, client->username);
628	>	else
629	>	snprintf(nbuf, sizeof(nbuf), "%s[%s@ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]",
630	>	client->name, client->username);
631		break;
632		default:
633	<	ircsprintf(nbuf, "%s[%s@%s]", client->name, client->username,
634	<	client->host);
633	>	snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
634	>	client->name,
635	>	client->username, client->host);
636		}
637
638	<	return(nbuf);
638	>	return nbuf;
639		}
640
641		void
642		free_exited_clients(void)
643		{
644	<	dlink_node *ptr, *next;
645	<	struct Client *target_p;
702	<
644	>	dlink_node *ptr = NULL, *next = NULL;
645	>
646		DLINK_FOREACH_SAFE(ptr, next, dead_list.head)
647		{
648	<	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);
648	>	free_client(ptr->data);
649		dlinkDelete(ptr, &dead_list);
650		free_dlink_node(ptr);
651		}
#	Line 732 | Line 664 | exit_one_client(struct Client *source_p,
664
665		assert(!IsMe(source_p));
666
667	<	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))
667	>	if (IsClient(source_p))
668		{
669		if (source_p->servptr->serv != NULL)
670	<	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->users);
670	>	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->client_list);
671
672	<	/* If a person is on a channel, send a QUIT notice
673	<	** to every client (person) on the same channel (so
674	<	** that the client can show the "**signoff" message).
675	<	** (Note: The notice is to the local clients *only*)
676	<	*/
677	<	sendto_common_channels_local(source_p, 0, ":%s!%s@%s QUIT :%s",
672	>	/*
673	>	* If a person is on a channel, send a QUIT notice
674	>	* to every client (person) on the same channel (so
675	>	* that the client can show the "**signoff" message).
676	>	* (Note: The notice is to the local clients *only*)
677	>	*/
678	>	sendto_common_channels_local(source_p, 0, 0, ":%s!%s@%s QUIT :%s",
679		source_p->name, source_p->username,
680		source_p->host, quitmsg);
681		DLINK_FOREACH_SAFE(lp, next_lp, source_p->channel.head)
682		remove_user_from_channel(lp->data);
683
684	<	/* Clean up allow lists */
685	<	del_all_accepts(source_p);
766	<	add_history(source_p, 0);
767	<	off_history(source_p);
684	>	whowas_add_history(source_p, 0);
685	>	whowas_off_history(source_p);
686
687		watch_check_hash(source_p, RPL_LOGOFF);
688
689	<	if (!MyConnect(source_p))
772	<	{
773	<	source_p->from->serv->dep_users--;
774	<	assert(source_p->from->serv->dep_users >= 0);
775	<	}
776	<	else
689	>	if (MyConnect(source_p))
690		{
691		/* Clean up invitefield */
692		DLINK_FOREACH_SAFE(lp, next_lp, source_p->localClient->invited.head)
693		del_invite(lp->data, source_p);
694	+
695	+	del_all_accepts(source_p);
696		}
697		}
698	+	else if (IsServer(source_p))
699	+	{
700	+	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->server_list);
701	+
702	+	if ((lp = dlinkFindDelete(&global_serv_list, source_p)) != NULL)
703	+	free_dlink_node(lp);
704	+	}
705
706		/* Remove source_p from the client lists */
707		if (HasID(source_p))
#	Line 819 | Line 741 | exit_one_client(struct Client *source_p,
741		static void
742		recurse_send_quits(struct Client *original_source_p, struct Client *source_p,
743		struct Client *from, struct Client *to, const char *comment,
744	<	const char *splitstr, const char *myname)
744	>	const char *splitstr)
745		{
746		dlink_node *ptr, *next;
747		struct Client *target_p;
826	–	int hidden = match(myname, source_p->name);
748
749		assert(to != source_p);  /* should be already removed from serv_list */
750
751		/* If this server can handle quit storm (QS) removal
752		* 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
753		*/
754	<	if (hidden || !IsCapable(to, CAP_QS))
755	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->users.head)
754	>	if (!IsCapable(to, CAP_QS))
755	>	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->client_list.head)
756		{
757		target_p = ptr->data;
758		sendto_one(to, ":%s QUIT :%s", target_p->name, splitstr);
759		}
760
761	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->servers.head)
761	>	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->server_list.head)
762		recurse_send_quits(original_source_p, ptr->data, from, to,
763	<	comment, splitstr, myname);
763	>	comment, splitstr);
764
765	<	if (!hidden && ((source_p == original_source_p && to != from) ||
766	<	!IsCapable(to, CAP_QS)))
765	>	if ((source_p == original_source_p && to != from) ||
766	>	!IsCapable(to, CAP_QS))
767		{
768		/* don't use a prefix here - we have to be 100% sure the message
769		* will be accepted without Unknown prefix etc.. */
#	Line 853 | Line 771 | recurse_send_quits(struct Client *origin
771		}
772		}
773
774	<	/*
774	>	/*
775		* Remove all clients that depend on source_p; assumes all (S)QUITs have
776	<	* already been sent.  we make sure to exit a server's dependent clients
777	<	* and servers before the server itself; exit_one_client takes care of
776	>	* already been sent.  we make sure to exit a server's dependent clients
777	>	* and servers before the server itself; exit_one_client takes care of
778		* actually removing things off llists.   tweaked from +CSr31  -orabidoo
779		*/
780		static void
#	Line 864 | Line 782 | recurse_remove_clients(struct Client *so
782		{
783		dlink_node *ptr, *next;
784
785	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->users.head)
785	>	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->client_list.head)
786		exit_one_client(ptr->data, quitmsg);
787
788	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->servers.head)
788	>	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->server_list.head)
789		{
790		recurse_remove_clients(ptr->data, quitmsg);
791		exit_one_client(ptr->data, quitmsg);
792		}
875	–
876	–	assert(source_p->serv->dep_servers == 1);
877	–	assert(source_p->serv->dep_users == 0);
793		}
794
795		/*
#	Line 886 | Line 801 | static void
801		remove_dependents(struct Client *source_p, struct Client *from,
802		const char *comment, const char *splitstr)
803		{
804	<	struct Client *to;
890	<	struct ConfItem *conf;
891	<	static char myname[HOSTLEN+1];
892	<	dlink_node *ptr;
804	>	dlink_node *ptr = NULL;
805
806		DLINK_FOREACH(ptr, serv_list.head)
807	<	{
808	<	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	<	}
807	>	recurse_send_quits(source_p, source_p, from, ptr->data,
808	>	comment, splitstr);
809
810		recurse_remove_clients(source_p, splitstr);
811		}
#	Line 911 | Line 815 | remove_dependents(struct Client *source_
815		* this on any struct Client, regardless of its state.
816		*
817		* Note, you shouldn't exit remote _users_ without first doing
818	<	* SetKilled and propagating a kill or similar message. However,
819	<	* it is perfectly correct to call exit_client to force a _server_
818	>	* AddFlag(x, FLAGS_KILLED) and propagating a kill or similar message.
819	>	* However, it is perfectly correct to call exit_client to force a _server_
820		* quit (either local or remote one).
821		*
822		* inputs:       - a client pointer that is going to be exited
#	Line 927 | Line 831 | remove_dependents(struct Client *source_
831		void
832		exit_client(struct Client *source_p, struct Client *from, const char *comment)
833		{
834	<	dlink_node *m;
834	>	dlink_node *m = NULL;
835
836		if (MyConnect(source_p))
837		{
#	Line 942 | Line 846 | exit_client(struct Client *source_p, str
846		if (IsIpHash(source_p))
847		remove_one_ip(&source_p->localClient->ip);
848
849	<	delete_auth(source_p);
849	>	delete_auth(&source_p->localClient->auth);
850
851	<	/* This source_p could have status of one of STAT_UNKNOWN, STAT_CONNECTING
851	>	/*
852	>	* This source_p could have status of one of STAT_UNKNOWN, STAT_CONNECTING
853		* STAT_HANDSHAKE or STAT_UNKNOWN
854		* all of which are lumped together into unknown_list
855		*
#	Line 952 | Line 857 | exit_client(struct Client *source_p, str
857		*/
858		if (!IsRegistered(source_p))
859		{
860	<	if ((m = dlinkFindDelete(&unknown_list, source_p)) != NULL)
861	<	free_dlink_node(m);
860	>	assert(dlinkFind(&unknown_list, source_p));
861	>
862	>	dlinkDelete(&source_p->localClient->lclient_node, &unknown_list);
863		}
864		else if (IsClient(source_p))
865		{
866	+	time_t on_for = CurrentTime - source_p->localClient->firsttime;
867	+	assert(Count.local > 0);
868		Count.local--;
869
870	<	if (IsOper(source_p))
963	<	{
870	>	if (HasUMode(source_p, UMODE_OPER))
871		if ((m = dlinkFindDelete(&oper_list, source_p)) != NULL)
872		free_dlink_node(m);
966	–	}
873
874	+	assert(dlinkFind(&local_client_list, source_p));
875		dlinkDelete(&source_p->localClient->lclient_node, &local_client_list);
876	+
877		if (source_p->localClient->list_task != NULL)
878		free_list_task(source_p->localClient->list_task, source_p);
879
880		watch_del_watch_list(source_p);
881	<	sendto_realops_flags(UMODE_CCONN, L_ALL, "Client exiting: %s (%s@%s) [%s] [%s]",
881	>	sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
882	>	"Client exiting: %s (%s@%s) [%s] [%s]",
883		source_p->name, source_p->username, source_p->host, comment,
884		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
885		"255.255.255.255" : source_p->sockhost);
886	<	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL, "CLIEXIT: %s %s %s %s 0 %s",
887	<	source_p->name,
888	<	source_p->username,
889	<	source_p->host,
890	<
891	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
892	<	"255.255.255.255" : source_p->sockhost,
893	<	comment);
886	>	ilog(LOG_TYPE_USER, "%s (%3u:%02u:%02u): %s!%s@%s %llu/%llu",
887	>	myctime(source_p->localClient->firsttime), (unsigned int)(on_for / 3600),
888	>	(unsigned int)((on_for % 3600)/60), (unsigned int)(on_for % 60),
889	>	source_p->name, source_p->username, source_p->host,
890	>	source_p->localClient->send.bytes>>10,
891	>	source_p->localClient->recv.bytes>>10);
892	>	}
893	>	else if (IsServer(source_p))
894	>	{
895	>	assert(Count.myserver > 0);
896	>	--Count.myserver;
897	>
898	>	assert(dlinkFind(&serv_list, source_p));
899	>	dlinkDelete(&source_p->localClient->lclient_node, &serv_list);
900	>	unset_chcap_usage_counts(source_p);
901		}
902
987	–	/* As soon as a client is known to be a server of some sort
988	–	* it has to be put on the serv_list, or SJOIN's to this new server
989	–	* from the connect burst will not be seen.
990	–	*/
991	–	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	–	}
1008	–	}
1009	–
1010	–	log_user_exit(source_p);
1011	–
903		if (!IsDead(source_p))
904		{
905		if (IsServer(source_p))
906		{
907		/* for them, we are exiting the network */
908		sendto_one(source_p, ":%s SQUIT %s :%s",
909	<	ID_or_name(from, source_p), me.name, comment);
909	>	ID_or_name(from, source_p), me.name, comment);
910		}
911
912		sendto_one(source_p, "ERROR :Closing Link: %s (%s)",
#	Line 1035 | Line 926 | exit_client(struct Client *source_p, str
926		*/
927		close_connection(source_p);
928		}
929	+	else if (IsClient(source_p) && HasFlag(source_p->servptr, FLAGS_EOB))
930	+	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
931	+	"Client exiting at %s: %s (%s@%s) [%s]",
932	+	source_p->servptr->name, source_p->name,
933	+	source_p->username, source_p->host, comment);
934
935		if (IsServer(source_p))
936		{
#	Line 1044 | Line 940 | exit_client(struct Client *source_p, str
940		assert(source_p->serv != NULL && source_p->servptr != NULL);
941
942		if (ConfigServerHide.hide_servers)
943	<	/* set netsplit message to "*.net *.split" to still show
943	>	/*
944	>	* Set netsplit message to "*.net *.split" to still show
945		* that its a split, but hide the servers splitting
946		*/
947		strcpy(splitstr, "*.net *.split");
#	Line 1056 | Line 953 | exit_client(struct Client *source_p, str
953
954		if (source_p->servptr == &me)
955		{
956	<	sendto_realops_flags(UMODE_ALL, L_ALL,
956	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
957		"%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
958	<	source_p->name, (int)(CurrentTime - source_p->firsttime),
958	>	source_p->name, (int)(CurrentTime - source_p->localClient->firsttime),
959		source_p->localClient->send.bytes >> 10,
960		source_p->localClient->recv.bytes >> 10);
961	<	ilog(L_NOTICE, "%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
962	<	source_p->name, (int)(CurrentTime - source_p->firsttime),
961	>	ilog(LOG_TYPE_IRCD, "%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
962	>	source_p->name, (int)(CurrentTime - source_p->localClient->firsttime),
963		source_p->localClient->send.bytes >> 10,
964		source_p->localClient->recv.bytes >> 10);
965		}
966		}
967	<	else if (IsClient(source_p) && !IsKilled(source_p))
967	>	else if (IsClient(source_p) && !HasFlag(source_p, FLAGS_KILLED))
968		{
969	<	sendto_server(from->from, source_p, NULL, CAP_TS6, NOCAPS, NOFLAGS,
969	>	sendto_server(from->from, CAP_TS6, NOCAPS,
970		":%s QUIT :%s", ID(source_p), comment);
971	<	sendto_server(from->from, source_p, NULL, NOCAPS, CAP_TS6, NOFLAGS,
971	>	sendto_server(from->from, NOCAPS, CAP_TS6,
972		":%s QUIT :%s", source_p->name, comment);
973		}
974
#	Line 1117 | Line 1014 | dead_link_on_write(struct Client *client
1014		void
1015		dead_link_on_read(struct Client *client_p, int error)
1016		{
1017	<	char errmsg[255];
1017	>	char errmsg[IRCD_BUFSIZE];
1018		int current_error;
1019
1020		if (IsDefunct(client_p))
#	Line 1130 | Line 1027 | dead_link_on_read(struct Client *client_
1027
1028		if (IsServer(client_p) || IsHandshake(client_p))
1029		{
1030	<	int connected = CurrentTime - client_p->firsttime;
1031	<
1030	>	int connected = CurrentTime - client_p->localClient->firsttime;
1031	>
1032		if (error == 0)
1033		{
1034		/* Admins get the real IP */
1035	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
1036	<	"Server %s closed the connection",
1037	<	get_client_name(client_p, SHOW_IP));
1035	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
1036	>	"Server %s closed the connection",
1037	>	get_client_name(client_p, SHOW_IP));
1038
1039		/* Opers get a masked IP */
1040	<	sendto_realops_flags(UMODE_ALL, L_OPER,
1041	<	"Server %s closed the connection",
1042	<	get_client_name(client_p, MASK_IP));
1040	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
1041	>	"Server %s closed the connection",
1042	>	get_client_name(client_p, MASK_IP));
1043
1044	<	ilog(L_NOTICE, "Server %s closed the connection",
1045	<	get_client_name(client_p, SHOW_IP));
1044	>	ilog(LOG_TYPE_IRCD, "Server %s closed the connection",
1045	>	get_client_name(client_p, SHOW_IP));
1046		}
1047		else
1048		{
1049		report_error(L_ADMIN, "Lost connection to %s: %s",
1050	<	get_client_name(client_p, SHOW_IP), current_error);
1050	>	get_client_name(client_p, SHOW_IP), current_error);
1051		report_error(L_OPER, "Lost connection to %s: %s",
1052	<	get_client_name(client_p, MASK_IP), current_error);
1052	>	get_client_name(client_p, MASK_IP), current_error);
1053		}
1054
1055	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1056	<	"%s had been connected for %d day%s, %2d:%02d:%02d",
1057	<	client_p->name, connected/86400,
1058	<	(connected/86400 == 1) ? "" : "s",
1059	<	(connected % 86400) / 3600, (connected % 3600) / 60,
1060	<	connected % 60);
1055	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1056	>	"%s had been connected for %d day%s, %2d:%02d:%02d",
1057	>	client_p->name, connected/86400,
1058	>	(connected/86400 == 1) ? "" : "s",
1059	>	(connected % 86400) / 3600, (connected % 3600) / 60,
1060	>	connected % 60);
1061		}
1062
1063		if (error == 0)
1064		strlcpy(errmsg, "Remote host closed the connection",
1065		sizeof(errmsg));
1066		else
1067	<	ircsprintf(errmsg, "Read error: %s",
1068	<	strerror(current_error));
1067	>	snprintf(errmsg, sizeof(errmsg), "Read error: %s",
1068	>	strerror(current_error));
1069
1070		exit_client(client_p, &me, errmsg);
1071		}
#	Line 1187 | Line 1084 | exit_aborted_clients(void)
1084
1085		if (target_p == NULL)
1086		{
1087	<	sendto_realops_flags(UMODE_ALL, L_ALL,
1087	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
1088		"Warning: null client on abort_list!");
1089		dlinkDelete(ptr, &abort_list);
1090		free_dlink_node(ptr);
#	Line 1201 | Line 1098 | exit_aborted_clients(void)
1098		else
1099		notice = "Write error: connection closed";
1100
1101	<	exit_client(target_p, &me, notice);
1101	>	exit_client(target_p, &me, notice);
1102		free_dlink_node(ptr);
1103		}
1104		}
1105
1106		/*
1107		* accept processing, this adds a form of "caller ID" to ircd
1108	<	*
1108	>	*
1109		* If a client puts themselves into "caller ID only" mode,
1110	<	* only clients that match a client pointer they have put on
1110	>	* only clients that match a client pointer they have put on
1111		* the accept list will be allowed to message them.
1112		*
1113	<	* [ 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.
1113	>	* Diane Bruce, "Dianora" db@db.net
1114		*/
1115
1116	<	/* accept_message()
1117	<	*
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)
1116	>	void
1117	>	del_accept(struct split_nuh_item *accept_p, struct Client *client_p)
1118		{
1119	<	dlink_node *ptr;
1238	<
1239	<	DLINK_FOREACH(ptr, target->allow_list.head)
1240	<	{
1241	<	struct Client *target_p = ptr->data;
1119	>	dlinkDelete(&accept_p->node, &client_p->localClient->acceptlist);
1120
1121	<	if (source == target_p)
1122	<	return (1);
1123	<	}
1124	<
1247	<	if (IsSoftCallerId(target))
1248	<	{
1249	<	DLINK_FOREACH(ptr, target->channel.head)
1250	<	if (IsMember(source, ((struct Membership *)ptr->data)->chptr))
1251	<	return (1);
1252	<	}
1253	<
1254	<	return (0);
1121	>	MyFree(accept_p->nickptr);
1122	>	MyFree(accept_p->userptr);
1123	>	MyFree(accept_p->hostptr);
1124	>	MyFree(accept_p);
1125		}
1126
1127	<	/* del_from_accept()
1128	<	*
1129	<	* inputs       - pointer to source client
1130	<	*              - 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)
1127	>	struct split_nuh_item *
1128	>	find_accept(const char *nick, const char *user,
1129	>	const char *host, struct Client *client_p,
1130	>	int (*cmpfunc)(const char *, const char *))
1131		{
1132	<	dlink_node *ptr;
1271	<	dlink_node *ptr2;
1272	<	dlink_node *next_ptr;
1273	<	dlink_node *next_ptr2;
1274	<	struct Client *target_p;
1132	>	dlink_node *ptr = NULL;
1133
1134	<	DLINK_FOREACH_SAFE(ptr, next_ptr, target->allow_list.head)
1134	>	DLINK_FOREACH(ptr, client_p->localClient->acceptlist.head)
1135		{
1136	<	target_p = ptr->data;
1279	<
1280	<	if (source == target_p)
1281	<	{
1282	<	dlinkDelete(ptr, &target->allow_list);
1283	<	free_dlink_node(ptr);
1136	>	struct split_nuh_item *accept_p = ptr->data;
1137
1138	<	DLINK_FOREACH_SAFE(ptr2, next_ptr2, source->on_allow_list.head)
1139	<	{
1140	<	target_p = ptr2->data;
1141	<
1289	<	if (target == target_p)
1290	<	{
1291	<	dlinkDelete(ptr2, &source->on_allow_list);
1292	<	free_dlink_node(ptr2);
1293	<	}
1294	<	}
1295	<	}
1138	>	if (!cmpfunc(accept_p->nickptr, nick) &&
1139	>	!cmpfunc(accept_p->userptr, user) &&
1140	>	!cmpfunc(accept_p->hostptr, host))
1141	>	return accept_p;
1142		}
1143	+
1144	+	return NULL;
1145		}
1146
1147	<	/* del_all_accepts()
1147	>	/* accept_message()
1148		*
1149	<	* inputs       - pointer to exiting client
1150	<	* output       - NONE
1151	<	* side effects - Walk through given clients allow_list and on_allow_list
1152	<	*                remove all references to this client
1149	>	* inputs       - pointer to source client
1150	>	*              - pointer to target client
1151	>	* output       - 1 if accept this message 0 if not
1152	>	* side effects - See if source is on target's allow list
1153		*/
1154	<	void
1155	<	del_all_accepts(struct Client *client_p)
1154	>	int
1155	>	accept_message(struct Client *source,
1156	>	struct Client *target)
1157		{
1158	<	dlink_node *ptr, *next_ptr;
1158	>	dlink_node *ptr = NULL;
1159
1160	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->allow_list.head)
1161	<	del_from_accept(ptr->data, client_p);
1160	>	if (source == target || find_accept(source->name, source->username,
1161	>	source->host, target, match))
1162	>	return 1;
1163
1164	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->on_allow_list.head)
1165	<	del_from_accept(client_p, ptr->data);
1166	<	}
1167	<
1318	<	/* del_all_their_accepts()
1319	<	*
1320	<	* inputs       - pointer to exiting client
1321	<	* 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;
1164	>	if (HasUMode(target, UMODE_SOFTCALLERID))
1165	>	DLINK_FOREACH(ptr, target->channel.head)
1166	>	if (IsMember(source, ((struct Membership *)ptr->data)->chptr))
1167	>	return 1;
1168
1169	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->on_allow_list.head)
1332	<	del_from_accept(client_p, ptr->data);
1169	>	return 0;
1170		}
1171
1172	<	/* set_initial_nick()
1336	<	*
1337	<	* inputs
1338	<	* output
1339	<	* side effects -
1172	>	/* del_all_accepts()
1173		*
1174	<	* This function is only called to set up an initially registering
1175	<	* client.
1174	>	* inputs       - pointer to exiting client
1175	>	* output       - NONE
1176	>	* side effects - Walk through given clients acceptlist and remove all entries
1177		*/
1178		void
1179	<	set_initial_nick(struct Client *client_p, struct Client *source_p,
1346	<	const char *nick)
1179	>	del_all_accepts(struct Client *client_p)
1180		{
1181	<	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';
1181	>	dlink_node *ptr = NULL, *next_ptr = NULL;
1182
1183	<	if (!source_p->localClient->registration)
1184	<	{
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	<	}
1183	>	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->acceptlist.head)
1184	>	del_accept(ptr->data, client_p);
1185		}
1186
1187	<	/* change_local_nick()
1188	<	*
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)
1187	>	unsigned int
1188	>	idle_time_get(const struct Client *source_p, const struct Client *target_p)
1189		{
1190	<	int samenick = 0;
1190	>	unsigned int idle = 0;
1191	>	unsigned int min_idle = 0;
1192	>	unsigned int max_idle = 0;
1193	>	const struct ClassItem *class = get_class_ptr(&target_p->localClient->confs);
1194
1195	<	/*
1196	<	** Client just changing his/her nick. If he/she is
1197	<	** on a channel, send note of change to all clients
1198	<	** on that channel. Propagate notice to other servers.
1199	<	*/
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);
1195	>	if (!(class->flags & CLASS_FLAGS_FAKE_IDLE) || target_p == source_p)
1196	>	return CurrentTime - target_p->localClient->last_privmsg;
1197	>	if (HasUMode(source_p, UMODE_OPER) &&
1198	>	!(class->flags & CLASS_FLAGS_HIDE_IDLE_FROM_OPERS))
1199	>	return CurrentTime - target_p->localClient->last_privmsg;
1200
1201	<	if (!samenick)
1202	<	{
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	<	}
1201	>	min_idle = class->min_idle;
1202	>	max_idle = class->max_idle;
1203
1204	<	/* XXX - the format of this notice should eventually be changed
1205	<	* 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);
1204	>	if (min_idle == max_idle)
1205	>	return min_idle;
1206
1207	<	/*
1208	<	* 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	<	}
1207	>	if (class->flags & CLASS_FLAGS_RANDOM_IDLE)
1208	>	idle = genrand_int32();
1209		else
1210	<	{
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);
1210	>	idle = CurrentTime - target_p->localClient->last_privmsg;
1211
1212	<	if (!samenick)
1213	<	{
1214	<	clear_ban_cache_client(source_p);
1215	<	watch_check_hash(source_p, RPL_LOGOFF);
1467	<	}
1468	<
1469	<	strcpy(source_p->name, nick);
1470	<	hash_add_client(source_p);
1212	>	if (max_idle == 0)
1213	>	idle = 0;
1214	>	else
1215	>	idle %= max_idle;
1216
1217	<	if (!samenick)
1218	<	watch_check_hash(source_p, RPL_LOGON);
1217	>	if (idle < min_idle)
1218	>	idle = min_idle + (idle % (max_idle - min_idle));
1219
1220	<	/* fd_desc is long enough */
1476	<	fd_note(&client_p->localClient->fd, "Nick: %s", nick);
1220	>	return idle;
1221		}

Diff Legend

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