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 3502 by michael, Sat May 10 19:42:22 2014 UTC vs.
Revision 5347 by michael, Sun Jan 11 12:42:20 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 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;
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! */
#	Line 135 | Line 104 | make_client(struct Client *from)
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, "0");
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);
#	Line 164 | Line 132 | free_client(struct Client *client_p)
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	>	MyFree(client_p->connection->challenge_operator);
142	>	client_p->connection->challenge_response = NULL;
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
195	–	/*
196	–	* check_pings - go through the local client list and check activity
197	–	* kill off stuff that should die
198	–	*
199	–	* inputs       - NOT USED (from event)
200	–	* 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	–	*/
208	–
209	–	/*
210	–	* 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	–	*/
220	–
221	–	static void
222	–	check_pings(void *notused)
223	–	{
224	–	check_pings_list(&local_client_list);
225	–	check_pings_list(&serv_list);
226	–	check_unknowns_list();
227	–	}
228	–
163		/* check_pings_list()
164		*
165		* inputs       - pointer to list to check
#	Line 235 | Line 169 | check_pings(void *notused)
169		static void
170		check_pings_list(dlink_list *list)
171		{
172	<	char scratch[IRCD_BUFSIZE];
172	>	char buf[IRCD_BUFSIZE] = "";
173		int ping = 0;      /* ping time value from client */
174	<	dlink_node *ptr = NULL, *next_ptr = NULL;
174	>	dlink_node *node = NULL, *node_next = NULL;
175
176	<	DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
176	>	DLINK_FOREACH_SAFE(node, node_next, list->head)
177		{
178	<	struct Client *client_p = ptr->data;
178	>	struct Client *client_p = node->data;
179
246	–	/*
247	–	** Note: No need to notify opers here. It's
248	–	** already done when "FLAGS_DEADSOCKET" is set.
249	–	*/
180		if (IsDead(client_p))
181	<	{
252	<	/* Ignore it, its been exited already */
253	<	continue;
254	<	}
181	>	continue;  /* Ignore it, its been exited already */
182
183		if (!IsRegistered(client_p))
184		ping = CONNECTTIMEOUT;
185		else
186	<	ping = get_client_ping(&client_p->localClient->confs);
186	>	ping = get_client_ping(&client_p->connection->confs);
187
188	<	if (ping < CurrentTime - client_p->localClient->lasttime)
188	>	if (ping < CurrentTime - client_p->connection->lasttime)
189		{
190		if (!IsPingSent(client_p))
191		{
192		/*
193	<	* if we havent PINGed the connection and we havent
193	>	* If we haven't PINGed the connection and we haven't
194		* heard from it in a while, PING it to make sure
195		* it is still alive.
196		*/
197		SetPingSent(client_p);
198	<	client_p->localClient->lasttime = CurrentTime - ping;
198	>	client_p->connection->lasttime = CurrentTime - ping;
199		sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
200		}
201		else
202		{
203	<	if (CurrentTime - client_p->localClient->lasttime >= 2 * ping)
203	>	if (CurrentTime - client_p->connection->lasttime >= 2 * ping)
204		{
205		/*
206		* If the client/server hasn't talked to us in 2*ping seconds
#	Line 291 | Line 218 | check_pings_list(dlink_list *list)
218		get_client_name(client_p, HIDE_IP));
219		}
220
221	<	snprintf(scratch, sizeof(scratch), "Ping timeout: %d seconds",
222	<	(int)(CurrentTime - client_p->localClient->lasttime));
223	<	exit_client(client_p, scratch);
221	>	snprintf(buf, sizeof(buf), "Ping timeout: %d seconds",
222	>	(int)(CurrentTime - client_p->connection->lasttime));
223	>	exit_client(client_p, buf);
224		}
225		}
226		}
#	Line 309 | Line 236 | check_pings_list(dlink_list *list)
236		static void
237		check_unknowns_list(void)
238		{
239	<	dlink_node *ptr = NULL, *ptr_next = NULL;
239	>	dlink_node *node = NULL, *node_next = NULL;
240
241	<	DLINK_FOREACH_SAFE(ptr, ptr_next, unknown_list.head)
241	>	DLINK_FOREACH_SAFE(node, node_next, unknown_list.head)
242		{
243	<	struct Client *client_p = ptr->data;
243	>	struct Client *client_p = node->data;
244
245		/*
246		* Check UNKNOWN connections - if they have been in this state
247		* for > 30s, close them.
248		*/
249	<	if (IsAuthFinished(client_p) && (CurrentTime - client_p->localClient->firsttime) > 30)
249	>	if (IsAuthFinished(client_p) && (CurrentTime - client_p->connection->firsttime) > 30)
250		exit_client(client_p, "Registration timed out");
251		}
252		}
253
254	+	/*
255	+	* check_pings - go through the local client list and check activity
256	+	* kill off stuff that should die
257	+	*
258	+	* inputs       - NOT USED (from event)
259	+	* output       - next time_t when check_pings() should be called again
260	+	* side effects -
261	+	*
262	+	*
263	+	* A PING can be sent to clients as necessary.
264	+	*
265	+	* Client/Server ping outs are handled.
266	+	*/
267	+
268	+	/*
269	+	* Addon from adrian. We used to call this after nextping seconds,
270	+	* however I've changed it to run once a second. This is only for
271	+	* PING timeouts, not K/etc-line checks (thanks dianora!). Having it
272	+	* run once a second makes life a lot easier - when a new client connects
273	+	* and they need a ping in 4 seconds, if nextping was set to 20 seconds
274	+	* we end up waiting 20 seconds. This is stupid. :-)
275	+	* I will optimise (hah!) check_pings() once I've finished working on
276	+	* tidying up other network IO evilnesses.
277	+	*     -- adrian
278	+	*/
279	+
280	+	static void
281	+	check_pings(void *unused)
282	+	{
283	+	check_pings_list(&local_client_list);
284	+	check_pings_list(&local_server_list);
285	+	check_unknowns_list();
286	+	}
287	+
288		/* check_conf_klines()
289		*
290		* inputs       - NONE
#	Line 334 | Line 295 | check_unknowns_list(void)
295		void
296		check_conf_klines(void)
297		{
337	–	struct Client *client_p = NULL;       /* current local client_p being examined */
298		struct MaskItem *conf = NULL;
299	<	dlink_node *ptr, *next_ptr;
299	>	dlink_node *node = NULL, *node_next = NULL;
300
301	<	DLINK_FOREACH_SAFE(ptr, next_ptr, local_client_list.head)
301	>	DLINK_FOREACH_SAFE(node, node_next, local_client_list.head)
302		{
303	<	client_p = ptr->data;
303	>	struct Client *client_p = node->data;
304
305	<	/* If a client is already being exited
306	<	*/
347	<	if (IsDead(client_p) || !IsClient(client_p))
305	>	/* If a client is already being exited */
306	>	if (IsDead(client_p))
307		continue;
308
309	<	if ((conf = find_dline_conf(&client_p->localClient->ip,
310	<	client_p->localClient->aftype)))
309	>	if ((conf = find_conf_by_address(NULL, &client_p->connection->ip, CONF_DLINE,
310	>	client_p->connection->aftype, NULL, NULL, 1)))
311		{
353	–	if (conf->type == CONF_EXEMPT)
354	–	continue;
355	–
312		conf_try_ban(client_p, conf);
313		continue; /* and go examine next fd/client_p */
314		}
315
316	<	if (ConfigFileEntry.glines)
316	>	if (ConfigGeneral.glines)
317		{
318	<	if ((conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
319	<	CONF_GLINE, client_p->localClient->aftype,
318	>	if ((conf = find_conf_by_address(client_p->host, &client_p->connection->ip,
319	>	CONF_GLINE, client_p->connection->aftype,
320		client_p->username, NULL, 1)))
321		{
322		conf_try_ban(client_p, conf);
#	Line 369 | Line 325 | check_conf_klines(void)
325		}
326		}
327
328	<	if ((conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
329	<	CONF_KLINE, client_p->localClient->aftype,
328	>	if ((conf = find_conf_by_address(client_p->host, &client_p->connection->ip,
329	>	CONF_KLINE, client_p->connection->aftype,
330		client_p->username, NULL, 1)))
331		{
332		conf_try_ban(client_p, conf);
#	Line 386 | Line 342 | check_conf_klines(void)
342		}
343
344		/* also check the unknowns list for new dlines */
345	<	DLINK_FOREACH_SAFE(ptr, next_ptr, unknown_list.head)
345	>	DLINK_FOREACH_SAFE(node, node_next, unknown_list.head)
346		{
347	<	client_p = ptr->data;
347	>	struct Client *client_p = node->data;
348
349	<	if ((conf = find_dline_conf(&client_p->localClient->ip,
350	<	client_p->localClient->aftype)))
349	>	if ((conf = find_conf_by_address(NULL, &client_p->connection->ip, CONF_DLINE,
350	>	client_p->connection->aftype, NULL, NULL, 1)))
351		{
352	<	if (conf->type == CONF_EXEMPT)
353	<	continue;
398	<
399	<	exit_client(client_p, "D-lined");
352	>	conf_try_ban(client_p, conf);
353	>	continue; /* and go examine next fd/client_p */
354		}
355		}
356		}
#	Line 433 | Line 387 | conf_try_ban(struct Client *client_p, st
387		type_string = kline_string;
388		break;
389		case CONF_DLINE:
390	+	if (find_conf_by_address(NULL, &client_p->connection->ip, CONF_EXEMPT,
391	+	client_p->connection->aftype, NULL, NULL, 1))
392	+	return;
393		type_string = dline_string;
394		break;
395		case CONF_GLINE:
#	Line 479 | Line 436 | update_client_exit_stats(struct Client *
436		if (IsClient(client_p))
437		{
438		assert(Count.total > 0);
439	+
440		--Count.total;
441		if (HasUMode(client_p, UMODE_OPER))
442		--Count.oper;
#	Line 524 | Line 482 | find_person(const struct Client *const s
482		struct Client *
483		find_chasing(struct Client *source_p, const char *name)
484		{
485	<	struct Client *who = find_person(source_p, name);
485	>	struct Client *target_p = find_person(source_p, name);
486
487	<	if (who)
488	<	return who;
487	>	if (target_p)
488	>	return target_p;
489
490		if (IsDigit(*name))
491		return NULL;
492
493	<	if ((who = whowas_get_history(name,
494	<	(time_t)ConfigFileEntry.kill_chase_time_limit))
495	<	== NULL)
493	>	target_p = whowas_get_history(name, (time_t)ConfigGeneral.kill_chase_time_limit);
494	>
495	>	if (!target_p)
496		{
497		sendto_one_numeric(source_p, &me, ERR_NOSUCHNICK, name);
498		return NULL;
499		}
500
501	<	return who;
501	>	return target_p;
502		}
503
504		/*
#	Line 552 | Line 510 | find_chasing(struct Client *source_p, co
510		*        But, this can be used to any client structure.
511		*
512		* NOTE 1:
513	<	*        Watch out the allocation of "nbuf", if either source_p->name
513	>	*        Watch out the allocation of "buf", if either source_p->name
514		*        or source_p->sockhost gets changed into pointers instead of
515		*        directly allocated within the structure...
516		*
517		* NOTE 2:
518		*        Function return either a pointer to the structure (source_p) or
519	<	*        to internal buffer (nbuf). *NEVER* use the returned pointer
519	>	*        to internal buffer (buf). *NEVER* use the returned pointer
520		*        to modify what it points!!!
521		*/
522		const char *
523		get_client_name(const struct Client *client_p, enum addr_mask_type type)
524		{
525	<	static char nbuf[HOSTLEN * 2 + USERLEN + 5];
568	<
569	<	assert(client_p);
525	>	static char buf[HOSTLEN * 2 + USERLEN + 5];
526
527		if (!MyConnect(client_p))
528		return client_p->name;
#	Line 579 | Line 535 | get_client_name(const struct Client *cli
535		type = MASK_IP;
536		}
537
582	–	if (ConfigFileEntry.hide_spoof_ips)
583	–	if (type == SHOW_IP && IsIPSpoof(client_p))
584	–	type = MASK_IP;
585	–
538		/* And finally, let's get the host information, ip or name */
539		switch (type)
540		{
541		case SHOW_IP:
542	<	snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
542	>	snprintf(buf, sizeof(buf), "%s[%s@%s]",
543		client_p->name,
544		client_p->username, client_p->sockhost);
545		break;
546		case MASK_IP:
547	<	if (client_p->localClient->aftype == AF_INET)
548	<	snprintf(nbuf, sizeof(nbuf), "%s[%s@255.255.255.255]",
547	>	if (client_p->connection->aftype == AF_INET)
548	>	snprintf(buf, sizeof(buf), "%s[%s@255.255.255.255]",
549		client_p->name, client_p->username);
550		else
551	<	snprintf(nbuf, sizeof(nbuf), "%s[%s@ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]",
551	>	snprintf(buf, sizeof(buf), "%s[%s@ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]",
552		client_p->name, client_p->username);
553		break;
554		default:
555	<	snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
555	>	snprintf(buf, sizeof(buf), "%s[%s@%s]",
556		client_p->name,
557		client_p->username, client_p->host);
558		}
559
560	<	return nbuf;
560	>	return buf;
561		}
562
563		void
564		free_exited_clients(void)
565		{
566	<	dlink_node *ptr = NULL, *next = NULL;
566	>	dlink_node *node = NULL, *node_next = NULL;
567
568	<	DLINK_FOREACH_SAFE(ptr, next, dead_list.head)
568	>	DLINK_FOREACH_SAFE(node, node_next, dead_list.head)
569		{
570	<	free_client(ptr->data);
571	<	dlinkDelete(ptr, &dead_list);
572	<	free_dlink_node(ptr);
570	>	free_client(node->data);
571	>	dlinkDelete(node, &dead_list);
572	>	free_dlink_node(node);
573		}
574		}
575
#	Line 628 | Line 580 | free_exited_clients(void)
580		* The only messages generated are QUITs on channels.
581		*/
582		static void
583	<	exit_one_client(struct Client *source_p, const char *quitmsg)
583	>	exit_one_client(struct Client *source_p, const char *comment)
584		{
585	<	dlink_node *ptr = NULL, *ptr_next = NULL;
585	>	dlink_node *node = NULL, *node_next = NULL;
586
587		assert(!IsMe(source_p));
588	+	assert(source_p != &me);
589
590		if (IsClient(source_p))
591		{
592		dlinkDelete(&source_p->lnode, &source_p->servptr->serv->client_list);
593	+	dlinkDelete(&source_p->node, &global_client_list);
594
595		/*
596		* If a person is on a channel, send a QUIT notice
#	Line 646 | Line 600 | exit_one_client(struct Client *source_p,
600		*/
601		sendto_common_channels_local(source_p, 0, 0, ":%s!%s@%s QUIT :%s",
602		source_p->name, source_p->username,
603	<	source_p->host, quitmsg);
604	<	DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->channel.head)
605	<	remove_user_from_channel(ptr->data);
603	>	source_p->host, comment);
604	>
605	>	DLINK_FOREACH_SAFE(node, node_next, source_p->channel.head)
606	>	remove_user_from_channel(node->data);
607
608		whowas_add_history(source_p, 0);
609		whowas_off_history(source_p);
#	Line 658 | Line 613 | exit_one_client(struct Client *source_p,
613		if (MyConnect(source_p))
614		{
615		/* Clean up invitefield */
616	<	DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->localClient->invited.head)
617	<	del_invite(ptr->data, source_p);
616	>	DLINK_FOREACH_SAFE(node, node_next, source_p->connection->invited.head)
617	>	del_invite(node->data, source_p);
618
619		del_all_accepts(source_p);
620		}
#	Line 667 | Line 622 | exit_one_client(struct Client *source_p,
622		else if (IsServer(source_p))
623		{
624		dlinkDelete(&source_p->lnode, &source_p->servptr->serv->server_list);
625	+	dlinkDelete(&source_p->node, &global_client_list);
626
627	<	if ((ptr = dlinkFindDelete(&global_serv_list, source_p)))
628	<	free_dlink_node(ptr);
627	>	if ((node = dlinkFindDelete(&global_server_list, source_p)))
628	>	free_dlink_node(node);
629		}
630
631		/* Remove source_p from the client lists */
632		if (source_p->id[0])
633		hash_del_id(source_p);
634	+
635		if (source_p->name[0])
636		hash_del_client(source_p);
637
638		if (IsUserHostIp(source_p))
639		delete_user_host(source_p->username, source_p->host, !MyConnect(source_p));
640
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	–
641		update_client_exit_stats(source_p);
642
643		/* Check to see if the client isn't already on the dead list */
#	Line 705 | Line 655 | exit_one_client(struct Client *source_p,
655		* actually removing things off llists.   tweaked from +CSr31  -orabidoo
656		*/
657		static void
658	<	recurse_remove_clients(struct Client *source_p, const char *quitmsg)
658	>	recurse_remove_clients(struct Client *source_p, const char *comment)
659		{
660	<	dlink_node *ptr = NULL, *ptr_next = NULL;
660	>	dlink_node *node = NULL, *node_next = NULL;
661
662	<	DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->serv->client_list.head)
663	<	exit_one_client(ptr->data, quitmsg);
662	>	DLINK_FOREACH_SAFE(node, node_next, source_p->serv->client_list.head)
663	>	exit_one_client(node->data, comment);
664
665	<	DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->serv->server_list.head)
665	>	DLINK_FOREACH_SAFE(node, node_next, source_p->serv->server_list.head)
666		{
667	<	recurse_remove_clients(ptr->data, quitmsg);
668	<	exit_one_client(ptr->data, quitmsg);
667	>	recurse_remove_clients(node->data, comment);
668	>	exit_one_client(node->data, comment);
669		}
670		}
671
#	Line 739 | Line 689 | recurse_remove_clients(struct Client *so
689		void
690		exit_client(struct Client *source_p, const char *comment)
691		{
692	<	dlink_node *m = NULL;
692	>	dlink_node *node = NULL;
693	>
694	>	assert(!IsMe(source_p));
695	>	assert(source_p != &me);
696
697		if (MyConnect(source_p))
698		{
#	Line 751 | Line 704 | exit_client(struct Client *source_p, con
704
705		SetClosing(source_p);
706
707	<	if (IsIpHash(source_p))
708	<	remove_one_ip(&source_p->localClient->ip);
707	>	if (HasFlag(source_p, FLAGS_IPHASH))
708	>	{
709	>	DelFlag(source_p, FLAGS_IPHASH);
710	>	ipcache_remove_address(&source_p->connection->ip);
711	>	}
712
713	<	delete_auth(&source_p->localClient->auth);
713	>	delete_auth(&source_p->connection->auth);
714
715		/*
716		* This source_p could have status of one of STAT_UNKNOWN, STAT_CONNECTING
#	Line 767 | Line 723 | exit_client(struct Client *source_p, con
723		{
724		assert(dlinkFind(&unknown_list, source_p));
725
726	<	dlinkDelete(&source_p->localClient->lclient_node, &unknown_list);
726	>	dlinkDelete(&source_p->connection->lclient_node, &unknown_list);
727		}
728		else if (IsClient(source_p))
729		{
730	<	time_t on_for = CurrentTime - source_p->localClient->firsttime;
730	>	time_t on_for = CurrentTime - source_p->connection->firsttime;
731	>
732		assert(Count.local > 0);
733	<	Count.local--;
733	>
734	>	--Count.local;
735
736		if (HasUMode(source_p, UMODE_OPER))
737	<	if ((m = dlinkFindDelete(&oper_list, source_p)))
738	<	free_dlink_node(m);
737	>	if ((node = dlinkFindDelete(&oper_list, source_p)))
738	>	free_dlink_node(node);
739
740		assert(dlinkFind(&local_client_list, source_p));
741	<	dlinkDelete(&source_p->localClient->lclient_node, &local_client_list);
741	>	dlinkDelete(&source_p->connection->lclient_node, &local_client_list);
742
743	<	if (source_p->localClient->list_task)
743	>	if (source_p->connection->list_task)
744		free_list_task(source_p);
745
746		watch_del_watch_list(source_p);
747		sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
748		"Client exiting: %s (%s@%s) [%s] [%s]",
749		source_p->name, source_p->username, source_p->host, comment,
750	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
751	<	"255.255.255.255" : source_p->sockhost);
750	>	source_p->sockhost);
751	>
752		ilog(LOG_TYPE_USER, "%s (%3u:%02u:%02u): %s!%s@%s %llu/%llu",
753	<	myctime(source_p->localClient->firsttime), (unsigned int)(on_for / 3600),
753	>	myctime(source_p->connection->firsttime), (unsigned int)(on_for / 3600),
754		(unsigned int)((on_for % 3600)/60), (unsigned int)(on_for % 60),
755		source_p->name, source_p->username, source_p->host,
756	<	source_p->localClient->send.bytes>>10,
757	<	source_p->localClient->recv.bytes>>10);
756	>	source_p->connection->send.bytes>>10,
757	>	source_p->connection->recv.bytes>>10);
758		}
759		else if (IsServer(source_p))
760		{
761		assert(Count.myserver > 0);
762	+
763		--Count.myserver;
764
765	<	assert(dlinkFind(&serv_list, source_p));
766	<	dlinkDelete(&source_p->localClient->lclient_node, &serv_list);
765	>	assert(dlinkFind(&local_server_list, source_p));
766	>	dlinkDelete(&source_p->connection->lclient_node, &local_server_list);
767		}
768
769		if (!IsDead(source_p))
#	Line 848 | Line 807 | exit_client(struct Client *source_p, con
807		snprintf(splitstr, sizeof(splitstr), "%s %s",
808		source_p->servptr->name, source_p->name);
809
810	<	/* Send SQUIT for source_p in every direction. source_p is already off of serv_list here */
810	>	/* Send SQUIT for source_p in every direction. source_p is already off of local_server_list here */
811		if (!HasFlag(source_p, FLAGS_SQUIT))
812	<	sendto_server(NULL, NOCAPS, NOCAPS, "SQUIT %s :%s", source_p->id, comment);
812	>	sendto_server(NULL, 0, 0, "SQUIT %s :%s", source_p->id, comment);
813
814		/* Now exit the clients internally */
815		recurse_remove_clients(source_p, splitstr);
816
817		if (MyConnect(source_p))
818		{
819	+	int connected = CurrentTime - source_p->connection->firsttime;
820		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
821	<	"%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
822	<	source_p->name, (int)(CurrentTime - source_p->localClient->firsttime),
823	<	source_p->localClient->send.bytes >> 10,
824	<	source_p->localClient->recv.bytes >> 10);
825	<	ilog(LOG_TYPE_IRCD, "%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
826	<	source_p->name, (int)(CurrentTime - source_p->localClient->firsttime),
827	<	source_p->localClient->send.bytes >> 10,
828	<	source_p->localClient->recv.bytes >> 10);
821	>	"%s was connected for %d day%s, %2d:%02d:%02d. %llu/%llu sendK/recvK.",
822	>	source_p->name, connected/86400, (connected/86400 == 1) ? "" : "s",
823	>	(connected % 86400) / 3600, (connected % 3600) / 60, connected % 60,
824	>	source_p->connection->send.bytes >> 10,
825	>	source_p->connection->recv.bytes >> 10);
826	>	ilog(LOG_TYPE_IRCD, "%s was connected for %d day%s, %2d:%02d:%02d. %llu/%llu sendK/recvK.",
827	>	source_p->name, connected/86400, (connected/86400 == 1) ? "" : "s",
828	>	(connected % 86400) / 3600, (connected % 3600) / 60, connected % 60,
829	>	source_p->connection->send.bytes >> 10,
830	>	source_p->connection->recv.bytes >> 10);
831		}
832		}
833		else if (IsClient(source_p) && !HasFlag(source_p, FLAGS_KILLED))
834	<	sendto_server(source_p->from, NOCAPS, NOCAPS, ":%s QUIT :%s",
834	>	sendto_server(source_p->from, 0, 0, ":%s QUIT :%s",
835		source_p->id, comment);
836
837		/* The client *better* be off all of the lists */
838		assert(dlinkFind(&unknown_list, source_p) == NULL);
839		assert(dlinkFind(&local_client_list, source_p) == NULL);
840	<	assert(dlinkFind(&serv_list, source_p) == NULL);
840	>	assert(dlinkFind(&local_server_list, source_p) == NULL);
841		assert(dlinkFind(&oper_list, source_p) == NULL);
842
843		exit_one_client(source_p, comment);
#	Line 888 | Line 850 | exit_client(struct Client *source_p, con
850		void
851		dead_link_on_write(struct Client *client_p, int ierrno)
852		{
853	<	dlink_node *ptr;
853	>	dlink_node *node;
854
855		if (IsDefunct(client_p))
856		return;
857
858	<	dbuf_clear(&client_p->localClient->buf_recvq);
859	<	dbuf_clear(&client_p->localClient->buf_sendq);
858	>	dbuf_clear(&client_p->connection->buf_recvq);
859	>	dbuf_clear(&client_p->connection->buf_sendq);
860
861		assert(dlinkFind(&abort_list, client_p) == NULL);
862	<	ptr = make_dlink_node();
862	>	node = make_dlink_node();
863		/* don't let exit_aborted_clients() finish yet */
864	<	dlinkAddTail(client_p, ptr, &abort_list);
864	>	dlinkAddTail(client_p, node, &abort_list);
865
866		if (eac_next == NULL)
867	<	eac_next = ptr;
867	>	eac_next = node;
868
869		SetDead(client_p); /* You are dead my friend */
870		}
#	Line 920 | Line 882 | dead_link_on_read(struct Client *client_
882		if (IsDefunct(client_p))
883		return;
884
885	<	dbuf_clear(&client_p->localClient->buf_recvq);
886	<	dbuf_clear(&client_p->localClient->buf_sendq);
885	>	dbuf_clear(&client_p->connection->buf_recvq);
886	>	dbuf_clear(&client_p->connection->buf_sendq);
887
888	<	current_error = get_sockerr(client_p->localClient->fd.fd);
888	>	current_error = get_sockerr(client_p->connection->fd.fd);
889
890		if (IsServer(client_p) || IsHandshake(client_p))
891		{
892	<	int connected = CurrentTime - client_p->localClient->firsttime;
892	>	int connected = CurrentTime - client_p->connection->firsttime;
893
894		if (error == 0)
895		{
#	Line 953 | Line 915 | dead_link_on_read(struct Client *client_
915		}
916
917		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
918	<	"%s had been connected for %d day%s, %2d:%02d:%02d",
918	>	"%s was connected for %d day%s, %2d:%02d:%02d",
919		client_p->name, connected/86400,
920		(connected/86400 == 1) ? "" : "s",
921		(connected % 86400) / 3600, (connected % 3600) / 60,
#	Line 1016 | Line 978 | exit_aborted_clients(void)
978		void
979		del_accept(struct split_nuh_item *accept_p, struct Client *client_p)
980		{
981	<	dlinkDelete(&accept_p->node, &client_p->localClient->acceptlist);
981	>	dlinkDelete(&accept_p->node, &client_p->connection->acceptlist);
982
983		MyFree(accept_p->nickptr);
984		MyFree(accept_p->userptr);
#	Line 1029 | Line 991 | find_accept(const char *nick, const char
991		const char *host, struct Client *client_p,
992		int (*cmpfunc)(const char *, const char *))
993		{
994	<	dlink_node *ptr = NULL;
994	>	dlink_node *node = NULL;
995
996	<	DLINK_FOREACH(ptr, client_p->localClient->acceptlist.head)
996	>	DLINK_FOREACH(node, client_p->connection->acceptlist.head)
997		{
998	<	struct split_nuh_item *accept_p = ptr->data;
998	>	struct split_nuh_item *accept_p = node->data;
999
1000		if (!cmpfunc(accept_p->nickptr, nick) &&
1001		!cmpfunc(accept_p->userptr, user) &&
#	Line 1055 | Line 1017 | int
1017		accept_message(struct Client *source,
1018		struct Client *target)
1019		{
1020	<	dlink_node *ptr = NULL;
1020	>	dlink_node *node = NULL;
1021
1022		if (source == target || find_accept(source->name, source->username,
1023		source->host, target, match))
1024		return 1;
1025
1026	<	if (HasUMode(target, UMODE_SOFTCALLERID))
1027	<	DLINK_FOREACH(ptr, target->channel.head)
1028	<	if (IsMember(source, ((struct Membership *)ptr->data)->chptr))
1026	>	if (!HasUMode(target, UMODE_CALLERID) && HasUMode(target, UMODE_SOFTCALLERID))
1027	>	DLINK_FOREACH(node, target->channel.head)
1028	>	if (IsMember(source, ((struct Membership *)node->data)->chptr))
1029		return 1;
1030
1031		return 0;
#	Line 1078 | Line 1040 | accept_message(struct Client *source,
1040		void
1041		del_all_accepts(struct Client *client_p)
1042		{
1043	<	dlink_node *ptr = NULL, *ptr_next = NULL;
1043	>	dlink_node *node = NULL, *node_next = NULL;
1044
1045	<	DLINK_FOREACH_SAFE(ptr, ptr_next, client_p->localClient->acceptlist.head)
1046	<	del_accept(ptr->data, client_p);
1045	>	DLINK_FOREACH_SAFE(node, node_next, client_p->connection->acceptlist.head)
1046	>	del_accept(node->data, client_p);
1047		}
1048
1049		unsigned int
#	Line 1090 | Line 1052 | idle_time_get(const struct Client *sourc
1052		unsigned int idle = 0;
1053		unsigned int min_idle = 0;
1054		unsigned int max_idle = 0;
1055	<	const struct ClassItem *class = get_class_ptr(&target_p->localClient->confs);
1055	>	const struct ClassItem *const class = get_class_ptr(&target_p->connection->confs);
1056
1057		if (!(class->flags & CLASS_FLAGS_FAKE_IDLE) || target_p == source_p)
1058	<	return CurrentTime - target_p->localClient->last_privmsg;
1058	>	return CurrentTime - target_p->connection->last_privmsg;
1059	>
1060		if (HasUMode(source_p, UMODE_OPER) &&
1061		!(class->flags & CLASS_FLAGS_HIDE_IDLE_FROM_OPERS))
1062	<	return CurrentTime - target_p->localClient->last_privmsg;
1062	>	return CurrentTime - target_p->connection->last_privmsg;
1063
1064		min_idle = class->min_idle;
1065		max_idle = class->max_idle;
#	Line 1107 | Line 1070 | idle_time_get(const struct Client *sourc
1070		if (class->flags & CLASS_FLAGS_RANDOM_IDLE)
1071		idle = genrand_int32();
1072		else
1073	<	idle = CurrentTime - target_p->localClient->last_privmsg;
1073	>	idle = CurrentTime - target_p->connection->last_privmsg;
1074
1075		if (!max_idle)
1076		idle = 0;
#	Line 1119 | Line 1082 | idle_time_get(const struct Client *sourc
1082
1083		return idle;
1084		}
1085	+
1086	+	/* client_init()
1087	+	*
1088	+	* inputs       - NONE
1089	+	* output       - NONE
1090	+	* side effects - initialize client free memory
1091	+	*/
1092	+	void
1093	+	client_init(void)
1094	+	{
1095	+	static struct event event_ping =
1096	+	{
1097	+	.name = "check_pings",
1098	+	.handler = check_pings,
1099	+	.when = 5
1100	+	};
1101	+
1102	+	client_pool = mp_pool_new(sizeof(struct Client), MP_CHUNK_SIZE_CLIENT);
1103	+	connection_pool = mp_pool_new(sizeof(struct Connection), MP_CHUNK_SIZE_CONNECTION);
1104	+	event_add(&event_ping, NULL);
1105	+	}

Diff Legend

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