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 5558 by michael, Fri Feb 13 20:45:49 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, "0");
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);
#	Line 133 | Line 132 | free_client(struct Client *client_p)
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);
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	<	listener_release(client_p->localClient->listener);
151	<	client_p->localClient->listener = NULL;
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	<	mp_pool_release(client_p->localClient);
157	>	mp_pool_release(client_p->connection);
158		}
159
160		mp_pool_release(client_p);
161		}
162
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	+	if (numeric >= ERR_LAST_ERR_MSG || *umodes != '+')
171	+	return;
172	+
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
#	Line 170 | Line 210 | check_pings_list(dlink_list *list)
210		{
211		char buf[IRCD_BUFSIZE] = "";
212		int ping = 0;      /* ping time value from client */
213	<	dlink_node *ptr = NULL, *ptr_next = NULL;
213	>	dlink_node *node = NULL, *node_next = NULL;
214
215	<	DLINK_FOREACH_SAFE(ptr, ptr_next, list->head)
215	>	DLINK_FOREACH_SAFE(node, node_next, list->head)
216		{
217	<	struct Client *client_p = ptr->data;
217	>	struct Client *client_p = node->data;
218
219		if (IsDead(client_p))
220		continue;  /* Ignore it, its been exited already */
#	Line 182 | Line 222 | check_pings_list(dlink_list *list)
222		if (!IsRegistered(client_p))
223		ping = CONNECTTIMEOUT;
224		else
225	<	ping = get_client_ping(&client_p->localClient->confs);
225	>	ping = get_client_ping(&client_p->connection->confs);
226
227	<	if (ping < CurrentTime - client_p->localClient->lasttime)
227	>	if (ping < CurrentTime - client_p->connection->lasttime)
228		{
229		if (!IsPingSent(client_p))
230		{
#	Line 194 | Line 234 | check_pings_list(dlink_list *list)
234		* it is still alive.
235		*/
236		SetPingSent(client_p);
237	<	client_p->localClient->lasttime = CurrentTime - ping;
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->localClient->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
#	Line 218 | Line 258 | check_pings_list(dlink_list *list)
258		}
259
260		snprintf(buf, sizeof(buf), "Ping timeout: %d seconds",
261	<	(int)(CurrentTime - client_p->localClient->lasttime));
261	>	(int)(CurrentTime - client_p->connection->lasttime));
262		exit_client(client_p, buf);
263		}
264		}
#	Line 235 | Line 275 | check_pings_list(dlink_list *list)
275		static void
276		check_unknowns_list(void)
277		{
278	<	dlink_node *ptr = NULL, *ptr_next = NULL;
278	>	dlink_node *node = NULL, *node_next = NULL;
279
280	<	DLINK_FOREACH_SAFE(ptr, ptr_next, unknown_list.head)
280	>	DLINK_FOREACH_SAFE(node, node_next, unknown_list.head)
281		{
282	<	struct Client *client_p = ptr->data;
282	>	struct Client *client_p = node->data;
283
284		/*
285		* Check UNKNOWN connections - if they have been in this state
286		* for > 30s, close them.
287		*/
288	<	if (IsAuthFinished(client_p) && (CurrentTime - client_p->localClient->firsttime) > 30)
288	>	if (IsAuthFinished(client_p) && (CurrentTime - client_p->connection->firsttime) > 30)
289		exit_client(client_p, "Registration timed out");
290		}
291		}
#	Line 277 | Line 317 | check_unknowns_list(void)
317		*/
318
319		static void
320	<	check_pings(void *notused)
320	>	check_pings(void *unused)
321		{
322		check_pings_list(&local_client_list);
323		check_pings_list(&local_server_list);
#	Line 295 | Line 335 | void
335		check_conf_klines(void)
336		{
337		struct MaskItem *conf = NULL;
338	<	dlink_node *ptr = NULL, *ptr_next = NULL;
338	>	dlink_node *node = NULL, *node_next = NULL;
339
340	<	DLINK_FOREACH_SAFE(ptr, ptr_next, local_client_list.head)
340	>	DLINK_FOREACH_SAFE(node, node_next, local_client_list.head)
341		{
342	<	struct Client *client_p = ptr->data;
342	>	struct Client *client_p = node->data;
343
344	<	/* If a client is already being exited
345	<	*/
306	<	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 ((conf = find_conf_by_address(NULL, &client_p->localClient->ip, CONF_DLINE,
349	<	client_p->localClient->aftype, NULL, NULL, 1)))
348	>	if ((conf = find_conf_by_address(NULL, &client_p->connection->ip, CONF_DLINE,
349	>	client_p->connection->aftype, NULL, NULL, 1)))
350		{
351		conf_try_ban(client_p, conf);
352		continue; /* and go examine next fd/client_p */
#	Line 315 | Line 354 | check_conf_klines(void)
354
355		if (ConfigGeneral.glines)
356		{
357	<	if ((conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
358	<	CONF_GLINE, client_p->localClient->aftype,
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		conf_try_ban(client_p, conf);
#	Line 325 | Line 364 | check_conf_klines(void)
364		}
365		}
366
367	<	if ((conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
368	<	CONF_KLINE, client_p->localClient->aftype,
367	>	if ((conf = find_conf_by_address(client_p->host, &client_p->connection->ip,
368	>	CONF_KLINE, client_p->connection->aftype,
369		client_p->username, NULL, 1)))
370		{
371		conf_try_ban(client_p, conf);
#	Line 342 | Line 381 | check_conf_klines(void)
381		}
382
383		/* also check the unknowns list for new dlines */
384	<	DLINK_FOREACH_SAFE(ptr, ptr_next, unknown_list.head)
384	>	DLINK_FOREACH_SAFE(node, node_next, unknown_list.head)
385		{
386	<	struct Client *client_p = ptr->data;
386	>	struct Client *client_p = node->data;
387
388	<	if ((conf = find_conf_by_address(NULL, &client_p->localClient->ip, CONF_DLINE,
389	<	client_p->localClient->aftype, NULL, NULL, 1)))
388	>	if ((conf = find_conf_by_address(NULL, &client_p->connection->ip, CONF_DLINE,
389	>	client_p->connection->aftype, NULL, NULL, 1)))
390		{
391		conf_try_ban(client_p, conf);
392		continue; /* and go examine next fd/client_p */
#	Line 387 | Line 426 | conf_try_ban(struct Client *client_p, st
426		type_string = kline_string;
427		break;
428		case CONF_DLINE:
429	<	if (find_conf_by_address(NULL, &client_p->localClient->ip, CONF_EXEMPT,
430	<	client_p->localClient->aftype, NULL, NULL, 1))
429	>	if (find_conf_by_address(NULL, &client_p->connection->ip, CONF_EXEMPT,
430	>	client_p->connection->aftype, NULL, NULL, 1))
431		return;
432		type_string = dline_string;
433		break;
#	Line 436 | Line 475 | update_client_exit_stats(struct Client *
475		if (IsClient(client_p))
476		{
477		assert(Count.total > 0);
478	+
479		--Count.total;
480		if (HasUMode(client_p, UMODE_OPER))
481		--Count.oper;
#	Line 481 | Line 521 | find_person(const struct Client *const s
521		struct Client *
522		find_chasing(struct Client *source_p, const char *name)
523		{
524	<	struct Client *who = find_person(source_p, name);
524	>	struct Client *target_p = find_person(source_p, name);
525
526	<	if (who)
527	<	return who;
526	>	if (target_p)
527	>	return target_p;
528
529		if (IsDigit(*name))
530		return NULL;
531
532	<	if ((who = whowas_get_history(name,
533	<	(time_t)ConfigGeneral.kill_chase_time_limit))
534	<	== NULL)
532	>	target_p = whowas_get_history(name, (time_t)ConfigGeneral.kill_chase_time_limit);
533	>
534	>	if (!target_p)
535		{
536		sendto_one_numeric(source_p, &me, ERR_NOSUCHNICK, name);
537		return NULL;
538		}
539
540	<	return who;
540	>	return target_p;
541		}
542
543		/*
#	Line 523 | Line 563 | get_client_name(const struct Client *cli
563		{
564		static char buf[HOSTLEN * 2 + USERLEN + 5];
565
526	–	assert(client_p);
527	–
566		if (!MyConnect(client_p))
567		return client_p->name;
568
#	Line 536 | Line 574 | get_client_name(const struct Client *cli
574		type = MASK_IP;
575		}
576
539	–	if (ConfigGeneral.hide_spoof_ips)
540	–	if (IsIPSpoof(client_p) && type == SHOW_IP)
541	–	type = MASK_IP;
542	–
577		/* And finally, let's get the host information, ip or name */
578		switch (type)
579		{
#	Line 549 | Line 583 | get_client_name(const struct Client *cli
583		client_p->username, client_p->sockhost);
584		break;
585		case MASK_IP:
586	<	if (client_p->localClient->aftype == AF_INET)
586	>	if (client_p->connection->aftype == AF_INET)
587		snprintf(buf, sizeof(buf), "%s[%s@255.255.255.255]",
588		client_p->name, client_p->username);
589		else
#	Line 568 | Line 602 | get_client_name(const struct Client *cli
602		void
603		free_exited_clients(void)
604		{
605	<	dlink_node *ptr = NULL, *next = NULL;
605	>	dlink_node *node = NULL, *node_next = NULL;
606
607	<	DLINK_FOREACH_SAFE(ptr, next, dead_list.head)
607	>	DLINK_FOREACH_SAFE(node, node_next, dead_list.head)
608		{
609	<	free_client(ptr->data);
610	<	dlinkDelete(ptr, &dead_list);
611	<	free_dlink_node(ptr);
609	>	free_client(node->data);
610	>	dlinkDelete(node, &dead_list);
611	>	free_dlink_node(node);
612		}
613		}
614
#	Line 587 | Line 621 | free_exited_clients(void)
621		static void
622		exit_one_client(struct Client *source_p, const char *comment)
623		{
624	<	dlink_node *ptr = NULL, *ptr_next = NULL;
624	>	dlink_node *node = NULL, *node_next = NULL;
625
626		assert(!IsMe(source_p));
627		assert(source_p != &me);
#	Line 606 | Line 640 | exit_one_client(struct Client *source_p,
640		sendto_common_channels_local(source_p, 0, 0, ":%s!%s@%s QUIT :%s",
641		source_p->name, source_p->username,
642		source_p->host, comment);
643	<	DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->channel.head)
644	<	remove_user_from_channel(ptr->data);
643	>
644	>	DLINK_FOREACH_SAFE(node, node_next, source_p->channel.head)
645	>	remove_user_from_channel(node->data);
646
647		whowas_add_history(source_p, 0);
648		whowas_off_history(source_p);
#	Line 617 | Line 652 | exit_one_client(struct Client *source_p,
652		if (MyConnect(source_p))
653		{
654		/* Clean up invitefield */
655	<	DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->localClient->invited.head)
656	<	del_invite(ptr->data, source_p);
655	>	DLINK_FOREACH_SAFE(node, node_next, source_p->connection->invited.head)
656	>	del_invite(node->data, source_p);
657
658		del_all_accepts(source_p);
659		}
#	Line 628 | Line 663 | exit_one_client(struct Client *source_p,
663		dlinkDelete(&source_p->lnode, &source_p->servptr->serv->server_list);
664		dlinkDelete(&source_p->node, &global_client_list);
665
666	<	if ((ptr = dlinkFindDelete(&global_server_list, source_p)))
667	<	free_dlink_node(ptr);
666	>	if ((node = dlinkFindDelete(&global_server_list, source_p)))
667	>	free_dlink_node(node);
668		}
669
670		/* Remove source_p from the client lists */
671		if (source_p->id[0])
672		hash_del_id(source_p);
673	+
674		if (source_p->name[0])
675		hash_del_client(source_p);
676
#	Line 660 | Line 696 | exit_one_client(struct Client *source_p,
696		static void
697		recurse_remove_clients(struct Client *source_p, const char *comment)
698		{
699	<	dlink_node *ptr = NULL, *ptr_next = NULL;
699	>	dlink_node *node = NULL, *node_next = NULL;
700
701	<	DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->serv->client_list.head)
702	<	exit_one_client(ptr->data, comment);
701	>	DLINK_FOREACH_SAFE(node, node_next, source_p->serv->client_list.head)
702	>	exit_one_client(node->data, comment);
703
704	<	DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->serv->server_list.head)
704	>	DLINK_FOREACH_SAFE(node, node_next, source_p->serv->server_list.head)
705		{
706	<	recurse_remove_clients(ptr->data, comment);
707	<	exit_one_client(ptr->data, comment);
706	>	recurse_remove_clients(node->data, comment);
707	>	exit_one_client(node->data, comment);
708		}
709		}
710
#	Line 692 | Line 728 | recurse_remove_clients(struct Client *so
728		void
729		exit_client(struct Client *source_p, const char *comment)
730		{
731	<	dlink_node *m = NULL;
731	>	dlink_node *node = NULL;
732
733		assert(!IsMe(source_p));
734		assert(source_p != &me);
#	Line 710 | Line 746 | exit_client(struct Client *source_p, con
746		if (HasFlag(source_p, FLAGS_IPHASH))
747		{
748		DelFlag(source_p, FLAGS_IPHASH);
749	<	ipcache_remove_address(&source_p->localClient->ip);
749	>	ipcache_remove_address(&source_p->connection->ip);
750		}
751
752	<	delete_auth(&source_p->localClient->auth);
752	>	delete_auth(&source_p->connection->auth);
753
754		/*
755		* This source_p could have status of one of STAT_UNKNOWN, STAT_CONNECTING
#	Line 726 | Line 762 | exit_client(struct Client *source_p, con
762		{
763		assert(dlinkFind(&unknown_list, source_p));
764
765	<	dlinkDelete(&source_p->localClient->lclient_node, &unknown_list);
765	>	dlinkDelete(&source_p->connection->lclient_node, &unknown_list);
766		}
767		else if (IsClient(source_p))
768		{
769	<	time_t on_for = CurrentTime - source_p->localClient->firsttime;
769	>	time_t on_for = CurrentTime - source_p->connection->firsttime;
770	>
771		assert(Count.local > 0);
772	<	Count.local--;
772	>
773	>	--Count.local;
774
775		if (HasUMode(source_p, UMODE_OPER))
776	<	if ((m = dlinkFindDelete(&oper_list, source_p)))
777	<	free_dlink_node(m);
776	>	if ((node = dlinkFindDelete(&oper_list, source_p)))
777	>	free_dlink_node(node);
778
779		assert(dlinkFind(&local_client_list, source_p));
780	<	dlinkDelete(&source_p->localClient->lclient_node, &local_client_list);
780	>	dlinkDelete(&source_p->connection->lclient_node, &local_client_list);
781
782	<	if (source_p->localClient->list_task)
782	>	if (source_p->connection->list_task)
783		free_list_task(source_p);
784
785		watch_del_watch_list(source_p);
786	+	client_clear_svstags(source_p);
787	+
788		sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
789		"Client exiting: %s (%s@%s) [%s] [%s]",
790		source_p->name, source_p->username, source_p->host, comment,
791	<	ConfigGeneral.hide_spoof_ips && IsIPSpoof(source_p) ?
792	<	"255.255.255.255" : source_p->sockhost);
791	>	source_p->sockhost);
792	>
793		ilog(LOG_TYPE_USER, "%s (%3u:%02u:%02u): %s!%s@%s %llu/%llu",
794	<	myctime(source_p->localClient->firsttime), (unsigned int)(on_for / 3600),
794	>	myctime(source_p->connection->firsttime), (unsigned int)(on_for / 3600),
795		(unsigned int)((on_for % 3600)/60), (unsigned int)(on_for % 60),
796		source_p->name, source_p->username, source_p->host,
797	<	source_p->localClient->send.bytes>>10,
798	<	source_p->localClient->recv.bytes>>10);
797	>	source_p->connection->send.bytes>>10,
798	>	source_p->connection->recv.bytes>>10);
799		}
800		else if (IsServer(source_p))
801		{
802		assert(Count.myserver > 0);
803	+
804		--Count.myserver;
805
806		assert(dlinkFind(&local_server_list, source_p));
807	<	dlinkDelete(&source_p->localClient->lclient_node, &local_server_list);
807	>	dlinkDelete(&source_p->connection->lclient_node, &local_server_list);
808		}
809
810		if (!IsDead(source_p))
#	Line 809 | Line 850 | exit_client(struct Client *source_p, con
850
851		/* Send SQUIT for source_p in every direction. source_p is already off of local_server_list here */
852		if (!HasFlag(source_p, FLAGS_SQUIT))
853	<	sendto_server(NULL, NOCAPS, NOCAPS, "SQUIT %s :%s", source_p->id, comment);
853	>	sendto_server(NULL, 0, 0, "SQUIT %s :%s", source_p->id, comment);
854
855		/* Now exit the clients internally */
856		recurse_remove_clients(source_p, splitstr);
857
858		if (MyConnect(source_p))
859		{
860	+	int connected = CurrentTime - source_p->connection->firsttime;
861		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
862	<	"%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
863	<	source_p->name, (int)(CurrentTime - source_p->localClient->firsttime),
864	<	source_p->localClient->send.bytes >> 10,
865	<	source_p->localClient->recv.bytes >> 10);
866	<	ilog(LOG_TYPE_IRCD, "%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
867	<	source_p->name, (int)(CurrentTime - source_p->localClient->firsttime),
868	<	source_p->localClient->send.bytes >> 10,
869	<	source_p->localClient->recv.bytes >> 10);
862	>	"%s was connected for %d day%s, %2d:%02d:%02d. %llu/%llu sendK/recvK.",
863	>	source_p->name, connected/86400, (connected/86400 == 1) ? "" : "s",
864	>	(connected % 86400) / 3600, (connected % 3600) / 60, connected % 60,
865	>	source_p->connection->send.bytes >> 10,
866	>	source_p->connection->recv.bytes >> 10);
867	>	ilog(LOG_TYPE_IRCD, "%s was connected for %d day%s, %2d:%02d:%02d. %llu/%llu sendK/recvK.",
868	>	source_p->name, connected/86400, (connected/86400 == 1) ? "" : "s",
869	>	(connected % 86400) / 3600, (connected % 3600) / 60, connected % 60,
870	>	source_p->connection->send.bytes >> 10,
871	>	source_p->connection->recv.bytes >> 10);
872		}
873		}
874		else if (IsClient(source_p) && !HasFlag(source_p, FLAGS_KILLED))
875	<	sendto_server(source_p->from, NOCAPS, NOCAPS, ":%s QUIT :%s",
875	>	sendto_server(source_p->from, 0, 0, ":%s QUIT :%s",
876		source_p->id, comment);
877
878		/* The client *better* be off all of the lists */
#	Line 847 | Line 891 | exit_client(struct Client *source_p, con
891		void
892		dead_link_on_write(struct Client *client_p, int ierrno)
893		{
894	<	dlink_node *ptr;
894	>	dlink_node *node;
895
896		if (IsDefunct(client_p))
897		return;
898
899	<	dbuf_clear(&client_p->localClient->buf_recvq);
900	<	dbuf_clear(&client_p->localClient->buf_sendq);
899	>	dbuf_clear(&client_p->connection->buf_recvq);
900	>	dbuf_clear(&client_p->connection->buf_sendq);
901
902		assert(dlinkFind(&abort_list, client_p) == NULL);
903	<	ptr = make_dlink_node();
903	>	node = make_dlink_node();
904		/* don't let exit_aborted_clients() finish yet */
905	<	dlinkAddTail(client_p, ptr, &abort_list);
905	>	dlinkAddTail(client_p, node, &abort_list);
906
907		if (eac_next == NULL)
908	<	eac_next = ptr;
908	>	eac_next = node;
909
910		SetDead(client_p); /* You are dead my friend */
911		}
#	Line 879 | Line 923 | dead_link_on_read(struct Client *client_
923		if (IsDefunct(client_p))
924		return;
925
926	<	dbuf_clear(&client_p->localClient->buf_recvq);
927	<	dbuf_clear(&client_p->localClient->buf_sendq);
926	>	dbuf_clear(&client_p->connection->buf_recvq);
927	>	dbuf_clear(&client_p->connection->buf_sendq);
928
929	<	current_error = get_sockerr(client_p->localClient->fd.fd);
929	>	current_error = get_sockerr(client_p->connection->fd.fd);
930
931		if (IsServer(client_p) || IsHandshake(client_p))
932		{
933	<	int connected = CurrentTime - client_p->localClient->firsttime;
933	>	int connected = CurrentTime - client_p->connection->firsttime;
934
935		if (error == 0)
936		{
#	Line 912 | Line 956 | dead_link_on_read(struct Client *client_
956		}
957
958		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
959	<	"%s had been connected for %d day%s, %2d:%02d:%02d",
959	>	"%s was connected for %d day%s, %2d:%02d:%02d",
960		client_p->name, connected/86400,
961		(connected/86400 == 1) ? "" : "s",
962		(connected % 86400) / 3600, (connected % 3600) / 60,
#	Line 975 | Line 1019 | exit_aborted_clients(void)
1019		void
1020		del_accept(struct split_nuh_item *accept_p, struct Client *client_p)
1021		{
1022	<	dlinkDelete(&accept_p->node, &client_p->localClient->acceptlist);
1022	>	dlinkDelete(&accept_p->node, &client_p->connection->acceptlist);
1023
1024		MyFree(accept_p->nickptr);
1025		MyFree(accept_p->userptr);
#	Line 988 | Line 1032 | find_accept(const char *nick, const char
1032		const char *host, struct Client *client_p,
1033		int (*cmpfunc)(const char *, const char *))
1034		{
1035	<	dlink_node *ptr = NULL;
1035	>	dlink_node *node = NULL;
1036
1037	<	DLINK_FOREACH(ptr, client_p->localClient->acceptlist.head)
1037	>	DLINK_FOREACH(node, client_p->connection->acceptlist.head)
1038		{
1039	<	struct split_nuh_item *accept_p = ptr->data;
1039	>	struct split_nuh_item *accept_p = node->data;
1040
1041		if (!cmpfunc(accept_p->nickptr, nick) &&
1042		!cmpfunc(accept_p->userptr, user) &&
#	Line 1014 | Line 1058 | int
1058		accept_message(struct Client *source,
1059		struct Client *target)
1060		{
1061	<	dlink_node *ptr = NULL;
1061	>	dlink_node *node = NULL;
1062	>
1063	>	if (HasFlag(source, FLAGS_SERVICE) ||
1064	>	(HasUMode(source, UMODE_OPER) && ConfigGeneral.opers_bypass_callerid))
1065	>	return 1;
1066
1067		if (source == target || find_accept(source->name, source->username,
1068		source->host, target, match))
1069		return 1;
1070
1071	<	if (HasUMode(target, UMODE_SOFTCALLERID))
1072	<	DLINK_FOREACH(ptr, target->channel.head)
1073	<	if (IsMember(source, ((struct Membership *)ptr->data)->chptr))
1071	>	if (!HasUMode(target, UMODE_CALLERID) && HasUMode(target, UMODE_SOFTCALLERID))
1072	>	DLINK_FOREACH(node, target->channel.head)
1073	>	if (IsMember(source, ((struct Membership *)node->data)->chptr))
1074		return 1;
1075
1076		return 0;
#	Line 1037 | Line 1085 | accept_message(struct Client *source,
1085		void
1086		del_all_accepts(struct Client *client_p)
1087		{
1088	<	dlink_node *ptr = NULL, *ptr_next = NULL;
1088	>	dlink_node *node = NULL, *node_next = NULL;
1089
1090	<	DLINK_FOREACH_SAFE(ptr, ptr_next, client_p->localClient->acceptlist.head)
1091	<	del_accept(ptr->data, client_p);
1090	>	DLINK_FOREACH_SAFE(node, node_next, client_p->connection->acceptlist.head)
1091	>	del_accept(node->data, client_p);
1092		}
1093
1094		unsigned int
1095	<	idle_time_get(const struct Client *source_p, const struct Client *target_p)
1095	>	client_get_idle_time(const struct Client *source_p,
1096	>	const struct Client *target_p)
1097		{
1098		unsigned int idle = 0;
1099		unsigned int min_idle = 0;
1100		unsigned int max_idle = 0;
1101	<	const struct ClassItem *class = get_class_ptr(&target_p->localClient->confs);
1101	>	const struct ClassItem *const class = get_class_ptr(&target_p->connection->confs);
1102
1103		if (!(class->flags & CLASS_FLAGS_FAKE_IDLE) || target_p == source_p)
1104	<	return CurrentTime - target_p->localClient->last_privmsg;
1104	>	return CurrentTime - target_p->connection->last_privmsg;
1105	>
1106		if (HasUMode(source_p, UMODE_OPER) &&
1107		!(class->flags & CLASS_FLAGS_HIDE_IDLE_FROM_OPERS))
1108	<	return CurrentTime - target_p->localClient->last_privmsg;
1108	>	return CurrentTime - target_p->connection->last_privmsg;
1109
1110		min_idle = class->min_idle;
1111		max_idle = class->max_idle;
#	Line 1066 | Line 1116 | idle_time_get(const struct Client *sourc
1116		if (class->flags & CLASS_FLAGS_RANDOM_IDLE)
1117		idle = genrand_int32();
1118		else
1119	<	idle = CurrentTime - target_p->localClient->last_privmsg;
1119	>	idle = CurrentTime - target_p->connection->last_privmsg;
1120
1121		if (!max_idle)
1122		idle = 0;
#	Line 1096 | Line 1146 | client_init(void)
1146		};
1147
1148		client_pool = mp_pool_new(sizeof(struct Client), MP_CHUNK_SIZE_CLIENT);
1149	<	lclient_pool = mp_pool_new(sizeof(struct LocalUser), MP_CHUNK_SIZE_LCLIENT);
1149	>	connection_pool = mp_pool_new(sizeof(struct Connection), MP_CHUNK_SIZE_CONNECTION);
1150		event_add(&event_ping, NULL);
1151		}

Diff Legend

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