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 1783 by michael, Thu Jan 24 19:26:51 2013 UTC vs.
Revision 5985 by michael, Tue May 26 18:52:42 2015 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-2015 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 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	–	/* init_client()
82	–	*
83	–	* inputs       - NONE
84	–	* output       - NONE
85	–	* side effects - initialize client free memory
86	–	*/
87	–	void
88	–	init_client(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 | init_client(void)
83		struct Client *
84		make_client(struct Client *from)
85		{
86	<	struct Client *client_p = mp_pool_get(client_pool);
117	<
118	<	memset(client_p, 0, sizeof(*client_p));
86	>	struct Client *const client_p = mp_pool_get(client_pool);
87
88	<	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);
135	>	assert(client_p->connection->invited.head == NULL);
136	>	assert(dlink_list_length(&client_p->connection->invited) == 0);
137	>	assert(dlink_list_length(&client_p->connection->watches) == 0);
138		assert(IsClosing(client_p) && IsDead(client_p));
139
140	<	MyFree(client_p->localClient->response);
141	<	MyFree(client_p->localClient->auth_oper);
140	>	MyFree(client_p->connection->challenge_response);
141	>	client_p->connection->challenge_response = NULL;
142	>	MyFree(client_p->connection->challenge_operator);
143	>	client_p->connection->challenge_operator = NULL;
144
145		/*
146	<	* clean up extra sockets from P-lines which have been discarded.
146	>	* Clean up extra sockets from listen {} blocks which have been discarded.
147		*/
148	<	if (client_p->localClient->listener)
148	>	if (client_p->connection->listener)
149		{
150	<	assert(0 < client_p->localClient->listener->ref_count);
151	<	if (0 == --client_p->localClient->listener->ref_count &&
185	<	!client_p->localClient->listener->active)
186	<	free_listener(client_p->localClient->listener);
150	>	listener_release(client_p->connection->listener);
151	>	client_p->connection->listener = NULL;
152		}
153
154	<	dbuf_clear(&client_p->localClient->buf_recvq);
155	<	dbuf_clear(&client_p->localClient->buf_sendq);
154	>	dbuf_clear(&client_p->connection->buf_recvq);
155	>	dbuf_clear(&client_p->connection->buf_sendq);
156
157	<	mp_pool_release(client_p->localClient);
157	>	mp_pool_release(client_p->connection);
158		}
159
160		mp_pool_release(client_p);
161		}
162
163	<	/*
164	<	* check_pings - go through the local client list and check activity
165	<	* kill off stuff that should die
166	<	*
167	<	* inputs       - NOT USED (from event)
168	<	* output       - next time_t when check_pings() should be called again
204	<	* side effects -
205	<	*
206	<	*
207	<	* A PING can be sent to clients as necessary.
208	<	*
209	<	* Client/Server ping outs are handled.
210	<	*/
163	>	void
164	>	client_attach_svstag(struct Client *client_p, unsigned int numeric,
165	>	const char *umodes, const char *const tag)
166	>	{
167	>	struct ServicesTag *svstag = NULL;
168	>	const struct user_modes *tab = NULL;
169
170	<	/*
171	<	* Addon from adrian. We used to call this after nextping seconds,
214	<	* however I've changed it to run once a second. This is only for
215	<	* PING timeouts, not K/etc-line checks (thanks dianora!). Having it
216	<	* run once a second makes life a lot easier - when a new client connects
217	<	* and they need a ping in 4 seconds, if nextping was set to 20 seconds
218	<	* we end up waiting 20 seconds. This is stupid. :-)
219	<	* I will optimise (hah!) check_pings() once I've finished working on
220	<	* tidying up other network IO evilnesses.
221	<	*     -- adrian
222	<	*/
170	>	if (numeric >= ERR_LAST_ERR_MSG || *umodes != '+')
171	>	return;
172
173	<	static void
174	<	check_pings(void *notused)
175	<	{
176	<	check_pings_list(&local_client_list);
177	<	check_pings_list(&serv_list);
178	<	check_unknowns_list();
173	>	svstag = MyCalloc(sizeof(*svstag));
174	>	svstag->numeric = numeric;
175	>	svstag->tag = xstrdup(tag);
176	>
177	>	for (const char *m = umodes + 1; *m; ++m)
178	>	if ((tab = umode_map[(unsigned char)*m]))
179	>	svstag->umodes |= tab->flag;
180	>
181	>	if (numeric != RPL_WHOISOPERATOR)
182	>	dlinkAddTail(svstag, &svstag->node, &client_p->svstags);
183	>	else
184	>	dlinkAdd(svstag, &svstag->node, &client_p->svstags);
185	>	}
186	>
187	>	void
188	>	client_clear_svstags(struct Client *client_p)
189	>	{
190	>	dlink_node *node = NULL, *node_next = NULL;
191	>
192	>	DLINK_FOREACH_SAFE(node, node_next, client_p->svstags.head)
193	>	{
194	>	struct ServicesTag *svstag = node->data;
195	>
196	>	dlinkDelete(&svstag->node, &client_p->svstags);
197	>	MyFree(svstag->tag);
198	>	MyFree(svstag);
199	>	}
200		}
201
202		/* check_pings_list()
203		*
204		* inputs       - pointer to list to check
205		* output       - NONE
206	<	* side effects -
206	>	* side effects -
207		*/
208		static void
209		check_pings_list(dlink_list *list)
210		{
211	<	char scratch[32];        /* way too generous but... */
211	>	char buf[IRCD_BUFSIZE] = "";
212		int ping = 0;      /* ping time value from client */
213	<	dlink_node *ptr = NULL, *next_ptr = NULL;
213	>	dlink_node *node = NULL, *node_next = NULL;
214
215	<	DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
215	>	DLINK_FOREACH_SAFE(node, node_next, list->head)
216		{
217	<	struct Client *client_p = ptr->data;
217	>	struct Client *client_p = node->data;
218
249	–	/*
250	–	** Note: No need to notify opers here. It's
251	–	** already done when "FLAGS_DEADSOCKET" is set.
252	–	*/
219		if (IsDead(client_p))
220	<	{
255	<	/* Ignore it, its been exited already */
256	<	continue;
257	<	}
220	>	continue;  /* Ignore it, its been exited already */
221
222		if (!IsRegistered(client_p))
223		ping = CONNECTTIMEOUT;
224		else
225	<	ping = get_client_ping(&client_p->localClient->confs);
225	>	ping = get_client_ping(&client_p->connection->confs);
226
227	<	if (ping < CurrentTime - client_p->localClient->lasttime)
227	>	if (ping < CurrentTime - client_p->connection->lasttime)
228		{
229		if (!IsPingSent(client_p))
230		{
231	<	/*
232	<	* if we havent PINGed the connection and we havent
233	<	* heard from it in a while, PING it to make sure
234	<	* it is still alive.
235	<	*/
236	<	SetPingSent(client_p);
237	<	client_p->localClient->lasttime = CurrentTime - ping;
238	<	sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
231	>	/*
232	>	* If we haven't PINGed the connection and we haven't
233	>	* heard from it in a while, PING it to make sure
234	>	* it is still alive.
235	>	*/
236	>	SetPingSent(client_p);
237	>	client_p->connection->lasttime = CurrentTime - ping;
238	>	sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
239		}
240		else
241		{
242	<	if (CurrentTime - client_p->localClient->lasttime >= 2 * ping)
242	>	if (CurrentTime - client_p->connection->lasttime >= 2 * ping)
243		{
244		/*
245		* If the client/server hasn't talked to us in 2*ping seconds
246		* and it has a ping time, then close its connection.
247		*/
248		if (IsServer(client_p) || IsHandshake(client_p))
249	<	{
250	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
251	<	"No response from %s, closing link",
252	<	get_client_name(client_p, HIDE_IP));
253	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
254	<	"No response from %s, closing link",
255	<	get_client_name(client_p, MASK_IP));
256	<	ilog(LOG_TYPE_IRCD, "No response from %s, closing link",
257	<	get_client_name(client_p, HIDE_IP));
258	<	}
259	<
260	<	snprintf(scratch, sizeof(scratch), "Ping timeout: %d seconds",
261	<	(int)(CurrentTime - client_p->localClient->lasttime));
262	<	exit_client(client_p, &me, scratch);
249	>	{
250	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
251	>	"No response from %s, closing link",
252	>	get_client_name(client_p, HIDE_IP));
253	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
254	>	"No response from %s, closing link",
255	>	get_client_name(client_p, MASK_IP));
256	>	ilog(LOG_TYPE_IRCD, "No response from %s, closing link",
257	>	get_client_name(client_p, HIDE_IP));
258	>	}
259	>
260	>	snprintf(buf, sizeof(buf), "Ping timeout: %d seconds",
261	>	(int)(CurrentTime - client_p->connection->lasttime));
262	>	exit_client(client_p, buf);
263		}
264		}
265		}
#	Line 312 | Line 275 | check_pings_list(dlink_list *list)
275		static void
276		check_unknowns_list(void)
277		{
278	<	dlink_node *ptr, *next_ptr;
278	>	dlink_node *node = NULL, *node_next = NULL;
279
280	<	DLINK_FOREACH_SAFE(ptr, next_ptr, unknown_list.head)
280	>	DLINK_FOREACH_SAFE(node, node_next, unknown_list.head)
281		{
282	<	struct Client *client_p = ptr->data;
282	>	struct Client *client_p = node->data;
283
284		/*
285		* Check UNKNOWN connections - if they have been in this state
286		* for > 30s, close them.
287		*/
288	<	if (IsAuthFinished(client_p) && (CurrentTime - client_p->localClient->firsttime) > 30)
289	<	exit_client(client_p, &me, "Registration timed out");
288	>	if (IsAuthFinished(client_p) && (CurrentTime - client_p->connection->firsttime) > 30)
289	>	exit_client(client_p, "Registration timed out");
290		}
291		}
292
293	+	/*
294	+	* check_pings - go through the local client list and check activity
295	+	* kill off stuff that should die
296	+	*
297	+	* inputs       - NOT USED (from event)
298	+	* output       - next time_t when check_pings() should be called again
299	+	* side effects -
300	+	*
301	+	*
302	+	* A PING can be sent to clients as necessary.
303	+	*
304	+	* Client/Server ping outs are handled.
305	+	*/
306	+
307	+	/*
308	+	* Addon from adrian. We used to call this after nextping seconds,
309	+	* however I've changed it to run once a second. This is only for
310	+	* PING timeouts, not K/etc-line checks (thanks dianora!). Having it
311	+	* run once a second makes life a lot easier - when a new client connects
312	+	* and they need a ping in 4 seconds, if nextping was set to 20 seconds
313	+	* we end up waiting 20 seconds. This is stupid. :-)
314	+	* I will optimise (hah!) check_pings() once I've finished working on
315	+	* tidying up other network IO evilnesses.
316	+	*     -- adrian
317	+	*/
318	+
319	+	static void
320	+	check_pings(void *unused)
321	+	{
322	+	check_pings_list(&local_client_list);
323	+	check_pings_list(&local_server_list);
324	+	check_unknowns_list();
325	+	}
326	+
327		/* check_conf_klines()
328		*
329		* inputs       - NONE
#	Line 334 | Line 331 | check_unknowns_list(void)
331		* side effects - Check all connections for a pending kline against the
332		*                client, exit the client if a kline matches.
333		*/
334	<	void
334	>	void
335		check_conf_klines(void)
336	<	{
340	<	struct Client *client_p = NULL;       /* current local client_p being examined */
336	>	{
337		struct MaskItem *conf = NULL;
338	<	dlink_node *ptr, *next_ptr;
338	>	dlink_node *node = NULL, *node_next = NULL;
339
340	<	DLINK_FOREACH_SAFE(ptr, next_ptr, local_client_list.head)
340	>	DLINK_FOREACH_SAFE(node, node_next, local_client_list.head)
341		{
342	<	client_p = ptr->data;
342	>	struct Client *client_p = node->data;
343
344	<	/* If a client is already being exited
345	<	*/
350	<	if (IsDead(client_p) || !IsClient(client_p))
344	>	/* If a client is already being exited */
345	>	if (IsDead(client_p))
346		continue;
347
348	<	if ((conf = find_dline_conf(&client_p->localClient->ip,
349	<	client_p->localClient->aftype)) != NULL)
348	>	if ((conf = find_conf_by_address(NULL, &client_p->connection->ip, CONF_DLINE,
349	>	client_p->connection->aftype, NULL, NULL, 1)))
350		{
351	<	if (conf->type == CONF_EXEMPT)
352	<	continue;
358	<
359	<	ban_them(client_p, conf);
360	<	continue; /* and go examine next fd/client_p */
351	>	conf_try_ban(client_p, conf);
352	>	continue;  /* and go examine next Client */
353		}
354
355	<	if (ConfigFileEntry.glines && (conf = find_gline(client_p)))
356	<	{
357	<	if (IsExemptKline(client_p) ||
366	<	IsExemptGline(client_p))
367	<	{
368	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
369	<	"GLINE over-ruled for %s, client is %sline_exempt",
370	<	get_client_name(client_p, HIDE_IP), IsExemptKline(client_p) ? "k" : "g");
371	<	continue;
372	<	}
373	<
374	<	ban_them(client_p, conf);
375	<	/* and go examine next fd/client_p */
376	<	continue;
377	<	}
378	<
379	<	if ((conf = find_kill(client_p)) != NULL)
355	>	if ((conf = find_conf_by_address(client_p->host, &client_p->connection->ip,
356	>	CONF_KLINE, client_p->connection->aftype,
357	>	client_p->username, NULL, 1)))
358		{
359	<	if (IsExemptKline(client_p))
360	<	{
383	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
384	<	"KLINE over-ruled for %s, client is kline_exempt",
385	<	get_client_name(client_p, HIDE_IP));
386	<	continue;
387	<	}
388	<
389	<	ban_them(client_p, conf);
390	<	continue;
359	>	conf_try_ban(client_p, conf);
360	>	continue;  /* and go examine next Client */
361		}
362
363	<	if ((conf = find_matching_name_conf(CONF_XLINE,  client_p->info,
364	<	NULL, NULL, 0)) != NULL ||
395	<	(conf = find_matching_name_conf(CONF_RXLINE, client_p->info,
396	<	NULL, NULL, 0)) != NULL)
363	>	if ((conf = find_matching_name_conf(CONF_XLINE, client_p->info,
364	>	NULL, NULL, 0)))
365		{
366	<	ban_them(client_p, conf);
367	<	continue;
366	>	conf_try_ban(client_p, conf);
367	>	continue;  /* and go examine next Client */
368		}
369		}
370
371	<	/* also check the unknowns list for new dlines */
372	<	DLINK_FOREACH_SAFE(ptr, next_ptr, unknown_list.head)
371	>	/* Also check the unknowns list for new dlines */
372	>	DLINK_FOREACH_SAFE(node, node_next, unknown_list.head)
373		{
374	<	client_p = ptr->data;
374	>	struct Client *client_p = node->data;
375
376	<	if ((conf = find_dline_conf(&client_p->localClient->ip,
377	<	client_p->localClient->aftype)))
376	>	if ((conf = find_conf_by_address(NULL, &client_p->connection->ip, CONF_DLINE,
377	>	client_p->connection->aftype, NULL, NULL, 1)))
378		{
379	<	if (conf->type == CONF_EXEMPT)
380	<	continue;
413	<
414	<	exit_client(client_p, &me, "D-lined");
379	>	conf_try_ban(client_p, conf);
380	>	continue;  /* and go examine next Client */
381		}
382		}
383		}
384
385		/*
386	<	* ban_them
386	>	* conf_try_ban
387		*
388		* inputs       - pointer to client to ban
389		*              - pointer to MaskItem
390		* output       - NONE
391		* side effects - given client_p is banned
392		*/
393	<	static void
394	<	ban_them(struct Client *client_p, struct MaskItem *conf)
393	>	void
394	>	conf_try_ban(struct Client *client_p, struct MaskItem *conf)
395		{
396	<	const char *user_reason = NULL;       /* What is sent to user */
431	<	const char *type_string = NULL;
432	<	const char dline_string[] = "D-line";
433	<	const char kline_string[] = "K-line";
434	<	const char gline_string[] = "G-line";
435	<	const char xline_string[] = "X-line";
396	>	char ban_type = '\0';
397
398		switch (conf->type)
399		{
439	–	case CONF_RKLINE:
400		case CONF_KLINE:
401	<	type_string = kline_string;
401	>	if (IsExemptKline(client_p))
402	>	{
403	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
404	>	"KLINE over-ruled for %s, client is kline_exempt",
405	>	get_client_name(client_p, HIDE_IP));
406	>	return;
407	>	}
408	>
409	>	ban_type = 'K';
410		break;
411		case CONF_DLINE:
412	<	type_string = dline_string;
413	<	break;
414	<	case CONF_GLINE:
415	<	type_string = gline_string;
412	>	if (find_conf_by_address(NULL, &client_p->connection->ip, CONF_EXEMPT,
413	>	client_p->connection->aftype, NULL, NULL, 1))
414	>	return;
415	>	ban_type = 'D';
416		break;
449	–	case CONF_RXLINE:
417		case CONF_XLINE:
418	<	type_string = xline_string;
418	>	if (IsExemptXline(client_p))
419	>	{
420	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
421	>	"XLINE over-ruled for %s, client is xline_exempt",
422	>	get_client_name(client_p, HIDE_IP));
423	>	return;
424	>	}
425	>	ban_type = 'X';
426		++conf->count;
427		break;
428		default:
#	Line 456 | Line 430 | ban_them(struct Client *client_p, struct
430		break;
431		}
432
433	<	user_reason = conf->reason ? conf->reason : type_string;
434	<
461	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s active for %s",
462	<	type_string, get_client_name(client_p, HIDE_IP));
433	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%c-line active for %s",
434	>	ban_type, get_client_name(client_p, HIDE_IP));
435
436		if (IsClient(client_p))
437	<	sendto_one(client_p, form_str(ERR_YOUREBANNEDCREEP),
466	<	me.name, client_p->name, user_reason);
437	>	sendto_one_numeric(client_p, &me, ERR_YOUREBANNEDCREEP, conf->reason);
438
439	<	exit_client(client_p, &me, user_reason);
439	>	exit_client(client_p, conf->reason);
440		}
441
442		/* update_client_exit_stats()
443		*
444		* input        - pointer to client
445		* output       - NONE
446	<	* side effects -
446	>	* side effects -
447		*/
448		static void
449		update_client_exit_stats(struct Client *client_p)
#	Line 480 | Line 451 | update_client_exit_stats(struct Client *
451		if (IsClient(client_p))
452		{
453		assert(Count.total > 0);
454	+
455		--Count.total;
456		if (HasUMode(client_p, UMODE_OPER))
457		--Count.oper;
#	Line 502 | Line 474 | update_client_exit_stats(struct Client *
474		* side effects - find person by (nick)name
475		*/
476		struct Client *
477	<	find_person(const struct Client *client_p, const char *name)
477	>	find_person(const struct Client *const source_p, const char *name)
478		{
479	<	struct Client *c2ptr = NULL;
479	>	struct Client *target_p = NULL;
480
481		if (IsDigit(*name))
482		{
483	<	if ((c2ptr = hash_find_id(name)) != NULL)
484	<	{
513	<	/* invisible users shall not be found by UID guessing */
514	<	if (HasUMode(c2ptr, UMODE_INVISIBLE))
515	<	if (!IsServer(client_p) && !HasFlag(client_p, FLAGS_SERVICE))
516	<	c2ptr = NULL;
517	<	}
483	>	if (IsServer(source_p->from))
484	>	target_p = hash_find_id(name);
485		}
486		else
487	<	c2ptr = hash_find_client(name);
487	>	target_p = hash_find_client(name);
488
489	<	return ((c2ptr != NULL && IsClient(c2ptr)) ? c2ptr : NULL);
489	>	return (target_p && IsClient(target_p)) ? target_p : NULL;
490		}
491
492		/*
493	<	* find_chasing - find the client structure for a nick name (user)
494	<	*      using history mechanism if necessary. If the client is not found,
495	<	*      an error message (NO SUCH NICK) is generated. If the client was found
529	<	*      through the history, chasing will be 1 and otherwise 0.
493	>	* find_chasing - find the client structure for a nick name (name)
494	>	*      using history mechanism if necessary. If the client is not found,
495	>	*      an error message (NO SUCH NICK) is generated.
496		*/
497		struct Client *
498	<	find_chasing(struct Client *client_p, struct Client *source_p, const char *user, int *chasing)
498	>	find_chasing(struct Client *source_p, const char *name)
499		{
500	<	struct Client *who = find_person(client_p, user);
500	>	struct Client *target_p = find_person(source_p, name);
501
502	<	if (chasing)
503	<	*chasing = 0;
502	>	if (target_p)
503	>	return target_p;
504
505	<	if (who)
540	<	return who;
541	<
542	<	if (IsDigit(*user))
505	>	if (IsDigit(*name))
506		return NULL;
507
508	<	if ((who = get_history(user,
509	<	(time_t)ConfigFileEntry.kill_chase_time_limit))
510	<	== NULL)
508	>	target_p = whowas_get_history(name, (time_t)ConfigGeneral.kill_chase_time_limit);
509	>
510	>	if (!target_p)
511		{
512	<	sendto_one(source_p, form_str(ERR_NOSUCHNICK),
550	<	me.name, source_p->name, user);
512	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHNICK, name);
513		return NULL;
514		}
515
516	<	if (chasing)
555	<	*chasing = 1;
556	<
557	<	return who;
516	>	return target_p;
517		}
518
519		/*
#	Line 566 | Line 525 | find_chasing(struct Client *client_p, st
525		*        But, this can be used to any client structure.
526		*
527		* NOTE 1:
528	<	*        Watch out the allocation of "nbuf", if either source_p->name
528	>	*        Watch out the allocation of "buf", if either source_p->name
529		*        or source_p->sockhost gets changed into pointers instead of
530		*        directly allocated within the structure...
531		*
532		* NOTE 2:
533		*        Function return either a pointer to the structure (source_p) or
534	<	*        to internal buffer (nbuf). *NEVER* use the returned pointer
534	>	*        to internal buffer (buf). *NEVER* use the returned pointer
535		*        to modify what it points!!!
536		*/
537		const char *
538	<	get_client_name(const struct Client *client, enum addr_mask_type type)
538	>	get_client_name(const struct Client *client_p, enum addr_mask_type type)
539		{
540	<	static char nbuf[HOSTLEN * 2 + USERLEN + 5];
582	<
583	<	assert(client != NULL);
540	>	static char buf[HOSTLEN * 2 + USERLEN + 5];
541
542	<	if (!MyConnect(client))
543	<	return client->name;
542	>	if (!MyConnect(client_p))
543	>	return client_p->name;
544
545	<	if (IsServer(client) || IsConnecting(client) || IsHandshake(client))
545	>	if (IsServer(client_p) || IsConnecting(client_p) || IsHandshake(client_p))
546		{
547	<	if (!irccmp(client->name, client->host))
548	<	return client->name;
547	>	if (!irccmp(client_p->name, client_p->host))
548	>	return client_p->name;
549		else if (ConfigServerHide.hide_server_ips)
550		type = MASK_IP;
551		}
552
596	–	if (ConfigFileEntry.hide_spoof_ips)
597	–	if (type == SHOW_IP && IsIPSpoof(client))
598	–	type = MASK_IP;
599	–
553		/* And finally, let's get the host information, ip or name */
554		switch (type)
555		{
556		case SHOW_IP:
557	<	snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
558	<	client->name,
559	<	client->username, client->sockhost);
557	>	snprintf(buf, sizeof(buf), "%s[%s@%s]",
558	>	client_p->name,
559	>	client_p->username, client_p->sockhost);
560		break;
561		case MASK_IP:
562	<	if (client->localClient->aftype == AF_INET)
563	<	snprintf(nbuf, sizeof(nbuf), "%s[%s@255.255.255.255]",
564	<	client->name, client->username);
562	>	if (client_p->connection->aftype == AF_INET)
563	>	snprintf(buf, sizeof(buf), "%s[%s@255.255.255.255]",
564	>	client_p->name, client_p->username);
565		else
566	<	snprintf(nbuf, sizeof(nbuf), "%s[%s@ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]",
567	<	client->name, client->username);
566	>	snprintf(buf, sizeof(buf), "%s[%s@ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]",
567	>	client_p->name, client_p->username);
568		break;
569		default:
570	<	snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
571	<	client->name,
572	<	client->username, client->host);
570	>	snprintf(buf, sizeof(buf), "%s[%s@%s]",
571	>	client_p->name,
572	>	client_p->username, client_p->host);
573		}
574
575	<	return nbuf;
575	>	return buf;
576		}
577
578		void
579		free_exited_clients(void)
580		{
581	<	dlink_node *ptr = NULL, *next = NULL;
582	<
583	<	DLINK_FOREACH_SAFE(ptr, next, dead_list.head)
581	>	dlink_node *node = NULL, *node_next = NULL;
582	>
583	>	DLINK_FOREACH_SAFE(node, node_next, dead_list.head)
584		{
585	<	free_client(ptr->data);
586	<	dlinkDelete(ptr, &dead_list);
587	<	free_dlink_node(ptr);
585	>	free_client(node->data);
586	>	dlinkDelete(node, &dead_list);
587	>	free_dlink_node(node);
588		}
589		}
590
#	Line 642 | Line 595 | free_exited_clients(void)
595		* The only messages generated are QUITs on channels.
596		*/
597		static void
598	<	exit_one_client(struct Client *source_p, const char *quitmsg)
598	>	exit_one_client(struct Client *source_p, const char *comment)
599		{
600	<	dlink_node *lp = NULL, *next_lp = NULL;
600	>	dlink_node *node = NULL, *node_next = NULL;
601
602		assert(!IsMe(source_p));
603	+	assert(source_p != &me);
604
605		if (IsClient(source_p))
606		{
607	<	if (source_p->servptr->serv != NULL)
608	<	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->client_list);
607	>	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->client_list);
608	>	dlinkDelete(&source_p->node, &global_client_list);
609
610		/*
611		* If a person is on a channel, send a QUIT notice
#	Line 661 | Line 615 | exit_one_client(struct Client *source_p,
615		*/
616		sendto_common_channels_local(source_p, 0, 0, ":%s!%s@%s QUIT :%s",
617		source_p->name, source_p->username,
618	<	source_p->host, quitmsg);
619	<	DLINK_FOREACH_SAFE(lp, next_lp, source_p->channel.head)
620	<	remove_user_from_channel(lp->data);
618	>	source_p->host, comment);
619	>
620	>	DLINK_FOREACH_SAFE(node, node_next, source_p->channel.head)
621	>	remove_user_from_channel(node->data);
622
623	<	add_history(source_p, 0);
624	<	off_history(source_p);
623	>	whowas_add_history(source_p, 0);
624	>	whowas_off_history(source_p);
625
626		watch_check_hash(source_p, RPL_LOGOFF);
627
628		if (MyConnect(source_p))
629		{
630	<	/* Clean up invitefield */
676	<	DLINK_FOREACH_SAFE(lp, next_lp, source_p->localClient->invited.head)
677	<	del_invite(lp->data, source_p);
678	<
630	>	clear_invites_client(source_p);
631		del_all_accepts(source_p);
632		}
633		}
634		else if (IsServer(source_p))
635		{
636		dlinkDelete(&source_p->lnode, &source_p->servptr->serv->server_list);
637	+	dlinkDelete(&source_p->node, &global_client_list);
638
639	<	if ((lp = dlinkFindDelete(&global_serv_list, source_p)) != NULL)
640	<	free_dlink_node(lp);
639	>	if ((node = dlinkFindDelete(&global_server_list, source_p)))
640	>	free_dlink_node(node);
641		}
642
643		/* Remove source_p from the client lists */
644	<	if (HasID(source_p))
644	>	if (source_p->id[0])
645		hash_del_id(source_p);
646	+
647		if (source_p->name[0])
648		hash_del_client(source_p);
649
650		if (IsUserHostIp(source_p))
651		delete_user_host(source_p->username, source_p->host, !MyConnect(source_p));
652
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);
705	–
653		update_client_exit_stats(source_p);
654
655		/* Check to see if the client isn't already on the dead list */
#	Line 713 | Line 660 | exit_one_client(struct Client *source_p,
660		dlinkAdd(source_p, make_dlink_node(), &dead_list);
661		}
662
663	<	/* 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	<
758	<	/*
663	>	/*
664		* Remove all clients that depend on source_p; assumes all (S)QUITs have
665	<	* already been sent.  we make sure to exit a server's dependent clients
666	<	* and servers before the server itself; exit_one_client takes care of
665	>	* already been sent.  we make sure to exit a server's dependent clients
666	>	* and servers before the server itself; exit_one_client takes care of
667		* actually removing things off llists.   tweaked from +CSr31  -orabidoo
668		*/
669		static void
670	<	recurse_remove_clients(struct Client *source_p, const char *quitmsg)
670	>	recurse_remove_clients(struct Client *source_p, const char *comment)
671		{
672	<	dlink_node *ptr, *next;
672	>	dlink_node *node = NULL, *node_next = NULL;
673
674	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->client_list.head)
675	<	exit_one_client(ptr->data, quitmsg);
674	>	DLINK_FOREACH_SAFE(node, node_next, source_p->serv->client_list.head)
675	>	exit_one_client(node->data, comment);
676
677	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->server_list.head)
677	>	DLINK_FOREACH_SAFE(node, node_next, source_p->serv->server_list.head)
678		{
679	<	recurse_remove_clients(ptr->data, quitmsg);
680	<	exit_one_client(ptr->data, quitmsg);
679	>	recurse_remove_clients(node->data, comment);
680	>	exit_one_client(node->data, comment);
681		}
682		}
683
684		/*
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	–	/*
685		* exit_client - exit a client of any type. Generally, you can use
686		* this on any struct Client, regardless of its state.
687		*
688		* Note, you shouldn't exit remote _users_ without first doing
689		* AddFlag(x, FLAGS_KILLED) and propagating a kill or similar message.
690	+	*
691		* However, it is perfectly correct to call exit_client to force a _server_
692		* quit (either local or remote one).
693		*
694	+	*
695		* 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!
696		* output:       none
697		* side effects: the client is delinked from all lists, disconnected,
698		*               and the rest of IRC network is notified of the exit.
699		*               Client memory is scheduled to be freed
700		*/
701		void
702	<	exit_client(struct Client *source_p, struct Client *from, const char *comment)
702	>	exit_client(struct Client *source_p, const char *comment)
703		{
704	<	dlink_node *m = NULL;
704	>	dlink_node *node = NULL;
705	>
706	>	assert(!IsMe(source_p));
707	>	assert(source_p != &me);
708
709		if (MyConnect(source_p))
710		{
#	Line 827 | Line 716 | exit_client(struct Client *source_p, str
716
717		SetClosing(source_p);
718
719	<	if (IsIpHash(source_p))
831	<	remove_one_ip(&source_p->localClient->ip);
832	<
833	<	if (source_p->localClient->auth)
719	>	if (HasFlag(source_p, FLAGS_IPHASH))
720		{
721	<	delete_auth(source_p->localClient->auth);
722	<	source_p->localClient->auth = NULL;
721	>	DelFlag(source_p, FLAGS_IPHASH);
722	>	ipcache_remove_address(&source_p->connection->ip);
723		}
724
725	+	delete_auth(&source_p->connection->auth);
726	+
727		/*
728		* This source_p could have status of one of STAT_UNKNOWN, STAT_CONNECTING
729		* STAT_HANDSHAKE or STAT_UNKNOWN
#	Line 847 | Line 735 | exit_client(struct Client *source_p, str
735		{
736		assert(dlinkFind(&unknown_list, source_p));
737
738	<	dlinkDelete(&source_p->localClient->lclient_node, &unknown_list);
738	>	dlinkDelete(&source_p->connection->lclient_node, &unknown_list);
739		}
740		else if (IsClient(source_p))
741		{
742	<	time_t on_for = CurrentTime - source_p->localClient->firsttime;
742	>	time_t on_for = CurrentTime - source_p->connection->firsttime;
743	>
744		assert(Count.local > 0);
745	<	Count.local--;
745	>
746	>	--Count.local;
747
748		if (HasUMode(source_p, UMODE_OPER))
749	<	if ((m = dlinkFindDelete(&oper_list, source_p)) != NULL)
750	<	free_dlink_node(m);
749	>	if ((node = dlinkFindDelete(&oper_list, source_p)))
750	>	free_dlink_node(node);
751
752		assert(dlinkFind(&local_client_list, source_p));
753	<	dlinkDelete(&source_p->localClient->lclient_node, &local_client_list);
753	>	dlinkDelete(&source_p->connection->lclient_node, &local_client_list);
754
755	<	if (source_p->localClient->list_task != NULL)
756	<	free_list_task(source_p->localClient->list_task, source_p);
755	>	if (source_p->connection->list_task)
756	>	free_list_task(source_p);
757
758		watch_del_watch_list(source_p);
759	+	client_clear_svstags(source_p);
760	+
761		sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
762		"Client exiting: %s (%s@%s) [%s] [%s]",
763		source_p->name, source_p->username, source_p->host, comment,
764	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
765	<	"255.255.255.255" : source_p->sockhost);
874	<	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL, SEND_NOTICE,
875	<	"CLIEXIT: %s %s %s %s 0 %s",
876	<	source_p->name,
877	<	source_p->username,
878	<	source_p->host,
879	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
880	<	"255.255.255.255" : source_p->sockhost,
881	<	comment);
764	>	source_p->sockhost);
765	>
766		ilog(LOG_TYPE_USER, "%s (%3u:%02u:%02u): %s!%s@%s %llu/%llu",
767	<	myctime(source_p->localClient->firsttime), (unsigned int)(on_for / 3600),
767	>	myctime(source_p->connection->firsttime), (unsigned int)(on_for / 3600),
768		(unsigned int)((on_for % 3600)/60), (unsigned int)(on_for % 60),
769		source_p->name, source_p->username, source_p->host,
770	<	source_p->localClient->send.bytes>>10,
771	<	source_p->localClient->recv.bytes>>10);
770	>	source_p->connection->send.bytes>>10,
771	>	source_p->connection->recv.bytes>>10);
772		}
773		else if (IsServer(source_p))
774		{
775		assert(Count.myserver > 0);
776	+
777		--Count.myserver;
778
779	<	assert(dlinkFind(&serv_list, source_p));
780	<	dlinkDelete(&source_p->localClient->lclient_node, &serv_list);
896	<	unset_chcap_usage_counts(source_p);
779	>	assert(dlinkFind(&local_server_list, source_p));
780	>	dlinkDelete(&source_p->connection->lclient_node, &local_server_list);
781		}
782
783		if (!IsDead(source_p))
784		{
785		if (IsServer(source_p))
786		{
787	<	/* for them, we are exiting the network */
788	<	sendto_one(source_p, ":%s SQUIT %s :%s",
789	<	ID_or_name(from, source_p), me.name, comment);
787	>	if (!HasFlag(source_p, FLAGS_SQUIT))
788	>	{
789	>	/* for them, we are exiting the network */
790	>	sendto_one(source_p, ":%s SQUIT %s :%s",
791	>	me.id, me.id, comment);
792	>	}
793		}
794
795		sendto_one(source_p, "ERROR :Closing Link: %s (%s)",
796		source_p->host, comment);
797		}
798
912	–	/*
913	–	** Currently only server connections can have
914	–	** depending remote clients here, but it does no
915	–	** harm to check for all local clients. In
916	–	** future some other clients than servers might
917	–	** have remotes too...
918	–	**
919	–	** Close the Client connection first and mark it
920	–	** so that no messages are attempted to send to it.
921	–	** Remember it makes source_p->from == NULL.
922	–	*/
799		close_connection(source_p);
800		}
801	+	else if (IsClient(source_p) && HasFlag(source_p->servptr, FLAGS_EOB))
802	+	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
803	+	"Client exiting at %s: %s (%s@%s) [%s]",
804	+	source_p->servptr->name, source_p->name,
805	+	source_p->username, source_p->host, comment);
806
807		if (IsServer(source_p))
808		{
809	<	char splitstr[HOSTLEN + HOSTLEN + 2];
809	>	char splitstr[HOSTLEN + HOSTLEN + 2] = "";
810
811	<	/* This shouldn't ever happen */
812	<	assert(source_p->serv != NULL && source_p->servptr != NULL);
811	>	assert(source_p->serv);
812	>	assert(source_p->servptr);
813
814		if (ConfigServerHide.hide_servers)
815		/*
816	<	* Set netsplit message to "*.net *.split" to still show
816	>	* Set netsplit message to "*.net *.split" to still show
817		* that its a split, but hide the servers splitting
818		*/
819	<	strcpy(splitstr, "*.net *.split");
819	>	strlcpy(splitstr, "*.net *.split", sizeof(splitstr));
820		else
821		snprintf(splitstr, sizeof(splitstr), "%s %s",
822		source_p->servptr->name, source_p->name);
823
824	<	remove_dependents(source_p, from->from, comment, splitstr);
824	>	/* Send SQUIT for source_p in every direction. source_p is already off of local_server_list here */
825	>	if (!HasFlag(source_p, FLAGS_SQUIT))
826	>	sendto_server(NULL, 0, 0, "SQUIT %s :%s", source_p->id, comment);
827	>
828	>	/* Now exit the clients internally */
829	>	recurse_remove_clients(source_p, splitstr);
830
831	<	if (source_p->servptr == &me)
831	>	if (MyConnect(source_p))
832		{
833	+	int connected = CurrentTime - source_p->connection->firsttime;
834		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
835	<	"%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
836	<	source_p->name, (int)(CurrentTime - source_p->localClient->firsttime),
837	<	source_p->localClient->send.bytes >> 10,
838	<	source_p->localClient->recv.bytes >> 10);
839	<	ilog(LOG_TYPE_IRCD, "%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
840	<	source_p->name, (int)(CurrentTime - source_p->localClient->firsttime),
841	<	source_p->localClient->send.bytes >> 10,
842	<	source_p->localClient->recv.bytes >> 10);
835	>	"%s was connected for %d day%s, %2d:%02d:%02d. %llu/%llu sendK/recvK.",
836	>	source_p->name, connected/86400, (connected/86400 == 1) ? "" : "s",
837	>	(connected % 86400) / 3600, (connected % 3600) / 60, connected % 60,
838	>	source_p->connection->send.bytes >> 10,
839	>	source_p->connection->recv.bytes >> 10);
840	>	ilog(LOG_TYPE_IRCD, "%s was connected for %d day%s, %2d:%02d:%02d. %llu/%llu sendK/recvK.",
841	>	source_p->name, connected/86400, (connected/86400 == 1) ? "" : "s",
842	>	(connected % 86400) / 3600, (connected % 3600) / 60, connected % 60,
843	>	source_p->connection->send.bytes >> 10,
844	>	source_p->connection->recv.bytes >> 10);
845		}
846		}
847		else if (IsClient(source_p) && !HasFlag(source_p, FLAGS_KILLED))
848	<	{
849	<	sendto_server(from->from, CAP_TS6, NOCAPS,
961	<	":%s QUIT :%s", ID(source_p), comment);
962	<	sendto_server(from->from, NOCAPS, CAP_TS6,
963	<	":%s QUIT :%s", source_p->name, comment);
964	<	}
848	>	sendto_server(source_p->from, 0, 0, ":%s QUIT :%s",
849	>	source_p->id, comment);
850
851		/* The client *better* be off all of the lists */
852		assert(dlinkFind(&unknown_list, source_p) == NULL);
853		assert(dlinkFind(&local_client_list, source_p) == NULL);
854	<	assert(dlinkFind(&serv_list, source_p) == NULL);
854	>	assert(dlinkFind(&local_server_list, source_p) == NULL);
855		assert(dlinkFind(&oper_list, source_p) == NULL);
856
857		exit_one_client(source_p, comment);
#	Line 979 | Line 864 | exit_client(struct Client *source_p, str
864		void
865		dead_link_on_write(struct Client *client_p, int ierrno)
866		{
867	<	dlink_node *ptr;
867	>	dlink_node *node;
868
869		if (IsDefunct(client_p))
870		return;
871
872	<	dbuf_clear(&client_p->localClient->buf_recvq);
873	<	dbuf_clear(&client_p->localClient->buf_sendq);
872	>	dbuf_clear(&client_p->connection->buf_recvq);
873	>	dbuf_clear(&client_p->connection->buf_sendq);
874
875		assert(dlinkFind(&abort_list, client_p) == NULL);
876	<	ptr = make_dlink_node();
876	>	node = make_dlink_node();
877		/* don't let exit_aborted_clients() finish yet */
878	<	dlinkAddTail(client_p, ptr, &abort_list);
878	>	dlinkAddTail(client_p, node, &abort_list);
879
880		if (eac_next == NULL)
881	<	eac_next = ptr;
881	>	eac_next = node;
882
883		SetDead(client_p); /* You are dead my friend */
884		}
#	Line 1005 | Line 890 | dead_link_on_write(struct Client *client
890		void
891		dead_link_on_read(struct Client *client_p, int error)
892		{
893	<	char errmsg[255];
893	>	char errmsg[IRCD_BUFSIZE];
894		int current_error;
895
896		if (IsDefunct(client_p))
897		return;
898
899	<	dbuf_clear(&client_p->localClient->buf_recvq);
900	<	dbuf_clear(&client_p->localClient->buf_sendq);
899	>	dbuf_clear(&client_p->connection->buf_recvq);
900	>	dbuf_clear(&client_p->connection->buf_sendq);
901
902	<	current_error = get_sockerr(client_p->localClient->fd.fd);
902	>	current_error = get_sockerr(client_p->connection->fd.fd);
903
904		if (IsServer(client_p) || IsHandshake(client_p))
905		{
906	<	int connected = CurrentTime - client_p->localClient->firsttime;
907	<
906	>	int connected = CurrentTime - client_p->connection->firsttime;
907	>
908		if (error == 0)
909		{
910		/* Admins get the real IP */
911		sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
912	<	"Server %s closed the connection",
913	<	get_client_name(client_p, SHOW_IP));
912	>	"Server %s closed the connection",
913	>	get_client_name(client_p, SHOW_IP));
914
915		/* Opers get a masked IP */
916		sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
917	<	"Server %s closed the connection",
918	<	get_client_name(client_p, MASK_IP));
917	>	"Server %s closed the connection",
918	>	get_client_name(client_p, MASK_IP));
919
920		ilog(LOG_TYPE_IRCD, "Server %s closed the connection",
921	<	get_client_name(client_p, SHOW_IP));
921	>	get_client_name(client_p, SHOW_IP));
922		}
923		else
924		{
925		report_error(L_ADMIN, "Lost connection to %s: %s",
926	<	get_client_name(client_p, SHOW_IP), current_error);
926	>	get_client_name(client_p, SHOW_IP), current_error);
927		report_error(L_OPER, "Lost connection to %s: %s",
928	<	get_client_name(client_p, MASK_IP), current_error);
928	>	get_client_name(client_p, MASK_IP), current_error);
929		}
930
931		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
932	<	"%s had been connected for %d day%s, %2d:%02d:%02d",
933	<	client_p->name, connected/86400,
934	<	(connected/86400 == 1) ? "" : "s",
935	<	(connected % 86400) / 3600, (connected % 3600) / 60,
936	<	connected % 60);
932	>	"%s was connected for %d day%s, %2d:%02d:%02d",
933	>	client_p->name, connected/86400,
934	>	(connected/86400 == 1) ? "" : "s",
935	>	(connected % 86400) / 3600, (connected % 3600) / 60,
936	>	connected % 60);
937		}
938
939		if (error == 0)
#	Line 1058 | Line 943 | dead_link_on_read(struct Client *client_
943		snprintf(errmsg, sizeof(errmsg), "Read error: %s",
944		strerror(current_error));
945
946	<	exit_client(client_p, &me, errmsg);
946	>	exit_client(client_p, errmsg);
947		}
948
949		void
#	Line 1089 | Line 974 | exit_aborted_clients(void)
974		else
975		notice = "Write error: connection closed";
976
977	<	exit_client(target_p, &me, notice);
977	>	exit_client(target_p, notice);
978		free_dlink_node(ptr);
979		}
980		}
#	Line 1107 | Line 992 | exit_aborted_clients(void)
992		void
993		del_accept(struct split_nuh_item *accept_p, struct Client *client_p)
994		{
995	<	dlinkDelete(&accept_p->node, &client_p->localClient->acceptlist);
995	>	dlinkDelete(&accept_p->node, &client_p->connection->acceptlist);
996
997		MyFree(accept_p->nickptr);
998		MyFree(accept_p->userptr);
#	Line 1117 | Line 1002 | del_accept(struct split_nuh_item *accept
1002
1003		struct split_nuh_item *
1004		find_accept(const char *nick, const char *user,
1005	<	const char *host, struct Client *client_p, int do_match)
1005	>	const char *host, struct Client *client_p,
1006	>	int (*cmpfunc)(const char *, const char *))
1007		{
1008	<	dlink_node *ptr = NULL;
1123	<	/* XXX We wouldn't need that if match() would return 0 on match */
1124	<	int (*cmpfunc)(const char *, const char *) = do_match ? match : irccmp;
1008	>	dlink_node *node = NULL;
1009
1010	<	DLINK_FOREACH(ptr, client_p->localClient->acceptlist.head)
1010	>	DLINK_FOREACH(node, client_p->connection->acceptlist.head)
1011		{
1012	<	struct split_nuh_item *accept_p = ptr->data;
1012	>	struct split_nuh_item *accept_p = node->data;
1013
1014		if (!cmpfunc(accept_p->nickptr, nick) &&
1015		!cmpfunc(accept_p->userptr, user) &&
#	Line 1147 | Line 1031 | int
1031		accept_message(struct Client *source,
1032		struct Client *target)
1033		{
1034	<	dlink_node *ptr = NULL;
1034	>	dlink_node *node = NULL;
1035	>
1036	>	if (HasFlag(source, FLAGS_SERVICE) ||
1037	>	(HasUMode(source, UMODE_OPER) && ConfigGeneral.opers_bypass_callerid))
1038	>	return 1;
1039
1040		if (source == target || find_accept(source->name, source->username,
1041	<	source->host, target, 1))
1041	>	source->host, target, match))
1042		return 1;
1043
1044	<	if (HasUMode(target, UMODE_SOFTCALLERID))
1045	<	DLINK_FOREACH(ptr, target->channel.head)
1046	<	if (IsMember(source, ((struct Membership *)ptr->data)->chptr))
1044	>	if (!HasUMode(target, UMODE_CALLERID) && HasUMode(target, UMODE_SOFTCALLERID))
1045	>	DLINK_FOREACH(node, target->channel.head)
1046	>	if (IsMember(source, ((struct Membership *)node->data)->chptr))
1047		return 1;
1048
1049		return 0;
#	Line 1170 | Line 1058 | accept_message(struct Client *source,
1058		void
1059		del_all_accepts(struct Client *client_p)
1060		{
1061	<	dlink_node *ptr = NULL, *next_ptr = NULL;
1061	>	dlink_node *node = NULL, *node_next = NULL;
1062
1063	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->acceptlist.head)
1064	<	del_accept(ptr->data, client_p);
1063	>	DLINK_FOREACH_SAFE(node, node_next, client_p->connection->acceptlist.head)
1064	>	del_accept(node->data, client_p);
1065		}
1066
1067		unsigned int
1068	<	idle_time_get(const struct Client *source_p, const struct Client *target_p)
1068	>	client_get_idle_time(const struct Client *source_p,
1069	>	const struct Client *target_p)
1070		{
1071		unsigned int idle = 0;
1072		unsigned int min_idle = 0;
1073		unsigned int max_idle = 0;
1074	<	struct ClassItem *class = get_class_ptr(&target_p->localClient->confs);
1074	>	const struct ClassItem *const class = get_class_ptr(&target_p->connection->confs);
1075	>
1076	>	if (!(class->flags & CLASS_FLAGS_FAKE_IDLE) || target_p == source_p)
1077	>	return CurrentTime - target_p->connection->last_privmsg;
1078
1187	–	if (target_p == source_p)
1188	–	return CurrentTime - target_p->localClient->last_privmsg;
1079		if (HasUMode(source_p, UMODE_OPER) &&
1080	<	(!(class->flags & CLASS_FLAGS_HIDE_IDLE_FROM_OPERS)))
1081	<	return CurrentTime - target_p->localClient->last_privmsg;
1080	>	!(class->flags & CLASS_FLAGS_HIDE_IDLE_FROM_OPERS))
1081	>	return CurrentTime - target_p->connection->last_privmsg;
1082
1083		min_idle = class->min_idle;
1084		max_idle = class->max_idle;
#	Line 1199 | Line 1089 | idle_time_get(const struct Client *sourc
1089		if (class->flags & CLASS_FLAGS_RANDOM_IDLE)
1090		idle = genrand_int32();
1091		else
1092	<	idle = CurrentTime - target_p->localClient->last_privmsg;
1092	>	idle = CurrentTime - target_p->connection->last_privmsg;
1093
1094	<	if (max_idle == 0)
1094	>	if (!max_idle)
1095		idle = 0;
1096		else
1097		idle %= max_idle;
#	Line 1211 | Line 1101 | idle_time_get(const struct Client *sourc
1101
1102		return idle;
1103		}
1104	+
1105	+	/* client_init()
1106	+	*
1107	+	* inputs       - NONE
1108	+	* output       - NONE
1109	+	* side effects - initialize client free memory
1110	+	*/
1111	+	void
1112	+	client_init(void)
1113	+	{
1114	+	static struct event event_ping =
1115	+	{
1116	+	.name = "check_pings",
1117	+	.handler = check_pings,
1118	+	.when = 5
1119	+	};
1120	+
1121	+	client_pool = mp_pool_new(sizeof(struct Client), MP_CHUNK_SIZE_CLIENT);
1122	+	connection_pool = mp_pool_new(sizeof(struct Connection), MP_CHUNK_SIZE_CONNECTION);
1123	+	event_add(&event_ping, NULL);
1124	+	}

Diff Legend

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