ViewVC Help

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

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

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

Comparing:
ircd-hybrid/src/client.c (property svn:keywords), Revision 31 by knight, Sun Oct 2 20:34:05 2005 UTC vs.
ircd-hybrid/trunk/src/client.c (property svn:keywords), Revision 5732 by michael, Sun Mar 29 10:57:50 2015 UTC

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

Diff Legend

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