ViewVC Help

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

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

Comparing ircd-hybrid/trunk/src/client.c (file contents):
Revision 1592 by michael, Sat Oct 27 21:02:32 2012 UTC vs.
Revision 6513 by michael, Sun Sep 6 18:32:38 2015 UTC

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

Diff Legend

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