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 2583 by michael, Wed Nov 20 23:01:19 2013 UTC vs.
Revision 7244 by michael, Wed Feb 3 18:19:20 2016 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  client.c: Controls clients.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2002 by the past and present ircd coders, and others.
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 16 | 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	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file client.c
23	>	* \brief Controls clients.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
28		#include "list.h"
29		#include "client.h"
28	–	#include "channel_mode.h"
30		#include "event.h"
30	–	#include "fdlist.h"
31		#include "hash.h"
32		#include "irc_string.h"
33		#include "ircd.h"
34	–	#include "s_gline.h"
34		#include "numeric.h"
35	<	#include "packet.h"
37	<	#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"
46	<	#include "dbuf.h"
43	>	#include "user.h"
44		#include "memory.h"
45		#include "mempool.h"
46		#include "hostmask.h"
47		#include "listener.h"
51	–	#include "irc_res.h"
48		#include "userhost.h"
49		#include "watch.h"
50		#include "rng_mt.h"
51	+	#include "parse.h"
52	+	#include "ipcache.h"
53
56	–	dlink_list listing_client_list = { NULL, NULL, 0 };
57	–	/* Pointer to beginning of Client list */
58	–	dlink_list global_client_list = {NULL, NULL, 0};
59	–	/* unknown/client pointer lists */
60	–	dlink_list unknown_list = {NULL, NULL, 0};
61	–	dlink_list local_client_list = {NULL, NULL, 0};
62	–	dlink_list serv_list = {NULL, NULL, 0};
63	–	dlink_list global_serv_list = {NULL, NULL, 0};
64	–	dlink_list oper_list = {NULL, NULL, 0};
65	–
66	–	static EVH check_pings;
54
55	<	static mp_pool_t *client_pool  = NULL;
56	<	static mp_pool_t *lclient_pool = NULL;
57	<
58	<	static dlink_list dead_list  = { NULL, NULL, 0};
59	<	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
76	–	static void check_pings_list(dlink_list *);
77	–	static void check_unknowns_list(void);
78	–	static void ban_them(struct Client *, struct MaskItem *);
79	–
80	–
81	–	/* client_init()
82	–	*
83	–	* inputs       - NONE
84	–	* output       - NONE
85	–	* side effects - initialize client free memory
86	–	*/
87	–	void
88	–	client_init(void)
89	–	{
90	–	/* start off the check ping event ..  -- adrian
91	–	* Every 30 seconds is plenty -- db
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	–	eventAdd("check_pings", check_pings, NULL, 5);
96	–	}
67
68		/*
69		* make_client - create a new Client struct and set it to initial state.
#	Line 113 | 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);
86	>	struct Client *const client_p = mp_pool_get(client_pool);
87
88	<	memset(client_p, 0, sizeof(*client_p));
119	<
120	<	if (from == NULL)
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;
128	<	client_p->localClient->lasttime     = CurrentTime;
129	<	client_p->localClient->firsttime    = CurrentTime;
130	<	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;
105	<	client_p->status = STAT_UNKNOWN;
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 154 | Line 119 | make_client(struct Client *from)
119		static void
120		free_client(struct Client *client_p)
121		{
157	–	assert(client_p != NULL);
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);
130	>	xfree(client_p->serv);
131	>	xfree(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);
138	<	assert(IsClosing(client_p) && IsDead(client_p));
175	<
176	<	MyFree(client_p->localClient->response);
177	<	MyFree(client_p->localClient->auth_oper);
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(HasFlag(client_p, FLAGS_CLOSING) && IsDead(client_p));
139
140		/*
141	<	* clean up extra sockets from P-lines which have been discarded.
141	>	* Clean up extra sockets from listen {} blocks which have been discarded.
142		*/
143	<	if (client_p->localClient->listener)
143	>	if (client_p->connection->listener)
144		{
145	<	assert(0 < client_p->localClient->listener->ref_count);
146	<	if (0 == --client_p->localClient->listener->ref_count &&
186	<	!client_p->localClient->listener->active)
187	<	free_listener(client_p->localClient->listener);
145	>	listener_release(client_p->connection->listener);
146	>	client_p->connection->listener = NULL;
147		}
148
149	<	dbuf_clear(&client_p->localClient->buf_recvq);
150	<	dbuf_clear(&client_p->localClient->buf_sendq);
149	>	dbuf_clear(&client_p->connection->buf_recvq);
150	>	dbuf_clear(&client_p->connection->buf_sendq);
151
152	<	mp_pool_release(client_p->localClient);
152	>	mp_pool_release(client_p->connection);
153		}
154
155		mp_pool_release(client_p);
156		}
157
158	<	/*
159	<	* check_pings - go through the local client list and check activity
160	<	* kill off stuff that should die
161	<	*
162	<	* inputs       - NOT USED (from event)
204	<	* output       - next time_t when check_pings() should be called again
205	<	* side effects -
206	<	*
207	<	*
208	<	* A PING can be sent to clients as necessary.
209	<	*
210	<	* Client/Server ping outs are handled.
211	<	*/
158	>	void
159	>	client_attach_svstag(struct Client *client_p, unsigned int numeric,
160	>	const char *umodes, const char *const tag)
161	>	{
162	>	const struct user_modes *tab = NULL;
163
164	<	/*
165	<	* Addon from adrian. We used to call this after nextping seconds,
215	<	* however I've changed it to run once a second. This is only for
216	<	* PING timeouts, not K/etc-line checks (thanks dianora!). Having it
217	<	* run once a second makes life a lot easier - when a new client connects
218	<	* and they need a ping in 4 seconds, if nextping was set to 20 seconds
219	<	* we end up waiting 20 seconds. This is stupid. :-)
220	<	* I will optimise (hah!) check_pings() once I've finished working on
221	<	* tidying up other network IO evilnesses.
222	<	*     -- adrian
223	<	*/
164	>	if (numeric >= ERR_LAST_ERR_MSG || *umodes != '+')
165	>	return;
166
167	<	static void
168	<	check_pings(void *notused)
167	>	struct ServicesTag *svstag = xcalloc(sizeof(*svstag));
168	>	svstag->numeric = numeric;
169	>	svstag->tag = xstrdup(tag);
170	>
171	>	for (const char *m = umodes + 1; *m; ++m)
172	>	if ((tab = umode_map[(unsigned char)*m]))
173	>	svstag->umodes |= tab->flag;
174	>
175	>	if (numeric != RPL_WHOISOPERATOR)
176	>	dlinkAddTail(svstag, &svstag->node, &client_p->svstags);
177	>	else
178	>	dlinkAdd(svstag, &svstag->node, &client_p->svstags);
179	>	}
180	>
181	>	void
182	>	client_clear_svstags(struct Client *client_p)
183		{
184	<	check_pings_list(&local_client_list);
185	<	check_pings_list(&serv_list);
186	<	check_unknowns_list();
184	>	while (client_p->svstags.head)
185	>	{
186	>	struct ServicesTag *svstag = client_p->svstags.head->data;
187	>
188	>	dlinkDelete(&svstag->node, &client_p->svstags);
189	>	xfree(svstag->tag);
190	>	xfree(svstag);
191	>	}
192		}
193
194		/* check_pings_list()
#	Line 239 | Line 200 | check_pings(void *notused)
200		static void
201		check_pings_list(dlink_list *list)
202		{
203	<	char scratch[32];        /* way too generous but... */
203	>	char buf[32] = "";  /* 32 = sizeof("Ping timeout: 999999999 seconds") */
204		int ping = 0;      /* ping time value from client */
205	<	dlink_node *ptr = NULL, *next_ptr = NULL;
205	>	dlink_node *node = NULL, *node_next = NULL;
206
207	<	DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
207	>	DLINK_FOREACH_SAFE(node, node_next, list->head)
208		{
209	<	struct Client *client_p = ptr->data;
209	>	struct Client *client_p = node->data;
210
250	–	/*
251	–	** Note: No need to notify opers here. It's
252	–	** already done when "FLAGS_DEADSOCKET" is set.
253	–	*/
211		if (IsDead(client_p))
212	<	{
256	<	/* Ignore it, its been exited already */
257	<	continue;
258	<	}
212	>	continue;  /* Ignore it, its been exited already */
213
214	<	if (!IsRegistered(client_p))
215	<	ping = CONNECTTIMEOUT;
214	>	if (IsClient(client_p) || IsServer(client_p))
215	>	ping = get_client_ping(&client_p->connection->confs);
216		else
217	<	ping = get_client_ping(&client_p->localClient->confs);
217	>	ping = CONNECTTIMEOUT;
218
219	<	if (ping < CurrentTime - client_p->localClient->lasttime)
219	>	if (ping < CurrentTime - client_p->connection->lasttime)
220		{
221	<	if (!IsPingSent(client_p))
221	>	if (!HasFlag(client_p, FLAGS_PINGSENT))
222		{
223		/*
224	<	* if we havent PINGed the connection and we havent
224	>	* If we haven't PINGed the connection and we haven't
225		* heard from it in a while, PING it to make sure
226		* it is still alive.
227		*/
228	<	SetPingSent(client_p);
229	<	client_p->localClient->lasttime = CurrentTime - ping;
228	>	AddFlag(client_p, FLAGS_PINGSENT);
229	>	client_p->connection->lasttime = CurrentTime - ping;
230		sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
231		}
232		else
233		{
234	<	if (CurrentTime - client_p->localClient->lasttime >= 2 * ping)
234	>	if (CurrentTime - client_p->connection->lasttime >= 2 * ping)
235		{
236		/*
237		* If the client/server hasn't talked to us in 2*ping seconds
#	Line 285 | Line 239 | check_pings_list(dlink_list *list)
239		*/
240		if (IsServer(client_p) || IsHandshake(client_p))
241		{
242	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
242	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
243		"No response from %s, closing link",
244	<	get_client_name(client_p, HIDE_IP));
245	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
244	>	get_client_name(client_p, SHOW_IP));
245	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
246		"No response from %s, closing link",
247		get_client_name(client_p, MASK_IP));
248		ilog(LOG_TYPE_IRCD, "No response from %s, closing link",
249	<	get_client_name(client_p, HIDE_IP));
249	>	get_client_name(client_p, SHOW_IP));
250		}
251
252	<	snprintf(scratch, sizeof(scratch), "Ping timeout: %d seconds",
253	<	(int)(CurrentTime - client_p->localClient->lasttime));
254	<	exit_client(client_p, &me, scratch);
252	>	snprintf(buf, sizeof(buf), "Ping timeout: %ji seconds",
253	>	(CurrentTime - client_p->connection->lasttime));
254	>	exit_client(client_p, buf);
255		}
256		}
257		}
#	Line 313 | Line 267 | check_pings_list(dlink_list *list)
267		static void
268		check_unknowns_list(void)
269		{
270	<	dlink_node *ptr, *next_ptr;
270	>	dlink_node *node = NULL, *node_next = NULL;
271
272	<	DLINK_FOREACH_SAFE(ptr, next_ptr, unknown_list.head)
272	>	DLINK_FOREACH_SAFE(node, node_next, unknown_list.head)
273		{
274	<	struct Client *client_p = ptr->data;
274	>	struct Client *client_p = node->data;
275
276		/*
277		* Check UNKNOWN connections - if they have been in this state
278		* for > 30s, close them.
279		*/
280	<	if (IsAuthFinished(client_p) && (CurrentTime - client_p->localClient->firsttime) > 30)
281	<	exit_client(client_p, &me, "Registration timed out");
280	>	if (HasFlag(client_p, FLAGS_FINISHED_AUTH) && (CurrentTime - client_p->connection->firsttime) > 30)
281	>	exit_client(client_p, "Registration timed out");
282		}
283		}
284
285	+	/*
286	+	* check_pings - go through the local client list and check activity
287	+	* kill off stuff that should die
288	+	*
289	+	* inputs       - NOT USED (from event)
290	+	* output       - next time_t when check_pings() should be called again
291	+	* side effects -
292	+	*
293	+	*
294	+	* A PING can be sent to clients as necessary.
295	+	*
296	+	* Client/Server ping outs are handled.
297	+	*/
298	+
299	+	/*
300	+	* Addon from adrian. We used to call this after nextping seconds,
301	+	* however I've changed it to run once a second. This is only for
302	+	* PING timeouts, not K/etc-line checks (thanks dianora!). Having it
303	+	* run once a second makes life a lot easier - when a new client connects
304	+	* and they need a ping in 4 seconds, if nextping was set to 20 seconds
305	+	* we end up waiting 20 seconds. This is stupid. :-)
306	+	* I will optimise (hah!) check_pings() once I've finished working on
307	+	* tidying up other network IO evilnesses.
308	+	*     -- adrian
309	+	*/
310	+
311	+	static void
312	+	check_pings(void *unused)
313	+	{
314	+	check_pings_list(&local_client_list);
315	+	check_pings_list(&local_server_list);
316	+	check_unknowns_list();
317	+	}
318	+
319		/* check_conf_klines()
320		*
321		* inputs       - NONE
#	Line 338 | Line 326 | check_unknowns_list(void)
326		void
327		check_conf_klines(void)
328		{
341	–	struct Client *client_p = NULL;       /* current local client_p being examined */
329		struct MaskItem *conf = NULL;
330	<	dlink_node *ptr, *next_ptr;
330	>	dlink_node *node = NULL, *node_next = NULL;
331
332	<	DLINK_FOREACH_SAFE(ptr, next_ptr, local_client_list.head)
332	>	DLINK_FOREACH_SAFE(node, node_next, local_client_list.head)
333		{
334	<	client_p = ptr->data;
334	>	struct Client *client_p = node->data;
335
336	<	/* If a client is already being exited
337	<	*/
351	<	if (IsDead(client_p) || !IsClient(client_p))
336	>	/* If a client is already being exited */
337	>	if (IsDead(client_p))
338		continue;
339
340	<	if ((conf = find_dline_conf(&client_p->localClient->ip,
341	<	client_p->localClient->aftype)) != NULL)
340	>	if ((conf = find_conf_by_address(NULL, &client_p->connection->ip, CONF_DLINE,
341	>	client_p->connection->aftype, NULL, NULL, 1)))
342		{
343	<	if (conf->type == CONF_EXEMPT)
344	<	continue;
359	<
360	<	ban_them(client_p, conf);
361	<	continue; /* and go examine next fd/client_p */
362	<	}
363	<
364	<	if (ConfigFileEntry.glines)
365	<	{
366	<	if (!(conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
367	<	CONF_GLINE, client_p->localClient->aftype,
368	<	client_p->username, NULL, 1)))
369	<	continue;
370	<
371	<	if (IsExemptKline(client_p) ||
372	<	IsExemptGline(client_p))
373	<	{
374	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
375	<	"GLINE over-ruled for %s, client is %sline_exempt",
376	<	get_client_name(client_p, HIDE_IP), IsExemptKline(client_p) ? "k" : "g");
377	<	continue;
378	<	}
379	<
380	<	ban_them(client_p, conf);
381	<	/* and go examine next fd/client_p */
382	<	continue;
343	>	conf_try_ban(client_p, conf);
344	>	continue;  /* and go examine next Client */
345		}
346
347	<	if ((conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
348	<	CONF_KLINE, client_p->localClient->aftype,
349	<	client_p->username, NULL, 1)) != NULL)
347	>	if ((conf = find_conf_by_address(client_p->host, &client_p->connection->ip,
348	>	CONF_KLINE, client_p->connection->aftype,
349	>	client_p->username, NULL, 1)))
350		{
351	<	if (IsExemptKline(client_p))
352	<	{
391	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
392	<	"KLINE over-ruled for %s, client is kline_exempt",
393	<	get_client_name(client_p, HIDE_IP));
394	<	continue;
395	<	}
396	<
397	<	ban_them(client_p, conf);
398	<	continue;
351	>	conf_try_ban(client_p, conf);
352	>	continue;  /* and go examine next Client */
353		}
354
355	<	if ((conf = find_matching_name_conf(CONF_XLINE,  client_p->info,
355	>	if ((conf = find_matching_name_conf(CONF_XLINE, client_p->info,
356		NULL, NULL, 0)))
357		{
358	<	ban_them(client_p, conf);
359	<	continue;
358	>	conf_try_ban(client_p, conf);
359	>	continue;  /* and go examine next Client */
360		}
361		}
362
363	<	/* also check the unknowns list for new dlines */
364	<	DLINK_FOREACH_SAFE(ptr, next_ptr, unknown_list.head)
363	>	/* Also check the unknowns list for new dlines */
364	>	DLINK_FOREACH_SAFE(node, node_next, unknown_list.head)
365		{
366	<	client_p = ptr->data;
366	>	struct Client *client_p = node->data;
367
368	<	if ((conf = find_dline_conf(&client_p->localClient->ip,
369	<	client_p->localClient->aftype)))
368	>	if ((conf = find_conf_by_address(NULL, &client_p->connection->ip, CONF_DLINE,
369	>	client_p->connection->aftype, NULL, NULL, 1)))
370		{
371	<	if (conf->type == CONF_EXEMPT)
372	<	continue;
419	<
420	<	exit_client(client_p, &me, "D-lined");
371	>	conf_try_ban(client_p, conf);
372	>	continue;  /* and go examine next Client */
373		}
374		}
375		}
376
377		/*
378	<	* ban_them
378	>	* conf_try_ban
379		*
380		* inputs       - pointer to client to ban
381		*              - pointer to MaskItem
382		* output       - NONE
383		* side effects - given client_p is banned
384		*/
385	<	static void
386	<	ban_them(struct Client *client_p, struct MaskItem *conf)
385	>	void
386	>	conf_try_ban(struct Client *client_p, struct MaskItem *conf)
387		{
388	<	const char *user_reason = NULL;  /* What is sent to user */
437	<	const char *type_string = NULL;
438	<	const char dline_string[] = "D-line";
439	<	const char kline_string[] = "K-line";
440	<	const char gline_string[] = "G-line";
441	<	const char xline_string[] = "X-line";
388	>	char ban_type = '?';
389
390		switch (conf->type)
391		{
392		case CONF_KLINE:
393	<	type_string = kline_string;
393	>	if (HasFlag(client_p, FLAGS_EXEMPTKLINE))
394	>	{
395	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
396	>	"KLINE over-ruled for %s, client is kline_exempt",
397	>	get_client_name(client_p, HIDE_IP));
398	>	return;
399	>	}
400	>
401	>	ban_type = 'K';
402		break;
403		case CONF_DLINE:
404	<	type_string = dline_string;
405	<	break;
406	<	case CONF_GLINE:
407	<	type_string = gline_string;
404	>	if (find_conf_by_address(NULL, &client_p->connection->ip, CONF_EXEMPT,
405	>	client_p->connection->aftype, NULL, NULL, 1))
406	>	return;
407	>	ban_type = 'D';
408		break;
409		case CONF_XLINE:
410	<	type_string = xline_string;
410	>	if (HasFlag(client_p, FLAGS_EXEMPTXLINE))
411	>	{
412	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
413	>	"XLINE over-ruled for %s, client is xline_exempt",
414	>	get_client_name(client_p, HIDE_IP));
415	>	return;
416	>	}
417	>
418	>	ban_type = 'X';
419		++conf->count;
420		break;
421		default:
#	Line 460 | Line 423 | ban_them(struct Client *client_p, struct
423		break;
424		}
425
426	<	user_reason = conf->reason ? conf->reason : type_string;
427	<
465	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s active for %s",
466	<	type_string, get_client_name(client_p, HIDE_IP));
426	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE, "%c-line active for %s",
427	>	ban_type, get_client_name(client_p, HIDE_IP));
428
429		if (IsClient(client_p))
430	<	sendto_one(client_p, form_str(ERR_YOUREBANNEDCREEP),
470	<	me.name, client_p->name, user_reason);
430	>	sendto_one_numeric(client_p, &me, ERR_YOUREBANNEDCREEP, conf->reason);
431
432	<	exit_client(client_p, &me, user_reason);
432	>	exit_client(client_p, conf->reason);
433		}
434
435		/* update_client_exit_stats()
#	Line 484 | Line 444 | update_client_exit_stats(struct Client *
444		if (IsClient(client_p))
445		{
446		assert(Count.total > 0);
447	+
448		--Count.total;
449		if (HasUMode(client_p, UMODE_OPER))
450		--Count.oper;
#	Line 494 | Line 455 | update_client_exit_stats(struct Client *
455		sendto_realops_flags(UMODE_EXTERNAL, L_ALL, SEND_NOTICE,
456		"Server %s split from %s",
457		client_p->name, client_p->servptr->name);
497	–
498	–	if (splitchecking && !splitmode)
499	–	check_splitmode(NULL);
458		}
459
460		/* find_person()
#	Line 506 | Line 464 | update_client_exit_stats(struct Client *
464		* side effects - find person by (nick)name
465		*/
466		struct Client *
467	<	find_person(const struct Client *client_p, const char *name)
467	>	find_person(const struct Client *const source_p, const char *name)
468		{
469		struct Client *target_p = NULL;
470
471		if (IsDigit(*name))
472		{
473	<	if ((target_p = hash_find_id(name)) != NULL)
474	<	if (!IsServer(client_p) && !HasFlag(client_p, FLAGS_SERVICE))
517	<	target_p = NULL;
473	>	if (IsServer(source_p->from))
474	>	target_p = hash_find_id(name);
475		}
476		else
477		target_p = hash_find_client(name);
#	Line 525 | Line 482 | find_person(const struct Client *client_
482		/*
483		* find_chasing - find the client structure for a nick name (name)
484		*      using history mechanism if necessary. If the client is not found,
485	<	*      an error message (NO SUCH NICK) is generated. If the client was found
529	<	*      through the history, chasing will be 1 and otherwise 0.
485	>	*      an error message (NO SUCH NICK) is generated.
486		*/
487		struct Client *
488	<	find_chasing(struct Client *source_p, const char *name, int *const chasing)
488	>	find_chasing(struct Client *source_p, const char *name)
489		{
490	<	struct Client *who = find_person(source_p->from, name);
535	<
536	<	if (chasing)
537	<	*chasing = 0;
490	>	struct Client *target_p = find_person(source_p, name);
491
492	<	if (who)
493	<	return who;
492	>	if (target_p)
493	>	return target_p;
494
495		if (IsDigit(*name))
496		return NULL;
497
498	<	if ((who = whowas_get_history(name,
499	<	(time_t)ConfigFileEntry.kill_chase_time_limit))
500	<	== NULL)
498	>	target_p = whowas_get_history(name, (time_t)ConfigGeneral.kill_chase_time_limit);
499	>
500	>	if (!target_p)
501		{
502	<	sendto_one(source_p, form_str(ERR_NOSUCHNICK),
550	<	me.name, source_p->name, name);
502	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHNICK, name);
503		return NULL;
504		}
505
506	<	if (chasing)
555	<	*chasing = 1;
556	<
557	<	return who;
506	>	return target_p;
507		}
508
509		/*
#	Line 566 | Line 515 | find_chasing(struct Client *source_p, co
515		*        But, this can be used to any client structure.
516		*
517		* NOTE 1:
518	<	*        Watch out the allocation of "nbuf", if either source_p->name
518	>	*        Watch out the allocation of "buf", if either source_p->name
519		*        or source_p->sockhost gets changed into pointers instead of
520		*        directly allocated within the structure...
521		*
522		* NOTE 2:
523		*        Function return either a pointer to the structure (source_p) or
524	<	*        to internal buffer (nbuf). *NEVER* use the returned pointer
524	>	*        to internal buffer (buf). *NEVER* use the returned pointer
525		*        to modify what it points!!!
526		*/
527		const char *
528	<	get_client_name(const struct Client *client, enum addr_mask_type type)
528	>	get_client_name(const struct Client *client_p, enum addr_mask_type type)
529		{
530	<	static char nbuf[HOSTLEN * 2 + USERLEN + 5];
582	<
583	<	assert(client != NULL);
530	>	static char buf[HOSTLEN * 2 + USERLEN + 4];  /* +4 for [,@,],\0 */
531
532	<	if (!MyConnect(client))
533	<	return client->name;
532	>	if (!MyConnect(client_p))
533	>	return client_p->name;
534
535	<	if (IsServer(client) || IsConnecting(client) || IsHandshake(client))
535	>	if (IsServer(client_p) || IsConnecting(client_p) || IsHandshake(client_p))
536		{
537	<	if (!irccmp(client->name, client->host))
538	<	return client->name;
537	>	if (!irccmp(client_p->name, client_p->host))
538	>	return client_p->name;
539		else if (ConfigServerHide.hide_server_ips)
540		type = MASK_IP;
541		}
542
596	–	if (ConfigFileEntry.hide_spoof_ips)
597	–	if (type == SHOW_IP && IsIPSpoof(client))
598	–	type = MASK_IP;
599	–
543		/* And finally, let's get the host information, ip or name */
544		switch (type)
545		{
546		case SHOW_IP:
547	<	snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
548	<	client->name,
549	<	client->username, client->sockhost);
547	>	snprintf(buf, sizeof(buf), "%s[%s@%s]",
548	>	client_p->name,
549	>	client_p->username, client_p->sockhost);
550		break;
551		case MASK_IP:
552	<	if (client->localClient->aftype == AF_INET)
553	<	snprintf(nbuf, sizeof(nbuf), "%s[%s@255.255.255.255]",
554	<	client->name, client->username);
552	>	if (client_p->connection->aftype == AF_INET)
553	>	snprintf(buf, sizeof(buf), "%s[%s@255.255.255.255]",
554	>	client_p->name, client_p->username);
555		else
556	<	snprintf(nbuf, sizeof(nbuf), "%s[%s@ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]",
557	<	client->name, client->username);
556	>	snprintf(buf, sizeof(buf), "%s[%s@ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]",
557	>	client_p->name, client_p->username);
558		break;
559	<	default:
560	<	snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
561	<	client->name,
562	<	client->username, client->host);
559	>	default:  /* HIDE_IP */
560	>	snprintf(buf, sizeof(buf), "%s[%s@%s]",
561	>	client_p->name,
562	>	client_p->username, client_p->host);
563		}
564
565	<	return nbuf;
565	>	return buf;
566		}
567
568		void
569		free_exited_clients(void)
570		{
571	<	dlink_node *ptr = NULL, *next = NULL;
571	>	dlink_node *node = NULL, *node_next = NULL;
572
573	<	DLINK_FOREACH_SAFE(ptr, next, dead_list.head)
573	>	DLINK_FOREACH_SAFE(node, node_next, dead_list.head)
574		{
575	<	free_client(ptr->data);
576	<	dlinkDelete(ptr, &dead_list);
577	<	free_dlink_node(ptr);
575	>	free_client(node->data);
576	>	dlinkDelete(node, &dead_list);
577	>	free_dlink_node(node);
578		}
579		}
580
#	Line 642 | Line 585 | free_exited_clients(void)
585		* The only messages generated are QUITs on channels.
586		*/
587		static void
588	<	exit_one_client(struct Client *source_p, const char *quitmsg)
588	>	exit_one_client(struct Client *source_p, const char *comment)
589		{
590	<	dlink_node *lp = NULL, *next_lp = NULL;
590	>	dlink_node *node = NULL, *node_next = NULL;
591
592		assert(!IsMe(source_p));
593	+	assert(source_p != &me);
594
595		if (IsClient(source_p))
596		{
597	<	if (source_p->servptr->serv != NULL)
598	<	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->client_list);
597	>	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->client_list);
598	>	dlinkDelete(&source_p->node, &global_client_list);
599
600		/*
601		* If a person is on a channel, send a QUIT notice
#	Line 659 | Line 603 | exit_one_client(struct Client *source_p,
603		* that the client can show the "**signoff" message).
604		* (Note: The notice is to the local clients *only*)
605		*/
606	<	sendto_common_channels_local(source_p, 0, 0, ":%s!%s@%s QUIT :%s",
606	>	sendto_common_channels_local(source_p, 0, 0, 0, ":%s!%s@%s QUIT :%s",
607		source_p->name, source_p->username,
608	<	source_p->host, quitmsg);
609	<	DLINK_FOREACH_SAFE(lp, next_lp, source_p->channel.head)
610	<	remove_user_from_channel(lp->data);
608	>	source_p->host, comment);
609	>
610	>	DLINK_FOREACH_SAFE(node, node_next, source_p->channel.head)
611	>	remove_user_from_channel(node->data);
612	>
613	>	client_clear_svstags(source_p);
614
615		whowas_add_history(source_p, 0);
616		whowas_off_history(source_p);
#	Line 672 | Line 619 | exit_one_client(struct Client *source_p,
619
620		if (MyConnect(source_p))
621		{
622	<	/* Clean up invitefield */
676	<	DLINK_FOREACH_SAFE(lp, next_lp, source_p->localClient->invited.head)
677	<	del_invite(lp->data, source_p);
678	<
622	>	clear_invites_client(source_p);
623		del_all_accepts(source_p);
624		}
625		}
626		else if (IsServer(source_p))
627		{
628		dlinkDelete(&source_p->lnode, &source_p->servptr->serv->server_list);
629	+	dlinkDelete(&source_p->node, &global_client_list);
630
631	<	if ((lp = dlinkFindDelete(&global_serv_list, source_p)) != NULL)
632	<	free_dlink_node(lp);
631	>	if ((node = dlinkFindDelete(&global_server_list, source_p)))
632	>	free_dlink_node(node);
633		}
634
635		/* Remove source_p from the client lists */
636	<	if (HasID(source_p))
636	>	if (source_p->id[0])
637		hash_del_id(source_p);
638	+
639		if (source_p->name[0])
640		hash_del_client(source_p);
641
642	<	if (IsUserHostIp(source_p))
643	<	delete_user_host(source_p->username, source_p->host, !MyConnect(source_p));
698	<
699	<	/* remove from global client list
700	<	* NOTE: source_p->node.next cannot be NULL if the client is added
701	<	*       to global_client_list (there is always &me at its end)
702	<	*/
703	<	if (source_p != NULL && source_p->node.next != NULL)
704	<	dlinkDelete(&source_p->node, &global_client_list);
642	>	if (HasFlag(source_p, FLAGS_USERHOST))
643	>	userhost_del(source_p->username, source_p->host, !MyConnect(source_p));
644
645		update_client_exit_stats(source_p);
646
#	Line 713 | Line 652 | exit_one_client(struct Client *source_p,
652		dlinkAdd(source_p, make_dlink_node(), &dead_list);
653		}
654
716	–	/* Recursively send QUITs and SQUITs for source_p and all its dependent clients
717	–	* and servers to those servers that need them.  A server needs the client
718	–	* QUITs if it can't figure them out from the SQUIT (ie pre-TS4) or if it
719	–	* isn't getting the SQUIT because of @#(*&@)# hostmasking.  With TS4, once
720	–	* a link gets a SQUIT, it doesn't need any QUIT/SQUITs for clients depending
721	–	* on that one -orabidoo
722	–	*
723	–	* This is now called on each local server -adx
724	–	*/
725	–	static void
726	–	recurse_send_quits(struct Client *original_source_p, struct Client *source_p,
727	–	struct Client *from, struct Client *to, const char *comment,
728	–	const char *splitstr)
729	–	{
730	–	dlink_node *ptr, *next;
731	–	struct Client *target_p;
732	–
733	–	assert(to != source_p);  /* should be already removed from serv_list */
734	–
735	–	/* If this server can handle quit storm (QS) removal
736	–	* of dependents, just send the SQUIT
737	–	*/
738	–	if (!IsCapable(to, CAP_QS))
739	–	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->client_list.head)
740	–	{
741	–	target_p = ptr->data;
742	–	sendto_one(to, ":%s QUIT :%s", target_p->name, splitstr);
743	–	}
744	–
745	–	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->server_list.head)
746	–	recurse_send_quits(original_source_p, ptr->data, from, to,
747	–	comment, splitstr);
748	–
749	–	if ((source_p == original_source_p && to != from) ||
750	–	!IsCapable(to, CAP_QS))
751	–	{
752	–	/* don't use a prefix here - we have to be 100% sure the message
753	–	* will be accepted without Unknown prefix etc.. */
754	–	sendto_one(to, "SQUIT %s :%s", ID_or_name(source_p, to), comment);
755	–	}
756	–	}
757	–
655		/*
656		* Remove all clients that depend on source_p; assumes all (S)QUITs have
657		* already been sent.  we make sure to exit a server's dependent clients
#	Line 762 | Line 659 | recurse_send_quits(struct Client *origin
659		* actually removing things off llists.   tweaked from +CSr31  -orabidoo
660		*/
661		static void
662	<	recurse_remove_clients(struct Client *source_p, const char *quitmsg)
662	>	recurse_remove_clients(struct Client *source_p, const char *comment)
663		{
664	<	dlink_node *ptr, *next;
664	>	dlink_node *node = NULL, *node_next = NULL;
665
666	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->client_list.head)
667	<	exit_one_client(ptr->data, quitmsg);
666	>	DLINK_FOREACH_SAFE(node, node_next, source_p->serv->client_list.head)
667	>	exit_one_client(node->data, comment);
668
669	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->server_list.head)
669	>	DLINK_FOREACH_SAFE(node, node_next, source_p->serv->server_list.head)
670		{
671	<	recurse_remove_clients(ptr->data, quitmsg);
672	<	exit_one_client(ptr->data, quitmsg);
671	>	recurse_remove_clients(node->data, comment);
672	>	exit_one_client(node->data, comment);
673		}
674		}
675
676		/*
780	–	** Remove *everything* that depends on source_p, from all lists, and sending
781	–	** all necessary QUITs and SQUITs.  source_p itself is still on the lists,
782	–	** and its SQUITs have been sent except for the upstream one  -orabidoo
783	–	*/
784	–	static void
785	–	remove_dependents(struct Client *source_p, struct Client *from,
786	–	const char *comment, const char *splitstr)
787	–	{
788	–	dlink_node *ptr = NULL;
789	–
790	–	DLINK_FOREACH(ptr, serv_list.head)
791	–	recurse_send_quits(source_p, source_p, from, ptr->data,
792	–	comment, splitstr);
793	–
794	–	recurse_remove_clients(source_p, splitstr);
795	–	}
796	–
797	–	/*
677		* exit_client - exit a client of any type. Generally, you can use
678		* this on any struct Client, regardless of its state.
679		*
680		* Note, you shouldn't exit remote _users_ without first doing
681		* AddFlag(x, FLAGS_KILLED) and propagating a kill or similar message.
682	+	*
683		* However, it is perfectly correct to call exit_client to force a _server_
684		* quit (either local or remote one).
685		*
686	+	*
687		* inputs:       - a client pointer that is going to be exited
807	–	*               - for servers, the second argument is a pointer to who
808	–	*                 is firing the server. This side won't get any generated
809	–	*                 messages. NEVER NULL!
688		* output:       none
689		* side effects: the client is delinked from all lists, disconnected,
690		*               and the rest of IRC network is notified of the exit.
691		*               Client memory is scheduled to be freed
692		*/
693		void
694	<	exit_client(struct Client *source_p, struct Client *from, const char *comment)
694	>	exit_client(struct Client *source_p, const char *comment)
695		{
696	<	dlink_node *m = NULL;
696	>	dlink_node *node = NULL;
697	>
698	>	assert(!IsMe(source_p));
699	>	assert(source_p != &me);
700
701		if (MyConnect(source_p))
702		{
703		/* DO NOT REMOVE. exit_client can be called twice after a failed
704		* read/write.
705		*/
706	<	if (IsClosing(source_p))
706	>	if (HasFlag(source_p, FLAGS_CLOSING))
707		return;
708
709	<	SetClosing(source_p);
709	>	AddFlag(source_p, FLAGS_CLOSING);
710
711	<	if (IsIpHash(source_p))
712	<	remove_one_ip(&source_p->localClient->ip);
711	>	if (HasFlag(source_p, FLAGS_IPHASH))
712	>	{
713	>	DelFlag(source_p, FLAGS_IPHASH);
714	>	ipcache_remove_address(&source_p->connection->ip);
715	>	}
716
717	<	delete_auth(&source_p->localClient->auth);
717	>	delete_auth(&source_p->connection->auth);
718
719	<	/*
836	<	* This source_p could have status of one of STAT_UNKNOWN, STAT_CONNECTING
837	<	* STAT_HANDSHAKE or STAT_UNKNOWN
838	<	* all of which are lumped together into unknown_list
839	<	*
840	<	* In all above cases IsRegistered() will not be true.
841	<	*/
842	<	if (!IsRegistered(source_p))
719	>	if (IsClient(source_p))
720		{
721	<	assert(dlinkFind(&unknown_list, source_p));
721	>	time_t on_for = CurrentTime - source_p->connection->firsttime;
722
846	–	dlinkDelete(&source_p->localClient->lclient_node, &unknown_list);
847	–	}
848	–	else if (IsClient(source_p))
849	–	{
850	–	time_t on_for = CurrentTime - source_p->localClient->firsttime;
723		assert(Count.local > 0);
724	<	Count.local--;
724	>
725	>	--Count.local;
726
727		if (HasUMode(source_p, UMODE_OPER))
728	<	if ((m = dlinkFindDelete(&oper_list, source_p)) != NULL)
729	<	free_dlink_node(m);
728	>	if ((node = dlinkFindDelete(&oper_list, source_p)))
729	>	free_dlink_node(node);
730
731		assert(dlinkFind(&local_client_list, source_p));
732	<	dlinkDelete(&source_p->localClient->lclient_node, &local_client_list);
732	>	dlinkDelete(&source_p->connection->lclient_node, &local_client_list);
733
734	<	if (source_p->localClient->list_task != NULL)
735	<	free_list_task(source_p->localClient->list_task, source_p);
734	>	if (source_p->connection->list_task)
735	>	free_list_task(source_p);
736
737		watch_del_watch_list(source_p);
738	+
739		sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
740		"Client exiting: %s (%s@%s) [%s] [%s]",
741	<	source_p->name, source_p->username, source_p->host, comment,
742	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
743	<	"255.255.255.255" : source_p->sockhost);
744	<	ilog(LOG_TYPE_USER, "%s (%3u:%02u:%02u): %s!%s@%s %llu/%llu",
745	<	myctime(source_p->localClient->firsttime), (unsigned int)(on_for / 3600),
741	>	source_p->name, source_p->username, source_p->host,
742	>	source_p->sockhost, comment);
743	>
744	>	ilog(LOG_TYPE_USER, "%s (%3u:%02u:%02u): %s!%s@%s %ju/%ju",
745	>	date_ctime(source_p->connection->firsttime), (unsigned int)(on_for / 3600),
746		(unsigned int)((on_for % 3600)/60), (unsigned int)(on_for % 60),
747		source_p->name, source_p->username, source_p->host,
748	<	source_p->localClient->send.bytes>>10,
749	<	source_p->localClient->recv.bytes>>10);
748	>	source_p->connection->send.bytes>>10,
749	>	source_p->connection->recv.bytes>>10);
750		}
751		else if (IsServer(source_p))
752		{
753		assert(Count.myserver > 0);
754	+
755		--Count.myserver;
756
757	<	assert(dlinkFind(&serv_list, source_p));
758	<	dlinkDelete(&source_p->localClient->lclient_node, &serv_list);
759	<	unset_chcap_usage_counts(source_p);
757	>	assert(dlinkFind(&local_server_list, source_p));
758	>	dlinkDelete(&source_p->connection->lclient_node, &local_server_list);
759	>	}
760	>	else
761	>	{
762	>	assert(dlinkFind(&unknown_list, source_p));
763	>	dlinkDelete(&source_p->connection->lclient_node, &unknown_list);
764		}
765
766		if (!IsDead(source_p))
767		{
768		if (IsServer(source_p))
769		{
770	<	/* for them, we are exiting the network */
771	<	sendto_one(source_p, ":%s SQUIT %s :%s",
772	<	ID_or_name(from, source_p), me.name, comment);
770	>	if (!HasFlag(source_p, FLAGS_SQUIT))
771	>	{
772	>	/* for them, we are exiting the network */
773	>	sendto_one(source_p, ":%s SQUIT %s :%s",
774	>	me.id, me.id, comment);
775	>	}
776		}
777
778		sendto_one(source_p, "ERROR :Closing Link: %s (%s)",
779		source_p->host, comment);
780		}
781
900	–	/*
901	–	** Currently only server connections can have
902	–	** depending remote clients here, but it does no
903	–	** harm to check for all local clients. In
904	–	** future some other clients than servers might
905	–	** have remotes too...
906	–	**
907	–	** Close the Client connection first and mark it
908	–	** so that no messages are attempted to send to it.
909	–	** Remember it makes source_p->from == NULL.
910	–	*/
782		close_connection(source_p);
783		}
784		else if (IsClient(source_p) && HasFlag(source_p->servptr, FLAGS_EOB))
785		sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
786	<	"Client exiting at %s: %s (%s@%s) [%s]",
786	>	"Client exiting at %s: %s (%s@%s) [%s] [%s]",
787		source_p->servptr->name, source_p->name,
788	<	source_p->username, source_p->host, comment);
788	>	source_p->username, source_p->host, source_p->sockhost, comment);
789
790		if (IsServer(source_p))
791		{
792	<	char splitstr[HOSTLEN + HOSTLEN + 2];
792	>	char splitstr[HOSTLEN + HOSTLEN + 2] = "";
793
794	<	/* This shouldn't ever happen */
795	<	assert(source_p->serv != NULL && source_p->servptr != NULL);
794	>	assert(source_p->serv);
795	>	assert(source_p->servptr);
796
797		if (ConfigServerHide.hide_servers)
798		/*
799		* Set netsplit message to "*.net *.split" to still show
800		* that its a split, but hide the servers splitting
801		*/
802	<	strcpy(splitstr, "*.net *.split");
802	>	strlcpy(splitstr, "*.net *.split", sizeof(splitstr));
803		else
804		snprintf(splitstr, sizeof(splitstr), "%s %s",
805		source_p->servptr->name, source_p->name);
806
807	<	remove_dependents(source_p, from->from, comment, splitstr);
807	>	/* Send SQUIT for source_p in every direction. source_p is already off of local_server_list here */
808	>	if (!HasFlag(source_p, FLAGS_SQUIT))
809	>	sendto_server(NULL, 0, 0, "SQUIT %s :%s", source_p->id, comment);
810
811	<	if (source_p->servptr == &me)
811	>	/* Now exit the clients internally */
812	>	recurse_remove_clients(source_p, splitstr);
813	>
814	>	if (MyConnect(source_p))
815		{
816	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
817	<	"%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
818	<	source_p->name, (int)(CurrentTime - source_p->localClient->firsttime),
819	<	source_p->localClient->send.bytes >> 10,
820	<	source_p->localClient->recv.bytes >> 10);
821	<	ilog(LOG_TYPE_IRCD, "%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);
816	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
817	>	"%s was connected for %s. %ju/%ju sendK/recvK.",
818	>	source_p->name, time_dissect(CurrentTime - source_p->connection->firsttime),
819	>	source_p->connection->send.bytes >> 10,
820	>	source_p->connection->recv.bytes >> 10);
821	>	ilog(LOG_TYPE_IRCD, "%s was connected for %s. %ju/%ju sendK/recvK.",
822	>	source_p->name, time_dissect(CurrentTime - source_p->connection->firsttime),
823	>	source_p->connection->send.bytes >> 10,
824	>	source_p->connection->recv.bytes >> 10);
825		}
826		}
827		else if (IsClient(source_p) && !HasFlag(source_p, FLAGS_KILLED))
828	<	{
829	<	sendto_server(from->from, CAP_TS6, NOCAPS,
954	<	":%s QUIT :%s", ID(source_p), comment);
955	<	sendto_server(from->from, NOCAPS, CAP_TS6,
956	<	":%s QUIT :%s", source_p->name, comment);
957	<	}
828	>	sendto_server(source_p->from, 0, 0, ":%s QUIT :%s",
829	>	source_p->id, comment);
830
831		/* The client *better* be off all of the lists */
832		assert(dlinkFind(&unknown_list, source_p) == NULL);
833		assert(dlinkFind(&local_client_list, source_p) == NULL);
834	<	assert(dlinkFind(&serv_list, source_p) == NULL);
834	>	assert(dlinkFind(&local_server_list, source_p) == NULL);
835		assert(dlinkFind(&oper_list, source_p) == NULL);
836
837		exit_one_client(source_p, comment);
#	Line 972 | Line 844 | exit_client(struct Client *source_p, str
844		void
845		dead_link_on_write(struct Client *client_p, int ierrno)
846		{
847	<	dlink_node *ptr;
847	>	dlink_node *node;
848
849		if (IsDefunct(client_p))
850		return;
851
852	<	dbuf_clear(&client_p->localClient->buf_recvq);
853	<	dbuf_clear(&client_p->localClient->buf_sendq);
852	>	dbuf_clear(&client_p->connection->buf_recvq);
853	>	dbuf_clear(&client_p->connection->buf_sendq);
854
855		assert(dlinkFind(&abort_list, client_p) == NULL);
856	<	ptr = make_dlink_node();
856	>	node = make_dlink_node();
857		/* don't let exit_aborted_clients() finish yet */
858	<	dlinkAddTail(client_p, ptr, &abort_list);
858	>	dlinkAddTail(client_p, node, &abort_list);
859
860		if (eac_next == NULL)
861	<	eac_next = ptr;
861	>	eac_next = node;
862
863		SetDead(client_p); /* You are dead my friend */
864		}
#	Line 998 | Line 870 | dead_link_on_write(struct Client *client
870		void
871		dead_link_on_read(struct Client *client_p, int error)
872		{
873	<	char errmsg[255];
873	>	char errmsg[IRCD_BUFSIZE];
874		int current_error;
875
876		if (IsDefunct(client_p))
877		return;
878
879	<	dbuf_clear(&client_p->localClient->buf_recvq);
880	<	dbuf_clear(&client_p->localClient->buf_sendq);
879	>	dbuf_clear(&client_p->connection->buf_recvq);
880	>	dbuf_clear(&client_p->connection->buf_sendq);
881
882	<	current_error = get_sockerr(client_p->localClient->fd.fd);
882	>	current_error = get_sockerr(client_p->connection->fd.fd);
883
884		if (IsServer(client_p) || IsHandshake(client_p))
885		{
1014	–	int connected = CurrentTime - client_p->localClient->firsttime;
1015	–
886		if (error == 0)
887		{
888		/* Admins get the real IP */
889	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
889	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
890		"Server %s closed the connection",
891		get_client_name(client_p, SHOW_IP));
892
893		/* Opers get a masked IP */
894	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
894	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
895		"Server %s closed the connection",
896		get_client_name(client_p, MASK_IP));
897
#	Line 1036 | Line 906 | dead_link_on_read(struct Client *client_
906		get_client_name(client_p, MASK_IP), current_error);
907		}
908
909	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
910	<	"%s had been connected for %d day%s, %2d:%02d:%02d",
911	<	client_p->name, connected/86400,
1042	<	(connected/86400 == 1) ? "" : "s",
1043	<	(connected % 86400) / 3600, (connected % 3600) / 60,
1044	<	connected % 60);
909	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
910	>	"%s was connected for %s",
911	>	client_p->name, time_dissect(CurrentTime - client_p->connection->firsttime));
912		}
913
914		if (error == 0)
#	Line 1051 | Line 918 | dead_link_on_read(struct Client *client_
918		snprintf(errmsg, sizeof(errmsg), "Read error: %s",
919		strerror(current_error));
920
921	<	exit_client(client_p, &me, errmsg);
921	>	exit_client(client_p, errmsg);
922		}
923
924		void
#	Line 1068 | Line 935 | exit_aborted_clients(void)
935
936		if (target_p == NULL)
937		{
938	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
938	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
939		"Warning: null client on abort_list!");
940		dlinkDelete(ptr, &abort_list);
941		free_dlink_node(ptr);
#	Line 1077 | Line 944 | exit_aborted_clients(void)
944
945		dlinkDelete(ptr, &abort_list);
946
947	<	if (IsSendQExceeded(target_p))
947	>	if (HasFlag(target_p, FLAGS_SENDQEX))
948		notice = "Max SendQ exceeded";
949		else
950		notice = "Write error: connection closed";
951
952	<	exit_client(target_p, &me, notice);
952	>	exit_client(target_p, notice);
953		free_dlink_node(ptr);
954		}
955		}
#	Line 1100 | Line 967 | exit_aborted_clients(void)
967		void
968		del_accept(struct split_nuh_item *accept_p, struct Client *client_p)
969		{
970	<	dlinkDelete(&accept_p->node, &client_p->localClient->acceptlist);
970	>	dlinkDelete(&accept_p->node, &client_p->connection->acceptlist);
971
972	<	MyFree(accept_p->nickptr);
973	<	MyFree(accept_p->userptr);
974	<	MyFree(accept_p->hostptr);
975	<	MyFree(accept_p);
972	>	xfree(accept_p->nickptr);
973	>	xfree(accept_p->userptr);
974	>	xfree(accept_p->hostptr);
975	>	xfree(accept_p);
976		}
977
978		struct split_nuh_item *
#	Line 1113 | Line 980 | find_accept(const char *nick, const char
980		const char *host, struct Client *client_p,
981		int (*cmpfunc)(const char *, const char *))
982		{
983	<	dlink_node *ptr = NULL;
983	>	dlink_node *node = NULL;
984
985	<	DLINK_FOREACH(ptr, client_p->localClient->acceptlist.head)
985	>	DLINK_FOREACH(node, client_p->connection->acceptlist.head)
986		{
987	<	struct split_nuh_item *accept_p = ptr->data;
987	>	struct split_nuh_item *accept_p = node->data;
988
989		if (!cmpfunc(accept_p->nickptr, nick) &&
990		!cmpfunc(accept_p->userptr, user) &&
#	Line 1139 | Line 1006 | int
1006		accept_message(struct Client *source,
1007		struct Client *target)
1008		{
1009	<	dlink_node *ptr = NULL;
1009	>	dlink_node *node = NULL;
1010	>
1011	>	if (HasFlag(source, FLAGS_SERVICE) ||
1012	>	(HasUMode(source, UMODE_OPER) && ConfigGeneral.opers_bypass_callerid))
1013	>	return 1;
1014
1015		if (source == target || find_accept(source->name, source->username,
1016		source->host, target, match))
1017		return 1;
1018
1019	<	if (HasUMode(target, UMODE_SOFTCALLERID))
1020	<	DLINK_FOREACH(ptr, target->channel.head)
1021	<	if (IsMember(source, ((struct Membership *)ptr->data)->chptr))
1019	>	if (!HasUMode(target, UMODE_CALLERID) && HasUMode(target, UMODE_SOFTCALLERID))
1020	>	DLINK_FOREACH(node, target->channel.head)
1021	>	if (IsMember(source, ((struct Membership *)node->data)->chptr))
1022		return 1;
1023
1024		return 0;
#	Line 1162 | Line 1033 | accept_message(struct Client *source,
1033		void
1034		del_all_accepts(struct Client *client_p)
1035		{
1036	<	dlink_node *ptr = NULL, *next_ptr = NULL;
1036	>	dlink_node *node = NULL, *node_next = NULL;
1037
1038	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->acceptlist.head)
1039	<	del_accept(ptr->data, client_p);
1038	>	DLINK_FOREACH_SAFE(node, node_next, client_p->connection->acceptlist.head)
1039	>	del_accept(node->data, client_p);
1040		}
1041
1042		unsigned int
1043	<	idle_time_get(const struct Client *source_p, const struct Client *target_p)
1043	>	client_get_idle_time(const struct Client *source_p,
1044	>	const struct Client *target_p)
1045		{
1046		unsigned int idle = 0;
1047		unsigned int min_idle = 0;
1048		unsigned int max_idle = 0;
1049	<	const struct ClassItem *class = get_class_ptr(&target_p->localClient->confs);
1049	>	const struct ClassItem *const class = get_class_ptr(&target_p->connection->confs);
1050
1051		if (!(class->flags & CLASS_FLAGS_FAKE_IDLE) || target_p == source_p)
1052	<	return CurrentTime - target_p->localClient->last_privmsg;
1052	>	return CurrentTime - target_p->connection->last_privmsg;
1053	>
1054		if (HasUMode(source_p, UMODE_OPER) &&
1055		!(class->flags & CLASS_FLAGS_HIDE_IDLE_FROM_OPERS))
1056	<	return CurrentTime - target_p->localClient->last_privmsg;
1056	>	return CurrentTime - target_p->connection->last_privmsg;
1057
1058		min_idle = class->min_idle;
1059		max_idle = class->max_idle;
#	Line 1191 | Line 1064 | idle_time_get(const struct Client *sourc
1064		if (class->flags & CLASS_FLAGS_RANDOM_IDLE)
1065		idle = genrand_int32();
1066		else
1067	<	idle = CurrentTime - target_p->localClient->last_privmsg;
1067	>	idle = CurrentTime - target_p->connection->last_privmsg;
1068
1069	<	if (max_idle == 0)
1069	>	if (!max_idle)
1070		idle = 0;
1071		else
1072		idle %= max_idle;
#	Line 1203 | Line 1076 | idle_time_get(const struct Client *sourc
1076
1077		return idle;
1078		}
1079	+
1080	+	/* client_init()
1081	+	*
1082	+	* inputs       - NONE
1083	+	* output       - NONE
1084	+	* side effects - initialize client free memory
1085	+	*/
1086	+	void
1087	+	client_init(void)
1088	+	{
1089	+	static struct event event_ping =
1090	+	{
1091	+	.name = "check_pings",
1092	+	.handler = check_pings,
1093	+	.when = 5
1094	+	};
1095	+
1096	+	client_pool = mp_pool_new(sizeof(struct Client), MP_CHUNK_SIZE_CLIENT);
1097	+	connection_pool = mp_pool_new(sizeof(struct Connection), MP_CHUNK_SIZE_CONNECTION);
1098	+	event_add(&event_ping, NULL);
1099	+	}

Diff Legend

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