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 4400 by michael, Tue Aug 5 17:42:56 2014 UTC vs.
Revision 4823 by michael, Sat Nov 1 18:22:33 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 104 | Line 104 | make_client(struct Client *from)
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 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))
306	>	/* If a client is already being exited */
307	>	if (IsDead(client_p))
308		continue;
309
310	<	if ((conf = find_conf_by_address(NULL, &client_p->localClient->ip, CONF_DLINE,
311	<	client_p->localClient->aftype, NULL, NULL, 1)))
310	>	if ((conf = find_conf_by_address(NULL, &client_p->connection->ip, CONF_DLINE,
311	>	client_p->connection->aftype, NULL, NULL, 1)))
312		{
313		conf_try_ban(client_p, conf);
314		continue; /* and go examine next fd/client_p */
#	Line 317 | Line 316 | check_conf_klines(void)
316
317		if (ConfigGeneral.glines)
318		{
319	<	if ((conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
320	<	CONF_GLINE, client_p->localClient->aftype,
319	>	if ((conf = find_conf_by_address(client_p->host, &client_p->connection->ip,
320	>	CONF_GLINE, client_p->connection->aftype,
321		client_p->username, NULL, 1)))
322		{
323		conf_try_ban(client_p, conf);
#	Line 327 | Line 326 | check_conf_klines(void)
326		}
327		}
328
329	<	if ((conf = find_conf_by_address(client_p->host, &client_p->localClient->ip,
330	<	CONF_KLINE, client_p->localClient->aftype,
329	>	if ((conf = find_conf_by_address(client_p->host, &client_p->connection->ip,
330	>	CONF_KLINE, client_p->connection->aftype,
331		client_p->username, NULL, 1)))
332		{
333		conf_try_ban(client_p, conf);
#	Line 344 | Line 343 | check_conf_klines(void)
343		}
344
345		/* also check the unknowns list for new dlines */
346	<	DLINK_FOREACH_SAFE(ptr, ptr_next, unknown_list.head)
346	>	DLINK_FOREACH_SAFE(node, node_next, unknown_list.head)
347		{
348	<	struct Client *client_p = ptr->data;
348	>	struct Client *client_p = node->data;
349
350	<	if ((conf = find_conf_by_address(NULL, &client_p->localClient->ip, CONF_DLINE,
351	<	client_p->localClient->aftype, NULL, NULL, 1)))
350	>	if ((conf = find_conf_by_address(NULL, &client_p->connection->ip, CONF_DLINE,
351	>	client_p->connection->aftype, NULL, NULL, 1)))
352		{
353		conf_try_ban(client_p, conf);
354		continue; /* and go examine next fd/client_p */
#	Line 389 | Line 388 | conf_try_ban(struct Client *client_p, st
388		type_string = kline_string;
389		break;
390		case CONF_DLINE:
391	<	if (find_conf_by_address(NULL, &client_p->localClient->ip, CONF_EXEMPT,
392	<	client_p->localClient->aftype, NULL, NULL, 1))
391	>	if (find_conf_by_address(NULL, &client_p->connection->ip, CONF_EXEMPT,
392	>	client_p->connection->aftype, NULL, NULL, 1))
393		return;
394		type_string = dline_string;
395		break;
#	Line 551 | Line 550 | get_client_name(const struct Client *cli
550		client_p->username, client_p->sockhost);
551		break;
552		case MASK_IP:
553	<	if (client_p->localClient->aftype == AF_INET)
553	>	if (client_p->connection->aftype == AF_INET)
554		snprintf(buf, sizeof(buf), "%s[%s@255.255.255.255]",
555		client_p->name, client_p->username);
556		else
#	Line 570 | Line 569 | get_client_name(const struct Client *cli
569		void
570		free_exited_clients(void)
571		{
572	<	dlink_node *ptr = NULL, *next = NULL;
572	>	dlink_node *node = NULL, *node_next = NULL;
573
574	<	DLINK_FOREACH_SAFE(ptr, next, dead_list.head)
574	>	DLINK_FOREACH_SAFE(node, node_next, dead_list.head)
575		{
576	<	free_client(ptr->data);
577	<	dlinkDelete(ptr, &dead_list);
578	<	free_dlink_node(ptr);
576	>	free_client(node->data);
577	>	dlinkDelete(node, &dead_list);
578	>	free_dlink_node(node);
579		}
580		}
581
#	Line 589 | Line 588 | free_exited_clients(void)
588		static void
589		exit_one_client(struct Client *source_p, const char *comment)
590		{
591	<	dlink_node *ptr = NULL, *ptr_next = NULL;
591	>	dlink_node *node = NULL, *node_next = NULL;
592
593		assert(!IsMe(source_p));
594		assert(source_p != &me);
#	Line 608 | Line 607 | exit_one_client(struct Client *source_p,
607		sendto_common_channels_local(source_p, 0, 0, ":%s!%s@%s QUIT :%s",
608		source_p->name, source_p->username,
609		source_p->host, comment);
610	<	DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->channel.head)
611	<	remove_user_from_channel(ptr->data);
610	>	DLINK_FOREACH_SAFE(node, node_next, source_p->channel.head)
611	>	remove_user_from_channel(node->data);
612
613		whowas_add_history(source_p, 0);
614		whowas_off_history(source_p);
#	Line 619 | Line 618 | exit_one_client(struct Client *source_p,
618		if (MyConnect(source_p))
619		{
620		/* Clean up invitefield */
621	<	DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->localClient->invited.head)
622	<	del_invite(ptr->data, source_p);
621	>	DLINK_FOREACH_SAFE(node, node_next, source_p->connection->invited.head)
622	>	del_invite(node->data, source_p);
623
624		del_all_accepts(source_p);
625		}
#	Line 630 | 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 */
#	Line 662 | Line 661 | exit_one_client(struct Client *source_p,
661		static void
662		recurse_remove_clients(struct Client *source_p, const char *comment)
663		{
664	<	dlink_node *ptr = NULL, *ptr_next = NULL;
664	>	dlink_node *node = NULL, *node_next = NULL;
665
666	<	DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->serv->client_list.head)
667	<	exit_one_client(ptr->data, comment);
666	>	DLINK_FOREACH_SAFE(node, node_next, source_p->serv->client_list.head)
667	>	exit_one_client(node->data, comment);
668
669	<	DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->serv->server_list.head)
669	>	DLINK_FOREACH_SAFE(node, node_next, source_p->serv->server_list.head)
670		{
671	<	recurse_remove_clients(ptr->data, comment);
672	<	exit_one_client(ptr->data, comment);
671	>	recurse_remove_clients(node->data, comment);
672	>	exit_one_client(node->data, comment);
673		}
674		}
675
#	Line 694 | Line 693 | recurse_remove_clients(struct Client *so
693		void
694		exit_client(struct Client *source_p, const char *comment)
695		{
696	<	dlink_node *m = NULL;
696	>	dlink_node *node = NULL;
697
698		assert(!IsMe(source_p));
699		assert(source_p != &me);
#	Line 712 | Line 711 | exit_client(struct Client *source_p, con
711		if (HasFlag(source_p, FLAGS_IPHASH))
712		{
713		DelFlag(source_p, FLAGS_IPHASH);
714	<	ipcache_remove_address(&source_p->localClient->ip);
714	>	ipcache_remove_address(&source_p->connection->ip);
715		}
716
717	<	delete_auth(&source_p->localClient->auth);
717	>	delete_auth(&source_p->connection->auth);
718
719		/*
720		* This source_p could have status of one of STAT_UNKNOWN, STAT_CONNECTING
#	Line 728 | Line 727 | exit_client(struct Client *source_p, con
727		{
728		assert(dlinkFind(&unknown_list, source_p));
729
730	<	dlinkDelete(&source_p->localClient->lclient_node, &unknown_list);
730	>	dlinkDelete(&source_p->connection->lclient_node, &unknown_list);
731		}
732		else if (IsClient(source_p))
733		{
734	<	time_t on_for = CurrentTime - source_p->localClient->firsttime;
734	>	time_t on_for = CurrentTime - source_p->connection->firsttime;
735		assert(Count.local > 0);
736		Count.local--;
737
738		if (HasUMode(source_p, UMODE_OPER))
739	<	if ((m = dlinkFindDelete(&oper_list, source_p)))
740	<	free_dlink_node(m);
739	>	if ((node = dlinkFindDelete(&oper_list, source_p)))
740	>	free_dlink_node(node);
741
742		assert(dlinkFind(&local_client_list, source_p));
743	<	dlinkDelete(&source_p->localClient->lclient_node, &local_client_list);
743	>	dlinkDelete(&source_p->connection->lclient_node, &local_client_list);
744
745	<	if (source_p->localClient->list_task)
745	>	if (source_p->connection->list_task)
746		free_list_task(source_p);
747
748		watch_del_watch_list(source_p);
#	Line 753 | Line 752 | exit_client(struct Client *source_p, con
752		ConfigGeneral.hide_spoof_ips && IsIPSpoof(source_p) ?
753		"255.255.255.255" : source_p->sockhost);
754		ilog(LOG_TYPE_USER, "%s (%3u:%02u:%02u): %s!%s@%s %llu/%llu",
755	<	myctime(source_p->localClient->firsttime), (unsigned int)(on_for / 3600),
755	>	myctime(source_p->connection->firsttime), (unsigned int)(on_for / 3600),
756		(unsigned int)((on_for % 3600)/60), (unsigned int)(on_for % 60),
757		source_p->name, source_p->username, source_p->host,
758	<	source_p->localClient->send.bytes>>10,
759	<	source_p->localClient->recv.bytes>>10);
758	>	source_p->connection->send.bytes>>10,
759	>	source_p->connection->recv.bytes>>10);
760		}
761		else if (IsServer(source_p))
762		{
#	Line 765 | Line 764 | exit_client(struct Client *source_p, con
764		--Count.myserver;
765
766		assert(dlinkFind(&local_server_list, source_p));
767	<	dlinkDelete(&source_p->localClient->lclient_node, &local_server_list);
767	>	dlinkDelete(&source_p->connection->lclient_node, &local_server_list);
768		}
769
770		if (!IsDead(source_p))
#	Line 818 | Line 817 | exit_client(struct Client *source_p, con
817
818		if (MyConnect(source_p))
819		{
820	+	int connected = CurrentTime - source_p->connection->firsttime;
821		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
822	<	"%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
823	<	source_p->name, (int)(CurrentTime - source_p->localClient->firsttime),
824	<	source_p->localClient->send.bytes >> 10,
825	<	source_p->localClient->recv.bytes >> 10);
826	<	ilog(LOG_TYPE_IRCD, "%s was connected for %d seconds.  %llu/%llu sendK/recvK.",
827	<	source_p->name, (int)(CurrentTime - source_p->localClient->firsttime),
828	<	source_p->localClient->send.bytes >> 10,
829	<	source_p->localClient->recv.bytes >> 10);
822	>	"%s was connected for %d day%s, %2d:%02d:%02d. %llu/%llu sendK/recvK.",
823	>	source_p->name, connected/86400, (connected/86400 == 1) ? "" : "s",
824	>	(connected % 86400) / 3600, (connected % 3600) / 60, connected % 60,
825	>	source_p->connection->send.bytes >> 10,
826	>	source_p->connection->recv.bytes >> 10);
827	>	ilog(LOG_TYPE_IRCD, "%s was connected for %d day%s, %2d:%02d:%02d. %llu/%llu sendK/recvK.",
828	>	source_p->name, connected/86400, (connected/86400 == 1) ? "" : "s",
829	>	(connected % 86400) / 3600, (connected % 3600) / 60, connected % 60,
830	>	source_p->connection->send.bytes >> 10,
831	>	source_p->connection->recv.bytes >> 10);
832		}
833		}
834		else if (IsClient(source_p) && !HasFlag(source_p, FLAGS_KILLED))
#	Line 849 | Line 851 | exit_client(struct Client *source_p, con
851		void
852		dead_link_on_write(struct Client *client_p, int ierrno)
853		{
854	<	dlink_node *ptr;
854	>	dlink_node *node;
855
856		if (IsDefunct(client_p))
857		return;
858
859	<	dbuf_clear(&client_p->localClient->buf_recvq);
860	<	dbuf_clear(&client_p->localClient->buf_sendq);
859	>	dbuf_clear(&client_p->connection->buf_recvq);
860	>	dbuf_clear(&client_p->connection->buf_sendq);
861
862		assert(dlinkFind(&abort_list, client_p) == NULL);
863	<	ptr = make_dlink_node();
863	>	node = make_dlink_node();
864		/* don't let exit_aborted_clients() finish yet */
865	<	dlinkAddTail(client_p, ptr, &abort_list);
865	>	dlinkAddTail(client_p, node, &abort_list);
866
867		if (eac_next == NULL)
868	<	eac_next = ptr;
868	>	eac_next = node;
869
870		SetDead(client_p); /* You are dead my friend */
871		}
#	Line 881 | Line 883 | dead_link_on_read(struct Client *client_
883		if (IsDefunct(client_p))
884		return;
885
886	<	dbuf_clear(&client_p->localClient->buf_recvq);
887	<	dbuf_clear(&client_p->localClient->buf_sendq);
886	>	dbuf_clear(&client_p->connection->buf_recvq);
887	>	dbuf_clear(&client_p->connection->buf_sendq);
888
889	<	current_error = get_sockerr(client_p->localClient->fd.fd);
889	>	current_error = get_sockerr(client_p->connection->fd.fd);
890
891		if (IsServer(client_p) || IsHandshake(client_p))
892		{
893	<	int connected = CurrentTime - client_p->localClient->firsttime;
893	>	int connected = CurrentTime - client_p->connection->firsttime;
894
895		if (error == 0)
896		{
#	Line 914 | Line 916 | dead_link_on_read(struct Client *client_
916		}
917
918		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
919	<	"%s had been connected for %d day%s, %2d:%02d:%02d",
919	>	"%s was connected for %d day%s, %2d:%02d:%02d",
920		client_p->name, connected/86400,
921		(connected/86400 == 1) ? "" : "s",
922		(connected % 86400) / 3600, (connected % 3600) / 60,
#	Line 977 | Line 979 | exit_aborted_clients(void)
979		void
980		del_accept(struct split_nuh_item *accept_p, struct Client *client_p)
981		{
982	<	dlinkDelete(&accept_p->node, &client_p->localClient->acceptlist);
982	>	dlinkDelete(&accept_p->node, &client_p->connection->acceptlist);
983
984		MyFree(accept_p->nickptr);
985		MyFree(accept_p->userptr);
#	Line 990 | Line 992 | find_accept(const char *nick, const char
992		const char *host, struct Client *client_p,
993		int (*cmpfunc)(const char *, const char *))
994		{
995	<	dlink_node *ptr = NULL;
995	>	dlink_node *node = NULL;
996
997	<	DLINK_FOREACH(ptr, client_p->localClient->acceptlist.head)
997	>	DLINK_FOREACH(node, client_p->connection->acceptlist.head)
998		{
999	<	struct split_nuh_item *accept_p = ptr->data;
999	>	struct split_nuh_item *accept_p = node->data;
1000
1001		if (!cmpfunc(accept_p->nickptr, nick) &&
1002		!cmpfunc(accept_p->userptr, user) &&
#	Line 1016 | Line 1018 | int
1018		accept_message(struct Client *source,
1019		struct Client *target)
1020		{
1021	<	dlink_node *ptr = NULL;
1021	>	dlink_node *node = NULL;
1022
1023		if (source == target || find_accept(source->name, source->username,
1024		source->host, target, match))
1025		return 1;
1026
1027	<	if (HasUMode(target, UMODE_SOFTCALLERID))
1028	<	DLINK_FOREACH(ptr, target->channel.head)
1029	<	if (IsMember(source, ((struct Membership *)ptr->data)->chptr))
1027	>	if (!HasUMode(target, UMODE_CALLERID) && HasUMode(target, UMODE_SOFTCALLERID))
1028	>	DLINK_FOREACH(node, target->channel.head)
1029	>	if (IsMember(source, ((struct Membership *)node->data)->chptr))
1030		return 1;
1031
1032		return 0;
#	Line 1039 | Line 1041 | accept_message(struct Client *source,
1041		void
1042		del_all_accepts(struct Client *client_p)
1043		{
1044	<	dlink_node *ptr = NULL, *ptr_next = NULL;
1044	>	dlink_node *node = NULL, *node_next = NULL;
1045
1046	<	DLINK_FOREACH_SAFE(ptr, ptr_next, client_p->localClient->acceptlist.head)
1047	<	del_accept(ptr->data, client_p);
1046	>	DLINK_FOREACH_SAFE(node, node_next, client_p->connection->acceptlist.head)
1047	>	del_accept(node->data, client_p);
1048		}
1049
1050		unsigned int
#	Line 1051 | Line 1053 | idle_time_get(const struct Client *sourc
1053		unsigned int idle = 0;
1054		unsigned int min_idle = 0;
1055		unsigned int max_idle = 0;
1056	<	const struct ClassItem *class = get_class_ptr(&target_p->localClient->confs);
1056	>	const struct ClassItem *class = get_class_ptr(&target_p->connection->confs);
1057
1058		if (!(class->flags & CLASS_FLAGS_FAKE_IDLE) || target_p == source_p)
1059	<	return CurrentTime - target_p->localClient->last_privmsg;
1059	>	return CurrentTime - target_p->connection->last_privmsg;
1060		if (HasUMode(source_p, UMODE_OPER) &&
1061		!(class->flags & CLASS_FLAGS_HIDE_IDLE_FROM_OPERS))
1062	<	return CurrentTime - target_p->localClient->last_privmsg;
1062	>	return CurrentTime - target_p->connection->last_privmsg;
1063
1064		min_idle = class->min_idle;
1065		max_idle = class->max_idle;
#	Line 1068 | Line 1070 | idle_time_get(const struct Client *sourc
1070		if (class->flags & CLASS_FLAGS_RANDOM_IDLE)
1071		idle = genrand_int32();
1072		else
1073	<	idle = CurrentTime - target_p->localClient->last_privmsg;
1073	>	idle = CurrentTime - target_p->connection->last_privmsg;
1074
1075		if (!max_idle)
1076		idle = 0;
#	Line 1098 | Line 1100 | client_init(void)
1100		};
1101
1102		client_pool = mp_pool_new(sizeof(struct Client), MP_CHUNK_SIZE_CLIENT);
1103	<	lclient_pool = mp_pool_new(sizeof(struct LocalUser), MP_CHUNK_SIZE_LCLIENT);
1103	>	connection_pool = mp_pool_new(sizeof(struct Connection), MP_CHUNK_SIZE_CONNECTION);
1104		event_add(&event_ping, NULL);
1105		}

Diff Legend

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