ViewVC Help

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

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

Comparing ircd-hybrid/trunk/src/client.c (file contents):
Revision 4428 by michael, Thu Aug 7 17:46:02 2014 UTC vs.
Revision 6774 by michael, Fri Nov 13 20:20:48 2015 UTC

#	Line 1 | Line 1
1		/*
2		*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (c) 1997-2014 ircd-hybrid development team
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 15 | 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
#	Line 60 | Line 60 | dlink_list global_client_list;
60		dlink_list global_server_list;
61		dlink_list oper_list;
62
63	<	static mp_pool_t *client_pool, *lclient_pool;
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
#	Line 83 | Line 83 | static dlink_node *eac_next;  /* next ab
83		struct Client *
84		make_client(struct Client *from)
85		{
86	<	struct Client *client_p = mp_pool_get(client_pool);
86	>	struct Client *const client_p = mp_pool_get(client_pool);
87
88		if (!from)
89		{
90	<	client_p->from                      = client_p; /* 'from' of local client is self! */
91	<	client_p->localClient               = mp_pool_get(lclient_pool);
92	<	client_p->localClient->since        = CurrentTime;
93	<	client_p->localClient->lasttime     = CurrentTime;
94	<	client_p->localClient->firsttime    = CurrentTime;
95	<	client_p->localClient->registration = REG_INIT;
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
97		/* as good a place as any... */
98	<	dlinkAdd(client_p, &client_p->localClient->lclient_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->idhnext = client_p;
104	<	client_p->hnext  = client_p;
104	>	client_p->hnext = client_p;
105		SetUnknown(client_p);
106		strcpy(client_p->username, "unknown");
107	<	strcpy(client_p->svid, "0");
107	>	strcpy(client_p->account, "*");
108
109		return client_p;
110		}
#	Line 119 | Line 119 | make_client(struct Client *from)
119		static void
120		free_client(struct Client *client_p)
121		{
122	–	assert(client_p);
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);
128	>	assert(dlink_list_length(&client_p->svstags) == 0);
129
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);
137	<	assert(dlink_list_length(&client_p->localClient->watches) == 0);
138	<	assert(IsClosing(client_p) && IsDead(client_p));
140	<
141	<	MyFree(client_p->localClient->response);
142	<	MyFree(client_p->localClient->auth_oper);
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(HasFlag(client_p, FLAGS_CLOSING) && IsDead(client_p));
139
140		/*
141	<	* clean up extra sockets from P-lines which have been discarded.
141	>	* Clean up extra sockets from listen {} blocks which have been discarded.
142		*/
143	<	if (client_p->localClient->listener)
143	>	if (client_p->connection->listener)
144		{
145	<	listener_release(client_p->localClient->listener);
146	<	client_p->localClient->listener = NULL;
145	>	listener_release(client_p->connection->listener);
146	>	client_p->connection->listener = NULL;
147		}
148
149	<	dbuf_clear(&client_p->localClient->buf_recvq);
150	<	dbuf_clear(&client_p->localClient->buf_sendq);
149	>	dbuf_clear(&client_p->connection->buf_recvq);
150	>	dbuf_clear(&client_p->connection->buf_sendq);
151
152	<	mp_pool_release(client_p->localClient);
152	>	mp_pool_release(client_p->connection);
153		}
154
155		mp_pool_release(client_p);
156		}
157
158	+	void
159	+	client_attach_svstag(struct Client *client_p, unsigned int numeric,
160	+	const char *umodes, const char *const tag)
161	+	{
162	+	struct ServicesTag *svstag = NULL;
163	+	const struct user_modes *tab = NULL;
164	+
165	+	if (numeric >= ERR_LAST_ERR_MSG || *umodes != '+')
166	+	return;
167	+
168	+	svstag = MyCalloc(sizeof(*svstag));
169	+	svstag->numeric = numeric;
170	+	svstag->tag = xstrdup(tag);
171	+
172	+	for (const char *m = umodes + 1; *m; ++m)
173	+	if ((tab = umode_map[(unsigned char)*m]))
174	+	svstag->umodes |= tab->flag;
175	+
176	+	if (numeric != RPL_WHOISOPERATOR)
177	+	dlinkAddTail(svstag, &svstag->node, &client_p->svstags);
178	+	else
179	+	dlinkAdd(svstag, &svstag->node, &client_p->svstags);
180	+	}
181	+
182	+	void
183	+	client_clear_svstags(struct Client *client_p)
184	+	{
185	+	dlink_node *node = NULL, *node_next = NULL;
186	+
187	+	DLINK_FOREACH_SAFE(node, node_next, client_p->svstags.head)
188	+	{
189	+	struct ServicesTag *svstag = node->data;
190	+
191	+	dlinkDelete(&svstag->node, &client_p->svstags);
192	+	MyFree(svstag->tag);
193	+	MyFree(svstag);
194	+	}
195	+	}
196	+
197		/* check_pings_list()
198		*
199		* inputs       - pointer to list to check
#	Line 170 | Line 205 | check_pings_list(dlink_list *list)
205		{
206		char buf[IRCD_BUFSIZE] = "";
207		int ping = 0;      /* ping time value from client */
208	<	dlink_node *ptr = NULL, *ptr_next = NULL;
208	>	dlink_node *node = NULL, *node_next = NULL;
209
210	<	DLINK_FOREACH_SAFE(ptr, ptr_next, list->head)
210	>	DLINK_FOREACH_SAFE(node, node_next, list->head)
211		{
212	<	struct Client *client_p = ptr->data;
212	>	struct Client *client_p = node->data;
213
214		if (IsDead(client_p))
215		continue;  /* Ignore it, its been exited already */
216
217	<	if (!IsRegistered(client_p))
218	<	ping = CONNECTTIMEOUT;
217	>	if (IsClient(client_p) || IsServer(client_p))
218	>	ping = get_client_ping(&client_p->connection->confs);
219		else
220	<	ping = get_client_ping(&client_p->localClient->confs);
220	>	ping = CONNECTTIMEOUT;
221
222	<	if (ping < CurrentTime - client_p->localClient->lasttime)
222	>	if (ping < CurrentTime - client_p->connection->lasttime)
223		{
224	<	if (!IsPingSent(client_p))
224	>	if (!HasFlag(client_p, FLAGS_PINGSENT))
225		{
226		/*
227		* If we haven't PINGed the connection and we haven't
228		* heard from it in a while, PING it to make sure
229		* it is still alive.
230		*/
231	<	SetPingSent(client_p);
232	<	client_p->localClient->lasttime = CurrentTime - ping;
231	>	AddFlag(client_p, FLAGS_PINGSENT);
232	>	client_p->connection->lasttime = CurrentTime - ping;
233		sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
234		}
235		else
236		{
237	<	if (CurrentTime - client_p->localClient->lasttime >= 2 * ping)
237	>	if (CurrentTime - client_p->connection->lasttime >= 2 * ping)
238		{
239		/*
240		* If the client/server hasn't talked to us in 2*ping seconds
#	Line 207 | Line 242 | check_pings_list(dlink_list *list)
242		*/
243		if (IsServer(client_p) || IsHandshake(client_p))
244		{
245	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
245	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
246		"No response from %s, closing link",
247	<	get_client_name(client_p, HIDE_IP));
248	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
247	>	get_client_name(client_p, SHOW_IP));
248	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
249		"No response from %s, closing link",
250		get_client_name(client_p, MASK_IP));
251		ilog(LOG_TYPE_IRCD, "No response from %s, closing link",
252	<	get_client_name(client_p, HIDE_IP));
252	>	get_client_name(client_p, SHOW_IP));
253		}
254
255		snprintf(buf, sizeof(buf), "Ping timeout: %d seconds",
256	<	(int)(CurrentTime - client_p->localClient->lasttime));
256	>	(int)(CurrentTime - client_p->connection->lasttime));
257		exit_client(client_p, buf);
258		}
259		}
#	Line 235 | Line 270 | check_pings_list(dlink_list *list)
270		static void
271		check_unknowns_list(void)
272		{
273	<	dlink_node *ptr = NULL, *ptr_next = NULL;
273	>	dlink_node *node = NULL, *node_next = NULL;
274
275	<	DLINK_FOREACH_SAFE(ptr, ptr_next, unknown_list.head)
275	>	DLINK_FOREACH_SAFE(node, node_next, unknown_list.head)
276		{
277	<	struct Client *client_p = ptr->data;
277	>	struct Client *client_p = node->data;
278
279		/*
280		* Check UNKNOWN connections - if they have been in this state
281		* for > 30s, close them.
282		*/
283	<	if (IsAuthFinished(client_p) && (CurrentTime - client_p->localClient->firsttime) > 30)
283	>	if (HasFlag(client_p, FLAGS_FINISHED_AUTH) && (CurrentTime - client_p->connection->firsttime) > 30)
284		exit_client(client_p, "Registration timed out");
285		}
286		}
#	Line 277 | Line 312 | check_unknowns_list(void)
312		*/
313
314		static void
315	<	check_pings(void *notused)
315	>	check_pings(void *unused)
316		{
317		check_pings_list(&local_client_list);
318		check_pings_list(&local_server_list);
#	Line 295 | Line 330 | void
330		check_conf_klines(void)
331		{
332		struct MaskItem *conf = NULL;
333	<	dlink_node *ptr = NULL, *ptr_next = NULL;
333	>	dlink_node *node = NULL, *node_next = NULL;
334
335	<	DLINK_FOREACH_SAFE(ptr, ptr_next, local_client_list.head)
335	>	DLINK_FOREACH_SAFE(node, node_next, local_client_list.head)
336		{
337	<	struct Client *client_p = ptr->data;
337	>	struct Client *client_p = node->data;
338
339	<	/* If a client is already being exited
340	<	*/
306	<	if (IsDead(client_p) || !IsClient(client_p))
339	>	/* If a client is already being exited */
340	>	if (IsDead(client_p))
341		continue;
342
343	<	if ((conf = find_conf_by_address(NULL, &client_p->localClient->ip, CONF_DLINE,
344	<	client_p->localClient->aftype, NULL, NULL, 1)))
343	>	if ((conf = find_conf_by_address(NULL, &client_p->connection->ip, CONF_DLINE,
344	>	client_p->connection->aftype, NULL, NULL, 1)))
345		{
346		conf_try_ban(client_p, conf);
347	<	continue; /* and go examine next fd/client_p */
314	<	}
315	<
316	<	if (ConfigGeneral.glines)
317	<	{
318	<	if ((conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
319	<	CONF_GLINE, client_p->localClient->aftype,
320	<	client_p->username, NULL, 1)))
321	<	{
322	<	conf_try_ban(client_p, conf);
323	<	/* and go examine next fd/client_p */
324	<	continue;
325	<	}
347	>	continue;  /* and go examine next Client */
348		}
349
350	<	if ((conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
351	<	CONF_KLINE, client_p->localClient->aftype,
350	>	if ((conf = find_conf_by_address(client_p->host, &client_p->connection->ip,
351	>	CONF_KLINE, client_p->connection->aftype,
352		client_p->username, NULL, 1)))
353		{
354		conf_try_ban(client_p, conf);
355	<	continue;
355	>	continue;  /* and go examine next Client */
356		}
357
358	<	if ((conf = find_matching_name_conf(CONF_XLINE,  client_p->info,
358	>	if ((conf = find_matching_name_conf(CONF_XLINE, client_p->info,
359		NULL, NULL, 0)))
360		{
361		conf_try_ban(client_p, conf);
362	<	continue;
362	>	continue;  /* and go examine next Client */
363		}
364		}
365
366	<	/* also check the unknowns list for new dlines */
367	<	DLINK_FOREACH_SAFE(ptr, ptr_next, unknown_list.head)
366	>	/* Also check the unknowns list for new dlines */
367	>	DLINK_FOREACH_SAFE(node, node_next, unknown_list.head)
368		{
369	<	struct Client *client_p = ptr->data;
369	>	struct Client *client_p = node->data;
370
371	<	if ((conf = find_conf_by_address(NULL, &client_p->localClient->ip, CONF_DLINE,
372	<	client_p->localClient->aftype, NULL, NULL, 1)))
371	>	if ((conf = find_conf_by_address(NULL, &client_p->connection->ip, CONF_DLINE,
372	>	client_p->connection->aftype, NULL, NULL, 1)))
373		{
374		conf_try_ban(client_p, conf);
375	<	continue; /* and go examine next fd/client_p */
375	>	continue;  /* and go examine next Client */
376		}
377		}
378		}
#	Line 366 | Line 388 | check_conf_klines(void)
388		void
389		conf_try_ban(struct Client *client_p, struct MaskItem *conf)
390		{
391	<	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";
373	<	const char gline_string[] = "G-line";
374	<	const char xline_string[] = "X-line";
391	>	char ban_type = '\0';
392
393		switch (conf->type)
394		{
395		case CONF_KLINE:
396	<	if (IsExemptKline(client_p))
396	>	if (HasFlag(client_p, FLAGS_EXEMPTKLINE))
397		{
398	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
398	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
399		"KLINE over-ruled for %s, client is kline_exempt",
400		get_client_name(client_p, HIDE_IP));
401		return;
402		}
403
404	<	type_string = kline_string;
404	>	ban_type = 'K';
405		break;
406		case CONF_DLINE:
407	<	if (find_conf_by_address(NULL, &client_p->localClient->ip, CONF_EXEMPT,
408	<	client_p->localClient->aftype, NULL, NULL, 1))
407	>	if (find_conf_by_address(NULL, &client_p->connection->ip, CONF_EXEMPT,
408	>	client_p->connection->aftype, NULL, NULL, 1))
409		return;
410	<	type_string = dline_string;
410	>	ban_type = 'D';
411		break;
412	<	case CONF_GLINE:
413	<	if (IsExemptKline(client_p) ||
397	<	IsExemptGline(client_p))
412	>	case CONF_XLINE:
413	>	if (HasFlag(client_p, FLAGS_EXEMPTXLINE))
414		{
415	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
416	<	"GLINE over-ruled for %s, client is %sline_exempt",
417	<	get_client_name(client_p, HIDE_IP), IsExemptKline(client_p) ? "k" : "g");
415	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
416	>	"XLINE over-ruled for %s, client is xline_exempt",
417	>	get_client_name(client_p, HIDE_IP));
418		return;
419		}
420
421	<	type_string = gline_string;
406	<	break;
407	<	case CONF_XLINE:
408	<	type_string = xline_string;
421	>	ban_type = 'X';
422		++conf->count;
423		break;
424		default:
#	Line 413 | Line 426 | conf_try_ban(struct Client *client_p, st
426		break;
427		}
428
429	<	user_reason = conf->reason ? conf->reason : type_string;
430	<
418	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s active for %s",
419	<	type_string, get_client_name(client_p, HIDE_IP));
429	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE, "%c-line active for %s",
430	>	ban_type, get_client_name(client_p, HIDE_IP));
431
432		if (IsClient(client_p))
433	<	sendto_one_numeric(client_p, &me, ERR_YOUREBANNEDCREEP, user_reason);
433	>	sendto_one_numeric(client_p, &me, ERR_YOUREBANNEDCREEP, conf->reason);
434
435	<	exit_client(client_p, user_reason);
435	>	exit_client(client_p, conf->reason);
436		}
437
438		/* update_client_exit_stats()
#	Line 436 | Line 447 | update_client_exit_stats(struct Client *
447		if (IsClient(client_p))
448		{
449		assert(Count.total > 0);
450	+
451		--Count.total;
452		if (HasUMode(client_p, UMODE_OPER))
453		--Count.oper;
#	Line 446 | Line 458 | update_client_exit_stats(struct Client *
458		sendto_realops_flags(UMODE_EXTERNAL, L_ALL, SEND_NOTICE,
459		"Server %s split from %s",
460		client_p->name, client_p->servptr->name);
449	–
450	–	if (splitchecking && !splitmode)
451	–	check_splitmode(NULL);
461		}
462
463		/* find_person()
#	Line 481 | Line 490 | find_person(const struct Client *const s
490		struct Client *
491		find_chasing(struct Client *source_p, const char *name)
492		{
493	<	struct Client *who = find_person(source_p, name);
493	>	struct Client *target_p = find_person(source_p, name);
494
495	<	if (who)
496	<	return who;
495	>	if (target_p)
496	>	return target_p;
497
498		if (IsDigit(*name))
499		return NULL;
500
501	<	if ((who = whowas_get_history(name,
502	<	(time_t)ConfigGeneral.kill_chase_time_limit))
503	<	== NULL)
501	>	target_p = whowas_get_history(name, (time_t)ConfigGeneral.kill_chase_time_limit);
502	>
503	>	if (!target_p)
504		{
505		sendto_one_numeric(source_p, &me, ERR_NOSUCHNICK, name);
506		return NULL;
507		}
508
509	<	return who;
509	>	return target_p;
510		}
511
512		/*
#	Line 523 | Line 532 | get_client_name(const struct Client *cli
532		{
533		static char buf[HOSTLEN * 2 + USERLEN + 5];
534
526	–	assert(client_p);
527	–
535		if (!MyConnect(client_p))
536		return client_p->name;
537
#	Line 536 | Line 543 | get_client_name(const struct Client *cli
543		type = MASK_IP;
544		}
545
539	–	if (ConfigGeneral.hide_spoof_ips)
540	–	if (IsIPSpoof(client_p) && type == SHOW_IP)
541	–	type = MASK_IP;
542	–
546		/* And finally, let's get the host information, ip or name */
547		switch (type)
548		{
#	Line 549 | Line 552 | get_client_name(const struct Client *cli
552		client_p->username, client_p->sockhost);
553		break;
554		case MASK_IP:
555	<	if (client_p->localClient->aftype == AF_INET)
555	>	if (client_p->connection->aftype == AF_INET)
556		snprintf(buf, sizeof(buf), "%s[%s@255.255.255.255]",
557		client_p->name, client_p->username);
558		else
559		snprintf(buf, sizeof(buf), "%s[%s@ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff]",
560		client_p->name, client_p->username);
561		break;
562	<	default:
562	>	default:  /* HIDE_IP */
563		snprintf(buf, sizeof(buf), "%s[%s@%s]",
564		client_p->name,
565		client_p->username, client_p->host);
#	Line 568 | Line 571 | get_client_name(const struct Client *cli
571		void
572		free_exited_clients(void)
573		{
574	<	dlink_node *ptr = NULL, *next = NULL;
574	>	dlink_node *node = NULL, *node_next = NULL;
575
576	<	DLINK_FOREACH_SAFE(ptr, next, dead_list.head)
576	>	DLINK_FOREACH_SAFE(node, node_next, dead_list.head)
577		{
578	<	free_client(ptr->data);
579	<	dlinkDelete(ptr, &dead_list);
580	<	free_dlink_node(ptr);
578	>	free_client(node->data);
579	>	dlinkDelete(node, &dead_list);
580	>	free_dlink_node(node);
581		}
582		}
583
#	Line 587 | Line 590 | free_exited_clients(void)
590		static void
591		exit_one_client(struct Client *source_p, const char *comment)
592		{
593	<	dlink_node *ptr = NULL, *ptr_next = NULL;
593	>	dlink_node *node = NULL, *node_next = NULL;
594
595		assert(!IsMe(source_p));
596		assert(source_p != &me);
#	Line 603 | Line 606 | exit_one_client(struct Client *source_p,
606		* that the client can show the "**signoff" message).
607		* (Note: The notice is to the local clients *only*)
608		*/
609	<	sendto_common_channels_local(source_p, 0, 0, ":%s!%s@%s QUIT :%s",
609	>	sendto_common_channels_local(source_p, 0, 0, 0, ":%s!%s@%s QUIT :%s",
610		source_p->name, source_p->username,
611		source_p->host, comment);
612	<	DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->channel.head)
613	<	remove_user_from_channel(ptr->data);
612	>
613	>	DLINK_FOREACH_SAFE(node, node_next, source_p->channel.head)
614	>	remove_user_from_channel(node->data);
615
616		whowas_add_history(source_p, 0);
617		whowas_off_history(source_p);
#	Line 616 | Line 620 | exit_one_client(struct Client *source_p,
620
621		if (MyConnect(source_p))
622		{
623	<	/* Clean up invitefield */
620	<	DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->localClient->invited.head)
621	<	del_invite(ptr->data, source_p);
622	<
623	>	clear_invites_client(source_p);
624		del_all_accepts(source_p);
625		}
626		}
#	Line 628 | Line 629 | exit_one_client(struct Client *source_p,
629		dlinkDelete(&source_p->lnode, &source_p->servptr->serv->server_list);
630		dlinkDelete(&source_p->node, &global_client_list);
631
632	<	if ((ptr = dlinkFindDelete(&global_server_list, source_p)))
633	<	free_dlink_node(ptr);
632	>	if ((node = dlinkFindDelete(&global_server_list, source_p)))
633	>	free_dlink_node(node);
634		}
635
636		/* Remove source_p from the client lists */
637		if (source_p->id[0])
638		hash_del_id(source_p);
639	+
640		if (source_p->name[0])
641		hash_del_client(source_p);
642
643	<	if (IsUserHostIp(source_p))
644	<	delete_user_host(source_p->username, source_p->host, !MyConnect(source_p));
643	>	if (HasFlag(source_p, FLAGS_USERHOST))
644	>	userhost_del(source_p->username, source_p->host, !MyConnect(source_p));
645
646		update_client_exit_stats(source_p);
647
#	Line 660 | Line 662 | exit_one_client(struct Client *source_p,
662		static void
663		recurse_remove_clients(struct Client *source_p, const char *comment)
664		{
665	<	dlink_node *ptr = NULL, *ptr_next = NULL;
665	>	dlink_node *node = NULL, *node_next = NULL;
666
667	<	DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->serv->client_list.head)
668	<	exit_one_client(ptr->data, comment);
667	>	DLINK_FOREACH_SAFE(node, node_next, source_p->serv->client_list.head)
668	>	exit_one_client(node->data, comment);
669
670	<	DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->serv->server_list.head)
670	>	DLINK_FOREACH_SAFE(node, node_next, source_p->serv->server_list.head)
671		{
672	<	recurse_remove_clients(ptr->data, comment);
673	<	exit_one_client(ptr->data, comment);
672	>	recurse_remove_clients(node->data, comment);
673	>	exit_one_client(node->data, comment);
674		}
675		}
676
#	Line 692 | Line 694 | recurse_remove_clients(struct Client *so
694		void
695		exit_client(struct Client *source_p, const char *comment)
696		{
697	<	dlink_node *m = NULL;
697	>	dlink_node *node = NULL;
698
699		assert(!IsMe(source_p));
700		assert(source_p != &me);
#	Line 702 | Line 704 | exit_client(struct Client *source_p, con
704		/* DO NOT REMOVE. exit_client can be called twice after a failed
705		* read/write.
706		*/
707	<	if (IsClosing(source_p))
707	>	if (HasFlag(source_p, FLAGS_CLOSING))
708		return;
709
710	<	SetClosing(source_p);
710	>	AddFlag(source_p, FLAGS_CLOSING);
711
712		if (HasFlag(source_p, FLAGS_IPHASH))
713		{
714		DelFlag(source_p, FLAGS_IPHASH);
715	<	ipcache_remove_address(&source_p->localClient->ip);
715	>	ipcache_remove_address(&source_p->connection->ip);
716		}
717
718	<	delete_auth(&source_p->localClient->auth);
718	>	delete_auth(&source_p->connection->auth);
719
720	<	/*
719	<	* This source_p could have status of one of STAT_UNKNOWN, STAT_CONNECTING
720	<	* STAT_HANDSHAKE or STAT_UNKNOWN
721	<	* all of which are lumped together into unknown_list
722	<	*
723	<	* In all above cases IsRegistered() will not be true.
724	<	*/
725	<	if (!IsRegistered(source_p))
720	>	if (IsClient(source_p))
721		{
722	<	assert(dlinkFind(&unknown_list, source_p));
722	>	time_t on_for = CurrentTime - source_p->connection->firsttime;
723
729	–	dlinkDelete(&source_p->localClient->lclient_node, &unknown_list);
730	–	}
731	–	else if (IsClient(source_p))
732	–	{
733	–	time_t on_for = CurrentTime - source_p->localClient->firsttime;
724		assert(Count.local > 0);
725	<	Count.local--;
725	>
726	>	--Count.local;
727
728		if (HasUMode(source_p, UMODE_OPER))
729	<	if ((m = dlinkFindDelete(&oper_list, source_p)))
730	<	free_dlink_node(m);
729	>	if ((node = dlinkFindDelete(&oper_list, source_p)))
730	>	free_dlink_node(node);
731
732		assert(dlinkFind(&local_client_list, source_p));
733	<	dlinkDelete(&source_p->localClient->lclient_node, &local_client_list);
733	>	dlinkDelete(&source_p->connection->lclient_node, &local_client_list);
734
735	<	if (source_p->localClient->list_task)
735	>	if (source_p->connection->list_task)
736		free_list_task(source_p);
737
738		watch_del_watch_list(source_p);
739	+	client_clear_svstags(source_p);
740	+
741		sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
742		"Client exiting: %s (%s@%s) [%s] [%s]",
743		source_p->name, source_p->username, source_p->host, comment,
744	<	ConfigGeneral.hide_spoof_ips && IsIPSpoof(source_p) ?
745	<	"255.255.255.255" : source_p->sockhost);
744	>	source_p->sockhost);
745	>
746		ilog(LOG_TYPE_USER, "%s (%3u:%02u:%02u): %s!%s@%s %llu/%llu",
747	<	myctime(source_p->localClient->firsttime), (unsigned int)(on_for / 3600),
747	>	date_ctime(source_p->connection->firsttime), (unsigned int)(on_for / 3600),
748		(unsigned int)((on_for % 3600)/60), (unsigned int)(on_for % 60),
749		source_p->name, source_p->username, source_p->host,
750	<	source_p->localClient->send.bytes>>10,
751	<	source_p->localClient->recv.bytes>>10);
750	>	source_p->connection->send.bytes>>10,
751	>	source_p->connection->recv.bytes>>10);
752		}
753		else if (IsServer(source_p))
754		{
755		assert(Count.myserver > 0);
756	+
757		--Count.myserver;
758
759		assert(dlinkFind(&local_server_list, source_p));
760	<	dlinkDelete(&source_p->localClient->lclient_node, &local_server_list);
760	>	dlinkDelete(&source_p->connection->lclient_node, &local_server_list);
761	>	}
762	>	else
763	>	{
764	>	assert(dlinkFind(&unknown_list, source_p));
765	>	dlinkDelete(&source_p->connection->lclient_node, &unknown_list);
766		}
767
768		if (!IsDead(source_p))
#	Line 794 | Line 793 | exit_client(struct Client *source_p, con
793		{
794		char splitstr[HOSTLEN + HOSTLEN + 2] = "";
795
796	<	/* This shouldn't ever happen */
797	<	assert(source_p->serv && source_p->servptr);
796	>	assert(source_p->serv);
797	>	assert(source_p->servptr);
798
799		if (ConfigServerHide.hide_servers)
800		/*
#	Line 809 | Line 808 | exit_client(struct Client *source_p, con
808
809		/* Send SQUIT for source_p in every direction. source_p is already off of local_server_list here */
810		if (!HasFlag(source_p, FLAGS_SQUIT))
811	<	sendto_server(NULL, NOCAPS, NOCAPS, "SQUIT %s :%s", source_p->id, comment);
811	>	sendto_server(NULL, 0, 0, "SQUIT %s :%s", source_p->id, comment);
812
813		/* Now exit the clients internally */
814		recurse_remove_clients(source_p, splitstr);
815
816		if (MyConnect(source_p))
817		{
818	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
819	<	"%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
820	<	source_p->name, (int)(CurrentTime - source_p->localClient->firsttime),
821	<	source_p->localClient->send.bytes >> 10,
822	<	source_p->localClient->recv.bytes >> 10);
823	<	ilog(LOG_TYPE_IRCD, "%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
824	<	source_p->name, (int)(CurrentTime - source_p->localClient->firsttime),
825	<	source_p->localClient->send.bytes >> 10,
826	<	source_p->localClient->recv.bytes >> 10);
818	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
819	>	"%s was connected for %s. %llu/%llu sendK/recvK.",
820	>	source_p->name, time_dissect(CurrentTime - source_p->connection->firsttime),
821	>	source_p->connection->send.bytes >> 10,
822	>	source_p->connection->recv.bytes >> 10);
823	>	ilog(LOG_TYPE_IRCD, "%s was connected for %s. %llu/%llu sendK/recvK.",
824	>	source_p->name, time_dissect(CurrentTime - source_p->connection->firsttime),
825	>	source_p->connection->send.bytes >> 10,
826	>	source_p->connection->recv.bytes >> 10);
827		}
828		}
829		else if (IsClient(source_p) && !HasFlag(source_p, FLAGS_KILLED))
830	<	sendto_server(source_p->from, NOCAPS, NOCAPS, ":%s QUIT :%s",
830	>	sendto_server(source_p->from, 0, 0, ":%s QUIT :%s",
831		source_p->id, comment);
832
833		/* The client *better* be off all of the lists */
#	Line 847 | Line 846 | exit_client(struct Client *source_p, con
846		void
847		dead_link_on_write(struct Client *client_p, int ierrno)
848		{
849	<	dlink_node *ptr;
849	>	dlink_node *node;
850
851		if (IsDefunct(client_p))
852		return;
853
854	<	dbuf_clear(&client_p->localClient->buf_recvq);
855	<	dbuf_clear(&client_p->localClient->buf_sendq);
854	>	dbuf_clear(&client_p->connection->buf_recvq);
855	>	dbuf_clear(&client_p->connection->buf_sendq);
856
857		assert(dlinkFind(&abort_list, client_p) == NULL);
858	<	ptr = make_dlink_node();
858	>	node = make_dlink_node();
859		/* don't let exit_aborted_clients() finish yet */
860	<	dlinkAddTail(client_p, ptr, &abort_list);
860	>	dlinkAddTail(client_p, node, &abort_list);
861
862		if (eac_next == NULL)
863	<	eac_next = ptr;
863	>	eac_next = node;
864
865		SetDead(client_p); /* You are dead my friend */
866		}
#	Line 879 | Line 878 | dead_link_on_read(struct Client *client_
878		if (IsDefunct(client_p))
879		return;
880
881	<	dbuf_clear(&client_p->localClient->buf_recvq);
882	<	dbuf_clear(&client_p->localClient->buf_sendq);
881	>	dbuf_clear(&client_p->connection->buf_recvq);
882	>	dbuf_clear(&client_p->connection->buf_sendq);
883
884	<	current_error = get_sockerr(client_p->localClient->fd.fd);
884	>	current_error = get_sockerr(client_p->connection->fd.fd);
885
886		if (IsServer(client_p) || IsHandshake(client_p))
887		{
889	–	int connected = CurrentTime - client_p->localClient->firsttime;
890	–
888		if (error == 0)
889		{
890		/* Admins get the real IP */
891	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
891	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ADMIN, SEND_NOTICE,
892		"Server %s closed the connection",
893		get_client_name(client_p, SHOW_IP));
894
895		/* Opers get a masked IP */
896	<	sendto_realops_flags(UMODE_ALL, L_OPER, SEND_NOTICE,
896	>	sendto_realops_flags(UMODE_SERVNOTICE, L_OPER, SEND_NOTICE,
897		"Server %s closed the connection",
898		get_client_name(client_p, MASK_IP));
899
#	Line 911 | Line 908 | dead_link_on_read(struct Client *client_
908		get_client_name(client_p, MASK_IP), current_error);
909		}
910
911	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
912	<	"%s had been connected for %d day%s, %2d:%02d:%02d",
913	<	client_p->name, connected/86400,
917	<	(connected/86400 == 1) ? "" : "s",
918	<	(connected % 86400) / 3600, (connected % 3600) / 60,
919	<	connected % 60);
911	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
912	>	"%s was connected for %s",
913	>	client_p->name, time_dissect(CurrentTime - client_p->connection->firsttime));
914		}
915
916		if (error == 0)
#	Line 943 | Line 937 | exit_aborted_clients(void)
937
938		if (target_p == NULL)
939		{
940	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
940	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
941		"Warning: null client on abort_list!");
942		dlinkDelete(ptr, &abort_list);
943		free_dlink_node(ptr);
#	Line 952 | Line 946 | exit_aborted_clients(void)
946
947		dlinkDelete(ptr, &abort_list);
948
949	<	if (IsSendQExceeded(target_p))
949	>	if (HasFlag(target_p, FLAGS_SENDQEX))
950		notice = "Max SendQ exceeded";
951		else
952		notice = "Write error: connection closed";
#	Line 975 | Line 969 | exit_aborted_clients(void)
969		void
970		del_accept(struct split_nuh_item *accept_p, struct Client *client_p)
971		{
972	<	dlinkDelete(&accept_p->node, &client_p->localClient->acceptlist);
972	>	dlinkDelete(&accept_p->node, &client_p->connection->acceptlist);
973
974		MyFree(accept_p->nickptr);
975		MyFree(accept_p->userptr);
#	Line 988 | Line 982 | find_accept(const char *nick, const char
982		const char *host, struct Client *client_p,
983		int (*cmpfunc)(const char *, const char *))
984		{
985	<	dlink_node *ptr = NULL;
985	>	dlink_node *node = NULL;
986
987	<	DLINK_FOREACH(ptr, client_p->localClient->acceptlist.head)
987	>	DLINK_FOREACH(node, client_p->connection->acceptlist.head)
988		{
989	<	struct split_nuh_item *accept_p = ptr->data;
989	>	struct split_nuh_item *accept_p = node->data;
990
991		if (!cmpfunc(accept_p->nickptr, nick) &&
992		!cmpfunc(accept_p->userptr, user) &&
#	Line 1014 | Line 1008 | int
1008		accept_message(struct Client *source,
1009		struct Client *target)
1010		{
1011	<	dlink_node *ptr = NULL;
1011	>	dlink_node *node = NULL;
1012	>
1013	>	if (HasFlag(source, FLAGS_SERVICE) ||
1014	>	(HasUMode(source, UMODE_OPER) && ConfigGeneral.opers_bypass_callerid))
1015	>	return 1;
1016
1017		if (source == target || find_accept(source->name, source->username,
1018		source->host, target, match))
1019		return 1;
1020
1021	<	if (HasUMode(target, UMODE_SOFTCALLERID))
1022	<	DLINK_FOREACH(ptr, target->channel.head)
1023	<	if (IsMember(source, ((struct Membership *)ptr->data)->chptr))
1021	>	if (!HasUMode(target, UMODE_CALLERID) && HasUMode(target, UMODE_SOFTCALLERID))
1022	>	DLINK_FOREACH(node, target->channel.head)
1023	>	if (IsMember(source, ((struct Membership *)node->data)->chptr))
1024		return 1;
1025
1026		return 0;
#	Line 1037 | Line 1035 | accept_message(struct Client *source,
1035		void
1036		del_all_accepts(struct Client *client_p)
1037		{
1038	<	dlink_node *ptr = NULL, *ptr_next = NULL;
1038	>	dlink_node *node = NULL, *node_next = NULL;
1039
1040	<	DLINK_FOREACH_SAFE(ptr, ptr_next, client_p->localClient->acceptlist.head)
1041	<	del_accept(ptr->data, client_p);
1040	>	DLINK_FOREACH_SAFE(node, node_next, client_p->connection->acceptlist.head)
1041	>	del_accept(node->data, client_p);
1042		}
1043
1044		unsigned int
1045	<	idle_time_get(const struct Client *source_p, const struct Client *target_p)
1045	>	client_get_idle_time(const struct Client *source_p,
1046	>	const struct Client *target_p)
1047		{
1048		unsigned int idle = 0;
1049		unsigned int min_idle = 0;
1050		unsigned int max_idle = 0;
1051	<	const struct ClassItem *class = get_class_ptr(&target_p->localClient->confs);
1051	>	const struct ClassItem *const class = get_class_ptr(&target_p->connection->confs);
1052
1053		if (!(class->flags & CLASS_FLAGS_FAKE_IDLE) || target_p == source_p)
1054	<	return CurrentTime - target_p->localClient->last_privmsg;
1054	>	return CurrentTime - target_p->connection->last_privmsg;
1055	>
1056		if (HasUMode(source_p, UMODE_OPER) &&
1057		!(class->flags & CLASS_FLAGS_HIDE_IDLE_FROM_OPERS))
1058	<	return CurrentTime - target_p->localClient->last_privmsg;
1058	>	return CurrentTime - target_p->connection->last_privmsg;
1059
1060		min_idle = class->min_idle;
1061		max_idle = class->max_idle;
#	Line 1066 | Line 1066 | idle_time_get(const struct Client *sourc
1066		if (class->flags & CLASS_FLAGS_RANDOM_IDLE)
1067		idle = genrand_int32();
1068		else
1069	<	idle = CurrentTime - target_p->localClient->last_privmsg;
1069	>	idle = CurrentTime - target_p->connection->last_privmsg;
1070
1071		if (!max_idle)
1072		idle = 0;
#	Line 1096 | Line 1096 | client_init(void)
1096		};
1097
1098		client_pool = mp_pool_new(sizeof(struct Client), MP_CHUNK_SIZE_CLIENT);
1099	<	lclient_pool = mp_pool_new(sizeof(struct LocalUser), MP_CHUNK_SIZE_LCLIENT);
1099	>	connection_pool = mp_pool_new(sizeof(struct Connection), MP_CHUNK_SIZE_CONNECTION);
1100		event_add(&event_ping, NULL);
1101		}

Diff Legend

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