ViewVC Help

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

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

Comparing ircd-hybrid/trunk/src/client.c (file contents):
Revision 4428 by michael, Thu Aug 7 17:46:02 2014 UTC vs.
Revision 6375 by michael, Fri Aug 21 10:34:16 2015 UTC

#	Line 1 | Line 1
1		/*
2		*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (c) 1997-2014 ircd-hybrid development team
4	>	*  Copyright (c) 1997-2015 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 15 | Line 15
15		*
16		*  You should have received a copy of the GNU General Public License
17		*  along with this program; if not, write to the Free Software
18	<	*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
18	>	*  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
19		*  USA
20		*/
21
#	Line 60 | Line 60 | dlink_list global_client_list;
60		dlink_list global_server_list;
61		dlink_list oper_list;
62
63	<	static mp_pool_t *client_pool, *lclient_pool;
63	>	static mp_pool_t *client_pool, *connection_pool;
64		static dlink_list dead_list, abort_list;
65		static dlink_node *eac_next;  /* next aborted client to exit */
66
#	Line 83 | Line 83 | static dlink_node *eac_next;  /* next ab
83		struct Client *
84		make_client(struct Client *from)
85		{
86	<	struct Client *client_p = mp_pool_get(client_pool);
86	>	struct Client *const client_p = mp_pool_get(client_pool);
87
88		if (!from)
89		{
90	<	client_p->from                      = client_p; /* 'from' of local client is self! */
91	<	client_p->localClient               = mp_pool_get(lclient_pool);
92	<	client_p->localClient->since        = CurrentTime;
93	<	client_p->localClient->lasttime     = CurrentTime;
94	<	client_p->localClient->firsttime    = CurrentTime;
95	<	client_p->localClient->registration = REG_INIT;
90	>	client_p->from = client_p;  /* 'from' of local client is self! */
91	>	client_p->connection = mp_pool_get(connection_pool);
92	>	client_p->connection->since = CurrentTime;
93	>	client_p->connection->lasttime = CurrentTime;
94	>	client_p->connection->firsttime = CurrentTime;
95	>	client_p->connection->registration = REG_INIT;
96
97		/* as good a place as any... */
98	<	dlinkAdd(client_p, &client_p->localClient->lclient_node, &unknown_list);
98	>	dlinkAdd(client_p, &client_p->connection->lclient_node, &unknown_list);
99		}
100		else
101	<	client_p->from = from; /* 'from' of local client is self! */
101	>	client_p->from = from;
102
103		client_p->idhnext = client_p;
104	<	client_p->hnext  = client_p;
104	>	client_p->hnext = client_p;
105		SetUnknown(client_p);
106		strcpy(client_p->username, "unknown");
107	<	strcpy(client_p->svid, "0");
107	>	strcpy(client_p->account, "*");
108
109		return client_p;
110		}
#	Line 119 | Line 119 | make_client(struct Client *from)
119		static void
120		free_client(struct Client *client_p)
121		{
122	–	assert(client_p);
122		assert(client_p != &me);
123		assert(client_p->hnext == client_p);
124		assert(client_p->idhnext == client_p);
125		assert(client_p->channel.head == NULL);
126		assert(dlink_list_length(&client_p->channel) == 0);
127		assert(dlink_list_length(&client_p->whowas) == 0);
128	<	assert(!IsServer(client_p) || client_p->serv);
128	>	assert(dlink_list_length(&client_p->svstags) == 0);
129
130		MyFree(client_p->serv);
131		MyFree(client_p->certfp);
132
133		if (MyConnect(client_p))
134		{
135	<	assert(client_p->localClient->invited.head == NULL);
136	<	assert(dlink_list_length(&client_p->localClient->invited) == 0);
137	<	assert(dlink_list_length(&client_p->localClient->watches) == 0);
135	>	assert(client_p->connection->invited.head == NULL);
136	>	assert(dlink_list_length(&client_p->connection->invited) == 0);
137	>	assert(dlink_list_length(&client_p->connection->watches) == 0);
138		assert(IsClosing(client_p) && IsDead(client_p));
139
140	<	MyFree(client_p->localClient->response);
141	<	MyFree(client_p->localClient->auth_oper);
140	>	MyFree(client_p->connection->challenge_response);
141	>	client_p->connection->challenge_response = NULL;
142	>	MyFree(client_p->connection->challenge_operator);
143	>	client_p->connection->challenge_operator = NULL;
144
145		/*
146	<	* clean up extra sockets from P-lines which have been discarded.
146	>	* Clean up extra sockets from listen {} blocks which have been discarded.
147		*/
148	<	if (client_p->localClient->listener)
148	>	if (client_p->connection->listener)
149		{
150	<	listener_release(client_p->localClient->listener);
151	<	client_p->localClient->listener = NULL;
150	>	listener_release(client_p->connection->listener);
151	>	client_p->connection->listener = NULL;
152		}
153
154	<	dbuf_clear(&client_p->localClient->buf_recvq);
155	<	dbuf_clear(&client_p->localClient->buf_sendq);
154	>	dbuf_clear(&client_p->connection->buf_recvq);
155	>	dbuf_clear(&client_p->connection->buf_sendq);
156
157	<	mp_pool_release(client_p->localClient);
157	>	mp_pool_release(client_p->connection);
158		}
159
160		mp_pool_release(client_p);
161		}
162
163	+	void
164	+	client_attach_svstag(struct Client *client_p, unsigned int numeric,
165	+	const char *umodes, const char *const tag)
166	+	{
167	+	struct ServicesTag *svstag = NULL;
168	+	const struct user_modes *tab = NULL;
169	+
170	+	if (numeric >= ERR_LAST_ERR_MSG || *umodes != '+')
171	+	return;
172	+
173	+	svstag = MyCalloc(sizeof(*svstag));
174	+	svstag->numeric = numeric;
175	+	svstag->tag = xstrdup(tag);
176	+
177	+	for (const char *m = umodes + 1; *m; ++m)
178	+	if ((tab = umode_map[(unsigned char)*m]))
179	+	svstag->umodes |= tab->flag;
180	+
181	+	if (numeric != RPL_WHOISOPERATOR)
182	+	dlinkAddTail(svstag, &svstag->node, &client_p->svstags);
183	+	else
184	+	dlinkAdd(svstag, &svstag->node, &client_p->svstags);
185	+	}
186	+
187	+	void
188	+	client_clear_svstags(struct Client *client_p)
189	+	{
190	+	dlink_node *node = NULL, *node_next = NULL;
191	+
192	+	DLINK_FOREACH_SAFE(node, node_next, client_p->svstags.head)
193	+	{
194	+	struct ServicesTag *svstag = node->data;
195	+
196	+	dlinkDelete(&svstag->node, &client_p->svstags);
197	+	MyFree(svstag->tag);
198	+	MyFree(svstag);
199	+	}
200	+	}
201	+
202		/* check_pings_list()
203		*
204		* inputs       - pointer to list to check
#	Line 170 | Line 210 | check_pings_list(dlink_list *list)
210		{
211		char buf[IRCD_BUFSIZE] = "";
212		int ping = 0;      /* ping time value from client */
213	<	dlink_node *ptr = NULL, *ptr_next = NULL;
213	>	dlink_node *node = NULL, *node_next = NULL;
214
215	<	DLINK_FOREACH_SAFE(ptr, ptr_next, list->head)
215	>	DLINK_FOREACH_SAFE(node, node_next, list->head)
216		{
217	<	struct Client *client_p = ptr->data;
217	>	struct Client *client_p = node->data;
218
219		if (IsDead(client_p))
220		continue;  /* Ignore it, its been exited already */
221
222	<	if (!IsRegistered(client_p))
223	<	ping = CONNECTTIMEOUT;
222	>	if (IsClient(client_p) || IsServer(client_p))
223	>	ping = get_client_ping(&client_p->connection->confs);
224		else
225	<	ping = get_client_ping(&client_p->localClient->confs);
225	>	ping = CONNECTTIMEOUT;
226
227	<	if (ping < CurrentTime - client_p->localClient->lasttime)
227	>	if (ping < CurrentTime - client_p->connection->lasttime)
228		{
229	<	if (!IsPingSent(client_p))
229	>	if (!HasFlag(client_p, FLAGS_PINGSENT))
230		{
231		/*
232		* If we haven't PINGed the connection and we haven't
233		* heard from it in a while, PING it to make sure
234		* it is still alive.
235		*/
236	<	SetPingSent(client_p);
237	<	client_p->localClient->lasttime = CurrentTime - ping;
236	>	AddFlag(client_p, FLAGS_PINGSENT);
237	>	client_p->connection->lasttime = CurrentTime - ping;
238		sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
239		}
240		else
241		{
242	<	if (CurrentTime - client_p->localClient->lasttime >= 2 * ping)
242	>	if (CurrentTime - client_p->connection->lasttime >= 2 * ping)
243		{
244		/*
245		* If the client/server hasn't talked to us in 2*ping seconds
#	Line 207 | Line 247 | check_pings_list(dlink_list *list)
247		*/
248		if (IsServer(client_p) || IsHandshake(client_p))
249		{
250	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
250	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
251		"No response from %s, closing link",
252		get_client_name(client_p, HIDE_IP));
253	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
253	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
254		"No response from %s, closing link",
255		get_client_name(client_p, MASK_IP));
256		ilog(LOG_TYPE_IRCD, "No response from %s, closing link",
#	Line 218 | Line 258 | check_pings_list(dlink_list *list)
258		}
259
260		snprintf(buf, sizeof(buf), "Ping timeout: %d seconds",
261	<	(int)(CurrentTime - client_p->localClient->lasttime));
261	>	(int)(CurrentTime - client_p->connection->lasttime));
262		exit_client(client_p, buf);
263		}
264		}
#	Line 235 | Line 275 | check_pings_list(dlink_list *list)
275		static void
276		check_unknowns_list(void)
277		{
278	<	dlink_node *ptr = NULL, *ptr_next = NULL;
278	>	dlink_node *node = NULL, *node_next = NULL;
279
280	<	DLINK_FOREACH_SAFE(ptr, ptr_next, unknown_list.head)
280	>	DLINK_FOREACH_SAFE(node, node_next, unknown_list.head)
281		{
282	<	struct Client *client_p = ptr->data;
282	>	struct Client *client_p = node->data;
283
284		/*
285		* Check UNKNOWN connections - if they have been in this state
286		* for > 30s, close them.
287		*/
288	<	if (IsAuthFinished(client_p) && (CurrentTime - client_p->localClient->firsttime) > 30)
288	>	if (IsAuthFinished(client_p) && (CurrentTime - client_p->connection->firsttime) > 30)
289		exit_client(client_p, "Registration timed out");
290		}
291		}
#	Line 277 | Line 317 | check_unknowns_list(void)
317		*/
318
319		static void
320	<	check_pings(void *notused)
320	>	check_pings(void *unused)
321		{
322		check_pings_list(&local_client_list);
323		check_pings_list(&local_server_list);
#	Line 295 | Line 335 | void
335		check_conf_klines(void)
336		{
337		struct MaskItem *conf = NULL;
338	<	dlink_node *ptr = NULL, *ptr_next = NULL;
338	>	dlink_node *node = NULL, *node_next = NULL;
339
340	<	DLINK_FOREACH_SAFE(ptr, ptr_next, local_client_list.head)
340	>	DLINK_FOREACH_SAFE(node, node_next, local_client_list.head)
341		{
342	<	struct Client *client_p = ptr->data;
342	>	struct Client *client_p = node->data;
343
344	<	/* If a client is already being exited
345	<	*/
306	<	if (IsDead(client_p) || !IsClient(client_p))
344	>	/* If a client is already being exited */
345	>	if (IsDead(client_p))
346		continue;
347
348	<	if ((conf = find_conf_by_address(NULL, &client_p->localClient->ip, CONF_DLINE,
349	<	client_p->localClient->aftype, NULL, NULL, 1)))
348	>	if ((conf = find_conf_by_address(NULL, &client_p->connection->ip, CONF_DLINE,
349	>	client_p->connection->aftype, NULL, NULL, 1)))
350		{
351		conf_try_ban(client_p, conf);
352	<	continue; /* and go examine next fd/client_p */
352	>	continue;  /* and go examine next Client */
353		}
354
355	<	if (ConfigGeneral.glines)
356	<	{
318	<	if ((conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
319	<	CONF_GLINE, client_p->localClient->aftype,
320	<	client_p->username, NULL, 1)))
321	<	{
322	<	conf_try_ban(client_p, conf);
323	<	/* and go examine next fd/client_p */
324	<	continue;
325	<	}
326	<	}
327	<
328	<	if ((conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
329	<	CONF_KLINE, client_p->localClient->aftype,
355	>	if ((conf = find_conf_by_address(client_p->host, &client_p->connection->ip,
356	>	CONF_KLINE, client_p->connection->aftype,
357		client_p->username, NULL, 1)))
358		{
359		conf_try_ban(client_p, conf);
360	<	continue;
360	>	continue;  /* and go examine next Client */
361		}
362
363	<	if ((conf = find_matching_name_conf(CONF_XLINE,  client_p->info,
363	>	if ((conf = find_matching_name_conf(CONF_XLINE, client_p->info,
364		NULL, NULL, 0)))
365		{
366		conf_try_ban(client_p, conf);
367	<	continue;
367	>	continue;  /* and go examine next Client */
368		}
369		}
370
371	<	/* also check the unknowns list for new dlines */
372	<	DLINK_FOREACH_SAFE(ptr, ptr_next, unknown_list.head)
371	>	/* Also check the unknowns list for new dlines */
372	>	DLINK_FOREACH_SAFE(node, node_next, unknown_list.head)
373		{
374	<	struct Client *client_p = ptr->data;
374	>	struct Client *client_p = node->data;
375
376	<	if ((conf = find_conf_by_address(NULL, &client_p->localClient->ip, CONF_DLINE,
377	<	client_p->localClient->aftype, NULL, NULL, 1)))
376	>	if ((conf = find_conf_by_address(NULL, &client_p->connection->ip, CONF_DLINE,
377	>	client_p->connection->aftype, NULL, NULL, 1)))
378		{
379		conf_try_ban(client_p, conf);
380	<	continue; /* and go examine next fd/client_p */
380	>	continue;  /* and go examine next Client */
381		}
382		}
383		}
#	Line 366 | Line 393 | check_conf_klines(void)
393		void
394		conf_try_ban(struct Client *client_p, struct MaskItem *conf)
395		{
396	<	const char *user_reason = NULL;  /* What is sent to user */
370	<	const char *type_string = NULL;
371	<	const char dline_string[] = "D-line";
372	<	const char kline_string[] = "K-line";
373	<	const char gline_string[] = "G-line";
374	<	const char xline_string[] = "X-line";
396	>	char ban_type = '\0';
397
398		switch (conf->type)
399		{
400		case CONF_KLINE:
401	<	if (IsExemptKline(client_p))
401	>	if (HasFlag(client_p, FLAGS_EXEMPTKLINE))
402		{
403	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
403	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
404		"KLINE over-ruled for %s, client is kline_exempt",
405		get_client_name(client_p, HIDE_IP));
406		return;
407		}
408
409	<	type_string = kline_string;
409	>	ban_type = 'K';
410		break;
411		case CONF_DLINE:
412	<	if (find_conf_by_address(NULL, &client_p->localClient->ip, CONF_EXEMPT,
413	<	client_p->localClient->aftype, NULL, NULL, 1))
412	>	if (find_conf_by_address(NULL, &client_p->connection->ip, CONF_EXEMPT,
413	>	client_p->connection->aftype, NULL, NULL, 1))
414		return;
415	<	type_string = dline_string;
415	>	ban_type = 'D';
416		break;
417	<	case CONF_GLINE:
418	<	if (IsExemptKline(client_p) ||
397	<	IsExemptGline(client_p))
417	>	case CONF_XLINE:
418	>	if (HasFlag(client_p, FLAGS_EXEMPTXLINE))
419		{
420	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
421	<	"GLINE over-ruled for %s, client is %sline_exempt",
422	<	get_client_name(client_p, HIDE_IP), IsExemptKline(client_p) ? "k" : "g");
420	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
421	>	"XLINE over-ruled for %s, client is xline_exempt",
422	>	get_client_name(client_p, HIDE_IP));
423		return;
424		}
425
426	<	type_string = gline_string;
406	<	break;
407	<	case CONF_XLINE:
408	<	type_string = xline_string;
426	>	ban_type = 'X';
427		++conf->count;
428		break;
429		default:
#	Line 413 | Line 431 | conf_try_ban(struct Client *client_p, st
431		break;
432		}
433
434	<	user_reason = conf->reason ? conf->reason : type_string;
435	<
418	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s active for %s",
419	<	type_string, get_client_name(client_p, HIDE_IP));
434	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE, "%c-line active for %s",
435	>	ban_type, get_client_name(client_p, HIDE_IP));
436
437		if (IsClient(client_p))
438	<	sendto_one_numeric(client_p, &me, ERR_YOUREBANNEDCREEP, user_reason);
438	>	sendto_one_numeric(client_p, &me, ERR_YOUREBANNEDCREEP, conf->reason);
439
440	<	exit_client(client_p, user_reason);
440	>	exit_client(client_p, conf->reason);
441		}
442
443		/* update_client_exit_stats()
#	Line 436 | Line 452 | update_client_exit_stats(struct Client *
452		if (IsClient(client_p))
453		{
454		assert(Count.total > 0);
455	+
456		--Count.total;
457		if (HasUMode(client_p, UMODE_OPER))
458		--Count.oper;
#	Line 446 | Line 463 | update_client_exit_stats(struct Client *
463		sendto_realops_flags(UMODE_EXTERNAL, L_ALL, SEND_NOTICE,
464		"Server %s split from %s",
465		client_p->name, client_p->servptr->name);
449	–
450	–	if (splitchecking && !splitmode)
451	–	check_splitmode(NULL);
466		}
467
468		/* find_person()
#	Line 481 | Line 495 | find_person(const struct Client *const s
495		struct Client *
496		find_chasing(struct Client *source_p, const char *name)
497		{
498	<	struct Client *who = find_person(source_p, name);
498	>	struct Client *target_p = find_person(source_p, name);
499
500	<	if (who)
501	<	return who;
500	>	if (target_p)
501	>	return target_p;
502
503		if (IsDigit(*name))
504		return NULL;
505
506	<	if ((who = whowas_get_history(name,
507	<	(time_t)ConfigGeneral.kill_chase_time_limit))
508	<	== NULL)
506	>	target_p = whowas_get_history(name, (time_t)ConfigGeneral.kill_chase_time_limit);
507	>
508	>	if (!target_p)
509		{
510		sendto_one_numeric(source_p, &me, ERR_NOSUCHNICK, name);
511		return NULL;
512		}
513
514	<	return who;
514	>	return target_p;
515		}
516
517		/*
#	Line 523 | Line 537 | get_client_name(const struct Client *cli
537		{
538		static char buf[HOSTLEN * 2 + USERLEN + 5];
539
526	–	assert(client_p);
527	–
540		if (!MyConnect(client_p))
541		return client_p->name;
542
#	Line 536 | Line 548 | get_client_name(const struct Client *cli
548		type = MASK_IP;
549		}
550
539	–	if (ConfigGeneral.hide_spoof_ips)
540	–	if (IsIPSpoof(client_p) && type == SHOW_IP)
541	–	type = MASK_IP;
542	–
551		/* And finally, let's get the host information, ip or name */
552		switch (type)
553		{
#	Line 549 | Line 557 | get_client_name(const struct Client *cli
557		client_p->username, client_p->sockhost);
558		break;
559		case MASK_IP:
560	<	if (client_p->localClient->aftype == AF_INET)
560	>	if (client_p->connection->aftype == AF_INET)
561		snprintf(buf, sizeof(buf), "%s[%s@255.255.255.255]",
562		client_p->name, client_p->username);
563		else
564		snprintf(buf, sizeof(buf), "%s[%s@ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]",
565		client_p->name, client_p->username);
566		break;
567	<	default:
567	>	default:  /* HIDE_IP */
568		snprintf(buf, sizeof(buf), "%s[%s@%s]",
569		client_p->name,
570		client_p->username, client_p->host);
#	Line 568 | Line 576 | get_client_name(const struct Client *cli
576		void
577		free_exited_clients(void)
578		{
579	<	dlink_node *ptr = NULL, *next = NULL;
579	>	dlink_node *node = NULL, *node_next = NULL;
580
581	<	DLINK_FOREACH_SAFE(ptr, next, dead_list.head)
581	>	DLINK_FOREACH_SAFE(node, node_next, dead_list.head)
582		{
583	<	free_client(ptr->data);
584	<	dlinkDelete(ptr, &dead_list);
585	<	free_dlink_node(ptr);
583	>	free_client(node->data);
584	>	dlinkDelete(node, &dead_list);
585	>	free_dlink_node(node);
586		}
587		}
588
#	Line 587 | Line 595 | free_exited_clients(void)
595		static void
596		exit_one_client(struct Client *source_p, const char *comment)
597		{
598	<	dlink_node *ptr = NULL, *ptr_next = NULL;
598	>	dlink_node *node = NULL, *node_next = NULL;
599
600		assert(!IsMe(source_p));
601		assert(source_p != &me);
#	Line 606 | Line 614 | exit_one_client(struct Client *source_p,
614		sendto_common_channels_local(source_p, 0, 0, ":%s!%s@%s QUIT :%s",
615		source_p->name, source_p->username,
616		source_p->host, comment);
617	<	DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->channel.head)
618	<	remove_user_from_channel(ptr->data);
617	>
618	>	DLINK_FOREACH_SAFE(node, node_next, source_p->channel.head)
619	>	remove_user_from_channel(node->data);
620
621		whowas_add_history(source_p, 0);
622		whowas_off_history(source_p);
#	Line 616 | Line 625 | exit_one_client(struct Client *source_p,
625
626		if (MyConnect(source_p))
627		{
628	<	/* Clean up invitefield */
620	<	DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->localClient->invited.head)
621	<	del_invite(ptr->data, source_p);
622	<
628	>	clear_invites_client(source_p);
629		del_all_accepts(source_p);
630		}
631		}
#	Line 628 | Line 634 | exit_one_client(struct Client *source_p,
634		dlinkDelete(&source_p->lnode, &source_p->servptr->serv->server_list);
635		dlinkDelete(&source_p->node, &global_client_list);
636
637	<	if ((ptr = dlinkFindDelete(&global_server_list, source_p)))
638	<	free_dlink_node(ptr);
637	>	if ((node = dlinkFindDelete(&global_server_list, source_p)))
638	>	free_dlink_node(node);
639		}
640
641		/* Remove source_p from the client lists */
642		if (source_p->id[0])
643		hash_del_id(source_p);
644	+
645		if (source_p->name[0])
646		hash_del_client(source_p);
647
648	<	if (IsUserHostIp(source_p))
648	>	if (HasFlag(source_p, FLAGS_USERHOST))
649		delete_user_host(source_p->username, source_p->host, !MyConnect(source_p));
650
651		update_client_exit_stats(source_p);
#	Line 660 | Line 667 | exit_one_client(struct Client *source_p,
667		static void
668		recurse_remove_clients(struct Client *source_p, const char *comment)
669		{
670	<	dlink_node *ptr = NULL, *ptr_next = NULL;
670	>	dlink_node *node = NULL, *node_next = NULL;
671
672	<	DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->serv->client_list.head)
673	<	exit_one_client(ptr->data, comment);
672	>	DLINK_FOREACH_SAFE(node, node_next, source_p->serv->client_list.head)
673	>	exit_one_client(node->data, comment);
674
675	<	DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->serv->server_list.head)
675	>	DLINK_FOREACH_SAFE(node, node_next, source_p->serv->server_list.head)
676		{
677	<	recurse_remove_clients(ptr->data, comment);
678	<	exit_one_client(ptr->data, comment);
677	>	recurse_remove_clients(node->data, comment);
678	>	exit_one_client(node->data, comment);
679		}
680		}
681
#	Line 692 | Line 699 | recurse_remove_clients(struct Client *so
699		void
700		exit_client(struct Client *source_p, const char *comment)
701		{
702	<	dlink_node *m = NULL;
702	>	dlink_node *node = NULL;
703
704		assert(!IsMe(source_p));
705		assert(source_p != &me);
#	Line 710 | Line 717 | exit_client(struct Client *source_p, con
717		if (HasFlag(source_p, FLAGS_IPHASH))
718		{
719		DelFlag(source_p, FLAGS_IPHASH);
720	<	ipcache_remove_address(&source_p->localClient->ip);
720	>	ipcache_remove_address(&source_p->connection->ip);
721		}
722
723	<	delete_auth(&source_p->localClient->auth);
723	>	delete_auth(&source_p->connection->auth);
724
725	<	/*
719	<	* This source_p could have status of one of STAT_UNKNOWN, STAT_CONNECTING
720	<	* STAT_HANDSHAKE or STAT_UNKNOWN
721	<	* all of which are lumped together into unknown_list
722	<	*
723	<	* In all above cases IsRegistered() will not be true.
724	<	*/
725	<	if (!IsRegistered(source_p))
725	>	if (IsClient(source_p))
726		{
727	<	assert(dlinkFind(&unknown_list, source_p));
727	>	time_t on_for = CurrentTime - source_p->connection->firsttime;
728
729	–	dlinkDelete(&source_p->localClient->lclient_node, &unknown_list);
730	–	}
731	–	else if (IsClient(source_p))
732	–	{
733	–	time_t on_for = CurrentTime - source_p->localClient->firsttime;
729		assert(Count.local > 0);
730	<	Count.local--;
730	>
731	>	--Count.local;
732
733		if (HasUMode(source_p, UMODE_OPER))
734	<	if ((m = dlinkFindDelete(&oper_list, source_p)))
735	<	free_dlink_node(m);
734	>	if ((node = dlinkFindDelete(&oper_list, source_p)))
735	>	free_dlink_node(node);
736
737		assert(dlinkFind(&local_client_list, source_p));
738	<	dlinkDelete(&source_p->localClient->lclient_node, &local_client_list);
738	>	dlinkDelete(&source_p->connection->lclient_node, &local_client_list);
739
740	<	if (source_p->localClient->list_task)
740	>	if (source_p->connection->list_task)
741		free_list_task(source_p);
742
743		watch_del_watch_list(source_p);
744	+	client_clear_svstags(source_p);
745	+
746		sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
747		"Client exiting: %s (%s@%s) [%s] [%s]",
748		source_p->name, source_p->username, source_p->host, comment,
749	<	ConfigGeneral.hide_spoof_ips && IsIPSpoof(source_p) ?
750	<	"255.255.255.255" : source_p->sockhost);
749	>	source_p->sockhost);
750	>
751		ilog(LOG_TYPE_USER, "%s (%3u:%02u:%02u): %s!%s@%s %llu/%llu",
752	<	myctime(source_p->localClient->firsttime), (unsigned int)(on_for / 3600),
752	>	myctime(source_p->connection->firsttime), (unsigned int)(on_for / 3600),
753		(unsigned int)((on_for % 3600)/60), (unsigned int)(on_for % 60),
754		source_p->name, source_p->username, source_p->host,
755	<	source_p->localClient->send.bytes>>10,
756	<	source_p->localClient->recv.bytes>>10);
755	>	source_p->connection->send.bytes>>10,
756	>	source_p->connection->recv.bytes>>10);
757		}
758		else if (IsServer(source_p))
759		{
760		assert(Count.myserver > 0);
761	+
762		--Count.myserver;
763
764		assert(dlinkFind(&local_server_list, source_p));
765	<	dlinkDelete(&source_p->localClient->lclient_node, &local_server_list);
765	>	dlinkDelete(&source_p->connection->lclient_node, &local_server_list);
766	>	}
767	>	else
768	>	{
769	>	assert(dlinkFind(&unknown_list, source_p));
770	>	dlinkDelete(&source_p->connection->lclient_node, &unknown_list);
771		}
772
773		if (!IsDead(source_p))
#	Line 794 | Line 798 | exit_client(struct Client *source_p, con
798		{
799		char splitstr[HOSTLEN + HOSTLEN + 2] = "";
800
801	<	/* This shouldn't ever happen */
802	<	assert(source_p->serv && source_p->servptr);
801	>	assert(source_p->serv);
802	>	assert(source_p->servptr);
803
804		if (ConfigServerHide.hide_servers)
805		/*
#	Line 809 | Line 813 | exit_client(struct Client *source_p, con
813
814		/* Send SQUIT for source_p in every direction. source_p is already off of local_server_list here */
815		if (!HasFlag(source_p, FLAGS_SQUIT))
816	<	sendto_server(NULL, NOCAPS, NOCAPS, "SQUIT %s :%s", source_p->id, comment);
816	>	sendto_server(NULL, 0, 0, "SQUIT %s :%s", source_p->id, comment);
817
818		/* Now exit the clients internally */
819		recurse_remove_clients(source_p, splitstr);
820
821		if (MyConnect(source_p))
822		{
823	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
824	<	"%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
825	<	source_p->name, (int)(CurrentTime - source_p->localClient->firsttime),
826	<	source_p->localClient->send.bytes >> 10,
827	<	source_p->localClient->recv.bytes >> 10);
828	<	ilog(LOG_TYPE_IRCD, "%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
829	<	source_p->name, (int)(CurrentTime - source_p->localClient->firsttime),
830	<	source_p->localClient->send.bytes >> 10,
831	<	source_p->localClient->recv.bytes >> 10);
823	>	int connected = CurrentTime - source_p->connection->firsttime;
824	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
825	>	"%s was connected for %d day%s, %2d:%02d:%02d. %llu/%llu sendK/recvK.",
826	>	source_p->name, connected/86400, (connected/86400 == 1) ? "" : "s",
827	>	(connected % 86400) / 3600, (connected % 3600) / 60, connected % 60,
828	>	source_p->connection->send.bytes >> 10,
829	>	source_p->connection->recv.bytes >> 10);
830	>	ilog(LOG_TYPE_IRCD, "%s was connected for %d day%s, %2d:%02d:%02d. %llu/%llu sendK/recvK.",
831	>	source_p->name, connected/86400, (connected/86400 == 1) ? "" : "s",
832	>	(connected % 86400) / 3600, (connected % 3600) / 60, connected % 60,
833	>	source_p->connection->send.bytes >> 10,
834	>	source_p->connection->recv.bytes >> 10);
835		}
836		}
837		else if (IsClient(source_p) && !HasFlag(source_p, FLAGS_KILLED))
838	<	sendto_server(source_p->from, NOCAPS, NOCAPS, ":%s QUIT :%s",
838	>	sendto_server(source_p->from, 0, 0, ":%s QUIT :%s",
839		source_p->id, comment);
840
841		/* The client *better* be off all of the lists */
#	Line 847 | Line 854 | exit_client(struct Client *source_p, con
854		void
855		dead_link_on_write(struct Client *client_p, int ierrno)
856		{
857	<	dlink_node *ptr;
857	>	dlink_node *node;
858
859		if (IsDefunct(client_p))
860		return;
861
862	<	dbuf_clear(&client_p->localClient->buf_recvq);
863	<	dbuf_clear(&client_p->localClient->buf_sendq);
862	>	dbuf_clear(&client_p->connection->buf_recvq);
863	>	dbuf_clear(&client_p->connection->buf_sendq);
864
865		assert(dlinkFind(&abort_list, client_p) == NULL);
866	<	ptr = make_dlink_node();
866	>	node = make_dlink_node();
867		/* don't let exit_aborted_clients() finish yet */
868	<	dlinkAddTail(client_p, ptr, &abort_list);
868	>	dlinkAddTail(client_p, node, &abort_list);
869
870		if (eac_next == NULL)
871	<	eac_next = ptr;
871	>	eac_next = node;
872
873		SetDead(client_p); /* You are dead my friend */
874		}
#	Line 879 | Line 886 | dead_link_on_read(struct Client *client_
886		if (IsDefunct(client_p))
887		return;
888
889	<	dbuf_clear(&client_p->localClient->buf_recvq);
890	<	dbuf_clear(&client_p->localClient->buf_sendq);
889	>	dbuf_clear(&client_p->connection->buf_recvq);
890	>	dbuf_clear(&client_p->connection->buf_sendq);
891
892	<	current_error = get_sockerr(client_p->localClient->fd.fd);
892	>	current_error = get_sockerr(client_p->connection->fd.fd);
893
894		if (IsServer(client_p) || IsHandshake(client_p))
895		{
896	<	int connected = CurrentTime - client_p->localClient->firsttime;
896	>	int connected = CurrentTime - client_p->connection->firsttime;
897
898		if (error == 0)
899		{
900		/* Admins get the real IP */
901	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
901	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
902		"Server %s closed the connection",
903		get_client_name(client_p, SHOW_IP));
904
905		/* Opers get a masked IP */
906	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
906	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
907		"Server %s closed the connection",
908		get_client_name(client_p, MASK_IP));
909
#	Line 911 | Line 918 | dead_link_on_read(struct Client *client_
918		get_client_name(client_p, MASK_IP), current_error);
919		}
920
921	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
922	<	"%s had been connected for %d day%s, %2d:%02d:%02d",
921	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
922	>	"%s was connected for %d day%s, %2d:%02d:%02d",
923		client_p->name, connected/86400,
924		(connected/86400 == 1) ? "" : "s",
925		(connected % 86400) / 3600, (connected % 3600) / 60,
#	Line 943 | Line 950 | exit_aborted_clients(void)
950
951		if (target_p == NULL)
952		{
953	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
953	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
954		"Warning: null client on abort_list!");
955		dlinkDelete(ptr, &abort_list);
956		free_dlink_node(ptr);
#	Line 952 | Line 959 | exit_aborted_clients(void)
959
960		dlinkDelete(ptr, &abort_list);
961
962	<	if (IsSendQExceeded(target_p))
962	>	if (HasFlag(target_p, FLAGS_SENDQEX))
963		notice = "Max SendQ exceeded";
964		else
965		notice = "Write error: connection closed";
#	Line 975 | Line 982 | exit_aborted_clients(void)
982		void
983		del_accept(struct split_nuh_item *accept_p, struct Client *client_p)
984		{
985	<	dlinkDelete(&accept_p->node, &client_p->localClient->acceptlist);
985	>	dlinkDelete(&accept_p->node, &client_p->connection->acceptlist);
986
987		MyFree(accept_p->nickptr);
988		MyFree(accept_p->userptr);
#	Line 988 | Line 995 | find_accept(const char *nick, const char
995		const char *host, struct Client *client_p,
996		int (*cmpfunc)(const char *, const char *))
997		{
998	<	dlink_node *ptr = NULL;
998	>	dlink_node *node = NULL;
999
1000	<	DLINK_FOREACH(ptr, client_p->localClient->acceptlist.head)
1000	>	DLINK_FOREACH(node, client_p->connection->acceptlist.head)
1001		{
1002	<	struct split_nuh_item *accept_p = ptr->data;
1002	>	struct split_nuh_item *accept_p = node->data;
1003
1004		if (!cmpfunc(accept_p->nickptr, nick) &&
1005		!cmpfunc(accept_p->userptr, user) &&
#	Line 1014 | Line 1021 | int
1021		accept_message(struct Client *source,
1022		struct Client *target)
1023		{
1024	<	dlink_node *ptr = NULL;
1024	>	dlink_node *node = NULL;
1025	>
1026	>	if (HasFlag(source, FLAGS_SERVICE) ||
1027	>	(HasUMode(source, UMODE_OPER) && ConfigGeneral.opers_bypass_callerid))
1028	>	return 1;
1029
1030		if (source == target || find_accept(source->name, source->username,
1031		source->host, target, match))
1032		return 1;
1033
1034	<	if (HasUMode(target, UMODE_SOFTCALLERID))
1035	<	DLINK_FOREACH(ptr, target->channel.head)
1036	<	if (IsMember(source, ((struct Membership *)ptr->data)->chptr))
1034	>	if (!HasUMode(target, UMODE_CALLERID) && HasUMode(target, UMODE_SOFTCALLERID))
1035	>	DLINK_FOREACH(node, target->channel.head)
1036	>	if (IsMember(source, ((struct Membership *)node->data)->chptr))
1037		return 1;
1038
1039		return 0;
#	Line 1037 | Line 1048 | accept_message(struct Client *source,
1048		void
1049		del_all_accepts(struct Client *client_p)
1050		{
1051	<	dlink_node *ptr = NULL, *ptr_next = NULL;
1051	>	dlink_node *node = NULL, *node_next = NULL;
1052
1053	<	DLINK_FOREACH_SAFE(ptr, ptr_next, client_p->localClient->acceptlist.head)
1054	<	del_accept(ptr->data, client_p);
1053	>	DLINK_FOREACH_SAFE(node, node_next, client_p->connection->acceptlist.head)
1054	>	del_accept(node->data, client_p);
1055		}
1056
1057		unsigned int
1058	<	idle_time_get(const struct Client *source_p, const struct Client *target_p)
1058	>	client_get_idle_time(const struct Client *source_p,
1059	>	const struct Client *target_p)
1060		{
1061		unsigned int idle = 0;
1062		unsigned int min_idle = 0;
1063		unsigned int max_idle = 0;
1064	<	const struct ClassItem *class = get_class_ptr(&target_p->localClient->confs);
1064	>	const struct ClassItem *const class = get_class_ptr(&target_p->connection->confs);
1065
1066		if (!(class->flags & CLASS_FLAGS_FAKE_IDLE) || target_p == source_p)
1067	<	return CurrentTime - target_p->localClient->last_privmsg;
1067	>	return CurrentTime - target_p->connection->last_privmsg;
1068	>
1069		if (HasUMode(source_p, UMODE_OPER) &&
1070		!(class->flags & CLASS_FLAGS_HIDE_IDLE_FROM_OPERS))
1071	<	return CurrentTime - target_p->localClient->last_privmsg;
1071	>	return CurrentTime - target_p->connection->last_privmsg;
1072
1073		min_idle = class->min_idle;
1074		max_idle = class->max_idle;
#	Line 1066 | Line 1079 | idle_time_get(const struct Client *sourc
1079		if (class->flags & CLASS_FLAGS_RANDOM_IDLE)
1080		idle = genrand_int32();
1081		else
1082	<	idle = CurrentTime - target_p->localClient->last_privmsg;
1082	>	idle = CurrentTime - target_p->connection->last_privmsg;
1083
1084		if (!max_idle)
1085		idle = 0;
#	Line 1096 | Line 1109 | client_init(void)
1109		};
1110
1111		client_pool = mp_pool_new(sizeof(struct Client), MP_CHUNK_SIZE_CLIENT);
1112	<	lclient_pool = mp_pool_new(sizeof(struct LocalUser), MP_CHUNK_SIZE_LCLIENT);
1112	>	connection_pool = mp_pool_new(sizeof(struct Connection), MP_CHUNK_SIZE_CONNECTION);
1113		event_add(&event_ping, NULL);
1114		}

Diff Legend

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