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 4962 by michael, Mon Dec 1 13:08:31 2014 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  client.c: Controls clients.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2002 by the past and present ircd coders, and others.
4	>	*  Copyright (c) 1997-2014 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 16 | Line 15
15		*
16		*  You should have received a copy of the GNU General Public License
17		*  along with this program; if not, write to the Free Software
18	<	*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
18	>	*  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
19		*  USA
20	<	*
21	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file client.c
23	>	* \brief Controls clients.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
28		#include "list.h"
29		#include "client.h"
28	–	#include "channel_mode.h"
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 *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! */
102
103	+	client_p->idhnext = client_p;
104		client_p->hnext  = client_p;
105	<	client_p->status = STAT_UNKNOWN;
105	>	SetUnknown(client_p);
106		strcpy(client_p->username, "unknown");
107	+	strcpy(client_p->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		{
122	<	assert(client_p != NULL);
122	>	assert(client_p);
123		assert(client_p != &me);
124		assert(client_p->hnext == client_p);
125	+	assert(client_p->idhnext == client_p);
126		assert(client_p->channel.head == NULL);
127		assert(dlink_list_length(&client_p->channel) == 0);
128	+	assert(dlink_list_length(&client_p->whowas) == 0);
129	+	assert(!IsServer(client_p) || client_p->serv);
130
154	–	MyFree(client_p->away);
131		MyFree(client_p->serv);
132	+	MyFree(client_p->certfp);
133
134		if (MyConnect(client_p))
135		{
136	<	assert(client_p->localClient->invited.head == NULL);
137	<	assert(dlink_list_length(&client_p->localClient->invited) == 0);
136	>	assert(client_p->connection->invited.head == NULL);
137	>	assert(dlink_list_length(&client_p->connection->invited) == 0);
138	>	assert(dlink_list_length(&client_p->connection->watches) == 0);
139		assert(IsClosing(client_p) && IsDead(client_p));
140
141	<	MyFree(client_p->localClient->response);
142	<	MyFree(client_p->localClient->auth_oper);
141	>	MyFree(client_p->connection->challenge_response);
142	>	MyFree(client_p->connection->challenge_operator);
143	>	client_p->connection->challenge_response = NULL;
144	>	client_p->connection->challenge_operator = NULL;
145
146		/*
147	<	* clean up extra sockets from P-lines which have been discarded.
147	>	* Clean up extra sockets from listen{} blocks which have been discarded.
148		*/
149	<	if (client_p->localClient->listener)
149	>	if (client_p->connection->listener)
150		{
151	<	assert(0 < client_p->localClient->listener->ref_count);
152	<	if (0 == --client_p->localClient->listener->ref_count &&
173	<	!client_p->localClient->listener->active)
174	<	free_listener(client_p->localClient->listener);
151	>	listener_release(client_p->connection->listener);
152	>	client_p->connection->listener = NULL;
153		}
154
155	<	dbuf_clear(&client_p->localClient->buf_recvq);
156	<	dbuf_clear(&client_p->localClient->buf_sendq);
155	>	dbuf_clear(&client_p->connection->buf_recvq);
156	>	dbuf_clear(&client_p->connection->buf_sendq);
157
158	<	BlockHeapFree(lclient_heap, client_p->localClient);
158	>	mp_pool_release(client_p->connection);
159		}
160
161	<	BlockHeapFree(client_heap, client_p);
184	<	}
185	<
186	<	/*
187	<	* check_pings - go through the local client list and check activity
188	<	* kill off stuff that should die
189	<	*
190	<	* inputs       - NOT USED (from event)
191	<	* 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	<	*/
199	<
200	<	/*
201	<	* 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	<	*/
211	<
212	<	static void
213	<	check_pings(void *notused)
214	<	{
215	<	check_pings_list(&local_client_list);
216	<	check_pings_list(&serv_list);
217	<	check_unknowns_list();
161	>	mp_pool_release(client_p);
162		}
163
164		/* check_pings_list()
165		*
166		* inputs       - pointer to list to check
167		* output       - NONE
168	<	* side effects -
168	>	* side effects -
169		*/
170		static void
171		check_pings_list(dlink_list *list)
172		{
173	<	char scratch[32];        /* way too generous but... */
174	<	struct Client *client_p; /* current local client_p being examined */
175	<	int ping, pingwarn;      /* ping time value from client */
232	<	dlink_node *ptr, *next_ptr;
173	>	char buf[IRCD_BUFSIZE] = "";
174	>	int ping = 0;      /* ping time value from client */
175	>	dlink_node *node = NULL, *node_next = NULL;
176
177	<	DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
177	>	DLINK_FOREACH_SAFE(node, node_next, list->head)
178		{
179	<	client_p = ptr->data;
179	>	struct Client *client_p = node->data;
180
238	–	/*
239	–	** Note: No need to notify opers here. It's
240	–	** already done when "FLAGS_DEADSOCKET" is set.
241	–	*/
181		if (IsDead(client_p))
182	<	{
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	<	}
182	>	continue;  /* Ignore it, its been exited already */
183
184		if (!IsRegistered(client_p))
185	<	ping = CONNECTTIMEOUT, pingwarn = 0;
185	>	ping = CONNECTTIMEOUT;
186		else
187	<	ping = get_client_ping(client_p, &pingwarn);
187	>	ping = get_client_ping(&client_p->connection->confs);
188
189	<	if (ping < CurrentTime - client_p->lasttime)
189	>	if (ping < CurrentTime - client_p->connection->lasttime)
190		{
191		if (!IsPingSent(client_p))
192		{
193	<	/*
194	<	* if we havent PINGed the connection and we havent
195	<	* heard from it in a while, PING it to make sure
196	<	* it is still alive.
197	<	*/
198	<	SetPingSent(client_p);
199	<	ClearPingWarning(client_p);
200	<	client_p->lasttime = CurrentTime - ping;
272	<	sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
193	>	/*
194	>	* If we haven't PINGed the connection and we haven't
195	>	* heard from it in a while, PING it to make sure
196	>	* it is still alive.
197	>	*/
198	>	SetPingSent(client_p);
199	>	client_p->connection->lasttime = CurrentTime - ping;
200	>	sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
201		}
202		else
203		{
204	<	if (CurrentTime - client_p->lasttime >= 2 * ping)
204	>	if (CurrentTime - client_p->connection->lasttime >= 2 * ping)
205		{
206		/*
207		* If the client/server hasn't talked to us in 2*ping seconds
208		* and it has a ping time, then close its connection.
209		*/
210		if (IsServer(client_p) || IsHandshake(client_p))
211	<	{
212	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
213	<	"No response from %s, closing link",
214	<	get_client_name(client_p, HIDE_IP));
215	<	sendto_realops_flags(UMODE_ALL, L_OPER,
216	<	"No response from %s, closing link",
217	<	get_client_name(client_p, MASK_IP));
218	<	ilog(L_NOTICE, "No response from %s, closing link",
219	<	get_client_name(client_p, HIDE_IP));
220	<	}
221	<
222	<	snprintf(scratch, sizeof(scratch), "Ping timeout: %d seconds",
223	<	(int)(CurrentTime - client_p->lasttime));
224	<	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);
211	>	{
212	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
213	>	"No response from %s, closing link",
214	>	get_client_name(client_p, HIDE_IP));
215	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
216	>	"No response from %s, closing link",
217	>	get_client_name(client_p, MASK_IP));
218	>	ilog(LOG_TYPE_IRCD, "No response from %s, closing link",
219	>	get_client_name(client_p, HIDE_IP));
220	>	}
221	>
222	>	snprintf(buf, sizeof(buf), "Ping timeout: %d seconds",
223	>	(int)(CurrentTime - client_p->connection->lasttime));
224	>	exit_client(client_p, buf);
225		}
226		}
227		}
#	Line 327 | Line 237 | check_pings_list(dlink_list *list)
237		static void
238		check_unknowns_list(void)
239		{
240	<	dlink_node *ptr, *next_ptr;
240	>	dlink_node *node = NULL, *node_next = NULL;
241
242	<	DLINK_FOREACH_SAFE(ptr, next_ptr, unknown_list.head)
242	>	DLINK_FOREACH_SAFE(node, node_next, unknown_list.head)
243		{
244	<	struct Client *client_p = ptr->data;
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	<	}
244	>	struct Client *client_p = node->data;
245
246		/*
247		* Check UNKNOWN connections - if they have been in this state
248		* for > 30s, close them.
249		*/
250	<	if (IsAuthFinished(client_p) && (CurrentTime - client_p->firsttime) > 30)
251	<	exit_client(client_p, &me, "Registration timed out");
250	>	if (IsAuthFinished(client_p) && (CurrentTime - client_p->connection->firsttime) > 30)
251	>	exit_client(client_p, "Registration timed out");
252		}
253		}
254
255	+	/*
256	+	* check_pings - go through the local client list and check activity
257	+	* kill off stuff that should die
258	+	*
259	+	* inputs       - NOT USED (from event)
260	+	* output       - next time_t when check_pings() should be called again
261	+	* side effects -
262	+	*
263	+	*
264	+	* A PING can be sent to clients as necessary.
265	+	*
266	+	* Client/Server ping outs are handled.
267	+	*/
268	+
269	+	/*
270	+	* Addon from adrian. We used to call this after nextping seconds,
271	+	* however I've changed it to run once a second. This is only for
272	+	* PING timeouts, not K/etc-line checks (thanks dianora!). Having it
273	+	* run once a second makes life a lot easier - when a new client connects
274	+	* and they need a ping in 4 seconds, if nextping was set to 20 seconds
275	+	* we end up waiting 20 seconds. This is stupid. :-)
276	+	* I will optimise (hah!) check_pings() once I've finished working on
277	+	* tidying up other network IO evilnesses.
278	+	*     -- adrian
279	+	*/
280	+
281	+	static void
282	+	check_pings(void *unused)
283	+	{
284	+	check_pings_list(&local_client_list);
285	+	check_pings_list(&local_server_list);
286	+	check_unknowns_list();
287	+	}
288	+
289		/* check_conf_klines()
290		*
291		* inputs       - NONE
#	Line 356 | Line 293 | check_unknowns_list(void)
293		* side effects - Check all connections for a pending kline against the
294		*                client, exit the client if a kline matches.
295		*/
296	<	void
296	>	void
297		check_conf_klines(void)
298	<	{
299	<	struct Client *client_p = NULL;       /* current local client_p being examined */
300	<	struct AccessItem *aconf = NULL;
364	<	struct ConfItem *conf = NULL;
365	<	dlink_node *ptr, *next_ptr;
298	>	{
299	>	struct MaskItem *conf = NULL;
300	>	dlink_node *node = NULL, *node_next = NULL;
301
302	<	DLINK_FOREACH_SAFE(ptr, next_ptr, local_client_list.head)
302	>	DLINK_FOREACH_SAFE(node, node_next, local_client_list.head)
303		{
304	<	client_p = ptr->data;
304	>	struct Client *client_p = node->data;
305
306	<	/* If a client is already being exited
307	<	*/
373	<	if (IsDead(client_p) || !IsClient(client_p))
306	>	/* If a client is already being exited */
307	>	if (IsDead(client_p))
308		continue;
309
310	<	/* if there is a returned struct ConfItem then kill it */
311	<	if ((aconf = find_dline_conf(&client_p->localClient->ip,
378	<	client_p->localClient->aftype)) != NULL)
310	>	if ((conf = find_conf_by_address(NULL, &client_p->connection->ip, CONF_DLINE,
311	>	client_p->connection->aftype, NULL, NULL, 1)))
312		{
313	<	if (aconf->status & CONF_EXEMPTDLINE)
381	<	continue;
382	<
383	<	conf = unmap_conf_item(aconf);
384	<	ban_them(client_p, conf);
313	>	conf_try_ban(client_p, conf);
314		continue; /* and go examine next fd/client_p */
315		}
316
317	<	if (ConfigFileEntry.glines && (aconf = find_gline(client_p)))
317	>	if (ConfigGeneral.glines)
318		{
319	<	if (IsExemptKline(client_p) ||
320	<	IsExemptGline(client_p))
319	>	if ((conf = find_conf_by_address(client_p->host, &client_p->connection->ip,
320	>	CONF_GLINE, client_p->connection->aftype,
321	>	client_p->username, NULL, 1)))
322		{
323	<	sendto_realops_flags(UMODE_ALL, L_ALL,
324	<	"GLINE over-ruled for %s, client is %sline_exempt",
395	<	get_client_name(client_p, HIDE_IP), IsExemptKline(client_p) ? "k" : "g");
323	>	conf_try_ban(client_p, conf);
324	>	/* and go examine next fd/client_p */
325		continue;
326		}
327	+	}
328
329	<	conf = unmap_conf_item(aconf);
330	<	ban_them(client_p, conf);
331	<	/* and go examine next fd/client_p */
402	<	continue;
403	<	}
404	<
405	<	if ((aconf = find_kill(client_p)) != NULL)
329	>	if ((conf = find_conf_by_address(client_p->host, &client_p->connection->ip,
330	>	CONF_KLINE, client_p->connection->aftype,
331	>	client_p->username, NULL, 1)))
332		{
333	<
334	<	/* 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;
333	>	conf_try_ban(client_p, conf);
334	>	continue;
335		}
336
337	<	/* if there is a returned struct MatchItem then kill it */
338	<	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)
337	>	if ((conf = find_matching_name_conf(CONF_XLINE,  client_p->info,
338	>	NULL, NULL, 0)))
339		{
340	<	ban_them(client_p, conf);
340	>	conf_try_ban(client_p, conf);
341		continue;
342		}
343		}
344
345		/* also check the unknowns list for new dlines */
346	<	DLINK_FOREACH_SAFE(ptr, next_ptr, unknown_list.head)
346	>	DLINK_FOREACH_SAFE(node, node_next, unknown_list.head)
347		{
348	<	client_p = ptr->data;
348	>	struct Client *client_p = node->data;
349
350	<	if ((aconf = find_dline_conf(&client_p->localClient->ip,
351	<	client_p->localClient->aftype)))
350	>	if ((conf = find_conf_by_address(NULL, &client_p->connection->ip, CONF_DLINE,
351	>	client_p->connection->aftype, NULL, NULL, 1)))
352		{
353	<	if (aconf->status & CONF_EXEMPTDLINE)
354	<	continue;
443	<
444	<	exit_client(client_p, &me, "D-lined");
353	>	conf_try_ban(client_p, conf);
354	>	continue; /* and go examine next fd/client_p */
355		}
356		}
357		}
358
359		/*
360	<	* ban_them
360	>	* conf_try_ban
361		*
362		* inputs       - pointer to client to ban
363	<	*              - pointer to ConfItem
363	>	*              - pointer to MaskItem
364		* output       - NONE
365		* side effects - given client_p is banned
366		*/
367	<	static void
368	<	ban_them(struct Client *client_p, struct ConfItem *conf)
367	>	void
368	>	conf_try_ban(struct Client *client_p, struct MaskItem *conf)
369		{
370	<	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;
370	>	const char *user_reason = NULL;  /* What is sent to user */
371		const char *type_string = NULL;
372		const char dline_string[] = "D-line";
373		const char kline_string[] = "K-line";
#	Line 469 | Line 376 | ban_them(struct Client *client_p, struct
376
377		switch (conf->type)
378		{
379	<	case RKLINE_TYPE:
380	<	case KLINE_TYPE:
379	>	case CONF_KLINE:
380	>	if (IsExemptKline(client_p))
381	>	{
382	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
383	>	"KLINE over-ruled for %s, client is kline_exempt",
384	>	get_client_name(client_p, HIDE_IP));
385	>	return;
386	>	}
387	>
388		type_string = kline_string;
475	–	aconf = map_to_conf(conf);
389		break;
390	<	case DLINE_TYPE:
390	>	case CONF_DLINE:
391	>	if (find_conf_by_address(NULL, &client_p->connection->ip, CONF_EXEMPT,
392	>	client_p->connection->aftype, NULL, NULL, 1))
393	>	return;
394		type_string = dline_string;
479	–	aconf = map_to_conf(conf);
395		break;
396	<	case GLINE_TYPE:
396	>	case CONF_GLINE:
397	>	if (IsExemptKline(client_p) ||
398	>	IsExemptGline(client_p))
399	>	{
400	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
401	>	"GLINE over-ruled for %s, client is %sline_exempt",
402	>	get_client_name(client_p, HIDE_IP), IsExemptKline(client_p) ? "k" : "g");
403	>	return;
404	>	}
405	>
406		type_string = gline_string;
483	–	aconf = map_to_conf(conf);
407		break;
408	<	case RXLINE_TYPE:
486	<	case XLINE_TYPE:
408	>	case CONF_XLINE:
409		type_string = xline_string;
410	<	xconf = map_to_conf(conf);
489	<	++xconf->count;
410	>	++conf->count;
411		break;
412		default:
413		assert(0);
414		break;
415		}
416
417	<	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;
417	>	user_reason = conf->reason ? conf->reason : type_string;
418
419	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s active for %s",
419	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s active for %s",
420		type_string, get_client_name(client_p, HIDE_IP));
421
422		if (IsClient(client_p))
423	<	sendto_one(client_p, form_str(ERR_YOUREBANNEDCREEP),
516	<	me.name, client_p->name, user_reason);
423	>	sendto_one_numeric(client_p, &me, ERR_YOUREBANNEDCREEP, user_reason);
424
425	<	exit_client(client_p, &me, channel_reason);
425	>	exit_client(client_p, user_reason);
426		}
427
428		/* update_client_exit_stats()
429		*
430		* input        - pointer to client
431		* output       - NONE
432	<	* side effects -
432	>	* side effects -
433		*/
434		static void
435		update_client_exit_stats(struct Client *client_p)
#	Line 531 | Line 438 | update_client_exit_stats(struct Client *
438		{
439		assert(Count.total > 0);
440		--Count.total;
441	<	if (IsOper(client_p))
441	>	if (HasUMode(client_p, UMODE_OPER))
442		--Count.oper;
443	<	if (IsInvisible(client_p))
443	>	if (HasUMode(client_p, UMODE_INVISIBLE))
444		--Count.invisi;
445		}
446		else if (IsServer(client_p))
447	<	sendto_realops_flags(UMODE_EXTERNAL, L_ALL, "Server %s split from %s",
447	>	sendto_realops_flags(UMODE_EXTERNAL, L_ALL, SEND_NOTICE,
448	>	"Server %s split from %s",
449		client_p->name, client_p->servptr->name);
450
451		if (splitchecking && !splitmode)
#	Line 550 | Line 458 | update_client_exit_stats(struct Client *
458		* output       - return client pointer
459		* side effects - find person by (nick)name
460		*/
553	–	/* XXX - ugly wrapper */
461		struct Client *
462	<	find_person(const struct Client *client_p, const char *name)
462	>	find_person(const struct Client *const source_p, const char *name)
463		{
464	<	struct Client *c2ptr;
464	>	struct Client *target_p = NULL;
465
466		if (IsDigit(*name))
467		{
468	<	if ((c2ptr = hash_find_id(name)) != NULL)
469	<	{
563	<	/* invisible users shall not be found by UID guessing */
564	<	if (IsInvisible(c2ptr) && !IsServer(client_p))
565	<	c2ptr = NULL;
566	<	}
468	>	if (IsServer(source_p->from))
469	>	target_p = hash_find_id(name);
470		}
471		else
472	<	c2ptr = hash_find_client(name);
472	>	target_p = hash_find_client(name);
473
474	<	return ((c2ptr != NULL && IsClient(c2ptr)) ? c2ptr : NULL);
474	>	return (target_p && IsClient(target_p)) ? target_p : NULL;
475		}
476
477		/*
478	<	* find_chasing - find the client structure for a nick name (user)
479	<	*      using history mechanism if necessary. If the client is not found,
480	<	*      an error message (NO SUCH NICK) is generated. If the client was found
578	<	*      through the history, chasing will be 1 and otherwise 0.
478	>	* find_chasing - find the client structure for a nick name (name)
479	>	*      using history mechanism if necessary. If the client is not found,
480	>	*      an error message (NO SUCH NICK) is generated.
481		*/
482		struct Client *
483	<	find_chasing(struct Client *client_p, struct Client *source_p, const char *user, int *chasing)
483	>	find_chasing(struct Client *source_p, const char *name)
484		{
485	<	struct Client *who = find_person(client_p, user);
584	<
585	<	if (chasing)
586	<	*chasing = 0;
485	>	struct Client *target_p = find_person(source_p, name);
486
487	<	if (who)
488	<	return who;
487	>	if (target_p)
488	>	return target_p;
489
490	<	if (IsDigit(*user))
490	>	if (IsDigit(*name))
491		return NULL;
492
493	<	if ((who = get_history(user,
494	<	(time_t)ConfigFileEntry.kill_chase_time_limit))
495	<	== NULL)
493	>	target_p = whowas_get_history(name, (time_t)ConfigGeneral.kill_chase_time_limit);
494	>
495	>	if (!target_p)
496		{
497	<	sendto_one(source_p, form_str(ERR_NOSUCHNICK),
599	<	me.name, source_p->name, user);
497	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHNICK, name);
498		return NULL;
499		}
500
501	<	if (chasing)
604	<	*chasing = 1;
605	<
606	<	return who;
501	>	return target_p;
502		}
503
504		/*
#	Line 615 | Line 510 | find_chasing(struct Client *client_p, st
510		*        But, this can be used to any client structure.
511		*
512		* NOTE 1:
513	<	*        Watch out the allocation of "nbuf", if either source_p->name
513	>	*        Watch out the allocation of "buf", if either source_p->name
514		*        or source_p->sockhost gets changed into pointers instead of
515		*        directly allocated within the structure...
516		*
517		* NOTE 2:
518		*        Function return either a pointer to the structure (source_p) or
519	<	*        to internal buffer (nbuf). *NEVER* use the returned pointer
519	>	*        to internal buffer (buf). *NEVER* use the returned pointer
520		*        to modify what it points!!!
521		*/
522		const char *
523	<	get_client_name(const struct Client *client, int showip)
523	>	get_client_name(const struct Client *client_p, enum addr_mask_type type)
524		{
525	<	static char nbuf[HOSTLEN * 2 + USERLEN + 5];
525	>	static char buf[HOSTLEN * 2 + USERLEN + 5];
526
527	<	assert(client != NULL);
527	>	assert(client_p);
528
529	<	if (irccmp(client->name, client->host) == 0)
530	<	return client->name;
529	>	if (!MyConnect(client_p))
530	>	return client_p->name;
531
532	<	if (ConfigServerHide.hide_server_ips)
533	<	if (IsServer(client) || IsConnecting(client) || IsHandshake(client))
534	<	showip = MASK_IP;
532	>	if (IsServer(client_p) || IsConnecting(client_p) || IsHandshake(client_p))
533	>	{
534	>	if (!irccmp(client_p->name, client_p->host))
535	>	return client_p->name;
536	>	else if (ConfigServerHide.hide_server_ips)
537	>	type = MASK_IP;
538	>	}
539
540	<	if (ConfigFileEntry.hide_spoof_ips)
541	<	if (showip == SHOW_IP && IsIPSpoof(client))
542	<	showip = MASK_IP;
540	>	if (ConfigGeneral.hide_spoof_ips)
541	>	if (IsIPSpoof(client_p) && type == SHOW_IP)
542	>	type = MASK_IP;
543
544		/* And finally, let's get the host information, ip or name */
545	<	switch (showip)
545	>	switch (type)
546		{
547		case SHOW_IP:
548	<	if (MyConnect(client))
549	<	{
550	<	snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
551	<	client->name,
653	<	client->username, client->sockhost);
654	<	break;
655	<	}
548	>	snprintf(buf, sizeof(buf), "%s[%s@%s]",
549	>	client_p->name,
550	>	client_p->username, client_p->sockhost);
551	>	break;
552		case MASK_IP:
553	<	snprintf(nbuf, sizeof(nbuf), "%s[%s@255.255.255.255]",
554	<	client->name, client->username);
553	>	if (client_p->connection->aftype == AF_INET)
554	>	snprintf(buf, sizeof(buf), "%s[%s@255.255.255.255]",
555	>	client_p->name, client_p->username);
556	>	else
557	>	snprintf(buf, sizeof(buf), "%s[%s@ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]",
558	>	client_p->name, client_p->username);
559		break;
560		default:
561	<	snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
562	<	client->name,
563	<	client->username, client->host);
561	>	snprintf(buf, sizeof(buf), "%s[%s@%s]",
562	>	client_p->name,
563	>	client_p->username, client_p->host);
564		}
565
566	<	return nbuf;
566	>	return buf;
567		}
568
569		void
570		free_exited_clients(void)
571		{
572	<	dlink_node *ptr = NULL, *next = NULL;
573	<
574	<	DLINK_FOREACH_SAFE(ptr, next, dead_list.head)
572	>	dlink_node *node = NULL, *node_next = NULL;
573	>
574	>	DLINK_FOREACH_SAFE(node, node_next, dead_list.head)
575		{
576	<	free_client(ptr->data);
577	<	dlinkDelete(ptr, &dead_list);
578	<	free_dlink_node(ptr);
576	>	free_client(node->data);
577	>	dlinkDelete(node, &dead_list);
578	>	free_dlink_node(node);
579		}
580		}
581
#	Line 686 | Line 586 | free_exited_clients(void)
586		* The only messages generated are QUITs on channels.
587		*/
588		static void
589	<	exit_one_client(struct Client *source_p, const char *quitmsg)
589	>	exit_one_client(struct Client *source_p, const char *comment)
590		{
591	<	dlink_node *lp = NULL, *next_lp = NULL;
591	>	dlink_node *node = NULL, *node_next = NULL;
592
593		assert(!IsMe(source_p));
594	+	assert(source_p != &me);
595
596		if (IsClient(source_p))
597		{
598	<	if (source_p->servptr->serv != NULL)
599	<	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->client_list);
598	>	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->client_list);
599	>	dlinkDelete(&source_p->node, &global_client_list);
600
601		/*
602		* If a person is on a channel, send a QUIT notice
#	Line 703 | Line 604 | exit_one_client(struct Client *source_p,
604		* that the client can show the "**signoff" message).
605		* (Note: The notice is to the local clients *only*)
606		*/
607	<	sendto_common_channels_local(source_p, 0, ":%s!%s@%s QUIT :%s",
607	>	sendto_common_channels_local(source_p, 0, 0, ":%s!%s@%s QUIT :%s",
608		source_p->name, source_p->username,
609	<	source_p->host, quitmsg);
610	<	DLINK_FOREACH_SAFE(lp, next_lp, source_p->channel.head)
611	<	remove_user_from_channel(lp->data);
609	>	source_p->host, comment);
610	>
611	>	DLINK_FOREACH_SAFE(node, node_next, source_p->channel.head)
612	>	remove_user_from_channel(node->data);
613
614	<	add_history(source_p, 0);
615	<	off_history(source_p);
614	>	whowas_add_history(source_p, 0);
615	>	whowas_off_history(source_p);
616
617		watch_check_hash(source_p, RPL_LOGOFF);
618
619		if (MyConnect(source_p))
620		{
621		/* Clean up invitefield */
622	<	DLINK_FOREACH_SAFE(lp, next_lp, source_p->localClient->invited.head)
623	<	del_invite(lp->data, source_p);
622	>	DLINK_FOREACH_SAFE(node, node_next, source_p->connection->invited.head)
623	>	del_invite(node->data, source_p);
624
625		del_all_accepts(source_p);
626		}
#	Line 726 | Line 628 | exit_one_client(struct Client *source_p,
628		else if (IsServer(source_p))
629		{
630		dlinkDelete(&source_p->lnode, &source_p->servptr->serv->server_list);
631	+	dlinkDelete(&source_p->node, &global_client_list);
632
633	<	if ((lp = dlinkFindDelete(&global_serv_list, source_p)) != NULL)
634	<	free_dlink_node(lp);
633	>	if ((node = dlinkFindDelete(&global_server_list, source_p)))
634	>	free_dlink_node(node);
635		}
636
637		/* Remove source_p from the client lists */
638	<	if (HasID(source_p))
638	>	if (source_p->id[0])
639		hash_del_id(source_p);
640	+
641		if (source_p->name[0])
642		hash_del_client(source_p);
643
644		if (IsUserHostIp(source_p))
645		delete_user_host(source_p->username, source_p->host, !MyConnect(source_p));
646
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	–
647		update_client_exit_stats(source_p);
648
649		/* Check to see if the client isn't already on the dead list */
#	Line 757 | Line 654 | exit_one_client(struct Client *source_p,
654		dlinkAdd(source_p, make_dlink_node(), &dead_list);
655		}
656
657	<	/* 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	<	/*
657	>	/*
658		* Remove all clients that depend on source_p; assumes all (S)QUITs have
659	<	* already been sent.  we make sure to exit a server's dependent clients
660	<	* and servers before the server itself; exit_one_client takes care of
659	>	* already been sent.  we make sure to exit a server's dependent clients
660	>	* and servers before the server itself; exit_one_client takes care of
661		* actually removing things off llists.   tweaked from +CSr31  -orabidoo
662		*/
663		static void
664	<	recurse_remove_clients(struct Client *source_p, const char *quitmsg)
664	>	recurse_remove_clients(struct Client *source_p, const char *comment)
665		{
666	<	dlink_node *ptr, *next;
666	>	dlink_node *node = NULL, *node_next = NULL;
667
668	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->client_list.head)
669	<	exit_one_client(ptr->data, quitmsg);
668	>	DLINK_FOREACH_SAFE(node, node_next, source_p->serv->client_list.head)
669	>	exit_one_client(node->data, comment);
670
671	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->server_list.head)
671	>	DLINK_FOREACH_SAFE(node, node_next, source_p->serv->server_list.head)
672		{
673	<	recurse_remove_clients(ptr->data, quitmsg);
674	<	exit_one_client(ptr->data, quitmsg);
673	>	recurse_remove_clients(node->data, comment);
674	>	exit_one_client(node->data, comment);
675		}
676		}
677
678		/*
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	–	/*
679		* exit_client - exit a client of any type. Generally, you can use
680		* this on any struct Client, regardless of its state.
681		*
682		* Note, you shouldn't exit remote _users_ without first doing
683	<	* SetKilled and propagating a kill or similar message. However,
684	<	* it is perfectly correct to call exit_client to force a _server_
683	>	* AddFlag(x, FLAGS_KILLED) and propagating a kill or similar message.
684	>	*
685	>	* However, it is perfectly correct to call exit_client to force a _server_
686		* quit (either local or remote one).
687		*
688	+	*
689		* 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!
690		* output:       none
691		* side effects: the client is delinked from all lists, disconnected,
692		*               and the rest of IRC network is notified of the exit.
693		*               Client memory is scheduled to be freed
694		*/
695		void
696	<	exit_client(struct Client *source_p, struct Client *from, const char *comment)
696	>	exit_client(struct Client *source_p, const char *comment)
697		{
698	<	dlink_node *m = NULL;
698	>	dlink_node *node = NULL;
699	>
700	>	assert(!IsMe(source_p));
701	>	assert(source_p != &me);
702
703		if (MyConnect(source_p))
704		{
#	Line 875 | Line 710 | exit_client(struct Client *source_p, str
710
711		SetClosing(source_p);
712
713	<	if (IsIpHash(source_p))
879	<	remove_one_ip(&source_p->localClient->ip);
880	<
881	<	if (source_p->localClient->auth)
713	>	if (HasFlag(source_p, FLAGS_IPHASH))
714		{
715	<	delete_auth(source_p->localClient->auth);
716	<	source_p->localClient->auth = NULL;
715	>	DelFlag(source_p, FLAGS_IPHASH);
716	>	ipcache_remove_address(&source_p->connection->ip);
717		}
718
719	<	/* This source_p could have status of one of STAT_UNKNOWN, STAT_CONNECTING
719	>	delete_auth(&source_p->connection->auth);
720	>
721	>	/*
722	>	* This source_p could have status of one of STAT_UNKNOWN, STAT_CONNECTING
723		* STAT_HANDSHAKE or STAT_UNKNOWN
724		* all of which are lumped together into unknown_list
725		*
#	Line 894 | Line 729 | exit_client(struct Client *source_p, str
729		{
730		assert(dlinkFind(&unknown_list, source_p));
731
732	<	dlinkDelete(&source_p->localClient->lclient_node, &unknown_list);
732	>	dlinkDelete(&source_p->connection->lclient_node, &unknown_list);
733		}
734		else if (IsClient(source_p))
735		{
736	+	time_t on_for = CurrentTime - source_p->connection->firsttime;
737	+
738		assert(Count.local > 0);
739	<	Count.local--;
739	>	--Count.local;
740
741	<	if (IsOper(source_p))
742	<	{
743	<	if ((m = dlinkFindDelete(&oper_list, source_p)) != NULL)
907	<	free_dlink_node(m);
908	<	}
741	>	if (HasUMode(source_p, UMODE_OPER))
742	>	if ((node = dlinkFindDelete(&oper_list, source_p)))
743	>	free_dlink_node(node);
744
745		assert(dlinkFind(&local_client_list, source_p));
746	<	dlinkDelete(&source_p->localClient->lclient_node, &local_client_list);
746	>	dlinkDelete(&source_p->connection->lclient_node, &local_client_list);
747
748	<	if (source_p->localClient->list_task != NULL)
749	<	free_list_task(source_p->localClient->list_task, source_p);
748	>	if (source_p->connection->list_task)
749	>	free_list_task(source_p);
750
751		watch_del_watch_list(source_p);
752	<	sendto_realops_flags(UMODE_CCONN, L_ALL, "Client exiting: %s (%s@%s) [%s] [%s]",
752	>	sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
753	>	"Client exiting: %s (%s@%s) [%s] [%s]",
754		source_p->name, source_p->username, source_p->host, comment,
755	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
755	>	ConfigGeneral.hide_spoof_ips && IsIPSpoof(source_p) ?
756		"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	–	}
757
758	<	/* As soon as a client is known to be a server of some sort
759	<	* it has to be put on the serv_list, or SJOIN's to this new server
760	<	* from the connect burst will not be seen.
761	<	*/
762	<	if (IsServer(source_p) || IsConnecting(source_p) ||
763	<	IsHandshake(source_p))
758	>	ilog(LOG_TYPE_USER, "%s (%3u:%02u:%02u): %s!%s@%s %llu/%llu",
759	>	myctime(source_p->connection->firsttime), (unsigned int)(on_for / 3600),
760	>	(unsigned int)((on_for % 3600)/60), (unsigned int)(on_for % 60),
761	>	source_p->name, source_p->username, source_p->host,
762	>	source_p->connection->send.bytes>>10,
763	>	source_p->connection->recv.bytes>>10);
764	>	}
765	>	else if (IsServer(source_p))
766		{
767	<	if ((m = dlinkFindDelete(&serv_list, source_p)) != NULL)
768	<	{
940	<	free_dlink_node(m);
941	<	unset_chcap_usage_counts(source_p);
942	<	}
767	>	assert(Count.myserver > 0);
768	>	--Count.myserver;
769
770	<	if (IsServer(source_p))
771	<	Count.myserver--;
770	>	assert(dlinkFind(&local_server_list, source_p));
771	>	dlinkDelete(&source_p->connection->lclient_node, &local_server_list);
772		}
773
948	–	log_user_exit(source_p);
949	–
774		if (!IsDead(source_p))
775		{
776		if (IsServer(source_p))
777		{
778	<	/* for them, we are exiting the network */
779	<	sendto_one(source_p, ":%s SQUIT %s :%s",
780	<	ID_or_name(from, source_p), me.name, comment);
778	>	if (!HasFlag(source_p, FLAGS_SQUIT))
779	>	{
780	>	/* for them, we are exiting the network */
781	>	sendto_one(source_p, ":%s SQUIT %s :%s",
782	>	me.id, me.id, comment);
783	>	}
784		}
785
786		sendto_one(source_p, "ERROR :Closing Link: %s (%s)",
787		source_p->host, comment);
788		}
789
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	–	*/
790		close_connection(source_p);
791		}
792	+	else if (IsClient(source_p) && HasFlag(source_p->servptr, FLAGS_EOB))
793	+	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
794	+	"Client exiting at %s: %s (%s@%s) [%s]",
795	+	source_p->servptr->name, source_p->name,
796	+	source_p->username, source_p->host, comment);
797
798		if (IsServer(source_p))
799		{
800	<	char splitstr[HOSTLEN + HOSTLEN + 2];
800	>	char splitstr[HOSTLEN + HOSTLEN + 2] = "";
801
802		/* This shouldn't ever happen */
803	<	assert(source_p->serv != NULL && source_p->servptr != NULL);
803	>	assert(source_p->serv && source_p->servptr);
804
805		if (ConfigServerHide.hide_servers)
806		/*
807	<	* Set netsplit message to "*.net *.split" to still show
807	>	* Set netsplit message to "*.net *.split" to still show
808		* that its a split, but hide the servers splitting
809		*/
810	<	strcpy(splitstr, "*.net *.split");
810	>	strlcpy(splitstr, "*.net *.split", sizeof(splitstr));
811		else
812		snprintf(splitstr, sizeof(splitstr), "%s %s",
813		source_p->servptr->name, source_p->name);
814
815	<	remove_dependents(source_p, from->from, comment, splitstr);
815	>	/* Send SQUIT for source_p in every direction. source_p is already off of local_server_list here */
816	>	if (!HasFlag(source_p, FLAGS_SQUIT))
817	>	sendto_server(NULL, 0, 0, "SQUIT %s :%s", source_p->id, comment);
818	>
819	>	/* Now exit the clients internally */
820	>	recurse_remove_clients(source_p, splitstr);
821
822	<	if (source_p->servptr == &me)
822	>	if (MyConnect(source_p))
823		{
824	<	sendto_realops_flags(UMODE_ALL, L_ALL,
825	<	"%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
826	<	source_p->name, (int)(CurrentTime - source_p->firsttime),
827	<	source_p->localClient->send.bytes >> 10,
828	<	source_p->localClient->recv.bytes >> 10);
829	<	ilog(L_NOTICE, "%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
830	<	source_p->name, (int)(CurrentTime - source_p->firsttime),
831	<	source_p->localClient->send.bytes >> 10,
832	<	source_p->localClient->recv.bytes >> 10);
833	<	}
834	<	}
835	<	else if (IsClient(source_p) && !IsKilled(source_p))
836	<	{
837	<	sendto_server(from->from, NULL, CAP_TS6, NOCAPS,
838	<	":%s QUIT :%s", ID(source_p), comment);
839	<	sendto_server(from->from, NULL, NOCAPS, CAP_TS6,
840	<	":%s QUIT :%s", source_p->name, comment);
1015	<	}
824	>	int connected = CurrentTime - source_p->connection->firsttime;
825	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
826	>	"%s was connected for %d day%s, %2d:%02d:%02d. %llu/%llu sendK/recvK.",
827	>	source_p->name, connected/86400, (connected/86400 == 1) ? "" : "s",
828	>	(connected % 86400) / 3600, (connected % 3600) / 60, connected % 60,
829	>	source_p->connection->send.bytes >> 10,
830	>	source_p->connection->recv.bytes >> 10);
831	>	ilog(LOG_TYPE_IRCD, "%s was connected for %d day%s, %2d:%02d:%02d. %llu/%llu sendK/recvK.",
832	>	source_p->name, connected/86400, (connected/86400 == 1) ? "" : "s",
833	>	(connected % 86400) / 3600, (connected % 3600) / 60, connected % 60,
834	>	source_p->connection->send.bytes >> 10,
835	>	source_p->connection->recv.bytes >> 10);
836	>	}
837	>	}
838	>	else if (IsClient(source_p) && !HasFlag(source_p, FLAGS_KILLED))
839	>	sendto_server(source_p->from, 0, 0, ":%s QUIT :%s",
840	>	source_p->id, comment);
841
842		/* The client *better* be off all of the lists */
843		assert(dlinkFind(&unknown_list, source_p) == NULL);
844		assert(dlinkFind(&local_client_list, source_p) == NULL);
845	<	assert(dlinkFind(&serv_list, source_p) == NULL);
845	>	assert(dlinkFind(&local_server_list, source_p) == NULL);
846		assert(dlinkFind(&oper_list, source_p) == NULL);
847
848		exit_one_client(source_p, comment);
#	Line 1030 | Line 855 | exit_client(struct Client *source_p, str
855		void
856		dead_link_on_write(struct Client *client_p, int ierrno)
857		{
858	<	dlink_node *ptr;
858	>	dlink_node *node;
859
860		if (IsDefunct(client_p))
861		return;
862
863	<	dbuf_clear(&client_p->localClient->buf_recvq);
864	<	dbuf_clear(&client_p->localClient->buf_sendq);
863	>	dbuf_clear(&client_p->connection->buf_recvq);
864	>	dbuf_clear(&client_p->connection->buf_sendq);
865
866		assert(dlinkFind(&abort_list, client_p) == NULL);
867	<	ptr = make_dlink_node();
867	>	node = make_dlink_node();
868		/* don't let exit_aborted_clients() finish yet */
869	<	dlinkAddTail(client_p, ptr, &abort_list);
869	>	dlinkAddTail(client_p, node, &abort_list);
870
871		if (eac_next == NULL)
872	<	eac_next = ptr;
872	>	eac_next = node;
873
874		SetDead(client_p); /* You are dead my friend */
875		}
#	Line 1056 | Line 881 | dead_link_on_write(struct Client *client
881		void
882		dead_link_on_read(struct Client *client_p, int error)
883		{
884	<	char errmsg[255];
884	>	char errmsg[IRCD_BUFSIZE];
885		int current_error;
886
887		if (IsDefunct(client_p))
888		return;
889
890	<	dbuf_clear(&client_p->localClient->buf_recvq);
891	<	dbuf_clear(&client_p->localClient->buf_sendq);
890	>	dbuf_clear(&client_p->connection->buf_recvq);
891	>	dbuf_clear(&client_p->connection->buf_sendq);
892
893	<	current_error = get_sockerr(client_p->localClient->fd.fd);
893	>	current_error = get_sockerr(client_p->connection->fd.fd);
894
895		if (IsServer(client_p) || IsHandshake(client_p))
896		{
897	<	int connected = CurrentTime - client_p->firsttime;
898	<
897	>	int connected = CurrentTime - client_p->connection->firsttime;
898	>
899		if (error == 0)
900		{
901		/* Admins get the real IP */
902	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
903	<	"Server %s closed the connection",
904	<	get_client_name(client_p, SHOW_IP));
902	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
903	>	"Server %s closed the connection",
904	>	get_client_name(client_p, SHOW_IP));
905
906		/* Opers get a masked IP */
907	<	sendto_realops_flags(UMODE_ALL, L_OPER,
908	<	"Server %s closed the connection",
909	<	get_client_name(client_p, MASK_IP));
907	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
908	>	"Server %s closed the connection",
909	>	get_client_name(client_p, MASK_IP));
910
911	<	ilog(L_NOTICE, "Server %s closed the connection",
912	<	get_client_name(client_p, SHOW_IP));
911	>	ilog(LOG_TYPE_IRCD, "Server %s closed the connection",
912	>	get_client_name(client_p, SHOW_IP));
913		}
914		else
915		{
916		report_error(L_ADMIN, "Lost connection to %s: %s",
917	<	get_client_name(client_p, SHOW_IP), current_error);
917	>	get_client_name(client_p, SHOW_IP), current_error);
918		report_error(L_OPER, "Lost connection to %s: %s",
919	<	get_client_name(client_p, MASK_IP), current_error);
919	>	get_client_name(client_p, MASK_IP), current_error);
920		}
921
922	<	sendto_realops_flags(UMODE_ALL, L_ALL,
923	<	"%s had been connected for %d day%s, %2d:%02d:%02d",
924	<	client_p->name, connected/86400,
925	<	(connected/86400 == 1) ? "" : "s",
926	<	(connected % 86400) / 3600, (connected % 3600) / 60,
927	<	connected % 60);
922	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
923	>	"%s was connected for %d day%s, %2d:%02d:%02d",
924	>	client_p->name, connected/86400,
925	>	(connected/86400 == 1) ? "" : "s",
926	>	(connected % 86400) / 3600, (connected % 3600) / 60,
927	>	connected % 60);
928		}
929
930		if (error == 0)
#	Line 1109 | Line 934 | dead_link_on_read(struct Client *client_
934		snprintf(errmsg, sizeof(errmsg), "Read error: %s",
935		strerror(current_error));
936
937	<	exit_client(client_p, &me, errmsg);
937	>	exit_client(client_p, errmsg);
938		}
939
940		void
#	Line 1126 | Line 951 | exit_aborted_clients(void)
951
952		if (target_p == NULL)
953		{
954	<	sendto_realops_flags(UMODE_ALL, L_ALL,
954	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
955		"Warning: null client on abort_list!");
956		dlinkDelete(ptr, &abort_list);
957		free_dlink_node(ptr);
#	Line 1140 | Line 965 | exit_aborted_clients(void)
965		else
966		notice = "Write error: connection closed";
967
968	<	exit_client(target_p, &me, notice);
968	>	exit_client(target_p, notice);
969		free_dlink_node(ptr);
970		}
971		}
#	Line 1156 | Line 981 | exit_aborted_clients(void)
981		*/
982
983		void
984	<	del_accept(struct split_nuh_item *accept_p, struct Client *client_p)
984	>	del_accept(struct split_nuh_item *accept, struct Client *client_p)
985		{
986	<	dlinkDelete(&accept_p->node, &client_p->localClient->acceptlist);
986	>	dlinkDelete(&accept->node, &client_p->connection->acceptlist);
987
988	<	MyFree(accept_p->nickptr);
989	<	MyFree(accept_p->userptr);
990	<	MyFree(accept_p->hostptr);
991	<	MyFree(accept_p);
988	>	MyFree(accept->nickptr);
989	>	MyFree(accept->userptr);
990	>	MyFree(accept->hostptr);
991	>	MyFree(accept);
992		}
993
994		struct split_nuh_item *
995		find_accept(const char *nick, const char *user,
996	<	const char *host, struct Client *client_p, int do_match)
996	>	const char *host, struct Client *client_p,
997	>	int (*cmpfunc)(const char *, const char *))
998		{
999	<	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;
999	>	dlink_node *node = NULL;
1000
1001	<	DLINK_FOREACH(ptr, client_p->localClient->acceptlist.head)
1001	>	DLINK_FOREACH(node, client_p->connection->acceptlist.head)
1002		{
1003	<	struct split_nuh_item *accept_p = ptr->data;
1003	>	struct split_nuh_item *accept = node->data;
1004
1005	<	if (cmpfunc(accept_p->nickptr, nick) == do_match &&
1006	<	cmpfunc(accept_p->userptr, user) == do_match &&
1007	<	cmpfunc(accept_p->hostptr, host) == do_match)
1008	<	return accept_p;
1005	>	if (!cmpfunc(accept->nickptr, nick) &&
1006	>	!cmpfunc(accept->userptr, user) &&
1007	>	!cmpfunc(accept->hostptr, host))
1008	>	return accept;
1009		}
1010
1011		return NULL;
#	Line 1198 | Line 1022 | int
1022		accept_message(struct Client *source,
1023		struct Client *target)
1024		{
1025	<	dlink_node *ptr = NULL;
1025	>	dlink_node *node = NULL;
1026
1027		if (source == target || find_accept(source->name, source->username,
1028	<	source->host, target, 1))
1028	>	source->host, target, match))
1029		return 1;
1030
1031	<	if (IsSoftCallerId(target))
1032	<	DLINK_FOREACH(ptr, target->channel.head)
1033	<	if (IsMember(source, ((struct Membership *)ptr->data)->chptr))
1031	>	if (!HasUMode(target, UMODE_CALLERID) && HasUMode(target, UMODE_SOFTCALLERID))
1032	>	DLINK_FOREACH(node, target->channel.head)
1033	>	if (IsMember(source, ((struct Membership *)node->data)->chptr))
1034		return 1;
1035
1036		return 0;
#	Line 1221 | Line 1045 | accept_message(struct Client *source,
1045		void
1046		del_all_accepts(struct Client *client_p)
1047		{
1048	<	dlink_node *ptr = NULL, *next_ptr = NULL;
1048	>	dlink_node *node = NULL, *node_next = NULL;
1049
1050	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->acceptlist.head)
1051	<	del_accept(ptr->data, client_p);
1050	>	DLINK_FOREACH_SAFE(node, node_next, client_p->connection->acceptlist.head)
1051	>	del_accept(node->data, client_p);
1052		}
1053
1054	<	/* change_local_nick()
1055	<	*
1232	<	* 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)
1054	>	unsigned int
1055	>	idle_time_get(const struct Client *source_p, const struct Client *target_p)
1056		{
1057	<	int samenick = 0;
1057	>	unsigned int idle = 0;
1058	>	unsigned int min_idle = 0;
1059	>	unsigned int max_idle = 0;
1060	>	const struct ClassItem *const class = get_class_ptr(&target_p->connection->confs);
1061
1062	<	assert(source_p->name[0] && !EmptyString(nick));
1062	>	if (!(class->flags & CLASS_FLAGS_FAKE_IDLE) || target_p == source_p)
1063	>	return CurrentTime - target_p->connection->last_privmsg;
1064
1065	<	/*
1066	<	* Client just changing his/her nick. If he/she is
1067	<	* 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);
1065	>	if (HasUMode(source_p, UMODE_OPER) &&
1066	>	!(class->flags & CLASS_FLAGS_HIDE_IDLE_FROM_OPERS))
1067	>	return CurrentTime - target_p->connection->last_privmsg;
1068
1069	<	if (!samenick)
1070	<	{
1266	<	source_p->tsinfo = CurrentTime;
1267	<	clear_ban_cache_client(source_p);
1268	<	watch_check_hash(source_p, RPL_LOGOFF);
1069	>	min_idle = class->min_idle;
1070	>	max_idle = class->max_idle;
1071
1072	<	if (HasUMode(source_p, UMODE_REGISTERED))
1073	<	{
1272	<	unsigned int oldmodes = source_p->umodes;
1273	<	char modebuf[IRCD_BUFSIZE] = { '\0' };
1072	>	if (min_idle == max_idle)
1073	>	return min_idle;
1074
1075	<	DelUMode(source_p, UMODE_REGISTERED);
1076	<	send_umode(source_p, source_p, oldmodes, 0xffffffff, modebuf);
1077	<	}
1078	<	}
1279	<
1280	<	/* XXX - the format of this notice should eventually be changed
1281	<	* to either %s[%s@%s], or even better would be get_client_name() -bill
1282	<	*/
1283	<	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);
1075	>	if (class->flags & CLASS_FLAGS_RANDOM_IDLE)
1076	>	idle = genrand_int32();
1077	>	else
1078	>	idle = CurrentTime - target_p->connection->last_privmsg;
1079
1080	<	sendto_server(client_p, NULL, CAP_TS6, NOCAPS,
1081	<	":%s NICK %s :%lu",
1082	<	ID(source_p), nick, (unsigned long)source_p->tsinfo);
1083	<	sendto_server(client_p, NULL, NOCAPS, CAP_TS6,
1294	<	":%s NICK %s :%lu",
1295	<	source_p->name, nick, (unsigned long)source_p->tsinfo);
1080	>	if (!max_idle)
1081	>	idle = 0;
1082	>	else
1083	>	idle %= max_idle;
1084
1085	<	hash_del_client(source_p);
1086	<	strcpy(source_p->name, nick);
1299	<	hash_add_client(source_p);
1085	>	if (idle < min_idle)
1086	>	idle = min_idle + (idle % (max_idle - min_idle));
1087
1088	<	if (!samenick)
1089	<	watch_check_hash(source_p, RPL_LOGON);
1088	>	return idle;
1089	>	}
1090
1091	<	/* fd_desc is long enough */
1092	<	fd_note(&client_p->localClient->fd, "Nick: %s", nick);
1093	<	}
1094	<	else
1095	<	sendto_one(source_p, form_str(ERR_NICKTOOFAST),
1096	<	me.name, source_p->name, source_p->name,
1097	<	nick, ConfigFileEntry.max_nick_time);
1091	>	/* client_init()
1092	>	*
1093	>	* inputs       - NONE
1094	>	* output       - NONE
1095	>	* side effects - initialize client free memory
1096	>	*/
1097	>	void
1098	>	client_init(void)
1099	>	{
1100	>	static struct event event_ping =
1101	>	{
1102	>	.name = "check_pings",
1103	>	.handler = check_pings,
1104	>	.when = 5
1105	>	};
1106	>
1107	>	client_pool = mp_pool_new(sizeof(struct Client), MP_CHUNK_SIZE_CLIENT);
1108	>	connection_pool = mp_pool_new(sizeof(struct Connection), MP_CHUNK_SIZE_CONNECTION);
1109	>	event_add(&event_ping, NULL);
1110		}

Diff Legend

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