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

Comparing:
ircd-hybrid-8/src/client.c (property svn:keywords), Revision 1483 by michael, Wed Jul 25 19:15:48 2012 UTC vs.
ircd-hybrid/trunk/src/client.c (property svn:keywords), Revision 7969 by michael, Mon Mar 13 19:28:30 2017 UTC

#	Line 1 | Line 1
1	<	Id Revision
1	>	Id

Diff Legend

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