ViewVC Help

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

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

Comparing:
ircd-hybrid-8/src/client.c (file contents), Revision 1219 by michael, Sun Sep 18 09:02:38 2011 UTC vs.
ircd-hybrid/trunk/src/client.c (file contents), Revision 2739 by michael, Sat Jan 4 20:04:27 2014 UTC

#	Line 26 | Line 26
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"
#	Line 37 | Line 36
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 46 | Line 45
45		#include "s_user.h"
46		#include "dbuf.h"
47		#include "memory.h"
48	+	#include "mempool.h"
49		#include "hostmask.h"
50	–	#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 65 | 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 75 | 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);
79	<	static void ban_them(struct Client *, struct ConfItem *);
79	>	static void ban_them(struct Client *, struct MaskItem *);
80
81
82	<	/* init_client()
82	>	/* client_init()
83		*
84		* inputs       - NONE
85		* output       - NONE
86		* side effects - initialize client free memory
87		*/
88		void
89	<	init_client(void)
89	>	client_init(void)
90		{
91		/* start off the check ping event ..  -- adrian
92		* Every 30 seconds is plenty -- db
93		*/
94	<	client_heap = BlockHeapCreate("client", sizeof(struct Client), CLIENT_HEAP_SIZE);
95	<	lclient_heap = BlockHeapCreate("local client", sizeof(struct LocalUser), LCLIENT_HEAP_SIZE);
94	>	client_pool = mp_pool_new(sizeof(struct Client), MP_CHUNK_SIZE_CLIENT);
95	>	lclient_pool = mp_pool_new(sizeof(struct LocalUser), MP_CHUNK_SIZE_LCLIENT);
96		eventAdd("check_pings", check_pings, NULL, 5);
97		}
98
#	Line 113 | Line 114 | init_client(void)
114		struct Client *
115		make_client(struct Client *from)
116		{
117	<	struct Client *client_p = BlockHeapAlloc(client_heap);
117	>	struct Client *client_p = mp_pool_get(client_pool);
118	>
119	>	memset(client_p, 0, sizeof(*client_p));
120
121		if (from == NULL)
122		{
123	<	client_p->from  = client_p; /* 'from' of local client is self! */
124	<	client_p->since = client_p->lasttime = client_p->firsttime = CurrentTime;
123	>	client_p->from                      = client_p; /* 'from' of local client is self! */
124	>	client_p->localClient               = mp_pool_get(lclient_pool);
125	>
126	>	memset(client_p->localClient, 0, sizeof(*client_p->localClient));
127
128	<	client_p->localClient = BlockHeapAlloc(lclient_heap);
128	>	client_p->localClient->since        = CurrentTime;
129	>	client_p->localClient->lasttime     = CurrentTime;
130	>	client_p->localClient->firsttime    = CurrentTime;
131		client_p->localClient->registration = REG_INIT;
132	+
133		/* as good a place as any... */
134		dlinkAdd(client_p, &client_p->localClient->lclient_node, &unknown_list);
135		}
136		else
137		client_p->from = from; /* 'from' of local client is self! */
138
139	+	client_p->idhnext = client_p;
140		client_p->hnext  = client_p;
141	<	client_p->status = STAT_UNKNOWN;
141	>	SetUnknown(client_p);
142		strcpy(client_p->username, "unknown");
143	+	strcpy(client_p->svid, "0");
144
145		return client_p;
146		}
#	Line 148 | Line 158 | free_client(struct Client *client_p)
158		assert(client_p != NULL);
159		assert(client_p != &me);
160		assert(client_p->hnext == client_p);
161	+	assert(client_p->idhnext == client_p);
162		assert(client_p->channel.head == NULL);
163		assert(dlink_list_length(&client_p->channel) == 0);
164	+	assert(dlink_list_length(&client_p->whowas) == 0);
165	+	assert(!IsServer(client_p) || (IsServer(client_p) && client_p->serv));
166
154	–	MyFree(client_p->away);
167		MyFree(client_p->serv);
168	+	MyFree(client_p->certfp);
169
170		if (MyConnect(client_p))
171		{
172		assert(client_p->localClient->invited.head == NULL);
173		assert(dlink_list_length(&client_p->localClient->invited) == 0);
174	+	assert(dlink_list_length(&client_p->localClient->watches) == 0);
175		assert(IsClosing(client_p) && IsDead(client_p));
176
177		MyFree(client_p->localClient->response);
#	Line 170 | Line 184 | free_client(struct Client *client_p)
184		{
185		assert(0 < client_p->localClient->listener->ref_count);
186		if (0 == --client_p->localClient->listener->ref_count &&
187	<	!client_p->localClient->listener->active)
187	>	!client_p->localClient->listener->active)
188		free_listener(client_p->localClient->listener);
189		}
190
191		dbuf_clear(&client_p->localClient->buf_recvq);
192		dbuf_clear(&client_p->localClient->buf_sendq);
193
194	<	BlockHeapFree(lclient_heap, client_p->localClient);
194	>	mp_pool_release(client_p->localClient);
195		}
196
197	<	BlockHeapFree(client_heap, client_p);
197	>	mp_pool_release(client_p);
198		}
199
200		/*
#	Line 189 | Line 203 | free_client(struct Client *client_p)
203		*
204		* inputs       - NOT USED (from event)
205		* output       - next time_t when check_pings() should be called again
206	<	* side effects -
206	>	* side effects -
207		*
208		*
209		* A PING can be sent to clients as necessary.
#	Line 211 | Line 225 | free_client(struct Client *client_p)
225
226		static void
227		check_pings(void *notused)
228	<	{
228	>	{
229		check_pings_list(&local_client_list);
230		check_pings_list(&serv_list);
231		check_unknowns_list();
#	Line 221 | Line 235 | check_pings(void *notused)
235		*
236		* inputs       - pointer to list to check
237		* output       - NONE
238	<	* side effects -
238	>	* side effects -
239		*/
240		static void
241		check_pings_list(dlink_list *list)
242		{
243	<	char scratch[32];        /* way too generous but... */
244	<	struct Client *client_p; /* current local client_p being examined */
245	<	int ping, pingwarn;      /* ping time value from client */
232	<	dlink_node *ptr, *next_ptr;
243	>	char scratch[IRCD_BUFSIZE];
244	>	int ping = 0;      /* ping time value from client */
245	>	dlink_node *ptr = NULL, *next_ptr = NULL;
246
247		DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
248		{
249	<	client_p = ptr->data;
249	>	struct Client *client_p = ptr->data;
250
251		/*
252		** Note: No need to notify opers here. It's
#	Line 242 | Line 255 | check_pings_list(dlink_list *list)
255		if (IsDead(client_p))
256		{
257		/* 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");
258		continue;
259		}
260
261		if (!IsRegistered(client_p))
262	<	ping = CONNECTTIMEOUT, pingwarn = 0;
262	>	ping = CONNECTTIMEOUT;
263		else
264	<	ping = get_client_ping(client_p, &pingwarn);
264	>	ping = get_client_ping(&client_p->localClient->confs);
265
266	<	if (ping < CurrentTime - client_p->lasttime)
266	>	if (ping < CurrentTime - client_p->localClient->lasttime)
267		{
268		if (!IsPingSent(client_p))
269		{
270	<	/*
271	<	* if we havent PINGed the connection and we havent
272	<	* heard from it in a while, PING it to make sure
273	<	* it is still alive.
274	<	*/
275	<	SetPingSent(client_p);
276	<	ClearPingWarning(client_p);
277	<	client_p->lasttime = CurrentTime - ping;
272	<	sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
270	>	/*
271	>	* if we havent PINGed the connection and we havent
272	>	* heard from it in a while, PING it to make sure
273	>	* it is still alive.
274	>	*/
275	>	SetPingSent(client_p);
276	>	client_p->localClient->lasttime = CurrentTime - ping;
277	>	sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
278		}
279		else
280		{
281	<	if (CurrentTime - client_p->lasttime >= 2 * ping)
281	>	if (CurrentTime - client_p->localClient->lasttime >= 2 * ping)
282		{
283		/*
284		* If the client/server hasn't talked to us in 2*ping seconds
285		* and it has a ping time, then close its connection.
286		*/
287		if (IsServer(client_p) || IsHandshake(client_p))
288	<	{
289	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
290	<	"No response from %s, closing link",
291	<	get_client_name(client_p, HIDE_IP));
292	<	sendto_realops_flags(UMODE_ALL, L_OPER,
293	<	"No response from %s, closing link",
294	<	get_client_name(client_p, MASK_IP));
295	<	ilog(L_NOTICE, "No response from %s, closing link",
296	<	get_client_name(client_p, HIDE_IP));
297	<	}
288	>	{
289	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
290	>	"No response from %s, closing link",
291	>	get_client_name(client_p, HIDE_IP));
292	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
293	>	"No response from %s, closing link",
294	>	get_client_name(client_p, MASK_IP));
295	>	ilog(LOG_TYPE_IRCD, "No response from %s, closing link",
296	>	get_client_name(client_p, HIDE_IP));
297	>	}
298
299		snprintf(scratch, sizeof(scratch), "Ping timeout: %d seconds",
300	<	(int)(CurrentTime - client_p->lasttime));
300	>	(int)(CurrentTime - client_p->localClient->lasttime));
301		exit_client(client_p, &me, scratch);
302		}
298	–	else if (!IsPingWarning(client_p) && pingwarn > 0 &&
299	–	(IsServer(client_p) || IsHandshake(client_p)) &&
300	–	CurrentTime - client_p->lasttime >= ping + pingwarn)
301	–	{
302	–	/*
303	–	* If the server hasn't replied in pingwarn seconds after sending
304	–	* the PING, notify the opers so that they are aware of the problem.
305	–	*/
306	–	SetPingWarning(client_p);
307	–	sendto_realops_flags(UMODE_ALL, L_ADMIN,
308	–	"Warning, no response from %s in %d seconds",
309	–	get_client_name(client_p, HIDE_IP), pingwarn);
310	–	sendto_realops_flags(UMODE_ALL, L_OPER,
311	–	"Warning, no response from %s in %d seconds",
312	–	get_client_name(client_p, MASK_IP), pingwarn);
313	–	ilog(L_NOTICE, "No response from %s in %d seconds",
314	–	get_client_name(client_p, HIDE_IP), pingwarn);
315	–	}
303		}
304		}
305		}
#	Line 333 | Line 320 | check_unknowns_list(void)
320		{
321		struct Client *client_p = ptr->data;
322
336	–	if (client_p->localClient->reject_delay > 0)
337	–	{
338	–	if (client_p->localClient->reject_delay <= CurrentTime)
339	–	exit_client(client_p, &me, "Rejected");
340	–	continue;
341	–	}
342	–
323		/*
324		* Check UNKNOWN connections - if they have been in this state
325		* for > 30s, close them.
326		*/
327	<	if (IsAuthFinished(client_p) && (CurrentTime - client_p->firsttime) > 30)
327	>	if (IsAuthFinished(client_p) && (CurrentTime - client_p->localClient->firsttime) > 30)
328		exit_client(client_p, &me, "Registration timed out");
329		}
330		}
#	Line 356 | Line 336 | check_unknowns_list(void)
336		* side effects - Check all connections for a pending kline against the
337		*                client, exit the client if a kline matches.
338		*/
339	<	void
339	>	void
340		check_conf_klines(void)
341	<	{
341	>	{
342		struct Client *client_p = NULL;       /* current local client_p being examined */
343	<	struct AccessItem *aconf = NULL;
364	<	struct ConfItem *conf = NULL;
343	>	struct MaskItem *conf = NULL;
344		dlink_node *ptr, *next_ptr;
345
346		DLINK_FOREACH_SAFE(ptr, next_ptr, local_client_list.head)
#	Line 373 | Line 352 | check_conf_klines(void)
352		if (IsDead(client_p) || !IsClient(client_p))
353		continue;
354
355	<	/* if there is a returned struct ConfItem then kill it */
377	<	if ((aconf = find_dline_conf(&client_p->localClient->ip,
355	>	if ((conf = find_dline_conf(&client_p->localClient->ip,
356		client_p->localClient->aftype)) != NULL)
357		{
358	<	if (aconf->status & CONF_EXEMPTDLINE)
359	<	continue;
358	>	if (conf->type == CONF_EXEMPT)
359	>	continue;
360
383	–	conf = unmap_conf_item(aconf);
361		ban_them(client_p, conf);
362		continue; /* and go examine next fd/client_p */
363		}
364
365	<	if (ConfigFileEntry.glines && (aconf = find_gline(client_p)))
365	>	if (ConfigFileEntry.glines)
366		{
367	<	if (IsExemptKline(client_p) ||
368	<	IsExemptGline(client_p))
367	>	if ((conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
368	>	CONF_GLINE, client_p->localClient->aftype,
369	>	client_p->username, NULL, 1)))
370		{
371	<	sendto_realops_flags(UMODE_ALL, L_ALL,
372	<	"GLINE over-ruled for %s, client is %sline_exempt",
373	<	get_client_name(client_p, HIDE_IP), IsExemptKline(client_p) ? "k" : "g");
371	>	if (IsExemptKline(client_p) ||
372	>	IsExemptGline(client_p))
373	>	{
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	>
380	>	ban_them(client_p, conf);
381	>	/* and go examine next fd/client_p */
382		continue;
383		}
384	+	}
385
386	<	conf = unmap_conf_item(aconf);
387	<	ban_them(client_p, conf);
388	<	/* and go examine next fd/client_p */
402	<	continue;
403	<	}
404	<
405	<	if ((aconf = find_kill(client_p)) != NULL)
386	>	if ((conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
387	>	CONF_KLINE, client_p->localClient->aftype,
388	>	client_p->username, NULL, 1)))
389		{
407	–
408	–	/* if there is a returned struct AccessItem.. then kill it */
390		if (IsExemptKline(client_p))
391		{
392	<	sendto_realops_flags(UMODE_ALL, L_ALL,
392	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
393		"KLINE over-ruled for %s, client is kline_exempt",
394		get_client_name(client_p, HIDE_IP));
395		continue;
396		}
397
417	–	conf = unmap_conf_item(aconf);
398		ban_them(client_p, conf);
399	<	continue;
399	>	continue;
400		}
401
402	<	/* if there is a returned struct MatchItem then kill it */
403	<	if ((conf = find_matching_name_conf(XLINE_TYPE,  client_p->info,
424	<	NULL, NULL, 0)) != NULL ||
425	<	(conf = find_matching_name_conf(RXLINE_TYPE, client_p->info,
426	<	NULL, NULL, 0)) != NULL)
402	>	if ((conf = find_matching_name_conf(CONF_XLINE,  client_p->info,
403	>	NULL, NULL, 0)))
404		{
405		ban_them(client_p, conf);
406		continue;
#	Line 435 | Line 412 | check_conf_klines(void)
412		{
413		client_p = ptr->data;
414
415	<	if ((aconf = find_dline_conf(&client_p->localClient->ip,
416	<	client_p->localClient->aftype)))
415	>	if ((conf = find_dline_conf(&client_p->localClient->ip,
416	>	client_p->localClient->aftype)))
417		{
418	<	if (aconf->status & CONF_EXEMPTDLINE)
418	>	if (conf->type == CONF_EXEMPT)
419		continue;
420
421		exit_client(client_p, &me, "D-lined");
#	Line 450 | Line 427 | check_conf_klines(void)
427		* ban_them
428		*
429		* inputs       - pointer to client to ban
430	<	*              - pointer to ConfItem
430	>	*              - pointer to MaskItem
431		* output       - NONE
432		* side effects - given client_p is banned
433		*/
434		static void
435	<	ban_them(struct Client *client_p, struct ConfItem *conf)
435	>	ban_them(struct Client *client_p, struct MaskItem *conf)
436		{
437	<	const char *user_reason = NULL;       /* What is sent to user */
461	<	const char *channel_reason = NULL;    /* What is sent to channel */
462	<	struct AccessItem *aconf = NULL;
463	<	struct MatchItem *xconf = NULL;
437	>	const char *user_reason = NULL;  /* What is sent to user */
438		const char *type_string = NULL;
439		const char dline_string[] = "D-line";
440		const char kline_string[] = "K-line";
#	Line 469 | Line 443 | ban_them(struct Client *client_p, struct
443
444		switch (conf->type)
445		{
446	<	case RKLINE_TYPE:
473	<	case KLINE_TYPE:
446	>	case CONF_KLINE:
447		type_string = kline_string;
475	–	aconf = map_to_conf(conf);
448		break;
449	<	case DLINE_TYPE:
449	>	case CONF_DLINE:
450		type_string = dline_string;
479	–	aconf = map_to_conf(conf);
451		break;
452	<	case GLINE_TYPE:
452	>	case CONF_GLINE:
453		type_string = gline_string;
483	–	aconf = map_to_conf(conf);
454		break;
455	<	case RXLINE_TYPE:
486	<	case XLINE_TYPE:
455	>	case CONF_XLINE:
456		type_string = xline_string;
457	<	xconf = map_to_conf(conf);
489	<	++xconf->count;
457	>	++conf->count;
458		break;
459		default:
460		assert(0);
461		break;
462		}
463
464	<	if (ConfigFileEntry.kline_with_reason)
497	<	{
498	<	if (aconf != NULL)
499	<	user_reason = aconf->reason ? aconf->reason : type_string;
500	<	if (xconf != NULL)
501	<	user_reason = xconf->reason ? xconf->reason : type_string;
502	<	}
503	<	else
504	<	user_reason = type_string;
464	>	user_reason = conf->reason ? conf->reason : type_string;
465
466	<	if (ConfigFileEntry.kline_reason != NULL)
507	<	channel_reason = ConfigFileEntry.kline_reason;
508	<	else
509	<	channel_reason = user_reason;
510	<
511	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s active for %s",
466	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s active for %s",
467		type_string, get_client_name(client_p, HIDE_IP));
468
469		if (IsClient(client_p))
470		sendto_one(client_p, form_str(ERR_YOUREBANNEDCREEP),
471	<	me.name, client_p->name, user_reason);
471	>	me.name, client_p->name, user_reason);
472
473	<	exit_client(client_p, &me, channel_reason);
473	>	exit_client(client_p, &me, user_reason);
474		}
475
476		/* update_client_exit_stats()
477		*
478		* input        - pointer to client
479		* output       - NONE
480	<	* side effects -
480	>	* side effects -
481		*/
482		static void
483		update_client_exit_stats(struct Client *client_p)
#	Line 537 | Line 492 | update_client_exit_stats(struct Client *
492		--Count.invisi;
493		}
494		else if (IsServer(client_p))
495	<	sendto_realops_flags(UMODE_EXTERNAL, L_ALL, "Server %s split from %s",
495	>	sendto_realops_flags(UMODE_EXTERNAL, L_ALL, SEND_NOTICE,
496	>	"Server %s split from %s",
497		client_p->name, client_p->servptr->name);
498
499		if (splitchecking && !splitmode)
#	Line 550 | Line 506 | update_client_exit_stats(struct Client *
506		* output       - return client pointer
507		* side effects - find person by (nick)name
508		*/
553	–	/* XXX - ugly wrapper */
509		struct Client *
510		find_person(const struct Client *client_p, const char *name)
511		{
512	<	struct Client *c2ptr;
512	>	struct Client *target_p = NULL;
513
514		if (IsDigit(*name))
515		{
516	<	if ((c2ptr = hash_find_id(name)) != NULL)
517	<	{
563	<	/* invisible users shall not be found by UID guessing */
564	<	if (HasUMode(c2ptr, UMODE_INVISIBLE) && !IsServer(client_p))
565	<	c2ptr = NULL;
566	<	}
516	>	if (IsServer(client_p) || HasFlag(client_p, FLAGS_SERVICE))
517	>	target_p = hash_find_id(name);
518		}
519		else
520	<	c2ptr = hash_find_client(name);
520	>	target_p = hash_find_client(name);
521
522	<	return ((c2ptr != NULL && IsClient(c2ptr)) ? c2ptr : NULL);
522	>	return (target_p && IsClient(target_p)) ? target_p : NULL;
523		}
524
525		/*
526	<	* find_chasing - find the client structure for a nick name (user)
527	<	*      using history mechanism if necessary. If the client is not found,
526	>	* find_chasing - find the client structure for a nick name (name)
527	>	*      using history mechanism if necessary. If the client is not found,
528		*      an error message (NO SUCH NICK) is generated. If the client was found
529		*      through the history, chasing will be 1 and otherwise 0.
530		*/
531		struct Client *
532	<	find_chasing(struct Client *client_p, struct Client *source_p, const char *user, int *chasing)
532	>	find_chasing(struct Client *source_p, const char *name, int *const chasing)
533		{
534	<	struct Client *who = find_person(client_p, user);
534	>	struct Client *who = find_person(source_p->from, name);
535
536		if (chasing)
537		*chasing = 0;
#	Line 588 | Line 539 | find_chasing(struct Client *client_p, st
539		if (who)
540		return who;
541
542	<	if (IsDigit(*user))
542	>	if (IsDigit(*name))
543		return NULL;
544
545	<	if ((who = get_history(user,
546	<	(time_t)ConfigFileEntry.kill_chase_time_limit))
547	<	== NULL)
545	>	if ((who = whowas_get_history(name,
546	>	(time_t)ConfigFileEntry.kill_chase_time_limit))
547	>	== NULL)
548		{
549		sendto_one(source_p, form_str(ERR_NOSUCHNICK),
550	<	me.name, source_p->name, user);
550	>	me.name, source_p->name, name);
551		return NULL;
552		}
553
#	Line 625 | Line 576 | find_chasing(struct Client *client_p, st
576		*        to modify what it points!!!
577		*/
578		const char *
579	<	get_client_name(const 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)
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	<	snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
607	<	client->name,
653	<	client->username, client->sockhost);
654	<	break;
655	<	}
604	>	snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
605	>	client->name,
606	>	client->username, client->sockhost);
607	>	break;
608		case MASK_IP:
609	<	snprintf(nbuf, sizeof(nbuf), "%s[%s@255.255.255.255]",
610	<	client->name, 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		snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
#	Line 670 | Line 626 | void
626		free_exited_clients(void)
627		{
628		dlink_node *ptr = NULL, *next = NULL;
629	<
629	>
630		DLINK_FOREACH_SAFE(ptr, next, dead_list.head)
631		{
632		free_client(ptr->data);
#	Line 703 | Line 659 | exit_one_client(struct Client *source_p,
659		* that the client can show the "**signoff" message).
660		* (Note: The notice is to the local clients *only*)
661		*/
662	<	sendto_common_channels_local(source_p, 0, ":%s!%s@%s QUIT :%s",
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	<	add_history(source_p, 0);
669	<	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
#	Line 773 | Line 729 | recurse_send_quits(struct Client *origin
729		{
730		dlink_node *ptr, *next;
731		struct Client *target_p;
776	–	int hidden = match(me.name, source_p->name); /* XXX */
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
782	–	*
783	–	* Always check *all* dependent servers if some of them are
784	–	* hidden behind fakename. If so, send out the QUITs -adx
737		*/
738	<	if (hidden || !IsCapable(to, CAP_QS))
738	>	if (!IsCapable(to, CAP_QS))
739		DLINK_FOREACH_SAFE(ptr, next, source_p->serv->client_list.head)
740		{
741		target_p = ptr->data;
#	Line 794 | Line 746 | recurse_send_quits(struct Client *origin
746		recurse_send_quits(original_source_p, ptr->data, from, to,
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 803 | 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 878 | Line 830 | exit_client(struct Client *source_p, str
830		if (IsIpHash(source_p))
831		remove_one_ip(&source_p->localClient->ip);
832
833	<	if (source_p->localClient->auth)
882	<	{
883	<	delete_auth(source_p->localClient->auth);
884	<	source_p->localClient->auth = NULL;
885	<	}
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 898 | Line 847 | exit_client(struct Client *source_p, str
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 (HasUMode(source_p, UMODE_OPER))
905	–	{
855		if ((m = dlinkFindDelete(&oper_list, source_p)) != NULL)
856		free_dlink_node(m);
908	–	}
857
858		assert(dlinkFind(&local_client_list, source_p));
859		dlinkDelete(&source_p->localClient->lclient_node, &local_client_list);
#	Line 914 | Line 862 | exit_client(struct Client *source_p, str
862		free_list_task(source_p->localClient->list_task, source_p);
863
864		watch_del_watch_list(source_p);
865	<	sendto_realops_flags(UMODE_CCONN, L_ALL, "Client exiting: %s (%s@%s) [%s] [%s]",
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	<	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL, "CLIEXIT: %s %s %s %s 0 %s",
871	<	source_p->name,
872	<	source_p->username,
873	<	source_p->host,
874	<
875	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
876	<	"255.255.255.255" : source_p->sockhost,
877	<	comment);
878	<	}
879	<
880	<	/* As soon as a client is known to be a server of some sort
881	<	* it has to be put on the serv_list, or SJOIN's to this new server
882	<	* from the connect burst will not be seen.
883	<	* XXX - TBV.  This is not true. The only place where we put a server on
884	<	* serv_list is in server_estab right now after registration process.
936	<	* And only after this, a burst is sent to the remote server, i.e. we never
937	<	* send a burst to STAT_CONNECTING, or STAT_HANDSHAKE. This will need
938	<	* more investigation later on, but for now, it's not a problem after all.
939	<	*/
940	<	if (IsServer(source_p) || IsConnecting(source_p) ||
941	<	IsHandshake(source_p))
942	<	{
943	<	if (dlinkFind(&serv_list, source_p))
944	<	{
945	<	dlinkDelete(&source_p->localClient->lclient_node, &serv_list);
946	<	unset_chcap_usage_counts(source_p);
947	<	}
948	<
949	<	if (IsServer(source_p))
950	<	Count.myserver--;
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
953	–	log_user_exit(source_p);
954	–
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 978 | 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 988 | Line 925 | exit_client(struct Client *source_p, str
925
926		if (ConfigServerHide.hide_servers)
927		/*
928	<	* Set netsplit message to "*.net *.split" to still show
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 1000 | 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) && !HasFlag(source_p, FLAGS_KILLED))
952		{
953	<	sendto_server(from->from, NULL, CAP_TS6, NOCAPS,
953	>	sendto_server(from->from, CAP_TS6, NOCAPS,
954		":%s QUIT :%s", ID(source_p), comment);
955	<	sendto_server(from->from, NULL, NOCAPS, CAP_TS6,
955	>	sendto_server(from->from, NOCAPS, CAP_TS6,
956		":%s QUIT :%s", source_p->name, comment);
957		}
958
#	Line 1061 | Line 998 | dead_link_on_write(struct Client *client
998		void
999		dead_link_on_read(struct Client *client_p, int error)
1000		{
1001	<	char errmsg[255];
1001	>	char errmsg[IRCD_BUFSIZE];
1002		int current_error;
1003
1004		if (IsDefunct(client_p))
#	Line 1074 | 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: %s",
1034	<	get_client_name(client_p, SHOW_IP), current_error);
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);
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)
#	Line 1131 | 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 1145 | 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		}
#	Line 1173 | Line 1110 | del_accept(struct split_nuh_item *accept
1110
1111		struct split_nuh_item *
1112		find_accept(const char *nick, const char *user,
1113	<	const char *host, struct Client *client_p, int do_match)
1113	>	const char *host, struct Client *client_p,
1114	>	int (*cmpfunc)(const char *, const char *))
1115		{
1116		dlink_node *ptr = NULL;
1179	–	/* XXX We wouldn't need that if match() would return 0 on match */
1180	–	int (*cmpfunc)(const char *, const char *) = do_match ? match : irccmp;
1117
1118		DLINK_FOREACH(ptr, client_p->localClient->acceptlist.head)
1119		{
1120		struct split_nuh_item *accept_p = ptr->data;
1121
1122	<	if (cmpfunc(accept_p->nickptr, nick) == do_match &&
1123	<	cmpfunc(accept_p->userptr, user) == do_match &&
1124	<	cmpfunc(accept_p->hostptr, host) == do_match)
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
#	Line 1206 | Line 1142 | accept_message(struct Client *source,
1142		dlink_node *ptr = NULL;
1143
1144		if (source == target || find_accept(source->name, source->username,
1145	<	source->host, target, 1))
1145	>	source->host, target, match))
1146		return 1;
1147
1148		if (HasUMode(target, UMODE_SOFTCALLERID))
#	Line 1231 | Line 1167 | del_all_accepts(struct Client *client_p)
1167		DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->acceptlist.head)
1168		del_accept(ptr->data, client_p);
1169		}
1170	+
1171	+	unsigned int
1172	+	idle_time_get(const struct Client *source_p, const struct Client *target_p)
1173	+	{
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	+	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	+	min_idle = class->min_idle;
1186	+	max_idle = class->max_idle;
1187	+
1188	+	if (min_idle == max_idle)
1189	+	return min_idle;
1190	+
1191	+	if (class->flags & CLASS_FLAGS_RANDOM_IDLE)
1192	+	idle = genrand_int32();
1193	+	else
1194	+	idle = CurrentTime - target_p->localClient->last_privmsg;
1195	+
1196	+	if (max_idle == 0)
1197	+	idle = 0;
1198	+	else
1199	+	idle %= max_idle;
1200	+
1201	+	if (idle < min_idle)
1202	+	idle = min_idle + (idle % (max_idle - min_idle));
1203	+
1204	+	return idle;
1205	+	}

Diff Legend

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