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 5555 by michael, Fri Feb 13 18:56:09 2015 UTC

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

Diff Legend

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