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 1549 by michael, Mon Oct 1 18:11:11 2012 UTC vs.
ircd-hybrid/trunk/src/client.c (file contents), Revision 4975 by michael, Mon Dec 1 19:54:35 2014 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  client.c: Controls clients.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2002 by the past and present ircd coders, and others.
4	>	*  Copyright (c) 1997-2014 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 16 | Line 15
15		*
16		*  You should have received a copy of the GNU General Public License
17		*  along with this program; if not, write to the Free Software
18	<	*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
18	>	*  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
19		*  USA
20	<	*
21	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file client.c
23	>	* \brief Controls clients.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
28		#include "list.h"
29		#include "client.h"
28	–	#include "channel_mode.h"
30		#include "event.h"
30	–	#include "fdlist.h"
31		#include "hash.h"
32		#include "irc_string.h"
33		#include "ircd.h"
34	–	#include "s_gline.h"
34		#include "numeric.h"
35	<	#include "packet.h"
37	<	#include "s_auth.h"
35	>	#include "auth.h"
36		#include "s_bsd.h"
37		#include "conf.h"
38		#include "log.h"
39	<	#include "s_misc.h"
40	<	#include "s_serv.h"
39	>	#include "misc.h"
40	>	#include "server.h"
41		#include "send.h"
42		#include "whowas.h"
43	<	#include "s_user.h"
46	<	#include "dbuf.h"
43	>	#include "user.h"
44		#include "memory.h"
45	+	#include "mempool.h"
46		#include "hostmask.h"
49	–	#include "balloc.h"
47		#include "listener.h"
51	–	#include "irc_res.h"
48		#include "userhost.h"
49		#include "watch.h"
50	+	#include "rng_mt.h"
51	+	#include "parse.h"
52	+	#include "ipcache.h"
53
55	–	dlink_list listing_client_list = { NULL, NULL, 0 };
56	–	/* Pointer to beginning of Client list */
57	–	dlink_list global_client_list = {NULL, NULL, 0};
58	–	/* unknown/client pointer lists */
59	–	dlink_list unknown_list = {NULL, NULL, 0};
60	–	dlink_list local_client_list = {NULL, NULL, 0};
61	–	dlink_list serv_list = {NULL, NULL, 0};
62	–	dlink_list global_serv_list = {NULL, NULL, 0};
63	–	dlink_list oper_list = {NULL, NULL, 0};
64	–
65	–	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
75	–	static void check_pings_list(dlink_list *);
76	–	static void check_unknowns_list(void);
77	–	static void ban_them(struct Client *, struct ConfItem *);
78	–
79	–
80	–	/* init_client()
81	–	*
82	–	* inputs       - NONE
83	–	* output       - NONE
84	–	* side effects - initialize client free memory
85	–	*/
86	–	void
87	–	init_client(void)
88	–	{
89	–	/* start off the check ping event ..  -- adrian
90	–	* Every 30 seconds is plenty -- db
91	–	*/
92	–	client_heap = BlockHeapCreate("client", sizeof(struct Client), CLIENT_HEAP_SIZE);
93	–	lclient_heap = BlockHeapCreate("local client", sizeof(struct LocalUser), LCLIENT_HEAP_SIZE);
94	–	eventAdd("check_pings", check_pings, NULL, 5);
95	–	}
67
68		/*
69		* make_client - create a new Client struct and set it to initial state.
#	Line 112 | Line 83 | init_client(void)
83		struct Client *
84		make_client(struct Client *from)
85		{
86	<	struct Client *client_p = BlockHeapAlloc(client_heap);
86	>	struct Client *client_p = mp_pool_get(client_pool);
87
88	<	if (from == NULL)
88	>	if (!from)
89		{
90		client_p->from                      = client_p; /* 'from' of local client is self! */
91	<	client_p->localClient               = BlockHeapAlloc(lclient_heap);
92	<	client_p->localClient->since        = CurrentTime;
93	<	client_p->localClient->lasttime     = CurrentTime;
94	<	client_p->localClient->firsttime    = CurrentTime;
95	<	client_p->localClient->registration = REG_INIT;
91	>	client_p->connection               = mp_pool_get(connection_pool);
92	>	client_p->connection->since        = CurrentTime;
93	>	client_p->connection->lasttime     = CurrentTime;
94	>	client_p->connection->firsttime    = CurrentTime;
95	>	client_p->connection->registration = REG_INIT;
96
97		/* as good a place as any... */
98	<	dlinkAdd(client_p, &client_p->localClient->lclient_node, &unknown_list);
98	>	dlinkAdd(client_p, &client_p->connection->lclient_node, &unknown_list);
99		}
100		else
101		client_p->from = from; /* 'from' of local client is self! */
102
103		client_p->idhnext = client_p;
104		client_p->hnext  = client_p;
105	<	client_p->status = STAT_UNKNOWN;
105	>	SetUnknown(client_p);
106		strcpy(client_p->username, "unknown");
107	+	strcpy(client_p->account, "0");
108
109		return client_p;
110		}
#	Line 147 | Line 119 | make_client(struct Client *from)
119		static void
120		free_client(struct Client *client_p)
121		{
122	<	assert(client_p != NULL);
122	>	assert(client_p);
123		assert(client_p != &me);
124		assert(client_p->hnext == client_p);
125		assert(client_p->idhnext == client_p);
126		assert(client_p->channel.head == NULL);
127		assert(dlink_list_length(&client_p->channel) == 0);
128		assert(dlink_list_length(&client_p->whowas) == 0);
129	<	assert(!IsServer(client_p) || IsServer(client_p) && client_p->serv);
129	>	assert(!IsServer(client_p) || client_p->serv);
130
131		MyFree(client_p->serv);
132	+	MyFree(client_p->certfp);
133
134		if (MyConnect(client_p))
135		{
136	<	assert(client_p->localClient->invited.head == NULL);
137	<	assert(dlink_list_length(&client_p->localClient->invited) == 0);
138	<	assert(dlink_list_length(&client_p->localClient->watches) == 0);
136	>	assert(client_p->connection->invited.head == NULL);
137	>	assert(dlink_list_length(&client_p->connection->invited) == 0);
138	>	assert(dlink_list_length(&client_p->connection->watches) == 0);
139		assert(IsClosing(client_p) && IsDead(client_p));
140
141	<	MyFree(client_p->localClient->response);
142	<	MyFree(client_p->localClient->auth_oper);
141	>	MyFree(client_p->connection->challenge_response);
142	>	MyFree(client_p->connection->challenge_operator);
143	>	client_p->connection->challenge_response = NULL;
144	>	client_p->connection->challenge_operator = NULL;
145
146		/*
147	<	* clean up extra sockets from P-lines which have been discarded.
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 &&
178	<	!client_p->localClient->listener->active)
179	<	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);
189	<	}
190	<
191	<	/*
192	<	* check_pings - go through the local client list and check activity
193	<	* kill off stuff that should die
194	<	*
195	<	* inputs       - NOT USED (from event)
196	<	* output       - next time_t when check_pings() should be called again
197	<	* side effects -
198	<	*
199	<	*
200	<	* A PING can be sent to clients as necessary.
201	<	*
202	<	* Client/Server ping outs are handled.
203	<	*/
204	<
205	<	/*
206	<	* Addon from adrian. We used to call this after nextping seconds,
207	<	* however I've changed it to run once a second. This is only for
208	<	* PING timeouts, not K/etc-line checks (thanks dianora!). Having it
209	<	* run once a second makes life a lot easier - when a new client connects
210	<	* and they need a ping in 4 seconds, if nextping was set to 20 seconds
211	<	* we end up waiting 20 seconds. This is stupid. :-)
212	<	* I will optimise (hah!) check_pings() once I've finished working on
213	<	* tidying up other network IO evilnesses.
214	<	*     -- adrian
215	<	*/
216	<
217	<	static void
218	<	check_pings(void *notused)
219	<	{
220	<	check_pings_list(&local_client_list);
221	<	check_pings_list(&serv_list);
222	<	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 */
237	<	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
243	–	/*
244	–	** Note: No need to notify opers here. It's
245	–	** already done when "FLAGS_DEADSOCKET" is set.
246	–	*/
181		if (IsDead(client_p))
182	<	{
249	<	/* Ignore it, its been exited already */
250	<	continue;
251	<	}
182	>	continue;  /* Ignore it, its been exited already */
183
184		if (!IsRegistered(client_p))
185	<	ping = CONNECTTIMEOUT, 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->localClient->lasttime)
189	>	if (ping < CurrentTime - client_p->connection->lasttime)
190		{
191		if (!IsPingSent(client_p))
192		{
193	<	/*
194	<	* if we havent PINGed the connection and we havent
195	<	* heard from it in a while, PING it to make sure
196	<	* it is still alive.
197	<	*/
198	<	SetPingSent(client_p);
199	<	ClearPingWarning(client_p);
200	<	client_p->localClient->lasttime = CurrentTime - ping;
270	<	sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
193	>	/*
194	>	* If we haven't PINGed the connection and we haven't
195	>	* heard from it in a while, PING it to make sure
196	>	* it is still alive.
197	>	*/
198	>	SetPingSent(client_p);
199	>	client_p->connection->lasttime = CurrentTime - ping;
200	>	sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
201		}
202		else
203		{
204	<	if (CurrentTime - client_p->localClient->lasttime >= 2 * ping)
204	>	if (CurrentTime - client_p->connection->lasttime >= 2 * ping)
205		{
206		/*
207		* If the client/server hasn't talked to us in 2*ping seconds
208		* and it has a ping time, then close its connection.
209		*/
210		if (IsServer(client_p) || IsHandshake(client_p))
211	<	{
212	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
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(LOG_TYPE_IRCD, "No response from %s, closing link",
219	<	get_client_name(client_p, HIDE_IP));
220	<	}
221	<
222	<	snprintf(scratch, sizeof(scratch), "Ping timeout: %d seconds",
223	<	(int)(CurrentTime - client_p->localClient->lasttime));
224	<	exit_client(client_p, &me, scratch);
295	<	}
296	<	else if (!IsPingWarning(client_p) && pingwarn > 0 &&
297	<	(IsServer(client_p) || IsHandshake(client_p)) &&
298	<	CurrentTime - client_p->localClient->lasttime >= ping + pingwarn)
299	<	{
300	<	/*
301	<	* If the server hasn't replied in pingwarn seconds after sending
302	<	* the PING, notify the opers so that they are aware of the problem.
303	<	*/
304	<	SetPingWarning(client_p);
305	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
306	<	"Warning, no response from %s in %d seconds",
307	<	get_client_name(client_p, HIDE_IP), pingwarn);
308	<	sendto_realops_flags(UMODE_ALL, L_OPER,
309	<	"Warning, no response from %s in %d seconds",
310	<	get_client_name(client_p, MASK_IP), pingwarn);
311	<	ilog(LOG_TYPE_IRCD, "No response from %s in %d seconds",
312	<	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 325 | Line 237 | check_pings_list(dlink_list *list)
237		static void
238		check_unknowns_list(void)
239		{
240	<	dlink_node *ptr, *next_ptr;
240	>	dlink_node *node = NULL, *node_next = NULL;
241
242	<	DLINK_FOREACH_SAFE(ptr, next_ptr, unknown_list.head)
242	>	DLINK_FOREACH_SAFE(node, node_next, unknown_list.head)
243		{
244	<	struct Client *client_p = ptr->data;
244	>	struct Client *client_p = node->data;
245
246		/*
247		* Check UNKNOWN connections - if they have been in this state
248		* for > 30s, close them.
249		*/
250	<	if (IsAuthFinished(client_p) && (CurrentTime - client_p->localClient->firsttime) > 30)
251	<	exit_client(client_p, &me, "Registration timed out");
250	>	if (IsAuthFinished(client_p) && (CurrentTime - client_p->connection->firsttime) > 30)
251	>	exit_client(client_p, "Registration timed out");
252		}
253		}
254
255	+	/*
256	+	* check_pings - go through the local client list and check activity
257	+	* kill off stuff that should die
258	+	*
259	+	* inputs       - NOT USED (from event)
260	+	* output       - next time_t when check_pings() should be called again
261	+	* side effects -
262	+	*
263	+	*
264	+	* A PING can be sent to clients as necessary.
265	+	*
266	+	* Client/Server ping outs are handled.
267	+	*/
268	+
269	+	/*
270	+	* Addon from adrian. We used to call this after nextping seconds,
271	+	* however I've changed it to run once a second. This is only for
272	+	* PING timeouts, not K/etc-line checks (thanks dianora!). Having it
273	+	* run once a second makes life a lot easier - when a new client connects
274	+	* and they need a ping in 4 seconds, if nextping was set to 20 seconds
275	+	* we end up waiting 20 seconds. This is stupid. :-)
276	+	* I will optimise (hah!) check_pings() once I've finished working on
277	+	* tidying up other network IO evilnesses.
278	+	*     -- adrian
279	+	*/
280	+
281	+	static void
282	+	check_pings(void *unused)
283	+	{
284	+	check_pings_list(&local_client_list);
285	+	check_pings_list(&local_server_list);
286	+	check_unknowns_list();
287	+	}
288	+
289		/* check_conf_klines()
290		*
291		* inputs       - NONE
#	Line 347 | 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;
355	<	struct ConfItem *conf = NULL;
356	<	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	<	*/
364	<	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,
369	<	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)
372	<	continue;
373	<
374	<	conf = unmap_conf_item(aconf);
375	<	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",
386	<	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 */
393	<	continue;
394	<	}
395	<
396	<	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 */
400	<	if (IsExemptKline(client_p))
401	<	{
402	<	sendto_realops_flags(UMODE_ALL, L_ALL,
403	<	"KLINE over-ruled for %s, client is kline_exempt",
404	<	get_client_name(client_p, HIDE_IP));
405	<	continue;
406	<	}
407	<
408	<	conf = unmap_conf_item(aconf);
409	<	ban_them(client_p, conf);
410	<	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,
415	<	NULL, NULL, 0)) != NULL ||
416	<	(conf = find_matching_name_conf(RXLINE_TYPE, client_p->info,
417	<	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;
434	<
435	<	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 */
452	<	struct AccessItem *aconf = NULL;
453	<	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 459 | 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;
465	–	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;
469	–	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;
473	–	aconf = map_to_conf(conf);
407		break;
408	<	case RXLINE_TYPE:
476	<	case XLINE_TYPE:
408	>	case CONF_XLINE:
409		type_string = xline_string;
410	<	xconf = map_to_conf(conf);
479	<	++xconf->count;
410	>	++conf->count;
411		break;
412		default:
413		assert(0);
414		break;
415		}
416
417	<	if (aconf != NULL)
487	<	user_reason = aconf->reason ? aconf->reason : type_string;
488	<	if (xconf != NULL)
489	<	user_reason = xconf->reason ? xconf->reason : type_string;
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),
496	<	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, user_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 517 | Line 444 | update_client_exit_stats(struct Client *
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 531 | Line 459 | update_client_exit_stats(struct Client *
459		* side effects - find person by (nick)name
460		*/
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	<	{
542	<	/* invisible users shall not be found by UID guessing */
543	<	if (HasUMode(c2ptr, UMODE_INVISIBLE) && !IsServer(client_p))
544	<	c2ptr = NULL;
545	<	}
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
557	<	*      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);
563	<
564	<	if (chasing)
565	<	*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),
578	<	me.name, source_p->name, user);
497	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHNICK, name);
498		return NULL;
499		}
500
501	<	if (chasing)
583	<	*chasing = 1;
584	<
585	<	return who;
501	>	return target_p;
502		}
503
504		/*
#	Line 594 | 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, enum addr_mask_type type)
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 (!MyConnect(client))
530	<	return client->name;
529	>	if (!MyConnect(client_p))
530	>	return client_p->name;
531
532	<	if (IsServer(client) || IsConnecting(client) || IsHandshake(client))
532	>	if (IsServer(client_p) || IsConnecting(client_p) || IsHandshake(client_p))
533		{
534	<	if (!irccmp(client->name, client->host))
535	<	return client->name;
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
624	–	if (ConfigFileEntry.hide_spoof_ips)
625	–	if (type == SHOW_IP && IsIPSpoof(client))
626	–	type = MASK_IP;
627	–
540		/* And finally, let's get the host information, ip or name */
541		switch (type)
542		{
543		case SHOW_IP:
544	<	snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
545	<	client->name,
546	<	client->username, client->sockhost);
544	>	snprintf(buf, sizeof(buf), "%s[%s@%s]",
545	>	client_p->name,
546	>	client_p->username, client_p->sockhost);
547		break;
548		case MASK_IP:
549	<	if (client->localClient->aftype == AF_INET)
550	<	snprintf(nbuf, sizeof(nbuf), "%s[%s@255.255.255.255]",
551	<	client->name, client->username);
549	>	if (client_p->connection->aftype == AF_INET)
550	>	snprintf(buf, sizeof(buf), "%s[%s@255.255.255.255]",
551	>	client_p->name, client_p->username);
552		else
553	<	snprintf(nbuf, sizeof(nbuf), "%s[%s@ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]",
554	<	client->name, client->username);
553	>	snprintf(buf, sizeof(buf), "%s[%s@ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]",
554	>	client_p->name, client_p->username);
555		break;
556		default:
557	<	snprintf(nbuf, sizeof(nbuf), "%s[%s@%s]",
558	<	client->name,
559	<	client->username, client->host);
557	>	snprintf(buf, sizeof(buf), "%s[%s@%s]",
558	>	client_p->name,
559	>	client_p->username, client_p->host);
560		}
561
562	<	return nbuf;
562	>	return buf;
563		}
564
565		void
566		free_exited_clients(void)
567		{
568	<	dlink_node *ptr = NULL, *next = NULL;
569	<
570	<	DLINK_FOREACH_SAFE(ptr, next, dead_list.head)
568	>	dlink_node *node = NULL, *node_next = NULL;
569	>
570	>	DLINK_FOREACH_SAFE(node, node_next, dead_list.head)
571		{
572	<	free_client(ptr->data);
573	<	dlinkDelete(ptr, &dead_list);
574	<	free_dlink_node(ptr);
572	>	free_client(node->data);
573	>	dlinkDelete(node, &dead_list);
574	>	free_dlink_node(node);
575		}
576		}
577
#	Line 670 | Line 582 | free_exited_clients(void)
582		* The only messages generated are QUITs on channels.
583		*/
584		static void
585	<	exit_one_client(struct Client *source_p, const char *quitmsg)
585	>	exit_one_client(struct Client *source_p, const char *comment)
586		{
587	<	dlink_node *lp = NULL, *next_lp = NULL;
587	>	dlink_node *node = NULL, *node_next = NULL;
588
589		assert(!IsMe(source_p));
590	+	assert(source_p != &me);
591
592		if (IsClient(source_p))
593		{
594	<	if (source_p->servptr->serv != NULL)
595	<	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->client_list);
594	>	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->client_list);
595	>	dlinkDelete(&source_p->node, &global_client_list);
596
597		/*
598		* If a person is on a channel, send a QUIT notice
#	Line 687 | Line 600 | exit_one_client(struct Client *source_p,
600		* that the client can show the "**signoff" message).
601		* (Note: The notice is to the local clients *only*)
602		*/
603	<	sendto_common_channels_local(source_p, 0, ":%s!%s@%s QUIT :%s",
603	>	sendto_common_channels_local(source_p, 0, 0, ":%s!%s@%s QUIT :%s",
604		source_p->name, source_p->username,
605	<	source_p->host, quitmsg);
693	<	DLINK_FOREACH_SAFE(lp, next_lp, source_p->channel.head)
694	<	remove_user_from_channel(lp->data);
605	>	source_p->host, comment);
606
607	<	add_history(source_p, 0);
608	<	off_history(source_p);
607	>	DLINK_FOREACH_SAFE(node, node_next, source_p->channel.head)
608	>	remove_user_from_channel(node->data);
609	>
610	>	whowas_add_history(source_p, 0);
611	>	whowas_off_history(source_p);
612
613		watch_check_hash(source_p, RPL_LOGOFF);
614
615		if (MyConnect(source_p))
616		{
617		/* Clean up invitefield */
618	<	DLINK_FOREACH_SAFE(lp, next_lp, source_p->localClient->invited.head)
619	<	del_invite(lp->data, source_p);
618	>	DLINK_FOREACH_SAFE(node, node_next, source_p->connection->invited.head)
619	>	del_invite(node->data, source_p);
620
621		del_all_accepts(source_p);
622		}
#	Line 710 | Line 624 | exit_one_client(struct Client *source_p,
624		else if (IsServer(source_p))
625		{
626		dlinkDelete(&source_p->lnode, &source_p->servptr->serv->server_list);
627	+	dlinkDelete(&source_p->node, &global_client_list);
628
629	<	if ((lp = dlinkFindDelete(&global_serv_list, source_p)) != NULL)
630	<	free_dlink_node(lp);
629	>	if ((node = dlinkFindDelete(&global_server_list, source_p)))
630	>	free_dlink_node(node);
631		}
632
633		/* Remove source_p from the client lists */
634	<	if (HasID(source_p))
634	>	if (source_p->id[0])
635		hash_del_id(source_p);
636	+
637		if (source_p->name[0])
638		hash_del_client(source_p);
639
640		if (IsUserHostIp(source_p))
641		delete_user_host(source_p->username, source_p->host, !MyConnect(source_p));
642
727	–	/* remove from global client list
728	–	* NOTE: source_p->node.next cannot be NULL if the client is added
729	–	*       to global_client_list (there is always &me at its end)
730	–	*/
731	–	if (source_p != NULL && source_p->node.next != NULL)
732	–	dlinkDelete(&source_p->node, &global_client_list);
733	–
643		update_client_exit_stats(source_p);
644
645		/* Check to see if the client isn't already on the dead list */
#	Line 741 | Line 650 | exit_one_client(struct Client *source_p,
650		dlinkAdd(source_p, make_dlink_node(), &dead_list);
651		}
652
653	<	/* Recursively send QUITs and SQUITs for source_p and all its dependent clients
745	<	* and servers to those servers that need them.  A server needs the client
746	<	* QUITs if it can't figure them out from the SQUIT (ie pre-TS4) or if it
747	<	* isn't getting the SQUIT because of @#(*&@)# hostmasking.  With TS4, once
748	<	* a link gets a SQUIT, it doesn't need any QUIT/SQUITs for clients depending
749	<	* on that one -orabidoo
750	<	*
751	<	* This is now called on each local server -adx
752	<	*/
753	<	static void
754	<	recurse_send_quits(struct Client *original_source_p, struct Client *source_p,
755	<	struct Client *from, struct Client *to, const char *comment,
756	<	const char *splitstr)
757	<	{
758	<	dlink_node *ptr, *next;
759	<	struct Client *target_p;
760	<
761	<	assert(to != source_p);  /* should be already removed from serv_list */
762	<
763	<	/* If this server can handle quit storm (QS) removal
764	<	* of dependents, just send the SQUIT
765	<	*/
766	<	if (!IsCapable(to, CAP_QS))
767	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->client_list.head)
768	<	{
769	<	target_p = ptr->data;
770	<	sendto_one(to, ":%s QUIT :%s", target_p->name, splitstr);
771	<	}
772	<
773	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->server_list.head)
774	<	recurse_send_quits(original_source_p, ptr->data, from, to,
775	<	comment, splitstr);
776	<
777	<	if ((source_p == original_source_p && to != from) ||
778	<	!IsCapable(to, CAP_QS))
779	<	{
780	<	/* don't use a prefix here - we have to be 100% sure the message
781	<	* will be accepted without Unknown prefix etc.. */
782	<	sendto_one(to, "SQUIT %s :%s", ID_or_name(source_p, to), comment);
783	<	}
784	<	}
785	<
786	<	/*
653	>	/*
654		* Remove all clients that depend on source_p; assumes all (S)QUITs have
655	<	* already been sent.  we make sure to exit a server's dependent clients
656	<	* and servers before the server itself; exit_one_client takes care of
655	>	* already been sent.  we make sure to exit a server's dependent clients
656	>	* and servers before the server itself; exit_one_client takes care of
657		* actually removing things off llists.   tweaked from +CSr31  -orabidoo
658		*/
659		static void
660	<	recurse_remove_clients(struct Client *source_p, const char *quitmsg)
660	>	recurse_remove_clients(struct Client *source_p, const char *comment)
661		{
662	<	dlink_node *ptr, *next;
662	>	dlink_node *node = NULL, *node_next = NULL;
663
664	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->client_list.head)
665	<	exit_one_client(ptr->data, quitmsg);
664	>	DLINK_FOREACH_SAFE(node, node_next, source_p->serv->client_list.head)
665	>	exit_one_client(node->data, comment);
666
667	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->server_list.head)
667	>	DLINK_FOREACH_SAFE(node, node_next, source_p->serv->server_list.head)
668		{
669	<	recurse_remove_clients(ptr->data, quitmsg);
670	<	exit_one_client(ptr->data, quitmsg);
669	>	recurse_remove_clients(node->data, comment);
670	>	exit_one_client(node->data, comment);
671		}
672		}
673
674		/*
808	–	** Remove *everything* that depends on source_p, from all lists, and sending
809	–	** all necessary QUITs and SQUITs.  source_p itself is still on the lists,
810	–	** and its SQUITs have been sent except for the upstream one  -orabidoo
811	–	*/
812	–	static void
813	–	remove_dependents(struct Client *source_p, struct Client *from,
814	–	const char *comment, const char *splitstr)
815	–	{
816	–	dlink_node *ptr = NULL;
817	–
818	–	DLINK_FOREACH(ptr, serv_list.head)
819	–	recurse_send_quits(source_p, source_p, from, ptr->data,
820	–	comment, splitstr);
821	–
822	–	recurse_remove_clients(source_p, splitstr);
823	–	}
824	–
825	–	/*
675		* exit_client - exit a client of any type. Generally, you can use
676		* this on any struct Client, regardless of its state.
677		*
678		* Note, you shouldn't exit remote _users_ without first doing
679		* AddFlag(x, FLAGS_KILLED) and propagating a kill or similar message.
680	+	*
681		* However, it is perfectly correct to call exit_client to force a _server_
682		* quit (either local or remote one).
683		*
684	+	*
685		* inputs:       - a client pointer that is going to be exited
835	–	*               - for servers, the second argument is a pointer to who
836	–	*                 is firing the server. This side won't get any generated
837	–	*                 messages. NEVER NULL!
686		* output:       none
687		* side effects: the client is delinked from all lists, disconnected,
688		*               and the rest of IRC network is notified of the exit.
689		*               Client memory is scheduled to be freed
690		*/
691		void
692	<	exit_client(struct Client *source_p, struct Client *from, const char *comment)
692	>	exit_client(struct Client *source_p, const char *comment)
693		{
694	<	dlink_node *m = NULL;
694	>	dlink_node *node = NULL;
695	>
696	>	assert(!IsMe(source_p));
697	>	assert(source_p != &me);
698
699		if (MyConnect(source_p))
700		{
#	Line 855 | Line 706 | exit_client(struct Client *source_p, str
706
707		SetClosing(source_p);
708
709	<	if (IsIpHash(source_p))
859	<	remove_one_ip(&source_p->localClient->ip);
860	<
861	<	if (source_p->localClient->auth)
709	>	if (HasFlag(source_p, FLAGS_IPHASH))
710		{
711	<	delete_auth(source_p->localClient->auth);
712	<	source_p->localClient->auth = NULL;
711	>	DelFlag(source_p, FLAGS_IPHASH);
712	>	ipcache_remove_address(&source_p->connection->ip);
713		}
714
715	<	/* This source_p could have status of one of STAT_UNKNOWN, STAT_CONNECTING
715	>	delete_auth(&source_p->connection->auth);
716	>
717	>	/*
718	>	* This source_p could have status of one of STAT_UNKNOWN, STAT_CONNECTING
719		* STAT_HANDSHAKE or STAT_UNKNOWN
720		* all of which are lumped together into unknown_list
721		*
#	Line 874 | Line 725 | exit_client(struct Client *source_p, str
725		{
726		assert(dlinkFind(&unknown_list, source_p));
727
728	<	dlinkDelete(&source_p->localClient->lclient_node, &unknown_list);
728	>	dlinkDelete(&source_p->connection->lclient_node, &unknown_list);
729		}
730		else if (IsClient(source_p))
731		{
732	<	time_t on_for = CurrentTime - source_p->localClient->firsttime;
732	>	time_t on_for = CurrentTime - source_p->connection->firsttime;
733	>
734		assert(Count.local > 0);
735	<	Count.local--;
735	>	--Count.local;
736
737		if (HasUMode(source_p, UMODE_OPER))
738	<	{
739	<	if ((m = dlinkFindDelete(&oper_list, source_p)) != NULL)
888	<	free_dlink_node(m);
889	<	}
738	>	if ((node = dlinkFindDelete(&oper_list, source_p)))
739	>	free_dlink_node(node);
740
741		assert(dlinkFind(&local_client_list, source_p));
742	<	dlinkDelete(&source_p->localClient->lclient_node, &local_client_list);
742	>	dlinkDelete(&source_p->connection->lclient_node, &local_client_list);
743
744	<	if (source_p->localClient->list_task != NULL)
745	<	free_list_task(source_p->localClient->list_task, source_p);
744	>	if (source_p->connection->list_task)
745	>	free_list_task(source_p);
746
747		watch_del_watch_list(source_p);
748	<	sendto_realops_flags(UMODE_CCONN, L_ALL, "Client exiting: %s (%s@%s) [%s] [%s]",
748	>	sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
749	>	"Client exiting: %s (%s@%s) [%s] [%s]",
750		source_p->name, source_p->username, source_p->host, comment,
751	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
752	<	"255.255.255.255" : source_p->sockhost);
902	<	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL, "CLIEXIT: %s %s %s %s 0 %s",
903	<	source_p->name,
904	<	source_p->username,
905	<	source_p->host,
906	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
907	<	"255.255.255.255" : source_p->sockhost,
908	<	comment);
751	>	source_p->sockhost);
752	>
753		ilog(LOG_TYPE_USER, "%s (%3u:%02u:%02u): %s!%s@%s %llu/%llu",
754	<	myctime(source_p->localClient->firsttime), (unsigned int)(on_for / 3600),
754	>	myctime(source_p->connection->firsttime), (unsigned int)(on_for / 3600),
755		(unsigned int)((on_for % 3600)/60), (unsigned int)(on_for % 60),
756		source_p->name, source_p->username, source_p->host,
757	<	source_p->localClient->send.bytes>>10,
758	<	source_p->localClient->recv.bytes>>10);
757	>	source_p->connection->send.bytes>>10,
758	>	source_p->connection->recv.bytes>>10);
759		}
760	<
917	<	/* As soon as a client is known to be a server of some sort
918	<	* it has to be put on the serv_list, or SJOIN's to this new server
919	<	* from the connect burst will not be seen.
920	<	* XXX - TBV.  This is not true. The only place where we put a server on
921	<	* serv_list is in server_estab right now after registration process.
922	<	* And only after this, a burst is sent to the remote server, i.e. we never
923	<	* send a burst to STAT_CONNECTING, or STAT_HANDSHAKE. This will need
924	<	* more investigation later on, but for now, it's not a problem after all.
925	<	*/
926	<	if (IsServer(source_p) || IsConnecting(source_p) ||
927	<	IsHandshake(source_p))
760	>	else if (IsServer(source_p))
761		{
762	<	if (dlinkFind(&serv_list, source_p))
763	<	{
931	<	dlinkDelete(&source_p->localClient->lclient_node, &serv_list);
932	<	unset_chcap_usage_counts(source_p);
933	<	}
762	>	assert(Count.myserver > 0);
763	>	--Count.myserver;
764
765	<	if (IsServer(source_p))
766	<	Count.myserver--;
765	>	assert(dlinkFind(&local_server_list, source_p));
766	>	dlinkDelete(&source_p->connection->lclient_node, &local_server_list);
767		}
768
769		if (!IsDead(source_p))
770		{
771		if (IsServer(source_p))
772		{
773	<	/* for them, we are exiting the network */
774	<	sendto_one(source_p, ":%s SQUIT %s :%s",
775	<	ID_or_name(from, source_p), me.name, comment);
773	>	if (!HasFlag(source_p, FLAGS_SQUIT))
774	>	{
775	>	/* for them, we are exiting the network */
776	>	sendto_one(source_p, ":%s SQUIT %s :%s",
777	>	me.id, me.id, comment);
778	>	}
779		}
780
781		sendto_one(source_p, "ERROR :Closing Link: %s (%s)",
782		source_p->host, comment);
783		}
784
952	–	/*
953	–	** Currently only server connections can have
954	–	** depending remote clients here, but it does no
955	–	** harm to check for all local clients. In
956	–	** future some other clients than servers might
957	–	** have remotes too...
958	–	**
959	–	** Close the Client connection first and mark it
960	–	** so that no messages are attempted to send to it.
961	–	** Remember it makes source_p->from == NULL.
962	–	*/
785		close_connection(source_p);
786		}
787	+	else if (IsClient(source_p) && HasFlag(source_p->servptr, FLAGS_EOB))
788	+	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
789	+	"Client exiting at %s: %s (%s@%s) [%s]",
790	+	source_p->servptr->name, source_p->name,
791	+	source_p->username, source_p->host, comment);
792
793		if (IsServer(source_p))
794		{
795	<	char splitstr[HOSTLEN + HOSTLEN + 2];
795	>	char splitstr[HOSTLEN + HOSTLEN + 2] = "";
796
797		/* This shouldn't ever happen */
798	<	assert(source_p->serv != NULL && source_p->servptr != NULL);
798	>	assert(source_p->serv && source_p->servptr);
799
800		if (ConfigServerHide.hide_servers)
801		/*
802	<	* Set netsplit message to "*.net *.split" to still show
802	>	* Set netsplit message to "*.net *.split" to still show
803		* that its a split, but hide the servers splitting
804		*/
805	<	strcpy(splitstr, "*.net *.split");
805	>	strlcpy(splitstr, "*.net *.split", sizeof(splitstr));
806		else
807		snprintf(splitstr, sizeof(splitstr), "%s %s",
808		source_p->servptr->name, source_p->name);
809
810	<	remove_dependents(source_p, from->from, comment, splitstr);
810	>	/* Send SQUIT for source_p in every direction. source_p is already off of local_server_list here */
811	>	if (!HasFlag(source_p, FLAGS_SQUIT))
812	>	sendto_server(NULL, 0, 0, "SQUIT %s :%s", source_p->id, comment);
813
814	<	if (source_p->servptr == &me)
814	>	/* Now exit the clients internally */
815	>	recurse_remove_clients(source_p, splitstr);
816	>
817	>	if (MyConnect(source_p))
818		{
819	<	sendto_realops_flags(UMODE_ALL, L_ALL,
820	<	"%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
821	<	source_p->name, (int)(CurrentTime - source_p->localClient->firsttime),
822	<	source_p->localClient->send.bytes >> 10,
823	<	source_p->localClient->recv.bytes >> 10);
824	<	ilog(LOG_TYPE_IRCD, "%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
825	<	source_p->name, (int)(CurrentTime - source_p->localClient->firsttime),
826	<	source_p->localClient->send.bytes >> 10,
827	<	source_p->localClient->recv.bytes >> 10);
819	>	int connected = CurrentTime - source_p->connection->firsttime;
820	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
821	>	"%s was connected for %d day%s, %2d:%02d:%02d. %llu/%llu sendK/recvK.",
822	>	source_p->name, connected/86400, (connected/86400 == 1) ? "" : "s",
823	>	(connected % 86400) / 3600, (connected % 3600) / 60, connected % 60,
824	>	source_p->connection->send.bytes >> 10,
825	>	source_p->connection->recv.bytes >> 10);
826	>	ilog(LOG_TYPE_IRCD, "%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		}
832		}
833		else if (IsClient(source_p) && !HasFlag(source_p, FLAGS_KILLED))
834	<	{
835	<	sendto_server(from->from, CAP_TS6, NOCAPS,
1001	<	":%s QUIT :%s", ID(source_p), comment);
1002	<	sendto_server(from->from, NOCAPS, CAP_TS6,
1003	<	":%s QUIT :%s", source_p->name, comment);
1004	<	}
834	>	sendto_server(source_p->from, 0, 0, ":%s QUIT :%s",
835	>	source_p->id, comment);
836
837		/* The client *better* be off all of the lists */
838		assert(dlinkFind(&unknown_list, source_p) == NULL);
839		assert(dlinkFind(&local_client_list, source_p) == NULL);
840	<	assert(dlinkFind(&serv_list, source_p) == NULL);
840	>	assert(dlinkFind(&local_server_list, source_p) == NULL);
841		assert(dlinkFind(&oper_list, source_p) == NULL);
842
843		exit_one_client(source_p, comment);
#	Line 1019 | Line 850 | exit_client(struct Client *source_p, str
850		void
851		dead_link_on_write(struct Client *client_p, int ierrno)
852		{
853	<	dlink_node *ptr;
853	>	dlink_node *node;
854
855		if (IsDefunct(client_p))
856		return;
857
858	<	dbuf_clear(&client_p->localClient->buf_recvq);
859	<	dbuf_clear(&client_p->localClient->buf_sendq);
858	>	dbuf_clear(&client_p->connection->buf_recvq);
859	>	dbuf_clear(&client_p->connection->buf_sendq);
860
861		assert(dlinkFind(&abort_list, client_p) == NULL);
862	<	ptr = make_dlink_node();
862	>	node = make_dlink_node();
863		/* don't let exit_aborted_clients() finish yet */
864	<	dlinkAddTail(client_p, ptr, &abort_list);
864	>	dlinkAddTail(client_p, node, &abort_list);
865
866		if (eac_next == NULL)
867	<	eac_next = ptr;
867	>	eac_next = node;
868
869		SetDead(client_p); /* You are dead my friend */
870		}
#	Line 1045 | Line 876 | dead_link_on_write(struct Client *client
876		void
877		dead_link_on_read(struct Client *client_p, int error)
878		{
879	<	char errmsg[255];
879	>	char errmsg[IRCD_BUFSIZE];
880		int current_error;
881
882		if (IsDefunct(client_p))
883		return;
884
885	<	dbuf_clear(&client_p->localClient->buf_recvq);
886	<	dbuf_clear(&client_p->localClient->buf_sendq);
885	>	dbuf_clear(&client_p->connection->buf_recvq);
886	>	dbuf_clear(&client_p->connection->buf_sendq);
887
888	<	current_error = get_sockerr(client_p->localClient->fd.fd);
888	>	current_error = get_sockerr(client_p->connection->fd.fd);
889
890		if (IsServer(client_p) || IsHandshake(client_p))
891		{
892	<	int connected = CurrentTime - client_p->localClient->firsttime;
893	<
892	>	int connected = CurrentTime - client_p->connection->firsttime;
893	>
894		if (error == 0)
895		{
896		/* Admins get the real IP */
897	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
898	<	"Server %s closed the connection",
899	<	get_client_name(client_p, SHOW_IP));
897	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
898	>	"Server %s closed the connection",
899	>	get_client_name(client_p, SHOW_IP));
900
901		/* Opers get a masked IP */
902	<	sendto_realops_flags(UMODE_ALL, L_OPER,
903	<	"Server %s closed the connection",
904	<	get_client_name(client_p, MASK_IP));
902	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
903	>	"Server %s closed the connection",
904	>	get_client_name(client_p, MASK_IP));
905
906		ilog(LOG_TYPE_IRCD, "Server %s closed the connection",
907	<	get_client_name(client_p, SHOW_IP));
907	>	get_client_name(client_p, SHOW_IP));
908		}
909		else
910		{
911		report_error(L_ADMIN, "Lost connection to %s: %s",
912	<	get_client_name(client_p, SHOW_IP), current_error);
912	>	get_client_name(client_p, SHOW_IP), current_error);
913		report_error(L_OPER, "Lost connection to %s: %s",
914	<	get_client_name(client_p, MASK_IP), current_error);
914	>	get_client_name(client_p, MASK_IP), current_error);
915		}
916
917	<	sendto_realops_flags(UMODE_ALL, L_ALL,
918	<	"%s had been connected for %d day%s, %2d:%02d:%02d",
919	<	client_p->name, connected/86400,
920	<	(connected/86400 == 1) ? "" : "s",
921	<	(connected % 86400) / 3600, (connected % 3600) / 60,
922	<	connected % 60);
917	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
918	>	"%s was connected for %d day%s, %2d:%02d:%02d",
919	>	client_p->name, connected/86400,
920	>	(connected/86400 == 1) ? "" : "s",
921	>	(connected % 86400) / 3600, (connected % 3600) / 60,
922	>	connected % 60);
923		}
924
925		if (error == 0)
#	Line 1098 | Line 929 | dead_link_on_read(struct Client *client_
929		snprintf(errmsg, sizeof(errmsg), "Read error: %s",
930		strerror(current_error));
931
932	<	exit_client(client_p, &me, errmsg);
932	>	exit_client(client_p, errmsg);
933		}
934
935		void
#	Line 1115 | Line 946 | exit_aborted_clients(void)
946
947		if (target_p == NULL)
948		{
949	<	sendto_realops_flags(UMODE_ALL, L_ALL,
949	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
950		"Warning: null client on abort_list!");
951		dlinkDelete(ptr, &abort_list);
952		free_dlink_node(ptr);
#	Line 1129 | Line 960 | exit_aborted_clients(void)
960		else
961		notice = "Write error: connection closed";
962
963	<	exit_client(target_p, &me, notice);
963	>	exit_client(target_p, notice);
964		free_dlink_node(ptr);
965		}
966		}
#	Line 1147 | Line 978 | exit_aborted_clients(void)
978		void
979		del_accept(struct split_nuh_item *accept_p, struct Client *client_p)
980		{
981	<	dlinkDelete(&accept_p->node, &client_p->localClient->acceptlist);
981	>	dlinkDelete(&accept_p->node, &client_p->connection->acceptlist);
982
983		MyFree(accept_p->nickptr);
984		MyFree(accept_p->userptr);
#	Line 1157 | Line 988 | del_accept(struct split_nuh_item *accept
988
989		struct split_nuh_item *
990		find_accept(const char *nick, const char *user,
991	<	const char *host, struct Client *client_p, int do_match)
991	>	const char *host, struct Client *client_p,
992	>	int (*cmpfunc)(const char *, const char *))
993		{
994	<	dlink_node *ptr = NULL;
1163	<	/* XXX We wouldn't need that if match() would return 0 on match */
1164	<	int (*cmpfunc)(const char *, const char *) = do_match ? match : irccmp;
994	>	dlink_node *node = NULL;
995
996	<	DLINK_FOREACH(ptr, client_p->localClient->acceptlist.head)
996	>	DLINK_FOREACH(node, client_p->connection->acceptlist.head)
997		{
998	<	struct split_nuh_item *accept_p = ptr->data;
998	>	struct split_nuh_item *accept_p = node->data;
999
1000	<	if (cmpfunc(accept_p->nickptr, nick) == do_match &&
1001	<	cmpfunc(accept_p->userptr, user) == do_match &&
1002	<	cmpfunc(accept_p->hostptr, host) == do_match)
1000	>	if (!cmpfunc(accept_p->nickptr, nick) &&
1001	>	!cmpfunc(accept_p->userptr, user) &&
1002	>	!cmpfunc(accept_p->hostptr, host))
1003		return accept_p;
1004		}
1005
#	Line 1187 | Line 1017 | int
1017		accept_message(struct Client *source,
1018		struct Client *target)
1019		{
1020	<	dlink_node *ptr = NULL;
1020	>	dlink_node *node = NULL;
1021
1022		if (source == target || find_accept(source->name, source->username,
1023	<	source->host, target, 1))
1023	>	source->host, target, match))
1024		return 1;
1025
1026	<	if (HasUMode(target, UMODE_SOFTCALLERID))
1027	<	DLINK_FOREACH(ptr, target->channel.head)
1028	<	if (IsMember(source, ((struct Membership *)ptr->data)->chptr))
1026	>	if (!HasUMode(target, UMODE_CALLERID) && HasUMode(target, UMODE_SOFTCALLERID))
1027	>	DLINK_FOREACH(node, target->channel.head)
1028	>	if (IsMember(source, ((struct Membership *)node->data)->chptr))
1029		return 1;
1030
1031		return 0;
#	Line 1210 | Line 1040 | accept_message(struct Client *source,
1040		void
1041		del_all_accepts(struct Client *client_p)
1042		{
1043	<	dlink_node *ptr = NULL, *next_ptr = NULL;
1043	>	dlink_node *node = NULL, *node_next = NULL;
1044	>
1045	>	DLINK_FOREACH_SAFE(node, node_next, client_p->connection->acceptlist.head)
1046	>	del_accept(node->data, client_p);
1047	>	}
1048	>
1049	>	unsigned int
1050	>	idle_time_get(const struct Client *source_p, const struct Client *target_p)
1051	>	{
1052	>	unsigned int idle = 0;
1053	>	unsigned int min_idle = 0;
1054	>	unsigned int max_idle = 0;
1055	>	const struct ClassItem *const class = get_class_ptr(&target_p->connection->confs);
1056	>
1057	>	if (!(class->flags & CLASS_FLAGS_FAKE_IDLE) || target_p == source_p)
1058	>	return CurrentTime - target_p->connection->last_privmsg;
1059	>
1060	>	if (HasUMode(source_p, UMODE_OPER) &&
1061	>	!(class->flags & CLASS_FLAGS_HIDE_IDLE_FROM_OPERS))
1062	>	return CurrentTime - target_p->connection->last_privmsg;
1063	>
1064	>	min_idle = class->min_idle;
1065	>	max_idle = class->max_idle;
1066	>
1067	>	if (min_idle == max_idle)
1068	>	return min_idle;
1069	>
1070	>	if (class->flags & CLASS_FLAGS_RANDOM_IDLE)
1071	>	idle = genrand_int32();
1072	>	else
1073	>	idle = CurrentTime - target_p->connection->last_privmsg;
1074
1075	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->localClient->acceptlist.head)
1076	<	del_accept(ptr->data, client_p);
1075	>	if (!max_idle)
1076	>	idle = 0;
1077	>	else
1078	>	idle %= max_idle;
1079	>
1080	>	if (idle < min_idle)
1081	>	idle = min_idle + (idle % (max_idle - min_idle));
1082	>
1083	>	return idle;
1084	>	}
1085	>
1086	>	/* client_init()
1087	>	*
1088	>	* inputs       - NONE
1089	>	* output       - NONE
1090	>	* side effects - initialize client free memory
1091	>	*/
1092	>	void
1093	>	client_init(void)
1094	>	{
1095	>	static struct event event_ping =
1096	>	{
1097	>	.name = "check_pings",
1098	>	.handler = check_pings,
1099	>	.when = 5
1100	>	};
1101	>
1102	>	client_pool = mp_pool_new(sizeof(struct Client), MP_CHUNK_SIZE_CLIENT);
1103	>	connection_pool = mp_pool_new(sizeof(struct Connection), MP_CHUNK_SIZE_CONNECTION);
1104	>	event_add(&event_ping, NULL);
1105		}

Diff Legend

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