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 7006 by michael, Fri Jan 1 00:07:54 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);
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)
163	<	* 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	>	struct ServicesTag *svstag = NULL;
163	>	const struct user_modes *tab = NULL;
164
165	<	/*
166	<	* 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	<	*/
165	>	if (numeric >= ERR_LAST_ERR_MSG || *umodes != '+')
166	>	return;
167
168	<	static void
169	<	check_pings(void *notused)
168	>	svstag = MyCalloc(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	>	dlink_node *node = NULL, *node_next = NULL;
186	>
187	>	DLINK_FOREACH_SAFE(node, node_next, client_p->svstags.head)
188	>	{
189	>	struct ServicesTag *svstag = node->data;
190	>
191	>	dlinkDelete(&svstag->node, &client_p->svstags);
192	>	MyFree(svstag->tag);
193	>	MyFree(svstag);
194	>	}
195		}
196
197		/* check_pings_list()
#	Line 239 | Line 203 | check_pings(void *notused)
203		static void
204		check_pings_list(dlink_list *list)
205		{
206	<	char scratch[32];        /* way too generous but... */
206	>	char buf[32] = "";  /* 32 = sizeof("Ping timeout: 999999999 seconds") */
207		int ping = 0;      /* ping time value from client */
208	<	dlink_node *ptr = NULL, *next_ptr = NULL;
208	>	dlink_node *node = NULL, *node_next = NULL;
209
210	<	DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
210	>	DLINK_FOREACH_SAFE(node, node_next, list->head)
211		{
212	<	struct Client *client_p = ptr->data;
212	>	struct Client *client_p = node->data;
213
250	–	/*
251	–	** Note: No need to notify opers here. It's
252	–	** already done when "FLAGS_DEADSOCKET" is set.
253	–	*/
214		if (IsDead(client_p))
215	<	{
256	<	/* Ignore it, its been exited already */
257	<	continue;
258	<	}
215	>	continue;  /* Ignore it, its been exited already */
216
217	<	if (!IsRegistered(client_p))
218	<	ping = CONNECTTIMEOUT;
217	>	if (IsClient(client_p) || IsServer(client_p))
218	>	ping = get_client_ping(&client_p->connection->confs);
219		else
220	<	ping = get_client_ping(&client_p->localClient->confs);
220	>	ping = CONNECTTIMEOUT;
221
222	<	if (ping < CurrentTime - client_p->localClient->lasttime)
222	>	if (ping < CurrentTime - client_p->connection->lasttime)
223		{
224	<	if (!IsPingSent(client_p))
224	>	if (!HasFlag(client_p, FLAGS_PINGSENT))
225		{
226		/*
227	<	* if we havent PINGed the connection and we havent
227	>	* If we haven't PINGed the connection and we haven't
228		* heard from it in a while, PING it to make sure
229		* it is still alive.
230		*/
231	<	SetPingSent(client_p);
232	<	client_p->localClient->lasttime = CurrentTime - ping;
231	>	AddFlag(client_p, FLAGS_PINGSENT);
232	>	client_p->connection->lasttime = CurrentTime - ping;
233		sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
234		}
235		else
236		{
237	<	if (CurrentTime - client_p->localClient->lasttime >= 2 * ping)
237	>	if (CurrentTime - client_p->connection->lasttime >= 2 * ping)
238		{
239		/*
240		* If the client/server hasn't talked to us in 2*ping seconds
#	Line 285 | Line 242 | check_pings_list(dlink_list *list)
242		*/
243		if (IsServer(client_p) || IsHandshake(client_p))
244		{
245	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
245	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
246		"No response from %s, closing link",
247	<	get_client_name(client_p, HIDE_IP));
248	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
247	>	get_client_name(client_p, SHOW_IP));
248	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
249		"No response from %s, closing link",
250		get_client_name(client_p, MASK_IP));
251		ilog(LOG_TYPE_IRCD, "No response from %s, closing link",
252	<	get_client_name(client_p, HIDE_IP));
252	>	get_client_name(client_p, SHOW_IP));
253		}
254
255	<	snprintf(scratch, sizeof(scratch), "Ping timeout: %d seconds",
256	<	(int)(CurrentTime - client_p->localClient->lasttime));
257	<	exit_client(client_p, &me, scratch);
255	>	snprintf(buf, sizeof(buf), "Ping timeout: %ji seconds",
256	>	(CurrentTime - client_p->connection->lasttime));
257	>	exit_client(client_p, buf);
258		}
259		}
260		}
#	Line 313 | Line 270 | check_pings_list(dlink_list *list)
270		static void
271		check_unknowns_list(void)
272		{
273	<	dlink_node *ptr, *next_ptr;
273	>	dlink_node *node = NULL, *node_next = NULL;
274
275	<	DLINK_FOREACH_SAFE(ptr, next_ptr, unknown_list.head)
275	>	DLINK_FOREACH_SAFE(node, node_next, unknown_list.head)
276		{
277	<	struct Client *client_p = ptr->data;
277	>	struct Client *client_p = node->data;
278
279		/*
280		* Check UNKNOWN connections - if they have been in this state
281		* for > 30s, close them.
282		*/
283	<	if (IsAuthFinished(client_p) && (CurrentTime - client_p->localClient->firsttime) > 30)
284	<	exit_client(client_p, &me, "Registration timed out");
283	>	if (HasFlag(client_p, FLAGS_FINISHED_AUTH) && (CurrentTime - client_p->connection->firsttime) > 30)
284	>	exit_client(client_p, "Registration timed out");
285		}
286		}
287
288	+	/*
289	+	* check_pings - go through the local client list and check activity
290	+	* kill off stuff that should die
291	+	*
292	+	* inputs       - NOT USED (from event)
293	+	* output       - next time_t when check_pings() should be called again
294	+	* side effects -
295	+	*
296	+	*
297	+	* A PING can be sent to clients as necessary.
298	+	*
299	+	* Client/Server ping outs are handled.
300	+	*/
301	+
302	+	/*
303	+	* Addon from adrian. We used to call this after nextping seconds,
304	+	* however I've changed it to run once a second. This is only for
305	+	* PING timeouts, not K/etc-line checks (thanks dianora!). Having it
306	+	* run once a second makes life a lot easier - when a new client connects
307	+	* and they need a ping in 4 seconds, if nextping was set to 20 seconds
308	+	* we end up waiting 20 seconds. This is stupid. :-)
309	+	* I will optimise (hah!) check_pings() once I've finished working on
310	+	* tidying up other network IO evilnesses.
311	+	*     -- adrian
312	+	*/
313	+
314	+	static void
315	+	check_pings(void *unused)
316	+	{
317	+	check_pings_list(&local_client_list);
318	+	check_pings_list(&local_server_list);
319	+	check_unknowns_list();
320	+	}
321	+
322		/* check_conf_klines()
323		*
324		* inputs       - NONE
#	Line 338 | Line 329 | check_unknowns_list(void)
329		void
330		check_conf_klines(void)
331		{
341	–	struct Client *client_p = NULL;       /* current local client_p being examined */
332		struct MaskItem *conf = NULL;
333	<	dlink_node *ptr, *next_ptr;
333	>	dlink_node *node = NULL, *node_next = NULL;
334
335	<	DLINK_FOREACH_SAFE(ptr, next_ptr, local_client_list.head)
335	>	DLINK_FOREACH_SAFE(node, node_next, local_client_list.head)
336		{
337	<	client_p = ptr->data;
337	>	struct Client *client_p = node->data;
338
339	<	/* If a client is already being exited
340	<	*/
351	<	if (IsDead(client_p) || !IsClient(client_p))
339	>	/* If a client is already being exited */
340	>	if (IsDead(client_p))
341		continue;
342
343	<	if ((conf = find_dline_conf(&client_p->localClient->ip,
344	<	client_p->localClient->aftype)) != NULL)
343	>	if ((conf = find_conf_by_address(NULL, &client_p->connection->ip, CONF_DLINE,
344	>	client_p->connection->aftype, NULL, NULL, 1)))
345		{
346	<	if (conf->type == CONF_EXEMPT)
347	<	continue;
359	<
360	<	ban_them(client_p, conf);
361	<	continue; /* and go examine next fd/client_p */
346	>	conf_try_ban(client_p, conf);
347	>	continue;  /* and go examine next Client */
348		}
349
350	<	if (ConfigFileEntry.glines)
350	>	if ((conf = find_conf_by_address(client_p->host, &client_p->connection->ip,
351	>	CONF_KLINE, client_p->connection->aftype,
352	>	client_p->username, NULL, 1)))
353		{
354	<	if (!(conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
355	<	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;
354	>	conf_try_ban(client_p, conf);
355	>	continue;  /* and go examine next Client */
356		}
357
358	<	if ((conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
386	<	CONF_KLINE, client_p->localClient->aftype,
387	<	client_p->username, NULL, 1)) != NULL)
388	<	{
389	<	if (IsExemptKline(client_p))
390	<	{
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;
399	<	}
400	<
401	<	if ((conf = find_matching_name_conf(CONF_XLINE,  client_p->info,
358	>	if ((conf = find_matching_name_conf(CONF_XLINE, client_p->info,
359		NULL, NULL, 0)))
360		{
361	<	ban_them(client_p, conf);
362	<	continue;
361	>	conf_try_ban(client_p, conf);
362	>	continue;  /* and go examine next Client */
363		}
364		}
365
366	<	/* also check the unknowns list for new dlines */
367	<	DLINK_FOREACH_SAFE(ptr, next_ptr, unknown_list.head)
366	>	/* Also check the unknowns list for new dlines */
367	>	DLINK_FOREACH_SAFE(node, node_next, unknown_list.head)
368		{
369	<	client_p = ptr->data;
369	>	struct Client *client_p = node->data;
370
371	<	if ((conf = find_dline_conf(&client_p->localClient->ip,
372	<	client_p->localClient->aftype)))
371	>	if ((conf = find_conf_by_address(NULL, &client_p->connection->ip, CONF_DLINE,
372	>	client_p->connection->aftype, NULL, NULL, 1)))
373		{
374	<	if (conf->type == CONF_EXEMPT)
375	<	continue;
419	<
420	<	exit_client(client_p, &me, "D-lined");
374	>	conf_try_ban(client_p, conf);
375	>	continue;  /* and go examine next Client */
376		}
377		}
378		}
379
380		/*
381	<	* ban_them
381	>	* conf_try_ban
382		*
383		* inputs       - pointer to client to ban
384		*              - pointer to MaskItem
385		* output       - NONE
386		* side effects - given client_p is banned
387		*/
388	<	static void
389	<	ban_them(struct Client *client_p, struct MaskItem *conf)
388	>	void
389	>	conf_try_ban(struct Client *client_p, struct MaskItem *conf)
390		{
391	<	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";
391	>	char ban_type = '?';
392
393		switch (conf->type)
394		{
395		case CONF_KLINE:
396	<	type_string = kline_string;
396	>	if (HasFlag(client_p, FLAGS_EXEMPTKLINE))
397	>	{
398	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
399	>	"KLINE over-ruled for %s, client is kline_exempt",
400	>	get_client_name(client_p, HIDE_IP));
401	>	return;
402	>	}
403	>
404	>	ban_type = 'K';
405		break;
406		case CONF_DLINE:
407	<	type_string = dline_string;
408	<	break;
409	<	case CONF_GLINE:
410	<	type_string = gline_string;
407	>	if (find_conf_by_address(NULL, &client_p->connection->ip, CONF_EXEMPT,
408	>	client_p->connection->aftype, NULL, NULL, 1))
409	>	return;
410	>	ban_type = 'D';
411		break;
412		case CONF_XLINE:
413	<	type_string = xline_string;
413	>	if (HasFlag(client_p, FLAGS_EXEMPTXLINE))
414	>	{
415	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
416	>	"XLINE over-ruled for %s, client is xline_exempt",
417	>	get_client_name(client_p, HIDE_IP));
418	>	return;
419	>	}
420	>
421	>	ban_type = 'X';
422		++conf->count;
423		break;
424		default:
#	Line 460 | Line 426 | ban_them(struct Client *client_p, struct
426		break;
427		}
428
429	<	user_reason = conf->reason ? conf->reason : type_string;
430	<
465	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s active for %s",
466	<	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(client_p, form_str(ERR_YOUREBANNEDCREEP),
470	<	me.name, client_p->name, user_reason);
433	>	sendto_one_numeric(client_p, &me, ERR_YOUREBANNEDCREEP, conf->reason);
434
435	<	exit_client(client_p, &me, user_reason);
435	>	exit_client(client_p, conf->reason);
436		}
437
438		/* update_client_exit_stats()
#	Line 484 | 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 494 | 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);
497	–
498	–	if (splitchecking && !splitmode)
499	–	check_splitmode(NULL);
461		}
462
463		/* find_person()
#	Line 506 | Line 467 | update_client_exit_stats(struct Client *
467		* side effects - find person by (nick)name
468		*/
469		struct Client *
470	<	find_person(const struct Client *client_p, const char *name)
470	>	find_person(const struct Client *const source_p, const char *name)
471		{
472		struct Client *target_p = NULL;
473
474		if (IsDigit(*name))
475		{
476	<	if ((target_p = hash_find_id(name)) != NULL)
477	<	if (!IsServer(client_p) && !HasFlag(client_p, FLAGS_SERVICE))
517	<	target_p = NULL;
476	>	if (IsServer(source_p->from))
477	>	target_p = hash_find_id(name);
478		}
479		else
480		target_p = hash_find_client(name);
#	Line 525 | Line 485 | find_person(const struct Client *client_
485		/*
486		* find_chasing - find the client structure for a nick name (name)
487		*      using history mechanism if necessary. If the client is not found,
488	<	*      an error message (NO SUCH NICK) is generated. If the client was found
529	<	*      through the history, chasing will be 1 and otherwise 0.
488	>	*      an error message (NO SUCH NICK) is generated.
489		*/
490		struct Client *
491	<	find_chasing(struct Client *source_p, const char *name, int *const chasing)
491	>	find_chasing(struct Client *source_p, const char *name)
492		{
493	<	struct Client *who = find_person(source_p->from, name);
535	<
536	<	if (chasing)
537	<	*chasing = 0;
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(source_p, form_str(ERR_NOSUCHNICK),
550	<	me.name, source_p->name, name);
505	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHNICK, name);
506		return NULL;
507		}
508
509	<	if (chasing)
555	<	*chasing = 1;
556	<
557	<	return who;
509	>	return target_p;
510		}
511
512		/*
#	Line 566 | 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, enum addr_mask_type type)
531	>	get_client_name(const struct Client *client_p, enum addr_mask_type type)
532		{
533	<	static char nbuf[HOSTLEN * 2 + USERLEN + 5];
582	<
583	<	assert(client != NULL);
533	>	static char buf[HOSTLEN * 2 + USERLEN + 4];  /* +4 for [,@,],\0 */
534
535	<	if (!MyConnect(client))
536	<	return client->name;
535	>	if (!MyConnect(client_p))
536	>	return client_p->name;
537
538	<	if (IsServer(client) || IsConnecting(client) || IsHandshake(client))
538	>	if (IsServer(client_p) || IsConnecting(client_p) || IsHandshake(client_p))
539		{
540	<	if (!irccmp(client->name, client->host))
541	<	return client->name;
540	>	if (!irccmp(client_p->name, client_p->host))
541	>	return client_p->name;
542		else if (ConfigServerHide.hide_server_ips)
543		type = MASK_IP;
544		}
545
596	–	if (ConfigFileEntry.hide_spoof_ips)
597	–	if (type == SHOW_IP && IsIPSpoof(client))
598	–	type = MASK_IP;
599	–
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]",
551	<	client->name,
552	<	client->username, client->sockhost);
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->localClient->aftype == AF_INET)
556	<	snprintf(nbuf, sizeof(nbuf), "%s[%s@255.255.255.255]",
557	<	client->name, client->username);
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]",
560	<	client->name, client->username);
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]",
564	<	client->name,
565	<	client->username, client->host);
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 642 | 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 *lp = NULL, *next_lp = 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	<	if (source_p->servptr->serv != NULL)
601	<	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->client_list);
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 659 | 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(lp, next_lp, source_p->channel.head)
613	<	remove_user_from_channel(lp->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 672 | Line 622 | exit_one_client(struct Client *source_p,
622
623		if (MyConnect(source_p))
624		{
625	<	/* Clean up invitefield */
676	<	DLINK_FOREACH_SAFE(lp, next_lp, source_p->localClient->invited.head)
677	<	del_invite(lp->data, source_p);
678	<
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 ((lp = dlinkFindDelete(&global_serv_list, source_p)) != NULL)
635	<	free_dlink_node(lp);
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 (HasID(source_p))
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));
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);
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 713 | Line 655 | exit_one_client(struct Client *source_p,
655		dlinkAdd(source_p, make_dlink_node(), &dead_list);
656		}
657
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	–
658		/*
659		* Remove all clients that depend on source_p; assumes all (S)QUITs have
660		* already been sent.  we make sure to exit a server's dependent clients
#	Line 762 | Line 662 | recurse_send_quits(struct Client *origin
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, *next;
667	>	dlink_node *node = NULL, *node_next = NULL;
668
669	<	DLINK_FOREACH_SAFE(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, 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
679		/*
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	–	/*
680		* exit_client - exit a client of any type. Generally, you can use
681		* this on any struct Client, regardless of its state.
682		*
683		* Note, you shouldn't exit remote _users_ without first doing
684		* AddFlag(x, FLAGS_KILLED) and propagating a kill or similar message.
685	+	*
686		* However, it is perfectly correct to call exit_client to force a _server_
687		* quit (either local or remote one).
688		*
689	+	*
690		* 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!
691		* output:       none
692		* side effects: the client is delinked from all lists, disconnected,
693		*               and the rest of IRC network is notified of the exit.
694		*               Client memory is scheduled to be freed
695		*/
696		void
697	<	exit_client(struct Client *source_p, struct Client *from, const char *comment)
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	<	/*
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))
722	>	if (IsClient(source_p))
723		{
724	<	assert(dlinkFind(&unknown_list, source_p));
724	>	time_t on_for = CurrentTime - source_p->connection->firsttime;
725
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;
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)) != NULL)
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 != NULL)
738	<	free_list_task(source_p->localClient->list_task, source_p);
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);
762	<	unset_chcap_usage_counts(source_p);
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))
770		{
771		if (IsServer(source_p))
772		{
773	<	/* for them, we are exiting the network */
774	<	sendto_one(source_p, ":%s SQUIT %s :%s",
775	<	ID_or_name(from, source_p), me.name, comment);
773	>	if (!HasFlag(source_p, FLAGS_SQUIT))
774	>	{
775	>	/* for them, we are exiting the network */
776	>	sendto_one(source_p, ":%s SQUIT %s :%s",
777	>	me.id, me.id, comment);
778	>	}
779		}
780
781		sendto_one(source_p, "ERROR :Closing Link: %s (%s)",
782		source_p->host, comment);
783		}
784
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	–	*/
785		close_connection(source_p);
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];
795	>	char splitstr[HOSTLEN + HOSTLEN + 2] = "";
796
797	<	/* This shouldn't ever happen */
798	<	assert(source_p->serv != NULL && source_p->servptr != NULL);
797	>	assert(source_p->serv);
798	>	assert(source_p->servptr);
799
800		if (ConfigServerHide.hide_servers)
801		/*
802		* Set netsplit message to "*.net *.split" to still show
803		* that its a split, but hide the servers splitting
804		*/
805	<	strcpy(splitstr, "*.net *.split");
805	>	strlcpy(splitstr, "*.net *.split", sizeof(splitstr));
806		else
807		snprintf(splitstr, sizeof(splitstr), "%s %s",
808		source_p->servptr->name, source_p->name);
809
810	<	remove_dependents(source_p, from->from, comment, splitstr);
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, 0, 0, "SQUIT %s :%s", source_p->id, comment);
813
814	<	if (source_p->servptr == &me)
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	<	{
832	<	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	<	}
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 972 | Line 847 | exit_client(struct Client *source_p, str
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 998 | Line 873 | dead_link_on_write(struct Client *client
873		void
874		dead_link_on_read(struct Client *client_p, int error)
875		{
876	<	char errmsg[255];
876	>	char errmsg[IRCD_BUFSIZE];
877		int current_error;
878
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		{
1014	–	int connected = CurrentTime - client_p->localClient->firsttime;
1015	–
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 1036 | 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,
1042	<	(connected/86400 == 1) ? "" : "s",
1043	<	(connected % 86400) / 3600, (connected % 3600) / 60,
1044	<	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 1051 | Line 921 | dead_link_on_read(struct Client *client_
921		snprintf(errmsg, sizeof(errmsg), "Read error: %s",
922		strerror(current_error));
923
924	<	exit_client(client_p, &me, errmsg);
924	>	exit_client(client_p, errmsg);
925		}
926
927		void
#	Line 1068 | 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 1077 | 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";
954
955	<	exit_client(target_p, &me, notice);
955	>	exit_client(target_p, notice);
956		free_dlink_node(ptr);
957		}
958		}
#	Line 1100 | 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);
#	Line 1113 | 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 1139 | 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 1162 | Line 1036 | accept_message(struct Client *source,
1036		void
1037		del_all_accepts(struct Client *client_p)
1038		{
1039	<	dlink_node *ptr = NULL, *next_ptr = NULL;
1039	>	dlink_node *node = NULL, *node_next = NULL;
1040
1041	<	DLINK_FOREACH_SAFE(ptr, next_ptr, 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 1191 | 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 == 0)
1072	>	if (!max_idle)
1073		idle = 0;
1074		else
1075		idle %= max_idle;
#	Line 1203 | 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)