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 1644 by michael, Tue Nov 6 22:20:16 2012 UTC vs.
Revision 4800 by michael, Tue Oct 28 13:59:43 2014 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-2014 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"
49	–	#include "balloc.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
55	–	dlink_list listing_client_list = { NULL, NULL, 0 };
56	–	/* Pointer to beginning of Client list */
57	–	dlink_list global_client_list = {NULL, NULL, 0};
58	–	/* unknown/client pointer lists */
59	–	dlink_list unknown_list = {NULL, NULL, 0};
60	–	dlink_list local_client_list = {NULL, NULL, 0};
61	–	dlink_list serv_list = {NULL, NULL, 0};
62	–	dlink_list global_serv_list = {NULL, NULL, 0};
63	–	dlink_list oper_list = {NULL, NULL, 0};
54
55	<	static EVH check_pings;
56	<
57	<	static BlockHeap *client_heap  = NULL;
58	<	static BlockHeap *lclient_heap = NULL;
59	<
60	<	static dlink_list dead_list  = { NULL, NULL, 0};
61	<	static dlink_list abort_list = { NULL, NULL, 0};
55	>	dlink_list listing_client_list;
56	>	dlink_list unknown_list;
57	>	dlink_list local_client_list;
58	>	dlink_list local_server_list;
59	>	dlink_list global_client_list;
60	>	dlink_list global_server_list;
61	>	dlink_list oper_list;
62
63	+	static mp_pool_t *client_pool, *connection_pool;
64	+	static dlink_list dead_list, abort_list;
65		static dlink_node *eac_next;  /* next aborted client to exit */
66
75	–	static void check_pings_list(dlink_list *);
76	–	static void check_unknowns_list(void);
77	–	static void ban_them(struct Client *, struct MaskItem *);
78	–
79	–
80	–	/* init_client()
81	–	*
82	–	* inputs       - NONE
83	–	* output       - NONE
84	–	* side effects - initialize client free memory
85	–	*/
86	–	void
87	–	init_client(void)
88	–	{
89	–	/* start off the check ping event ..  -- adrian
90	–	* Every 30 seconds is plenty -- db
91	–	*/
92	–	client_heap = BlockHeapCreate("client", sizeof(struct Client), CLIENT_HEAP_SIZE);
93	–	lclient_heap = BlockHeapCreate("local client", sizeof(struct LocalUser), LCLIENT_HEAP_SIZE);
94	–	eventAdd("check_pings", check_pings, NULL, 5);
95	–	}
67
68		/*
69		* make_client - create a new Client struct and set it to initial state.
#	Line 112 | Line 83 | init_client(void)
83		struct Client *
84		make_client(struct Client *from)
85		{
86	<	struct Client *client_p = BlockHeapAlloc(client_heap);
86	>	struct Client *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               = BlockHeapAlloc(lclient_heap);
92	<	client_p->localClient->since        = CurrentTime;
93	<	client_p->localClient->lasttime     = CurrentTime;
94	<	client_p->localClient->firsttime    = CurrentTime;
95	<	client_p->localClient->registration = REG_INIT;
91	>	client_p->connection               = mp_pool_get(connection_pool);
92	>	client_p->connection->since        = CurrentTime;
93	>	client_p->connection->lasttime     = CurrentTime;
94	>	client_p->connection->firsttime    = CurrentTime;
95	>	client_p->connection->registration = REG_INIT;
96
97		/* as good a place as any... */
98	<	dlinkAdd(client_p, &client_p->localClient->lclient_node, &unknown_list);
98	>	dlinkAdd(client_p, &client_p->connection->lclient_node, &unknown_list);
99		}
100		else
101		client_p->from = from; /* 'from' of local client is self! */
102
103		client_p->idhnext = client_p;
104		client_p->hnext  = client_p;
105	<	client_p->status = STAT_UNKNOWN;
105	>	SetUnknown(client_p);
106		strcpy(client_p->username, "unknown");
107		strcpy(client_p->svid, "0");
108
#	Line 148 | Line 119 | make_client(struct Client *from)
119		static void
120		free_client(struct Client *client_p)
121		{
122	<	assert(client_p != NULL);
122	>	assert(client_p);
123		assert(client_p != &me);
124		assert(client_p->hnext == client_p);
125		assert(client_p->idhnext == client_p);
126		assert(client_p->channel.head == NULL);
127		assert(dlink_list_length(&client_p->channel) == 0);
128		assert(dlink_list_length(&client_p->whowas) == 0);
129	<	assert(!IsServer(client_p) || IsServer(client_p) && client_p->serv);
129	>	assert(!IsServer(client_p) || client_p->serv);
130
131		MyFree(client_p->serv);
132	+	MyFree(client_p->certfp);
133
134		if (MyConnect(client_p))
135		{
136	<	assert(client_p->localClient->invited.head == NULL);
137	<	assert(dlink_list_length(&client_p->localClient->invited) == 0);
138	<	assert(dlink_list_length(&client_p->localClient->watches) == 0);
136	>	assert(client_p->connection->invited.head == NULL);
137	>	assert(dlink_list_length(&client_p->connection->invited) == 0);
138	>	assert(dlink_list_length(&client_p->connection->watches) == 0);
139		assert(IsClosing(client_p) && IsDead(client_p));
140
141	<	MyFree(client_p->localClient->response);
142	<	MyFree(client_p->localClient->auth_oper);
141	>	MyFree(client_p->connection->challenge_response);
142	>	MyFree(client_p->connection->challenge_operator);
143	>	client_p->connection->challenge_response = NULL;
144	>	client_p->connection->challenge_operator = NULL;
145
146		/*
147		* clean up extra sockets from P-lines which have been discarded.
148		*/
149	<	if (client_p->localClient->listener)
149	>	if (client_p->connection->listener)
150		{
151	<	assert(0 < client_p->localClient->listener->ref_count);
152	<	if (0 == --client_p->localClient->listener->ref_count &&
179	<	!client_p->localClient->listener->active)
180	<	free_listener(client_p->localClient->listener);
151	>	listener_release(client_p->connection->listener);
152	>	client_p->connection->listener = NULL;
153		}
154
155	<	dbuf_clear(&client_p->localClient->buf_recvq);
156	<	dbuf_clear(&client_p->localClient->buf_sendq);
155	>	dbuf_clear(&client_p->connection->buf_recvq);
156	>	dbuf_clear(&client_p->connection->buf_sendq);
157
158	<	BlockHeapFree(lclient_heap, client_p->localClient);
158	>	mp_pool_release(client_p->connection);
159		}
160
161	<	BlockHeapFree(client_heap, client_p);
190	<	}
191	<
192	<	/*
193	<	* check_pings - go through the local client list and check activity
194	<	* kill off stuff that should die
195	<	*
196	<	* inputs       - NOT USED (from event)
197	<	* output       - next time_t when check_pings() should be called again
198	<	* side effects -
199	<	*
200	<	*
201	<	* A PING can be sent to clients as necessary.
202	<	*
203	<	* Client/Server ping outs are handled.
204	<	*/
205	<
206	<	/*
207	<	* Addon from adrian. We used to call this after nextping seconds,
208	<	* however I've changed it to run once a second. This is only for
209	<	* PING timeouts, not K/etc-line checks (thanks dianora!). Having it
210	<	* run once a second makes life a lot easier - when a new client connects
211	<	* and they need a ping in 4 seconds, if nextping was set to 20 seconds
212	<	* we end up waiting 20 seconds. This is stupid. :-)
213	<	* I will optimise (hah!) check_pings() once I've finished working on
214	<	* tidying up other network IO evilnesses.
215	<	*     -- adrian
216	<	*/
217	<
218	<	static void
219	<	check_pings(void *notused)
220	<	{
221	<	check_pings_list(&local_client_list);
222	<	check_pings_list(&serv_list);
223	<	check_unknowns_list();
161	>	mp_pool_release(client_p);
162		}
163
164		/* check_pings_list()
165		*
166		* inputs       - pointer to list to check
167		* output       - NONE
168	<	* side effects -
168	>	* side effects -
169		*/
170		static void
171		check_pings_list(dlink_list *list)
172		{
173	<	char scratch[32];        /* way too generous but... */
173	>	char buf[IRCD_BUFSIZE] = "";
174		int ping = 0;      /* ping time value from client */
175	<	dlink_node *ptr = NULL, *next_ptr = NULL;
175	>	dlink_node *node = NULL, *node_next = NULL;
176
177	<	DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
177	>	DLINK_FOREACH_SAFE(node, node_next, list->head)
178		{
179	<	struct Client *client_p = ptr->data;
179	>	struct Client *client_p = node->data;
180
243	–	/*
244	–	** Note: No need to notify opers here. It's
245	–	** already done when "FLAGS_DEADSOCKET" is set.
246	–	*/
181		if (IsDead(client_p))
182	<	{
249	<	/* Ignore it, its been exited already */
250	<	continue;
251	<	}
182	>	continue;  /* Ignore it, its been exited already */
183
184		if (!IsRegistered(client_p))
185		ping = CONNECTTIMEOUT;
186		else
187	<	ping = get_client_ping(&client_p->localClient->confs);
187	>	ping = get_client_ping(&client_p->connection->confs);
188
189	<	if (ping < CurrentTime - client_p->localClient->lasttime)
189	>	if (ping < CurrentTime - client_p->connection->lasttime)
190		{
191		if (!IsPingSent(client_p))
192		{
193	<	/*
194	<	* if we havent PINGed the connection and we havent
195	<	* heard from it in a while, PING it to make sure
196	<	* it is still alive.
197	<	*/
198	<	SetPingSent(client_p);
199	<	client_p->localClient->lasttime = CurrentTime - ping;
200	<	sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
193	>	/*
194	>	* If we haven't PINGed the connection and we haven't
195	>	* heard from it in a while, PING it to make sure
196	>	* it is still alive.
197	>	*/
198	>	SetPingSent(client_p);
199	>	client_p->connection->lasttime = CurrentTime - ping;
200	>	sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
201		}
202		else
203		{
204	<	if (CurrentTime - client_p->localClient->lasttime >= 2 * ping)
204	>	if (CurrentTime - client_p->connection->lasttime >= 2 * ping)
205		{
206		/*
207		* If the client/server hasn't talked to us in 2*ping seconds
208		* and it has a ping time, then close its connection.
209		*/
210		if (IsServer(client_p) || IsHandshake(client_p))
211	<	{
212	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
213	<	"No response from %s, closing link",
214	<	get_client_name(client_p, HIDE_IP));
215	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
216	<	"No response from %s, closing link",
217	<	get_client_name(client_p, MASK_IP));
218	<	ilog(LOG_TYPE_IRCD, "No response from %s, closing link",
219	<	get_client_name(client_p, HIDE_IP));
220	<	}
221	<
222	<	snprintf(scratch, sizeof(scratch), "Ping timeout: %d seconds",
223	<	(int)(CurrentTime - client_p->localClient->lasttime));
224	<	exit_client(client_p, &me, scratch);
211	>	{
212	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
213	>	"No response from %s, closing link",
214	>	get_client_name(client_p, HIDE_IP));
215	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
216	>	"No response from %s, closing link",
217	>	get_client_name(client_p, MASK_IP));
218	>	ilog(LOG_TYPE_IRCD, "No response from %s, closing link",
219	>	get_client_name(client_p, HIDE_IP));
220	>	}
221	>
222	>	snprintf(buf, sizeof(buf), "Ping timeout: %d seconds",
223	>	(int)(CurrentTime - client_p->connection->lasttime));
224	>	exit_client(client_p, buf);
225		}
226		}
227		}
#	Line 306 | Line 237 | check_pings_list(dlink_list *list)
237		static void
238		check_unknowns_list(void)
239		{
240	<	dlink_node *ptr, *next_ptr;
240	>	dlink_node *node = NULL, *node_next = NULL;
241
242	<	DLINK_FOREACH_SAFE(ptr, next_ptr, unknown_list.head)
242	>	DLINK_FOREACH_SAFE(node, node_next, unknown_list.head)
243		{
244	<	struct Client *client_p = ptr->data;
244	>	struct Client *client_p = node->data;
245
246		/*
247		* Check UNKNOWN connections - if they have been in this state
248		* for > 30s, close them.
249		*/
250	<	if (IsAuthFinished(client_p) && (CurrentTime - client_p->localClient->firsttime) > 30)
251	<	exit_client(client_p, &me, "Registration timed out");
250	>	if (IsAuthFinished(client_p) && (CurrentTime - client_p->connection->firsttime) > 30)
251	>	exit_client(client_p, "Registration timed out");
252		}
253		}
254
255	+	/*
256	+	* check_pings - go through the local client list and check activity
257	+	* kill off stuff that should die
258	+	*
259	+	* inputs       - NOT USED (from event)
260	+	* output       - next time_t when check_pings() should be called again
261	+	* side effects -
262	+	*
263	+	*
264	+	* A PING can be sent to clients as necessary.
265	+	*
266	+	* Client/Server ping outs are handled.
267	+	*/
268	+
269	+	/*
270	+	* Addon from adrian. We used to call this after nextping seconds,
271	+	* however I've changed it to run once a second. This is only for
272	+	* PING timeouts, not K/etc-line checks (thanks dianora!). Having it
273	+	* run once a second makes life a lot easier - when a new client connects
274	+	* and they need a ping in 4 seconds, if nextping was set to 20 seconds
275	+	* we end up waiting 20 seconds. This is stupid. :-)
276	+	* I will optimise (hah!) check_pings() once I've finished working on
277	+	* tidying up other network IO evilnesses.
278	+	*     -- adrian
279	+	*/
280	+
281	+	static void
282	+	check_pings(void *unused)
283	+	{
284	+	check_pings_list(&local_client_list);
285	+	check_pings_list(&local_server_list);
286	+	check_unknowns_list();
287	+	}
288	+
289		/* check_conf_klines()
290		*
291		* inputs       - NONE
#	Line 328 | Line 293 | check_unknowns_list(void)
293		* side effects - Check all connections for a pending kline against the
294		*                client, exit the client if a kline matches.
295		*/
296	<	void
296	>	void
297		check_conf_klines(void)
298	<	{
334	<	struct Client *client_p = NULL;       /* current local client_p being examined */
298	>	{
299		struct MaskItem *conf = NULL;
300	<	dlink_node *ptr, *next_ptr;
300	>	dlink_node *node = NULL, *node_next = NULL;
301
302	<	DLINK_FOREACH_SAFE(ptr, next_ptr, local_client_list.head)
302	>	DLINK_FOREACH_SAFE(node, node_next, local_client_list.head)
303		{
304	<	client_p = ptr->data;
304	>	struct Client *client_p = node->data;
305
306		/* If a client is already being exited
307		*/
308	<	if (IsDead(client_p) || !IsClient(client_p))
308	>	if (IsDead(client_p))
309		continue;
310
311	<	if ((conf = find_dline_conf(&client_p->localClient->ip,
312	<	client_p->localClient->aftype)) != NULL)
311	>	if ((conf = find_conf_by_address(NULL, &client_p->connection->ip, CONF_DLINE,
312	>	client_p->connection->aftype, NULL, NULL, 1)))
313		{
314	<	if (conf->type == CONF_EXEMPT)
351	<	continue;
352	<
353	<	ban_them(client_p, conf);
314	>	conf_try_ban(client_p, conf);
315		continue; /* and go examine next fd/client_p */
316		}
317
318	<	if (ConfigFileEntry.glines && (conf = find_gline(client_p)))
318	>	if (ConfigGeneral.glines)
319		{
320	<	if (IsExemptKline(client_p) ||
321	<	IsExemptGline(client_p))
320	>	if ((conf = find_conf_by_address(client_p->host, &client_p->connection->ip,
321	>	CONF_GLINE, client_p->connection->aftype,
322	>	client_p->username, NULL, 1)))
323		{
324	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
325	<	"GLINE over-ruled for %s, client is %sline_exempt",
364	<	get_client_name(client_p, HIDE_IP), IsExemptKline(client_p) ? "k" : "g");
324	>	conf_try_ban(client_p, conf);
325	>	/* and go examine next fd/client_p */
326		continue;
327		}
328	+	}
329
330	<	ban_them(client_p, conf);
331	<	/* and go examine next fd/client_p */
332	<	continue;
371	<	}
372	<
373	<	if ((conf = find_kill(client_p)) != NULL)
330	>	if ((conf = find_conf_by_address(client_p->host, &client_p->connection->ip,
331	>	CONF_KLINE, client_p->connection->aftype,
332	>	client_p->username, NULL, 1)))
333		{
334	<	if (IsExemptKline(client_p))
335	<	{
377	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
378	<	"KLINE over-ruled for %s, client is kline_exempt",
379	<	get_client_name(client_p, HIDE_IP));
380	<	continue;
381	<	}
382	<
383	<	ban_them(client_p, conf);
384	<	continue;
334	>	conf_try_ban(client_p, conf);
335	>	continue;
336		}
337
338		if ((conf = find_matching_name_conf(CONF_XLINE,  client_p->info,
339	<	NULL, NULL, 0)) != NULL ||
389	<	(conf = find_matching_name_conf(CONF_RXLINE, client_p->info,
390	<	NULL, NULL, 0)) != NULL)
339	>	NULL, NULL, 0)))
340		{
341	<	ban_them(client_p, conf);
341	>	conf_try_ban(client_p, conf);
342		continue;
343		}
344		}
345
346		/* also check the unknowns list for new dlines */
347	<	DLINK_FOREACH_SAFE(ptr, next_ptr, unknown_list.head)
347	>	DLINK_FOREACH_SAFE(node, node_next, unknown_list.head)
348		{
349	<	client_p = ptr->data;
349	>	struct Client *client_p = node->data;
350
351	<	if ((conf = find_dline_conf(&client_p->localClient->ip,
352	<	client_p->localClient->aftype)))
351	>	if ((conf = find_conf_by_address(NULL, &client_p->connection->ip, CONF_DLINE,
352	>	client_p->connection->aftype, NULL, NULL, 1)))
353		{
354	<	if (conf->type == CONF_EXEMPT)
355	<	continue;
407	<
408	<	exit_client(client_p, &me, "D-lined");
354	>	conf_try_ban(client_p, conf);
355	>	continue; /* and go examine next fd/client_p */
356		}
357		}
358		}
359
360		/*
361	<	* ban_them
361	>	* conf_try_ban
362		*
363		* inputs       - pointer to client to ban
364		*              - pointer to MaskItem
365		* output       - NONE
366		* side effects - given client_p is banned
367		*/
368	<	static void
369	<	ban_them(struct Client *client_p, struct MaskItem *conf)
368	>	void
369	>	conf_try_ban(struct Client *client_p, struct MaskItem *conf)
370		{
371	<	const char *user_reason = NULL;       /* What is sent to user */
371	>	const char *user_reason = NULL;  /* What is sent to user */
372		const char *type_string = NULL;
373		const char dline_string[] = "D-line";
374		const char kline_string[] = "K-line";
#	Line 430 | Line 377 | ban_them(struct Client *client_p, struct
377
378		switch (conf->type)
379		{
433	–	case CONF_RKLINE:
380		case CONF_KLINE:
381	+	if (IsExemptKline(client_p))
382	+	{
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	+	return;
387	+	}
388	+
389		type_string = kline_string;
390		break;
391		case CONF_DLINE:
392	+	if (find_conf_by_address(NULL, &client_p->connection->ip, CONF_EXEMPT,
393	+	client_p->connection->aftype, NULL, NULL, 1))
394	+	return;
395		type_string = dline_string;
396		break;
397		case CONF_GLINE:
398	+	if (IsExemptKline(client_p) ||
399	+	IsExemptGline(client_p))
400	+	{
401	+	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
402	+	"GLINE over-ruled for %s, client is %sline_exempt",
403	+	get_client_name(client_p, HIDE_IP), IsExemptKline(client_p) ? "k" : "g");
404	+	return;
405	+	}
406	+
407		type_string = gline_string;
408		break;
443	–	case CONF_RXLINE:
409		case CONF_XLINE:
410		type_string = xline_string;
411		++conf->count;
#	Line 456 | Line 421 | ban_them(struct Client *client_p, struct
421		type_string, get_client_name(client_p, HIDE_IP));
422
423		if (IsClient(client_p))
424	<	sendto_one(client_p, form_str(ERR_YOUREBANNEDCREEP),
460	<	me.name, client_p->name, user_reason);
424	>	sendto_one_numeric(client_p, &me, ERR_YOUREBANNEDCREEP, user_reason);
425
426	<	exit_client(client_p, &me, user_reason);
426	>	exit_client(client_p, user_reason);
427		}
428
429		/* update_client_exit_stats()
430		*
431		* input        - pointer to client
432		* output       - NONE
433	<	* side effects -
433	>	* side effects -
434		*/
435		static void
436		update_client_exit_stats(struct Client *client_p)
#	Line 496 | Line 460 | update_client_exit_stats(struct Client *
460		* side effects - find person by (nick)name
461		*/
462		struct Client *
463	<	find_person(const struct Client *client_p, const char *name)
463	>	find_person(const struct Client *const source_p, const char *name)
464		{
465	<	struct Client *c2ptr = NULL;
465	>	struct Client *target_p = NULL;
466
467		if (IsDigit(*name))
468		{
469	<	if ((c2ptr = hash_find_id(name)) != NULL)
470	<	{
507	<	/* invisible users shall not be found by UID guessing */
508	<	if (HasUMode(c2ptr, UMODE_INVISIBLE))
509	<	if (!IsServer(client_p) && !HasFlag(client_p, FLAGS_SERVICE))
510	<	c2ptr = NULL;
511	<	}
469	>	if (IsServer(source_p->from))
470	>	target_p = hash_find_id(name);
471		}
472		else
473	<	c2ptr = hash_find_client(name);
473	>	target_p = hash_find_client(name);
474
475	<	return ((c2ptr != NULL && IsClient(c2ptr)) ? c2ptr : NULL);
475	>	return (target_p && IsClient(target_p)) ? target_p : NULL;
476		}
477
478		/*
479	<	* find_chasing - find the client structure for a nick name (user)
480	<	*      using history mechanism if necessary. If the client is not found,
481	<	*      an error message (NO SUCH NICK) is generated. If the client was found
523	<	*      through the history, chasing will be 1 and otherwise 0.
479	>	* find_chasing - find the client structure for a nick name (name)
480	>	*      using history mechanism if necessary. If the client is not found,
481	>	*      an error message (NO SUCH NICK) is generated.
482		*/
483		struct Client *
484	<	find_chasing(struct Client *client_p, struct Client *source_p, const char *user, int *chasing)
484	>	find_chasing(struct Client *source_p, const char *name)
485		{
486	<	struct Client *who = find_person(client_p, user);
529	<
530	<	if (chasing)
531	<	*chasing = 0;
486	>	struct Client *who = find_person(source_p, name);
487
488		if (who)
489		return who;
490
491	<	if (IsDigit(*user))
491	>	if (IsDigit(*name))
492		return NULL;
493
494	<	if ((who = get_history(user,
495	<	(time_t)ConfigFileEntry.kill_chase_time_limit))
496	<	== NULL)
494	>	if ((who = whowas_get_history(name,
495	>	(time_t)ConfigGeneral.kill_chase_time_limit))
496	>	== NULL)
497		{
498	<	sendto_one(source_p, form_str(ERR_NOSUCHNICK),
544	<	me.name, source_p->name, user);
498	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHNICK, name);
499		return NULL;
500		}
501
548	–	if (chasing)
549	–	*chasing = 1;
550	–
502		return who;
503		}
504
#	Line 560 | Line 511 | find_chasing(struct Client *client_p, st
511		*        But, this can be used to any client structure.
512		*
513		* NOTE 1:
514	<	*        Watch out the allocation of "nbuf", if either source_p->name
514	>	*        Watch out the allocation of "buf", if either source_p->name
515		*        or source_p->sockhost gets changed into pointers instead of
516		*        directly allocated within the structure...
517		*
518		* NOTE 2:
519		*        Function return either a pointer to the structure (source_p) or
520	<	*        to internal buffer (nbuf). *NEVER* use the returned pointer
520	>	*        to internal buffer (buf). *NEVER* use the returned pointer
521		*        to modify what it points!!!
522		*/
523		const char *
524	<	get_client_name(const struct Client *client, enum addr_mask_type type)
524	>	get_client_name(const struct Client *client_p, enum addr_mask_type type)
525		{
526	<	static char nbuf[HOSTLEN * 2 + USERLEN + 5];
526	>	static char buf[HOSTLEN * 2 + USERLEN + 5];
527
528	<	assert(client != NULL);
528	>	assert(client_p);
529
530	<	if (!MyConnect(client))
531	<	return client->name;
530	>	if (!MyConnect(client_p))
531	>	return client_p->name;
532
533	<	if (IsServer(client) || IsConnecting(client) || IsHandshake(client))
533	>	if (IsServer(client_p) || IsConnecting(client_p) || IsHandshake(client_p))
534		{
535	<	if (!irccmp(client->name, client->host))
536	<	return client->name;
535	>	if (!irccmp(client_p->name, client_p->host))
536	>	return client_p->name;
537		else if (ConfigServerHide.hide_server_ips)
538		type = MASK_IP;
539		}
540
541	<	if (ConfigFileEntry.hide_spoof_ips)
542	<	if (type == SHOW_IP && IsIPSpoof(client))
541	>	if (ConfigGeneral.hide_spoof_ips)
542	>	if (IsIPSpoof(client_p) && type == SHOW_IP)
543		type = MASK_IP;
544
545		/* And finally, let's get the host information, ip or name */
546		switch (type)
547		{
548		case SHOW_IP:
549	<	snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
550	<	client->name,
551	<	client->username, client->sockhost);
549	>	snprintf(buf, sizeof(buf), "%s[%s@%s]",
550	>	client_p->name,
551	>	client_p->username, client_p->sockhost);
552		break;
553		case MASK_IP:
554	<	if (client->localClient->aftype == AF_INET)
555	<	snprintf(nbuf, sizeof(nbuf), "%s[%s@255.255.255.255]",
556	<	client->name, client->username);
554	>	if (client_p->connection->aftype == AF_INET)
555	>	snprintf(buf, sizeof(buf), "%s[%s@255.255.255.255]",
556	>	client_p->name, client_p->username);
557		else
558	<	snprintf(nbuf, sizeof(nbuf), "%s[%s@ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]",
559	<	client->name, client->username);
558	>	snprintf(buf, sizeof(buf), "%s[%s@ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]",
559	>	client_p->name, client_p->username);
560		break;
561		default:
562	<	snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
563	<	client->name,
564	<	client->username, client->host);
562	>	snprintf(buf, sizeof(buf), "%s[%s@%s]",
563	>	client_p->name,
564	>	client_p->username, client_p->host);
565		}
566
567	<	return nbuf;
567	>	return buf;
568		}
569
570		void
571		free_exited_clients(void)
572		{
573	<	dlink_node *ptr = NULL, *next = NULL;
574	<
575	<	DLINK_FOREACH_SAFE(ptr, next, dead_list.head)
573	>	dlink_node *node = NULL, *node_next = NULL;
574	>
575	>	DLINK_FOREACH_SAFE(node, node_next, dead_list.head)
576		{
577	<	free_client(ptr->data);
578	<	dlinkDelete(ptr, &dead_list);
579	<	free_dlink_node(ptr);
577	>	free_client(node->data);
578	>	dlinkDelete(node, &dead_list);
579	>	free_dlink_node(node);
580		}
581		}
582
#	Line 636 | Line 587 | free_exited_clients(void)
587		* The only messages generated are QUITs on channels.
588		*/
589		static void
590	<	exit_one_client(struct Client *source_p, const char *quitmsg)
590	>	exit_one_client(struct Client *source_p, const char *comment)
591		{
592	<	dlink_node *lp = NULL, *next_lp = NULL;
592	>	dlink_node *node = NULL, *node_next = NULL;
593
594		assert(!IsMe(source_p));
595	+	assert(source_p != &me);
596
597		if (IsClient(source_p))
598		{
599	<	if (source_p->servptr->serv != NULL)
600	<	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->client_list);
599	>	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->client_list);
600	>	dlinkDelete(&source_p->node, &global_client_list);
601
602		/*
603		* If a person is on a channel, send a QUIT notice
#	Line 653 | Line 605 | exit_one_client(struct Client *source_p,
605		* that the client can show the "**signoff" message).
606		* (Note: The notice is to the local clients *only*)
607		*/
608	<	sendto_common_channels_local(source_p, 0, ":%s!%s@%s QUIT :%s",
608	>	sendto_common_channels_local(source_p, 0, 0, ":%s!%s@%s QUIT :%s",
609		source_p->name, source_p->username,
610	<	source_p->host, quitmsg);
611	<	DLINK_FOREACH_SAFE(lp, next_lp, source_p->channel.head)
612	<	remove_user_from_channel(lp->data);
610	>	source_p->host, comment);
611	>	DLINK_FOREACH_SAFE(node, node_next, source_p->channel.head)
612	>	remove_user_from_channel(node->data);
613
614	<	add_history(source_p, 0);
615	<	off_history(source_p);
614	>	whowas_add_history(source_p, 0);
615	>	whowas_off_history(source_p);
616
617		watch_check_hash(source_p, RPL_LOGOFF);
618
619		if (MyConnect(source_p))
620		{
621		/* Clean up invitefield */
622	<	DLINK_FOREACH_SAFE(lp, next_lp, source_p->localClient->invited.head)
623	<	del_invite(lp->data, source_p);
622	>	DLINK_FOREACH_SAFE(node, node_next, source_p->connection->invited.head)
623	>	del_invite(node->data, source_p);
624
625		del_all_accepts(source_p);
626		}
#	Line 676 | Line 628 | exit_one_client(struct Client *source_p,
628		else if (IsServer(source_p))
629		{
630		dlinkDelete(&source_p->lnode, &source_p->servptr->serv->server_list);
631	+	dlinkDelete(&source_p->node, &global_client_list);
632
633	<	if ((lp = dlinkFindDelete(&global_serv_list, source_p)) != NULL)
634	<	free_dlink_node(lp);
633	>	if ((node = dlinkFindDelete(&global_server_list, source_p)))
634	>	free_dlink_node(node);
635		}
636
637		/* Remove source_p from the client lists */
638	<	if (HasID(source_p))
638	>	if (source_p->id[0])
639		hash_del_id(source_p);
640		if (source_p->name[0])
641		hash_del_client(source_p);
#	Line 690 | Line 643 | exit_one_client(struct Client *source_p,
643		if (IsUserHostIp(source_p))
644		delete_user_host(source_p->username, source_p->host, !MyConnect(source_p));
645
693	–	/* remove from global client list
694	–	* NOTE: source_p->node.next cannot be NULL if the client is added
695	–	*       to global_client_list (there is always &me at its end)
696	–	*/
697	–	if (source_p != NULL && source_p->node.next != NULL)
698	–	dlinkDelete(&source_p->node, &global_client_list);
699	–
646		update_client_exit_stats(source_p);
647
648		/* Check to see if the client isn't already on the dead list */
#	Line 707 | Line 653 | exit_one_client(struct Client *source_p,
653		dlinkAdd(source_p, make_dlink_node(), &dead_list);
654		}
655
656	<	/* Recursively send QUITs and SQUITs for source_p and all its dependent clients
711	<	* and servers to those servers that need them.  A server needs the client
712	<	* QUITs if it can't figure them out from the SQUIT (ie pre-TS4) or if it
713	<	* isn't getting the SQUIT because of @#(*&@)# hostmasking.  With TS4, once
714	<	* a link gets a SQUIT, it doesn't need any QUIT/SQUITs for clients depending
715	<	* on that one -orabidoo
716	<	*
717	<	* This is now called on each local server -adx
718	<	*/
719	<	static void
720	<	recurse_send_quits(struct Client *original_source_p, struct Client *source_p,
721	<	struct Client *from, struct Client *to, const char *comment,
722	<	const char *splitstr)
723	<	{
724	<	dlink_node *ptr, *next;
725	<	struct Client *target_p;
726	<
727	<	assert(to != source_p);  /* should be already removed from serv_list */
728	<
729	<	/* If this server can handle quit storm (QS) removal
730	<	* of dependents, just send the SQUIT
731	<	*/
732	<	if (!IsCapable(to, CAP_QS))
733	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->client_list.head)
734	<	{
735	<	target_p = ptr->data;
736	<	sendto_one(to, ":%s QUIT :%s", target_p->name, splitstr);
737	<	}
738	<
739	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->server_list.head)
740	<	recurse_send_quits(original_source_p, ptr->data, from, to,
741	<	comment, splitstr);
742	<
743	<	if ((source_p == original_source_p && to != from) ||
744	<	!IsCapable(to, CAP_QS))
745	<	{
746	<	/* don't use a prefix here - we have to be 100% sure the message
747	<	* will be accepted without Unknown prefix etc.. */
748	<	sendto_one(to, "SQUIT %s :%s", ID_or_name(source_p, to), comment);
749	<	}
750	<	}
751	<
752	<	/*
656	>	/*
657		* Remove all clients that depend on source_p; assumes all (S)QUITs have
658	<	* already been sent.  we make sure to exit a server's dependent clients
659	<	* and servers before the server itself; exit_one_client takes care of
658	>	* already been sent.  we make sure to exit a server's dependent clients
659	>	* and servers before the server itself; exit_one_client takes care of
660		* actually removing things off llists.   tweaked from +CSr31  -orabidoo
661		*/
662		static void
663	<	recurse_remove_clients(struct Client *source_p, const char *quitmsg)
663	>	recurse_remove_clients(struct Client *source_p, const char *comment)
664		{
665	<	dlink_node *ptr, *next;
665	>	dlink_node *node = NULL, *node_next = NULL;
666
667	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->client_list.head)
668	<	exit_one_client(ptr->data, quitmsg);
667	>	DLINK_FOREACH_SAFE(node, node_next, source_p->serv->client_list.head)
668	>	exit_one_client(node->data, comment);
669
670	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->server_list.head)
670	>	DLINK_FOREACH_SAFE(node, node_next, source_p->serv->server_list.head)
671		{
672	<	recurse_remove_clients(ptr->data, quitmsg);
673	<	exit_one_client(ptr->data, quitmsg);
672	>	recurse_remove_clients(node->data, comment);
673	>	exit_one_client(node->data, comment);
674		}
675		}
676
677		/*
774	–	** Remove *everything* that depends on source_p, from all lists, and sending
775	–	** all necessary QUITs and SQUITs.  source_p itself is still on the lists,
776	–	** and its SQUITs have been sent except for the upstream one  -orabidoo
777	–	*/
778	–	static void
779	–	remove_dependents(struct Client *source_p, struct Client *from,
780	–	const char *comment, const char *splitstr)
781	–	{
782	–	dlink_node *ptr = NULL;
783	–
784	–	DLINK_FOREACH(ptr, serv_list.head)
785	–	recurse_send_quits(source_p, source_p, from, ptr->data,
786	–	comment, splitstr);
787	–
788	–	recurse_remove_clients(source_p, splitstr);
789	–	}
790	–
791	–	/*
678		* exit_client - exit a client of any type. Generally, you can use
679		* this on any struct Client, regardless of its state.
680		*
681		* Note, you shouldn't exit remote _users_ without first doing
682		* AddFlag(x, FLAGS_KILLED) and propagating a kill or similar message.
683	+	*
684		* However, it is perfectly correct to call exit_client to force a _server_
685		* quit (either local or remote one).
686		*
687	+	*
688		* inputs:       - a client pointer that is going to be exited
801	–	*               - for servers, the second argument is a pointer to who
802	–	*                 is firing the server. This side won't get any generated
803	–	*                 messages. NEVER NULL!
689		* output:       none
690		* side effects: the client is delinked from all lists, disconnected,
691		*               and the rest of IRC network is notified of the exit.
692		*               Client memory is scheduled to be freed
693		*/
694		void
695	<	exit_client(struct Client *source_p, struct Client *from, const char *comment)
695	>	exit_client(struct Client *source_p, const char *comment)
696		{
697	<	dlink_node *m = NULL;
697	>	dlink_node *node = NULL;
698	>
699	>	assert(!IsMe(source_p));
700	>	assert(source_p != &me);
701
702		if (MyConnect(source_p))
703		{
#	Line 821 | Line 709 | exit_client(struct Client *source_p, str
709
710		SetClosing(source_p);
711
712	<	if (IsIpHash(source_p))
825	<	remove_one_ip(&source_p->localClient->ip);
826	<
827	<	if (source_p->localClient->auth)
712	>	if (HasFlag(source_p, FLAGS_IPHASH))
713		{
714	<	delete_auth(source_p->localClient->auth);
715	<	source_p->localClient->auth = NULL;
714	>	DelFlag(source_p, FLAGS_IPHASH);
715	>	ipcache_remove_address(&source_p->connection->ip);
716		}
717
718	+	delete_auth(&source_p->connection->auth);
719	+
720		/*
721		* This source_p could have status of one of STAT_UNKNOWN, STAT_CONNECTING
722		* STAT_HANDSHAKE or STAT_UNKNOWN
#	Line 841 | Line 728 | exit_client(struct Client *source_p, str
728		{
729		assert(dlinkFind(&unknown_list, source_p));
730
731	<	dlinkDelete(&source_p->localClient->lclient_node, &unknown_list);
731	>	dlinkDelete(&source_p->connection->lclient_node, &unknown_list);
732		}
733		else if (IsClient(source_p))
734		{
735	<	time_t on_for = CurrentTime - source_p->localClient->firsttime;
735	>	time_t on_for = CurrentTime - source_p->connection->firsttime;
736		assert(Count.local > 0);
737		Count.local--;
738
739		if (HasUMode(source_p, UMODE_OPER))
740	<	if ((m = dlinkFindDelete(&oper_list, source_p)) != NULL)
741	<	free_dlink_node(m);
740	>	if ((node = dlinkFindDelete(&oper_list, source_p)))
741	>	free_dlink_node(node);
742
743		assert(dlinkFind(&local_client_list, source_p));
744	<	dlinkDelete(&source_p->localClient->lclient_node, &local_client_list);
744	>	dlinkDelete(&source_p->connection->lclient_node, &local_client_list);
745
746	<	if (source_p->localClient->list_task != NULL)
747	<	free_list_task(source_p->localClient->list_task, source_p);
746	>	if (source_p->connection->list_task)
747	>	free_list_task(source_p);
748
749		watch_del_watch_list(source_p);
750		sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
751		"Client exiting: %s (%s@%s) [%s] [%s]",
752		source_p->name, source_p->username, source_p->host, comment,
753	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
753	>	ConfigGeneral.hide_spoof_ips && IsIPSpoof(source_p) ?
754		"255.255.255.255" : source_p->sockhost);
868	–	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL, SEND_NOTICE,
869	–	"CLIEXIT: %s %s %s %s 0 %s",
870	–	source_p->name,
871	–	source_p->username,
872	–	source_p->host,
873	–	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
874	–	"255.255.255.255" : source_p->sockhost,
875	–	comment);
755		ilog(LOG_TYPE_USER, "%s (%3u:%02u:%02u): %s!%s@%s %llu/%llu",
756	<	myctime(source_p->localClient->firsttime), (unsigned int)(on_for / 3600),
756	>	myctime(source_p->connection->firsttime), (unsigned int)(on_for / 3600),
757		(unsigned int)((on_for % 3600)/60), (unsigned int)(on_for % 60),
758		source_p->name, source_p->username, source_p->host,
759	<	source_p->localClient->send.bytes>>10,
760	<	source_p->localClient->recv.bytes>>10);
759	>	source_p->connection->send.bytes>>10,
760	>	source_p->connection->recv.bytes>>10);
761		}
762		else if (IsServer(source_p))
763		{
764		assert(Count.myserver > 0);
765		--Count.myserver;
766
767	<	assert(dlinkFind(&serv_list, source_p));
768	<	dlinkDelete(&source_p->localClient->lclient_node, &serv_list);
890	<	unset_chcap_usage_counts(source_p);
767	>	assert(dlinkFind(&local_server_list, source_p));
768	>	dlinkDelete(&source_p->connection->lclient_node, &local_server_list);
769		}
770
771		if (!IsDead(source_p))
772		{
773		if (IsServer(source_p))
774		{
775	<	/* for them, we are exiting the network */
776	<	sendto_one(source_p, ":%s SQUIT %s :%s",
777	<	ID_or_name(from, source_p), me.name, comment);
775	>	if (!HasFlag(source_p, FLAGS_SQUIT))
776	>	{
777	>	/* for them, we are exiting the network */
778	>	sendto_one(source_p, ":%s SQUIT %s :%s",
779	>	me.id, me.id, comment);
780	>	}
781		}
782
783		sendto_one(source_p, "ERROR :Closing Link: %s (%s)",
784		source_p->host, comment);
785		}
786
906	–	/*
907	–	** Currently only server connections can have
908	–	** depending remote clients here, but it does no
909	–	** harm to check for all local clients. In
910	–	** future some other clients than servers might
911	–	** have remotes too...
912	–	**
913	–	** Close the Client connection first and mark it
914	–	** so that no messages are attempted to send to it.
915	–	** Remember it makes source_p->from == NULL.
916	–	*/
787		close_connection(source_p);
788		}
789	+	else if (IsClient(source_p) && HasFlag(source_p->servptr, FLAGS_EOB))
790	+	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
791	+	"Client exiting at %s: %s (%s@%s) [%s]",
792	+	source_p->servptr->name, source_p->name,
793	+	source_p->username, source_p->host, comment);
794
795		if (IsServer(source_p))
796		{
797	<	char splitstr[HOSTLEN + HOSTLEN + 2];
797	>	char splitstr[HOSTLEN + HOSTLEN + 2] = "";
798
799		/* This shouldn't ever happen */
800	<	assert(source_p->serv != NULL && source_p->servptr != NULL);
800	>	assert(source_p->serv && source_p->servptr);
801
802		if (ConfigServerHide.hide_servers)
803		/*
804	<	* Set netsplit message to "*.net *.split" to still show
804	>	* Set netsplit message to "*.net *.split" to still show
805		* that its a split, but hide the servers splitting
806		*/
807	<	strcpy(splitstr, "*.net *.split");
807	>	strlcpy(splitstr, "*.net *.split", sizeof(splitstr));
808		else
809		snprintf(splitstr, sizeof(splitstr), "%s %s",
810		source_p->servptr->name, source_p->name);
811
812	<	remove_dependents(source_p, from->from, comment, splitstr);
812	>	/* Send SQUIT for source_p in every direction. source_p is already off of local_server_list here */
813	>	if (!HasFlag(source_p, FLAGS_SQUIT))
814	>	sendto_server(NULL, NOCAPS, NOCAPS, "SQUIT %s :%s", source_p->id, comment);
815	>
816	>	/* Now exit the clients internally */
817	>	recurse_remove_clients(source_p, splitstr);
818
819	<	if (source_p->servptr == &me)
819	>	if (MyConnect(source_p))
820		{
821	+	int connected = CurrentTime - source_p->connection->firsttime;
822		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
823	<	"%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
824	<	source_p->name, (int)(CurrentTime - source_p->localClient->firsttime),
825	<	source_p->localClient->send.bytes >> 10,
826	<	source_p->localClient->recv.bytes >> 10);
827	<	ilog(LOG_TYPE_IRCD, "%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
828	<	source_p->name, (int)(CurrentTime - source_p->localClient->firsttime),
829	<	source_p->localClient->send.bytes >> 10,
830	<	source_p->localClient->recv.bytes >> 10);
823	>	"%s was connected for %d day%s, %2d:%02d:%02d. %llu/%llu sendK/recvK.",
824	>	source_p->name, connected/86400, (connected/86400 == 1) ? "" : "s",
825	>	(connected % 86400) / 3600, (connected % 3600) / 60, connected % 60,
826	>	source_p->connection->send.bytes >> 10,
827	>	source_p->connection->recv.bytes >> 10);
828	>	ilog(LOG_TYPE_IRCD, "%s was connected for %d day%s, %2d:%02d:%02d. %llu/%llu sendK/recvK.",
829	>	source_p->name, connected/86400, (connected/86400 == 1) ? "" : "s",
830	>	(connected % 86400) / 3600, (connected % 3600) / 60, connected % 60,
831	>	source_p->connection->send.bytes >> 10,
832	>	source_p->connection->recv.bytes >> 10);
833		}
834		}
835		else if (IsClient(source_p) && !HasFlag(source_p, FLAGS_KILLED))
836	<	{
837	<	sendto_server(from->from, CAP_TS6, NOCAPS,
955	<	":%s QUIT :%s", ID(source_p), comment);
956	<	sendto_server(from->from, NOCAPS, CAP_TS6,
957	<	":%s QUIT :%s", source_p->name, comment);
958	<	}
836	>	sendto_server(source_p->from, NOCAPS, NOCAPS, ":%s QUIT :%s",
837	>	source_p->id, comment);
838
839		/* The client *better* be off all of the lists */
840		assert(dlinkFind(&unknown_list, source_p) == NULL);
841		assert(dlinkFind(&local_client_list, source_p) == NULL);
842	<	assert(dlinkFind(&serv_list, source_p) == NULL);
842	>	assert(dlinkFind(&local_server_list, source_p) == NULL);
843		assert(dlinkFind(&oper_list, source_p) == NULL);
844
845		exit_one_client(source_p, comment);
#	Line 973 | Line 852 | exit_client(struct Client *source_p, str
852		void
853		dead_link_on_write(struct Client *client_p, int ierrno)
854		{
855	<	dlink_node *ptr;
855	>	dlink_node *node;
856
857		if (IsDefunct(client_p))
858		return;
859
860	<	dbuf_clear(&client_p->localClient->buf_recvq);
861	<	dbuf_clear(&client_p->localClient->buf_sendq);
860	>	dbuf_clear(&client_p->connection->buf_recvq);
861	>	dbuf_clear(&client_p->connection->buf_sendq);
862
863		assert(dlinkFind(&abort_list, client_p) == NULL);
864	<	ptr = make_dlink_node();
864	>	node = make_dlink_node();
865		/* don't let exit_aborted_clients() finish yet */
866	<	dlinkAddTail(client_p, ptr, &abort_list);
866	>	dlinkAddTail(client_p, node, &abort_list);
867
868		if (eac_next == NULL)
869	<	eac_next = ptr;
869	>	eac_next = node;
870
871		SetDead(client_p); /* You are dead my friend */
872		}
#	Line 999 | Line 878 | dead_link_on_write(struct Client *client
878		void
879		dead_link_on_read(struct Client *client_p, int error)
880		{
881	<	char errmsg[255];
881	>	char errmsg[IRCD_BUFSIZE];
882		int current_error;
883
884		if (IsDefunct(client_p))
885		return;
886
887	<	dbuf_clear(&client_p->localClient->buf_recvq);
888	<	dbuf_clear(&client_p->localClient->buf_sendq);
887	>	dbuf_clear(&client_p->connection->buf_recvq);
888	>	dbuf_clear(&client_p->connection->buf_sendq);
889
890	<	current_error = get_sockerr(client_p->localClient->fd.fd);
890	>	current_error = get_sockerr(client_p->connection->fd.fd);
891
892		if (IsServer(client_p) || IsHandshake(client_p))
893		{
894	<	int connected = CurrentTime - client_p->localClient->firsttime;
895	<
894	>	int connected = CurrentTime - client_p->connection->firsttime;
895	>
896		if (error == 0)
897		{
898		/* Admins get the real IP */
899		sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
900	<	"Server %s closed the connection",
901	<	get_client_name(client_p, SHOW_IP));
900	>	"Server %s closed the connection",
901	>	get_client_name(client_p, SHOW_IP));
902
903		/* Opers get a masked IP */
904		sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
905	<	"Server %s closed the connection",
906	<	get_client_name(client_p, MASK_IP));
905	>	"Server %s closed the connection",
906	>	get_client_name(client_p, MASK_IP));
907
908		ilog(LOG_TYPE_IRCD, "Server %s closed the connection",
909	<	get_client_name(client_p, SHOW_IP));
909	>	get_client_name(client_p, SHOW_IP));
910		}
911		else
912		{
913		report_error(L_ADMIN, "Lost connection to %s: %s",
914	<	get_client_name(client_p, SHOW_IP), current_error);
914	>	get_client_name(client_p, SHOW_IP), current_error);
915		report_error(L_OPER, "Lost connection to %s: %s",
916	<	get_client_name(client_p, MASK_IP), current_error);
916	>	get_client_name(client_p, MASK_IP), current_error);
917		}
918
919		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
920	<	"%s had been connected for %d day%s, %2d:%02d:%02d",
921	<	client_p->name, connected/86400,
922	<	(connected/86400 == 1) ? "" : "s",
923	<	(connected % 86400) / 3600, (connected % 3600) / 60,
924	<	connected % 60);
920	>	"%s was connected for %d day%s, %2d:%02d:%02d",
921	>	client_p->name, connected/86400,
922	>	(connected/86400 == 1) ? "" : "s",
923	>	(connected % 86400) / 3600, (connected % 3600) / 60,
924	>	connected % 60);
925		}
926
927		if (error == 0)
#	Line 1052 | Line 931 | dead_link_on_read(struct Client *client_
931		snprintf(errmsg, sizeof(errmsg), "Read error: %s",
932		strerror(current_error));
933
934	<	exit_client(client_p, &me, errmsg);
934	>	exit_client(client_p, errmsg);
935		}
936
937		void
#	Line 1083 | Line 962 | exit_aborted_clients(void)
962		else
963		notice = "Write error: connection closed";
964
965	<	exit_client(target_p, &me, notice);
965	>	exit_client(target_p, notice);
966		free_dlink_node(ptr);
967		}
968		}
#	Line 1101 | Line 980 | exit_aborted_clients(void)
980		void
981		del_accept(struct split_nuh_item *accept_p, struct Client *client_p)
982		{
983	<	dlinkDelete(&accept_p->node, &client_p->localClient->acceptlist);
983	>	dlinkDelete(&accept_p->node, &client_p->connection->acceptlist);
984
985		MyFree(accept_p->nickptr);
986		MyFree(accept_p->userptr);
#	Line 1111 | Line 990 | del_accept(struct split_nuh_item *accept
990
991		struct split_nuh_item *
992		find_accept(const char *nick, const char *user,
993	<	const char *host, struct Client *client_p, int do_match)
993	>	const char *host, struct Client *client_p,
994	>	int (*cmpfunc)(const char *, const char *))
995		{
996	<	dlink_node *ptr = NULL;
1117	<	/* XXX We wouldn't need that if match() would return 0 on match */
1118	<	int (*cmpfunc)(const char *, const char *) = do_match ? match : irccmp;
996	>	dlink_node *node = NULL;
997
998	<	DLINK_FOREACH(ptr, client_p->localClient->acceptlist.head)
998	>	DLINK_FOREACH(node, client_p->connection->acceptlist.head)
999		{
1000	<	struct split_nuh_item *accept_p = ptr->data;
1000	>	struct split_nuh_item *accept_p = node->data;
1001
1002	<	if (cmpfunc(accept_p->nickptr, nick) == do_match &&
1003	<	cmpfunc(accept_p->userptr, user) == do_match &&
1004	<	cmpfunc(accept_p->hostptr, host) == do_match)
1002	>	if (!cmpfunc(accept_p->nickptr, nick) &&
1003	>	!cmpfunc(accept_p->userptr, user) &&
1004	>	!cmpfunc(accept_p->hostptr, host))
1005		return accept_p;
1006		}
1007
#	Line 1141 | Line 1019 | int
1019		accept_message(struct Client *source,
1020		struct Client *target)
1021		{
1022	<	dlink_node *ptr = NULL;
1022	>	dlink_node *node = NULL;
1023
1024		if (source == target || find_accept(source->name, source->username,
1025	<	source->host, target, 1))
1025	>	source->host, target, match))
1026		return 1;
1027
1028	<	if (HasUMode(target, UMODE_SOFTCALLERID))
1029	<	DLINK_FOREACH(ptr, target->channel.head)
1030	<	if (IsMember(source, ((struct Membership *)ptr->data)->chptr))
1028	>	if (!HasUMode(target, UMODE_CALLERID) && HasUMode(target, UMODE_SOFTCALLERID))
1029	>	DLINK_FOREACH(node, target->channel.head)
1030	>	if (IsMember(source, ((struct Membership *)node->data)->chptr))
1031		return 1;
1032
1033		return 0;
#	Line 1164 | Line 1042 | accept_message(struct Client *source,
1042		void
1043		del_all_accepts(struct Client *client_p)
1044		{
1045	<	dlink_node *ptr = NULL, *next_ptr = NULL;
1045	>	dlink_node *node = NULL, *node_next = NULL;
1046	>
1047	>	DLINK_FOREACH_SAFE(node, node_next, client_p->connection->acceptlist.head)
1048	>	del_accept(node->data, client_p);
1049	>	}
1050	>
1051	>	unsigned int
1052	>	idle_time_get(const struct Client *source_p, const struct Client *target_p)
1053	>	{
1054	>	unsigned int idle = 0;
1055	>	unsigned int min_idle = 0;
1056	>	unsigned int max_idle = 0;
1057	>	const struct ClassItem *class = get_class_ptr(&target_p->connection->confs);
1058
1059	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->acceptlist.head)
1060	<	del_accept(ptr->data, client_p);
1059	>	if (!(class->flags & CLASS_FLAGS_FAKE_IDLE) || target_p == source_p)
1060	>	return CurrentTime - target_p->connection->last_privmsg;
1061	>	if (HasUMode(source_p, UMODE_OPER) &&
1062	>	!(class->flags & CLASS_FLAGS_HIDE_IDLE_FROM_OPERS))
1063	>	return CurrentTime - target_p->connection->last_privmsg;
1064	>
1065	>	min_idle = class->min_idle;
1066	>	max_idle = class->max_idle;
1067	>
1068	>	if (min_idle == max_idle)
1069	>	return min_idle;
1070	>
1071	>	if (class->flags & CLASS_FLAGS_RANDOM_IDLE)
1072	>	idle = genrand_int32();
1073	>	else
1074	>	idle = CurrentTime - target_p->connection->last_privmsg;
1075	>
1076	>	if (!max_idle)
1077	>	idle = 0;
1078	>	else
1079	>	idle %= max_idle;
1080	>
1081	>	if (idle < min_idle)
1082	>	idle = min_idle + (idle % (max_idle - min_idle));
1083	>
1084	>	return idle;
1085	>	}
1086	>
1087	>	/* client_init()
1088	>	*
1089	>	* inputs       - NONE
1090	>	* output       - NONE
1091	>	* side effects - initialize client free memory
1092	>	*/
1093	>	void
1094	>	client_init(void)
1095	>	{
1096	>	static struct event event_ping =
1097	>	{
1098	>	.name = "check_pings",
1099	>	.handler = check_pings,
1100	>	.when = 5
1101	>	};
1102	>
1103	>	client_pool = mp_pool_new(sizeof(struct Client), MP_CHUNK_SIZE_CLIENT);
1104	>	connection_pool = mp_pool_new(sizeof(struct Connection), MP_CHUNK_SIZE_CONNECTION);
1105	>	event_add(&event_ping, NULL);
1106		}

Diff Legend

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