ViewVC Help

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

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

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

Diff Legend

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