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 3289 by michael, Wed Apr 9 19:50:19 2014 UTC vs.
Revision 5732 by michael, Sun Mar 29 10:57:50 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 32 | Line 32
32		#include "irc_string.h"
33		#include "ircd.h"
34		#include "numeric.h"
35	<	#include "s_auth.h"
35	>	#include "auth.h"
36		#include "s_bsd.h"
37		#include "conf.h"
38		#include "log.h"
39	<	#include "s_misc.h"
40	<	#include "s_serv.h"
39	>	#include "misc.h"
40	>	#include "server.h"
41		#include "send.h"
42		#include "whowas.h"
43	<	#include "s_user.h"
43	>	#include "user.h"
44		#include "memory.h"
45		#include "mempool.h"
46		#include "hostmask.h"
#	Line 49 | Line 49
49		#include "watch.h"
50		#include "rng_mt.h"
51		#include "parse.h"
52	+	#include "ipcache.h"
53
53	–	dlink_list listing_client_list = { NULL, NULL, 0 };
54	–	/* Pointer to beginning of Client list */
55	–	dlink_list global_client_list = {NULL, NULL, 0};
56	–	/* unknown/client pointer lists */
57	–	dlink_list unknown_list = {NULL, NULL, 0};
58	–	dlink_list local_client_list = {NULL, NULL, 0};
59	–	dlink_list serv_list = {NULL, NULL, 0};
60	–	dlink_list global_serv_list = {NULL, NULL, 0};
61	–	dlink_list oper_list = {NULL, NULL, 0};
54
55	<	static EVH check_pings;
56	<
57	<	static mp_pool_t *client_pool  = NULL;
58	<	static mp_pool_t *lclient_pool = NULL;
59	<
60	<	static dlink_list dead_list  = { NULL, NULL, 0};
61	<	static dlink_list abort_list = { NULL, NULL, 0};
55	>	dlink_list listing_client_list;
56	>	dlink_list unknown_list;
57	>	dlink_list local_client_list;
58	>	dlink_list local_server_list;
59	>	dlink_list global_client_list;
60	>	dlink_list global_server_list;
61	>	dlink_list oper_list;
62
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
73	–	static void check_pings_list(dlink_list *);
74	–	static void check_unknowns_list(void);
75	–
76	–
77	–	/* client_init()
78	–	*
79	–	* inputs       - NONE
80	–	* output       - NONE
81	–	* side effects - initialize client free memory
82	–	*/
83	–	void
84	–	client_init(void)
85	–	{
86	–	/* start off the check ping event ..  -- adrian
87	–	* Every 30 seconds is plenty -- db
88	–	*/
89	–	client_pool = mp_pool_new(sizeof(struct Client), MP_CHUNK_SIZE_CLIENT);
90	–	lclient_pool = mp_pool_new(sizeof(struct LocalUser), MP_CHUNK_SIZE_LCLIENT);
91	–	eventAdd("check_pings", check_pings, NULL, 5);
92	–	}
67
68		/*
69		* make_client - create a new Client struct and set it to initial state.
#	Line 109 | Line 83 | client_init(void)
83		struct Client *
84		make_client(struct Client *from)
85		{
86	<	struct Client *client_p = mp_pool_get(client_pool);
113	<
114	<	memset(client_p, 0, sizeof(*client_p));
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	<
93	<	memset(client_p->localClient, 0, sizeof(*client_p->localClient));
94	<
95	<	client_p->localClient->since        = CurrentTime;
124	<	client_p->localClient->lasttime     = CurrentTime;
125	<	client_p->localClient->firsttime    = CurrentTime;
126	<	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 150 | Line 119 | make_client(struct Client *from)
119		static void
120		free_client(struct Client *client_p)
121		{
153	–	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) || (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	<	assert(0 < client_p->localClient->listener->ref_count);
151	<	if (0 == --client_p->localClient->listener->ref_count &&
182	<	!client_p->localClient->listener->active)
183	<	free_listener(client_p->localClient->listener);
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	<	/*
164	<	* check_pings - go through the local client list and check activity
165	<	* kill off stuff that should die
166	<	*
167	<	* inputs       - NOT USED (from event)
168	<	* output       - next time_t when check_pings() should be called again
201	<	* side effects -
202	<	*
203	<	*
204	<	* A PING can be sent to clients as necessary.
205	<	*
206	<	* Client/Server ping outs are handled.
207	<	*/
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	<	/*
171	<	* Addon from adrian. We used to call this after nextping seconds,
211	<	* however I've changed it to run once a second. This is only for
212	<	* PING timeouts, not K/etc-line checks (thanks dianora!). Having it
213	<	* run once a second makes life a lot easier - when a new client connects
214	<	* and they need a ping in 4 seconds, if nextping was set to 20 seconds
215	<	* we end up waiting 20 seconds. This is stupid. :-)
216	<	* I will optimise (hah!) check_pings() once I've finished working on
217	<	* tidying up other network IO evilnesses.
218	<	*     -- adrian
219	<	*/
170	>	if (numeric >= ERR_LAST_ERR_MSG || *umodes != '+')
171	>	return;
172
173	<	static void
174	<	check_pings(void *notused)
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	<	check_pings_list(&local_client_list);
191	<	check_pings_list(&serv_list);
192	<	check_unknowns_list();
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()
#	Line 235 | Line 208 | check_pings(void *notused)
208		static void
209		check_pings_list(dlink_list *list)
210		{
211	<	char scratch[IRCD_BUFSIZE];
211	>	char buf[IRCD_BUFSIZE] = "";
212		int ping = 0;      /* ping time value from client */
213	<	dlink_node *ptr = NULL, *next_ptr = NULL;
213	>	dlink_node *node = NULL, *node_next = NULL;
214
215	<	DLINK_FOREACH_SAFE(ptr, next_ptr, 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
246	–	/*
247	–	** Note: No need to notify opers here. It's
248	–	** already done when "FLAGS_DEADSOCKET" is set.
249	–	*/
219		if (IsDead(client_p))
220	<	{
252	<	/* Ignore it, its been exited already */
253	<	continue;
254	<	}
220	>	continue;  /* Ignore it, its been exited already */
221
222		if (!IsRegistered(client_p))
223		ping = CONNECTTIMEOUT;
224		else
225	<	ping = get_client_ping(&client_p->localClient->confs);
225	>	ping = get_client_ping(&client_p->connection->confs);
226
227	<	if (ping < CurrentTime - client_p->localClient->lasttime)
227	>	if (ping < CurrentTime - client_p->connection->lasttime)
228		{
229		if (!IsPingSent(client_p))
230		{
231		/*
232	<	* if we havent PINGed the connection and we havent
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;
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 291 | Line 257 | check_pings_list(dlink_list *list)
257		get_client_name(client_p, HIDE_IP));
258		}
259
260	<	snprintf(scratch, sizeof(scratch), "Ping timeout: %d seconds",
261	<	(int)(CurrentTime - client_p->localClient->lasttime));
262	<	exit_client(client_p, scratch);
260	>	snprintf(buf, sizeof(buf), "Ping timeout: %d seconds",
261	>	(int)(CurrentTime - client_p->connection->lasttime));
262	>	exit_client(client_p, buf);
263		}
264		}
265		}
#	Line 309 | 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		}
292
293	+	/*
294	+	* check_pings - go through the local client list and check activity
295	+	* kill off stuff that should die
296	+	*
297	+	* inputs       - NOT USED (from event)
298	+	* output       - next time_t when check_pings() should be called again
299	+	* side effects -
300	+	*
301	+	*
302	+	* A PING can be sent to clients as necessary.
303	+	*
304	+	* Client/Server ping outs are handled.
305	+	*/
306	+
307	+	/*
308	+	* Addon from adrian. We used to call this after nextping seconds,
309	+	* however I've changed it to run once a second. This is only for
310	+	* PING timeouts, not K/etc-line checks (thanks dianora!). Having it
311	+	* run once a second makes life a lot easier - when a new client connects
312	+	* and they need a ping in 4 seconds, if nextping was set to 20 seconds
313	+	* we end up waiting 20 seconds. This is stupid. :-)
314	+	* I will optimise (hah!) check_pings() once I've finished working on
315	+	* tidying up other network IO evilnesses.
316	+	*     -- adrian
317	+	*/
318	+
319	+	static void
320	+	check_pings(void *unused)
321	+	{
322	+	check_pings_list(&local_client_list);
323	+	check_pings_list(&local_server_list);
324	+	check_unknowns_list();
325	+	}
326	+
327		/* check_conf_klines()
328		*
329		* inputs       - NONE
#	Line 334 | Line 334 | check_unknowns_list(void)
334		void
335		check_conf_klines(void)
336		{
337	–	struct Client *client_p = NULL;       /* current local client_p being examined */
337		struct MaskItem *conf = NULL;
338	<	dlink_node *ptr, *next_ptr;
338	>	dlink_node *node = NULL, *node_next = NULL;
339
340	<	DLINK_FOREACH_SAFE(ptr, next_ptr, local_client_list.head)
340	>	DLINK_FOREACH_SAFE(node, node_next, local_client_list.head)
341		{
342	<	client_p = ptr->data;
342	>	struct Client *client_p = node->data;
343
344	<	/* If a client is already being exited
345	<	*/
347	<	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_dline_conf(&client_p->localClient->ip,
349	<	client_p->localClient->aftype)))
348	>	if ((conf = find_conf_by_address(NULL, &client_p->connection->ip, CONF_DLINE,
349	>	client_p->connection->aftype, NULL, NULL, 1)))
350		{
353	–	if (conf->type == CONF_EXEMPT)
354	–	continue;
355	–
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 (ConfigFileEntry.glines)
355	>	if (ConfigGeneral.glines)
356		{
357	<	if ((conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
358	<	CONF_GLINE, client_p->localClient->aftype,
357	>	if ((conf = find_conf_by_address(client_p->host, &client_p->connection->ip,
358	>	CONF_GLINE, client_p->connection->aftype,
359		client_p->username, NULL, 1)))
360		{
361		conf_try_ban(client_p, conf);
362	<	/* and go examine next fd/client_p */
368	<	continue;
362	>	continue;  /* and go examine next Client */
363		}
364		}
365
366	<	if ((conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
367	<	CONF_KLINE, client_p->localClient->aftype,
366	>	if ((conf = find_conf_by_address(client_p->host, &client_p->connection->ip,
367	>	CONF_KLINE, client_p->connection->aftype,
368		client_p->username, NULL, 1)))
369		{
370		conf_try_ban(client_p, conf);
371	<	continue;
371	>	continue;  /* and go examine next Client */
372		}
373
374		if ((conf = find_matching_name_conf(CONF_XLINE,  client_p->info,
375		NULL, NULL, 0)))
376		{
377		conf_try_ban(client_p, conf);
378	<	continue;
378	>	continue;  /* and go examine next Client */
379		}
380		}
381
382	<	/* also check the unknowns list for new dlines */
383	<	DLINK_FOREACH_SAFE(ptr, next_ptr, unknown_list.head)
382	>	/* Also check the unknowns list for new dlines */
383	>	DLINK_FOREACH_SAFE(node, node_next, unknown_list.head)
384		{
385	<	client_p = ptr->data;
385	>	struct Client *client_p = node->data;
386
387	<	if ((conf = find_dline_conf(&client_p->localClient->ip,
388	<	client_p->localClient->aftype)))
387	>	if ((conf = find_conf_by_address(NULL, &client_p->connection->ip, CONF_DLINE,
388	>	client_p->connection->aftype, NULL, NULL, 1)))
389		{
390	<	if (conf->type == CONF_EXEMPT)
391	<	continue;
398	<
399	<	exit_client(client_p, "D-lined");
390	>	conf_try_ban(client_p, conf);
391	>	continue;  /* and go examine next Client */
392		}
393		}
394		}
#	Line 433 | Line 425 | conf_try_ban(struct Client *client_p, st
425		type_string = kline_string;
426		break;
427		case CONF_DLINE:
428	+	if (find_conf_by_address(NULL, &client_p->connection->ip, CONF_EXEMPT,
429	+	client_p->connection->aftype, NULL, NULL, 1))
430	+	return;
431		type_string = dline_string;
432		break;
433		case CONF_GLINE:
#	Line 479 | Line 474 | update_client_exit_stats(struct Client *
474		if (IsClient(client_p))
475		{
476		assert(Count.total > 0);
477	+
478		--Count.total;
479		if (HasUMode(client_p, UMODE_OPER))
480		--Count.oper;
#	Line 524 | Line 520 | find_person(const struct Client *const s
520		struct Client *
521		find_chasing(struct Client *source_p, const char *name)
522		{
523	<	struct Client *who = find_person(source_p, name);
523	>	struct Client *target_p = find_person(source_p, name);
524
525	<	if (who)
526	<	return who;
525	>	if (target_p)
526	>	return target_p;
527
528		if (IsDigit(*name))
529		return NULL;
530
531	<	if ((who = whowas_get_history(name,
532	<	(time_t)ConfigFileEntry.kill_chase_time_limit))
533	<	== NULL)
531	>	target_p = whowas_get_history(name, (time_t)ConfigGeneral.kill_chase_time_limit);
532	>
533	>	if (!target_p)
534		{
535		sendto_one_numeric(source_p, &me, ERR_NOSUCHNICK, name);
536		return NULL;
537		}
538
539	<	return who;
539	>	return target_p;
540		}
541
542		/*
#	Line 552 | Line 548 | find_chasing(struct Client *source_p, co
548		*        But, this can be used to any client structure.
549		*
550		* NOTE 1:
551	<	*        Watch out the allocation of "nbuf", if either source_p->name
551	>	*        Watch out the allocation of "buf", if either source_p->name
552		*        or source_p->sockhost gets changed into pointers instead of
553		*        directly allocated within the structure...
554		*
555		* NOTE 2:
556		*        Function return either a pointer to the structure (source_p) or
557	<	*        to internal buffer (nbuf). *NEVER* use the returned pointer
557	>	*        to internal buffer (buf). *NEVER* use the returned pointer
558		*        to modify what it points!!!
559		*/
560		const char *
561		get_client_name(const struct Client *client_p, enum addr_mask_type type)
562		{
563	<	static char nbuf[HOSTLEN * 2 + USERLEN + 5];
568	<
569	<	assert(client_p);
563	>	static char buf[HOSTLEN * 2 + USERLEN + 5];
564
565		if (!MyConnect(client_p))
566		return client_p->name;
#	Line 579 | Line 573 | get_client_name(const struct Client *cli
573		type = MASK_IP;
574		}
575
582	–	if (ConfigFileEntry.hide_spoof_ips)
583	–	if (type == SHOW_IP && IsIPSpoof(client_p))
584	–	type = MASK_IP;
585	–
576		/* And finally, let's get the host information, ip or name */
577		switch (type)
578		{
579		case SHOW_IP:
580	<	snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
580	>	snprintf(buf, sizeof(buf), "%s[%s@%s]",
581		client_p->name,
582		client_p->username, client_p->sockhost);
583		break;
584		case MASK_IP:
585	<	if (client_p->localClient->aftype == AF_INET)
586	<	snprintf(nbuf, sizeof(nbuf), "%s[%s@255.255.255.255]",
585	>	if (client_p->connection->aftype == AF_INET)
586	>	snprintf(buf, sizeof(buf), "%s[%s@255.255.255.255]",
587		client_p->name, client_p->username);
588		else
589	<	snprintf(nbuf, sizeof(nbuf), "%s[%s@ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]",
589	>	snprintf(buf, sizeof(buf), "%s[%s@ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]",
590		client_p->name, client_p->username);
591		break;
592		default:
593	<	snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
593	>	snprintf(buf, sizeof(buf), "%s[%s@%s]",
594		client_p->name,
595		client_p->username, client_p->host);
596		}
597
598	<	return nbuf;
598	>	return buf;
599		}
600
601		void
602		free_exited_clients(void)
603		{
604	<	dlink_node *ptr = NULL, *next = NULL;
604	>	dlink_node *node = NULL, *node_next = NULL;
605
606	<	DLINK_FOREACH_SAFE(ptr, next, dead_list.head)
606	>	DLINK_FOREACH_SAFE(node, node_next, dead_list.head)
607		{
608	<	free_client(ptr->data);
609	<	dlinkDelete(ptr, &dead_list);
610	<	free_dlink_node(ptr);
608	>	free_client(node->data);
609	>	dlinkDelete(node, &dead_list);
610	>	free_dlink_node(node);
611		}
612		}
613
#	Line 628 | Line 618 | free_exited_clients(void)
618		* The only messages generated are QUITs on channels.
619		*/
620		static void
621	<	exit_one_client(struct Client *source_p, const char *quitmsg)
621	>	exit_one_client(struct Client *source_p, const char *comment)
622		{
623	<	dlink_node *ptr = NULL, *ptr_next = NULL;
623	>	dlink_node *node = NULL, *node_next = NULL;
624
625		assert(!IsMe(source_p));
626	+	assert(source_p != &me);
627
628		if (IsClient(source_p))
629		{
630		dlinkDelete(&source_p->lnode, &source_p->servptr->serv->client_list);
631	+	dlinkDelete(&source_p->node, &global_client_list);
632
633		/*
634		* If a person is on a channel, send a QUIT notice
#	Line 646 | Line 638 | exit_one_client(struct Client *source_p,
638		*/
639		sendto_common_channels_local(source_p, 0, 0, ":%s!%s@%s QUIT :%s",
640		source_p->name, source_p->username,
641	<	source_p->host, quitmsg);
642	<	DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->channel.head)
643	<	remove_user_from_channel(ptr->data);
641	>	source_p->host, comment);
642	>
643	>	DLINK_FOREACH_SAFE(node, node_next, source_p->channel.head)
644	>	remove_user_from_channel(node->data);
645
646		whowas_add_history(source_p, 0);
647		whowas_off_history(source_p);
#	Line 658 | Line 651 | exit_one_client(struct Client *source_p,
651		if (MyConnect(source_p))
652		{
653		/* Clean up invitefield */
654	<	DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->localClient->invited.head)
655	<	del_invite(ptr->data, source_p);
654	>	DLINK_FOREACH_SAFE(node, node_next, source_p->connection->invited.head)
655	>	del_invite(node->data, source_p);
656
657		del_all_accepts(source_p);
658		}
#	Line 667 | Line 660 | exit_one_client(struct Client *source_p,
660		else if (IsServer(source_p))
661		{
662		dlinkDelete(&source_p->lnode, &source_p->servptr->serv->server_list);
663	+	dlinkDelete(&source_p->node, &global_client_list);
664
665	<	if ((ptr = dlinkFindDelete(&global_serv_list, source_p)))
666	<	free_dlink_node(ptr);
665	>	if ((node = dlinkFindDelete(&global_server_list, source_p)))
666	>	free_dlink_node(node);
667		}
668
669		/* Remove source_p from the client lists */
670		if (source_p->id[0])
671		hash_del_id(source_p);
672	+
673		if (source_p->name[0])
674		hash_del_client(source_p);
675
676		if (IsUserHostIp(source_p))
677		delete_user_host(source_p->username, source_p->host, !MyConnect(source_p));
678
684	–	/* remove from global client list
685	–	* NOTE: source_p->node.next cannot be NULL if the client is added
686	–	*       to global_client_list (there is always &me at its end)
687	–	*/
688	–	if (source_p->node.next) /* XXX: not needed? */
689	–	dlinkDelete(&source_p->node, &global_client_list);
690	–
679		update_client_exit_stats(source_p);
680
681		/* Check to see if the client isn't already on the dead list */
#	Line 705 | Line 693 | exit_one_client(struct Client *source_p,
693		* actually removing things off llists.   tweaked from +CSr31  -orabidoo
694		*/
695		static void
696	<	recurse_remove_clients(struct Client *source_p, const char *quitmsg)
696	>	recurse_remove_clients(struct Client *source_p, const char *comment)
697		{
698	<	dlink_node *ptr = NULL, *ptr_next = NULL;
698	>	dlink_node *node = NULL, *node_next = NULL;
699
700	<	DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->serv->client_list.head)
701	<	exit_one_client(ptr->data, quitmsg);
700	>	DLINK_FOREACH_SAFE(node, node_next, source_p->serv->client_list.head)
701	>	exit_one_client(node->data, comment);
702
703	<	DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->serv->server_list.head)
703	>	DLINK_FOREACH_SAFE(node, node_next, source_p->serv->server_list.head)
704		{
705	<	recurse_remove_clients(ptr->data, quitmsg);
706	<	exit_one_client(ptr->data, quitmsg);
705	>	recurse_remove_clients(node->data, comment);
706	>	exit_one_client(node->data, comment);
707		}
708		}
709
#	Line 739 | Line 727 | recurse_remove_clients(struct Client *so
727		void
728		exit_client(struct Client *source_p, const char *comment)
729		{
730	<	dlink_node *m = NULL;
730	>	dlink_node *node = NULL;
731	>
732	>	assert(!IsMe(source_p));
733	>	assert(source_p != &me);
734
735		if (MyConnect(source_p))
736		{
#	Line 751 | Line 742 | exit_client(struct Client *source_p, con
742
743		SetClosing(source_p);
744
745	<	if (IsIpHash(source_p))
746	<	remove_one_ip(&source_p->localClient->ip);
745	>	if (HasFlag(source_p, FLAGS_IPHASH))
746	>	{
747	>	DelFlag(source_p, FLAGS_IPHASH);
748	>	ipcache_remove_address(&source_p->connection->ip);
749	>	}
750
751	<	delete_auth(&source_p->localClient->auth);
751	>	delete_auth(&source_p->connection->auth);
752
753		/*
754		* This source_p could have status of one of STAT_UNKNOWN, STAT_CONNECTING
#	Line 767 | Line 761 | exit_client(struct Client *source_p, con
761		{
762		assert(dlinkFind(&unknown_list, source_p));
763
764	<	dlinkDelete(&source_p->localClient->lclient_node, &unknown_list);
764	>	dlinkDelete(&source_p->connection->lclient_node, &unknown_list);
765		}
766		else if (IsClient(source_p))
767		{
768	<	time_t on_for = CurrentTime - source_p->localClient->firsttime;
768	>	time_t on_for = CurrentTime - source_p->connection->firsttime;
769	>
770		assert(Count.local > 0);
771	<	Count.local--;
771	>
772	>	--Count.local;
773
774		if (HasUMode(source_p, UMODE_OPER))
775	<	if ((m = dlinkFindDelete(&oper_list, source_p)))
776	<	free_dlink_node(m);
775	>	if ((node = dlinkFindDelete(&oper_list, source_p)))
776	>	free_dlink_node(node);
777
778		assert(dlinkFind(&local_client_list, source_p));
779	<	dlinkDelete(&source_p->localClient->lclient_node, &local_client_list);
779	>	dlinkDelete(&source_p->connection->lclient_node, &local_client_list);
780
781	<	if (source_p->localClient->list_task)
781	>	if (source_p->connection->list_task)
782		free_list_task(source_p);
783
784		watch_del_watch_list(source_p);
785	+	client_clear_svstags(source_p);
786	+
787		sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
788		"Client exiting: %s (%s@%s) [%s] [%s]",
789		source_p->name, source_p->username, source_p->host, comment,
790	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
791	<	"255.255.255.255" : source_p->sockhost);
790	>	source_p->sockhost);
791	>
792		ilog(LOG_TYPE_USER, "%s (%3u:%02u:%02u): %s!%s@%s %llu/%llu",
793	<	myctime(source_p->localClient->firsttime), (unsigned int)(on_for / 3600),
793	>	myctime(source_p->connection->firsttime), (unsigned int)(on_for / 3600),
794		(unsigned int)((on_for % 3600)/60), (unsigned int)(on_for % 60),
795		source_p->name, source_p->username, source_p->host,
796	<	source_p->localClient->send.bytes>>10,
797	<	source_p->localClient->recv.bytes>>10);
796	>	source_p->connection->send.bytes>>10,
797	>	source_p->connection->recv.bytes>>10);
798		}
799		else if (IsServer(source_p))
800		{
801		assert(Count.myserver > 0);
802	+
803		--Count.myserver;
804
805	<	assert(dlinkFind(&serv_list, source_p));
806	<	dlinkDelete(&source_p->localClient->lclient_node, &serv_list);
805	>	assert(dlinkFind(&local_server_list, source_p));
806	>	dlinkDelete(&source_p->connection->lclient_node, &local_server_list);
807		}
808
809		if (!IsDead(source_p))
#	Line 835 | Line 834 | exit_client(struct Client *source_p, con
834		{
835		char splitstr[HOSTLEN + HOSTLEN + 2] = "";
836
837	<	/* This shouldn't ever happen */
838	<	assert(source_p->serv && source_p->servptr);
837	>	assert(source_p->serv);
838	>	assert(source_p->servptr);
839
840		if (ConfigServerHide.hide_servers)
841		/*
#	Line 848 | Line 847 | exit_client(struct Client *source_p, con
847		snprintf(splitstr, sizeof(splitstr), "%s %s",
848		source_p->servptr->name, source_p->name);
849
850	<	/* Send SQUIT for source_p in every direction. source_p is already off of serv_list here */
850	>	/* Send SQUIT for source_p in every direction. source_p is already off of local_server_list here */
851		if (!HasFlag(source_p, FLAGS_SQUIT))
852	<	sendto_server(NULL, NOCAPS, NOCAPS, "SQUIT %s :%s", source_p->id, comment);
852	>	sendto_server(NULL, 0, 0, "SQUIT %s :%s", source_p->id, comment);
853
854		/* Now exit the clients internally */
855		recurse_remove_clients(source_p, splitstr);
856
857		if (MyConnect(source_p))
858		{
859	+	int connected = CurrentTime - source_p->connection->firsttime;
860		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
861	<	"%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
862	<	source_p->name, (int)(CurrentTime - source_p->localClient->firsttime),
863	<	source_p->localClient->send.bytes >> 10,
864	<	source_p->localClient->recv.bytes >> 10);
865	<	ilog(LOG_TYPE_IRCD, "%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
866	<	source_p->name, (int)(CurrentTime - source_p->localClient->firsttime),
867	<	source_p->localClient->send.bytes >> 10,
868	<	source_p->localClient->recv.bytes >> 10);
861	>	"%s was connected for %d day%s, %2d:%02d:%02d. %llu/%llu sendK/recvK.",
862	>	source_p->name, connected/86400, (connected/86400 == 1) ? "" : "s",
863	>	(connected % 86400) / 3600, (connected % 3600) / 60, connected % 60,
864	>	source_p->connection->send.bytes >> 10,
865	>	source_p->connection->recv.bytes >> 10);
866	>	ilog(LOG_TYPE_IRCD, "%s was connected for %d day%s, %2d:%02d:%02d. %llu/%llu sendK/recvK.",
867	>	source_p->name, connected/86400, (connected/86400 == 1) ? "" : "s",
868	>	(connected % 86400) / 3600, (connected % 3600) / 60, connected % 60,
869	>	source_p->connection->send.bytes >> 10,
870	>	source_p->connection->recv.bytes >> 10);
871		}
872		}
873		else if (IsClient(source_p) && !HasFlag(source_p, FLAGS_KILLED))
874	<	sendto_server(source_p->from, NOCAPS, NOCAPS, ":%s QUIT :%s",
874	>	sendto_server(source_p->from, 0, 0, ":%s QUIT :%s",
875		source_p->id, comment);
876
877		/* The client *better* be off all of the lists */
878		assert(dlinkFind(&unknown_list, source_p) == NULL);
879		assert(dlinkFind(&local_client_list, source_p) == NULL);
880	<	assert(dlinkFind(&serv_list, source_p) == NULL);
880	>	assert(dlinkFind(&local_server_list, source_p) == NULL);
881		assert(dlinkFind(&oper_list, source_p) == NULL);
882
883		exit_one_client(source_p, comment);
#	Line 888 | Line 890 | exit_client(struct Client *source_p, con
890		void
891		dead_link_on_write(struct Client *client_p, int ierrno)
892		{
893	<	dlink_node *ptr;
893	>	dlink_node *node;
894
895		if (IsDefunct(client_p))
896		return;
897
898	<	dbuf_clear(&client_p->localClient->buf_recvq);
899	<	dbuf_clear(&client_p->localClient->buf_sendq);
898	>	dbuf_clear(&client_p->connection->buf_recvq);
899	>	dbuf_clear(&client_p->connection->buf_sendq);
900
901		assert(dlinkFind(&abort_list, client_p) == NULL);
902	<	ptr = make_dlink_node();
902	>	node = make_dlink_node();
903		/* don't let exit_aborted_clients() finish yet */
904	<	dlinkAddTail(client_p, ptr, &abort_list);
904	>	dlinkAddTail(client_p, node, &abort_list);
905
906		if (eac_next == NULL)
907	<	eac_next = ptr;
907	>	eac_next = node;
908
909		SetDead(client_p); /* You are dead my friend */
910		}
#	Line 920 | Line 922 | dead_link_on_read(struct Client *client_
922		if (IsDefunct(client_p))
923		return;
924
925	<	dbuf_clear(&client_p->localClient->buf_recvq);
926	<	dbuf_clear(&client_p->localClient->buf_sendq);
925	>	dbuf_clear(&client_p->connection->buf_recvq);
926	>	dbuf_clear(&client_p->connection->buf_sendq);
927
928	<	current_error = get_sockerr(client_p->localClient->fd.fd);
928	>	current_error = get_sockerr(client_p->connection->fd.fd);
929
930		if (IsServer(client_p) || IsHandshake(client_p))
931		{
932	<	int connected = CurrentTime - client_p->localClient->firsttime;
932	>	int connected = CurrentTime - client_p->connection->firsttime;
933
934		if (error == 0)
935		{
#	Line 953 | Line 955 | dead_link_on_read(struct Client *client_
955		}
956
957		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
958	<	"%s had been connected for %d day%s, %2d:%02d:%02d",
958	>	"%s was connected for %d day%s, %2d:%02d:%02d",
959		client_p->name, connected/86400,
960		(connected/86400 == 1) ? "" : "s",
961		(connected % 86400) / 3600, (connected % 3600) / 60,
#	Line 1016 | Line 1018 | exit_aborted_clients(void)
1018		void
1019		del_accept(struct split_nuh_item *accept_p, struct Client *client_p)
1020		{
1021	<	dlinkDelete(&accept_p->node, &client_p->localClient->acceptlist);
1021	>	dlinkDelete(&accept_p->node, &client_p->connection->acceptlist);
1022
1023		MyFree(accept_p->nickptr);
1024		MyFree(accept_p->userptr);
#	Line 1029 | Line 1031 | find_accept(const char *nick, const char
1031		const char *host, struct Client *client_p,
1032		int (*cmpfunc)(const char *, const char *))
1033		{
1034	<	dlink_node *ptr = NULL;
1034	>	dlink_node *node = NULL;
1035
1036	<	DLINK_FOREACH(ptr, client_p->localClient->acceptlist.head)
1036	>	DLINK_FOREACH(node, client_p->connection->acceptlist.head)
1037		{
1038	<	struct split_nuh_item *accept_p = ptr->data;
1038	>	struct split_nuh_item *accept_p = node->data;
1039
1040		if (!cmpfunc(accept_p->nickptr, nick) &&
1041		!cmpfunc(accept_p->userptr, user) &&
#	Line 1055 | Line 1057 | int
1057		accept_message(struct Client *source,
1058		struct Client *target)
1059		{
1060	<	dlink_node *ptr = NULL;
1060	>	dlink_node *node = NULL;
1061	>
1062	>	if (HasFlag(source, FLAGS_SERVICE) ||
1063	>	(HasUMode(source, UMODE_OPER) && ConfigGeneral.opers_bypass_callerid))
1064	>	return 1;
1065
1066		if (source == target || find_accept(source->name, source->username,
1067		source->host, target, match))
1068		return 1;
1069
1070	<	if (HasUMode(target, UMODE_SOFTCALLERID))
1071	<	DLINK_FOREACH(ptr, target->channel.head)
1072	<	if (IsMember(source, ((struct Membership *)ptr->data)->chptr))
1070	>	if (!HasUMode(target, UMODE_CALLERID) && HasUMode(target, UMODE_SOFTCALLERID))
1071	>	DLINK_FOREACH(node, target->channel.head)
1072	>	if (IsMember(source, ((struct Membership *)node->data)->chptr))
1073		return 1;
1074
1075		return 0;
#	Line 1078 | Line 1084 | accept_message(struct Client *source,
1084		void
1085		del_all_accepts(struct Client *client_p)
1086		{
1087	<	dlink_node *ptr = NULL, *ptr_next = NULL;
1087	>	dlink_node *node = NULL, *node_next = NULL;
1088
1089	<	DLINK_FOREACH_SAFE(ptr, ptr_next, client_p->localClient->acceptlist.head)
1090	<	del_accept(ptr->data, client_p);
1089	>	DLINK_FOREACH_SAFE(node, node_next, client_p->connection->acceptlist.head)
1090	>	del_accept(node->data, client_p);
1091		}
1092
1093		unsigned int
1094	<	idle_time_get(const struct Client *source_p, const struct Client *target_p)
1094	>	client_get_idle_time(const struct Client *source_p,
1095	>	const struct Client *target_p)
1096		{
1097		unsigned int idle = 0;
1098		unsigned int min_idle = 0;
1099		unsigned int max_idle = 0;
1100	<	const struct ClassItem *class = get_class_ptr(&target_p->localClient->confs);
1100	>	const struct ClassItem *const class = get_class_ptr(&target_p->connection->confs);
1101
1102		if (!(class->flags & CLASS_FLAGS_FAKE_IDLE) || target_p == source_p)
1103	<	return CurrentTime - target_p->localClient->last_privmsg;
1103	>	return CurrentTime - target_p->connection->last_privmsg;
1104	>
1105		if (HasUMode(source_p, UMODE_OPER) &&
1106		!(class->flags & CLASS_FLAGS_HIDE_IDLE_FROM_OPERS))
1107	<	return CurrentTime - target_p->localClient->last_privmsg;
1107	>	return CurrentTime - target_p->connection->last_privmsg;
1108
1109		min_idle = class->min_idle;
1110		max_idle = class->max_idle;
#	Line 1107 | Line 1115 | idle_time_get(const struct Client *sourc
1115		if (class->flags & CLASS_FLAGS_RANDOM_IDLE)
1116		idle = genrand_int32();
1117		else
1118	<	idle = CurrentTime - target_p->localClient->last_privmsg;
1118	>	idle = CurrentTime - target_p->connection->last_privmsg;
1119
1120		if (!max_idle)
1121		idle = 0;
#	Line 1119 | Line 1127 | idle_time_get(const struct Client *sourc
1127
1128		return idle;
1129		}
1130	+
1131	+	/* client_init()
1132	+	*
1133	+	* inputs       - NONE
1134	+	* output       - NONE
1135	+	* side effects - initialize client free memory
1136	+	*/
1137	+	void
1138	+	client_init(void)
1139	+	{
1140	+	static struct event event_ping =
1141	+	{
1142	+	.name = "check_pings",
1143	+	.handler = check_pings,
1144	+	.when = 5
1145	+	};
1146	+
1147	+	client_pool = mp_pool_new(sizeof(struct Client), MP_CHUNK_SIZE_CLIENT);
1148	+	connection_pool = mp_pool_new(sizeof(struct Connection), MP_CHUNK_SIZE_CONNECTION);
1149	+	event_add(&event_ping, NULL);
1150	+	}

Diff Legend

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