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 650 by michael, Thu Jun 8 07:00:17 2006 UTC vs.
ircd-hybrid/trunk/src/client.c (file contents), Revision 4439 by michael, Sat Aug 9 18:36:19 2014 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  client.c: Controls clients.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2002 by the past and present ircd coders, and others.
4	>	*  Copyright (c) 1997-2014 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 18 | Line 17
17		*  along with this program; if not, write to the Free Software
18		*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
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 "log.h"
39	>	#include "misc.h"
40	>	#include "server.h"
41		#include "send.h"
42		#include "whowas.h"
43	<	#include "s_user.h"
49	<	#include "dbuf.h"
43	>	#include "user.h"
44		#include "memory.h"
45	+	#include "mempool.h"
46		#include "hostmask.h"
52	–	#include "balloc.h"
47		#include "listener.h"
54	–	#include "irc_res.h"
48		#include "userhost.h"
49	+	#include "watch.h"
50	+	#include "rng_mt.h"
51	+	#include "parse.h"
52	+	#include "ipcache.h"
53	+
54	+
55	+	dlink_list listing_client_list;
56	+	dlink_list unknown_list;
57	+	dlink_list local_client_list;
58	+	dlink_list local_server_list;
59	+	dlink_list global_client_list;
60	+	dlink_list global_server_list;
61	+	dlink_list oper_list;
62
63	<	dlink_list listing_client_list = { NULL, NULL, 0 };
64	<	/* Pointer to beginning of Client list */
59	<	dlink_list global_client_list = {NULL, NULL, 0};
60	<	/* unknown/client pointer lists */
61	<	dlink_list unknown_list = {NULL, NULL, 0};
62	<	dlink_list local_client_list = {NULL, NULL, 0};
63	<	dlink_list serv_list = {NULL, NULL, 0};
64	<	dlink_list global_serv_list = {NULL, NULL, 0};
65	<	dlink_list oper_list = {NULL, NULL, 0};
66	<
67	<	static EVH check_pings;
68	<
69	<	static BlockHeap *client_heap  = NULL;
70	<	static BlockHeap *lclient_heap = NULL;
71	<
72	<	static dlink_list dead_list  = { NULL, NULL, 0};
73	<	static dlink_list abort_list = { NULL, NULL, 0};
74	<
63	>	static mp_pool_t *client_pool, *lclient_pool;
64	>	static dlink_list dead_list, abort_list;
65		static dlink_node *eac_next;  /* next aborted client to exit */
66
77	–	static void check_pings_list(dlink_list *);
78	–	static void check_unknowns_list(void);
79	–	static void ban_them(struct Client *client_p, struct ConfItem *conf);
80	–
81	–
82	–	/* init_client()
83	–	*
84	–	* inputs       - NONE
85	–	* output       - NONE
86	–	* side effects - initialize client free memory
87	–	*/
88	–	void
89	–	init_client(void)
90	–	{
91	–	/* start off the check ping event ..  -- adrian
92	–	* Every 30 seconds is plenty -- db
93	–	*/
94	–	client_heap = BlockHeapCreate("client", sizeof(struct Client), CLIENT_HEAP_SIZE);
95	–	lclient_heap = BlockHeapCreate("local client", sizeof(struct LocalUser), LCLIENT_HEAP_SIZE);
96	–	eventAdd("check_pings", check_pings, NULL, 5);
97	–	}
67
68		/*
69		* make_client - create a new Client struct and set it to initial state.
#	Line 114 | Line 83 | init_client(void)
83		struct Client *
84		make_client(struct Client *from)
85		{
86	<	struct Client *client_p = BlockHeapAlloc(client_heap);
86	>	struct Client *client_p = mp_pool_get(client_pool);
87
88	<	if (from == NULL)
88	>	if (!from)
89		{
90	<	client_p->from  = client_p; /* 'from' of local client is self! */
91	<	client_p->since = client_p->lasttime = client_p->firsttime = CurrentTime;
92	<
93	<	client_p->localClient = BlockHeapAlloc(lclient_heap);
90	>	client_p->from                      = client_p; /* 'from' of local client is self! */
91	>	client_p->localClient               = mp_pool_get(lclient_pool);
92	>	client_p->localClient->since        = CurrentTime;
93	>	client_p->localClient->lasttime     = CurrentTime;
94	>	client_p->localClient->firsttime    = CurrentTime;
95		client_p->localClient->registration = REG_INIT;
96	+
97		/* as good a place as any... */
98	<	dlinkAdd(client_p, make_dlink_node(), &unknown_list);
98	>	dlinkAdd(client_p, &client_p->localClient->lclient_node, &unknown_list);
99		}
100		else
101		client_p->from = from; /* 'from' of local client is self! */
102
103	+	client_p->idhnext = client_p;
104		client_p->hnext  = client_p;
105	<	client_p->status = STAT_UNKNOWN;
105	>	SetUnknown(client_p);
106		strcpy(client_p->username, "unknown");
107	+	strcpy(client_p->svid, "0");
108
109		return client_p;
110		}
#	Line 146 | Line 119 | make_client(struct Client *from)
119		static void
120		free_client(struct Client *client_p)
121		{
122	<	assert(client_p != NULL);
122	>	assert(client_p);
123		assert(client_p != &me);
124		assert(client_p->hnext == client_p);
125	+	assert(client_p->idhnext == client_p);
126		assert(client_p->channel.head == NULL);
127		assert(dlink_list_length(&client_p->channel) == 0);
128	+	assert(dlink_list_length(&client_p->whowas) == 0);
129	+	assert(!IsServer(client_p) || client_p->serv);
130
155	–	MyFree(client_p->away);
131		MyFree(client_p->serv);
132	+	MyFree(client_p->certfp);
133
134		if (MyConnect(client_p))
135		{
136		assert(client_p->localClient->invited.head == NULL);
137		assert(dlink_list_length(&client_p->localClient->invited) == 0);
138	+	assert(dlink_list_length(&client_p->localClient->watches) == 0);
139		assert(IsClosing(client_p) && IsDead(client_p));
140
141	<	MyFree(client_p->localClient->response);
142	<	MyFree(client_p->localClient->auth_oper);
141	>	MyFree(client_p->localClient->challenge_response);
142	>	MyFree(client_p->localClient->challenge_operator);
143	>	client_p->localClient->challenge_response = NULL;
144	>	client_p->localClient->challenge_operator = NULL;
145
146		/*
147		* clean up extra sockets from P-lines which have been discarded.
148		*/
149		if (client_p->localClient->listener)
150		{
151	<	assert(0 < client_p->localClient->listener->ref_count);
152	<	if (0 == --client_p->localClient->listener->ref_count &&
174	<	!client_p->localClient->listener->active)
175	<	free_listener(client_p->localClient->listener);
151	>	listener_release(client_p->localClient->listener);
152	>	client_p->localClient->listener = NULL;
153		}
154
155		dbuf_clear(&client_p->localClient->buf_recvq);
156		dbuf_clear(&client_p->localClient->buf_sendq);
157
158	<	BlockHeapFree(lclient_heap, client_p->localClient);
158	>	mp_pool_release(client_p->localClient);
159		}
160
161	<	BlockHeapFree(client_heap, client_p);
185	<	}
186	<
187	<	/*
188	<	* check_pings - go through the local client list and check activity
189	<	* kill off stuff that should die
190	<	*
191	<	* inputs       - NOT USED (from event)
192	<	* output       - next time_t when check_pings() should be called again
193	<	* side effects -
194	<	*
195	<	*
196	<	* A PING can be sent to clients as necessary.
197	<	*
198	<	* Client/Server ping outs are handled.
199	<	*/
200	<
201	<	/*
202	<	* Addon from adrian. We used to call this after nextping seconds,
203	<	* however I've changed it to run once a second. This is only for
204	<	* PING timeouts, not K/etc-line checks (thanks dianora!). Having it
205	<	* run once a second makes life a lot easier - when a new client connects
206	<	* and they need a ping in 4 seconds, if nextping was set to 20 seconds
207	<	* we end up waiting 20 seconds. This is stupid. :-)
208	<	* I will optimise (hah!) check_pings() once I've finished working on
209	<	* tidying up other network IO evilnesses.
210	<	*     -- adrian
211	<	*/
212	<
213	<	static void
214	<	check_pings(void *notused)
215	<	{
216	<	check_pings_list(&local_client_list);
217	<	check_pings_list(&serv_list);
218	<	check_unknowns_list();
161	>	mp_pool_release(client_p);
162		}
163
164		/* check_pings_list()
165		*
166		* inputs       - pointer to list to check
167		* output       - NONE
168	<	* side effects -
168	>	* side effects -
169		*/
170		static void
171		check_pings_list(dlink_list *list)
172		{
173	<	char scratch[32];        /* way too generous but... */
174	<	struct Client *client_p; /* current local client_p being examined */
175	<	int ping, pingwarn;      /* ping time value from client */
233	<	dlink_node *ptr, *next_ptr;
173	>	char buf[IRCD_BUFSIZE] = "";
174	>	int ping = 0;      /* ping time value from client */
175	>	dlink_node *ptr = NULL, *ptr_next = NULL;
176
177	<	DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
177	>	DLINK_FOREACH_SAFE(ptr, ptr_next, list->head)
178		{
179	<	client_p = ptr->data;
179	>	struct Client *client_p = ptr->data;
180
239	–	/*
240	–	** Note: No need to notify opers here. It's
241	–	** already done when "FLAGS_DEADSOCKET" is set.
242	–	*/
181		if (IsDead(client_p))
182	<	{
245	<	/* Ignore it, its been exited already */
246	<	continue;
247	<	}
248	<
249	<	if (client_p->localClient->reject_delay > 0)
250	<	{
251	<	if (client_p->localClient->reject_delay <= CurrentTime)
252	<	exit_client(client_p, &me, "Rejected");
253	<	continue;
254	<	}
255	<
256	<	if (GlobalSetOptions.idletime && IsClient(client_p))
257	<	{
258	<	if (!IsExemptKline(client_p) && !IsOper(client_p) &&
259	<	!IsIdlelined(client_p) &&
260	<	((CurrentTime - client_p->localClient->last) > GlobalSetOptions.idletime))
261	<	{
262	<	struct ConfItem *conf;
263	<	struct AccessItem *aconf;
264	<
265	<	conf = make_conf_item(KLINE_TYPE);
266	<	aconf = (struct AccessItem *)map_to_conf(conf);
267	<
268	<	DupString(aconf->host, client_p->host);
269	<	DupString(aconf->reason, "idle exceeder");
270	<	DupString(aconf->user, client_p->username);
271	<	aconf->hold = CurrentTime + 60;
272	<	add_temp_line(conf);
273	<
274	<	sendto_realops_flags(UMODE_ALL, L_ALL,
275	<	"Idle time limit exceeded for %s - temp k-lining",
276	<	get_client_name(client_p, HIDE_IP));
277	<	exit_client(client_p, &me, aconf->reason);
278	<	continue;
279	<	}
280	<	}
182	>	continue;  /* Ignore it, its been exited already */
183
184		if (!IsRegistered(client_p))
185	<	ping = CONNECTTIMEOUT, pingwarn = 0;
185	>	ping = CONNECTTIMEOUT;
186		else
187	<	ping = get_client_ping(client_p, &pingwarn);
187	>	ping = get_client_ping(&client_p->localClient->confs);
188
189	<	if (ping < CurrentTime - client_p->lasttime)
189	>	if (ping < CurrentTime - client_p->localClient->lasttime)
190		{
191		if (!IsPingSent(client_p))
192		{
193	<	/*
194	<	* if we havent PINGed the connection and we havent
195	<	* heard from it in a while, PING it to make sure
196	<	* it is still alive.
197	<	*/
198	<	SetPingSent(client_p);
199	<	ClearPingWarning(client_p);
200	<	client_p->lasttime = CurrentTime - ping;
299	<	sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
193	>	/*
194	>	* If we haven't PINGed the connection and we haven't
195	>	* heard from it in a while, PING it to make sure
196	>	* it is still alive.
197	>	*/
198	>	SetPingSent(client_p);
199	>	client_p->localClient->lasttime = CurrentTime - ping;
200	>	sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
201		}
202		else
203		{
204	<	if (CurrentTime - client_p->lasttime >= 2 * ping)
204	>	if (CurrentTime - client_p->localClient->lasttime >= 2 * ping)
205		{
206		/*
207		* If the client/server hasn't talked to us in 2*ping seconds
208		* and it has a ping time, then close its connection.
209		*/
210		if (IsServer(client_p) || IsHandshake(client_p))
211	<	{
212	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
213	<	"No response from %s, closing link",
214	<	get_client_name(client_p, HIDE_IP));
215	<	sendto_realops_flags(UMODE_ALL, L_OPER,
216	<	"No response from %s, closing link",
217	<	get_client_name(client_p, MASK_IP));
218	<	ilog(L_NOTICE, "No response from %s, closing link",
219	<	get_client_name(client_p, HIDE_IP));
220	<	}
221	<
222	<	ircsprintf(scratch, "Ping timeout: %d seconds",
223	<	(int)(CurrentTime - client_p->lasttime));
224	<	exit_client(client_p, &me, scratch);
324	<	}
325	<	else if (!IsPingWarning(client_p) && pingwarn > 0 &&
326	<	(IsServer(client_p) || IsHandshake(client_p)) &&
327	<	CurrentTime - client_p->lasttime >= ping + pingwarn)
328	<	{
329	<	/*
330	<	* If the server hasn't replied in pingwarn seconds after sending
331	<	* the PING, notify the opers so that they are aware of the problem.
332	<	*/
333	<	SetPingWarning(client_p);
334	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
335	<	"Warning, no response from %s in %d seconds",
336	<	get_client_name(client_p, HIDE_IP), pingwarn);
337	<	sendto_realops_flags(UMODE_ALL, L_OPER,
338	<	"Warning, no response from %s in %d seconds",
339	<	get_client_name(client_p, MASK_IP), pingwarn);
340	<	ilog(L_NOTICE, "No response from %s in %d seconds",
341	<	get_client_name(client_p, HIDE_IP), pingwarn);
211	>	{
212	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
213	>	"No response from %s, closing link",
214	>	get_client_name(client_p, HIDE_IP));
215	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
216	>	"No response from %s, closing link",
217	>	get_client_name(client_p, MASK_IP));
218	>	ilog(LOG_TYPE_IRCD, "No response from %s, closing link",
219	>	get_client_name(client_p, HIDE_IP));
220	>	}
221	>
222	>	snprintf(buf, sizeof(buf), "Ping timeout: %d seconds",
223	>	(int)(CurrentTime - client_p->localClient->lasttime));
224	>	exit_client(client_p, buf);
225		}
226		}
227		}
#	Line 354 | Line 237 | check_pings_list(dlink_list *list)
237		static void
238		check_unknowns_list(void)
239		{
240	<	dlink_node *ptr, *next_ptr;
240	>	dlink_node *ptr = NULL, *ptr_next = NULL;
241
242	<	DLINK_FOREACH_SAFE(ptr, next_ptr, unknown_list.head)
242	>	DLINK_FOREACH_SAFE(ptr, ptr_next, unknown_list.head)
243		{
244		struct Client *client_p = ptr->data;
245
363	–	if (client_p->localClient->reject_delay > 0)
364	–	{
365	–	if (client_p->localClient->reject_delay <= CurrentTime)
366	–	exit_client(client_p, &me, "Rejected");
367	–	continue;
368	–	}
369	–
246		/*
247		* Check UNKNOWN connections - if they have been in this state
248		* for > 30s, close them.
249		*/
250	<	if (IsAuthFinished(client_p) && (CurrentTime - client_p->firsttime) > 30)
251	<	exit_client(client_p, &me, "Registration timed out");
250	>	if (IsAuthFinished(client_p) && (CurrentTime - client_p->localClient->firsttime) > 30)
251	>	exit_client(client_p, "Registration timed out");
252		}
253		}
254
255	+	/*
256	+	* check_pings - go through the local client list and check activity
257	+	* kill off stuff that should die
258	+	*
259	+	* inputs       - NOT USED (from event)
260	+	* output       - next time_t when check_pings() should be called again
261	+	* side effects -
262	+	*
263	+	*
264	+	* A PING can be sent to clients as necessary.
265	+	*
266	+	* Client/Server ping outs are handled.
267	+	*/
268	+
269	+	/*
270	+	* Addon from adrian. We used to call this after nextping seconds,
271	+	* however I've changed it to run once a second. This is only for
272	+	* PING timeouts, not K/etc-line checks (thanks dianora!). Having it
273	+	* run once a second makes life a lot easier - when a new client connects
274	+	* and they need a ping in 4 seconds, if nextping was set to 20 seconds
275	+	* we end up waiting 20 seconds. This is stupid. :-)
276	+	* I will optimise (hah!) check_pings() once I've finished working on
277	+	* tidying up other network IO evilnesses.
278	+	*     -- adrian
279	+	*/
280	+
281	+	static void
282	+	check_pings(void *unused)
283	+	{
284	+	check_pings_list(&local_client_list);
285	+	check_pings_list(&local_server_list);
286	+	check_unknowns_list();
287	+	}
288	+
289		/* check_conf_klines()
290		*
291		* inputs       - NONE
#	Line 383 | Line 293 | check_unknowns_list(void)
293		* side effects - Check all connections for a pending kline against the
294		*                client, exit the client if a kline matches.
295		*/
296	<	void
296	>	void
297		check_conf_klines(void)
298	<	{
299	<	struct Client *client_p = NULL;       /* current local client_p being examined */
300	<	struct AccessItem *aconf = NULL;
391	<	struct ConfItem *conf = NULL;
392	<	dlink_node *ptr, *next_ptr;
298	>	{
299	>	struct MaskItem *conf = NULL;
300	>	dlink_node *ptr = NULL, *ptr_next = NULL;
301
302	<	DLINK_FOREACH_SAFE(ptr, next_ptr, local_client_list.head)
302	>	DLINK_FOREACH_SAFE(ptr, ptr_next, local_client_list.head)
303		{
304	<	client_p = ptr->data;
304	>	struct Client *client_p = ptr->data;
305
306		/* If a client is already being exited
307		*/
308		if (IsDead(client_p) || !IsClient(client_p))
309		continue;
310
311	<	/* if there is a returned struct ConfItem then kill it */
312	<	if ((aconf = find_dline_conf(&client_p->localClient->ip,
405	<	client_p->localClient->aftype)) != NULL)
311	>	if ((conf = find_conf_by_address(NULL, &client_p->localClient->ip, CONF_DLINE,
312	>	client_p->localClient->aftype, NULL, NULL, 1)))
313		{
314	<	if (aconf->status & CONF_EXEMPTDLINE)
408	<	continue;
409	<
410	<	conf = unmap_conf_item(aconf);
411	<	ban_them(client_p, conf);
314	>	conf_try_ban(client_p, conf);
315		continue; /* and go examine next fd/client_p */
316		}
317
318	<	if (ConfigFileEntry.glines && (aconf = find_gline(client_p)))
318	>	if (ConfigGeneral.glines)
319		{
320	<	if (IsExemptKline(client_p) ||
321	<	IsExemptGline(client_p))
320	>	if ((conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
321	>	CONF_GLINE, client_p->localClient->aftype,
322	>	client_p->username, NULL, 1)))
323		{
324	<	sendto_realops_flags(UMODE_ALL, L_ALL,
325	<	"GLINE over-ruled for %s, client is %sline_exempt",
422	<	get_client_name(client_p, HIDE_IP), IsExemptKline(client_p) ? "k" : "g");
324	>	conf_try_ban(client_p, conf);
325	>	/* and go examine next fd/client_p */
326		continue;
327		}
328	+	}
329
330	<	conf = unmap_conf_item(aconf);
331	<	ban_them(client_p, conf);
332	<	/* and go examine next fd/client_p */
429	<	continue;
430	<	}
431	<
432	<	if ((aconf = find_kill(client_p)) != NULL)
330	>	if ((conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
331	>	CONF_KLINE, client_p->localClient->aftype,
332	>	client_p->username, NULL, 1)))
333		{
334	<
335	<	/* if there is a returned struct AccessItem.. then kill it */
436	<	if (IsExemptKline(client_p))
437	<	{
438	<	sendto_realops_flags(UMODE_ALL, L_ALL,
439	<	"KLINE over-ruled for %s, client is kline_exempt",
440	<	get_client_name(client_p, HIDE_IP));
441	<	continue;
442	<	}
443	<
444	<	conf = unmap_conf_item(aconf);
445	<	ban_them(client_p, conf);
446	<	continue;
334	>	conf_try_ban(client_p, conf);
335	>	continue;
336		}
337
338	<	/* if there is a returned struct MatchItem then kill it */
339	<	if ((conf = find_matching_name_conf(XLINE_TYPE,  client_p->info,
451	<	NULL, NULL, 0)) != NULL ||
452	<	(conf = find_matching_name_conf(RXLINE_TYPE, client_p->info,
453	<	NULL, NULL, 0)) != NULL)
338	>	if ((conf = find_matching_name_conf(CONF_XLINE,  client_p->info,
339	>	NULL, NULL, 0)))
340		{
341	<	ban_them(client_p, conf);
341	>	conf_try_ban(client_p, conf);
342		continue;
343		}
344		}
345
346		/* also check the unknowns list for new dlines */
347	<	DLINK_FOREACH_SAFE(ptr, next_ptr, unknown_list.head)
347	>	DLINK_FOREACH_SAFE(ptr, ptr_next, unknown_list.head)
348		{
349	<	client_p = ptr->data;
349	>	struct Client *client_p = ptr->data;
350
351	<	if ((aconf = find_dline_conf(&client_p->localClient->ip,
352	<	client_p->localClient->aftype)))
351	>	if ((conf = find_conf_by_address(NULL, &client_p->localClient->ip, CONF_DLINE,
352	>	client_p->localClient->aftype, NULL, NULL, 1)))
353		{
354	<	if (aconf->status & CONF_EXEMPTDLINE)
355	<	continue;
470	<
471	<	exit_client(client_p, &me, "D-lined");
354	>	conf_try_ban(client_p, conf);
355	>	continue; /* and go examine next fd/client_p */
356		}
357		}
358		}
359
360		/*
361	<	* ban_them
361	>	* conf_try_ban
362		*
363		* inputs       - pointer to client to ban
364	<	*              - pointer to ConfItem
364	>	*              - pointer to MaskItem
365		* output       - NONE
366		* side effects - given client_p is banned
367		*/
368	<	static void
369	<	ban_them(struct Client *client_p, struct ConfItem *conf)
368	>	void
369	>	conf_try_ban(struct Client *client_p, struct MaskItem *conf)
370		{
371	<	const char *user_reason = NULL;       /* What is sent to user */
488	<	const char *channel_reason = NULL;    /* What is sent to channel */
489	<	struct AccessItem *aconf = NULL;
490	<	struct MatchItem *xconf = NULL;
371	>	const char *user_reason = NULL;  /* What is sent to user */
372		const char *type_string = NULL;
373		const char dline_string[] = "D-line";
374		const char kline_string[] = "K-line";
#	Line 496 | Line 377 | ban_them(struct Client *client_p, struct
377
378		switch (conf->type)
379		{
380	<	case RKLINE_TYPE:
381	<	case KLINE_TYPE:
380	>	case CONF_KLINE:
381	>	if (IsExemptKline(client_p))
382	>	{
383	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
384	>	"KLINE over-ruled for %s, client is kline_exempt",
385	>	get_client_name(client_p, HIDE_IP));
386	>	return;
387	>	}
388	>
389		type_string = kline_string;
502	–	aconf = map_to_conf(conf);
390		break;
391	<	case DLINE_TYPE:
391	>	case CONF_DLINE:
392	>	if (find_conf_by_address(NULL, &client_p->localClient->ip, CONF_EXEMPT,
393	>	client_p->localClient->aftype, NULL, NULL, 1))
394	>	return;
395		type_string = dline_string;
506	–	aconf = map_to_conf(conf);
396		break;
397	<	case GLINE_TYPE:
397	>	case CONF_GLINE:
398	>	if (IsExemptKline(client_p) ||
399	>	IsExemptGline(client_p))
400	>	{
401	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
402	>	"GLINE over-ruled for %s, client is %sline_exempt",
403	>	get_client_name(client_p, HIDE_IP), IsExemptKline(client_p) ? "k" : "g");
404	>	return;
405	>	}
406	>
407		type_string = gline_string;
510	–	aconf = map_to_conf(conf);
408		break;
409	<	case RXLINE_TYPE:
513	<	case XLINE_TYPE:
409	>	case CONF_XLINE:
410		type_string = xline_string;
411	<	xconf = map_to_conf(conf);
516	<	++xconf->count;
411	>	++conf->count;
412		break;
413		default:
414		assert(0);
415		break;
416		}
417
418	<	if (ConfigFileEntry.kline_with_reason)
524	<	{
525	<	if (aconf != NULL)
526	<	user_reason = aconf->reason ? aconf->reason : type_string;
527	<	if (xconf != NULL)
528	<	user_reason = xconf->reason ? xconf->reason : type_string;
529	<	}
530	<	else
531	<	user_reason = type_string;
532	<
533	<	if (ConfigFileEntry.kline_reason != NULL)
534	<	channel_reason = ConfigFileEntry.kline_reason;
535	<	else
536	<	channel_reason = user_reason;
418	>	user_reason = conf->reason ? conf->reason : type_string;
419
420	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s active for %s",
420	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s active for %s",
421		type_string, get_client_name(client_p, HIDE_IP));
422
423		if (IsClient(client_p))
424	<	sendto_one(client_p, form_str(ERR_YOUREBANNEDCREEP),
543	<	me.name, client_p->name, user_reason);
424	>	sendto_one_numeric(client_p, &me, ERR_YOUREBANNEDCREEP, user_reason);
425
426	<	exit_client(client_p, &me, channel_reason);
426	>	exit_client(client_p, user_reason);
427		}
428
429		/* update_client_exit_stats()
430		*
431		* input        - pointer to client
432		* output       - NONE
433	<	* side effects -
433	>	* side effects -
434		*/
435		static void
436		update_client_exit_stats(struct Client *client_p)
437		{
438	<	if (IsServer(client_p))
558	<	{
559	<	sendto_realops_flags(UMODE_EXTERNAL, L_ALL,
560	<	"Server %s split from %s",
561	<	client_p->name, client_p->servptr->name);
562	<	}
563	<	else if (IsClient(client_p))
438	>	if (IsClient(client_p))
439		{
440	+	assert(Count.total > 0);
441		--Count.total;
442	<	if (IsOper(client_p))
442	>	if (HasUMode(client_p, UMODE_OPER))
443		--Count.oper;
444	<	if (IsInvisible(client_p))
444	>	if (HasUMode(client_p, UMODE_INVISIBLE))
445		--Count.invisi;
446		}
447	+	else if (IsServer(client_p))
448	+	sendto_realops_flags(UMODE_EXTERNAL, L_ALL, SEND_NOTICE,
449	+	"Server %s split from %s",
450	+	client_p->name, client_p->servptr->name);
451
452		if (splitchecking && !splitmode)
453		check_splitmode(NULL);
#	Line 579 | Line 459 | update_client_exit_stats(struct Client *
459		* output       - return client pointer
460		* side effects - find person by (nick)name
461		*/
582	–	/* XXX - ugly wrapper */
462		struct Client *
463	<	find_person(const struct Client *client_p, const char *name)
463	>	find_person(const struct Client *const source_p, const char *name)
464		{
465	<	struct Client *c2ptr;
465	>	struct Client *target_p = NULL;
466
467		if (IsDigit(*name))
468		{
469	<	if ((c2ptr = hash_find_id(name)) != NULL)
470	<	{
592	<	/* invisible users shall not be found by UID guessing */
593	<	if (IsInvisible(c2ptr) && !IsServer(client_p))
594	<	c2ptr = NULL;
595	<	}
469	>	if (IsServer(source_p->from))
470	>	target_p = hash_find_id(name);
471		}
472		else
473	<	c2ptr = find_client(name);
473	>	target_p = hash_find_client(name);
474
475	<	return ((c2ptr != NULL && IsClient(c2ptr)) ? c2ptr : NULL);
475	>	return (target_p && IsClient(target_p)) ? target_p : NULL;
476		}
477
478		/*
479	<	* find_chasing - find the client structure for a nick name (user)
480	<	*      using history mechanism if necessary. If the client is not found,
481	<	*      an error message (NO SUCH NICK) is generated. If the client was found
607	<	*      through the history, chasing will be 1 and otherwise 0.
479	>	* find_chasing - find the client structure for a nick name (name)
480	>	*      using history mechanism if necessary. If the client is not found,
481	>	*      an error message (NO SUCH NICK) is generated.
482		*/
483		struct Client *
484	<	find_chasing(struct Client *client_p, struct Client *source_p, const char *user, int *chasing)
484	>	find_chasing(struct Client *source_p, const char *name)
485		{
486	<	struct Client *who = find_person(client_p, user);
613	<
614	<	if (chasing)
615	<	*chasing = 0;
486	>	struct Client *who = find_person(source_p, name);
487
488		if (who)
489	<	return(who);
489	>	return who;
490
491	<	if (IsDigit(*user))
492	<	return(NULL);
491	>	if (IsDigit(*name))
492	>	return NULL;
493
494	<	if ((who = get_history(user,
495	<	(time_t)ConfigFileEntry.kill_chase_time_limit))
496	<	== NULL)
494	>	if ((who = whowas_get_history(name,
495	>	(time_t)ConfigGeneral.kill_chase_time_limit))
496	>	== NULL)
497		{
498	<	sendto_one(source_p, form_str(ERR_NOSUCHNICK),
499	<	me.name, source_p->name, user);
629	<	return(NULL);
498	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHNICK, name);
499	>	return NULL;
500		}
501
502	<	if (chasing)
633	<	*chasing = 1;
634	<
635	<	return(who);
502	>	return who;
503		}
504
505		/*
#	Line 644 | Line 511 | find_chasing(struct Client *client_p, st
511		*        But, this can be used to any client structure.
512		*
513		* NOTE 1:
514	<	*        Watch out the allocation of "nbuf", if either source_p->name
514	>	*        Watch out the allocation of "buf", if either source_p->name
515		*        or source_p->sockhost gets changed into pointers instead of
516		*        directly allocated within the structure...
517		*
518		* NOTE 2:
519		*        Function return either a pointer to the structure (source_p) or
520	<	*        to internal buffer (nbuf). *NEVER* use the returned pointer
520	>	*        to internal buffer (buf). *NEVER* use the returned pointer
521		*        to modify what it points!!!
522		*/
523		const char *
524	<	get_client_name(struct Client *client, int showip)
524	>	get_client_name(const struct Client *client_p, enum addr_mask_type type)
525		{
526	<	static char nbuf[HOSTLEN * 2 + USERLEN + 5];
526	>	static char buf[HOSTLEN * 2 + USERLEN + 5];
527
528	<	assert(client != NULL);
528	>	assert(client_p);
529
530	<	if (irccmp(client->name, client->host) == 0)
531	<	return(client->name);
530	>	if (!MyConnect(client_p))
531	>	return client_p->name;
532
533	<	if (ConfigServerHide.hide_server_ips)
534	<	if (IsServer(client) || IsConnecting(client) || IsHandshake(client))
535	<	showip = MASK_IP;
533	>	if (IsServer(client_p) || IsConnecting(client_p) || IsHandshake(client_p))
534	>	{
535	>	if (!irccmp(client_p->name, client_p->host))
536	>	return client_p->name;
537	>	else if (ConfigServerHide.hide_server_ips)
538	>	type = MASK_IP;
539	>	}
540
541	<	if (ConfigFileEntry.hide_spoof_ips)
542	<	if (showip == SHOW_IP && IsIPSpoof(client))
543	<	showip = MASK_IP;
541	>	if (ConfigGeneral.hide_spoof_ips)
542	>	if (IsIPSpoof(client_p) && type == SHOW_IP)
543	>	type = MASK_IP;
544
545		/* And finally, let's get the host information, ip or name */
546	<	switch (showip)
546	>	switch (type)
547		{
548		case SHOW_IP:
549	<	if (MyConnect(client))
550	<	{
551	<	ircsprintf(nbuf, "%s[%s@%s]", client->name, client->username,
552	<	client->sockhost);
682	<	break;
683	<	}
549	>	snprintf(buf, sizeof(buf), "%s[%s@%s]",
550	>	client_p->name,
551	>	client_p->username, client_p->sockhost);
552	>	break;
553		case MASK_IP:
554	<	ircsprintf(nbuf, "%s[%s@255.255.255.255]", client->name,
555	<	client->username);
554	>	if (client_p->localClient->aftype == AF_INET)
555	>	snprintf(buf, sizeof(buf), "%s[%s@255.255.255.255]",
556	>	client_p->name, client_p->username);
557	>	else
558	>	snprintf(buf, sizeof(buf), "%s[%s@ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]",
559	>	client_p->name, client_p->username);
560		break;
561		default:
562	<	ircsprintf(nbuf, "%s[%s@%s]", client->name, client->username,
563	<	client->host);
562	>	snprintf(buf, sizeof(buf), "%s[%s@%s]",
563	>	client_p->name,
564	>	client_p->username, client_p->host);
565		}
566
567	<	return(nbuf);
567	>	return buf;
568		}
569
570		void
571		free_exited_clients(void)
572		{
573	<	dlink_node *ptr, *next;
574	<	struct Client *target_p;
701	<
573	>	dlink_node *ptr = NULL, *next = NULL;
574	>
575		DLINK_FOREACH_SAFE(ptr, next, dead_list.head)
576		{
577	<	target_p = ptr->data;
705	<
706	<	if (ptr->data == NULL)
707	<	{
708	<	sendto_realops_flags(UMODE_ALL, L_ALL,
709	<	"Warning: null client on dead_list!");
710	<	dlinkDelete(ptr, &dead_list);
711	<	free_dlink_node(ptr);
712	<	continue;
713	<	}
714	<
715	<	free_client(target_p);
577	>	free_client(ptr->data);
578		dlinkDelete(ptr, &dead_list);
579		free_dlink_node(ptr);
580		}
#	Line 725 | Line 587 | free_exited_clients(void)
587		* The only messages generated are QUITs on channels.
588		*/
589		static void
590	<	exit_one_client(struct Client *source_p, const char *quitmsg)
590	>	exit_one_client(struct Client *source_p, const char *comment)
591		{
592	<	dlink_node *lp = NULL, *next_lp = NULL;
592	>	dlink_node *ptr = NULL, *ptr_next = NULL;
593
594		assert(!IsMe(source_p));
595	+	assert(source_p != &me);
596
597	<	if (IsServer(source_p))
597	>	if (IsClient(source_p))
598		{
599	<	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->servers);
599	>	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->client_list);
600	>	dlinkDelete(&source_p->node, &global_client_list);
601
602	<	if ((lp = dlinkFindDelete(&global_serv_list, source_p)) != NULL)
603	<	free_dlink_node(lp);
602	>	/*
603	>	* If a person is on a channel, send a QUIT notice
604	>	* to every client (person) on the same channel (so
605	>	* that the client can show the "**signoff" message).
606	>	* (Note: The notice is to the local clients *only*)
607	>	*/
608	>	sendto_common_channels_local(source_p, 0, 0, ":%s!%s@%s QUIT :%s",
609	>	source_p->name, source_p->username,
610	>	source_p->host, comment);
611	>	DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->channel.head)
612	>	remove_user_from_channel(ptr->data);
613
614	<	if (!MyConnect(source_p))
615	<	{
743	<	source_p->from->serv->dep_servers--;
744	<	assert(source_p->from->serv->dep_servers > 0);
745	<	}
746	<	}
747	<	else if (IsClient(source_p))
748	<	{
749	<	if (source_p->servptr->serv != NULL)
750	<	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->users);
614	>	whowas_add_history(source_p, 0);
615	>	whowas_off_history(source_p);
616
617	<	/* If a person is on a channel, send a QUIT notice
753	<	** to every client (person) on the same channel (so
754	<	** that the client can show the "**signoff" message).
755	<	** (Note: The notice is to the local clients *only*)
756	<	*/
757	<	sendto_common_channels_local(source_p, 0, ":%s!%s@%s QUIT :%s",
758	<	source_p->name, source_p->username,
759	<	source_p->host, quitmsg);
760	<	DLINK_FOREACH_SAFE(lp, next_lp, source_p->channel.head)
761	<	remove_user_from_channel(lp->data);
762	<
763	<	/* Clean up allow lists */
764	<	del_all_accepts(source_p);
765	<	add_history(source_p, 0);
766	<	off_history(source_p);
617	>	watch_check_hash(source_p, RPL_LOGOFF);
618
619	<	if (!MyConnect(source_p))
769	<	{
770	<	source_p->from->serv->dep_users--;
771	<	assert(source_p->from->serv->dep_users >= 0);
772	<	}
773	<	else
619	>	if (MyConnect(source_p))
620		{
621		/* Clean up invitefield */
622	<	DLINK_FOREACH_SAFE(lp, next_lp, source_p->localClient->invited.head)
623	<	del_invite(lp->data, source_p);
622	>	DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->localClient->invited.head)
623	>	del_invite(ptr->data, source_p);
624	>
625	>	del_all_accepts(source_p);
626		}
627		}
628	+	else if (IsServer(source_p))
629	+	{
630	+	dlinkDelete(&source_p->lnode, &source_p->servptr->serv->server_list);
631	+	dlinkDelete(&source_p->node, &global_client_list);
632	+
633	+	if ((ptr = dlinkFindDelete(&global_server_list, source_p)))
634	+	free_dlink_node(ptr);
635	+	}
636
637		/* Remove source_p from the client lists */
638	<	if (HasID(source_p))
638	>	if (source_p->id[0])
639		hash_del_id(source_p);
640		if (source_p->name[0])
641		hash_del_client(source_p);
#	Line 787 | Line 643 | exit_one_client(struct Client *source_p,
643		if (IsUserHostIp(source_p))
644		delete_user_host(source_p->username, source_p->host, !MyConnect(source_p));
645
790	–	/* remove from global client list
791	–	* NOTE: source_p->node.next cannot be NULL if the client is added
792	–	*       to global_client_list (there is always &me at its end)
793	–	*/
794	–	if (source_p != NULL && source_p->node.next != NULL)
795	–	dlinkDelete(&source_p->node, &global_client_list);
796	–
646		update_client_exit_stats(source_p);
647
648		/* Check to see if the client isn't already on the dead list */
#	Line 804 | Line 653 | exit_one_client(struct Client *source_p,
653		dlinkAdd(source_p, make_dlink_node(), &dead_list);
654		}
655
656	<	/* Recursively send QUITs and SQUITs for source_p and all its dependent clients
808	<	* and servers to those servers that need them.  A server needs the client
809	<	* QUITs if it can't figure them out from the SQUIT (ie pre-TS4) or if it
810	<	* isn't getting the SQUIT because of @#(*&@)# hostmasking.  With TS4, once
811	<	* a link gets a SQUIT, it doesn't need any QUIT/SQUITs for clients depending
812	<	* on that one -orabidoo
813	<	*
814	<	* This is now called on each local server -adx
815	<	*/
816	<	static void
817	<	recurse_send_quits(struct Client *original_source_p, struct Client *source_p,
818	<	struct Client *from, struct Client *to, const char *comment,
819	<	const char *splitstr, const char *myname)
820	<	{
821	<	dlink_node *ptr, *next;
822	<	struct Client *target_p;
823	<	int hidden = match(myname, source_p->name);
824	<
825	<	assert(to != source_p);  /* should be already removed from serv_list */
826	<
827	<	/* If this server can handle quit storm (QS) removal
828	<	* of dependents, just send the SQUIT
829	<	*
830	<	* Always check *all* dependent servers if some of them are
831	<	* hidden behind fakename. If so, send out the QUITs -adx
832	<	*/
833	<	if (hidden || !IsCapable(to, CAP_QS))
834	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->users.head)
835	<	{
836	<	target_p = ptr->data;
837	<	sendto_one(to, ":%s QUIT :%s", target_p->name, splitstr);
838	<	}
839	<
840	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->servers.head)
841	<	recurse_send_quits(original_source_p, ptr->data, from, to,
842	<	comment, splitstr, myname);
843	<
844	<	if (!hidden && ((source_p == original_source_p && to != from) ||
845	<	!IsCapable(to, CAP_QS)))
846	<	{
847	<	/* don't use a prefix here - we have to be 100% sure the message
848	<	* will be accepted without Unknown prefix etc.. */
849	<	sendto_one(to, "SQUIT %s :%s", ID_or_name(source_p, to), comment);
850	<	}
851	<	}
852	<
853	<	/*
656	>	/*
657		* Remove all clients that depend on source_p; assumes all (S)QUITs have
658	<	* already been sent.  we make sure to exit a server's dependent clients
659	<	* and servers before the server itself; exit_one_client takes care of
658	>	* already been sent.  we make sure to exit a server's dependent clients
659	>	* and servers before the server itself; exit_one_client takes care of
660		* actually removing things off llists.   tweaked from +CSr31  -orabidoo
661		*/
662		static void
663	<	recurse_remove_clients(struct Client *source_p, const char *quitmsg)
663	>	recurse_remove_clients(struct Client *source_p, const char *comment)
664		{
665	<	dlink_node *ptr, *next;
665	>	dlink_node *ptr = NULL, *ptr_next = NULL;
666
667	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->users.head)
668	<	exit_one_client(ptr->data, quitmsg);
667	>	DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->serv->client_list.head)
668	>	exit_one_client(ptr->data, comment);
669
670	<	DLINK_FOREACH_SAFE(ptr, next, source_p->serv->servers.head)
670	>	DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->serv->server_list.head)
671		{
672	<	recurse_remove_clients(ptr->data, quitmsg);
673	<	exit_one_client(ptr->data, quitmsg);
672	>	recurse_remove_clients(ptr->data, comment);
673	>	exit_one_client(ptr->data, comment);
674		}
872	–
873	–	assert(source_p->serv->dep_servers == 1);
874	–	assert(source_p->serv->dep_users == 0);
875	–	}
876	–
877	–	/*
878	–	** Remove *everything* that depends on source_p, from all lists, and sending
879	–	** all necessary QUITs and SQUITs.  source_p itself is still on the lists,
880	–	** and its SQUITs have been sent except for the upstream one  -orabidoo
881	–	*/
882	–	static void
883	–	remove_dependents(struct Client *source_p, struct Client *from,
884	–	const char *comment, const char *splitstr)
885	–	{
886	–	struct Client *to;
887	–	struct ConfItem *conf;
888	–	static char myname[HOSTLEN+1];
889	–	dlink_node *ptr;
890	–
891	–	DLINK_FOREACH(ptr, serv_list.head)
892	–	{
893	–	to = ptr->data;
894	–
895	–	if ((conf = to->serv->sconf) != NULL)
896	–	strlcpy(myname, my_name_for_link(conf), sizeof(myname));
897	–	else
898	–	strlcpy(myname, me.name, sizeof(myname));
899	–	recurse_send_quits(source_p, source_p, from, to,
900	–	comment, splitstr, myname);
901	–	}
902	–
903	–	recurse_remove_clients(source_p, splitstr);
675		}
676
677		/*
#	Line 908 | Line 679 | remove_dependents(struct Client *source_
679		* this on any struct Client, regardless of its state.
680		*
681		* Note, you shouldn't exit remote _users_ without first doing
682	<	* SetKilled and propagating a kill or similar message. However,
683	<	* it is perfectly correct to call exit_client to force a _server_
682	>	* AddFlag(x, FLAGS_KILLED) and propagating a kill or similar message.
683	>	*
684	>	* However, it is perfectly correct to call exit_client to force a _server_
685		* quit (either local or remote one).
686		*
687	+	*
688		* inputs:       - a client pointer that is going to be exited
916	–	*               - for servers, the second argument is a pointer to who
917	–	*                 is firing the server. This side won't get any generated
918	–	*                 messages. NEVER NULL!
689		* output:       none
690		* side effects: the client is delinked from all lists, disconnected,
691		*               and the rest of IRC network is notified of the exit.
692		*               Client memory is scheduled to be freed
693		*/
694		void
695	<	exit_client(struct Client *source_p, struct Client *from, const char *comment)
695	>	exit_client(struct Client *source_p, const char *comment)
696		{
697	<	dlink_node *m;
697	>	dlink_node *m = NULL;
698	>
699	>	assert(!IsMe(source_p));
700	>	assert(source_p != &me);
701
702		if (MyConnect(source_p))
703		{
#	Line 936 | Line 709 | exit_client(struct Client *source_p, str
709
710		SetClosing(source_p);
711
712	<	if (IsIpHash(source_p))
713	<	remove_one_ip(&source_p->localClient->ip);
712	>	if (HasFlag(source_p, FLAGS_IPHASH))
713	>	{
714	>	DelFlag(source_p, FLAGS_IPHASH);
715	>	ipcache_remove_address(&source_p->localClient->ip);
716	>	}
717
718	<	delete_auth(source_p);
718	>	delete_auth(&source_p->localClient->auth);
719
720	<	/* This source_p could have status of one of STAT_UNKNOWN, STAT_CONNECTING
720	>	/*
721	>	* This source_p could have status of one of STAT_UNKNOWN, STAT_CONNECTING
722		* STAT_HANDSHAKE or STAT_UNKNOWN
723		* all of which are lumped together into unknown_list
724		*
#	Line 949 | Line 726 | exit_client(struct Client *source_p, str
726		*/
727		if (!IsRegistered(source_p))
728		{
729	<	if ((m = dlinkFindDelete(&unknown_list, source_p)) != NULL)
730	<	free_dlink_node(m);
729	>	assert(dlinkFind(&unknown_list, source_p));
730	>
731	>	dlinkDelete(&source_p->localClient->lclient_node, &unknown_list);
732		}
733		else if (IsClient(source_p))
734		{
735	+	time_t on_for = CurrentTime - source_p->localClient->firsttime;
736	+	assert(Count.local > 0);
737		Count.local--;
738
739	<	if (IsOper(source_p))
740	<	{
961	<	if ((m = dlinkFindDelete(&oper_list, source_p)) != NULL)
739	>	if (HasUMode(source_p, UMODE_OPER))
740	>	if ((m = dlinkFindDelete(&oper_list, source_p)))
741		free_dlink_node(m);
963	–	}
742
743	+	assert(dlinkFind(&local_client_list, source_p));
744		dlinkDelete(&source_p->localClient->lclient_node, &local_client_list);
966	–	if (source_p->localClient->list_task != NULL)
967	–	free_list_task(source_p->localClient->list_task, source_p);
745
746	<	sendto_realops_flags(UMODE_CCONN, L_ALL, "Client exiting: %s (%s@%s) [%s] [%s]",
746	>	if (source_p->localClient->list_task)
747	>	free_list_task(source_p);
748	>
749	>	watch_del_watch_list(source_p);
750	>	sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
751	>	"Client exiting: %s (%s@%s) [%s] [%s]",
752		source_p->name, source_p->username, source_p->host, comment,
753	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
753	>	ConfigGeneral.hide_spoof_ips && IsIPSpoof(source_p) ?
754		"255.255.255.255" : source_p->sockhost);
755	+	ilog(LOG_TYPE_USER, "%s (%3u:%02u:%02u): %s!%s@%s %llu/%llu",
756	+	myctime(source_p->localClient->firsttime), (unsigned int)(on_for / 3600),
757	+	(unsigned int)((on_for % 3600)/60), (unsigned int)(on_for % 60),
758	+	source_p->name, source_p->username, source_p->host,
759	+	source_p->localClient->send.bytes>>10,
760	+	source_p->localClient->recv.bytes>>10);
761		}
762	<
975	<	/* As soon as a client is known to be a server of some sort
976	<	* it has to be put on the serv_list, or SJOIN's to this new server
977	<	* from the connect burst will not be seen.
978	<	*/
979	<	if (IsServer(source_p) || IsConnecting(source_p) ||
980	<	IsHandshake(source_p))
762	>	else if (IsServer(source_p))
763		{
764	<	if ((m = dlinkFindDelete(&serv_list, source_p)) != NULL)
765	<	{
984	<	free_dlink_node(m);
985	<	unset_chcap_usage_counts(source_p);
986	<	}
764	>	assert(Count.myserver > 0);
765	>	--Count.myserver;
766
767	<	if (IsServer(source_p))
768	<	{
990	<	Count.myserver--;
991	<	if (ServerInfo.hub)
992	<	remove_lazylink_flags(source_p->localClient->serverMask);
993	<	else
994	<	uplink = NULL;
995	<	}
767	>	assert(dlinkFind(&local_server_list, source_p));
768	>	dlinkDelete(&source_p->localClient->lclient_node, &local_server_list);
769		}
770
998	–	log_user_exit(source_p);
999	–
771		if (!IsDead(source_p))
772		{
773		if (IsServer(source_p))
774		{
775	<	/* for them, we are exiting the network */
776	<	sendto_one(source_p, ":%s SQUIT %s :%s",
777	<	ID_or_name(from, source_p), me.name, comment);
775	>	if (!HasFlag(source_p, FLAGS_SQUIT))
776	>	{
777	>	/* for them, we are exiting the network */
778	>	sendto_one(source_p, ":%s SQUIT %s :%s",
779	>	me.id, me.id, comment);
780	>	}
781		}
782
783		sendto_one(source_p, "ERROR :Closing Link: %s (%s)",
784		source_p->host, comment);
785		}
786
1013	–	/*
1014	–	** Currently only server connections can have
1015	–	** depending remote clients here, but it does no
1016	–	** harm to check for all local clients. In
1017	–	** future some other clients than servers might
1018	–	** have remotes too...
1019	–	**
1020	–	** Close the Client connection first and mark it
1021	–	** so that no messages are attempted to send to it.
1022	–	** Remember it makes source_p->from == NULL.
1023	–	*/
787		close_connection(source_p);
788		}
789	+	else if (IsClient(source_p) && HasFlag(source_p->servptr, FLAGS_EOB))
790	+	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
791	+	"Client exiting at %s: %s (%s@%s) [%s]",
792	+	source_p->servptr->name, source_p->name,
793	+	source_p->username, source_p->host, comment);
794
795		if (IsServer(source_p))
796		{
797	<	char splitstr[HOSTLEN + HOSTLEN + 2];
797	>	char splitstr[HOSTLEN + HOSTLEN + 2] = "";
798
799		/* This shouldn't ever happen */
800	<	assert(source_p->serv != NULL && source_p->servptr != NULL);
800	>	assert(source_p->serv && source_p->servptr);
801
802		if (ConfigServerHide.hide_servers)
803	<	/* set netsplit message to "*.net *.split" to still show
803	>	/*
804	>	* Set netsplit message to "*.net *.split" to still show
805		* that its a split, but hide the servers splitting
806		*/
807	<	strcpy(splitstr, "*.net *.split");
807	>	strlcpy(splitstr, "*.net *.split", sizeof(splitstr));
808		else
809		snprintf(splitstr, sizeof(splitstr), "%s %s",
810		source_p->servptr->name, source_p->name);
811
812	<	remove_dependents(source_p, from->from, comment, splitstr);
812	>	/* Send SQUIT for source_p in every direction. source_p is already off of local_server_list here */
813	>	if (!HasFlag(source_p, FLAGS_SQUIT))
814	>	sendto_server(NULL, NOCAPS, NOCAPS, "SQUIT %s :%s", source_p->id, comment);
815
816	<	if (source_p->servptr == &me)
816	>	/* Now exit the clients internally */
817	>	recurse_remove_clients(source_p, splitstr);
818	>
819	>	if (MyConnect(source_p))
820		{
821	<	sendto_realops_flags(UMODE_ALL, L_ALL,
821	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
822		"%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
823	<	source_p->name, (int)(CurrentTime - source_p->firsttime),
823	>	source_p->name, (int)(CurrentTime - source_p->localClient->firsttime),
824		source_p->localClient->send.bytes >> 10,
825		source_p->localClient->recv.bytes >> 10);
826	<	ilog(L_NOTICE, "%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
827	<	source_p->name, (int)(CurrentTime - source_p->firsttime),
826	>	ilog(LOG_TYPE_IRCD, "%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
827	>	source_p->name, (int)(CurrentTime - source_p->localClient->firsttime),
828		source_p->localClient->send.bytes >> 10,
829		source_p->localClient->recv.bytes >> 10);
830		}
831		}
832	<	else if (IsClient(source_p) && !IsKilled(source_p))
833	<	{
834	<	sendto_server(from->from, source_p, NULL, CAP_TS6, NOCAPS, NOFLAGS,
1061	<	":%s QUIT :%s", ID(source_p), comment);
1062	<	sendto_server(from->from, source_p, NULL, NOCAPS, CAP_TS6, NOFLAGS,
1063	<	":%s QUIT :%s", source_p->name, comment);
1064	<	}
832	>	else if (IsClient(source_p) && !HasFlag(source_p, FLAGS_KILLED))
833	>	sendto_server(source_p->from, NOCAPS, NOCAPS, ":%s QUIT :%s",
834	>	source_p->id, comment);
835
836		/* The client *better* be off all of the lists */
837		assert(dlinkFind(&unknown_list, source_p) == NULL);
838		assert(dlinkFind(&local_client_list, source_p) == NULL);
839	<	assert(dlinkFind(&serv_list, source_p) == NULL);
839	>	assert(dlinkFind(&local_server_list, source_p) == NULL);
840		assert(dlinkFind(&oper_list, source_p) == NULL);
841
842		exit_one_client(source_p, comment);
#	Line 1105 | Line 875 | dead_link_on_write(struct Client *client
875		void
876		dead_link_on_read(struct Client *client_p, int error)
877		{
878	<	char errmsg[255];
878	>	char errmsg[IRCD_BUFSIZE];
879		int current_error;
880
881		if (IsDefunct(client_p))
#	Line 1118 | Line 888 | dead_link_on_read(struct Client *client_
888
889		if (IsServer(client_p) || IsHandshake(client_p))
890		{
891	<	int connected = CurrentTime - client_p->firsttime;
892	<
891	>	int connected = CurrentTime - client_p->localClient->firsttime;
892	>
893		if (error == 0)
894		{
895		/* Admins get the real IP */
896	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
897	<	"Server %s closed the connection",
898	<	get_client_name(client_p, SHOW_IP));
896	>	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
897	>	"Server %s closed the connection",
898	>	get_client_name(client_p, SHOW_IP));
899
900		/* Opers get a masked IP */
901	<	sendto_realops_flags(UMODE_ALL, L_OPER,
902	<	"Server %s closed the connection",
903	<	get_client_name(client_p, MASK_IP));
901	>	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
902	>	"Server %s closed the connection",
903	>	get_client_name(client_p, MASK_IP));
904
905	<	ilog(L_NOTICE, "Server %s closed the connection",
906	<	get_client_name(client_p, SHOW_IP));
905	>	ilog(LOG_TYPE_IRCD, "Server %s closed the connection",
906	>	get_client_name(client_p, SHOW_IP));
907		}
908		else
909		{
910		report_error(L_ADMIN, "Lost connection to %s: %s",
911	<	get_client_name(client_p, SHOW_IP), current_error);
911	>	get_client_name(client_p, SHOW_IP), current_error);
912		report_error(L_OPER, "Lost connection to %s: %s",
913	<	get_client_name(client_p, MASK_IP), current_error);
913	>	get_client_name(client_p, MASK_IP), current_error);
914		}
915
916	<	sendto_realops_flags(UMODE_ALL, L_ALL,
917	<	"%s had been connected for %d day%s, %2d:%02d:%02d",
918	<	client_p->name, connected/86400,
919	<	(connected/86400 == 1) ? "" : "s",
920	<	(connected % 86400) / 3600, (connected % 3600) / 60,
921	<	connected % 60);
916	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
917	>	"%s had been connected for %d day%s, %2d:%02d:%02d",
918	>	client_p->name, connected/86400,
919	>	(connected/86400 == 1) ? "" : "s",
920	>	(connected % 86400) / 3600, (connected % 3600) / 60,
921	>	connected % 60);
922		}
923
924		if (error == 0)
925		strlcpy(errmsg, "Remote host closed the connection",
926		sizeof(errmsg));
927		else
928	<	ircsprintf(errmsg, "Read error: %s",
929	<	strerror(current_error));
928	>	snprintf(errmsg, sizeof(errmsg), "Read error: %s",
929	>	strerror(current_error));
930
931	<	exit_client(client_p, &me, errmsg);
931	>	exit_client(client_p, errmsg);
932		}
933
934		void
#	Line 1175 | Line 945 | exit_aborted_clients(void)
945
946		if (target_p == NULL)
947		{
948	<	sendto_realops_flags(UMODE_ALL, L_ALL,
948	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
949		"Warning: null client on abort_list!");
950		dlinkDelete(ptr, &abort_list);
951		free_dlink_node(ptr);
#	Line 1189 | Line 959 | exit_aborted_clients(void)
959		else
960		notice = "Write error: connection closed";
961
962	<	exit_client(target_p, &me, notice);
962	>	exit_client(target_p, notice);
963		free_dlink_node(ptr);
964		}
965		}
966
967		/*
968		* accept processing, this adds a form of "caller ID" to ircd
969	<	*
969	>	*
970		* If a client puts themselves into "caller ID only" mode,
971	<	* only clients that match a client pointer they have put on
971	>	* only clients that match a client pointer they have put on
972		* the accept list will be allowed to message them.
973		*
974	<	* [ source.on_allow_list ] -> [ target1 ] -> [ target2 ]
1205	<	*
1206	<	* [target.allow_list] -> [ source1 ] -> [source2 ]
1207	<	*
1208	<	* i.e. a target will have a link list of source pointers it will allow
1209	<	* each source client then has a back pointer pointing back
1210	<	* to the client that has it on its accept list.
1211	<	* This allows for exit_one_client to remove these now bogus entries
1212	<	* from any client having an accept on them.
974	>	* Diane Bruce, "Dianora" db@db.net
975		*/
976
977	<	/* accept_message()
978	<	*
1217	<	* inputs       - pointer to source client
1218	<	*              - pointer to target client
1219	<	* output       - 1 if accept this message 0 if not
1220	<	* side effects - See if source is on target's allow list
1221	<	*/
1222	<	int
1223	<	accept_message(struct Client *source, struct Client *target)
977	>	void
978	>	del_accept(struct split_nuh_item *accept_p, struct Client *client_p)
979		{
980	<	dlink_node *ptr;
980	>	dlinkDelete(&accept_p->node, &client_p->localClient->acceptlist);
981
982	<	DLINK_FOREACH(ptr, target->allow_list.head)
983	<	{
984	<	struct Client *target_p = ptr->data;
982	>	MyFree(accept_p->nickptr);
983	>	MyFree(accept_p->userptr);
984	>	MyFree(accept_p->hostptr);
985	>	MyFree(accept_p);
986	>	}
987
988	<	if (source == target_p)
989	<	return (1);
990	<	}
988	>	struct split_nuh_item *
989	>	find_accept(const char *nick, const char *user,
990	>	const char *host, struct Client *client_p,
991	>	int (*cmpfunc)(const char *, const char *))
992	>	{
993	>	dlink_node *ptr = NULL;
994
995	<	if (IsSoftCallerId(target))
995	>	DLINK_FOREACH(ptr, client_p->localClient->acceptlist.head)
996		{
997	<	DLINK_FOREACH(ptr, target->channel.head)
998	<	if (IsMember(source, ((struct Membership *)ptr->data)->chptr))
999	<	return (1);
997	>	struct split_nuh_item *accept_p = ptr->data;
998	>
999	>	if (!cmpfunc(accept_p->nickptr, nick) &&
1000	>	!cmpfunc(accept_p->userptr, user) &&
1001	>	!cmpfunc(accept_p->hostptr, host))
1002	>	return accept_p;
1003		}
1004
1005	<	return (0);
1005	>	return NULL;
1006		}
1007
1008	<	/* del_from_accept()
1246	<	*
1247	<	* inputs       - pointer to source client
1248	<	*              - pointer to target client
1249	<	* output       - NONE
1250	<	* side effects - Delete's source pointer to targets allow list
1008	>	/* accept_message()
1009		*
1010	<	* Walk through the target's accept list, remove if source is found,
1011	<	* Then walk through the source's on_accept_list remove target if found.
1010	>	* inputs       - pointer to source client
1011	>	*              - pointer to target client
1012	>	* output       - 1 if accept this message 0 if not
1013	>	* side effects - See if source is on target's allow list
1014		*/
1015	<	void
1016	<	del_from_accept(struct Client *source, struct Client *target)
1015	>	int
1016	>	accept_message(struct Client *source,
1017	>	struct Client *target)
1018		{
1019	<	dlink_node *ptr;
1259	<	dlink_node *ptr2;
1260	<	dlink_node *next_ptr;
1261	<	dlink_node *next_ptr2;
1262	<	struct Client *target_p;
1263	<
1264	<	DLINK_FOREACH_SAFE(ptr, next_ptr, target->allow_list.head)
1265	<	{
1266	<	target_p = ptr->data;
1019	>	dlink_node *ptr = NULL;
1020
1021	<	if (source == target_p)
1022	<	{
1023	<	dlinkDelete(ptr, &target->allow_list);
1271	<	free_dlink_node(ptr);
1021	>	if (source == target || find_accept(source->name, source->username,
1022	>	source->host, target, match))
1023	>	return 1;
1024
1025	<	DLINK_FOREACH_SAFE(ptr2, next_ptr2, source->on_allow_list.head)
1026	<	{
1027	<	target_p = ptr2->data;
1025	>	if (HasUMode(target, UMODE_SOFTCALLERID))
1026	>	DLINK_FOREACH(ptr, target->channel.head)
1027	>	if (IsMember(source, ((struct Membership *)ptr->data)->chptr))
1028	>	return 1;
1029
1030	<	if (target == target_p)
1278	<	{
1279	<	dlinkDelete(ptr2, &source->on_allow_list);
1280	<	free_dlink_node(ptr2);
1281	<	}
1282	<	}
1283	<	}
1284	<	}
1030	>	return 0;
1031		}
1032
1033		/* del_all_accepts()
1034		*
1035	<	* inputs       - pointer to exiting client
1036	<	* output       - NONE
1037	<	* side effects - Walk through given clients allow_list and on_allow_list
1292	<	*                remove all references to this client
1035	>	* inputs       - pointer to exiting client
1036	>	* output       - NONE
1037	>	* side effects - Walk through given clients acceptlist and remove all entries
1038		*/
1039		void
1040		del_all_accepts(struct Client *client_p)
1041		{
1042	<	dlink_node *ptr, *next_ptr;
1042	>	dlink_node *ptr = NULL, *ptr_next = NULL;
1043
1044	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->allow_list.head)
1045	<	del_from_accept(ptr->data, client_p);
1301	<
1302	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->on_allow_list.head)
1303	<	del_from_accept(client_p, ptr->data);
1044	>	DLINK_FOREACH_SAFE(ptr, ptr_next, client_p->localClient->acceptlist.head)
1045	>	del_accept(ptr->data, client_p);
1046		}
1047
1048	<	/* del_all_their_accepts()
1049	<	*
1308	<	* inputs       - pointer to exiting client
1309	<	* output       - NONE
1310	<	* side effects - Walk through given clients on_allow_list
1311	<	*                remove all references to this client,
1312	<	*                allow this client to keep their own allow_list
1313	<	*/
1314	<	void
1315	<	del_all_their_accepts(struct Client *client_p)
1048	>	unsigned int
1049	>	idle_time_get(const struct Client *source_p, const struct Client *target_p)
1050		{
1051	<	dlink_node *ptr, *next_ptr;
1051	>	unsigned int idle = 0;
1052	>	unsigned int min_idle = 0;
1053	>	unsigned int max_idle = 0;
1054	>	const struct ClassItem *class = get_class_ptr(&target_p->localClient->confs);
1055
1056	<	DLINK_FOREACH_SAFE(ptr, next_ptr, client_p->on_allow_list.head)
1057	<	del_from_accept(client_p, ptr->data);
1058	<	}
1056	>	if (!(class->flags & CLASS_FLAGS_FAKE_IDLE) || target_p == source_p)
1057	>	return CurrentTime - target_p->localClient->last_privmsg;
1058	>	if (HasUMode(source_p, UMODE_OPER) &&
1059	>	!(class->flags & CLASS_FLAGS_HIDE_IDLE_FROM_OPERS))
1060	>	return CurrentTime - target_p->localClient->last_privmsg;
1061
1062	<	/* set_initial_nick()
1063	<	*
1325	<	* inputs
1326	<	* output
1327	<	* side effects -
1328	<	*
1329	<	* This function is only called to set up an initially registering
1330	<	* client.
1331	<	*/
1332	<	void
1333	<	set_initial_nick(struct Client *client_p, struct Client *source_p,
1334	<	const char *nick)
1335	<	{
1336	<	char buf[USERLEN + 1];
1337	<
1338	<	/* Client setting NICK the first time */
1339	<
1340	<	/* This had to be copied here to avoid problems.. */
1341	<	source_p->tsinfo = CurrentTime;
1342	<	source_p->localClient->registration &= ~REG_NEED_NICK;
1062	>	min_idle = class->min_idle;
1063	>	max_idle = class->max_idle;
1064
1065	<	if (source_p->name[0])
1066	<	hash_del_client(source_p);
1065	>	if (min_idle == max_idle)
1066	>	return min_idle;
1067
1068	<	strlcpy(source_p->name, nick, sizeof(source_p->name));
1069	<	hash_add_client(source_p);
1068	>	if (class->flags & CLASS_FLAGS_RANDOM_IDLE)
1069	>	idle = genrand_int32();
1070	>	else
1071	>	idle = CurrentTime - target_p->localClient->last_privmsg;
1072
1073	<	/* fd_desc is long enough */
1074	<	fd_note(&client_p->localClient->fd, "Nick: %s", nick);
1075	<
1076	<	/* They have the nick they want now.. */
1354	<	client_p->llname[0] = '\0';
1073	>	if (!max_idle)
1074	>	idle = 0;
1075	>	else
1076	>	idle %= max_idle;
1077
1078	<	if (!source_p->localClient->registration)
1079	<	{
1358	<	strlcpy(buf, source_p->username, sizeof(buf));
1078	>	if (idle < min_idle)
1079	>	idle = min_idle + (idle % (max_idle - min_idle));
1080
1081	<	/*
1361	<	* USER already received, now we have NICK.
1362	<	* *NOTE* For servers "NICK" *must* precede the
1363	<	* user message (giving USER before NICK is possible
1364	<	* only for local client connection!). register_user
1365	<	* may reject the client and call exit_client for it
1366	<	* --must test this and exit m_nick too!!!
1367	<	*/
1368	<	register_local_user(client_p, source_p, nick, buf);
1369	<	}
1081	>	return idle;
1082		}
1083
1084	<	/* change_local_nick()
1084	>	/* client_init()
1085		*
1086	<	* inputs       - pointer to server
1087	<	*              - pointer to client
1088	<	*              - nick
1377	<	* output       -
1378	<	* side effects - changes nick of a LOCAL user
1086	>	* inputs       - NONE
1087	>	* output       - NONE
1088	>	* side effects - initialize client free memory
1089		*/
1090		void
1091	<	change_local_nick(struct Client *client_p, struct Client *source_p, const char *nick)
1091	>	client_init(void)
1092		{
1093	<	/*
1384	<	** Client just changing his/her nick. If he/she is
1385	<	** on a channel, send note of change to all clients
1386	<	** on that channel. Propagate notice to other servers.
1387	<	*/
1388	<	if ((source_p->localClient->last_nick_change +
1389	<	ConfigFileEntry.max_nick_time) < CurrentTime)
1390	<	source_p->localClient->number_of_nick_changes = 0;
1391	<	source_p->localClient->last_nick_change = CurrentTime;
1392	<	source_p->localClient->number_of_nick_changes++;
1393	<
1394	<	if ((ConfigFileEntry.anti_nick_flood &&
1395	<	(source_p->localClient->number_of_nick_changes
1396	<	<= ConfigFileEntry.max_nick_changes)) ||
1397	<	!ConfigFileEntry.anti_nick_flood ||
1398	<	(IsOper(source_p) && ConfigFileEntry.no_oper_flood))
1399	<	{
1400	<	if (irccmp(source_p->name, nick))
1401	<	source_p->tsinfo = CurrentTime;
1402	<
1403	<	/* XXX - the format of this notice should eventually be changed
1404	<	* to either %s[%s@%s], or even better would be get_client_name() -bill
1405	<	*/
1406	<	sendto_realops_flags(UMODE_NCHANGE, L_ALL, "Nick change: From %s to %s [%s@%s]",
1407	<	source_p->name, nick, source_p->username, source_p->host);
1408	<	sendto_common_channels_local(source_p, 1, ":%s!%s@%s NICK :%s",
1409	<	source_p->name, source_p->username,
1410	<	source_p->host, nick);
1411	<
1412	<	add_history(source_p, 1);
1413	<
1414	<	/* Only hubs care about lazy link nicks not being sent on yet
1415	<	* lazylink leafs/leafs always send their nicks up to hub,
1416	<	* hence must always propagate nick changes.
1417	<	* hubs might not propagate a nick change, if the leaf
1418	<	* does not know about that client yet.
1419	<	*/
1420	<	sendto_server(client_p, source_p, NULL, CAP_TS6, NOCAPS, NOFLAGS,
1421	<	":%s NICK %s :%lu",
1422	<	ID(source_p), nick, (unsigned long)source_p->tsinfo);
1423	<	sendto_server(client_p, source_p, NULL, NOCAPS, CAP_TS6, NOFLAGS,
1424	<	":%s NICK %s :%lu",
1425	<	source_p->name, nick, (unsigned long)source_p->tsinfo);
1426	<	}
1427	<	else
1093	>	static struct event event_ping =
1094		{
1095	<	sendto_one(source_p, form_str(ERR_NICKTOOFAST),
1096	<	me.name, source_p->name, source_p->name,
1097	<	nick, ConfigFileEntry.max_nick_time);
1098	<	return;
1099	<	}
1100	<
1101	<	/* Finally, add to hash */
1102	<	if (source_p->name[0])
1437	<	hash_del_client(source_p);
1438	<
1439	<	strcpy(source_p->name, nick);
1440	<	hash_add_client(source_p);
1441	<
1442	<	/* Make sure everyone that has this client on its accept list
1443	<	* loses that reference.
1444	<	*/
1445	<	del_all_their_accepts(source_p);
1446	<
1447	<	/* fd_desc is long enough */
1448	<	fd_note(&client_p->localClient->fd, "Nick: %s", nick);
1095	>	.name = "check_pings",
1096	>	.handler = check_pings,
1097	>	.when = 5
1098	>	};
1099	>
1100	>	client_pool = mp_pool_new(sizeof(struct Client), MP_CHUNK_SIZE_CLIENT);
1101	>	lclient_pool = mp_pool_new(sizeof(struct LocalUser), MP_CHUNK_SIZE_LCLIENT);
1102	>	event_add(&event_ping, NULL);
1103		}

Diff Legend

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