ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/svn/ircd-hybrid/trunk/src/client.c

Comparing:
ircd-hybrid-8/src/client.c (file contents), Revision 1176 by michael, Sun Aug 14 11:24:24 2011 UTC vs.
ircd-hybrid/trunk/src/client.c (file contents), Revision 5589 by michael, Tue Feb 17 17:32:26 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"
29	–	#include "common.h"
30		#include "event.h"
31	–	#include "fdlist.h"
31		#include "hash.h"
32		#include "irc_string.h"
33		#include "ircd.h"
35	–	#include "s_gline.h"
34		#include "numeric.h"
35	<	#include "packet.h"
38	<	#include "s_auth.h"
35	>	#include "auth.h"
36		#include "s_bsd.h"
37	<	#include "s_conf.h"
38	<	#include "s_log.h"
39	<	#include "s_misc.h"
40	<	#include "s_serv.h"
37	>	#include "conf.h"
38	>	#include "log.h"
39	>	#include "misc.h"
40	>	#include "server.h"
41		#include "send.h"
42		#include "whowas.h"
43	<	#include "s_user.h"
47	<	#include "dbuf.h"
43	>	#include "user.h"
44		#include "memory.h"
45	+	#include "mempool.h"
46		#include "hostmask.h"
50	–	#include "balloc.h"
47		#include "listener.h"
52	–	#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 BlockHeap *client_heap  = NULL;
56	<	static BlockHeap *lclient_heap = 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 ConfItem *);
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_heap = BlockHeapCreate("client", sizeof(struct Client), CLIENT_HEAP_SIZE);
94	–	lclient_heap = BlockHeapCreate("local client", sizeof(struct LocalUser), LCLIENT_HEAP_SIZE);
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 = BlockHeapAlloc(client_heap);
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->since = client_p->lasttime = client_p->firsttime = CurrentTime;
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
123	–	client_p->localClient = BlockHeapAlloc(lclient_heap);
124	–	client_p->localClient->registration = REG_INIT;
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->hnext  = client_p;
104	<	client_p->status = STAT_UNKNOWN;
103	>	client_p->idhnext = client_p;
104	>	client_p->hnext = client_p;
105	>	SetUnknown(client_p);
106		strcpy(client_p->username, "unknown");
107	+	strcpy(client_p->account, "0");
108
109		return client_p;
110		}
#	Line 145 | Line 119 | make_client(struct Client *from)
119		static void
120		free_client(struct Client *client_p)
121		{
148	–	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) || client_p->serv);
129
154	–	MyFree(client_p->away);
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);
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 &&
173	<	!client_p->localClient->listener->active)
174	<	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	<	BlockHeapFree(lclient_heap, client_p->localClient);
157	>	mp_pool_release(client_p->connection);
158		}
159
160	<	BlockHeapFree(client_heap, client_p);
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
192	<	* side effects -
193	<	*
194	<	*
195	<	* A PING can be sent to clients as necessary.
196	<	*
197	<	* Client/Server ping outs are handled.
198	<	*/
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,
202	<	* however I've changed it to run once a second. This is only for
203	<	* PING timeouts, not K/etc-line checks (thanks dianora!). Having it
204	<	* run once a second makes life a lot easier - when a new client connects
205	<	* and they need a ping in 4 seconds, if nextping was set to 20 seconds
206	<	* we end up waiting 20 seconds. This is stupid. :-)
207	<	* I will optimise (hah!) check_pings() once I've finished working on
208	<	* tidying up other network IO evilnesses.
209	<	*     -- adrian
210	<	*/
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... */
212	<	struct Client *client_p; /* current local client_p being examined */
213	<	int ping, pingwarn;      /* ping time value from client */
232	<	dlink_node *ptr, *next_ptr;
211	>	char buf[IRCD_BUFSIZE] = "";
212	>	int ping = 0;      /* ping time value from client */
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	<	client_p = ptr->data;
217	>	struct Client *client_p = node->data;
218
238	–	/*
239	–	** Note: No need to notify opers here. It's
240	–	** already done when "FLAGS_DEADSOCKET" is set.
241	–	*/
219		if (IsDead(client_p))
220	<	{
244	<	/* Ignore it, its been exited already */
245	<	continue;
246	<	}
247	<
248	<	if (client_p->localClient->reject_delay > 0)
249	<	{
250	<	if (client_p->localClient->reject_delay <= CurrentTime)
251	<	exit_client(client_p, &me, "Rejected");
252	<	continue;
253	<	}
220	>	continue;  /* Ignore it, its been exited already */
221
222		if (!IsRegistered(client_p))
223	<	ping = CONNECTTIMEOUT, pingwarn = 0;
223	>	ping = CONNECTTIMEOUT;
224		else
225	<	ping = get_client_ping(client_p, &pingwarn);
225	>	ping = get_client_ping(&client_p->connection->confs);
226
227	<	if (ping < CurrentTime - client_p->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	<	ClearPingWarning(client_p);
238	<	client_p->lasttime = CurrentTime - ping;
272	<	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->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,
251	<	"No response from %s, closing link",
252	<	get_client_name(client_p, HIDE_IP));
253	<	sendto_realops_flags(UMODE_ALL, L_OPER,
254	<	"No response from %s, closing link",
255	<	get_client_name(client_p, MASK_IP));
256	<	ilog(L_NOTICE, "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->lasttime));
262	<	exit_client(client_p, &me, scratch);
297	<	}
298	<	else if (!IsPingWarning(client_p) && pingwarn > 0 &&
299	<	(IsServer(client_p) || IsHandshake(client_p)) &&
300	<	CurrentTime - client_p->lasttime >= ping + pingwarn)
301	<	{
302	<	/*
303	<	* If the server hasn't replied in pingwarn seconds after sending
304	<	* the PING, notify the opers so that they are aware of the problem.
305	<	*/
306	<	SetPingWarning(client_p);
307	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
308	<	"Warning, no response from %s in %d seconds",
309	<	get_client_name(client_p, HIDE_IP), pingwarn);
310	<	sendto_realops_flags(UMODE_ALL, L_OPER,
311	<	"Warning, no response from %s in %d seconds",
312	<	get_client_name(client_p, MASK_IP), pingwarn);
313	<	ilog(L_NOTICE, "No response from %s in %d seconds",
314	<	get_client_name(client_p, HIDE_IP), pingwarn);
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 327 | 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;
335	<
336	<	if (client_p->localClient->reject_delay > 0)
337	<	{
338	<	if (client_p->localClient->reject_delay <= CurrentTime)
339	<	exit_client(client_p, &me, "Rejected");
340	<	continue;
341	<	}
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->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 356 | 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	<	{
337	<	struct Client *client_p = NULL;       /* current local client_p being examined */
338	<	struct AccessItem *aconf = NULL;
364	<	struct ConfItem *conf = NULL;
365	<	dlink_node *ptr, *next_ptr;
336	>	{
337	>	struct MaskItem *conf = NULL;
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	<	*/
373	<	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 there is a returned struct ConfItem then kill it */
349	<	if ((aconf = find_dline_conf(&client_p->localClient->ip,
378	<	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 (aconf->status & CONF_EXEMPTDLINE)
381	<	continue;
382	<
383	<	conf = unmap_conf_item(aconf);
384	<	ban_them(client_p, conf);
351	>	conf_try_ban(client_p, conf);
352		continue; /* and go examine next fd/client_p */
353		}
354
355	<	if (ConfigFileEntry.glines && (aconf = find_gline(client_p)))
355	>	if (ConfigGeneral.glines)
356		{
357	<	if (IsExemptKline(client_p) ||
358	<	IsExemptGline(client_p))
357	>	if ((conf = find_conf_by_address(client_p->host, &client_p->connection->ip,
358	>	CONF_GLINE, client_p->connection->aftype,
359	>	client_p->username, NULL, 1)))
360		{
361	<	sendto_realops_flags(UMODE_ALL, L_ALL,
362	<	"GLINE over-ruled for %s, client is %sline_exempt",
395	<	get_client_name(client_p, HIDE_IP), IsExemptKline(client_p) ? "k" : "g");
361	>	conf_try_ban(client_p, conf);
362	>	/* and go examine next fd/client_p */
363		continue;
364		}
365	+	}
366
367	<	conf = unmap_conf_item(aconf);
368	<	ban_them(client_p, conf);
369	<	/* and go examine next fd/client_p */
402	<	continue;
403	<	}
404	<
405	<	if ((aconf = find_kill(client_p)) != NULL)
367	>	if ((conf = find_conf_by_address(client_p->host, &client_p->connection->ip,
368	>	CONF_KLINE, client_p->connection->aftype,
369	>	client_p->username, NULL, 1)))
370		{
371	<
372	<	/* if there is a returned struct AccessItem.. then kill it */
409	<	if (IsExemptKline(client_p))
410	<	{
411	<	sendto_realops_flags(UMODE_ALL, L_ALL,
412	<	"KLINE over-ruled for %s, client is kline_exempt",
413	<	get_client_name(client_p, HIDE_IP));
414	<	continue;
415	<	}
416	<
417	<	conf = unmap_conf_item(aconf);
418	<	ban_them(client_p, conf);
419	<	continue;
371	>	conf_try_ban(client_p, conf);
372	>	continue;
373		}
374
375	<	/* if there is a returned struct MatchItem then kill it */
376	<	if ((conf = find_matching_name_conf(XLINE_TYPE,  client_p->info,
424	<	NULL, NULL, 0)) != NULL ||
425	<	(conf = find_matching_name_conf(RXLINE_TYPE, client_p->info,
426	<	NULL, NULL, 0)) != NULL)
375	>	if ((conf = find_matching_name_conf(CONF_XLINE,  client_p->info,
376	>	NULL, NULL, 0)))
377		{
378	<	ban_them(client_p, conf);
378	>	conf_try_ban(client_p, conf);
379		continue;
380		}
381		}
382
383		/* also check the unknowns list for new dlines */
384	<	DLINK_FOREACH_SAFE(ptr, next_ptr, unknown_list.head)
384	>	DLINK_FOREACH_SAFE(node, node_next, unknown_list.head)
385		{
386	<	client_p = ptr->data;
386	>	struct Client *client_p = node->data;
387
388	<	if ((aconf = find_dline_conf(&client_p->localClient->ip,
389	<	client_p->localClient->aftype)))
388	>	if ((conf = find_conf_by_address(NULL, &client_p->connection->ip, CONF_DLINE,
389	>	client_p->connection->aftype, NULL, NULL, 1)))
390		{
391	<	if (aconf->status & CONF_EXEMPTDLINE)
392	<	continue;
443	<
444	<	exit_client(client_p, &me, "D-lined");
391	>	conf_try_ban(client_p, conf);
392	>	continue; /* and go examine next fd/client_p */
393		}
394		}
395		}
396
397		/*
398	<	* ban_them
398	>	* conf_try_ban
399		*
400		* inputs       - pointer to client to ban
401	<	*              - pointer to ConfItem
401	>	*              - pointer to MaskItem
402		* output       - NONE
403		* side effects - given client_p is banned
404		*/
405	<	static void
406	<	ban_them(struct Client *client_p, struct ConfItem *conf)
405	>	void
406	>	conf_try_ban(struct Client *client_p, struct MaskItem *conf)
407		{
408	<	const char *user_reason = NULL;       /* What is sent to user */
461	<	const char *channel_reason = NULL;    /* What is sent to channel */
462	<	struct AccessItem *aconf = NULL;
463	<	struct MatchItem *xconf = NULL;
408	>	const char *user_reason = NULL;  /* What is sent to user */
409		const char *type_string = NULL;
410		const char dline_string[] = "D-line";
411		const char kline_string[] = "K-line";
#	Line 469 | Line 414 | ban_them(struct Client *client_p, struct
414
415		switch (conf->type)
416		{
417	<	case RKLINE_TYPE:
418	<	case KLINE_TYPE:
417	>	case CONF_KLINE:
418	>	if (IsExemptKline(client_p))
419	>	{
420	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
421	>	"KLINE over-ruled for %s, client is kline_exempt",
422	>	get_client_name(client_p, HIDE_IP));
423	>	return;
424	>	}
425	>
426		type_string = kline_string;
475	–	aconf = map_to_conf(conf);
427		break;
428	<	case DLINE_TYPE:
428	>	case CONF_DLINE:
429	>	if (find_conf_by_address(NULL, &client_p->connection->ip, CONF_EXEMPT,
430	>	client_p->connection->aftype, NULL, NULL, 1))
431	>	return;
432		type_string = dline_string;
479	–	aconf = map_to_conf(conf);
433		break;
434	<	case GLINE_TYPE:
434	>	case CONF_GLINE:
435	>	if (IsExemptKline(client_p) ||
436	>	IsExemptGline(client_p))
437	>	{
438	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
439	>	"GLINE over-ruled for %s, client is %sline_exempt",
440	>	get_client_name(client_p, HIDE_IP), IsExemptKline(client_p) ? "k" : "g");
441	>	return;
442	>	}
443	>
444		type_string = gline_string;
483	–	aconf = map_to_conf(conf);
445		break;
446	<	case RXLINE_TYPE:
486	<	case XLINE_TYPE:
446	>	case CONF_XLINE:
447		type_string = xline_string;
448	<	xconf = map_to_conf(conf);
489	<	++xconf->count;
448	>	++conf->count;
449		break;
450		default:
451		assert(0);
452		break;
453		}
454
455	<	if (ConfigFileEntry.kline_with_reason)
497	<	{
498	<	if (aconf != NULL)
499	<	user_reason = aconf->reason ? aconf->reason : type_string;
500	<	if (xconf != NULL)
501	<	user_reason = xconf->reason ? xconf->reason : type_string;
502	<	}
503	<	else
504	<	user_reason = type_string;
505	<
506	<	if (ConfigFileEntry.kline_reason != NULL)
507	<	channel_reason = ConfigFileEntry.kline_reason;
508	<	else
509	<	channel_reason = user_reason;
455	>	user_reason = conf->reason ? conf->reason : type_string;
456
457	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s active for %s",
457	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s active for %s",
458		type_string, get_client_name(client_p, HIDE_IP));
459
460		if (IsClient(client_p))
461	<	sendto_one(client_p, form_str(ERR_YOUREBANNEDCREEP),
516	<	me.name, client_p->name, user_reason);
461	>	sendto_one_numeric(client_p, &me, ERR_YOUREBANNEDCREEP, user_reason);
462
463	<	exit_client(client_p, &me, channel_reason);
463	>	exit_client(client_p, user_reason);
464		}
465
466		/* update_client_exit_stats()
467		*
468		* input        - pointer to client
469		* output       - NONE
470	<	* side effects -
470	>	* side effects -
471		*/
472		static void
473		update_client_exit_stats(struct Client *client_p)
#	Line 530 | Line 475 | update_client_exit_stats(struct Client *
475		if (IsClient(client_p))
476		{
477		assert(Count.total > 0);
478	+
479		--Count.total;
480	<	if (IsOper(client_p))
480	>	if (HasUMode(client_p, UMODE_OPER))
481		--Count.oper;
482	<	if (IsInvisible(client_p))
482	>	if (HasUMode(client_p, UMODE_INVISIBLE))
483		--Count.invisi;
484		}
485		else if (IsServer(client_p))
486	<	sendto_realops_flags(UMODE_EXTERNAL, L_ALL, "Server %s split from %s",
486	>	sendto_realops_flags(UMODE_EXTERNAL, L_ALL, SEND_NOTICE,
487	>	"Server %s split from %s",
488		client_p->name, client_p->servptr->name);
489
490		if (splitchecking && !splitmode)
#	Line 550 | Line 497 | update_client_exit_stats(struct Client *
497		* output       - return client pointer
498		* side effects - find person by (nick)name
499		*/
553	–	/* XXX - ugly wrapper */
500		struct Client *
501	<	find_person(const struct Client *client_p, const char *name)
501	>	find_person(const struct Client *const source_p, const char *name)
502		{
503	<	struct Client *c2ptr;
503	>	struct Client *target_p = NULL;
504
505		if (IsDigit(*name))
506		{
507	<	if ((c2ptr = hash_find_id(name)) != NULL)
508	<	{
563	<	/* invisible users shall not be found by UID guessing */
564	<	if (IsInvisible(c2ptr) && !IsServer(client_p))
565	<	c2ptr = NULL;
566	<	}
507	>	if (IsServer(source_p->from))
508	>	target_p = hash_find_id(name);
509		}
510		else
511	<	c2ptr = hash_find_client(name);
511	>	target_p = hash_find_client(name);
512
513	<	return ((c2ptr != NULL && IsClient(c2ptr)) ? c2ptr : NULL);
513	>	return (target_p && IsClient(target_p)) ? target_p : NULL;
514		}
515
516		/*
517	<	* find_chasing - find the client structure for a nick name (user)
518	<	*      using history mechanism if necessary. If the client is not found,
519	<	*      an error message (NO SUCH NICK) is generated. If the client was found
578	<	*      through the history, chasing will be 1 and otherwise 0.
517	>	* find_chasing - find the client structure for a nick name (name)
518	>	*      using history mechanism if necessary. If the client is not found,
519	>	*      an error message (NO SUCH NICK) is generated.
520		*/
521		struct Client *
522	<	find_chasing(struct Client *client_p, struct Client *source_p, const char *user, int *chasing)
522	>	find_chasing(struct Client *source_p, const char *name)
523		{
524	<	struct Client *who = find_person(client_p, user);
524	>	struct Client *target_p = find_person(source_p, name);
525
526	<	if (chasing)
527	<	*chasing = 0;
526	>	if (target_p)
527	>	return target_p;
528
529	<	if (who)
589	<	return who;
590	<
591	<	if (IsDigit(*user))
529	>	if (IsDigit(*name))
530		return NULL;
531
532	<	if ((who = get_history(user,
533	<	(time_t)ConfigFileEntry.kill_chase_time_limit))
534	<	== NULL)
532	>	target_p = whowas_get_history(name, (time_t)ConfigGeneral.kill_chase_time_limit);
533	>
534	>	if (!target_p)
535		{
536	<	sendto_one(source_p, form_str(ERR_NOSUCHNICK),
599	<	me.name, source_p->name, user);
536	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHNICK, name);
537		return NULL;
538		}
539
540	<	if (chasing)
604	<	*chasing = 1;
605	<
606	<	return who;
540	>	return target_p;
541		}
542
543		/*
#	Line 615 | Line 549 | find_chasing(struct Client *client_p, st
549		*        But, this can be used to any client structure.
550		*
551		* NOTE 1:
552	<	*        Watch out the allocation of "nbuf", if either source_p->name
552	>	*        Watch out the allocation of "buf", if either source_p->name
553		*        or source_p->sockhost gets changed into pointers instead of
554		*        directly allocated within the structure...
555		*
556		* NOTE 2:
557		*        Function return either a pointer to the structure (source_p) or
558	<	*        to internal buffer (nbuf). *NEVER* use the returned pointer
558	>	*        to internal buffer (buf). *NEVER* use the returned pointer
559		*        to modify what it points!!!
560		*/
561		const char *
562	<	get_client_name(const struct Client *client, int showip)
562	>	get_client_name(const struct Client *client_p, enum addr_mask_type type)
563		{
564	<	static char nbuf[HOSTLEN * 2 + USERLEN + 5];
631	<
632	<	assert(client != NULL);
633	<
634	<	if (irccmp(client->name, client->host) == 0)
635	<	return client->name;
564	>	static char buf[HOSTLEN * 2 + USERLEN + 5];
565
566	<	if (ConfigServerHide.hide_server_ips)
567	<	if (IsServer(client) || IsConnecting(client) || IsHandshake(client))
639	<	showip = MASK_IP;
566	>	if (!MyConnect(client_p))
567	>	return client_p->name;
568
569	<	if (ConfigFileEntry.hide_spoof_ips)
570	<	if (showip == SHOW_IP && IsIPSpoof(client))
571	<	showip = MASK_IP;
569	>	if (IsServer(client_p) || IsConnecting(client_p) || IsHandshake(client_p))
570	>	{
571	>	if (!irccmp(client_p->name, client_p->host))
572	>	return client_p->name;
573	>	else if (ConfigServerHide.hide_server_ips)
574	>	type = MASK_IP;
575	>	}
576
577		/* And finally, let's get the host information, ip or name */
578	<	switch (showip)
578	>	switch (type)
579		{
580		case SHOW_IP:
581	<	if (MyConnect(client))
582	<	{
583	<	snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
584	<	client->name,
653	<	client->username, client->sockhost);
654	<	break;
655	<	}
581	>	snprintf(buf, sizeof(buf), "%s[%s@%s]",
582	>	client_p->name,
583	>	client_p->username, client_p->sockhost);
584	>	break;
585		case MASK_IP:
586	<	snprintf(nbuf, sizeof(nbuf), "%s[%s@255.255.255.255]",
587	<	client->name, client->username);
586	>	if (client_p->connection->aftype == AF_INET)
587	>	snprintf(buf, sizeof(buf), "%s[%s@255.255.255.255]",
588	>	client_p->name, client_p->username);
589	>	else
590	>	snprintf(buf, sizeof(buf), "%s[%s@ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]",
591	>	client_p->name, client_p->username);
592		break;
593		default:
594	<	snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
595	<	client->name,
596	<	client->username, client->host);
594	>	snprintf(buf, sizeof(buf), "%s[%s@%s]",
595	>	client_p->name,
596	>	client_p->username, client_p->host);
597		}
598
599	<	return nbuf;
599	>	return buf;
600		}
601
602		void
603		free_exited_clients(void)
604		{
605	<	dlink_node *ptr = NULL, *next = NULL;
606	<
607	<	DLINK_FOREACH_SAFE(ptr, next, dead_list.head)
605	>	dlink_node *node = NULL, *node_next = NULL;
606	>
607	>	DLINK_FOREACH_SAFE(node, node_next, dead_list.head)
608		{
609	<	free_client(ptr->data);
610	<	dlinkDelete(ptr, &dead_list);
611	<	free_dlink_node(ptr);
609	>	free_client(node->data);
610	>	dlinkDelete(node, &dead_list);
611	>	free_dlink_node(node);
612		}
613		}
614
#	Line 686 | Line 619 | free_exited_clients(void)
619		* The only messages generated are QUITs on channels.
620		*/
621		static void
622	<	exit_one_client(struct Client *source_p, const char *quitmsg)
622	>	exit_one_client(struct Client *source_p, const char *comment)
623		{
624	<	dlink_node *lp = NULL, *next_lp = NULL;
624	>	dlink_node *node = NULL, *node_next = NULL;
625
626		assert(!IsMe(source_p));
627	+	assert(source_p != &me);
628
629		if (IsClient(source_p))
630		{
631	<	if (source_p->servptr->serv != NULL)
632	<	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->client_list);
631	>	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->client_list);
632	>	dlinkDelete(&source_p->node, &global_client_list);
633
634		/*
635		* If a person is on a channel, send a QUIT notice
#	Line 703 | Line 637 | exit_one_client(struct Client *source_p,
637		* that the client can show the "**signoff" message).
638		* (Note: The notice is to the local clients *only*)
639		*/
640	<	sendto_common_channels_local(source_p, 0, ":%s!%s@%s QUIT :%s",
640	>	sendto_common_channels_local(source_p, 0, 0, ":%s!%s@%s QUIT :%s",
641		source_p->name, source_p->username,
642	<	source_p->host, quitmsg);
709	<	DLINK_FOREACH_SAFE(lp, next_lp, source_p->channel.head)
710	<	remove_user_from_channel(lp->data);
642	>	source_p->host, comment);
643
644	<	add_history(source_p, 0);
645	<	off_history(source_p);
644	>	DLINK_FOREACH_SAFE(node, node_next, source_p->channel.head)
645	>	remove_user_from_channel(node->data);
646	>
647	>	whowas_add_history(source_p, 0);
648	>	whowas_off_history(source_p);
649
650		watch_check_hash(source_p, RPL_LOGOFF);
651
652		if (MyConnect(source_p))
653		{
654		/* Clean up invitefield */
655	<	DLINK_FOREACH_SAFE(lp, next_lp, source_p->localClient->invited.head)
656	<	del_invite(lp->data, source_p);
655	>	DLINK_FOREACH_SAFE(node, node_next, source_p->connection->invited.head)
656	>	del_invite(node->data, source_p);
657
658		del_all_accepts(source_p);
659		}
#	Line 726 | Line 661 | exit_one_client(struct Client *source_p,
661		else if (IsServer(source_p))
662		{
663		dlinkDelete(&source_p->lnode, &source_p->servptr->serv->server_list);
664	+	dlinkDelete(&source_p->node, &global_client_list);
665
666	<	if ((lp = dlinkFindDelete(&global_serv_list, source_p)) != NULL)
667	<	free_dlink_node(lp);
666	>	if ((node = dlinkFindDelete(&global_server_list, source_p)))
667	>	free_dlink_node(node);
668		}
669
670		/* Remove source_p from the client lists */
671	<	if (HasID(source_p))
671	>	if (source_p->id[0])
672		hash_del_id(source_p);
673	+
674		if (source_p->name[0])
675		hash_del_client(source_p);
676
677		if (IsUserHostIp(source_p))
678		delete_user_host(source_p->username, source_p->host, !MyConnect(source_p));
679
743	–	/* remove from global client list
744	–	* NOTE: source_p->node.next cannot be NULL if the client is added
745	–	*       to global_client_list (there is always &me at its end)
746	–	*/
747	–	if (source_p != NULL && source_p->node.next != NULL)
748	–	dlinkDelete(&source_p->node, &global_client_list);
749	–
680		update_client_exit_stats(source_p);
681
682		/* Check to see if the client isn't already on the dead list */
#	Line 757 | Line 687 | exit_one_client(struct Client *source_p,
687		dlinkAdd(source_p, make_dlink_node(), &dead_list);
688		}
689
690	<	/* Recursively send QUITs and SQUITs for source_p and all its dependent clients
761	<	* and servers to those servers that need them.  A server needs the client
762	<	* QUITs if it can't figure them out from the SQUIT (ie pre-TS4) or if it
763	<	* isn't getting the SQUIT because of @#(*&@)# hostmasking.  With TS4, once
764	<	* a link gets a SQUIT, it doesn't need any QUIT/SQUITs for clients depending
765	<	* on that one -orabidoo
766	<	*
767	<	* This is now called on each local server -adx
768	<	*/
769	<	static void
770	<	recurse_send_quits(struct Client *original_source_p, struct Client *source_p,
771	<	struct Client *from, struct Client *to, const char *comment,
772	<	const char *splitstr)
773	<	{
774	<	dlink_node *ptr, *next;
775	<	struct Client *target_p;
776	<	int hidden = match(me.name, source_p->name); /* XXX */
777	<
778	<	assert(to != source_p);  /* should be already removed from serv_list */
779	<
780	<	/* If this server can handle quit storm (QS) removal
781	<	* of dependents, just send the SQUIT
782	<	*
783	<	* Always check *all* dependent servers if some of them are
784	<	* hidden behind fakename. If so, send out the QUITs -adx
785	<	*/
786	<	if (hidden || !IsCapable(to, CAP_QS))
787	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->client_list.head)
788	<	{
789	<	target_p = ptr->data;
790	<	sendto_one(to, ":%s QUIT :%s", target_p->name, splitstr);
791	<	}
792	<
793	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->server_list.head)
794	<	recurse_send_quits(original_source_p, ptr->data, from, to,
795	<	comment, splitstr);
796	<
797	<	if (!hidden && ((source_p == original_source_p && to != from) ||
798	<	!IsCapable(to, CAP_QS)))
799	<	{
800	<	/* don't use a prefix here - we have to be 100% sure the message
801	<	* will be accepted without Unknown prefix etc.. */
802	<	sendto_one(to, "SQUIT %s :%s", ID_or_name(source_p, to), comment);
803	<	}
804	<	}
805	<
806	<	/*
690	>	/*
691		* Remove all clients that depend on source_p; assumes all (S)QUITs have
692	<	* already been sent.  we make sure to exit a server's dependent clients
693	<	* and servers before the server itself; exit_one_client takes care of
692	>	* already been sent.  we make sure to exit a server's dependent clients
693	>	* and servers before the server itself; exit_one_client takes care of
694		* actually removing things off llists.   tweaked from +CSr31  -orabidoo
695		*/
696		static void
697	<	recurse_remove_clients(struct Client *source_p, const char *quitmsg)
697	>	recurse_remove_clients(struct Client *source_p, const char *comment)
698		{
699	<	dlink_node *ptr, *next;
699	>	dlink_node *node = NULL, *node_next = NULL;
700
701	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->client_list.head)
702	<	exit_one_client(ptr->data, quitmsg);
701	>	DLINK_FOREACH_SAFE(node, node_next, source_p->serv->client_list.head)
702	>	exit_one_client(node->data, comment);
703
704	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->server_list.head)
704	>	DLINK_FOREACH_SAFE(node, node_next, source_p->serv->server_list.head)
705		{
706	<	recurse_remove_clients(ptr->data, quitmsg);
707	<	exit_one_client(ptr->data, quitmsg);
706	>	recurse_remove_clients(node->data, comment);
707	>	exit_one_client(node->data, comment);
708		}
709		}
710
711		/*
828	–	** Remove *everything* that depends on source_p, from all lists, and sending
829	–	** all necessary QUITs and SQUITs.  source_p itself is still on the lists,
830	–	** and its SQUITs have been sent except for the upstream one  -orabidoo
831	–	*/
832	–	static void
833	–	remove_dependents(struct Client *source_p, struct Client *from,
834	–	const char *comment, const char *splitstr)
835	–	{
836	–	dlink_node *ptr = NULL;
837	–
838	–	DLINK_FOREACH(ptr, serv_list.head)
839	–	recurse_send_quits(source_p, source_p, from, ptr->data,
840	–	comment, splitstr);
841	–
842	–	recurse_remove_clients(source_p, splitstr);
843	–	}
844	–
845	–	/*
712		* exit_client - exit a client of any type. Generally, you can use
713		* this on any struct Client, regardless of its state.
714		*
715		* Note, you shouldn't exit remote _users_ without first doing
716	<	* SetKilled and propagating a kill or similar message. However,
717	<	* it is perfectly correct to call exit_client to force a _server_
716	>	* AddFlag(x, FLAGS_KILLED) and propagating a kill or similar message.
717	>	*
718	>	* However, it is perfectly correct to call exit_client to force a _server_
719		* quit (either local or remote one).
720		*
721	+	*
722		* inputs:       - a client pointer that is going to be exited
855	–	*               - for servers, the second argument is a pointer to who
856	–	*                 is firing the server. This side won't get any generated
857	–	*                 messages. NEVER NULL!
723		* output:       none
724		* side effects: the client is delinked from all lists, disconnected,
725		*               and the rest of IRC network is notified of the exit.
726		*               Client memory is scheduled to be freed
727		*/
728		void
729	<	exit_client(struct Client *source_p, struct Client *from, const char *comment)
729	>	exit_client(struct Client *source_p, const char *comment)
730		{
731	<	dlink_node *m = NULL;
731	>	dlink_node *node = NULL;
732	>
733	>	assert(!IsMe(source_p));
734	>	assert(source_p != &me);
735
736		if (MyConnect(source_p))
737		{
#	Line 875 | Line 743 | exit_client(struct Client *source_p, str
743
744		SetClosing(source_p);
745
746	<	if (IsIpHash(source_p))
879	<	remove_one_ip(&source_p->localClient->ip);
880	<
881	<	if (source_p->localClient->auth)
746	>	if (HasFlag(source_p, FLAGS_IPHASH))
747		{
748	<	delete_auth(source_p->localClient->auth);
749	<	source_p->localClient->auth = NULL;
748	>	DelFlag(source_p, FLAGS_IPHASH);
749	>	ipcache_remove_address(&source_p->connection->ip);
750		}
751
752	<	/* This source_p could have status of one of STAT_UNKNOWN, STAT_CONNECTING
752	>	delete_auth(&source_p->connection->auth);
753	>
754	>	/*
755	>	* This source_p could have status of one of STAT_UNKNOWN, STAT_CONNECTING
756		* STAT_HANDSHAKE or STAT_UNKNOWN
757		* all of which are lumped together into unknown_list
758		*
#	Line 894 | Line 762 | exit_client(struct Client *source_p, str
762		{
763		assert(dlinkFind(&unknown_list, source_p));
764
765	<	dlinkDelete(&source_p->localClient->lclient_node, &unknown_list);
765	>	dlinkDelete(&source_p->connection->lclient_node, &unknown_list);
766		}
767		else if (IsClient(source_p))
768		{
769	+	time_t on_for = CurrentTime - source_p->connection->firsttime;
770	+
771		assert(Count.local > 0);
902	–	Count.local--;
772
773	<	if (IsOper(source_p))
774	<	{
775	<	if ((m = dlinkFindDelete(&oper_list, source_p)) != NULL)
776	<	free_dlink_node(m);
777	<	}
773	>	--Count.local;
774	>
775	>	if (HasUMode(source_p, UMODE_OPER))
776	>	if ((node = dlinkFindDelete(&oper_list, source_p)))
777	>	free_dlink_node(node);
778
779		assert(dlinkFind(&local_client_list, source_p));
780	<	dlinkDelete(&source_p->localClient->lclient_node, &local_client_list);
780	>	dlinkDelete(&source_p->connection->lclient_node, &local_client_list);
781
782	<	if (source_p->localClient->list_task != NULL)
783	<	free_list_task(source_p->localClient->list_task, source_p);
782	>	if (source_p->connection->list_task)
783	>	free_list_task(source_p);
784
785		watch_del_watch_list(source_p);
786	<	sendto_realops_flags(UMODE_CCONN, L_ALL, "Client exiting: %s (%s@%s) [%s] [%s]",
786	>	client_clear_svstags(source_p);
787	>
788	>	sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
789	>	"Client exiting: %s (%s@%s) [%s] [%s]",
790		source_p->name, source_p->username, source_p->host, comment,
791	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
920	<	"255.255.255.255" : source_p->sockhost);
921	<	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL, "CLIEXIT: %s %s %s %s 0 %s",
922	<	source_p->name,
923	<	source_p->username,
924	<	source_p->host,
925	<
926	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
927	<	"255.255.255.255" : source_p->sockhost,
928	<	comment);
929	<	}
791	>	source_p->sockhost);
792
793	<	/* As soon as a client is known to be a server of some sort
794	<	* it has to be put on the serv_list, or SJOIN's to this new server
795	<	* from the connect burst will not be seen.
796	<	*/
797	<	if (IsServer(source_p) || IsConnecting(source_p) ||
798	<	IsHandshake(source_p))
793	>	ilog(LOG_TYPE_USER, "%s (%3u:%02u:%02u): %s!%s@%s %llu/%llu",
794	>	myctime(source_p->connection->firsttime), (unsigned int)(on_for / 3600),
795	>	(unsigned int)((on_for % 3600)/60), (unsigned int)(on_for % 60),
796	>	source_p->name, source_p->username, source_p->host,
797	>	source_p->connection->send.bytes>>10,
798	>	source_p->connection->recv.bytes>>10);
799	>	}
800	>	else if (IsServer(source_p))
801		{
802	<	if ((m = dlinkFindDelete(&serv_list, source_p)) != NULL)
939	<	{
940	<	free_dlink_node(m);
941	<	unset_chcap_usage_counts(source_p);
942	<	}
802	>	assert(Count.myserver > 0);
803
804	<	if (IsServer(source_p))
945	<	Count.myserver--;
946	<	}
804	>	--Count.myserver;
805
806	<	log_user_exit(source_p);
806	>	assert(dlinkFind(&local_server_list, source_p));
807	>	dlinkDelete(&source_p->connection->lclient_node, &local_server_list);
808	>	}
809
810		if (!IsDead(source_p))
811		{
812		if (IsServer(source_p))
813		{
814	<	/* for them, we are exiting the network */
815	<	sendto_one(source_p, ":%s SQUIT %s :%s",
816	<	ID_or_name(from, source_p), me.name, comment);
814	>	if (!HasFlag(source_p, FLAGS_SQUIT))
815	>	{
816	>	/* for them, we are exiting the network */
817	>	sendto_one(source_p, ":%s SQUIT %s :%s",
818	>	me.id, me.id, comment);
819	>	}
820		}
821
822		sendto_one(source_p, "ERROR :Closing Link: %s (%s)",
823		source_p->host, comment);
824		}
825
963	–	/*
964	–	** Currently only server connections can have
965	–	** depending remote clients here, but it does no
966	–	** harm to check for all local clients. In
967	–	** future some other clients than servers might
968	–	** have remotes too...
969	–	**
970	–	** Close the Client connection first and mark it
971	–	** so that no messages are attempted to send to it.
972	–	** Remember it makes source_p->from == NULL.
973	–	*/
826		close_connection(source_p);
827		}
828	+	else if (IsClient(source_p) && HasFlag(source_p->servptr, FLAGS_EOB))
829	+	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
830	+	"Client exiting at %s: %s (%s@%s) [%s]",
831	+	source_p->servptr->name, source_p->name,
832	+	source_p->username, source_p->host, comment);
833
834		if (IsServer(source_p))
835		{
836	<	char splitstr[HOSTLEN + HOSTLEN + 2];
836	>	char splitstr[HOSTLEN + HOSTLEN + 2] = "";
837
838		/* This shouldn't ever happen */
839	<	assert(source_p->serv != NULL && source_p->servptr != NULL);
839	>	assert(source_p->serv && source_p->servptr);
840
841		if (ConfigServerHide.hide_servers)
842		/*
843	<	* Set netsplit message to "*.net *.split" to still show
843	>	* Set netsplit message to "*.net *.split" to still show
844		* that its a split, but hide the servers splitting
845		*/
846	<	strcpy(splitstr, "*.net *.split");
846	>	strlcpy(splitstr, "*.net *.split", sizeof(splitstr));
847		else
848		snprintf(splitstr, sizeof(splitstr), "%s %s",
849		source_p->servptr->name, source_p->name);
850
851	<	remove_dependents(source_p, from->from, comment, splitstr);
851	>	/* Send SQUIT for source_p in every direction. source_p is already off of local_server_list here */
852	>	if (!HasFlag(source_p, FLAGS_SQUIT))
853	>	sendto_server(NULL, 0, 0, "SQUIT %s :%s", source_p->id, comment);
854	>
855	>	/* Now exit the clients internally */
856	>	recurse_remove_clients(source_p, splitstr);
857
858	<	if (source_p->servptr == &me)
858	>	if (MyConnect(source_p))
859		{
860	<	sendto_realops_flags(UMODE_ALL, L_ALL,
861	<	"%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
862	<	source_p->name, (int)(CurrentTime - source_p->firsttime),
863	<	source_p->localClient->send.bytes >> 10,
864	<	source_p->localClient->recv.bytes >> 10);
865	<	ilog(L_NOTICE, "%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
866	<	source_p->name, (int)(CurrentTime - source_p->firsttime),
867	<	source_p->localClient->send.bytes >> 10,
868	<	source_p->localClient->recv.bytes >> 10);
869	<	}
870	<	}
871	<	else if (IsClient(source_p) && !IsKilled(source_p))
872	<	{
873	<	sendto_server(from->from, NULL, CAP_TS6, NOCAPS,
874	<	":%s QUIT :%s", ID(source_p), comment);
875	<	sendto_server(from->from, NULL, NOCAPS, CAP_TS6,
876	<	":%s QUIT :%s", source_p->name, comment);
1015	<	}
860	>	int connected = CurrentTime - source_p->connection->firsttime;
861	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
862	>	"%s was connected for %d day%s, %2d:%02d:%02d. %llu/%llu sendK/recvK.",
863	>	source_p->name, connected/86400, (connected/86400 == 1) ? "" : "s",
864	>	(connected % 86400) / 3600, (connected % 3600) / 60, connected % 60,
865	>	source_p->connection->send.bytes >> 10,
866	>	source_p->connection->recv.bytes >> 10);
867	>	ilog(LOG_TYPE_IRCD, "%s was connected for %d day%s, %2d:%02d:%02d. %llu/%llu sendK/recvK.",
868	>	source_p->name, connected/86400, (connected/86400 == 1) ? "" : "s",
869	>	(connected % 86400) / 3600, (connected % 3600) / 60, connected % 60,
870	>	source_p->connection->send.bytes >> 10,
871	>	source_p->connection->recv.bytes >> 10);
872	>	}
873	>	}
874	>	else if (IsClient(source_p) && !HasFlag(source_p, FLAGS_KILLED))
875	>	sendto_server(source_p->from, 0, 0, ":%s QUIT :%s",
876	>	source_p->id, comment);
877
878		/* The client *better* be off all of the lists */
879		assert(dlinkFind(&unknown_list, source_p) == NULL);
880		assert(dlinkFind(&local_client_list, source_p) == NULL);
881	<	assert(dlinkFind(&serv_list, source_p) == NULL);
881	>	assert(dlinkFind(&local_server_list, source_p) == NULL);
882		assert(dlinkFind(&oper_list, source_p) == NULL);
883
884		exit_one_client(source_p, comment);
#	Line 1030 | Line 891 | exit_client(struct Client *source_p, str
891		void
892		dead_link_on_write(struct Client *client_p, int ierrno)
893		{
894	<	dlink_node *ptr;
894	>	dlink_node *node;
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		assert(dlinkFind(&abort_list, client_p) == NULL);
903	<	ptr = make_dlink_node();
903	>	node = make_dlink_node();
904		/* don't let exit_aborted_clients() finish yet */
905	<	dlinkAddTail(client_p, ptr, &abort_list);
905	>	dlinkAddTail(client_p, node, &abort_list);
906
907		if (eac_next == NULL)
908	<	eac_next = ptr;
908	>	eac_next = node;
909
910		SetDead(client_p); /* You are dead my friend */
911		}
#	Line 1056 | Line 917 | dead_link_on_write(struct Client *client
917		void
918		dead_link_on_read(struct Client *client_p, int error)
919		{
920	<	char errmsg[255];
920	>	char errmsg[IRCD_BUFSIZE];
921		int current_error;
922
923		if (IsDefunct(client_p))
924		return;
925
926	<	dbuf_clear(&client_p->localClient->buf_recvq);
927	<	dbuf_clear(&client_p->localClient->buf_sendq);
926	>	dbuf_clear(&client_p->connection->buf_recvq);
927	>	dbuf_clear(&client_p->connection->buf_sendq);
928
929	<	current_error = get_sockerr(client_p->localClient->fd.fd);
929	>	current_error = get_sockerr(client_p->connection->fd.fd);
930
931		if (IsServer(client_p) || IsHandshake(client_p))
932		{
933	<	int connected = CurrentTime - client_p->firsttime;
934	<
933	>	int connected = CurrentTime - client_p->connection->firsttime;
934	>
935		if (error == 0)
936		{
937		/* Admins get the real IP */
938	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
939	<	"Server %s closed the connection",
940	<	get_client_name(client_p, SHOW_IP));
938	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
939	>	"Server %s closed the connection",
940	>	get_client_name(client_p, SHOW_IP));
941
942		/* Opers get a masked IP */
943	<	sendto_realops_flags(UMODE_ALL, L_OPER,
944	<	"Server %s closed the connection",
945	<	get_client_name(client_p, MASK_IP));
943	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
944	>	"Server %s closed the connection",
945	>	get_client_name(client_p, MASK_IP));
946
947	<	ilog(L_NOTICE, "Server %s closed the connection",
948	<	get_client_name(client_p, SHOW_IP));
947	>	ilog(LOG_TYPE_IRCD, "Server %s closed the connection",
948	>	get_client_name(client_p, SHOW_IP));
949		}
950		else
951		{
952		report_error(L_ADMIN, "Lost connection to %s: %s",
953	<	get_client_name(client_p, SHOW_IP), current_error);
953	>	get_client_name(client_p, SHOW_IP), current_error);
954		report_error(L_OPER, "Lost connection to %s: %s",
955	<	get_client_name(client_p, MASK_IP), current_error);
955	>	get_client_name(client_p, MASK_IP), current_error);
956		}
957
958	<	sendto_realops_flags(UMODE_ALL, L_ALL,
959	<	"%s had been connected for %d day%s, %2d:%02d:%02d",
960	<	client_p->name, connected/86400,
961	<	(connected/86400 == 1) ? "" : "s",
962	<	(connected % 86400) / 3600, (connected % 3600) / 60,
963	<	connected % 60);
958	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
959	>	"%s was connected for %d day%s, %2d:%02d:%02d",
960	>	client_p->name, connected/86400,
961	>	(connected/86400 == 1) ? "" : "s",
962	>	(connected % 86400) / 3600, (connected % 3600) / 60,
963	>	connected % 60);
964		}
965
966		if (error == 0)
#	Line 1109 | Line 970 | dead_link_on_read(struct Client *client_
970		snprintf(errmsg, sizeof(errmsg), "Read error: %s",
971		strerror(current_error));
972
973	<	exit_client(client_p, &me, errmsg);
973	>	exit_client(client_p, errmsg);
974		}
975
976		void
#	Line 1126 | Line 987 | exit_aborted_clients(void)
987
988		if (target_p == NULL)
989		{
990	<	sendto_realops_flags(UMODE_ALL, L_ALL,
990	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
991		"Warning: null client on abort_list!");
992		dlinkDelete(ptr, &abort_list);
993		free_dlink_node(ptr);
#	Line 1140 | Line 1001 | exit_aborted_clients(void)
1001		else
1002		notice = "Write error: connection closed";
1003
1004	<	exit_client(target_p, &me, notice);
1004	>	exit_client(target_p, notice);
1005		free_dlink_node(ptr);
1006		}
1007		}
#	Line 1158 | Line 1019 | exit_aborted_clients(void)
1019		void
1020		del_accept(struct split_nuh_item *accept_p, struct Client *client_p)
1021		{
1022	<	dlinkDelete(&accept_p->node, &client_p->localClient->acceptlist);
1022	>	dlinkDelete(&accept_p->node, &client_p->connection->acceptlist);
1023
1024		MyFree(accept_p->nickptr);
1025		MyFree(accept_p->userptr);
#	Line 1168 | Line 1029 | del_accept(struct split_nuh_item *accept
1029
1030		struct split_nuh_item *
1031		find_accept(const char *nick, const char *user,
1032	<	const char *host, struct Client *client_p, int do_match)
1032	>	const char *host, struct Client *client_p,
1033	>	int (*cmpfunc)(const char *, const char *))
1034		{
1035	<	dlink_node *ptr = NULL;
1174	<	/* XXX We wouldn't need that if match() would return 0 on match */
1175	<	int (*cmpfunc)(const char *, const char *) = do_match ? match : irccmp;
1035	>	dlink_node *node = NULL;
1036
1037	<	DLINK_FOREACH(ptr, client_p->localClient->acceptlist.head)
1037	>	DLINK_FOREACH(node, client_p->connection->acceptlist.head)
1038		{
1039	<	struct split_nuh_item *accept_p = ptr->data;
1039	>	struct split_nuh_item *accept_p = node->data;
1040
1041	<	if (cmpfunc(accept_p->nickptr, nick) == do_match &&
1042	<	cmpfunc(accept_p->userptr, user) == do_match &&
1043	<	cmpfunc(accept_p->hostptr, host) == do_match)
1041	>	if (!cmpfunc(accept_p->nickptr, nick) &&
1042	>	!cmpfunc(accept_p->userptr, user) &&
1043	>	!cmpfunc(accept_p->hostptr, host))
1044		return accept_p;
1045		}
1046
#	Line 1198 | Line 1058 | int
1058		accept_message(struct Client *source,
1059		struct Client *target)
1060		{
1061	<	dlink_node *ptr = NULL;
1061	>	dlink_node *node = NULL;
1062	>
1063	>	if (HasFlag(source, FLAGS_SERVICE) ||
1064	>	(HasUMode(source, UMODE_OPER) && ConfigGeneral.opers_bypass_callerid))
1065	>	return 1;
1066
1067		if (source == target || find_accept(source->name, source->username,
1068	<	source->host, target, 1))
1068	>	source->host, target, match))
1069		return 1;
1070
1071	<	if (IsSoftCallerId(target))
1072	<	DLINK_FOREACH(ptr, target->channel.head)
1073	<	if (IsMember(source, ((struct Membership *)ptr->data)->chptr))
1071	>	if (!HasUMode(target, UMODE_CALLERID) && HasUMode(target, UMODE_SOFTCALLERID))
1072	>	DLINK_FOREACH(node, target->channel.head)
1073	>	if (IsMember(source, ((struct Membership *)node->data)->chptr))
1074		return 1;
1075
1076		return 0;
#	Line 1221 | Line 1085 | accept_message(struct Client *source,
1085		void
1086		del_all_accepts(struct Client *client_p)
1087		{
1088	<	dlink_node *ptr = NULL, *next_ptr = NULL;
1088	>	dlink_node *node = NULL, *node_next = NULL;
1089
1090	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->acceptlist.head)
1091	<	del_accept(ptr->data, client_p);
1090	>	DLINK_FOREACH_SAFE(node, node_next, client_p->connection->acceptlist.head)
1091	>	del_accept(node->data, client_p);
1092		}
1093
1094	<	/* change_local_nick()
1095	<	*
1096	<	* inputs       - pointer to server
1233	<	*              - pointer to client
1234	<	*              - nick
1235	<	* output       -
1236	<	* side effects - changes nick of a LOCAL user
1237	<	*/
1238	<	void
1239	<	change_local_nick(struct Client *client_p, struct Client *source_p, const char *nick)
1094	>	unsigned int
1095	>	client_get_idle_time(const struct Client *source_p,
1096	>	const struct Client *target_p)
1097		{
1098	<	int samenick = 0;
1098	>	unsigned int idle = 0;
1099	>	unsigned int min_idle = 0;
1100	>	unsigned int max_idle = 0;
1101	>	const struct ClassItem *const class = get_class_ptr(&target_p->connection->confs);
1102
1103	<	assert(source_p->name[0] && !EmptyString(nick));
1103	>	if (!(class->flags & CLASS_FLAGS_FAKE_IDLE) || target_p == source_p)
1104	>	return CurrentTime - target_p->connection->last_privmsg;
1105
1106	<	/*
1107	<	* Client just changing his/her nick. If he/she is
1108	<	* on a channel, send note of change to all clients
1248	<	* on that channel. Propagate notice to other servers.
1249	<	*/
1250	<	if ((source_p->localClient->last_nick_change +
1251	<	ConfigFileEntry.max_nick_time) < CurrentTime)
1252	<	source_p->localClient->number_of_nick_changes = 0;
1253	<	source_p->localClient->last_nick_change = CurrentTime;
1254	<	source_p->localClient->number_of_nick_changes++;
1255	<
1256	<	if ((ConfigFileEntry.anti_nick_flood &&
1257	<	(source_p->localClient->number_of_nick_changes
1258	<	<= ConfigFileEntry.max_nick_changes)) ||
1259	<	!ConfigFileEntry.anti_nick_flood ||
1260	<	(IsOper(source_p) && ConfigFileEntry.no_oper_flood))
1261	<	{
1262	<	samenick = !irccmp(source_p->name, nick);
1106	>	if (HasUMode(source_p, UMODE_OPER) &&
1107	>	!(class->flags & CLASS_FLAGS_HIDE_IDLE_FROM_OPERS))
1108	>	return CurrentTime - target_p->connection->last_privmsg;
1109
1110	<	if (!samenick)
1111	<	{
1266	<	source_p->tsinfo = CurrentTime;
1267	<	clear_ban_cache_client(source_p);
1268	<	watch_check_hash(source_p, RPL_LOGOFF);
1110	>	min_idle = class->min_idle;
1111	>	max_idle = class->max_idle;
1112
1113	<	if (HasUMode(source_p, UMODE_REGISTERED))
1114	<	{
1272	<	unsigned int oldmodes = source_p->umodes;
1273	<	char modebuf[IRCD_BUFSIZE] = { '\0' };
1274	<
1275	<	DelUMode(source_p, UMODE_REGISTERED);
1276	<	send_umode(source_p, source_p, oldmodes, 0xffffffff, modebuf);
1277	<	}
1278	<	}
1113	>	if (min_idle == max_idle)
1114	>	return min_idle;
1115
1116	<	/* XXX - the format of this notice should eventually be changed
1117	<	* to either %s[%s@%s], or even better would be get_client_name() -bill
1118	<	*/
1119	<	sendto_realops_flags(UMODE_NCHANGE, L_ALL, "Nick change: From %s to %s [%s@%s]",
1284	<	source_p->name, nick, source_p->username, source_p->host);
1285	<	sendto_common_channels_local(source_p, 1, ":%s!%s@%s NICK :%s",
1286	<	source_p->name, source_p->username,
1287	<	source_p->host, nick);
1288	<	add_history(source_p, 1);
1116	>	if (class->flags & CLASS_FLAGS_RANDOM_IDLE)
1117	>	idle = genrand_int32();
1118	>	else
1119	>	idle = CurrentTime - target_p->connection->last_privmsg;
1120
1121	<	sendto_server(client_p, NULL, CAP_TS6, NOCAPS,
1122	<	":%s NICK %s :%lu",
1123	<	ID(source_p), nick, (unsigned long)source_p->tsinfo);
1124	<	sendto_server(client_p, NULL, NOCAPS, CAP_TS6,
1294	<	":%s NICK %s :%lu",
1295	<	source_p->name, nick, (unsigned long)source_p->tsinfo);
1121	>	if (!max_idle)
1122	>	idle = 0;
1123	>	else
1124	>	idle %= max_idle;
1125
1126	<	hash_del_client(source_p);
1127	<	strcpy(source_p->name, nick);
1299	<	hash_add_client(source_p);
1126	>	if (idle < min_idle)
1127	>	idle = min_idle + (idle % (max_idle - min_idle));
1128
1129	<	if (!samenick)
1130	<	watch_check_hash(source_p, RPL_LOGON);
1129	>	return idle;
1130	>	}
1131
1132	<	/* fd_desc is long enough */
1133	<	fd_note(&client_p->localClient->fd, "Nick: %s", nick);
1134	<	}
1135	<	else
1136	<	sendto_one(source_p, form_str(ERR_NICKTOOFAST),
1137	<	me.name, source_p->name, source_p->name,
1138	<	nick, ConfigFileEntry.max_nick_time);
1132	>	/* client_init()
1133	>	*
1134	>	* inputs       - NONE
1135	>	* output       - NONE
1136	>	* side effects - initialize client free memory
1137	>	*/
1138	>	void
1139	>	client_init(void)
1140	>	{
1141	>	static struct event event_ping =
1142	>	{
1143	>	.name = "check_pings",
1144	>	.handler = check_pings,
1145	>	.when = 5
1146	>	};
1147	>
1148	>	client_pool = mp_pool_new(sizeof(struct Client), MP_CHUNK_SIZE_CLIENT);
1149	>	connection_pool = mp_pool_new(sizeof(struct Connection), MP_CHUNK_SIZE_CONNECTION);
1150	>	event_add(&event_ping, NULL);
1151		}

Diff Legend

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