ViewVC Help

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

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

Comparing ircd-hybrid/trunk/src/user.c (file contents):
Revision 3896 by michael, Fri Jun 6 19:08:47 2014 UTC vs.
Revision 4962 by michael, Mon Dec 1 13:08:31 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 40 | Line 40
40		#include "log.h"
41		#include "server.h"
42		#include "send.h"
43	–	#include "supported.h"
43		#include "memory.h"
44		#include "packet.h"
45		#include "rng_mt.h"
#	Line 163 | Line 162 | void
162		show_lusers(struct Client *source_p)
163		{
164		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
165	<	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total-Count.invisi),
166	<	Count.invisi, dlink_list_length(&global_serv_list));
165	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
166	>	Count.invisi, dlink_list_length(&global_server_list));
167		else
168	<	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT,
169	<	(Count.total - Count.invisi), Count.invisi, 1);
168	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
169	>	Count.invisi, 1);
170
171		if (Count.oper)
172		sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper);
#	Line 175 | Line 174 | show_lusers(struct Client *source_p)
174		if (dlink_list_length(&unknown_list))
175		sendto_one_numeric(source_p, &me, RPL_LUSERUNKNOWN, dlink_list_length(&unknown_list));
176
177	<	if (dlink_list_length(&global_channel_list))
178	<	sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&global_channel_list));
177	>	if (dlink_list_length(&channel_list))
178	>	sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&channel_list));
179
180		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
181		{
#	Line 211 | Line 210 | show_lusers(struct Client *source_p)
210		void
211		show_isupport(struct Client *source_p)
212		{
213	<	const dlink_node *ptr = NULL;
213	>	const dlink_node *node = NULL;
214
215	<	DLINK_FOREACH(ptr, support_list_lines.head)
216	<	sendto_one_numeric(source_p, &me, RPL_ISUPPORT, ptr->data);
215	>	DLINK_FOREACH(node, support_list_lines.head)
216	>	sendto_one_numeric(source_p, &me, RPL_ISUPPORT, node->data);
217		}
218
219
#	Line 233 | Line 232 | report_and_set_user_flags(struct Client
232		if (IsConfDoSpoofIp(conf))
233		sendto_one_notice(source_p, &me, ":*** Spoofing your IP. Congrats.");
234
235	<	/* If this user is in the exception class, Set it "E lined" */
235	>	/* If this user is in the exception class, set it "E lined" */
236		if (IsConfExemptKline(conf))
237		{
238		SetExemptKline(source_p);
#	Line 282 | Line 281 | report_and_set_user_flags(struct Client
281		static void
282		introduce_client(struct Client *source_p)
283		{
284	<	dlink_node *ptr = NULL;
284	>	dlink_node *node = NULL;
285		char ubuf[IRCD_BUFSIZE] = "";
286
287		if (MyClient(source_p))
288	<	send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
288	>	send_umode(source_p, source_p, 0, ubuf);
289		else
290	<	send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
290	>	send_umode(NULL, source_p, 0, ubuf);
291
292		watch_check_hash(source_p, RPL_LOGON);
293
#	Line 298 | Line 297 | introduce_client(struct Client *source_p
297		ubuf[1] = '\0';
298		}
299
300	<	DLINK_FOREACH(ptr, serv_list.head)
300	>	DLINK_FOREACH(node, local_server_list.head)
301		{
302	<	struct Client *server = ptr->data;
302	>	struct Client *server = node->data;
303
304		if (server == source_p->from)
305		continue;
#	Line 313 | Line 312 | introduce_client(struct Client *source_p
312		ubuf, source_p->username, source_p->host,
313		(MyClient(source_p) && IsIPSpoof(source_p)) ?
314		"0" : source_p->sockhost, source_p->id,
315	<	source_p->svid,
315	>	source_p->account,
316		source_p->info);
317		else
318		sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
#	Line 349 | Line 348 | user_welcome(struct Client *source_p)
348		{
349		AddUMode(source_p, UMODE_SSL);
350		sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
351	<	ssl_get_cipher(source_p->localClient->fd.ssl));
351	>	ssl_get_cipher(source_p->connection->fd.ssl));
352		}
353		#endif
354
355	<	sendto_one_numeric(source_p, &me, RPL_WELCOME, ServerInfo.network_name,
355	>	sendto_one_numeric(source_p, &me, RPL_WELCOME, ConfigServerInfo.network_name,
356		source_p->name);
357		sendto_one_numeric(source_p, &me, RPL_YOURHOST,
358	<	get_listener_name(source_p->localClient->listener), ircd_version);
358	>	get_listener_name(source_p->connection->listener), ircd_version);
359		sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
360		sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
361		show_isupport(source_p);
362	<
364	<	if (source_p->id[0])
365	<	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
362	>	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
363
364		show_lusers(source_p);
365		motd_signon(source_p);
#	Line 378 | Line 375 | static int
375		check_xline(struct Client *source_p)
376		{
377		struct MaskItem *conf = NULL;
381	–	const char *reason = NULL;
378
379		if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
380		{
381		++conf->count;
386	–
387	–	if (conf->reason)
388	–	reason = conf->reason;
389	–	else
390	–	reason = CONF_NOREASON;
391	–
382		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
383		"X-line Rejecting [%s] [%s], user %s [%s]",
384	<	source_p->info, reason,
384	>	source_p->info, conf->reason,
385		get_client_name(source_p, HIDE_IP),
386		source_p->sockhost);
387
#	Line 416 | Line 406 | register_local_user(struct Client *sourc
406
407		assert(source_p == source_p->from);
408		assert(MyConnect(source_p));
409	<	assert(!source_p->localClient->registration);
409	>	assert(!source_p->connection->registration);
410
411		ClearCap(source_p, CAP_TS6);
412
413	<	if (ConfigFileEntry.ping_cookie)
413	>	if (ConfigGeneral.ping_cookie)
414		{
415	<	if (!IsPingSent(source_p) && !source_p->localClient->random_ping)
415	>	if (!IsPingSent(source_p) && !source_p->connection->random_ping)
416		{
417		do
418	<	source_p->localClient->random_ping = genrand_int32();
419	<	while (!source_p->localClient->random_ping);
418	>	source_p->connection->random_ping = genrand_int32();
419	>	while (!source_p->connection->random_ping);
420
421	<	sendto_one(source_p, "PING :%u",
432	<	source_p->localClient->random_ping);
421	>	sendto_one(source_p, "PING :%u", source_p->connection->random_ping);
422		SetPingSent(source_p);
423		return;
424		}
#	Line 438 | Line 427 | register_local_user(struct Client *sourc
427		return;
428		}
429
430	<	source_p->localClient->last_privmsg = CurrentTime;
430	>	source_p->connection->last_privmsg = CurrentTime;
431		/* Straight up the maximum rate of flooding... */
432	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
432	>	source_p->connection->allow_read = MAX_FLOOD_BURST;
433
434		if (!check_client(source_p))
435		return;
#	Line 449 | Line 438 | register_local_user(struct Client *sourc
438		{
439		sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
440		"character in your hostname");
441	<	strlcpy(source_p->host, source_p->sockhost,
453	<	sizeof(source_p->host));
441	>	strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
442		}
443
444	<	conf = source_p->localClient->confs.head->data;
444	>	conf = source_p->connection->confs.head->data;
445
446		if (!IsGotId(source_p))
447		{
#	Line 476 | Line 464 | register_local_user(struct Client *sourc
464		source_p->username[i++] = '~';
465
466		for (; *p && i < USERLEN; ++p)
467	<	if (*p != '[')
480	<	source_p->username[i++] = *p;
467	>	source_p->username[i++] = *p;
468
469		source_p->username[i] = '\0';
470		}
#	Line 485 | Line 472 | register_local_user(struct Client *sourc
472		/* Password check */
473		if (!EmptyString(conf->passwd))
474		{
475	<	if (!match_conf_password(source_p->localClient->passwd, conf))
475	>	if (!match_conf_password(source_p->connection->password, conf))
476		{
477		++ServerStats.is_ref;
478
#	Line 496 | Line 483 | register_local_user(struct Client *sourc
483		}
484
485		/*
486	<	* Don't free source_p->localClient->passwd here - it can be required
487	<	* by masked /stats I if there are auth{} blocks with need_password = no;
486	>	* Don't free source_p->connection->password here - it can be required
487	>	* by masked /stats I if there are auth {} blocks with need_password = no;
488		* --adx
489		*/
490
#	Line 517 | Line 504 | register_local_user(struct Client *sourc
504		* probably be just a percentage of the MAXCLIENTS...
505		*   -Taner
506		*/
507	<	if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
508	<	(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
507	>	if ((Count.local >= ConfigServerInfo.max_clients + MAX_BUFFER) ||
508	>	(Count.local >= ConfigServerInfo.max_clients && !IsExemptLimits(source_p)))
509		{
510		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
511		"Too many clients, rejecting %s[%s].",
#	Line 553 | Line 540 | register_local_user(struct Client *sourc
540		sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
541		"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
542		source_p->name, source_p->username, source_p->host,
543	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
543	>	ConfigGeneral.hide_spoof_ips && IsIPSpoof(source_p) ?
544		"255.255.255.255" : source_p->sockhost,
545	<	get_client_class(&source_p->localClient->confs),
545	>	get_client_class(&source_p->connection->confs),
546		source_p->info, source_p->id);
547
548	<	if (ConfigFileEntry.invisible_on_connect)
548	>	if (ConfigGeneral.invisible_on_connect)
549		{
550		AddUMode(source_p, UMODE_INVISIBLE);
551		++Count.invisi;
#	Line 570 | Line 557 | register_local_user(struct Client *sourc
557
558		if (!(Count.max_loc % 10))
559		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
560	<	"New Max Local Clients: %d",
560	>	"New maximum local client connections: %u",
561		Count.max_loc);
562		}
563
#	Line 581 | Line 568 | register_local_user(struct Client *sourc
568		assert(source_p->servptr == &me);
569		SetClient(source_p);
570		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
571	+	dlinkAdd(source_p, &source_p->node, &global_client_list);
572
573		assert(dlinkFind(&unknown_list, source_p));
574
575	<	dlink_move_node(&source_p->localClient->lclient_node,
575	>	dlink_move_node(&source_p->connection->lclient_node,
576		&unknown_list, &local_client_list);
577
578		user_welcome(source_p);
#	Line 605 | Line 593 | register_local_user(struct Client *sourc
593		*                is introduced by a server.
594		*/
595		void
596	<	register_remote_user(struct Client *source_p, const char *username,
609	<	const char *host, const char *server)
596	>	register_remote_user(struct Client *source_p)
597		{
598	<	struct Client *target_p = NULL;
612	<
613	<	assert(source_p->username != username);
614	<
615	<	strlcpy(source_p->host, host, sizeof(source_p->host));
616	<	strlcpy(source_p->username, username, sizeof(source_p->username));
617	<
618	<	/*
619	<	* Coming from another server, take the servers word for it
620	<	*/
621	<	source_p->servptr = hash_find_server(server);
622	<
623	<	/*
624	<	* Super GhostDetect:
625	<	* If we can't find the server the user is supposed to be on,
626	<	* then simply blow the user away.        -Taner
627	<	*/
628	<	if (source_p->servptr == NULL)
629	<	{
630	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
631	<	"No server %s for user %s[%s@%s] from %s",
632	<	server, source_p->name, source_p->username,
633	<	source_p->host, source_p->from->name);
634	<	sendto_one(source_p->from,
635	<	":%s KILL %s :%s (Ghosted, server %s doesn't exist)",
636	<	me.id, source_p->id, me.name, server);
637	<
638	<	AddFlag(source_p, FLAGS_KILLED);
639	<	exit_client(source_p, "Ghosted Client");
640	<	return;
641	<	}
598	>	const struct Client *target_p = NULL;
599
600		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
601		{
#	Line 669 | Line 626 | register_remote_user(struct Client *sour
626
627		SetClient(source_p);
628		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
629	+	dlinkAdd(source_p, &source_p->node, &global_client_list);
630		add_user_host(source_p->username, source_p->host, 1);
631		SetUserHost(source_p);
632
#	Line 742 | Line 700 | valid_username(const char *username, con
700		{
701		while (*++p)
702		{
703	<	if (*p == '.' && ConfigFileEntry.dots_in_ident)
703	>	if (*p == '.' && ConfigGeneral.dots_in_ident)
704		{
705	<	if (++dots > ConfigFileEntry.dots_in_ident)
705	>	if (++dots > ConfigGeneral.dots_in_ident)
706		return 0;
707		if (!IsUserChar(*(p + 1)))
708		return 0;
#	Line 780 | Line 738 | valid_nickname(const char *nickname, con
738		/*
739		* Nicks can't start with a digit or - or be 0 length.
740		*/
741	<	if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
741	>	if (EmptyString(p) || *p == '-' || (IsDigit(*p) && local))
742		return 0;
743
744		for (; *p; ++p)
#	Line 803 | Line 761 | valid_nickname(const char *nickname, con
761		*/
762		void
763		send_umode(struct Client *client_p, struct Client *source_p,
764	<	unsigned int old, unsigned int sendmask, char *umode_buf)
764	>	unsigned int old, char *umode_buf)
765		{
766		char *m = umode_buf;
767		int what = 0;
#	Line 819 | Line 777 | send_umode(struct Client *client_p, stru
777		if (!flag)
778		continue;
779
822	–	if (MyClient(source_p) && !(flag & sendmask))
823	–	continue;
824	–
780		if ((flag & old) && !HasUMode(source_p, flag))
781		{
782		if (what == MODE_DEL)
#	Line 850 | Line 805 | send_umode(struct Client *client_p, stru
805
806		if (*umode_buf && client_p)
807		sendto_one(client_p, ":%s!%s@%s MODE %s :%s",
808	<	source_p->name, source_p->username,
809	<	source_p->host, source_p->name, umode_buf);
808	>	client_p->name, client_p->username,
809	>	client_p->host, client_p->name, umode_buf);
810		}
811
812		/* send_umode_out()
#	Line 861 | Line 816 | send_umode(struct Client *client_p, stru
816		* side effects - Only send ubuf out to servers that know about this client
817		*/
818		void
819	<	send_umode_out(struct Client *client_p, struct Client *source_p,
865	<	unsigned int old)
819	>	send_umode_out(struct Client *source_p, unsigned int old)
820		{
821		char buf[IRCD_BUFSIZE] = "";
822
823	<	send_umode(NULL, source_p, old, SEND_UMODES, buf);
823	>	send_umode(MyClient(source_p) ? source_p : NULL, source_p, old, buf);
824
825		if (buf[0])
826	<	sendto_server(source_p, NOCAPS, NOCAPS, ":%s MODE %s :%s",
826	>	sendto_server(source_p, 0, 0, ":%s MODE %s :%s",
827		source_p->id, source_p->id, buf);
874	–
875	–	if (client_p && MyClient(client_p))
876	–	send_umode(client_p, source_p, old, 0xffffffff, buf);
828		}
829
830		void
831		user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
832		{
833	<	dlink_node *ptr = NULL;
833	>	dlink_node *node = NULL;
834
835		if (!strcmp(target_p->host, hostname))
836		return;
#	Line 899 | Line 850 | user_set_hostmask(struct Client *target_
850		default: return;
851		}
852
853	<	if (ConfigFileEntry.cycle_on_host_change)
853	>	if (ConfigGeneral.cycle_on_host_change)
854		sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
855		target_p->name, target_p->username, target_p->host);
856
#	Line 913 | Line 864 | user_set_hostmask(struct Client *target_
864
865		if (MyClient(target_p))
866		{
867	<	sendto_one_numeric(target_p, &me, RPL_NEWHOSTIS, target_p->host);
867	>	sendto_one_numeric(target_p, &me, RPL_VISIBLEHOST, target_p->host);
868		clear_ban_cache_client(target_p);
869		}
870
871	<	if (!ConfigFileEntry.cycle_on_host_change)
871	>	if (!ConfigGeneral.cycle_on_host_change)
872		return;
873
874	<	DLINK_FOREACH(ptr, target_p->channel.head)
874	>	DLINK_FOREACH(node, target_p->channel.head)
875		{
876		char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
877		char *p = modebuf;
878		int len = 0;
879	<	const struct Membership *ms = ptr->data;
879	>	const struct Membership *member = node->data;
880
881	<	if (has_member_flags(ms, CHFL_CHANOP))
881	>	if (has_member_flags(member, CHFL_CHANOP))
882		{
883		*p++ = 'o';
884		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
885		}
886
887	<	if (has_member_flags(ms, CHFL_HALFOP))
887	>	if (has_member_flags(member, CHFL_HALFOP))
888		{
889		*p++ = 'h';
890		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
891		}
892
893	<	if (has_member_flags(ms, CHFL_VOICE))
893	>	if (has_member_flags(member, CHFL_VOICE))
894		{
895		*p++ = 'v';
896		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
#	Line 947 | Line 898 | user_set_hostmask(struct Client *target_
898
899		*p = '\0';
900
901	<	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
902	<	target_p->name, target_p->username, target_p->host,
903	<	ms->chptr->chname);
901	>
902	>	sendto_channel_local_butone(target_p, CAP_EXTENDED_JOIN, 0, member->chptr, ":%s!%s@%s JOIN %s %s :%s",
903	>	target_p->name, target_p->username,
904	>	target_p->host, member->chptr->name,
905	>	(!IsDigit(target_p->account[0]) && target_p->account[0] != '*') ? target_p->account : "*",
906	>	target_p->info);
907	>	sendto_channel_local_butone(target_p, 0, CAP_EXTENDED_JOIN, member->chptr, ":%s!%s@%s JOIN :%s",
908	>	target_p->name, target_p->username,
909	>	target_p->host, member->chptr->name);
910	>
911		if (nickbuf[0])
912	<	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
913	<	target_p->servptr->name, ms->chptr->chname,
912	>	sendto_channel_local_butone(target_p, 0, 0, member->chptr, ":%s MODE %s +%s %s",
913	>	target_p->servptr->name, member->chptr->name,
914		modebuf, nickbuf);
915
916		}
#	Line 972 | Line 930 | void
930		oper_up(struct Client *source_p)
931		{
932		const unsigned int old = source_p->umodes;
933	<	const struct MaskItem *conf = source_p->localClient->confs.head->data;
933	>	const struct MaskItem *const conf = source_p->connection->confs.head->data;
934
935	<	assert(source_p->localClient->confs.head);
935	>	assert(source_p->connection->confs.head);
936
937		++Count.oper;
938		SetOper(source_p);
939
940		if (conf->modes)
941		AddUMode(source_p, conf->modes);
942	<	else if (ConfigFileEntry.oper_umodes)
943	<	AddUMode(source_p, ConfigFileEntry.oper_umodes);
942	>	else if (ConfigGeneral.oper_umodes)
943	>	AddUMode(source_p, ConfigGeneral.oper_umodes);
944
945		if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
946		++Count.invisi;
#	Line 999 | Line 957 | oper_up(struct Client *source_p)
957
958		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
959		get_oper_name(source_p));
960	<	send_umode_out(source_p, source_p, old);
960	>	sendto_server(NULL, 0, 0, ":%s GLOBOPS :%s is now an operator",
961	>	me.id, get_oper_name(source_p));
962	>	send_umode_out(source_p, old);
963		sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
964		}
965
#	Line 1030 | Line 990 | init_uid(void)
990		{
991		memset(new_uid, 0, sizeof(new_uid));
992
993	<	if (!EmptyString(ServerInfo.sid))
994	<	strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
993	>	if (!EmptyString(ConfigServerInfo.sid))
994	>	strlcpy(new_uid, ConfigServerInfo.sid, sizeof(new_uid));
995
996		for (unsigned int i = 0; i < IRC_MAXSID; ++i)
997		if (new_uid[i] == '\0')
#	Line 1099 | Line 1059 | void
1059		init_isupport(void)
1060		{
1061		add_isupport("CALLERID", NULL, -1);
1062	<	add_isupport("CASEMAPPING", CASEMAP, -1);
1062	>	add_isupport("CASEMAPPING", "rfc1459", -1);
1063		add_isupport("DEAF", "D", -1);
1064		add_isupport("KICKLEN", NULL, KICKLEN);
1065		add_isupport("MODES", NULL, MAXMODEPARAMS);
1066		add_isupport("PREFIX", "(ohv)@%+", -1);
1067		add_isupport("STATUSMSG", "@%+", -1);
1068	<	add_isupport("EXCEPTS", "e", -1);
1069	<	add_isupport("INVEX", "I", -1);
1068	>	add_isupport("EXCEPTS", NULL, -1);
1069	>	add_isupport("INVEX", NULL, -1);
1070		}
1071
1072		/*
#	Line 1121 | Line 1081 | init_isupport(void)
1081		void
1082		add_isupport(const char *name, const char *options, int n)
1083		{
1084	<	dlink_node *ptr;
1084	>	dlink_node *node = NULL;
1085		struct Isupport *support = NULL;
1086
1087	<	DLINK_FOREACH(ptr, support_list.head)
1087	>	DLINK_FOREACH(node, support_list.head)
1088		{
1089	<	support = ptr->data;
1089	>	support = node->data;
1090		if (irccmp(support->name, name) == 0)
1091		{
1092		MyFree(support->name);
#	Line 1135 | Line 1095 | add_isupport(const char *name, const cha
1095		}
1096		}
1097
1098	<	if (ptr == NULL)
1098	>	if (node == NULL)
1099		{
1100		support = MyCalloc(sizeof(*support));
1101		dlinkAddTail(support, &support->node, &support_list);
#	Line 1159 | Line 1119 | add_isupport(const char *name, const cha
1119		void
1120		delete_isupport(const char *name)
1121		{
1122	<	dlink_node *ptr;
1163	<	struct Isupport *support;
1122	>	dlink_node *node = NULL;
1123
1124	<	DLINK_FOREACH(ptr, support_list.head)
1124	>	DLINK_FOREACH(node, support_list.head)
1125		{
1126	<	support = ptr->data;
1126	>	struct Isupport *support = node->data;
1127	>
1128		if (irccmp(support->name, name) == 0)
1129		{
1130	<	dlinkDelete(ptr, &support_list);
1130	>	dlinkDelete(node, &support_list);
1131		MyFree(support->name);
1132		MyFree(support->options);
1133		MyFree(support);
#	Line 1190 | Line 1150 | rebuild_isupport_message_line(void)
1150		{
1151		char isupportbuffer[IRCD_BUFSIZE];
1152		char *p = isupportbuffer;
1153	<	dlink_node *ptr = NULL, *ptr_next = NULL;
1153	>	dlink_node *node = NULL, *node_next = NULL;
1154		int n = 0;
1155		int tokens = 0;
1156		size_t len = 0;
1157		size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1158
1159	<	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1159	>	DLINK_FOREACH_SAFE(node, node_next, support_list_lines.head)
1160		{
1161	<	dlinkDelete(ptr, &support_list_lines);
1162	<	MyFree(ptr->data);
1163	<	free_dlink_node(ptr);
1161	>	dlinkDelete(node, &support_list_lines);
1162	>	MyFree(node->data);
1163	>	free_dlink_node(node);
1164		}
1165
1166	<	DLINK_FOREACH(ptr, support_list.head)
1166	>	DLINK_FOREACH(node, support_list.head)
1167		{
1168	<	struct Isupport *support = ptr->data;
1168	>	struct Isupport *support = node->data;
1169
1170		p += (n = sprintf(p, "%s", support->name));
1171		len += n;

Diff Legend

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