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 4187 by michael, Sun Jul 6 16:14:34 2014 UTC vs.
Revision 7304 by michael, Wed Feb 10 10:45:46 2016 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-2016 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 35 | Line 35
35		#include "auth.h"
36		#include "s_bsd.h"
37		#include "conf.h"
38	+	#include "conf_gecos.h"
39		#include "log.h"
40		#include "misc.h"
41		#include "server.h"
#	Line 49 | Line 50
50		#include "watch.h"
51		#include "rng_mt.h"
52		#include "parse.h"
53	+	#include "ipcache.h"
54
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};
55
56	<	static void check_pings(void *);
57	<
58	<	static mp_pool_t *client_pool  = NULL;
59	<	static mp_pool_t *lclient_pool = NULL;
60	<
61	<	static dlink_list dead_list  = { NULL, NULL, 0};
62	<	static dlink_list abort_list = { NULL, NULL, 0};
56	>	dlink_list listing_client_list;
57	>	dlink_list unknown_list;
58	>	dlink_list local_client_list;
59	>	dlink_list local_server_list;
60	>	dlink_list global_client_list;
61	>	dlink_list global_server_list;
62	>	dlink_list oper_list;
63
64	+	static mp_pool_t *client_pool, *connection_pool;
65	+	static dlink_list dead_list, abort_list;
66		static dlink_node *eac_next;  /* next aborted client to exit */
67
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	–	static struct event event_ping =
87	–	{
88	–	.name = "check_pings",
89	–	.handler = check_pings,
90	–	.when = 5
91	–	};
92	–
93	–	client_pool = mp_pool_new(sizeof(struct Client), MP_CHUNK_SIZE_CLIENT);
94	–	lclient_pool = mp_pool_new(sizeof(struct LocalUser), MP_CHUNK_SIZE_LCLIENT);
95	–	event_add(&event_ping, NULL);
96	–	}
68
69		/*
70		* make_client - create a new Client struct and set it to initial state.
#	Line 113 | Line 84 | client_init(void)
84		struct Client *
85		make_client(struct Client *from)
86		{
87	<	struct Client *client_p = mp_pool_get(client_pool);
87	>	struct Client *const client_p = mp_pool_get(client_pool);
88
89		if (!from)
90		{
91	<	client_p->from                      = client_p; /* 'from' of local client is self! */
92	<	client_p->localClient               = mp_pool_get(lclient_pool);
93	<	client_p->localClient->since        = CurrentTime;
94	<	client_p->localClient->lasttime     = CurrentTime;
95	<	client_p->localClient->firsttime    = CurrentTime;
96	<	client_p->localClient->registration = REG_INIT;
91	>	client_p->from = client_p;  /* 'from' of local client is self! */
92	>	client_p->connection = mp_pool_get(connection_pool);
93	>	client_p->connection->since = CurrentTime;
94	>	client_p->connection->lasttime = CurrentTime;
95	>	client_p->connection->firsttime = CurrentTime;
96	>	client_p->connection->registration = REG_INIT;
97
98		/* as good a place as any... */
99	<	dlinkAdd(client_p, &client_p->localClient->lclient_node, &unknown_list);
99	>	dlinkAdd(client_p, &client_p->connection->lclient_node, &unknown_list);
100		}
101		else
102	<	client_p->from = from; /* 'from' of local client is self! */
102	>	client_p->from = from;
103
104		client_p->idhnext = client_p;
105	<	client_p->hnext  = client_p;
105	>	client_p->hnext = client_p;
106		SetUnknown(client_p);
107		strcpy(client_p->username, "unknown");
108	<	strcpy(client_p->svid, "0");
108	>	strcpy(client_p->account, "*");
109
110		return client_p;
111		}
#	Line 149 | Line 120 | make_client(struct Client *from)
120		static void
121		free_client(struct Client *client_p)
122		{
152	–	assert(client_p);
123		assert(client_p != &me);
124		assert(client_p->hnext == client_p);
125		assert(client_p->idhnext == client_p);
126		assert(client_p->channel.head == NULL);
127		assert(dlink_list_length(&client_p->channel) == 0);
128		assert(dlink_list_length(&client_p->whowas) == 0);
129	<	assert(!IsServer(client_p) || client_p->serv);
129	>	assert(dlink_list_length(&client_p->svstags) == 0);
130
131	<	MyFree(client_p->serv);
132	<	MyFree(client_p->certfp);
131	>	xfree(client_p->serv);
132	>	xfree(client_p->certfp);
133
134		if (MyConnect(client_p))
135		{
136	<	assert(client_p->localClient->invited.head == NULL);
137	<	assert(dlink_list_length(&client_p->localClient->invited) == 0);
138	<	assert(dlink_list_length(&client_p->localClient->watches) == 0);
139	<	assert(IsClosing(client_p) && IsDead(client_p));
170	<
171	<	MyFree(client_p->localClient->response);
172	<	MyFree(client_p->localClient->auth_oper);
136	>	assert(client_p->connection->invited.head == NULL);
137	>	assert(dlink_list_length(&client_p->connection->invited) == 0);
138	>	assert(dlink_list_length(&client_p->connection->watches) == 0);
139	>	assert(HasFlag(client_p, FLAGS_CLOSING) && IsDead(client_p));
140
141		/*
142	<	* clean up extra sockets from P-lines which have been discarded.
142	>	* Clean up extra sockets from listen {} blocks which have been discarded.
143		*/
144	<	if (client_p->localClient->listener)
144	>	if (client_p->connection->listener)
145		{
146	<	assert(0 < client_p->localClient->listener->ref_count);
147	<	if (0 == --client_p->localClient->listener->ref_count &&
181	<	!client_p->localClient->listener->active)
182	<	free_listener(client_p->localClient->listener);
146	>	listener_release(client_p->connection->listener);
147	>	client_p->connection->listener = NULL;
148		}
149
150	<	dbuf_clear(&client_p->localClient->buf_recvq);
151	<	dbuf_clear(&client_p->localClient->buf_sendq);
150	>	dbuf_clear(&client_p->connection->buf_recvq);
151	>	dbuf_clear(&client_p->connection->buf_sendq);
152
153	<	mp_pool_release(client_p->localClient);
153	>	mp_pool_release(client_p->connection);
154		}
155
156		mp_pool_release(client_p);
157		}
158
159	<	/*
160	<	* check_pings - go through the local client list and check activity
161	<	* kill off stuff that should die
162	<	*
163	<	* inputs       - NOT USED (from event)
199	<	* output       - next time_t when check_pings() should be called again
200	<	* side effects -
201	<	*
202	<	*
203	<	* A PING can be sent to clients as necessary.
204	<	*
205	<	* Client/Server ping outs are handled.
206	<	*/
159	>	void
160	>	client_attach_svstag(struct Client *client_p, unsigned int numeric,
161	>	const char *umodes, const char *const tag)
162	>	{
163	>	const struct user_modes *tab = NULL;
164
165	<	/*
166	<	* Addon from adrian. We used to call this after nextping seconds,
210	<	* however I've changed it to run once a second. This is only for
211	<	* PING timeouts, not K/etc-line checks (thanks dianora!). Having it
212	<	* run once a second makes life a lot easier - when a new client connects
213	<	* and they need a ping in 4 seconds, if nextping was set to 20 seconds
214	<	* we end up waiting 20 seconds. This is stupid. :-)
215	<	* I will optimise (hah!) check_pings() once I've finished working on
216	<	* tidying up other network IO evilnesses.
217	<	*     -- adrian
218	<	*/
165	>	if (numeric >= ERR_LAST_ERR_MSG || *umodes != '+')
166	>	return;
167
168	<	static void
169	<	check_pings(void *notused)
168	>	struct ServicesTag *svstag = xcalloc(sizeof(*svstag));
169	>	svstag->numeric = numeric;
170	>	svstag->tag = xstrdup(tag);
171	>
172	>	for (const char *m = umodes + 1; *m; ++m)
173	>	if ((tab = umode_map[(unsigned char)*m]))
174	>	svstag->umodes |= tab->flag;
175	>
176	>	if (numeric != RPL_WHOISOPERATOR)
177	>	dlinkAddTail(svstag, &svstag->node, &client_p->svstags);
178	>	else
179	>	dlinkAdd(svstag, &svstag->node, &client_p->svstags);
180	>	}
181	>
182	>	void
183	>	client_clear_svstags(struct Client *client_p)
184		{
185	<	check_pings_list(&local_client_list);
186	<	check_pings_list(&serv_list);
187	<	check_unknowns_list();
185	>	while (client_p->svstags.head)
186	>	{
187	>	struct ServicesTag *svstag = client_p->svstags.head->data;
188	>
189	>	dlinkDelete(&svstag->node, &client_p->svstags);
190	>	xfree(svstag->tag);
191	>	xfree(svstag);
192	>	}
193		}
194
195		/* check_pings_list()
#	Line 234 | Line 201 | check_pings(void *notused)
201		static void
202		check_pings_list(dlink_list *list)
203		{
204	<	char scratch[IRCD_BUFSIZE];
204	>	char buf[32] = "";  /* 32 = sizeof("Ping timeout: 999999999 seconds") */
205		int ping = 0;      /* ping time value from client */
206	<	dlink_node *ptr = NULL, *next_ptr = NULL;
206	>	dlink_node *node = NULL, *node_next = NULL;
207
208	<	DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
208	>	DLINK_FOREACH_SAFE(node, node_next, list->head)
209		{
210	<	struct Client *client_p = ptr->data;
210	>	struct Client *client_p = node->data;
211
245	–	/*
246	–	** Note: No need to notify opers here. It's
247	–	** already done when "FLAGS_DEADSOCKET" is set.
248	–	*/
212		if (IsDead(client_p))
213	<	{
251	<	/* Ignore it, its been exited already */
252	<	continue;
253	<	}
213	>	continue;  /* Ignore it, its been exited already */
214
215	<	if (!IsRegistered(client_p))
216	<	ping = CONNECTTIMEOUT;
215	>	if (IsClient(client_p) || IsServer(client_p))
216	>	ping = get_client_ping(&client_p->connection->confs);
217		else
218	<	ping = get_client_ping(&client_p->localClient->confs);
218	>	ping = CONNECTTIMEOUT;
219
220	<	if (ping < CurrentTime - client_p->localClient->lasttime)
220	>	if (ping < CurrentTime - client_p->connection->lasttime)
221		{
222	<	if (!IsPingSent(client_p))
222	>	if (!HasFlag(client_p, FLAGS_PINGSENT))
223		{
224		/*
225	<	* if we havent PINGed the connection and we havent
225	>	* If we haven't PINGed the connection and we haven't
226		* heard from it in a while, PING it to make sure
227		* it is still alive.
228		*/
229	<	SetPingSent(client_p);
230	<	client_p->localClient->lasttime = CurrentTime - ping;
229	>	AddFlag(client_p, FLAGS_PINGSENT);
230	>	client_p->connection->lasttime = CurrentTime - ping;
231		sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
232		}
233		else
234		{
235	<	if (CurrentTime - client_p->localClient->lasttime >= 2 * ping)
235	>	if (CurrentTime - client_p->connection->lasttime >= 2 * ping)
236		{
237		/*
238		* If the client/server hasn't talked to us in 2*ping seconds
#	Line 280 | Line 240 | check_pings_list(dlink_list *list)
240		*/
241		if (IsServer(client_p) || IsHandshake(client_p))
242		{
243	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
243	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
244		"No response from %s, closing link",
245	<	get_client_name(client_p, HIDE_IP));
246	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
245	>	get_client_name(client_p, SHOW_IP));
246	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
247		"No response from %s, closing link",
248		get_client_name(client_p, MASK_IP));
249		ilog(LOG_TYPE_IRCD, "No response from %s, closing link",
250	<	get_client_name(client_p, HIDE_IP));
250	>	get_client_name(client_p, SHOW_IP));
251		}
252
253	<	snprintf(scratch, sizeof(scratch), "Ping timeout: %d seconds",
254	<	(int)(CurrentTime - client_p->localClient->lasttime));
255	<	exit_client(client_p, scratch);
253	>	snprintf(buf, sizeof(buf), "Ping timeout: %ji seconds",
254	>	(CurrentTime - client_p->connection->lasttime));
255	>	exit_client(client_p, buf);
256		}
257		}
258		}
#	Line 308 | Line 268 | check_pings_list(dlink_list *list)
268		static void
269		check_unknowns_list(void)
270		{
271	<	dlink_node *ptr = NULL, *ptr_next = NULL;
271	>	dlink_node *node = NULL, *node_next = NULL;
272
273	<	DLINK_FOREACH_SAFE(ptr, ptr_next, unknown_list.head)
273	>	DLINK_FOREACH_SAFE(node, node_next, unknown_list.head)
274		{
275	<	struct Client *client_p = ptr->data;
275	>	struct Client *client_p = node->data;
276
277		/*
278		* Check UNKNOWN connections - if they have been in this state
279		* for > 30s, close them.
280		*/
281	<	if (IsAuthFinished(client_p) && (CurrentTime - client_p->localClient->firsttime) > 30)
281	>	if (HasFlag(client_p, FLAGS_FINISHED_AUTH) && (CurrentTime - client_p->connection->firsttime) > 30)
282		exit_client(client_p, "Registration timed out");
283		}
284		}
285
286	+	/*
287	+	* check_pings - go through the local client list and check activity
288	+	* kill off stuff that should die
289	+	*
290	+	* inputs       - NOT USED (from event)
291	+	* output       - next time_t when check_pings() should be called again
292	+	* side effects -
293	+	*
294	+	*
295	+	* A PING can be sent to clients as necessary.
296	+	*
297	+	* Client/Server ping outs are handled.
298	+	*/
299	+
300	+	/*
301	+	* Addon from adrian. We used to call this after nextping seconds,
302	+	* however I've changed it to run once a second. This is only for
303	+	* PING timeouts, not K/etc-line checks (thanks dianora!). Having it
304	+	* run once a second makes life a lot easier - when a new client connects
305	+	* and they need a ping in 4 seconds, if nextping was set to 20 seconds
306	+	* we end up waiting 20 seconds. This is stupid. :-)
307	+	* I will optimise (hah!) check_pings() once I've finished working on
308	+	* tidying up other network IO evilnesses.
309	+	*     -- adrian
310	+	*/
311	+
312	+	static void
313	+	check_pings(void *unused)
314	+	{
315	+	check_pings_list(&local_client_list);
316	+	check_pings_list(&local_server_list);
317	+	check_unknowns_list();
318	+	}
319	+
320		/* check_conf_klines()
321		*
322		* inputs       - NONE
#	Line 333 | Line 327 | check_unknowns_list(void)
327		void
328		check_conf_klines(void)
329		{
330	<	struct MaskItem *conf = NULL;
331	<	dlink_node *ptr = NULL, *ptr_next = NULL;
330	>	dlink_node *node = NULL, *node_next = NULL;
331	>	void *ptr;
332
333	<	DLINK_FOREACH_SAFE(ptr, ptr_next, local_client_list.head)
333	>	DLINK_FOREACH_SAFE(node, node_next, local_client_list.head)
334		{
335	<	struct Client *client_p = ptr->data;
335	>	struct Client *client_p = node->data;
336
337	<	/* If a client is already being exited
338	<	*/
345	<	if (IsDead(client_p) || !IsClient(client_p))
337	>	/* If a client is already being exited */
338	>	if (IsDead(client_p))
339		continue;
340
341	<	if ((conf = find_conf_by_address(NULL, &client_p->localClient->ip, CONF_DLINE,
342	<	client_p->localClient->aftype, NULL, NULL, 1)))
350	<	{
351	<	conf_try_ban(client_p, conf);
352	<	continue; /* and go examine next fd/client_p */
353	<	}
354	<
355	<	if (ConfigFileEntry.glines)
341	>	if ((ptr = find_conf_by_address(NULL, &client_p->connection->ip, CONF_DLINE,
342	>	client_p->connection->aftype, NULL, NULL, 1)))
343		{
344	<	if ((conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
345	<	CONF_GLINE, client_p->localClient->aftype,
346	<	client_p->username, NULL, 1)))
360	<	{
361	<	conf_try_ban(client_p, conf);
362	<	/* and go examine next fd/client_p */
363	<	continue;
364	<	}
344	>	const struct MaskItem *conf = ptr;
345	>	conf_try_ban(client_p, CLIENT_BAN_DLINE, conf->reason);
346	>	continue;  /* and go examine next Client */
347		}
348
349	<	if ((conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
350	<	CONF_KLINE, client_p->localClient->aftype,
351	<	client_p->username, NULL, 1)))
349	>	if ((ptr = find_conf_by_address(client_p->host, &client_p->connection->ip,
350	>	CONF_KLINE, client_p->connection->aftype,
351	>	client_p->username, NULL, 1)))
352		{
353	<	conf_try_ban(client_p, conf);
354	<	continue;
353	>	const struct MaskItem *conf = ptr;
354	>	conf_try_ban(client_p, CLIENT_BAN_KLINE, conf->reason);
355	>	continue;  /* and go examine next Client */
356		}
357
358	<	if ((conf = find_matching_name_conf(CONF_XLINE,  client_p->info,
376	<	NULL, NULL, 0)))
358	>	if ((ptr = gecos_find(client_p->info, match)))
359		{
360	<	conf_try_ban(client_p, conf);
361	<	continue;
360	>	const struct GecosItem *conf = ptr;
361	>	conf_try_ban(client_p, CLIENT_BAN_XLINE, conf->reason);
362	>	continue;  /* and go examine next Client */
363		}
364		}
365
366	<	/* also check the unknowns list for new dlines */
367	<	DLINK_FOREACH_SAFE(ptr, ptr_next, unknown_list.head)
366	>	/* Also check the unknowns list for new dlines */
367	>	DLINK_FOREACH_SAFE(node, node_next, unknown_list.head)
368		{
369	<	struct Client *client_p = ptr->data;
369	>	struct Client *client_p = node->data;
370
371	<	if ((conf = find_conf_by_address(NULL, &client_p->localClient->ip, CONF_DLINE,
372	<	client_p->localClient->aftype, NULL, NULL, 1)))
371	>	if ((ptr = find_conf_by_address(NULL, &client_p->connection->ip, CONF_DLINE,
372	>	client_p->connection->aftype, NULL, NULL, 1)))
373		{
374	<	conf_try_ban(client_p, conf);
375	<	continue; /* and go examine next fd/client_p */
374	>	const struct MaskItem *conf = ptr;
375	>	conf_try_ban(client_p, CLIENT_BAN_DLINE, conf->reason);
376	>	continue;  /* and go examine next Client */
377		}
378		}
379		}
#	Line 403 | Line 387 | check_conf_klines(void)
387		* side effects - given client_p is banned
388		*/
389		void
390	<	conf_try_ban(struct Client *client_p, struct MaskItem *conf)
390	>	conf_try_ban(struct Client *client_p, int type, const char *reason)
391		{
392	<	const char *user_reason = NULL;  /* What is sent to user */
409	<	const char *type_string = NULL;
410	<	const char dline_string[] = "D-line";
411	<	const char kline_string[] = "K-line";
412	<	const char gline_string[] = "G-line";
413	<	const char xline_string[] = "X-line";
392	>	char ban_type = '?';
393
394	<	switch (conf->type)
394	>	switch (type)
395		{
396	<	case CONF_KLINE:
397	<	if (IsExemptKline(client_p))
396	>	case CLIENT_BAN_KLINE:
397	>	if (HasFlag(client_p, FLAGS_EXEMPTKLINE))
398		{
399	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
399	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
400		"KLINE over-ruled for %s, client is kline_exempt",
401		get_client_name(client_p, HIDE_IP));
402		return;
403		}
404
405	<	type_string = kline_string;
405	>	ban_type = 'K';
406		break;
407	<	case CONF_DLINE:
408	<	if (find_conf_by_address(NULL, &client_p->localClient->ip, CONF_EXEMPT,
409	<	client_p->localClient->aftype, NULL, NULL, 1))
407	>	case CLIENT_BAN_DLINE:
408	>	if (find_conf_by_address(NULL, &client_p->connection->ip, CONF_EXEMPT,
409	>	client_p->connection->aftype, NULL, NULL, 1))
410		return;
411	<	type_string = dline_string;
411	>	ban_type = 'D';
412		break;
413	<	case CONF_GLINE:
414	<	if (IsExemptKline(client_p) ||
436	<	IsExemptGline(client_p))
413	>	case CLIENT_BAN_XLINE:
414	>	if (HasFlag(client_p, FLAGS_EXEMPTXLINE))
415		{
416	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
417	<	"GLINE over-ruled for %s, client is %sline_exempt",
418	<	get_client_name(client_p, HIDE_IP), IsExemptKline(client_p) ? "k" : "g");
416	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
417	>	"XLINE over-ruled for %s, client is xline_exempt",
418	>	get_client_name(client_p, HIDE_IP));
419		return;
420		}
421
422	<	type_string = gline_string;
445	<	break;
446	<	case CONF_XLINE:
447	<	type_string = xline_string;
448	<	++conf->count;
422	>	ban_type = 'X';
423		break;
424		default:
425		assert(0);
426		break;
427		}
428
429	<	user_reason = conf->reason ? conf->reason : type_string;
430	<
457	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s active for %s",
458	<	type_string, get_client_name(client_p, HIDE_IP));
429	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE, "%c-line active for %s",
430	>	ban_type, get_client_name(client_p, HIDE_IP));
431
432		if (IsClient(client_p))
433	<	sendto_one_numeric(client_p, &me, ERR_YOUREBANNEDCREEP, user_reason);
433	>	sendto_one_numeric(client_p, &me, ERR_YOUREBANNEDCREEP, reason);
434
435	<	exit_client(client_p, user_reason);
435	>	exit_client(client_p, reason);
436		}
437
438		/* update_client_exit_stats()
#	Line 475 | Line 447 | update_client_exit_stats(struct Client *
447		if (IsClient(client_p))
448		{
449		assert(Count.total > 0);
450	+
451		--Count.total;
452		if (HasUMode(client_p, UMODE_OPER))
453		--Count.oper;
#	Line 485 | Line 458 | update_client_exit_stats(struct Client *
458		sendto_realops_flags(UMODE_EXTERNAL, L_ALL, SEND_NOTICE,
459		"Server %s split from %s",
460		client_p->name, client_p->servptr->name);
488	–
489	–	if (splitchecking && !splitmode)
490	–	check_splitmode(NULL);
461		}
462
463		/* find_person()
#	Line 520 | Line 490 | find_person(const struct Client *const s
490		struct Client *
491		find_chasing(struct Client *source_p, const char *name)
492		{
493	<	struct Client *who = find_person(source_p, name);
493	>	struct Client *target_p = find_person(source_p, name);
494
495	<	if (who)
496	<	return who;
495	>	if (target_p)
496	>	return target_p;
497
498		if (IsDigit(*name))
499		return NULL;
500
501	<	if ((who = whowas_get_history(name,
502	<	(time_t)ConfigFileEntry.kill_chase_time_limit))
503	<	== NULL)
501	>	target_p = whowas_get_history(name, (time_t)ConfigGeneral.kill_chase_time_limit);
502	>
503	>	if (!target_p)
504		{
505		sendto_one_numeric(source_p, &me, ERR_NOSUCHNICK, name);
506		return NULL;
507		}
508
509	<	return who;
509	>	return target_p;
510		}
511
512		/*
#	Line 548 | Line 518 | find_chasing(struct Client *source_p, co
518		*        But, this can be used to any client structure.
519		*
520		* NOTE 1:
521	<	*        Watch out the allocation of "nbuf", if either source_p->name
521	>	*        Watch out the allocation of "buf", if either source_p->name
522		*        or source_p->sockhost gets changed into pointers instead of
523		*        directly allocated within the structure...
524		*
525		* NOTE 2:
526		*        Function return either a pointer to the structure (source_p) or
527	<	*        to internal buffer (nbuf). *NEVER* use the returned pointer
527	>	*        to internal buffer (buf). *NEVER* use the returned pointer
528		*        to modify what it points!!!
529		*/
530		const char *
531		get_client_name(const struct Client *client_p, enum addr_mask_type type)
532		{
533	<	static char nbuf[HOSTLEN * 2 + USERLEN + 5];
564	<
565	<	assert(client_p);
533	>	static char buf[HOSTLEN * 2 + USERLEN + 4];  /* +4 for [,@,],\0 */
534
535		if (!MyConnect(client_p))
536		return client_p->name;
#	Line 575 | Line 543 | get_client_name(const struct Client *cli
543		type = MASK_IP;
544		}
545
578	–	if (ConfigFileEntry.hide_spoof_ips)
579	–	if (IsIPSpoof(client_p) && type == SHOW_IP)
580	–	type = MASK_IP;
581	–
546		/* And finally, let's get the host information, ip or name */
547		switch (type)
548		{
549		case SHOW_IP:
550	<	snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
550	>	snprintf(buf, sizeof(buf), "%s[%s@%s]",
551		client_p->name,
552		client_p->username, client_p->sockhost);
553		break;
554		case MASK_IP:
555	<	if (client_p->localClient->aftype == AF_INET)
556	<	snprintf(nbuf, sizeof(nbuf), "%s[%s@255.255.255.255]",
555	>	if (client_p->connection->aftype == AF_INET)
556	>	snprintf(buf, sizeof(buf), "%s[%s@255.255.255.255]",
557		client_p->name, client_p->username);
558		else
559	<	snprintf(nbuf, sizeof(nbuf), "%s[%s@ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]",
559	>	snprintf(buf, sizeof(buf), "%s[%s@ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]",
560		client_p->name, client_p->username);
561		break;
562	<	default:
563	<	snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
562	>	default:  /* HIDE_IP */
563	>	snprintf(buf, sizeof(buf), "%s[%s@%s]",
564		client_p->name,
565		client_p->username, client_p->host);
566		}
567
568	<	return nbuf;
568	>	return buf;
569		}
570
571		void
572		free_exited_clients(void)
573		{
574	<	dlink_node *ptr = NULL, *next = NULL;
574	>	dlink_node *node = NULL, *node_next = NULL;
575
576	<	DLINK_FOREACH_SAFE(ptr, next, dead_list.head)
576	>	DLINK_FOREACH_SAFE(node, node_next, dead_list.head)
577		{
578	<	free_client(ptr->data);
579	<	dlinkDelete(ptr, &dead_list);
580	<	free_dlink_node(ptr);
578	>	free_client(node->data);
579	>	dlinkDelete(node, &dead_list);
580	>	free_dlink_node(node);
581		}
582		}
583
#	Line 624 | Line 588 | free_exited_clients(void)
588		* The only messages generated are QUITs on channels.
589		*/
590		static void
591	<	exit_one_client(struct Client *source_p, const char *quitmsg)
591	>	exit_one_client(struct Client *source_p, const char *comment)
592		{
593	<	dlink_node *ptr = NULL, *ptr_next = NULL;
593	>	dlink_node *node = NULL, *node_next = NULL;
594
595		assert(!IsMe(source_p));
596	+	assert(source_p != &me);
597
598		if (IsClient(source_p))
599		{
600		dlinkDelete(&source_p->lnode, &source_p->servptr->serv->client_list);
601	+	dlinkDelete(&source_p->node, &global_client_list);
602
603		/*
604		* If a person is on a channel, send a QUIT notice
#	Line 640 | Line 606 | exit_one_client(struct Client *source_p,
606		* that the client can show the "**signoff" message).
607		* (Note: The notice is to the local clients *only*)
608		*/
609	<	sendto_common_channels_local(source_p, 0, 0, ":%s!%s@%s QUIT :%s",
609	>	sendto_common_channels_local(source_p, 0, 0, 0, ":%s!%s@%s QUIT :%s",
610		source_p->name, source_p->username,
611	<	source_p->host, quitmsg);
612	<	DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->channel.head)
613	<	remove_user_from_channel(ptr->data);
611	>	source_p->host, comment);
612	>
613	>	DLINK_FOREACH_SAFE(node, node_next, source_p->channel.head)
614	>	remove_user_from_channel(node->data);
615	>
616	>	client_clear_svstags(source_p);
617
618		whowas_add_history(source_p, 0);
619		whowas_off_history(source_p);
#	Line 653 | Line 622 | exit_one_client(struct Client *source_p,
622
623		if (MyConnect(source_p))
624		{
625	<	/* Clean up invitefield */
657	<	DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->localClient->invited.head)
658	<	del_invite(ptr->data, source_p);
659	<
625	>	clear_invites_client(source_p);
626		del_all_accepts(source_p);
627		}
628		}
629		else if (IsServer(source_p))
630		{
631		dlinkDelete(&source_p->lnode, &source_p->servptr->serv->server_list);
632	+	dlinkDelete(&source_p->node, &global_client_list);
633
634	<	if ((ptr = dlinkFindDelete(&global_serv_list, source_p)))
635	<	free_dlink_node(ptr);
634	>	if ((node = dlinkFindDelete(&global_server_list, source_p)))
635	>	free_dlink_node(node);
636		}
637
638		/* Remove source_p from the client lists */
639		if (source_p->id[0])
640		hash_del_id(source_p);
641	+
642		if (source_p->name[0])
643		hash_del_client(source_p);
644
645	<	if (IsUserHostIp(source_p))
646	<	delete_user_host(source_p->username, source_p->host, !MyConnect(source_p));
679	<
680	<	if (source_p->node.next)
681	<	dlinkDelete(&source_p->node, &global_client_list);
645	>	if (HasFlag(source_p, FLAGS_USERHOST))
646	>	userhost_del(source_p->username, source_p->host, !MyConnect(source_p));
647
648		update_client_exit_stats(source_p);
649
#	Line 697 | Line 662 | exit_one_client(struct Client *source_p,
662		* actually removing things off llists.   tweaked from +CSr31  -orabidoo
663		*/
664		static void
665	<	recurse_remove_clients(struct Client *source_p, const char *quitmsg)
665	>	recurse_remove_clients(struct Client *source_p, const char *comment)
666		{
667	<	dlink_node *ptr = NULL, *ptr_next = NULL;
667	>	dlink_node *node = NULL, *node_next = NULL;
668
669	<	DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->serv->client_list.head)
670	<	exit_one_client(ptr->data, quitmsg);
669	>	DLINK_FOREACH_SAFE(node, node_next, source_p->serv->client_list.head)
670	>	exit_one_client(node->data, comment);
671
672	<	DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->serv->server_list.head)
672	>	DLINK_FOREACH_SAFE(node, node_next, source_p->serv->server_list.head)
673		{
674	<	recurse_remove_clients(ptr->data, quitmsg);
675	<	exit_one_client(ptr->data, quitmsg);
674	>	recurse_remove_clients(node->data, comment);
675	>	exit_one_client(node->data, comment);
676		}
677		}
678
#	Line 731 | Line 696 | recurse_remove_clients(struct Client *so
696		void
697		exit_client(struct Client *source_p, const char *comment)
698		{
699	<	dlink_node *m = NULL;
699	>	dlink_node *node = NULL;
700	>
701	>	assert(!IsMe(source_p));
702	>	assert(source_p != &me);
703
704		if (MyConnect(source_p))
705		{
706		/* DO NOT REMOVE. exit_client can be called twice after a failed
707		* read/write.
708		*/
709	<	if (IsClosing(source_p))
709	>	if (HasFlag(source_p, FLAGS_CLOSING))
710		return;
711
712	<	SetClosing(source_p);
712	>	AddFlag(source_p, FLAGS_CLOSING);
713
714	<	if (IsIpHash(source_p))
715	<	remove_one_ip(&source_p->localClient->ip);
714	>	if (HasFlag(source_p, FLAGS_IPHASH))
715	>	{
716	>	DelFlag(source_p, FLAGS_IPHASH);
717	>	ipcache_remove_address(&source_p->connection->ip);
718	>	}
719
720	<	delete_auth(&source_p->localClient->auth);
720	>	delete_auth(&source_p->connection->auth);
721
722	<	/*
752	<	* This source_p could have status of one of STAT_UNKNOWN, STAT_CONNECTING
753	<	* STAT_HANDSHAKE or STAT_UNKNOWN
754	<	* all of which are lumped together into unknown_list
755	<	*
756	<	* In all above cases IsRegistered() will not be true.
757	<	*/
758	<	if (!IsRegistered(source_p))
722	>	if (IsClient(source_p))
723		{
724	<	assert(dlinkFind(&unknown_list, source_p));
724	>	time_t on_for = CurrentTime - source_p->connection->firsttime;
725
762	–	dlinkDelete(&source_p->localClient->lclient_node, &unknown_list);
763	–	}
764	–	else if (IsClient(source_p))
765	–	{
766	–	time_t on_for = CurrentTime - source_p->localClient->firsttime;
726		assert(Count.local > 0);
727	<	Count.local--;
727	>
728	>	--Count.local;
729
730		if (HasUMode(source_p, UMODE_OPER))
731	<	if ((m = dlinkFindDelete(&oper_list, source_p)))
732	<	free_dlink_node(m);
731	>	if ((node = dlinkFindDelete(&oper_list, source_p)))
732	>	free_dlink_node(node);
733
734		assert(dlinkFind(&local_client_list, source_p));
735	<	dlinkDelete(&source_p->localClient->lclient_node, &local_client_list);
735	>	dlinkDelete(&source_p->connection->lclient_node, &local_client_list);
736
737	<	if (source_p->localClient->list_task)
737	>	if (source_p->connection->list_task)
738		free_list_task(source_p);
739
740		watch_del_watch_list(source_p);
741	+
742		sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
743		"Client exiting: %s (%s@%s) [%s] [%s]",
744	<	source_p->name, source_p->username, source_p->host, comment,
745	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
746	<	"255.255.255.255" : source_p->sockhost);
747	<	ilog(LOG_TYPE_USER, "%s (%3u:%02u:%02u): %s!%s@%s %llu/%llu",
748	<	myctime(source_p->localClient->firsttime), (unsigned int)(on_for / 3600),
744	>	source_p->name, source_p->username, source_p->host,
745	>	source_p->sockhost, comment);
746	>
747	>	ilog(LOG_TYPE_USER, "%s (%3u:%02u:%02u): %s!%s@%s %ju/%ju",
748	>	date_ctime(source_p->connection->firsttime), (unsigned int)(on_for / 3600),
749		(unsigned int)((on_for % 3600)/60), (unsigned int)(on_for % 60),
750		source_p->name, source_p->username, source_p->host,
751	<	source_p->localClient->send.bytes>>10,
752	<	source_p->localClient->recv.bytes>>10);
751	>	source_p->connection->send.bytes>>10,
752	>	source_p->connection->recv.bytes>>10);
753		}
754		else if (IsServer(source_p))
755		{
756		assert(Count.myserver > 0);
757	+
758		--Count.myserver;
759
760	<	assert(dlinkFind(&serv_list, source_p));
761	<	dlinkDelete(&source_p->localClient->lclient_node, &serv_list);
760	>	assert(dlinkFind(&local_server_list, source_p));
761	>	dlinkDelete(&source_p->connection->lclient_node, &local_server_list);
762	>	}
763	>	else
764	>	{
765	>	assert(dlinkFind(&unknown_list, source_p));
766	>	dlinkDelete(&source_p->connection->lclient_node, &unknown_list);
767		}
768
769		if (!IsDead(source_p))
#	Line 819 | Line 786 | exit_client(struct Client *source_p, con
786		}
787		else if (IsClient(source_p) && HasFlag(source_p->servptr, FLAGS_EOB))
788		sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
789	<	"Client exiting at %s: %s (%s@%s) [%s]",
789	>	"Client exiting at %s: %s (%s@%s) [%s] [%s]",
790		source_p->servptr->name, source_p->name,
791	<	source_p->username, source_p->host, comment);
791	>	source_p->username, source_p->host, source_p->sockhost, comment);
792
793		if (IsServer(source_p))
794		{
795		char splitstr[HOSTLEN + HOSTLEN + 2] = "";
796
797	<	/* This shouldn't ever happen */
798	<	assert(source_p->serv && source_p->servptr);
797	>	assert(source_p->serv);
798	>	assert(source_p->servptr);
799
800		if (ConfigServerHide.hide_servers)
801		/*
#	Line 840 | 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	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
820	<	"%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
821	<	source_p->name, (int)(CurrentTime - source_p->localClient->firsttime),
822	<	source_p->localClient->send.bytes >> 10,
823	<	source_p->localClient->recv.bytes >> 10);
824	<	ilog(LOG_TYPE_IRCD, "%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);
819	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
820	>	"%s was connected for %s. %ju/%ju sendK/recvK.",
821	>	source_p->name, time_dissect(CurrentTime - source_p->connection->firsttime),
822	>	source_p->connection->send.bytes >> 10,
823	>	source_p->connection->recv.bytes >> 10);
824	>	ilog(LOG_TYPE_IRCD, "%s was connected for %s. %ju/%ju sendK/recvK.",
825	>	source_p->name, time_dissect(CurrentTime - source_p->connection->firsttime),
826	>	source_p->connection->send.bytes >> 10,
827	>	source_p->connection->recv.bytes >> 10);
828		}
829		}
830		else if (IsClient(source_p) && !HasFlag(source_p, FLAGS_KILLED))
831	<	sendto_server(source_p->from, NOCAPS, NOCAPS, ":%s QUIT :%s",
831	>	sendto_server(source_p->from, 0, 0, ":%s QUIT :%s",
832		source_p->id, comment);
833
834		/* The client *better* be off all of the lists */
835		assert(dlinkFind(&unknown_list, source_p) == NULL);
836		assert(dlinkFind(&local_client_list, source_p) == NULL);
837	<	assert(dlinkFind(&serv_list, source_p) == NULL);
837	>	assert(dlinkFind(&local_server_list, source_p) == NULL);
838		assert(dlinkFind(&oper_list, source_p) == NULL);
839
840		exit_one_client(source_p, comment);
#	Line 880 | Line 847 | exit_client(struct Client *source_p, con
847		void
848		dead_link_on_write(struct Client *client_p, int ierrno)
849		{
850	<	dlink_node *ptr;
850	>	dlink_node *node;
851
852		if (IsDefunct(client_p))
853		return;
854
855	<	dbuf_clear(&client_p->localClient->buf_recvq);
856	<	dbuf_clear(&client_p->localClient->buf_sendq);
855	>	dbuf_clear(&client_p->connection->buf_recvq);
856	>	dbuf_clear(&client_p->connection->buf_sendq);
857
858		assert(dlinkFind(&abort_list, client_p) == NULL);
859	<	ptr = make_dlink_node();
859	>	node = make_dlink_node();
860		/* don't let exit_aborted_clients() finish yet */
861	<	dlinkAddTail(client_p, ptr, &abort_list);
861	>	dlinkAddTail(client_p, node, &abort_list);
862
863		if (eac_next == NULL)
864	<	eac_next = ptr;
864	>	eac_next = node;
865
866		SetDead(client_p); /* You are dead my friend */
867		}
#	Line 912 | Line 879 | dead_link_on_read(struct Client *client_
879		if (IsDefunct(client_p))
880		return;
881
882	<	dbuf_clear(&client_p->localClient->buf_recvq);
883	<	dbuf_clear(&client_p->localClient->buf_sendq);
882	>	dbuf_clear(&client_p->connection->buf_recvq);
883	>	dbuf_clear(&client_p->connection->buf_sendq);
884
885	<	current_error = get_sockerr(client_p->localClient->fd.fd);
885	>	current_error = get_sockerr(client_p->connection->fd.fd);
886
887		if (IsServer(client_p) || IsHandshake(client_p))
888		{
922	–	int connected = CurrentTime - client_p->localClient->firsttime;
923	–
889		if (error == 0)
890		{
891		/* Admins get the real IP */
892	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
892	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
893		"Server %s closed the connection",
894		get_client_name(client_p, SHOW_IP));
895
896		/* Opers get a masked IP */
897	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
897	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
898		"Server %s closed the connection",
899		get_client_name(client_p, MASK_IP));
900
#	Line 944 | Line 909 | dead_link_on_read(struct Client *client_
909		get_client_name(client_p, MASK_IP), current_error);
910		}
911
912	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
913	<	"%s had been connected for %d day%s, %2d:%02d:%02d",
914	<	client_p->name, connected/86400,
950	<	(connected/86400 == 1) ? "" : "s",
951	<	(connected % 86400) / 3600, (connected % 3600) / 60,
952	<	connected % 60);
912	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
913	>	"%s was connected for %s",
914	>	client_p->name, time_dissect(CurrentTime - client_p->connection->firsttime));
915		}
916
917		if (error == 0)
#	Line 976 | Line 938 | exit_aborted_clients(void)
938
939		if (target_p == NULL)
940		{
941	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
941	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
942		"Warning: null client on abort_list!");
943		dlinkDelete(ptr, &abort_list);
944		free_dlink_node(ptr);
#	Line 985 | Line 947 | exit_aborted_clients(void)
947
948		dlinkDelete(ptr, &abort_list);
949
950	<	if (IsSendQExceeded(target_p))
950	>	if (HasFlag(target_p, FLAGS_SENDQEX))
951		notice = "Max SendQ exceeded";
952		else
953		notice = "Write error: connection closed";
#	Line 1008 | Line 970 | exit_aborted_clients(void)
970		void
971		del_accept(struct split_nuh_item *accept_p, struct Client *client_p)
972		{
973	<	dlinkDelete(&accept_p->node, &client_p->localClient->acceptlist);
973	>	dlinkDelete(&accept_p->node, &client_p->connection->acceptlist);
974
975	<	MyFree(accept_p->nickptr);
976	<	MyFree(accept_p->userptr);
977	<	MyFree(accept_p->hostptr);
978	<	MyFree(accept_p);
975	>	xfree(accept_p->nickptr);
976	>	xfree(accept_p->userptr);
977	>	xfree(accept_p->hostptr);
978	>	xfree(accept_p);
979		}
980
981		struct split_nuh_item *
#	Line 1021 | Line 983 | find_accept(const char *nick, const char
983		const char *host, struct Client *client_p,
984		int (*cmpfunc)(const char *, const char *))
985		{
986	<	dlink_node *ptr = NULL;
986	>	dlink_node *node = NULL;
987
988	<	DLINK_FOREACH(ptr, client_p->localClient->acceptlist.head)
988	>	DLINK_FOREACH(node, client_p->connection->acceptlist.head)
989		{
990	<	struct split_nuh_item *accept_p = ptr->data;
990	>	struct split_nuh_item *accept_p = node->data;
991
992		if (!cmpfunc(accept_p->nickptr, nick) &&
993		!cmpfunc(accept_p->userptr, user) &&
#	Line 1047 | Line 1009 | int
1009		accept_message(struct Client *source,
1010		struct Client *target)
1011		{
1012	<	dlink_node *ptr = NULL;
1012	>	dlink_node *node = NULL;
1013	>
1014	>	if (HasFlag(source, FLAGS_SERVICE) ||
1015	>	(HasUMode(source, UMODE_OPER) && ConfigGeneral.opers_bypass_callerid))
1016	>	return 1;
1017
1018		if (source == target || find_accept(source->name, source->username,
1019		source->host, target, match))
1020		return 1;
1021
1022	<	if (HasUMode(target, UMODE_SOFTCALLERID))
1023	<	DLINK_FOREACH(ptr, target->channel.head)
1024	<	if (IsMember(source, ((struct Membership *)ptr->data)->chptr))
1022	>	if (!HasUMode(target, UMODE_CALLERID) && HasUMode(target, UMODE_SOFTCALLERID))
1023	>	DLINK_FOREACH(node, target->channel.head)
1024	>	if (IsMember(source, ((struct Membership *)node->data)->chptr))
1025		return 1;
1026
1027		return 0;
#	Line 1070 | Line 1036 | accept_message(struct Client *source,
1036		void
1037		del_all_accepts(struct Client *client_p)
1038		{
1039	<	dlink_node *ptr = NULL, *ptr_next = NULL;
1039	>	dlink_node *node = NULL, *node_next = NULL;
1040
1041	<	DLINK_FOREACH_SAFE(ptr, ptr_next, client_p->localClient->acceptlist.head)
1042	<	del_accept(ptr->data, client_p);
1041	>	DLINK_FOREACH_SAFE(node, node_next, client_p->connection->acceptlist.head)
1042	>	del_accept(node->data, client_p);
1043		}
1044
1045		unsigned int
1046	<	idle_time_get(const struct Client *source_p, const struct Client *target_p)
1046	>	client_get_idle_time(const struct Client *source_p,
1047	>	const struct Client *target_p)
1048		{
1049		unsigned int idle = 0;
1050		unsigned int min_idle = 0;
1051		unsigned int max_idle = 0;
1052	<	const struct ClassItem *class = get_class_ptr(&target_p->localClient->confs);
1052	>	const struct ClassItem *const class = get_class_ptr(&target_p->connection->confs);
1053
1054		if (!(class->flags & CLASS_FLAGS_FAKE_IDLE) || target_p == source_p)
1055	<	return CurrentTime - target_p->localClient->last_privmsg;
1055	>	return CurrentTime - target_p->connection->last_privmsg;
1056	>
1057		if (HasUMode(source_p, UMODE_OPER) &&
1058		!(class->flags & CLASS_FLAGS_HIDE_IDLE_FROM_OPERS))
1059	<	return CurrentTime - target_p->localClient->last_privmsg;
1059	>	return CurrentTime - target_p->connection->last_privmsg;
1060
1061		min_idle = class->min_idle;
1062		max_idle = class->max_idle;
#	Line 1099 | Line 1067 | idle_time_get(const struct Client *sourc
1067		if (class->flags & CLASS_FLAGS_RANDOM_IDLE)
1068		idle = genrand_int32();
1069		else
1070	<	idle = CurrentTime - target_p->localClient->last_privmsg;
1070	>	idle = CurrentTime - target_p->connection->last_privmsg;
1071
1072		if (!max_idle)
1073		idle = 0;
#	Line 1111 | Line 1079 | idle_time_get(const struct Client *sourc
1079
1080		return idle;
1081		}
1082	+
1083	+	/* client_init()
1084	+	*
1085	+	* inputs       - NONE
1086	+	* output       - NONE
1087	+	* side effects - initialize client free memory
1088	+	*/
1089	+	void
1090	+	client_init(void)
1091	+	{
1092	+	static struct event event_ping =
1093	+	{
1094	+	.name = "check_pings",
1095	+	.handler = check_pings,
1096	+	.when = 5
1097	+	};
1098	+
1099	+	client_pool = mp_pool_new(sizeof(struct Client), MP_CHUNK_SIZE_CLIENT);
1100	+	connection_pool = mp_pool_new(sizeof(struct Connection), MP_CHUNK_SIZE_CONNECTION);
1101	+	event_add(&event_ping, NULL);
1102	+	}

Diff Legend

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