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 4340 by michael, Sat Aug 2 16:53:22 2014 UTC vs.
Revision 4800 by michael, Tue Oct 28 13:59:43 2014 UTC

#	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 88 | Line 88 | make_client(struct Client *from)
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;
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! */
#	Line 133 | Line 133 | free_client(struct Client *client_p)
133
134		if (MyConnect(client_p))
135		{
136	<	assert(client_p->localClient->invited.head == NULL);
137	<	assert(dlink_list_length(&client_p->localClient->invited) == 0);
138	<	assert(dlink_list_length(&client_p->localClient->watches) == 0);
136	>	assert(client_p->connection->invited.head == NULL);
137	>	assert(dlink_list_length(&client_p->connection->invited) == 0);
138	>	assert(dlink_list_length(&client_p->connection->watches) == 0);
139		assert(IsClosing(client_p) && IsDead(client_p));
140
141	<	MyFree(client_p->localClient->response);
142	<	MyFree(client_p->localClient->auth_oper);
141	>	MyFree(client_p->connection->challenge_response);
142	>	MyFree(client_p->connection->challenge_operator);
143	>	client_p->connection->challenge_response = NULL;
144	>	client_p->connection->challenge_operator = NULL;
145
146		/*
147		* clean up extra sockets from P-lines which have been discarded.
148		*/
149	<	if (client_p->localClient->listener)
149	>	if (client_p->connection->listener)
150		{
151	<	assert(0 < client_p->localClient->listener->ref_count);
152	<	if (0 == --client_p->localClient->listener->ref_count &&
151	<	!client_p->localClient->listener->active)
152	<	free_listener(client_p->localClient->listener);
151	>	listener_release(client_p->connection->listener);
152	>	client_p->connection->listener = NULL;
153		}
154
155	<	dbuf_clear(&client_p->localClient->buf_recvq);
156	<	dbuf_clear(&client_p->localClient->buf_sendq);
155	>	dbuf_clear(&client_p->connection->buf_recvq);
156	>	dbuf_clear(&client_p->connection->buf_sendq);
157
158	<	mp_pool_release(client_p->localClient);
158	>	mp_pool_release(client_p->connection);
159		}
160
161		mp_pool_release(client_p);
#	Line 172 | Line 172 | check_pings_list(dlink_list *list)
172		{
173		char buf[IRCD_BUFSIZE] = "";
174		int ping = 0;      /* ping time value from client */
175	<	dlink_node *ptr = NULL, *ptr_next = NULL;
175	>	dlink_node *node = NULL, *node_next = NULL;
176
177	<	DLINK_FOREACH_SAFE(ptr, ptr_next, list->head)
177	>	DLINK_FOREACH_SAFE(node, node_next, list->head)
178		{
179	<	struct Client *client_p = ptr->data;
179	>	struct Client *client_p = node->data;
180
181		if (IsDead(client_p))
182		continue;  /* Ignore it, its been exited already */
#	Line 184 | Line 184 | check_pings_list(dlink_list *list)
184		if (!IsRegistered(client_p))
185		ping = CONNECTTIMEOUT;
186		else
187	<	ping = get_client_ping(&client_p->localClient->confs);
187	>	ping = get_client_ping(&client_p->connection->confs);
188
189	<	if (ping < CurrentTime - client_p->localClient->lasttime)
189	>	if (ping < CurrentTime - client_p->connection->lasttime)
190		{
191		if (!IsPingSent(client_p))
192		{
#	Line 196 | Line 196 | check_pings_list(dlink_list *list)
196		* it is still alive.
197		*/
198		SetPingSent(client_p);
199	<	client_p->localClient->lasttime = CurrentTime - ping;
199	>	client_p->connection->lasttime = CurrentTime - ping;
200		sendto_one(client_p, "PING :%s", ID_or_name(&me, client_p));
201		}
202		else
203		{
204	<	if (CurrentTime - client_p->localClient->lasttime >= 2 * ping)
204	>	if (CurrentTime - client_p->connection->lasttime >= 2 * ping)
205		{
206		/*
207		* If the client/server hasn't talked to us in 2*ping seconds
#	Line 220 | Line 220 | check_pings_list(dlink_list *list)
220		}
221
222		snprintf(buf, sizeof(buf), "Ping timeout: %d seconds",
223	<	(int)(CurrentTime - client_p->localClient->lasttime));
223	>	(int)(CurrentTime - client_p->connection->lasttime));
224		exit_client(client_p, buf);
225		}
226		}
#	Line 237 | Line 237 | check_pings_list(dlink_list *list)
237		static void
238		check_unknowns_list(void)
239		{
240	<	dlink_node *ptr = NULL, *ptr_next = NULL;
240	>	dlink_node *node = NULL, *node_next = NULL;
241
242	<	DLINK_FOREACH_SAFE(ptr, ptr_next, unknown_list.head)
242	>	DLINK_FOREACH_SAFE(node, node_next, unknown_list.head)
243		{
244	<	struct Client *client_p = ptr->data;
244	>	struct Client *client_p = node->data;
245
246		/*
247		* Check UNKNOWN connections - if they have been in this state
248		* for > 30s, close them.
249		*/
250	<	if (IsAuthFinished(client_p) && (CurrentTime - client_p->localClient->firsttime) > 30)
250	>	if (IsAuthFinished(client_p) && (CurrentTime - client_p->connection->firsttime) > 30)
251		exit_client(client_p, "Registration timed out");
252		}
253		}
#	Line 279 | Line 279 | check_unknowns_list(void)
279		*/
280
281		static void
282	<	check_pings(void *notused)
282	>	check_pings(void *unused)
283		{
284		check_pings_list(&local_client_list);
285		check_pings_list(&local_server_list);
#	Line 297 | Line 297 | void
297		check_conf_klines(void)
298		{
299		struct MaskItem *conf = NULL;
300	<	dlink_node *ptr = NULL, *ptr_next = NULL;
300	>	dlink_node *node = NULL, *node_next = NULL;
301
302	<	DLINK_FOREACH_SAFE(ptr, ptr_next, local_client_list.head)
302	>	DLINK_FOREACH_SAFE(node, node_next, local_client_list.head)
303		{
304	<	struct Client *client_p = ptr->data;
304	>	struct Client *client_p = node->data;
305
306		/* If a client is already being exited
307		*/
308	<	if (IsDead(client_p) || !IsClient(client_p))
308	>	if (IsDead(client_p))
309		continue;
310
311	<	if ((conf = find_conf_by_address(NULL, &client_p->localClient->ip, CONF_DLINE,
312	<	client_p->localClient->aftype, NULL, NULL, 1)))
311	>	if ((conf = find_conf_by_address(NULL, &client_p->connection->ip, CONF_DLINE,
312	>	client_p->connection->aftype, NULL, NULL, 1)))
313		{
314		conf_try_ban(client_p, conf);
315		continue; /* and go examine next fd/client_p */
#	Line 317 | Line 317 | check_conf_klines(void)
317
318		if (ConfigGeneral.glines)
319		{
320	<	if ((conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
321	<	CONF_GLINE, client_p->localClient->aftype,
320	>	if ((conf = find_conf_by_address(client_p->host, &client_p->connection->ip,
321	>	CONF_GLINE, client_p->connection->aftype,
322		client_p->username, NULL, 1)))
323		{
324		conf_try_ban(client_p, conf);
#	Line 327 | Line 327 | check_conf_klines(void)
327		}
328		}
329
330	<	if ((conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
331	<	CONF_KLINE, client_p->localClient->aftype,
330	>	if ((conf = find_conf_by_address(client_p->host, &client_p->connection->ip,
331	>	CONF_KLINE, client_p->connection->aftype,
332		client_p->username, NULL, 1)))
333		{
334		conf_try_ban(client_p, conf);
#	Line 344 | Line 344 | check_conf_klines(void)
344		}
345
346		/* also check the unknowns list for new dlines */
347	<	DLINK_FOREACH_SAFE(ptr, ptr_next, unknown_list.head)
347	>	DLINK_FOREACH_SAFE(node, node_next, unknown_list.head)
348		{
349	<	struct Client *client_p = ptr->data;
349	>	struct Client *client_p = node->data;
350
351	<	if ((conf = find_conf_by_address(NULL, &client_p->localClient->ip, CONF_DLINE,
352	<	client_p->localClient->aftype, NULL, NULL, 1)))
351	>	if ((conf = find_conf_by_address(NULL, &client_p->connection->ip, CONF_DLINE,
352	>	client_p->connection->aftype, NULL, NULL, 1)))
353		{
354		conf_try_ban(client_p, conf);
355		continue; /* and go examine next fd/client_p */
#	Line 389 | Line 389 | conf_try_ban(struct Client *client_p, st
389		type_string = kline_string;
390		break;
391		case CONF_DLINE:
392	<	if (find_conf_by_address(NULL, &client_p->localClient->ip, CONF_EXEMPT,
393	<	client_p->localClient->aftype, NULL, NULL, 1))
392	>	if (find_conf_by_address(NULL, &client_p->connection->ip, CONF_EXEMPT,
393	>	client_p->connection->aftype, NULL, NULL, 1))
394		return;
395		type_string = dline_string;
396		break;
#	Line 551 | Line 551 | get_client_name(const struct Client *cli
551		client_p->username, client_p->sockhost);
552		break;
553		case MASK_IP:
554	<	if (client_p->localClient->aftype == AF_INET)
554	>	if (client_p->connection->aftype == AF_INET)
555		snprintf(buf, sizeof(buf), "%s[%s@255.255.255.255]",
556		client_p->name, client_p->username);
557		else
#	Line 570 | Line 570 | get_client_name(const struct Client *cli
570		void
571		free_exited_clients(void)
572		{
573	<	dlink_node *ptr = NULL, *next = NULL;
573	>	dlink_node *node = NULL, *node_next = NULL;
574
575	<	DLINK_FOREACH_SAFE(ptr, next, dead_list.head)
575	>	DLINK_FOREACH_SAFE(node, node_next, dead_list.head)
576		{
577	<	free_client(ptr->data);
578	<	dlinkDelete(ptr, &dead_list);
579	<	free_dlink_node(ptr);
577	>	free_client(node->data);
578	>	dlinkDelete(node, &dead_list);
579	>	free_dlink_node(node);
580		}
581		}
582
#	Line 589 | Line 589 | free_exited_clients(void)
589		static void
590		exit_one_client(struct Client *source_p, const char *comment)
591		{
592	<	dlink_node *ptr = NULL, *ptr_next = NULL;
592	>	dlink_node *node = NULL, *node_next = NULL;
593
594		assert(!IsMe(source_p));
595		assert(source_p != &me);
#	Line 608 | Line 608 | exit_one_client(struct Client *source_p,
608		sendto_common_channels_local(source_p, 0, 0, ":%s!%s@%s QUIT :%s",
609		source_p->name, source_p->username,
610		source_p->host, comment);
611	<	DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->channel.head)
612	<	remove_user_from_channel(ptr->data);
611	>	DLINK_FOREACH_SAFE(node, node_next, source_p->channel.head)
612	>	remove_user_from_channel(node->data);
613
614		whowas_add_history(source_p, 0);
615		whowas_off_history(source_p);
#	Line 619 | Line 619 | exit_one_client(struct Client *source_p,
619		if (MyConnect(source_p))
620		{
621		/* Clean up invitefield */
622	<	DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->localClient->invited.head)
623	<	del_invite(ptr->data, source_p);
622	>	DLINK_FOREACH_SAFE(node, node_next, source_p->connection->invited.head)
623	>	del_invite(node->data, source_p);
624
625		del_all_accepts(source_p);
626		}
#	Line 630 | Line 630 | exit_one_client(struct Client *source_p,
630		dlinkDelete(&source_p->lnode, &source_p->servptr->serv->server_list);
631		dlinkDelete(&source_p->node, &global_client_list);
632
633	<	if ((ptr = dlinkFindDelete(&global_server_list, source_p)))
634	<	free_dlink_node(ptr);
633	>	if ((node = dlinkFindDelete(&global_server_list, source_p)))
634	>	free_dlink_node(node);
635		}
636
637		/* Remove source_p from the client lists */
#	Line 662 | 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 694 | 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 709 | Line 709 | exit_client(struct Client *source_p, con
709
710		SetClosing(source_p);
711
712	<	if (IsIpHash(source_p))
713	<	ipcache_remove_address(&source_p->localClient->ip);
712	>	if (HasFlag(source_p, FLAGS_IPHASH))
713	>	{
714	>	DelFlag(source_p, FLAGS_IPHASH);
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		/*
721		* This source_p could have status of one of STAT_UNKNOWN, STAT_CONNECTING
#	Line 725 | Line 728 | exit_client(struct Client *source_p, con
728		{
729		assert(dlinkFind(&unknown_list, source_p));
730
731	<	dlinkDelete(&source_p->localClient->lclient_node, &unknown_list);
731	>	dlinkDelete(&source_p->connection->lclient_node, &unknown_list);
732		}
733		else if (IsClient(source_p))
734		{
735	<	time_t on_for = CurrentTime - source_p->localClient->firsttime;
735	>	time_t on_for = CurrentTime - source_p->connection->firsttime;
736		assert(Count.local > 0);
737		Count.local--;
738
739		if (HasUMode(source_p, UMODE_OPER))
740	<	if ((m = dlinkFindDelete(&oper_list, source_p)))
741	<	free_dlink_node(m);
740	>	if ((node = dlinkFindDelete(&oper_list, source_p)))
741	>	free_dlink_node(node);
742
743		assert(dlinkFind(&local_client_list, source_p));
744	<	dlinkDelete(&source_p->localClient->lclient_node, &local_client_list);
744	>	dlinkDelete(&source_p->connection->lclient_node, &local_client_list);
745
746	<	if (source_p->localClient->list_task)
746	>	if (source_p->connection->list_task)
747		free_list_task(source_p);
748
749		watch_del_watch_list(source_p);
#	Line 750 | Line 753 | exit_client(struct Client *source_p, con
753		ConfigGeneral.hide_spoof_ips && IsIPSpoof(source_p) ?
754		"255.255.255.255" : source_p->sockhost);
755		ilog(LOG_TYPE_USER, "%s (%3u:%02u:%02u): %s!%s@%s %llu/%llu",
756	<	myctime(source_p->localClient->firsttime), (unsigned int)(on_for / 3600),
756	>	myctime(source_p->connection->firsttime), (unsigned int)(on_for / 3600),
757		(unsigned int)((on_for % 3600)/60), (unsigned int)(on_for % 60),
758		source_p->name, source_p->username, source_p->host,
759	<	source_p->localClient->send.bytes>>10,
760	<	source_p->localClient->recv.bytes>>10);
759	>	source_p->connection->send.bytes>>10,
760	>	source_p->connection->recv.bytes>>10);
761		}
762		else if (IsServer(source_p))
763		{
#	Line 762 | Line 765 | exit_client(struct Client *source_p, con
765		--Count.myserver;
766
767		assert(dlinkFind(&local_server_list, source_p));
768	<	dlinkDelete(&source_p->localClient->lclient_node, &local_server_list);
768	>	dlinkDelete(&source_p->connection->lclient_node, &local_server_list);
769		}
770
771		if (!IsDead(source_p))
#	Line 815 | Line 818 | exit_client(struct Client *source_p, con
818
819		if (MyConnect(source_p))
820		{
821	+	int connected = CurrentTime - source_p->connection->firsttime;
822		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
823	<	"%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);
827	<	ilog(LOG_TYPE_IRCD, "%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
828	<	source_p->name, (int)(CurrentTime - source_p->localClient->firsttime),
829	<	source_p->localClient->send.bytes >> 10,
830	<	source_p->localClient->recv.bytes >> 10);
823	>	"%s was connected for %d day%s, %2d:%02d:%02d. %llu/%llu sendK/recvK.",
824	>	source_p->name, connected/86400, (connected/86400 == 1) ? "" : "s",
825	>	(connected % 86400) / 3600, (connected % 3600) / 60, connected % 60,
826	>	source_p->connection->send.bytes >> 10,
827	>	source_p->connection->recv.bytes >> 10);
828	>	ilog(LOG_TYPE_IRCD, "%s was connected for %d day%s, %2d:%02d:%02d. %llu/%llu sendK/recvK.",
829	>	source_p->name, connected/86400, (connected/86400 == 1) ? "" : "s",
830	>	(connected % 86400) / 3600, (connected % 3600) / 60, connected % 60,
831	>	source_p->connection->send.bytes >> 10,
832	>	source_p->connection->recv.bytes >> 10);
833		}
834		}
835		else if (IsClient(source_p) && !HasFlag(source_p, FLAGS_KILLED))
#	Line 846 | Line 852 | exit_client(struct Client *source_p, con
852		void
853		dead_link_on_write(struct Client *client_p, int ierrno)
854		{
855	<	dlink_node *ptr;
855	>	dlink_node *node;
856
857		if (IsDefunct(client_p))
858		return;
859
860	<	dbuf_clear(&client_p->localClient->buf_recvq);
861	<	dbuf_clear(&client_p->localClient->buf_sendq);
860	>	dbuf_clear(&client_p->connection->buf_recvq);
861	>	dbuf_clear(&client_p->connection->buf_sendq);
862
863		assert(dlinkFind(&abort_list, client_p) == NULL);
864	<	ptr = make_dlink_node();
864	>	node = make_dlink_node();
865		/* don't let exit_aborted_clients() finish yet */
866	<	dlinkAddTail(client_p, ptr, &abort_list);
866	>	dlinkAddTail(client_p, node, &abort_list);
867
868		if (eac_next == NULL)
869	<	eac_next = ptr;
869	>	eac_next = node;
870
871		SetDead(client_p); /* You are dead my friend */
872		}
#	Line 878 | Line 884 | dead_link_on_read(struct Client *client_
884		if (IsDefunct(client_p))
885		return;
886
887	<	dbuf_clear(&client_p->localClient->buf_recvq);
888	<	dbuf_clear(&client_p->localClient->buf_sendq);
887	>	dbuf_clear(&client_p->connection->buf_recvq);
888	>	dbuf_clear(&client_p->connection->buf_sendq);
889
890	<	current_error = get_sockerr(client_p->localClient->fd.fd);
890	>	current_error = get_sockerr(client_p->connection->fd.fd);
891
892		if (IsServer(client_p) || IsHandshake(client_p))
893		{
894	<	int connected = CurrentTime - client_p->localClient->firsttime;
894	>	int connected = CurrentTime - client_p->connection->firsttime;
895
896		if (error == 0)
897		{
#	Line 911 | Line 917 | dead_link_on_read(struct Client *client_
917		}
918
919		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
920	<	"%s had been connected for %d day%s, %2d:%02d:%02d",
920	>	"%s was connected for %d day%s, %2d:%02d:%02d",
921		client_p->name, connected/86400,
922		(connected/86400 == 1) ? "" : "s",
923		(connected % 86400) / 3600, (connected % 3600) / 60,
#	Line 974 | Line 980 | exit_aborted_clients(void)
980		void
981		del_accept(struct split_nuh_item *accept_p, struct Client *client_p)
982		{
983	<	dlinkDelete(&accept_p->node, &client_p->localClient->acceptlist);
983	>	dlinkDelete(&accept_p->node, &client_p->connection->acceptlist);
984
985		MyFree(accept_p->nickptr);
986		MyFree(accept_p->userptr);
#	Line 987 | Line 993 | find_accept(const char *nick, const char
993		const char *host, struct Client *client_p,
994		int (*cmpfunc)(const char *, const char *))
995		{
996	<	dlink_node *ptr = NULL;
996	>	dlink_node *node = NULL;
997
998	<	DLINK_FOREACH(ptr, client_p->localClient->acceptlist.head)
998	>	DLINK_FOREACH(node, client_p->connection->acceptlist.head)
999		{
1000	<	struct split_nuh_item *accept_p = ptr->data;
1000	>	struct split_nuh_item *accept_p = node->data;
1001
1002		if (!cmpfunc(accept_p->nickptr, nick) &&
1003		!cmpfunc(accept_p->userptr, user) &&
#	Line 1013 | Line 1019 | int
1019		accept_message(struct Client *source,
1020		struct Client *target)
1021		{
1022	<	dlink_node *ptr = NULL;
1022	>	dlink_node *node = NULL;
1023
1024		if (source == target || find_accept(source->name, source->username,
1025		source->host, target, match))
1026		return 1;
1027
1028	<	if (HasUMode(target, UMODE_SOFTCALLERID))
1029	<	DLINK_FOREACH(ptr, target->channel.head)
1030	<	if (IsMember(source, ((struct Membership *)ptr->data)->chptr))
1028	>	if (!HasUMode(target, UMODE_CALLERID) && HasUMode(target, UMODE_SOFTCALLERID))
1029	>	DLINK_FOREACH(node, target->channel.head)
1030	>	if (IsMember(source, ((struct Membership *)node->data)->chptr))
1031		return 1;
1032
1033		return 0;
#	Line 1036 | Line 1042 | accept_message(struct Client *source,
1042		void
1043		del_all_accepts(struct Client *client_p)
1044		{
1045	<	dlink_node *ptr = NULL, *ptr_next = NULL;
1045	>	dlink_node *node = NULL, *node_next = NULL;
1046
1047	<	DLINK_FOREACH_SAFE(ptr, ptr_next, client_p->localClient->acceptlist.head)
1048	<	del_accept(ptr->data, client_p);
1047	>	DLINK_FOREACH_SAFE(node, node_next, client_p->connection->acceptlist.head)
1048	>	del_accept(node->data, client_p);
1049		}
1050
1051		unsigned int
#	Line 1048 | Line 1054 | idle_time_get(const struct Client *sourc
1054		unsigned int idle = 0;
1055		unsigned int min_idle = 0;
1056		unsigned int max_idle = 0;
1057	<	const struct ClassItem *class = get_class_ptr(&target_p->localClient->confs);
1057	>	const struct ClassItem *class = get_class_ptr(&target_p->connection->confs);
1058
1059		if (!(class->flags & CLASS_FLAGS_FAKE_IDLE) || target_p == source_p)
1060	<	return CurrentTime - target_p->localClient->last_privmsg;
1060	>	return CurrentTime - target_p->connection->last_privmsg;
1061		if (HasUMode(source_p, UMODE_OPER) &&
1062		!(class->flags & CLASS_FLAGS_HIDE_IDLE_FROM_OPERS))
1063	<	return CurrentTime - target_p->localClient->last_privmsg;
1063	>	return CurrentTime - target_p->connection->last_privmsg;
1064
1065		min_idle = class->min_idle;
1066		max_idle = class->max_idle;
#	Line 1065 | Line 1071 | idle_time_get(const struct Client *sourc
1071		if (class->flags & CLASS_FLAGS_RANDOM_IDLE)
1072		idle = genrand_int32();
1073		else
1074	<	idle = CurrentTime - target_p->localClient->last_privmsg;
1074	>	idle = CurrentTime - target_p->connection->last_privmsg;
1075
1076		if (!max_idle)
1077		idle = 0;
#	Line 1095 | Line 1101 | client_init(void)
1101		};
1102
1103		client_pool = mp_pool_new(sizeof(struct Client), MP_CHUNK_SIZE_CLIENT);
1104	<	lclient_pool = mp_pool_new(sizeof(struct LocalUser), MP_CHUNK_SIZE_LCLIENT);
1104	>	connection_pool = mp_pool_new(sizeof(struct Connection), MP_CHUNK_SIZE_CONNECTION);
1105		event_add(&event_ping, NULL);
1106		}

Diff Legend

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