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 6318 by michael, Wed Aug 5 16:04:43 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, "*");
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(dlink_list_length(&client_p->svstags) == 0);
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))
229	>	if (!HasFlag(client_p, FLAGS_PINGSENT))
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	>	AddFlag(client_p, FLAGS_PINGSENT);
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_SERVNOTICE, L_ADMIN, SEND_NOTICE,
251	>	"No response from %s, closing link",
252	>	get_client_name(client_p, HIDE_IP));
253	>	sendto_realops_flags(UMODE_SERVNOTICE, 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)
352	<	continue;
382	<
383	<	conf = unmap_conf_item(aconf);
384	<	ban_them(client_p, conf);
385	<	continue; /* and go examine next fd/client_p */
351	>	conf_try_ban(client_p, conf);
352	>	continue;  /* and go examine next Client */
353		}
354
355	<	if (ConfigFileEntry.glines && (aconf = find_gline(client_p)))
356	<	{
357	<	if (IsExemptKline(client_p) ||
391	<	IsExemptGline(client_p))
392	<	{
393	<	sendto_realops_flags(UMODE_ALL, L_ALL,
394	<	"GLINE over-ruled for %s, client is %sline_exempt",
395	<	get_client_name(client_p, HIDE_IP), IsExemptKline(client_p) ? "k" : "g");
396	<	continue;
397	<	}
398	<
399	<	conf = unmap_conf_item(aconf);
400	<	ban_them(client_p, conf);
401	<	/* and go examine next fd/client_p */
402	<	continue;
403	<	}
404	<
405	<	if ((aconf = find_kill(client_p)) != NULL)
355	>	if ((conf = find_conf_by_address(client_p->host, &client_p->connection->ip,
356	>	CONF_KLINE, client_p->connection->aftype,
357	>	client_p->username, NULL, 1)))
358		{
359	<
360	<	/* 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;
359	>	conf_try_ban(client_p, conf);
360	>	continue;  /* and go examine next Client */
361		}
362
363	<	/* if there is a returned struct MatchItem then kill it */
364	<	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)
363	>	if ((conf = find_matching_name_conf(CONF_XLINE, client_p->info,
364	>	NULL, NULL, 0)))
365		{
366	<	ban_them(client_p, conf);
367	<	continue;
366	>	conf_try_ban(client_p, conf);
367	>	continue;  /* and go examine next Client */
368		}
369		}
370
371	<	/* also check the unknowns list for new dlines */
372	<	DLINK_FOREACH_SAFE(ptr, next_ptr, unknown_list.head)
371	>	/* Also check the unknowns list for new dlines */
372	>	DLINK_FOREACH_SAFE(node, node_next, unknown_list.head)
373		{
374	<	client_p = ptr->data;
374	>	struct Client *client_p = node->data;
375
376	<	if ((aconf = find_dline_conf(&client_p->localClient->ip,
377	<	client_p->localClient->aftype)))
376	>	if ((conf = find_conf_by_address(NULL, &client_p->connection->ip, CONF_DLINE,
377	>	client_p->connection->aftype, NULL, NULL, 1)))
378		{
379	<	if (aconf->status & CONF_EXEMPTDLINE)
380	<	continue;
443	<
444	<	exit_client(client_p, &me, "D-lined");
379	>	conf_try_ban(client_p, conf);
380	>	continue;  /* and go examine next Client */
381		}
382		}
383		}
384
385		/*
386	<	* ban_them
386	>	* conf_try_ban
387		*
388		* inputs       - pointer to client to ban
389	<	*              - pointer to ConfItem
389	>	*              - pointer to MaskItem
390		* output       - NONE
391		* side effects - given client_p is banned
392		*/
393	<	static void
394	<	ban_them(struct Client *client_p, struct ConfItem *conf)
393	>	void
394	>	conf_try_ban(struct Client *client_p, struct MaskItem *conf)
395		{
396	<	const char *user_reason = NULL;       /* What is sent to user */
461	<	const char *channel_reason = NULL;    /* What is sent to channel */
462	<	struct AccessItem *aconf = NULL;
463	<	struct MatchItem *xconf = NULL;
464	<	const char *type_string = NULL;
465	<	const char dline_string[] = "D-line";
466	<	const char kline_string[] = "K-line";
467	<	const char gline_string[] = "G-line";
468	<	const char xline_string[] = "X-line";
396	>	char ban_type = '\0';
397
398		switch (conf->type)
399		{
400	<	case RKLINE_TYPE:
401	<	case KLINE_TYPE:
402	<	type_string = kline_string;
403	<	aconf = map_to_conf(conf);
404	<	break;
405	<	case DLINE_TYPE:
406	<	type_string = dline_string;
407	<	aconf = map_to_conf(conf);
400	>	case CONF_KLINE:
401	>	if (HasFlag(client_p, FLAGS_EXEMPTKLINE))
402	>	{
403	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
404	>	"KLINE over-ruled for %s, client is kline_exempt",
405	>	get_client_name(client_p, HIDE_IP));
406	>	return;
407	>	}
408	>
409	>	ban_type = 'K';
410		break;
411	<	case GLINE_TYPE:
412	<	type_string = gline_string;
413	<	aconf = map_to_conf(conf);
411	>	case CONF_DLINE:
412	>	if (find_conf_by_address(NULL, &client_p->connection->ip, CONF_EXEMPT,
413	>	client_p->connection->aftype, NULL, NULL, 1))
414	>	return;
415	>	ban_type = 'D';
416		break;
417	<	case RXLINE_TYPE:
418	<	case XLINE_TYPE:
419	<	type_string = xline_string;
420	<	xconf = map_to_conf(conf);
421	<	++xconf->count;
417	>	case CONF_XLINE:
418	>	if (HasFlag(client_p, FLAGS_EXEMPTXLINE))
419	>	{
420	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
421	>	"XLINE over-ruled for %s, client is xline_exempt",
422	>	get_client_name(client_p, HIDE_IP));
423	>	return;
424	>	}
425	>
426	>	ban_type = 'X';
427	>	++conf->count;
428		break;
429		default:
430		assert(0);
431		break;
432		}
433
434	<	if (ConfigFileEntry.kline_with_reason)
435	<	{
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;
510	<
511	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s active for %s",
512	<	type_string, get_client_name(client_p, HIDE_IP));
434	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE, "%c-line active for %s",
435	>	ban_type, get_client_name(client_p, HIDE_IP));
436
437		if (IsClient(client_p))
438	<	sendto_one(client_p, form_str(ERR_YOUREBANNEDCREEP),
516	<	me.name, client_p->name, user_reason);
438	>	sendto_one_numeric(client_p, &me, ERR_YOUREBANNEDCREEP, conf->reason);
439
440	<	exit_client(client_p, &me, channel_reason);
440	>	exit_client(client_p, conf->reason);
441		}
442
443		/* update_client_exit_stats()
444		*
445		* input        - pointer to client
446		* output       - NONE
447	<	* side effects -
447	>	* side effects -
448		*/
449		static void
450		update_client_exit_stats(struct Client *client_p)
#	Line 530 | Line 452 | update_client_exit_stats(struct Client *
452		if (IsClient(client_p))
453		{
454		assert(Count.total > 0);
455	+
456		--Count.total;
457	<	if (IsOper(client_p))
457	>	if (HasUMode(client_p, UMODE_OPER))
458		--Count.oper;
459	<	if (IsInvisible(client_p))
459	>	if (HasUMode(client_p, UMODE_INVISIBLE))
460		--Count.invisi;
461		}
462		else if (IsServer(client_p))
463	<	sendto_realops_flags(UMODE_EXTERNAL, L_ALL, "Server %s split from %s",
463	>	sendto_realops_flags(UMODE_EXTERNAL, L_ALL, SEND_NOTICE,
464	>	"Server %s split from %s",
465		client_p->name, client_p->servptr->name);
466
467		if (splitchecking && !splitmode)
#	Line 550 | Line 474 | update_client_exit_stats(struct Client *
474		* output       - return client pointer
475		* side effects - find person by (nick)name
476		*/
553	–	/* XXX - ugly wrapper */
477		struct Client *
478	<	find_person(const struct Client *client_p, const char *name)
478	>	find_person(const struct Client *const source_p, const char *name)
479		{
480	<	struct Client *c2ptr;
480	>	struct Client *target_p = NULL;
481
482		if (IsDigit(*name))
483		{
484	<	if ((c2ptr = hash_find_id(name)) != NULL)
485	<	{
563	<	/* invisible users shall not be found by UID guessing */
564	<	if (IsInvisible(c2ptr) && !IsServer(client_p))
565	<	c2ptr = NULL;
566	<	}
484	>	if (IsServer(source_p->from))
485	>	target_p = hash_find_id(name);
486		}
487		else
488	<	c2ptr = hash_find_client(name);
488	>	target_p = hash_find_client(name);
489
490	<	return ((c2ptr != NULL && IsClient(c2ptr)) ? c2ptr : NULL);
490	>	return (target_p && IsClient(target_p)) ? target_p : NULL;
491		}
492
493		/*
494	<	* find_chasing - find the client structure for a nick name (user)
495	<	*      using history mechanism if necessary. If the client is not found,
496	<	*      an error message (NO SUCH NICK) is generated. If the client was found
578	<	*      through the history, chasing will be 1 and otherwise 0.
494	>	* find_chasing - find the client structure for a nick name (name)
495	>	*      using history mechanism if necessary. If the client is not found,
496	>	*      an error message (NO SUCH NICK) is generated.
497		*/
498		struct Client *
499	<	find_chasing(struct Client *client_p, struct Client *source_p, const char *user, int *chasing)
499	>	find_chasing(struct Client *source_p, const char *name)
500		{
501	<	struct Client *who = find_person(client_p, user);
584	<
585	<	if (chasing)
586	<	*chasing = 0;
501	>	struct Client *target_p = find_person(source_p, name);
502
503	<	if (who)
504	<	return who;
503	>	if (target_p)
504	>	return target_p;
505
506	<	if (IsDigit(*user))
506	>	if (IsDigit(*name))
507		return NULL;
508
509	<	if ((who = get_history(user,
510	<	(time_t)ConfigFileEntry.kill_chase_time_limit))
511	<	== NULL)
509	>	target_p = whowas_get_history(name, (time_t)ConfigGeneral.kill_chase_time_limit);
510	>
511	>	if (!target_p)
512		{
513	<	sendto_one(source_p, form_str(ERR_NOSUCHNICK),
599	<	me.name, source_p->name, user);
513	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHNICK, name);
514		return NULL;
515		}
516
517	<	if (chasing)
604	<	*chasing = 1;
605	<
606	<	return who;
517	>	return target_p;
518		}
519
520		/*
#	Line 615 | Line 526 | find_chasing(struct Client *client_p, st
526		*        But, this can be used to any client structure.
527		*
528		* NOTE 1:
529	<	*        Watch out the allocation of "nbuf", if either source_p->name
529	>	*        Watch out the allocation of "buf", if either source_p->name
530		*        or source_p->sockhost gets changed into pointers instead of
531		*        directly allocated within the structure...
532		*
533		* NOTE 2:
534		*        Function return either a pointer to the structure (source_p) or
535	<	*        to internal buffer (nbuf). *NEVER* use the returned pointer
535	>	*        to internal buffer (buf). *NEVER* use the returned pointer
536		*        to modify what it points!!!
537		*/
538		const char *
539	<	get_client_name(const struct Client *client, int showip)
539	>	get_client_name(const struct Client *client_p, enum addr_mask_type type)
540		{
541	<	static char nbuf[HOSTLEN * 2 + USERLEN + 5];
631	<
632	<	assert(client != NULL);
541	>	static char buf[HOSTLEN * 2 + USERLEN + 5];
542
543	<	if (irccmp(client->name, client->host) == 0)
544	<	return client->name;
543	>	if (!MyConnect(client_p))
544	>	return client_p->name;
545
546	<	if (ConfigServerHide.hide_server_ips)
547	<	if (IsServer(client) || IsConnecting(client) || IsHandshake(client))
548	<	showip = MASK_IP;
549	<
550	<	if (ConfigFileEntry.hide_spoof_ips)
551	<	if (showip == SHOW_IP && IsIPSpoof(client))
552	<	showip = MASK_IP;
546	>	if (IsServer(client_p) || IsConnecting(client_p) || IsHandshake(client_p))
547	>	{
548	>	if (!irccmp(client_p->name, client_p->host))
549	>	return client_p->name;
550	>	else if (ConfigServerHide.hide_server_ips)
551	>	type = MASK_IP;
552	>	}
553
554		/* And finally, let's get the host information, ip or name */
555	<	switch (showip)
555	>	switch (type)
556		{
557		case SHOW_IP:
558	<	if (MyConnect(client))
559	<	{
560	<	snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
561	<	client->name,
653	<	client->username, client->sockhost);
654	<	break;
655	<	}
558	>	snprintf(buf, sizeof(buf), "%s[%s@%s]",
559	>	client_p->name,
560	>	client_p->username, client_p->sockhost);
561	>	break;
562		case MASK_IP:
563	<	snprintf(nbuf, sizeof(nbuf), "%s[%s@255.255.255.255]",
564	<	client->name, client->username);
563	>	if (client_p->connection->aftype == AF_INET)
564	>	snprintf(buf, sizeof(buf), "%s[%s@255.255.255.255]",
565	>	client_p->name, client_p->username);
566	>	else
567	>	snprintf(buf, sizeof(buf), "%s[%s@ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]",
568	>	client_p->name, client_p->username);
569		break;
570	<	default:
571	<	snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
572	<	client->name,
573	<	client->username, client->host);
570	>	default:  /* HIDE_IP */
571	>	snprintf(buf, sizeof(buf), "%s[%s@%s]",
572	>	client_p->name,
573	>	client_p->username, client_p->host);
574		}
575
576	<	return nbuf;
576	>	return buf;
577		}
578
579		void
580		free_exited_clients(void)
581		{
582	<	dlink_node *ptr = NULL, *next = NULL;
583	<
584	<	DLINK_FOREACH_SAFE(ptr, next, dead_list.head)
582	>	dlink_node *node = NULL, *node_next = NULL;
583	>
584	>	DLINK_FOREACH_SAFE(node, node_next, dead_list.head)
585		{
586	<	free_client(ptr->data);
587	<	dlinkDelete(ptr, &dead_list);
588	<	free_dlink_node(ptr);
586	>	free_client(node->data);
587	>	dlinkDelete(node, &dead_list);
588	>	free_dlink_node(node);
589		}
590		}
591
#	Line 686 | Line 596 | free_exited_clients(void)
596		* The only messages generated are QUITs on channels.
597		*/
598		static void
599	<	exit_one_client(struct Client *source_p, const char *quitmsg)
599	>	exit_one_client(struct Client *source_p, const char *comment)
600		{
601	<	dlink_node *lp = NULL, *next_lp = NULL;
601	>	dlink_node *node = NULL, *node_next = NULL;
602
603		assert(!IsMe(source_p));
604	+	assert(source_p != &me);
605
606		if (IsClient(source_p))
607		{
608	<	if (source_p->servptr->serv != NULL)
609	<	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->client_list);
608	>	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->client_list);
609	>	dlinkDelete(&source_p->node, &global_client_list);
610
611		/*
612		* If a person is on a channel, send a QUIT notice
#	Line 703 | Line 614 | exit_one_client(struct Client *source_p,
614		* that the client can show the "**signoff" message).
615		* (Note: The notice is to the local clients *only*)
616		*/
617	<	sendto_common_channels_local(source_p, 0, ":%s!%s@%s QUIT :%s",
617	>	sendto_common_channels_local(source_p, 0, 0, ":%s!%s@%s QUIT :%s",
618		source_p->name, source_p->username,
619	<	source_p->host, quitmsg);
709	<	DLINK_FOREACH_SAFE(lp, next_lp, source_p->channel.head)
710	<	remove_user_from_channel(lp->data);
619	>	source_p->host, comment);
620
621	<	add_history(source_p, 0);
622	<	off_history(source_p);
621	>	DLINK_FOREACH_SAFE(node, node_next, source_p->channel.head)
622	>	remove_user_from_channel(node->data);
623	>
624	>	whowas_add_history(source_p, 0);
625	>	whowas_off_history(source_p);
626
627		watch_check_hash(source_p, RPL_LOGOFF);
628
629		if (MyConnect(source_p))
630		{
631	<	/* Clean up invitefield */
720	<	DLINK_FOREACH_SAFE(lp, next_lp, source_p->localClient->invited.head)
721	<	del_invite(lp->data, source_p);
722	<
631	>	clear_invites_client(source_p);
632		del_all_accepts(source_p);
633		}
634		}
635		else if (IsServer(source_p))
636		{
637		dlinkDelete(&source_p->lnode, &source_p->servptr->serv->server_list);
638	+	dlinkDelete(&source_p->node, &global_client_list);
639
640	<	if ((lp = dlinkFindDelete(&global_serv_list, source_p)) != NULL)
641	<	free_dlink_node(lp);
640	>	if ((node = dlinkFindDelete(&global_server_list, source_p)))
641	>	free_dlink_node(node);
642		}
643
644		/* Remove source_p from the client lists */
645	<	if (HasID(source_p))
645	>	if (source_p->id[0])
646		hash_del_id(source_p);
647	+
648		if (source_p->name[0])
649		hash_del_client(source_p);
650
651	<	if (IsUserHostIp(source_p))
651	>	if (HasFlag(source_p, FLAGS_USERHOST))
652		delete_user_host(source_p->username, source_p->host, !MyConnect(source_p));
653
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	–
654		update_client_exit_stats(source_p);
655
656		/* Check to see if the client isn't already on the dead list */
#	Line 757 | Line 661 | exit_one_client(struct Client *source_p,
661		dlinkAdd(source_p, make_dlink_node(), &dead_list);
662		}
663
664	<	/* 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	<	/*
664	>	/*
665		* Remove all clients that depend on source_p; assumes all (S)QUITs have
666	<	* already been sent.  we make sure to exit a server's dependent clients
667	<	* and servers before the server itself; exit_one_client takes care of
666	>	* already been sent.  we make sure to exit a server's dependent clients
667	>	* and servers before the server itself; exit_one_client takes care of
668		* actually removing things off llists.   tweaked from +CSr31  -orabidoo
669		*/
670		static void
671	<	recurse_remove_clients(struct Client *source_p, const char *quitmsg)
671	>	recurse_remove_clients(struct Client *source_p, const char *comment)
672		{
673	<	dlink_node *ptr, *next;
673	>	dlink_node *node = NULL, *node_next = NULL;
674
675	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->client_list.head)
676	<	exit_one_client(ptr->data, quitmsg);
675	>	DLINK_FOREACH_SAFE(node, node_next, source_p->serv->client_list.head)
676	>	exit_one_client(node->data, comment);
677
678	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->server_list.head)
678	>	DLINK_FOREACH_SAFE(node, node_next, source_p->serv->server_list.head)
679		{
680	<	recurse_remove_clients(ptr->data, quitmsg);
681	<	exit_one_client(ptr->data, quitmsg);
680	>	recurse_remove_clients(node->data, comment);
681	>	exit_one_client(node->data, comment);
682		}
683		}
684
685		/*
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	–	/*
686		* exit_client - exit a client of any type. Generally, you can use
687		* this on any struct Client, regardless of its state.
688		*
689		* Note, you shouldn't exit remote _users_ without first doing
690	<	* SetKilled and propagating a kill or similar message. However,
691	<	* it is perfectly correct to call exit_client to force a _server_
690	>	* AddFlag(x, FLAGS_KILLED) and propagating a kill or similar message.
691	>	*
692	>	* However, it is perfectly correct to call exit_client to force a _server_
693		* quit (either local or remote one).
694		*
695	+	*
696		* 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!
697		* output:       none
698		* side effects: the client is delinked from all lists, disconnected,
699		*               and the rest of IRC network is notified of the exit.
700		*               Client memory is scheduled to be freed
701		*/
702		void
703	<	exit_client(struct Client *source_p, struct Client *from, const char *comment)
703	>	exit_client(struct Client *source_p, const char *comment)
704		{
705	<	dlink_node *m = NULL;
705	>	dlink_node *node = NULL;
706	>
707	>	assert(!IsMe(source_p));
708	>	assert(source_p != &me);
709
710		if (MyConnect(source_p))
711		{
#	Line 875 | Line 717 | exit_client(struct Client *source_p, str
717
718		SetClosing(source_p);
719
720	<	if (IsIpHash(source_p))
879	<	remove_one_ip(&source_p->localClient->ip);
880	<
881	<	if (source_p->localClient->auth)
720	>	if (HasFlag(source_p, FLAGS_IPHASH))
721		{
722	<	delete_auth(source_p->localClient->auth);
723	<	source_p->localClient->auth = NULL;
722	>	DelFlag(source_p, FLAGS_IPHASH);
723	>	ipcache_remove_address(&source_p->connection->ip);
724		}
725
726	<	/* This source_p could have status of one of STAT_UNKNOWN, STAT_CONNECTING
726	>	delete_auth(&source_p->connection->auth);
727	>
728	>	/*
729	>	* This source_p could have status of one of STAT_UNKNOWN, STAT_CONNECTING
730		* STAT_HANDSHAKE or STAT_UNKNOWN
731		* all of which are lumped together into unknown_list
732		*
#	Line 894 | Line 736 | exit_client(struct Client *source_p, str
736		{
737		assert(dlinkFind(&unknown_list, source_p));
738
739	<	dlinkDelete(&source_p->localClient->lclient_node, &unknown_list);
739	>	dlinkDelete(&source_p->connection->lclient_node, &unknown_list);
740		}
741		else if (IsClient(source_p))
742		{
743	+	time_t on_for = CurrentTime - source_p->connection->firsttime;
744	+
745		assert(Count.local > 0);
902	–	Count.local--;
746
747	<	if (IsOper(source_p))
748	<	{
749	<	if ((m = dlinkFindDelete(&oper_list, source_p)) != NULL)
750	<	free_dlink_node(m);
751	<	}
747	>	--Count.local;
748	>
749	>	if (HasUMode(source_p, UMODE_OPER))
750	>	if ((node = dlinkFindDelete(&oper_list, source_p)))
751	>	free_dlink_node(node);
752
753		assert(dlinkFind(&local_client_list, source_p));
754	<	dlinkDelete(&source_p->localClient->lclient_node, &local_client_list);
754	>	dlinkDelete(&source_p->connection->lclient_node, &local_client_list);
755
756	<	if (source_p->localClient->list_task != NULL)
757	<	free_list_task(source_p->localClient->list_task, source_p);
756	>	if (source_p->connection->list_task)
757	>	free_list_task(source_p);
758
759		watch_del_watch_list(source_p);
760	<	sendto_realops_flags(UMODE_CCONN, L_ALL, "Client exiting: %s (%s@%s) [%s] [%s]",
760	>	client_clear_svstags(source_p);
761	>
762	>	sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
763	>	"Client exiting: %s (%s@%s) [%s] [%s]",
764		source_p->name, source_p->username, source_p->host, comment,
765	<	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	<	}
765	>	source_p->sockhost);
766
767	<	/* As soon as a client is known to be a server of some sort
768	<	* it has to be put on the serv_list, or SJOIN's to this new server
769	<	* from the connect burst will not be seen.
770	<	*/
771	<	if (IsServer(source_p) || IsConnecting(source_p) ||
772	<	IsHandshake(source_p))
767	>	ilog(LOG_TYPE_USER, "%s (%3u:%02u:%02u): %s!%s@%s %llu/%llu",
768	>	myctime(source_p->connection->firsttime), (unsigned int)(on_for / 3600),
769	>	(unsigned int)((on_for % 3600)/60), (unsigned int)(on_for % 60),
770	>	source_p->name, source_p->username, source_p->host,
771	>	source_p->connection->send.bytes>>10,
772	>	source_p->connection->recv.bytes>>10);
773	>	}
774	>	else if (IsServer(source_p))
775		{
776	<	if ((m = dlinkFindDelete(&serv_list, source_p)) != NULL)
939	<	{
940	<	free_dlink_node(m);
941	<	unset_chcap_usage_counts(source_p);
942	<	}
776	>	assert(Count.myserver > 0);
777
778	<	if (IsServer(source_p))
945	<	Count.myserver--;
946	<	}
778	>	--Count.myserver;
779
780	<	log_user_exit(source_p);
780	>	assert(dlinkFind(&local_server_list, source_p));
781	>	dlinkDelete(&source_p->connection->lclient_node, &local_server_list);
782	>	}
783
784		if (!IsDead(source_p))
785		{
786		if (IsServer(source_p))
787		{
788	<	/* for them, we are exiting the network */
789	<	sendto_one(source_p, ":%s SQUIT %s :%s",
790	<	ID_or_name(from, source_p), me.name, comment);
788	>	if (!HasFlag(source_p, FLAGS_SQUIT))
789	>	{
790	>	/* for them, we are exiting the network */
791	>	sendto_one(source_p, ":%s SQUIT %s :%s",
792	>	me.id, me.id, comment);
793	>	}
794		}
795
796		sendto_one(source_p, "ERROR :Closing Link: %s (%s)",
797		source_p->host, comment);
798		}
799
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	–	*/
800		close_connection(source_p);
801		}
802	+	else if (IsClient(source_p) && HasFlag(source_p->servptr, FLAGS_EOB))
803	+	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
804	+	"Client exiting at %s: %s (%s@%s) [%s]",
805	+	source_p->servptr->name, source_p->name,
806	+	source_p->username, source_p->host, comment);
807
808		if (IsServer(source_p))
809		{
810	<	char splitstr[HOSTLEN + HOSTLEN + 2];
810	>	char splitstr[HOSTLEN + HOSTLEN + 2] = "";
811
812	<	/* This shouldn't ever happen */
813	<	assert(source_p->serv != NULL && source_p->servptr != NULL);
812	>	assert(source_p->serv);
813	>	assert(source_p->servptr);
814
815		if (ConfigServerHide.hide_servers)
816		/*
817	<	* Set netsplit message to "*.net *.split" to still show
817	>	* Set netsplit message to "*.net *.split" to still show
818		* that its a split, but hide the servers splitting
819		*/
820	<	strcpy(splitstr, "*.net *.split");
820	>	strlcpy(splitstr, "*.net *.split", sizeof(splitstr));
821		else
822		snprintf(splitstr, sizeof(splitstr), "%s %s",
823		source_p->servptr->name, source_p->name);
824
825	<	remove_dependents(source_p, from->from, comment, splitstr);
825	>	/* Send SQUIT for source_p in every direction. source_p is already off of local_server_list here */
826	>	if (!HasFlag(source_p, FLAGS_SQUIT))
827	>	sendto_server(NULL, 0, 0, "SQUIT %s :%s", source_p->id, comment);
828	>
829	>	/* Now exit the clients internally */
830	>	recurse_remove_clients(source_p, splitstr);
831
832	<	if (source_p->servptr == &me)
832	>	if (MyConnect(source_p))
833		{
834	<	sendto_realops_flags(UMODE_ALL, L_ALL,
835	<	"%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
836	<	source_p->name, (int)(CurrentTime - source_p->firsttime),
837	<	source_p->localClient->send.bytes >> 10,
838	<	source_p->localClient->recv.bytes >> 10);
839	<	ilog(L_NOTICE, "%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
840	<	source_p->name, (int)(CurrentTime - source_p->firsttime),
841	<	source_p->localClient->send.bytes >> 10,
842	<	source_p->localClient->recv.bytes >> 10);
843	<	}
844	<	}
845	<	else if (IsClient(source_p) && !IsKilled(source_p))
846	<	{
847	<	sendto_server(from->from, NULL, CAP_TS6, NOCAPS,
848	<	":%s QUIT :%s", ID(source_p), comment);
849	<	sendto_server(from->from, NULL, NOCAPS, CAP_TS6,
850	<	":%s QUIT :%s", source_p->name, comment);
1015	<	}
834	>	int connected = CurrentTime - source_p->connection->firsttime;
835	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
836	>	"%s was connected for %d day%s, %2d:%02d:%02d. %llu/%llu sendK/recvK.",
837	>	source_p->name, connected/86400, (connected/86400 == 1) ? "" : "s",
838	>	(connected % 86400) / 3600, (connected % 3600) / 60, connected % 60,
839	>	source_p->connection->send.bytes >> 10,
840	>	source_p->connection->recv.bytes >> 10);
841	>	ilog(LOG_TYPE_IRCD, "%s was connected for %d day%s, %2d:%02d:%02d. %llu/%llu sendK/recvK.",
842	>	source_p->name, connected/86400, (connected/86400 == 1) ? "" : "s",
843	>	(connected % 86400) / 3600, (connected % 3600) / 60, connected % 60,
844	>	source_p->connection->send.bytes >> 10,
845	>	source_p->connection->recv.bytes >> 10);
846	>	}
847	>	}
848	>	else if (IsClient(source_p) && !HasFlag(source_p, FLAGS_KILLED))
849	>	sendto_server(source_p->from, 0, 0, ":%s QUIT :%s",
850	>	source_p->id, comment);
851
852		/* The client *better* be off all of the lists */
853		assert(dlinkFind(&unknown_list, source_p) == NULL);
854		assert(dlinkFind(&local_client_list, source_p) == NULL);
855	<	assert(dlinkFind(&serv_list, source_p) == NULL);
855	>	assert(dlinkFind(&local_server_list, source_p) == NULL);
856		assert(dlinkFind(&oper_list, source_p) == NULL);
857
858		exit_one_client(source_p, comment);
#	Line 1030 | Line 865 | exit_client(struct Client *source_p, str
865		void
866		dead_link_on_write(struct Client *client_p, int ierrno)
867		{
868	<	dlink_node *ptr;
868	>	dlink_node *node;
869
870		if (IsDefunct(client_p))
871		return;
872
873	<	dbuf_clear(&client_p->localClient->buf_recvq);
874	<	dbuf_clear(&client_p->localClient->buf_sendq);
873	>	dbuf_clear(&client_p->connection->buf_recvq);
874	>	dbuf_clear(&client_p->connection->buf_sendq);
875
876		assert(dlinkFind(&abort_list, client_p) == NULL);
877	<	ptr = make_dlink_node();
877	>	node = make_dlink_node();
878		/* don't let exit_aborted_clients() finish yet */
879	<	dlinkAddTail(client_p, ptr, &abort_list);
879	>	dlinkAddTail(client_p, node, &abort_list);
880
881		if (eac_next == NULL)
882	<	eac_next = ptr;
882	>	eac_next = node;
883
884		SetDead(client_p); /* You are dead my friend */
885		}
#	Line 1056 | Line 891 | dead_link_on_write(struct Client *client
891		void
892		dead_link_on_read(struct Client *client_p, int error)
893		{
894	<	char errmsg[255];
894	>	char errmsg[IRCD_BUFSIZE];
895		int current_error;
896
897		if (IsDefunct(client_p))
898		return;
899
900	<	dbuf_clear(&client_p->localClient->buf_recvq);
901	<	dbuf_clear(&client_p->localClient->buf_sendq);
900	>	dbuf_clear(&client_p->connection->buf_recvq);
901	>	dbuf_clear(&client_p->connection->buf_sendq);
902
903	<	current_error = get_sockerr(client_p->localClient->fd.fd);
903	>	current_error = get_sockerr(client_p->connection->fd.fd);
904
905		if (IsServer(client_p) || IsHandshake(client_p))
906		{
907	<	int connected = CurrentTime - client_p->firsttime;
908	<
907	>	int connected = CurrentTime - client_p->connection->firsttime;
908	>
909		if (error == 0)
910		{
911		/* Admins get the real IP */
912	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
913	<	"Server %s closed the connection",
914	<	get_client_name(client_p, SHOW_IP));
912	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
913	>	"Server %s closed the connection",
914	>	get_client_name(client_p, SHOW_IP));
915
916		/* Opers get a masked IP */
917	<	sendto_realops_flags(UMODE_ALL, L_OPER,
918	<	"Server %s closed the connection",
919	<	get_client_name(client_p, MASK_IP));
917	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
918	>	"Server %s closed the connection",
919	>	get_client_name(client_p, MASK_IP));
920
921	<	ilog(L_NOTICE, "Server %s closed the connection",
922	<	get_client_name(client_p, SHOW_IP));
921	>	ilog(LOG_TYPE_IRCD, "Server %s closed the connection",
922	>	get_client_name(client_p, SHOW_IP));
923		}
924		else
925		{
926		report_error(L_ADMIN, "Lost connection to %s: %s",
927	<	get_client_name(client_p, SHOW_IP), current_error);
927	>	get_client_name(client_p, SHOW_IP), current_error);
928		report_error(L_OPER, "Lost connection to %s: %s",
929	<	get_client_name(client_p, MASK_IP), current_error);
929	>	get_client_name(client_p, MASK_IP), current_error);
930		}
931
932	<	sendto_realops_flags(UMODE_ALL, L_ALL,
933	<	"%s had been connected for %d day%s, %2d:%02d:%02d",
934	<	client_p->name, connected/86400,
935	<	(connected/86400 == 1) ? "" : "s",
936	<	(connected % 86400) / 3600, (connected % 3600) / 60,
937	<	connected % 60);
932	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
933	>	"%s was connected for %d day%s, %2d:%02d:%02d",
934	>	client_p->name, connected/86400,
935	>	(connected/86400 == 1) ? "" : "s",
936	>	(connected % 86400) / 3600, (connected % 3600) / 60,
937	>	connected % 60);
938		}
939
940		if (error == 0)
#	Line 1109 | Line 944 | dead_link_on_read(struct Client *client_
944		snprintf(errmsg, sizeof(errmsg), "Read error: %s",
945		strerror(current_error));
946
947	<	exit_client(client_p, &me, errmsg);
947	>	exit_client(client_p, errmsg);
948		}
949
950		void
#	Line 1126 | Line 961 | exit_aborted_clients(void)
961
962		if (target_p == NULL)
963		{
964	<	sendto_realops_flags(UMODE_ALL, L_ALL,
964	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
965		"Warning: null client on abort_list!");
966		dlinkDelete(ptr, &abort_list);
967		free_dlink_node(ptr);
#	Line 1135 | Line 970 | exit_aborted_clients(void)
970
971		dlinkDelete(ptr, &abort_list);
972
973	<	if (IsSendQExceeded(target_p))
973	>	if (HasFlag(target_p, FLAGS_SENDQEX))
974		notice = "Max SendQ exceeded";
975		else
976		notice = "Write error: connection closed";
977
978	<	exit_client(target_p, &me, notice);
978	>	exit_client(target_p, notice);
979		free_dlink_node(ptr);
980		}
981		}
#	Line 1158 | Line 993 | exit_aborted_clients(void)
993		void
994		del_accept(struct split_nuh_item *accept_p, struct Client *client_p)
995		{
996	<	dlinkDelete(&accept_p->node, &client_p->localClient->acceptlist);
996	>	dlinkDelete(&accept_p->node, &client_p->connection->acceptlist);
997
998		MyFree(accept_p->nickptr);
999		MyFree(accept_p->userptr);
#	Line 1168 | Line 1003 | del_accept(struct split_nuh_item *accept
1003
1004		struct split_nuh_item *
1005		find_accept(const char *nick, const char *user,
1006	<	const char *host, struct Client *client_p, int do_match)
1006	>	const char *host, struct Client *client_p,
1007	>	int (*cmpfunc)(const char *, const char *))
1008		{
1009	<	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;
1009	>	dlink_node *node = NULL;
1010
1011	<	DLINK_FOREACH(ptr, client_p->localClient->acceptlist.head)
1011	>	DLINK_FOREACH(node, client_p->connection->acceptlist.head)
1012		{
1013	<	struct split_nuh_item *accept_p = ptr->data;
1013	>	struct split_nuh_item *accept_p = node->data;
1014
1015	<	if (cmpfunc(accept_p->nickptr, nick) == do_match &&
1016	<	cmpfunc(accept_p->userptr, user) == do_match &&
1017	<	cmpfunc(accept_p->hostptr, host) == do_match)
1015	>	if (!cmpfunc(accept_p->nickptr, nick) &&
1016	>	!cmpfunc(accept_p->userptr, user) &&
1017	>	!cmpfunc(accept_p->hostptr, host))
1018		return accept_p;
1019		}
1020
#	Line 1198 | Line 1032 | int
1032		accept_message(struct Client *source,
1033		struct Client *target)
1034		{
1035	<	dlink_node *ptr = NULL;
1035	>	dlink_node *node = NULL;
1036	>
1037	>	if (HasFlag(source, FLAGS_SERVICE) ||
1038	>	(HasUMode(source, UMODE_OPER) && ConfigGeneral.opers_bypass_callerid))
1039	>	return 1;
1040
1041		if (source == target || find_accept(source->name, source->username,
1042	<	source->host, target, 1))
1042	>	source->host, target, match))
1043		return 1;
1044
1045	<	if (IsSoftCallerId(target))
1046	<	DLINK_FOREACH(ptr, target->channel.head)
1047	<	if (IsMember(source, ((struct Membership *)ptr->data)->chptr))
1045	>	if (!HasUMode(target, UMODE_CALLERID) && HasUMode(target, UMODE_SOFTCALLERID))
1046	>	DLINK_FOREACH(node, target->channel.head)
1047	>	if (IsMember(source, ((struct Membership *)node->data)->chptr))
1048		return 1;
1049
1050		return 0;
#	Line 1221 | Line 1059 | accept_message(struct Client *source,
1059		void
1060		del_all_accepts(struct Client *client_p)
1061		{
1062	<	dlink_node *ptr = NULL, *next_ptr = NULL;
1062	>	dlink_node *node = NULL, *node_next = NULL;
1063
1064	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->acceptlist.head)
1065	<	del_accept(ptr->data, client_p);
1064	>	DLINK_FOREACH_SAFE(node, node_next, client_p->connection->acceptlist.head)
1065	>	del_accept(node->data, client_p);
1066		}
1067
1068	<	/* change_local_nick()
1069	<	*
1070	<	* 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)
1068	>	unsigned int
1069	>	client_get_idle_time(const struct Client *source_p,
1070	>	const struct Client *target_p)
1071		{
1072	<	int samenick = 0;
1072	>	unsigned int idle = 0;
1073	>	unsigned int min_idle = 0;
1074	>	unsigned int max_idle = 0;
1075	>	const struct ClassItem *const class = get_class_ptr(&target_p->connection->confs);
1076
1077	<	assert(source_p->name[0] && !EmptyString(nick));
1077	>	if (!(class->flags & CLASS_FLAGS_FAKE_IDLE) || target_p == source_p)
1078	>	return CurrentTime - target_p->connection->last_privmsg;
1079
1080	<	/*
1081	<	* Client just changing his/her nick. If he/she is
1082	<	* 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);
1080	>	if (HasUMode(source_p, UMODE_OPER) &&
1081	>	!(class->flags & CLASS_FLAGS_HIDE_IDLE_FROM_OPERS))
1082	>	return CurrentTime - target_p->connection->last_privmsg;
1083
1084	<	if (!samenick)
1085	<	{
1266	<	source_p->tsinfo = CurrentTime;
1267	<	clear_ban_cache_client(source_p);
1268	<	watch_check_hash(source_p, RPL_LOGOFF);
1084	>	min_idle = class->min_idle;
1085	>	max_idle = class->max_idle;
1086
1087	<	if (HasUMode(source_p, UMODE_REGISTERED))
1088	<	{
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	<	}
1087	>	if (min_idle == max_idle)
1088	>	return min_idle;
1089
1090	<	/* XXX - the format of this notice should eventually be changed
1091	<	* to either %s[%s@%s], or even better would be get_client_name() -bill
1092	<	*/
1093	<	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);
1090	>	if (class->flags & CLASS_FLAGS_RANDOM_IDLE)
1091	>	idle = genrand_int32();
1092	>	else
1093	>	idle = CurrentTime - target_p->connection->last_privmsg;
1094
1095	<	sendto_server(client_p, NULL, CAP_TS6, NOCAPS,
1096	<	":%s NICK %s :%lu",
1097	<	ID(source_p), nick, (unsigned long)source_p->tsinfo);
1098	<	sendto_server(client_p, NULL, NOCAPS, CAP_TS6,
1294	<	":%s NICK %s :%lu",
1295	<	source_p->name, nick, (unsigned long)source_p->tsinfo);
1095	>	if (!max_idle)
1096	>	idle = 0;
1097	>	else
1098	>	idle %= max_idle;
1099
1100	<	hash_del_client(source_p);
1101	<	strcpy(source_p->name, nick);
1299	<	hash_add_client(source_p);
1100	>	if (idle < min_idle)
1101	>	idle = min_idle + (idle % (max_idle - min_idle));
1102
1103	<	if (!samenick)
1104	<	watch_check_hash(source_p, RPL_LOGON);
1103	>	return idle;
1104	>	}
1105
1106	<	/* fd_desc is long enough */
1107	<	fd_note(&client_p->localClient->fd, "Nick: %s", nick);
1108	<	}
1109	<	else
1110	<	sendto_one(source_p, form_str(ERR_NICKTOOFAST),
1111	<	me.name, source_p->name, source_p->name,
1112	<	nick, ConfigFileEntry.max_nick_time);
1106	>	/* client_init()
1107	>	*
1108	>	* inputs       - NONE
1109	>	* output       - NONE
1110	>	* side effects - initialize client free memory
1111	>	*/
1112	>	void
1113	>	client_init(void)
1114	>	{
1115	>	static struct event event_ping =
1116	>	{
1117	>	.name = "check_pings",
1118	>	.handler = check_pings,
1119	>	.when = 5
1120	>	};
1121	>
1122	>	client_pool = mp_pool_new(sizeof(struct Client), MP_CHUNK_SIZE_CLIENT);
1123	>	connection_pool = mp_pool_new(sizeof(struct Connection), MP_CHUNK_SIZE_CONNECTION);
1124	>	event_add(&event_ping, NULL);
1125		}

Diff Legend

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