ViewVC Help

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

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

Comparing:
ircd-hybrid-7.2/src/client.c (file contents), Revision 876 by michael, Wed Oct 24 21:51:21 2007 UTC vs.
ircd-hybrid/trunk/src/client.c (file contents), Revision 7304 by michael, Wed Feb 10 10:45:46 2016 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-2016 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 "tools.h"
28	>	#include "list.h"
29		#include "client.h"
28	–	#include "channel_mode.h"
29	–	#include "common.h"
30		#include "event.h"
31	–	#include "fdlist.h"
31		#include "hash.h"
32		#include "irc_string.h"
34	–	#include "sprintf_irc.h"
33		#include "ircd.h"
36	–	#include "list.h"
37	–	#include "s_gline.h"
34		#include "numeric.h"
35	<	#include "packet.h"
40	<	#include "s_auth.h"
35	>	#include "auth.h"
36		#include "s_bsd.h"
37	<	#include "s_conf.h"
38	<	#include "s_log.h"
39	<	#include "s_misc.h"
40	<	#include "s_serv.h"
37	>	#include "conf.h"
38	>	#include "conf_gecos.h"
39	>	#include "log.h"
40	>	#include "misc.h"
41	>	#include "server.h"
42		#include "send.h"
43		#include "whowas.h"
44	<	#include "s_user.h"
49	<	#include "dbuf.h"
44	>	#include "user.h"
45		#include "memory.h"
46	+	#include "mempool.h"
47		#include "hostmask.h"
52	–	#include "balloc.h"
48		#include "listener.h"
54	–	#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
58	–	dlink_list listing_client_list = { NULL, NULL, 0 };
59	–	/* Pointer to beginning of Client list */
60	–	dlink_list global_client_list = {NULL, NULL, 0};
61	–	/* unknown/client pointer lists */
62	–	dlink_list unknown_list = {NULL, NULL, 0};
63	–	dlink_list local_client_list = {NULL, NULL, 0};
64	–	dlink_list serv_list = {NULL, NULL, 0};
65	–	dlink_list global_serv_list = {NULL, NULL, 0};
66	–	dlink_list oper_list = {NULL, NULL, 0};
67	–
68	–	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
78	–	static void check_pings_list(dlink_list *);
79	–	static void check_unknowns_list(void);
80	–	static void ban_them(struct Client *client_p, struct ConfItem *conf);
81	–
82	–
83	–	/* init_client()
84	–	*
85	–	* inputs       - NONE
86	–	* output       - NONE
87	–	* side effects - initialize client free memory
88	–	*/
89	–	void
90	–	init_client(void)
91	–	{
92	–	/* start off the check ping event ..  -- adrian
93	–	* Every 30 seconds is plenty -- db
94	–	*/
95	–	client_heap = BlockHeapCreate("client", sizeof(struct Client), CLIENT_HEAP_SIZE);
96	–	lclient_heap = BlockHeapCreate("local client", sizeof(struct LocalUser), LCLIENT_HEAP_SIZE);
97	–	eventAdd("check_pings", check_pings, NULL, 5);
98	–	}
68
69		/*
70		* make_client - create a new Client struct and set it to initial state.
#	Line 115 | Line 84 | init_client(void)
84		struct Client *
85		make_client(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		{
91	<	client_p->from  = client_p; /* 'from' of local client is self! */
92	<	client_p->since = client_p->lasttime = client_p->firsttime = CurrentTime;
91	>	client_p->from = client_p;  /* 'from' of local client is self! */
92	>	client_p->connection = mp_pool_get(connection_pool);
93	>	client_p->connection->since = CurrentTime;
94	>	client_p->connection->lasttime = CurrentTime;
95	>	client_p->connection->firsttime = CurrentTime;
96	>	client_p->connection->registration = REG_INIT;
97
125	–	client_p->localClient = BlockHeapAlloc(lclient_heap);
126	–	client_p->localClient->registration = REG_INIT;
98		/* as good a place as any... */
99	<	dlinkAdd(client_p, make_dlink_node(), &unknown_list);
99	>	dlinkAdd(client_p, &client_p->connection->lclient_node, &unknown_list);
100		}
101		else
102	<	client_p->from = from; /* 'from' of local client is self! */
102	>	client_p->from = from;
103
104	<	client_p->hnext  = client_p;
105	<	client_p->status = STAT_UNKNOWN;
104	>	client_p->idhnext = client_p;
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		}
#	Line 147 | Line 120 | make_client(struct Client *from)
120		static void
121		free_client(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(dlink_list_length(&client_p->svstags) == 0);
130
131	<	MyFree(client_p->away);
132	<	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(IsClosing(client_p) && IsDead(client_p));
139	<
165	<	MyFree(client_p->localClient->response);
166	<	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 &&
175	<	!client_p->localClient->listener->active)
176	<	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)
193	<	* output       - next time_t when check_pings() should be called again
194	<	* side effects -
195	<	*
196	<	*
197	<	* A PING can be sent to clients as necessary.
198	<	*
199	<	* Client/Server ping outs are handled.
200	<	*/
159	>	void
160	>	client_attach_svstag(struct Client *client_p, unsigned int numeric,
161	>	const char *umodes, const char *const tag)
162	>	{
163	>	const struct user_modes *tab = NULL;
164
165	<	/*
166	<	* Addon from adrian. We used to call this after nextping seconds,
204	<	* however I've changed it to run once a second. This is only for
205	<	* PING timeouts, not K/etc-line checks (thanks dianora!). Having it
206	<	* run once a second makes life a lot easier - when a new client connects
207	<	* and they need a ping in 4 seconds, if nextping was set to 20 seconds
208	<	* we end up waiting 20 seconds. This is stupid. :-)
209	<	* I will optimise (hah!) check_pings() once I've finished working on
210	<	* tidying up other network IO evilnesses.
211	<	*     -- adrian
212	<	*/
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 */
234	<	dlink_node *ptr, *next_ptr;
204	>	char buf[32] = "";  /* 32 = sizeof("Ping timeout: 999999999 seconds") */
205	>	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
240	–	/*
241	–	** Note: No need to notify opers here. It's
242	–	** already done when "FLAGS_DEADSOCKET" is set.
243	–	*/
212		if (IsDead(client_p))
213	<	{
246	<	/* Ignore it, its been exited already */
247	<	continue;
248	<	}
249	<
250	<	if (client_p->localClient->reject_delay > 0)
251	<	{
252	<	if (client_p->localClient->reject_delay <= CurrentTime)
253	<	exit_client(client_p, &me, "Rejected");
254	<	continue;
255	<	}
256	<
257	<	if (GlobalSetOptions.idletime && IsClient(client_p))
258	<	{
259	<	if (!IsExemptKline(client_p) && !IsOper(client_p) &&
260	<	!IsIdlelined(client_p) &&
261	<	((CurrentTime - client_p->localClient->last) > GlobalSetOptions.idletime))
262	<	{
263	<	struct ConfItem *conf;
264	<	struct AccessItem *aconf;
265	<
266	<	conf = make_conf_item(KLINE_TYPE);
267	<	aconf = (struct AccessItem *)map_to_conf(conf);
213	>	continue;  /* Ignore it, its been exited already */
214
215	<	DupString(aconf->host, client_p->host);
216	<	DupString(aconf->reason, "idle exceeder");
271	<	DupString(aconf->user, client_p->username);
272	<	aconf->hold = CurrentTime + 60;
273	<	add_temp_line(conf);
274	<
275	<	sendto_realops_flags(UMODE_ALL, L_ALL,
276	<	"Idle time limit exceeded for %s - temp k-lining",
277	<	get_client_name(client_p, HIDE_IP));
278	<	exit_client(client_p, &me, aconf->reason);
279	<	continue;
280	<	}
281	<	}
282	<
283	<	if (!IsRegistered(client_p))
284	<	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->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->lasttime = CurrentTime - ping;
300	<	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->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(L_NOTICE, "No response from %s, closing link",
250	<	get_client_name(client_p, HIDE_IP));
251	<	}
252	<
253	<	ircsprintf(scratch, "Ping timeout: %d seconds",
254	<	(int)(CurrentTime - client_p->lasttime));
255	<	exit_client(client_p, &me, scratch);
325	<	}
326	<	else if (!IsPingWarning(client_p) && pingwarn > 0 &&
327	<	(IsServer(client_p) || IsHandshake(client_p)) &&
328	<	CurrentTime - client_p->lasttime >= ping + pingwarn)
329	<	{
330	<	/*
331	<	* If the server hasn't replied in pingwarn seconds after sending
332	<	* the PING, notify the opers so that they are aware of the problem.
333	<	*/
334	<	SetPingWarning(client_p);
335	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
336	<	"Warning, no response from %s in %d seconds",
337	<	get_client_name(client_p, HIDE_IP), pingwarn);
338	<	sendto_realops_flags(UMODE_ALL, L_OPER,
339	<	"Warning, no response from %s in %d seconds",
340	<	get_client_name(client_p, MASK_IP), pingwarn);
341	<	ilog(L_NOTICE, "No response from %s in %d seconds",
342	<	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 355 | 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;
363	<
364	<	if (client_p->localClient->reject_delay > 0)
365	<	{
366	<	if (client_p->localClient->reject_delay <= CurrentTime)
367	<	exit_client(client_p, &me, "Rejected");
368	<	continue;
369	<	}
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->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	+	* output       - next time_t when check_pings() should be called again
292	+	* side effects -
293	+	*
294	+	*
295	+	* A PING can be sent to clients as necessary.
296	+	*
297	+	* Client/Server ping outs are handled.
298	+	*/
299	+
300	+	/*
301	+	* Addon from adrian. We used to call this after nextping seconds,
302	+	* however I've changed it to run once a second. This is only for
303	+	* PING timeouts, not K/etc-line checks (thanks dianora!). Having it
304	+	* run once a second makes life a lot easier - when a new client connects
305	+	* and they need a ping in 4 seconds, if nextping was set to 20 seconds
306	+	* we end up waiting 20 seconds. This is stupid. :-)
307	+	* I will optimise (hah!) check_pings() once I've finished working on
308	+	* tidying up other network IO evilnesses.
309	+	*     -- adrian
310	+	*/
311	+
312	+	static void
313	+	check_pings(void *unused)
314	+	{
315	+	check_pings_list(&local_client_list);
316	+	check_pings_list(&local_server_list);
317	+	check_unknowns_list();
318	+	}
319	+
320		/* check_conf_klines()
321		*
322		* inputs       - NONE
#	Line 384 | Line 324 | check_unknowns_list(void)
324		* side effects - Check all connections for a pending kline against the
325		*                client, exit the client if a kline matches.
326		*/
327	<	void
327	>	void
328		check_conf_klines(void)
329	<	{
330	<	struct Client *client_p = NULL;       /* current local client_p being examined */
331	<	struct AccessItem *aconf = NULL;
392	<	struct ConfItem *conf = NULL;
393	<	dlink_node *ptr, *next_ptr;
329	>	{
330	>	dlink_node *node = NULL, *node_next = NULL;
331	>	void *ptr;
332
333	<	DLINK_FOREACH_SAFE(ptr, next_ptr, local_client_list.head)
333	>	DLINK_FOREACH_SAFE(node, node_next, local_client_list.head)
334		{
335	<	client_p = ptr->data;
335	>	struct Client *client_p = node->data;
336
337	<	/* If a client is already being exited
338	<	*/
401	<	if (IsDead(client_p) || !IsClient(client_p))
337	>	/* If a client is already being exited */
338	>	if (IsDead(client_p))
339		continue;
340
341	<	/* if there is a returned struct ConfItem then kill it */
342	<	if ((aconf = find_dline_conf(&client_p->localClient->ip,
406	<	client_p->localClient->aftype)) != NULL)
341	>	if ((ptr = find_conf_by_address(NULL, &client_p->connection->ip, CONF_DLINE,
342	>	client_p->connection->aftype, NULL, NULL, 1)))
343		{
344	<	if (aconf->status & CONF_EXEMPTDLINE)
345	<	continue;
346	<
411	<	conf = unmap_conf_item(aconf);
412	<	ban_them(client_p, conf);
413	<	continue; /* and go examine next fd/client_p */
344	>	const struct MaskItem *conf = ptr;
345	>	conf_try_ban(client_p, CLIENT_BAN_DLINE, conf->reason);
346	>	continue;  /* and go examine next Client */
347		}
348
349	<	if (ConfigFileEntry.glines && (aconf = find_gline(client_p)))
350	<	{
351	<	if (IsExemptKline(client_p) ||
419	<	IsExemptGline(client_p))
420	<	{
421	<	sendto_realops_flags(UMODE_ALL, L_ALL,
422	<	"GLINE over-ruled for %s, client is %sline_exempt",
423	<	get_client_name(client_p, HIDE_IP), IsExemptKline(client_p) ? "k" : "g");
424	<	continue;
425	<	}
426	<
427	<	conf = unmap_conf_item(aconf);
428	<	ban_them(client_p, conf);
429	<	/* and go examine next fd/client_p */
430	<	continue;
431	<	}
432	<
433	<	if ((aconf = find_kill(client_p)) != NULL)
349	>	if ((ptr = find_conf_by_address(client_p->host, &client_p->connection->ip,
350	>	CONF_KLINE, client_p->connection->aftype,
351	>	client_p->username, NULL, 1)))
352		{
353	<
354	<	/* if there is a returned struct AccessItem.. then kill it */
355	<	if (IsExemptKline(client_p))
438	<	{
439	<	sendto_realops_flags(UMODE_ALL, L_ALL,
440	<	"KLINE over-ruled for %s, client is kline_exempt",
441	<	get_client_name(client_p, HIDE_IP));
442	<	continue;
443	<	}
444	<
445	<	conf = unmap_conf_item(aconf);
446	<	ban_them(client_p, conf);
447	<	continue;
353	>	const struct MaskItem *conf = ptr;
354	>	conf_try_ban(client_p, CLIENT_BAN_KLINE, conf->reason);
355	>	continue;  /* and go examine next Client */
356		}
357
358	<	/* if there is a returned struct MatchItem then kill it */
451	<	if ((conf = find_matching_name_conf(XLINE_TYPE,  client_p->info,
452	<	NULL, NULL, 0)) != NULL ||
453	<	(conf = find_matching_name_conf(RXLINE_TYPE, client_p->info,
454	<	NULL, NULL, 0)) != NULL)
358	>	if ((ptr = gecos_find(client_p->info, match)))
359		{
360	<	ban_them(client_p, conf);
361	<	continue;
360	>	const struct GecosItem *conf = ptr;
361	>	conf_try_ban(client_p, CLIENT_BAN_XLINE, conf->reason);
362	>	continue;  /* and go examine next Client */
363		}
364		}
365
366	<	/* also check the unknowns list for new dlines */
367	<	DLINK_FOREACH_SAFE(ptr, next_ptr, unknown_list.head)
366	>	/* Also check the unknowns list for new dlines */
367	>	DLINK_FOREACH_SAFE(node, node_next, unknown_list.head)
368		{
369	<	client_p = ptr->data;
369	>	struct Client *client_p = node->data;
370
371	<	if ((aconf = find_dline_conf(&client_p->localClient->ip,
372	<	client_p->localClient->aftype)))
371	>	if ((ptr = find_conf_by_address(NULL, &client_p->connection->ip, CONF_DLINE,
372	>	client_p->connection->aftype, NULL, NULL, 1)))
373		{
374	<	if (aconf->status & CONF_EXEMPTDLINE)
375	<	continue;
376	<
472	<	exit_client(client_p, &me, "D-lined");
374	>	const struct MaskItem *conf = ptr;
375	>	conf_try_ban(client_p, CLIENT_BAN_DLINE, conf->reason);
376	>	continue;  /* and go examine next Client */
377		}
378		}
379		}
380
381		/*
382	<	* ban_them
382	>	* conf_try_ban
383		*
384		* inputs       - pointer to client to ban
385	<	*              - pointer to ConfItem
385	>	*              - pointer to MaskItem
386		* output       - NONE
387		* side effects - given client_p is banned
388		*/
389	<	static void
390	<	ban_them(struct Client *client_p, struct ConfItem *conf)
389	>	void
390	>	conf_try_ban(struct Client *client_p, int type, const char *reason)
391		{
392	<	const char *user_reason = NULL;       /* What is sent to user */
393	<	const char *channel_reason = NULL;    /* What is sent to channel */
394	<	struct AccessItem *aconf = NULL;
395	<	struct MatchItem *xconf = NULL;
396	<	const char *type_string = NULL;
397	<	const char dline_string[] = "D-line";
398	<	const char kline_string[] = "K-line";
399	<	const char gline_string[] = "G-line";
400	<	const char xline_string[] = "X-line";
401	<
402	<	switch (conf->type)
403	<	{
404	<	case RKLINE_TYPE:
405	<	case KLINE_TYPE:
502	<	type_string = kline_string;
503	<	aconf = map_to_conf(conf);
504	<	break;
505	<	case DLINE_TYPE:
506	<	type_string = dline_string;
507	<	aconf = map_to_conf(conf);
392	>	char ban_type = '?';
393	>
394	>	switch (type)
395	>	{
396	>	case CLIENT_BAN_KLINE:
397	>	if (HasFlag(client_p, FLAGS_EXEMPTKLINE))
398	>	{
399	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
400	>	"KLINE over-ruled for %s, client is kline_exempt",
401	>	get_client_name(client_p, HIDE_IP));
402	>	return;
403	>	}
404	>
405	>	ban_type = 'K';
406		break;
407	<	case GLINE_TYPE:
408	<	type_string = gline_string;
409	<	aconf = map_to_conf(conf);
407	>	case CLIENT_BAN_DLINE:
408	>	if (find_conf_by_address(NULL, &client_p->connection->ip, CONF_EXEMPT,
409	>	client_p->connection->aftype, NULL, NULL, 1))
410	>	return;
411	>	ban_type = 'D';
412		break;
413	<	case RXLINE_TYPE:
414	<	case XLINE_TYPE:
415	<	type_string = xline_string;
416	<	xconf = map_to_conf(conf);
417	<	++xconf->count;
413	>	case CLIENT_BAN_XLINE:
414	>	if (HasFlag(client_p, FLAGS_EXEMPTXLINE))
415	>	{
416	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
417	>	"XLINE over-ruled for %s, client is xline_exempt",
418	>	get_client_name(client_p, HIDE_IP));
419	>	return;
420	>	}
421	>
422	>	ban_type = 'X';
423		break;
424		default:
425		assert(0);
426		break;
427		}
428
429	<	if (ConfigFileEntry.kline_with_reason)
430	<	{
526	<	if (aconf != NULL)
527	<	user_reason = aconf->reason ? aconf->reason : type_string;
528	<	if (xconf != NULL)
529	<	user_reason = xconf->reason ? xconf->reason : type_string;
530	<	}
531	<	else
532	<	user_reason = type_string;
533	<
534	<	if (ConfigFileEntry.kline_reason != NULL)
535	<	channel_reason = ConfigFileEntry.kline_reason;
536	<	else
537	<	channel_reason = user_reason;
538	<
539	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s active for %s",
540	<	type_string, get_client_name(client_p, HIDE_IP));
429	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE, "%c-line active for %s",
430	>	ban_type, get_client_name(client_p, HIDE_IP));
431
432		if (IsClient(client_p))
433	<	sendto_one(client_p, form_str(ERR_YOUREBANNEDCREEP),
544	<	me.name, client_p->name, user_reason);
433	>	sendto_one_numeric(client_p, &me, ERR_YOUREBANNEDCREEP, reason);
434
435	<	exit_client(client_p, &me, channel_reason);
435	>	exit_client(client_p, reason);
436		}
437
438		/* update_client_exit_stats()
439		*
440		* input        - pointer to client
441		* output       - NONE
442	<	* side effects -
442	>	* side effects -
443		*/
444		static void
445		update_client_exit_stats(struct Client *client_p)
446		{
447	<	if (IsServer(client_p))
559	<	{
560	<	sendto_realops_flags(UMODE_EXTERNAL, L_ALL,
561	<	"Server %s split from %s",
562	<	client_p->name, client_p->servptr->name);
563	<	}
564	<	else if (IsClient(client_p))
447	>	if (IsClient(client_p))
448		{
449	+	assert(Count.total > 0);
450	+
451		--Count.total;
452	<	if (IsOper(client_p))
452	>	if (HasUMode(client_p, UMODE_OPER))
453		--Count.oper;
454	<	if (IsInvisible(client_p))
454	>	if (HasUMode(client_p, UMODE_INVISIBLE))
455		--Count.invisi;
456		}
457	<
458	<	if (splitchecking && !splitmode)
459	<	check_splitmode(NULL);
457	>	else if (IsServer(client_p))
458	>	sendto_realops_flags(UMODE_EXTERNAL, L_ALL, SEND_NOTICE,
459	>	"Server %s split from %s",
460	>	client_p->name, client_p->servptr->name);
461		}
462
463		/* find_person()
#	Line 580 | Line 466 | update_client_exit_stats(struct Client *
466		* output       - return client pointer
467		* side effects - find person by (nick)name
468		*/
583	–	/* XXX - ugly wrapper */
469		struct Client *
470	<	find_person(const struct Client *client_p, const char *name)
470	>	find_person(const struct Client *const source_p, const char *name)
471		{
472	<	struct Client *c2ptr;
472	>	struct Client *target_p = NULL;
473
474		if (IsDigit(*name))
475		{
476	<	if ((c2ptr = hash_find_id(name)) != NULL)
477	<	{
593	<	/* invisible users shall not be found by UID guessing */
594	<	if (IsInvisible(c2ptr) && !IsServer(client_p))
595	<	c2ptr = NULL;
596	<	}
476	>	if (IsServer(source_p->from))
477	>	target_p = hash_find_id(name);
478		}
479		else
480	<	c2ptr = find_client(name);
480	>	target_p = hash_find_client(name);
481
482	<	return ((c2ptr != NULL && IsClient(c2ptr)) ? c2ptr : NULL);
482	>	return (target_p && IsClient(target_p)) ? target_p : NULL;
483		}
484
485		/*
486	<	* find_chasing - find the client structure for a nick name (user)
487	<	*      using history mechanism if necessary. If the client is not found,
488	<	*      an error message (NO SUCH NICK) is generated. If the client was found
608	<	*      through the history, chasing will be 1 and otherwise 0.
486	>	* find_chasing - find the client structure for a nick name (name)
487	>	*      using history mechanism if necessary. If the client is not found,
488	>	*      an error message (NO SUCH NICK) is generated.
489		*/
490		struct Client *
491	<	find_chasing(struct Client *client_p, struct Client *source_p, const char *user, int *chasing)
491	>	find_chasing(struct Client *source_p, const char *name)
492		{
493	<	struct Client *who = find_person(client_p, user);
493	>	struct Client *target_p = find_person(source_p, name);
494
495	<	if (chasing)
496	<	*chasing = 0;
495	>	if (target_p)
496	>	return target_p;
497
498	<	if (who)
499	<	return(who);
498	>	if (IsDigit(*name))
499	>	return NULL;
500
501	<	if (IsDigit(*user))
622	<	return(NULL);
501	>	target_p = whowas_get_history(name, (time_t)ConfigGeneral.kill_chase_time_limit);
502
503	<	if ((who = get_history(user,
625	<	(time_t)ConfigFileEntry.kill_chase_time_limit))
626	<	== NULL)
503	>	if (!target_p)
504		{
505	<	sendto_one(source_p, form_str(ERR_NOSUCHNICK),
506	<	me.name, source_p->name, user);
630	<	return(NULL);
505	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHNICK, name);
506	>	return NULL;
507		}
508
509	<	if (chasing)
634	<	*chasing = 1;
635	<
636	<	return(who);
509	>	return target_p;
510		}
511
512		/*
#	Line 645 | Line 518 | find_chasing(struct Client *client_p, st
518		*        But, this can be used to any client structure.
519		*
520		* NOTE 1:
521	<	*        Watch out the allocation of "nbuf", if either source_p->name
521	>	*        Watch out the allocation of "buf", if either source_p->name
522		*        or source_p->sockhost gets changed into pointers instead of
523		*        directly allocated within the structure...
524		*
525		* NOTE 2:
526		*        Function return either a pointer to the structure (source_p) or
527	<	*        to internal buffer (nbuf). *NEVER* use the returned pointer
527	>	*        to internal buffer (buf). *NEVER* use the returned pointer
528		*        to modify what it points!!!
529		*/
530		const char *
531	<	get_client_name(struct Client *client, int showip)
531	>	get_client_name(const struct Client *client_p, enum addr_mask_type type)
532		{
533	<	static char nbuf[HOSTLEN * 2 + USERLEN + 5];
661	<
662	<	assert(client != NULL);
533	>	static char buf[HOSTLEN * 2 + USERLEN + 4];  /* +4 for [,@,],\0 */
534
535	<	if (irccmp(client->name, client->host) == 0)
536	<	return(client->name);
535	>	if (!MyConnect(client_p))
536	>	return client_p->name;
537
538	<	if (ConfigServerHide.hide_server_ips)
539	<	if (IsServer(client) || IsConnecting(client) || IsHandshake(client))
540	<	showip = MASK_IP;
541	<
542	<	if (ConfigFileEntry.hide_spoof_ips)
543	<	if (showip == SHOW_IP && IsIPSpoof(client))
544	<	showip = MASK_IP;
538	>	if (IsServer(client_p) || IsConnecting(client_p) || IsHandshake(client_p))
539	>	{
540	>	if (!irccmp(client_p->name, client_p->host))
541	>	return client_p->name;
542	>	else if (ConfigServerHide.hide_server_ips)
543	>	type = MASK_IP;
544	>	}
545
546		/* And finally, let's get the host information, ip or name */
547	<	switch (showip)
547	>	switch (type)
548		{
549		case SHOW_IP:
550	<	if (MyConnect(client))
551	<	{
552	<	ircsprintf(nbuf, "%s[%s@%s]", client->name, client->username,
553	<	client->sockhost);
683	<	break;
684	<	}
550	>	snprintf(buf, sizeof(buf), "%s[%s@%s]",
551	>	client_p->name,
552	>	client_p->username, client_p->sockhost);
553	>	break;
554		case MASK_IP:
555	<	ircsprintf(nbuf, "%s[%s@255.255.255.255]", client->name,
556	<	client->username);
555	>	if (client_p->connection->aftype == AF_INET)
556	>	snprintf(buf, sizeof(buf), "%s[%s@255.255.255.255]",
557	>	client_p->name, client_p->username);
558	>	else
559	>	snprintf(buf, sizeof(buf), "%s[%s@ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]",
560	>	client_p->name, client_p->username);
561		break;
562	<	default:
563	<	ircsprintf(nbuf, "%s[%s@%s]", client->name, client->username,
564	<	client->host);
562	>	default:  /* HIDE_IP */
563	>	snprintf(buf, sizeof(buf), "%s[%s@%s]",
564	>	client_p->name,
565	>	client_p->username, client_p->host);
566		}
567
568	<	return(nbuf);
568	>	return buf;
569		}
570
571		void
572		free_exited_clients(void)
573		{
574	<	dlink_node *ptr, *next;
701	<	struct Client *target_p;
702	<
703	<	DLINK_FOREACH_SAFE(ptr, next, dead_list.head)
704	<	{
705	<	target_p = ptr->data;
706	<
707	<	if (ptr->data == NULL)
708	<	{
709	<	sendto_realops_flags(UMODE_ALL, L_ALL,
710	<	"Warning: null client on dead_list!");
711	<	dlinkDelete(ptr, &dead_list);
712	<	free_dlink_node(ptr);
713	<	continue;
714	<	}
574	>	dlink_node *node = NULL, *node_next = NULL;
575
576	<	free_client(target_p);
577	<	dlinkDelete(ptr, &dead_list);
578	<	free_dlink_node(ptr);
576	>	DLINK_FOREACH_SAFE(node, node_next, dead_list.head)
577	>	{
578	>	free_client(node->data);
579	>	dlinkDelete(node, &dead_list);
580	>	free_dlink_node(node);
581		}
582		}
583
#	Line 726 | Line 588 | free_exited_clients(void)
588		* The only messages generated are QUITs on channels.
589		*/
590		static void
591	<	exit_one_client(struct Client *source_p, const char *quitmsg)
591	>	exit_one_client(struct Client *source_p, const char *comment)
592		{
593	<	dlink_node *lp = NULL, *next_lp = NULL;
593	>	dlink_node *node = NULL, *node_next = NULL;
594
595		assert(!IsMe(source_p));
596	+	assert(source_p != &me);
597
598	<	if (IsServer(source_p))
598	>	if (IsClient(source_p))
599		{
600	<	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->servers);
600	>	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->client_list);
601	>	dlinkDelete(&source_p->node, &global_client_list);
602
603	<	if ((lp = dlinkFindDelete(&global_serv_list, source_p)) != NULL)
604	<	free_dlink_node(lp);
603	>	/*
604	>	* If a person is on a channel, send a QUIT notice
605	>	* to every client (person) on the same channel (so
606	>	* that the client can show the "**signoff" message).
607	>	* (Note: The notice is to the local clients *only*)
608	>	*/
609	>	sendto_common_channels_local(source_p, 0, 0, 0, ":%s!%s@%s QUIT :%s",
610	>	source_p->name, source_p->username,
611	>	source_p->host, comment);
612
613	<	if (!MyConnect(source_p))
614	<	{
744	<	source_p->from->serv->dep_servers--;
745	<	assert(source_p->from->serv->dep_servers > 0);
746	<	}
747	<	}
748	<	else if (IsClient(source_p))
749	<	{
750	<	if (source_p->servptr->serv != NULL)
751	<	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->users);
613	>	DLINK_FOREACH_SAFE(node, node_next, source_p->channel.head)
614	>	remove_user_from_channel(node->data);
615
616	<	/* If a person is on a channel, send a QUIT notice
617	<	** to every client (person) on the same channel (so
618	<	** that the client can show the "**signoff" message).
619	<	** (Note: The notice is to the local clients *only*)
757	<	*/
758	<	sendto_common_channels_local(source_p, 0, ":%s!%s@%s QUIT :%s",
759	<	source_p->name, source_p->username,
760	<	source_p->host, quitmsg);
761	<	DLINK_FOREACH_SAFE(lp, next_lp, source_p->channel.head)
762	<	remove_user_from_channel(lp->data);
763	<
764	<	/* Clean up allow lists */
765	<	del_all_accepts(source_p);
766	<	add_history(source_p, 0);
767	<	off_history(source_p);
616	>	client_clear_svstags(source_p);
617	>
618	>	whowas_add_history(source_p, 0);
619	>	whowas_off_history(source_p);
620
621		watch_check_hash(source_p, RPL_LOGOFF);
622
623	<	if (!MyConnect(source_p))
772	<	{
773	<	source_p->from->serv->dep_users--;
774	<	assert(source_p->from->serv->dep_users >= 0);
775	<	}
776	<	else
623	>	if (MyConnect(source_p))
624		{
625	<	/* Clean up invitefield */
626	<	DLINK_FOREACH_SAFE(lp, next_lp, source_p->localClient->invited.head)
780	<	del_invite(lp->data, source_p);
625	>	clear_invites_client(source_p);
626	>	del_all_accepts(source_p);
627		}
628		}
629	+	else if (IsServer(source_p))
630	+	{
631	+	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->server_list);
632	+	dlinkDelete(&source_p->node, &global_client_list);
633	+
634	+	if ((node = dlinkFindDelete(&global_server_list, source_p)))
635	+	free_dlink_node(node);
636	+	}
637
638		/* Remove source_p from the client lists */
639	<	if (HasID(source_p))
639	>	if (source_p->id[0])
640		hash_del_id(source_p);
641	+
642		if (source_p->name[0])
643		hash_del_client(source_p);
644
645	<	if (IsUserHostIp(source_p))
646	<	delete_user_host(source_p->username, source_p->host, !MyConnect(source_p));
792	<
793	<	/* remove from global client list
794	<	* NOTE: source_p->node.next cannot be NULL if the client is added
795	<	*       to global_client_list (there is always &me at its end)
796	<	*/
797	<	if (source_p != NULL && source_p->node.next != NULL)
798	<	dlinkDelete(&source_p->node, &global_client_list);
645	>	if (HasFlag(source_p, FLAGS_USERHOST))
646	>	userhost_del(source_p->username, source_p->host, !MyConnect(source_p));
647
648		update_client_exit_stats(source_p);
649
#	Line 807 | Line 655 | exit_one_client(struct Client *source_p,
655		dlinkAdd(source_p, make_dlink_node(), &dead_list);
656		}
657
658	<	/* Recursively send QUITs and SQUITs for source_p and all its dependent clients
811	<	* and servers to those servers that need them.  A server needs the client
812	<	* QUITs if it can't figure them out from the SQUIT (ie pre-TS4) or if it
813	<	* isn't getting the SQUIT because of @#(*&@)# hostmasking.  With TS4, once
814	<	* a link gets a SQUIT, it doesn't need any QUIT/SQUITs for clients depending
815	<	* on that one -orabidoo
816	<	*
817	<	* This is now called on each local server -adx
818	<	*/
819	<	static void
820	<	recurse_send_quits(struct Client *original_source_p, struct Client *source_p,
821	<	struct Client *from, struct Client *to, const char *comment,
822	<	const char *splitstr, const char *myname)
823	<	{
824	<	dlink_node *ptr, *next;
825	<	struct Client *target_p;
826	<	int hidden = match(myname, source_p->name);
827	<
828	<	assert(to != source_p);  /* should be already removed from serv_list */
829	<
830	<	/* If this server can handle quit storm (QS) removal
831	<	* of dependents, just send the SQUIT
832	<	*
833	<	* Always check *all* dependent servers if some of them are
834	<	* hidden behind fakename. If so, send out the QUITs -adx
835	<	*/
836	<	if (hidden || !IsCapable(to, CAP_QS))
837	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->users.head)
838	<	{
839	<	target_p = ptr->data;
840	<	sendto_one(to, ":%s QUIT :%s", target_p->name, splitstr);
841	<	}
842	<
843	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->servers.head)
844	<	recurse_send_quits(original_source_p, ptr->data, from, to,
845	<	comment, splitstr, myname);
846	<
847	<	if (!hidden && ((source_p == original_source_p && to != from) ||
848	<	!IsCapable(to, CAP_QS)))
849	<	{
850	<	/* don't use a prefix here - we have to be 100% sure the message
851	<	* will be accepted without Unknown prefix etc.. */
852	<	sendto_one(to, "SQUIT %s :%s", ID_or_name(source_p, to), comment);
853	<	}
854	<	}
855	<
856	<	/*
658	>	/*
659		* Remove all clients that depend on source_p; assumes all (S)QUITs have
660	<	* already been sent.  we make sure to exit a server's dependent clients
661	<	* and servers before the server itself; exit_one_client takes care of
660	>	* already been sent.  we make sure to exit a server's dependent clients
661	>	* and servers before the server itself; exit_one_client takes care of
662		* actually removing things off llists.   tweaked from +CSr31  -orabidoo
663		*/
664		static void
665	<	recurse_remove_clients(struct Client *source_p, const char *quitmsg)
665	>	recurse_remove_clients(struct Client *source_p, const char *comment)
666		{
667	<	dlink_node *ptr, *next;
866	<
867	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->users.head)
868	<	exit_one_client(ptr->data, quitmsg);
869	<
870	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->servers.head)
871	<	{
872	<	recurse_remove_clients(ptr->data, quitmsg);
873	<	exit_one_client(ptr->data, quitmsg);
874	<	}
667	>	dlink_node *node = NULL, *node_next = NULL;
668
669	<	assert(source_p->serv->dep_servers == 1);
670	<	assert(source_p->serv->dep_users == 0);
878	<	}
879	<
880	<	/*
881	<	** Remove *everything* that depends on source_p, from all lists, and sending
882	<	** all necessary QUITs and SQUITs.  source_p itself is still on the lists,
883	<	** and its SQUITs have been sent except for the upstream one  -orabidoo
884	<	*/
885	<	static void
886	<	remove_dependents(struct Client *source_p, struct Client *from,
887	<	const char *comment, const char *splitstr)
888	<	{
889	<	struct Client *to;
890	<	struct ConfItem *conf;
891	<	static char myname[HOSTLEN+1];
892	<	dlink_node *ptr;
669	>	DLINK_FOREACH_SAFE(node, node_next, source_p->serv->client_list.head)
670	>	exit_one_client(node->data, comment);
671
672	<	DLINK_FOREACH(ptr, serv_list.head)
672	>	DLINK_FOREACH_SAFE(node, node_next, source_p->serv->server_list.head)
673		{
674	<	to = ptr->data;
675	<
898	<	if ((conf = to->serv->sconf) != NULL)
899	<	strlcpy(myname, my_name_for_link(conf), sizeof(myname));
900	<	else
901	<	strlcpy(myname, me.name, sizeof(myname));
902	<	recurse_send_quits(source_p, source_p, from, to,
903	<	comment, splitstr, myname);
674	>	recurse_remove_clients(node->data, comment);
675	>	exit_one_client(node->data, comment);
676		}
905	–
906	–	recurse_remove_clients(source_p, splitstr);
677		}
678
679		/*
#	Line 911 | Line 681 | remove_dependents(struct Client *source_
681		* this on any struct Client, regardless of its state.
682		*
683		* Note, you shouldn't exit remote _users_ without first doing
684	<	* SetKilled and propagating a kill or similar message. However,
685	<	* it is perfectly correct to call exit_client to force a _server_
684	>	* AddFlag(x, FLAGS_KILLED) and propagating a kill or similar message.
685	>	*
686	>	* However, it is perfectly correct to call exit_client to force a _server_
687		* quit (either local or remote one).
688		*
689	+	*
690		* inputs:       - a client pointer that is going to be exited
919	–	*               - for servers, the second argument is a pointer to who
920	–	*                 is firing the server. This side won't get any generated
921	–	*                 messages. NEVER NULL!
691		* output:       none
692		* side effects: the client is delinked from all lists, disconnected,
693		*               and the rest of IRC network is notified of the exit.
694		*               Client memory is scheduled to be freed
695		*/
696		void
697	<	exit_client(struct Client *source_p, struct Client *from, const char *comment)
697	>	exit_client(struct Client *source_p, const char *comment)
698		{
699	<	dlink_node *m;
699	>	dlink_node *node = NULL;
700	>
701	>	assert(!IsMe(source_p));
702	>	assert(source_p != &me);
703
704		if (MyConnect(source_p))
705		{
706		/* DO NOT REMOVE. exit_client can be called twice after a failed
707		* read/write.
708		*/
709	<	if (IsClosing(source_p))
709	>	if (HasFlag(source_p, FLAGS_CLOSING))
710		return;
711
712	<	SetClosing(source_p);
941	<
942	<	if (IsIpHash(source_p))
943	<	remove_one_ip(&source_p->localClient->ip);
712	>	AddFlag(source_p, FLAGS_CLOSING);
713
714	<	delete_auth(source_p);
946	<
947	<	/* This source_p could have status of one of STAT_UNKNOWN, STAT_CONNECTING
948	<	* STAT_HANDSHAKE or STAT_UNKNOWN
949	<	* all of which are lumped together into unknown_list
950	<	*
951	<	* In all above cases IsRegistered() will not be true.
952	<	*/
953	<	if (!IsRegistered(source_p))
714	>	if (HasFlag(source_p, FLAGS_IPHASH))
715		{
716	<	if ((m = dlinkFindDelete(&unknown_list, source_p)) != NULL)
717	<	free_dlink_node(m);
716	>	DelFlag(source_p, FLAGS_IPHASH);
717	>	ipcache_remove_address(&source_p->connection->ip);
718		}
719	<	else if (IsClient(source_p))
719	>
720	>	delete_auth(&source_p->connection->auth);
721	>
722	>	if (IsClient(source_p))
723		{
724	<	Count.local--;
724	>	time_t on_for = CurrentTime - source_p->connection->firsttime;
725
726	<	if (IsOper(source_p))
727	<	{
728	<	if ((m = dlinkFindDelete(&oper_list, source_p)) != NULL)
729	<	free_dlink_node(m);
730	<	}
726	>	assert(Count.local > 0);
727	>
728	>	--Count.local;
729	>
730	>	if (HasUMode(source_p, UMODE_OPER))
731	>	if ((node = dlinkFindDelete(&oper_list, source_p)))
732	>	free_dlink_node(node);
733
734	<	dlinkDelete(&source_p->localClient->lclient_node, &local_client_list);
735	<	if (source_p->localClient->list_task != NULL)
736	<	free_list_task(source_p->localClient->list_task, source_p);
734	>	assert(dlinkFind(&local_client_list, source_p));
735	>	dlinkDelete(&source_p->connection->lclient_node, &local_client_list);
736	>
737	>	if (source_p->connection->list_task)
738	>	free_list_task(source_p);
739
740		watch_del_watch_list(source_p);
973	–	sendto_realops_flags(UMODE_CCONN, L_ALL, "Client exiting: %s (%s@%s) [%s] [%s]",
974	–	source_p->name, source_p->username, source_p->host, comment,
975	–	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
976	–	"255.255.255.255" : source_p->sockhost);
977	–	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL, "CLIEXIT: %s %s %s %s 0 %s",
978	–	source_p->name,
979	–	source_p->username,
980	–	source_p->host,
981	–
982	–	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
983	–	"255.255.255.255" : source_p->sockhost,
984	–	comment);
985	–	}
741
742	<	/* As soon as a client is known to be a server of some sort
743	<	* it has to be put on the serv_list, or SJOIN's to this new server
744	<	* from the connect burst will not be seen.
745	<	*/
746	<	if (IsServer(source_p) || IsConnecting(source_p) ||
747	<	IsHandshake(source_p))
742	>	sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
743	>	"Client exiting: %s (%s@%s) [%s] [%s]",
744	>	source_p->name, source_p->username, source_p->host,
745	>	source_p->sockhost, comment);
746	>
747	>	ilog(LOG_TYPE_USER, "%s (%3u:%02u:%02u): %s!%s@%s %ju/%ju",
748	>	date_ctime(source_p->connection->firsttime), (unsigned int)(on_for / 3600),
749	>	(unsigned int)((on_for % 3600)/60), (unsigned int)(on_for % 60),
750	>	source_p->name, source_p->username, source_p->host,
751	>	source_p->connection->send.bytes>>10,
752	>	source_p->connection->recv.bytes>>10);
753	>	}
754	>	else if (IsServer(source_p))
755		{
756	<	if ((m = dlinkFindDelete(&serv_list, source_p)) != NULL)
995	<	{
996	<	free_dlink_node(m);
997	<	unset_chcap_usage_counts(source_p);
998	<	}
756	>	assert(Count.myserver > 0);
757
758	<	if (IsServer(source_p))
1001	<	{
1002	<	Count.myserver--;
1003	<	if (ServerInfo.hub)
1004	<	remove_lazylink_flags(source_p->localClient->serverMask);
1005	<	else
1006	<	uplink = NULL;
1007	<	}
1008	<	}
758	>	--Count.myserver;
759
760	<	log_user_exit(source_p);
760	>	assert(dlinkFind(&local_server_list, source_p));
761	>	dlinkDelete(&source_p->connection->lclient_node, &local_server_list);
762	>	}
763	>	else
764	>	{
765	>	assert(dlinkFind(&unknown_list, source_p));
766	>	dlinkDelete(&source_p->connection->lclient_node, &unknown_list);
767	>	}
768
769		if (!IsDead(source_p))
770		{
771		if (IsServer(source_p))
772		{
773	<	/* for them, we are exiting the network */
774	<	sendto_one(source_p, ":%s SQUIT %s :%s",
775	<	ID_or_name(from, source_p), me.name, comment);
773	>	if (!HasFlag(source_p, FLAGS_SQUIT))
774	>	{
775	>	/* for them, we are exiting the network */
776	>	sendto_one(source_p, ":%s SQUIT %s :%s",
777	>	me.id, me.id, comment);
778	>	}
779		}
780
781		sendto_one(source_p, "ERROR :Closing Link: %s (%s)",
782		source_p->host, comment);
783		}
784
1025	–	/*
1026	–	** Currently only server connections can have
1027	–	** depending remote clients here, but it does no
1028	–	** harm to check for all local clients. In
1029	–	** future some other clients than servers might
1030	–	** have remotes too...
1031	–	**
1032	–	** Close the Client connection first and mark it
1033	–	** so that no messages are attempted to send to it.
1034	–	** Remember it makes source_p->from == NULL.
1035	–	*/
785		close_connection(source_p);
786		}
787	+	else if (IsClient(source_p) && HasFlag(source_p->servptr, FLAGS_EOB))
788	+	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
789	+	"Client exiting at %s: %s (%s@%s) [%s] [%s]",
790	+	source_p->servptr->name, source_p->name,
791	+	source_p->username, source_p->host, source_p->sockhost, comment);
792
793		if (IsServer(source_p))
794		{
795	<	char splitstr[HOSTLEN + HOSTLEN + 2];
795	>	char splitstr[HOSTLEN + HOSTLEN + 2] = "";
796
797	<	/* This shouldn't ever happen */
798	<	assert(source_p->serv != NULL && source_p->servptr != NULL);
797	>	assert(source_p->serv);
798	>	assert(source_p->servptr);
799
800		if (ConfigServerHide.hide_servers)
801	<	/* set netsplit message to "*.net *.split" to still show
801	>	/*
802	>	* Set netsplit message to "*.net *.split" to still show
803		* that its a split, but hide the servers splitting
804		*/
805	<	strcpy(splitstr, "*.net *.split");
805	>	strlcpy(splitstr, "*.net *.split", sizeof(splitstr));
806		else
807		snprintf(splitstr, sizeof(splitstr), "%s %s",
808		source_p->servptr->name, source_p->name);
809
810	<	remove_dependents(source_p, from->from, comment, splitstr);
811	<
812	<	if (source_p->servptr == &me)
813	<	{
814	<	sendto_realops_flags(UMODE_ALL, L_ALL,
815	<	"%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
816	<	source_p->name, (int)(CurrentTime - source_p->firsttime),
817	<	source_p->localClient->send.bytes >> 10,
818	<	source_p->localClient->recv.bytes >> 10);
819	<	ilog(L_NOTICE, "%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
820	<	source_p->name, (int)(CurrentTime - source_p->firsttime),
821	<	source_p->localClient->send.bytes >> 10,
822	<	source_p->localClient->recv.bytes >> 10);
823	<	}
824	<	}
825	<	else if (IsClient(source_p) && !IsKilled(source_p))
826	<	{
827	<	sendto_server(from->from, source_p, NULL, CAP_TS6, NOCAPS, NOFLAGS,
828	<	":%s QUIT :%s", ID(source_p), comment);
829	<	sendto_server(from->from, source_p, NULL, NOCAPS, CAP_TS6, NOFLAGS,
830	<	":%s QUIT :%s", source_p->name, comment);
831	<	}
810	>	/* Send SQUIT for source_p in every direction. source_p is already off of local_server_list here */
811	>	if (!HasFlag(source_p, FLAGS_SQUIT))
812	>	sendto_server(NULL, 0, 0, "SQUIT %s :%s", source_p->id, comment);
813	>
814	>	/* Now exit the clients internally */
815	>	recurse_remove_clients(source_p, splitstr);
816	>
817	>	if (MyConnect(source_p))
818	>	{
819	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
820	>	"%s was connected for %s. %ju/%ju sendK/recvK.",
821	>	source_p->name, time_dissect(CurrentTime - source_p->connection->firsttime),
822	>	source_p->connection->send.bytes >> 10,
823	>	source_p->connection->recv.bytes >> 10);
824	>	ilog(LOG_TYPE_IRCD, "%s was connected for %s. %ju/%ju sendK/recvK.",
825	>	source_p->name, time_dissect(CurrentTime - source_p->connection->firsttime),
826	>	source_p->connection->send.bytes >> 10,
827	>	source_p->connection->recv.bytes >> 10);
828	>	}
829	>	}
830	>	else if (IsClient(source_p) && !HasFlag(source_p, FLAGS_KILLED))
831	>	sendto_server(source_p->from, 0, 0, ":%s QUIT :%s",
832	>	source_p->id, comment);
833
834		/* The client *better* be off all of the lists */
835		assert(dlinkFind(&unknown_list, source_p) == NULL);
836		assert(dlinkFind(&local_client_list, source_p) == NULL);
837	<	assert(dlinkFind(&serv_list, source_p) == NULL);
837	>	assert(dlinkFind(&local_server_list, source_p) == NULL);
838		assert(dlinkFind(&oper_list, source_p) == NULL);
839
840		exit_one_client(source_p, comment);
#	Line 1091 | Line 847 | exit_client(struct Client *source_p, str
847		void
848		dead_link_on_write(struct Client *client_p, int ierrno)
849		{
850	<	dlink_node *ptr;
850	>	dlink_node *node;
851
852		if (IsDefunct(client_p))
853		return;
854
855	<	dbuf_clear(&client_p->localClient->buf_recvq);
856	<	dbuf_clear(&client_p->localClient->buf_sendq);
855	>	dbuf_clear(&client_p->connection->buf_recvq);
856	>	dbuf_clear(&client_p->connection->buf_sendq);
857
858		assert(dlinkFind(&abort_list, client_p) == NULL);
859	<	ptr = make_dlink_node();
859	>	node = make_dlink_node();
860		/* don't let exit_aborted_clients() finish yet */
861	<	dlinkAddTail(client_p, ptr, &abort_list);
861	>	dlinkAddTail(client_p, node, &abort_list);
862
863		if (eac_next == NULL)
864	<	eac_next = ptr;
864	>	eac_next = node;
865
866		SetDead(client_p); /* You are dead my friend */
867		}
#	Line 1117 | Line 873 | dead_link_on_write(struct Client *client
873		void
874		dead_link_on_read(struct Client *client_p, int error)
875		{
876	<	char errmsg[255];
876	>	char errmsg[IRCD_BUFSIZE];
877		int current_error;
878
879		if (IsDefunct(client_p))
880		return;
881
882	<	dbuf_clear(&client_p->localClient->buf_recvq);
883	<	dbuf_clear(&client_p->localClient->buf_sendq);
882	>	dbuf_clear(&client_p->connection->buf_recvq);
883	>	dbuf_clear(&client_p->connection->buf_sendq);
884
885	<	current_error = get_sockerr(client_p->localClient->fd.fd);
885	>	current_error = get_sockerr(client_p->connection->fd.fd);
886
887		if (IsServer(client_p) || IsHandshake(client_p))
888		{
1133	–	int connected = CurrentTime - client_p->firsttime;
1134	–
889		if (error == 0)
890		{
891		/* Admins get the real IP */
892	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
893	<	"Server %s closed the connection",
894	<	get_client_name(client_p, SHOW_IP));
892	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
893	>	"Server %s closed the connection",
894	>	get_client_name(client_p, SHOW_IP));
895
896		/* Opers get a masked IP */
897	<	sendto_realops_flags(UMODE_ALL, L_OPER,
898	<	"Server %s closed the connection",
899	<	get_client_name(client_p, MASK_IP));
897	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
898	>	"Server %s closed the connection",
899	>	get_client_name(client_p, MASK_IP));
900
901	<	ilog(L_NOTICE, "Server %s closed the connection",
902	<	get_client_name(client_p, SHOW_IP));
901	>	ilog(LOG_TYPE_IRCD, "Server %s closed the connection",
902	>	get_client_name(client_p, SHOW_IP));
903		}
904		else
905		{
906		report_error(L_ADMIN, "Lost connection to %s: %s",
907	<	get_client_name(client_p, SHOW_IP), current_error);
907	>	get_client_name(client_p, SHOW_IP), current_error);
908		report_error(L_OPER, "Lost connection to %s: %s",
909	<	get_client_name(client_p, MASK_IP), current_error);
909	>	get_client_name(client_p, MASK_IP), current_error);
910		}
911
912	<	sendto_realops_flags(UMODE_ALL, L_ALL,
913	<	"%s had been connected for %d day%s, %2d:%02d:%02d",
914	<	client_p->name, connected/86400,
1161	<	(connected/86400 == 1) ? "" : "s",
1162	<	(connected % 86400) / 3600, (connected % 3600) / 60,
1163	<	connected % 60);
912	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
913	>	"%s was connected for %s",
914	>	client_p->name, time_dissect(CurrentTime - client_p->connection->firsttime));
915		}
916
917		if (error == 0)
918		strlcpy(errmsg, "Remote host closed the connection",
919		sizeof(errmsg));
920		else
921	<	ircsprintf(errmsg, "Read error: %s",
922	<	strerror(current_error));
921	>	snprintf(errmsg, sizeof(errmsg), "Read error: %s",
922	>	strerror(current_error));
923
924	<	exit_client(client_p, &me, errmsg);
924	>	exit_client(client_p, errmsg);
925		}
926
927		void
#	Line 1187 | Line 938 | exit_aborted_clients(void)
938
939		if (target_p == NULL)
940		{
941	<	sendto_realops_flags(UMODE_ALL, L_ALL,
941	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
942		"Warning: null client on abort_list!");
943		dlinkDelete(ptr, &abort_list);
944		free_dlink_node(ptr);
#	Line 1196 | Line 947 | exit_aborted_clients(void)
947
948		dlinkDelete(ptr, &abort_list);
949
950	<	if (IsSendQExceeded(target_p))
950	>	if (HasFlag(target_p, FLAGS_SENDQEX))
951		notice = "Max SendQ exceeded";
952		else
953		notice = "Write error: connection closed";
954
955	<	exit_client(target_p, &me, notice);
955	>	exit_client(target_p, notice);
956		free_dlink_node(ptr);
957		}
958		}
959
960		/*
961		* accept processing, this adds a form of "caller ID" to ircd
962	<	*
962	>	*
963		* If a client puts themselves into "caller ID only" mode,
964	<	* only clients that match a client pointer they have put on
964	>	* only clients that match a client pointer they have put on
965		* the accept list will be allowed to message them.
966		*
967	<	* [ source.on_allow_list ] -> [ target1 ] -> [ target2 ]
1217	<	*
1218	<	* [target.allow_list] -> [ source1 ] -> [source2 ]
1219	<	*
1220	<	* i.e. a target will have a link list of source pointers it will allow
1221	<	* each source client then has a back pointer pointing back
1222	<	* to the client that has it on its accept list.
1223	<	* This allows for exit_one_client to remove these now bogus entries
1224	<	* from any client having an accept on them.
967	>	* Diane Bruce, "Dianora" db@db.net
968		*/
969
970	<	/* accept_message()
971	<	*
1229	<	* inputs       - pointer to source client
1230	<	*              - pointer to target client
1231	<	* output       - 1 if accept this message 0 if not
1232	<	* side effects - See if source is on target's allow list
1233	<	*/
1234	<	int
1235	<	accept_message(struct Client *source, struct Client *target)
970	>	void
971	>	del_accept(struct split_nuh_item *accept_p, struct Client *client_p)
972		{
973	<	dlink_node *ptr;
973	>	dlinkDelete(&accept_p->node, &client_p->connection->acceptlist);
974
975	<	DLINK_FOREACH(ptr, target->allow_list.head)
976	<	{
977	<	struct Client *target_p = ptr->data;
975	>	xfree(accept_p->nickptr);
976	>	xfree(accept_p->userptr);
977	>	xfree(accept_p->hostptr);
978	>	xfree(accept_p);
979	>	}
980
981	<	if (source == target_p)
982	<	return (1);
983	<	}
981	>	struct split_nuh_item *
982	>	find_accept(const char *nick, const char *user,
983	>	const char *host, struct Client *client_p,
984	>	int (*cmpfunc)(const char *, const char *))
985	>	{
986	>	dlink_node *node = NULL;
987
988	<	if (IsSoftCallerId(target))
988	>	DLINK_FOREACH(node, client_p->connection->acceptlist.head)
989		{
990	<	DLINK_FOREACH(ptr, target->channel.head)
991	<	if (IsMember(source, ((struct Membership *)ptr->data)->chptr))
992	<	return (1);
990	>	struct split_nuh_item *accept_p = node->data;
991	>
992	>	if (!cmpfunc(accept_p->nickptr, nick) &&
993	>	!cmpfunc(accept_p->userptr, user) &&
994	>	!cmpfunc(accept_p->hostptr, host))
995	>	return accept_p;
996		}
997
998	<	return (0);
998	>	return NULL;
999		}
1000
1001	<	/* del_from_accept()
1258	<	*
1259	<	* inputs       - pointer to source client
1260	<	*              - pointer to target client
1261	<	* output       - NONE
1262	<	* side effects - Delete's source pointer to targets allow list
1001	>	/* accept_message()
1002		*
1003	<	* Walk through the target's accept list, remove if source is found,
1004	<	* Then walk through the source's on_accept_list remove target if found.
1003	>	* inputs       - pointer to source client
1004	>	*              - pointer to target client
1005	>	* output       - 1 if accept this message 0 if not
1006	>	* side effects - See if source is on target's allow list
1007		*/
1008	<	void
1009	<	del_from_accept(struct Client *source, struct Client *target)
1008	>	int
1009	>	accept_message(struct Client *source,
1010	>	struct Client *target)
1011		{
1012	<	dlink_node *ptr;
1271	<	dlink_node *ptr2;
1272	<	dlink_node *next_ptr;
1273	<	dlink_node *next_ptr2;
1274	<	struct Client *target_p;
1012	>	dlink_node *node = NULL;
1013
1014	<	DLINK_FOREACH_SAFE(ptr, next_ptr, target->allow_list.head)
1015	<	{
1016	<	target_p = ptr->data;
1014	>	if (HasFlag(source, FLAGS_SERVICE) ||
1015	>	(HasUMode(source, UMODE_OPER) && ConfigGeneral.opers_bypass_callerid))
1016	>	return 1;
1017
1018	<	if (source == target_p)
1019	<	{
1020	<	dlinkDelete(ptr, &target->allow_list);
1283	<	free_dlink_node(ptr);
1018	>	if (source == target || find_accept(source->name, source->username,
1019	>	source->host, target, match))
1020	>	return 1;
1021
1022	<	DLINK_FOREACH_SAFE(ptr2, next_ptr2, source->on_allow_list.head)
1023	<	{
1024	<	target_p = ptr2->data;
1022	>	if (!HasUMode(target, UMODE_CALLERID) && HasUMode(target, UMODE_SOFTCALLERID))
1023	>	DLINK_FOREACH(node, target->channel.head)
1024	>	if (IsMember(source, ((struct Membership *)node->data)->chptr))
1025	>	return 1;
1026
1027	<	if (target == target_p)
1290	<	{
1291	<	dlinkDelete(ptr2, &source->on_allow_list);
1292	<	free_dlink_node(ptr2);
1293	<	}
1294	<	}
1295	<	}
1296	<	}
1027	>	return 0;
1028		}
1029
1030		/* del_all_accepts()
1031		*
1032	<	* inputs       - pointer to exiting client
1033	<	* output       - NONE
1034	<	* side effects - Walk through given clients allow_list and on_allow_list
1304	<	*                remove all references to this client
1032	>	* inputs       - pointer to exiting client
1033	>	* output       - NONE
1034	>	* side effects - Walk through given clients acceptlist and remove all entries
1035		*/
1036		void
1037		del_all_accepts(struct Client *client_p)
1038		{
1039	<	dlink_node *ptr, *next_ptr;
1310	<
1311	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->allow_list.head)
1312	<	del_from_accept(ptr->data, client_p);
1039	>	dlink_node *node = NULL, *node_next = NULL;
1040
1041	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->on_allow_list.head)
1042	<	del_from_accept(client_p, ptr->data);
1041	>	DLINK_FOREACH_SAFE(node, node_next, client_p->connection->acceptlist.head)
1042	>	del_accept(node->data, client_p);
1043		}
1044
1045	<	/* del_all_their_accepts()
1046	<	*
1047	<	* inputs       - pointer to exiting client
1321	<	* output       - NONE
1322	<	* side effects - Walk through given clients on_allow_list
1323	<	*                remove all references to this client,
1324	<	*                allow this client to keep their own allow_list
1325	<	*/
1326	<	void
1327	<	del_all_their_accepts(struct Client *client_p)
1045	>	unsigned int
1046	>	client_get_idle_time(const struct Client *source_p,
1047	>	const struct Client *target_p)
1048		{
1049	<	dlink_node *ptr, *next_ptr;
1049	>	unsigned int idle = 0;
1050	>	unsigned int min_idle = 0;
1051	>	unsigned int max_idle = 0;
1052	>	const struct ClassItem *const class = get_class_ptr(&target_p->connection->confs);
1053
1054	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->on_allow_list.head)
1055	<	del_from_accept(client_p, ptr->data);
1333	<	}
1054	>	if (!(class->flags & CLASS_FLAGS_FAKE_IDLE) || target_p == source_p)
1055	>	return CurrentTime - target_p->connection->last_privmsg;
1056
1057	<	/* set_initial_nick()
1058	<	*
1059	<	* inputs
1338	<	* output
1339	<	* side effects -
1340	<	*
1341	<	* This function is only called to set up an initially registering
1342	<	* client.
1343	<	*/
1344	<	void
1345	<	set_initial_nick(struct Client *client_p, struct Client *source_p,
1346	<	const char *nick)
1347	<	{
1348	<	char buf[USERLEN + 1];
1057	>	if (HasUMode(source_p, UMODE_OPER) &&
1058	>	!(class->flags & CLASS_FLAGS_HIDE_IDLE_FROM_OPERS))
1059	>	return CurrentTime - target_p->connection->last_privmsg;
1060
1061	<	/* Client setting NICK the first time */
1062	<
1352	<	/* This had to be copied here to avoid problems.. */
1353	<	source_p->tsinfo = CurrentTime;
1354	<	source_p->localClient->registration &= ~REG_NEED_NICK;
1061	>	min_idle = class->min_idle;
1062	>	max_idle = class->max_idle;
1063
1064	<	if (source_p->name[0])
1065	<	hash_del_client(source_p);
1064	>	if (min_idle == max_idle)
1065	>	return min_idle;
1066
1067	<	strlcpy(source_p->name, nick, sizeof(source_p->name));
1068	<	hash_add_client(source_p);
1067	>	if (class->flags & CLASS_FLAGS_RANDOM_IDLE)
1068	>	idle = genrand_int32();
1069	>	else
1070	>	idle = CurrentTime - target_p->connection->last_privmsg;
1071
1072	<	/* fd_desc is long enough */
1073	<	fd_note(&client_p->localClient->fd, "Nick: %s", nick);
1074	<
1075	<	/* They have the nick they want now.. */
1366	<	client_p->llname[0] = '\0';
1072	>	if (!max_idle)
1073	>	idle = 0;
1074	>	else
1075	>	idle %= max_idle;
1076
1077	<	if (!source_p->localClient->registration)
1078	<	{
1370	<	strlcpy(buf, source_p->username, sizeof(buf));
1077	>	if (idle < min_idle)
1078	>	idle = min_idle + (idle % (max_idle - min_idle));
1079
1080	<	/*
1373	<	* USER already received, now we have NICK.
1374	<	* *NOTE* For servers "NICK" *must* precede the
1375	<	* user message (giving USER before NICK is possible
1376	<	* only for local client connection!). register_user
1377	<	* may reject the client and call exit_client for it
1378	<	* --must test this and exit m_nick too!!!
1379	<	*/
1380	<	register_local_user(client_p, source_p, nick, buf);
1381	<	}
1080	>	return idle;
1081		}
1082
1083	<	/* change_local_nick()
1083	>	/* client_init()
1084		*
1085	<	* inputs       - pointer to server
1086	<	*              - pointer to client
1087	<	*              - nick
1389	<	* output       -
1390	<	* side effects - changes nick of a LOCAL user
1085	>	* inputs       - NONE
1086	>	* output       - NONE
1087	>	* side effects - initialize client free memory
1088		*/
1089		void
1090	<	change_local_nick(struct Client *client_p, struct Client *source_p, const char *nick)
1090	>	client_init(void)
1091		{
1092	<	int samenick = 0;
1396	<
1397	<	/*
1398	<	** Client just changing his/her nick. If he/she is
1399	<	** on a channel, send note of change to all clients
1400	<	** on that channel. Propagate notice to other servers.
1401	<	*/
1402	<	if ((source_p->localClient->last_nick_change +
1403	<	ConfigFileEntry.max_nick_time) < CurrentTime)
1404	<	source_p->localClient->number_of_nick_changes = 0;
1405	<	source_p->localClient->last_nick_change = CurrentTime;
1406	<	source_p->localClient->number_of_nick_changes++;
1407	<
1408	<	if ((ConfigFileEntry.anti_nick_flood &&
1409	<	(source_p->localClient->number_of_nick_changes
1410	<	<= ConfigFileEntry.max_nick_changes)) ||
1411	<	!ConfigFileEntry.anti_nick_flood ||
1412	<	(IsOper(source_p) && ConfigFileEntry.no_oper_flood))
1092	>	static struct event event_ping =
1093		{
1094	<	samenick = !irccmp(source_p->name, nick);
1095	<
1096	<	if (!samenick)
1097	<	{
1098	<	/*
1099	<	* Make sure everyone that has this client on its accept list
1100	<	* loses that reference.
1101	<	*/
1422	<	del_all_their_accepts(source_p);
1423	<	source_p->tsinfo = CurrentTime;
1424	<	clear_ban_cache_client(source_p);
1425	<	}
1426	<
1427	<	/* XXX - the format of this notice should eventually be changed
1428	<	* to either %s[%s@%s], or even better would be get_client_name() -bill
1429	<	*/
1430	<	sendto_realops_flags(UMODE_NCHANGE, L_ALL, "Nick change: From %s to %s [%s@%s]",
1431	<	source_p->name, nick, source_p->username, source_p->host);
1432	<	sendto_common_channels_local(source_p, 1, ":%s!%s@%s NICK :%s",
1433	<	source_p->name, source_p->username,
1434	<	source_p->host, nick);
1435	<	add_history(source_p, 1);
1436	<
1437	<	/*
1438	<	* Only hubs care about lazy link nicks not being sent on yet
1439	<	* lazylink leafs/leafs always send their nicks up to hub,
1440	<	* hence must always propagate nick changes.
1441	<	* hubs might not propagate a nick change, if the leaf
1442	<	* does not know about that client yet.
1443	<	*/
1444	<	sendto_server(client_p, source_p, NULL, CAP_TS6, NOCAPS, NOFLAGS,
1445	<	":%s NICK %s :%lu",
1446	<	ID(source_p), nick, (unsigned long)source_p->tsinfo);
1447	<	sendto_server(client_p, source_p, NULL, NOCAPS, CAP_TS6, NOFLAGS,
1448	<	":%s NICK %s :%lu",
1449	<	source_p->name, nick, (unsigned long)source_p->tsinfo);
1450	<	}
1451	<	else
1452	<	{
1453	<	sendto_one(source_p, form_str(ERR_NICKTOOFAST),
1454	<	me.name, source_p->name, source_p->name,
1455	<	nick, ConfigFileEntry.max_nick_time);
1456	<	return;
1457	<	}
1458	<
1459	<	/* Finally, add to hash */
1460	<	if (source_p->name[0])
1461	<	hash_del_client(source_p);
1462	<
1463	<	if (!samenick)
1464	<	{
1465	<	clear_ban_cache_client(source_p);
1466	<	watch_check_hash(source_p, RPL_LOGOFF);
1467	<	}
1468	<
1469	<	strcpy(source_p->name, nick);
1470	<	hash_add_client(source_p);
1471	<
1472	<	if (!samenick)
1473	<	watch_check_hash(source_p, RPL_LOGON);
1474	<
1475	<	/* fd_desc is long enough */
1476	<	fd_note(&client_p->localClient->fd, "Nick: %s", nick);
1094	>	.name = "check_pings",
1095	>	.handler = check_pings,
1096	>	.when = 5
1097	>	};
1098	>
1099	>	client_pool = mp_pool_new(sizeof(struct Client), MP_CHUNK_SIZE_CLIENT);
1100	>	connection_pool = mp_pool_new(sizeof(struct Connection), MP_CHUNK_SIZE_CONNECTION);
1101	>	event_add(&event_ping, NULL);
1102		}

Diff Legend

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