ViewVC Help

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

root/svn/ircd-hybrid/branches/8.2.x/src/user.c

Comparing ircd-hybrid/trunk/src/s_user.c (file contents):
Revision 1644 by michael, Tue Nov 6 22:20:16 2012 UTC vs.
Revision 2145 by michael, Thu May 30 10:57:08 2013 UTC

#	Line 32 | Line 32
32		#include "fdlist.h"
33		#include "hash.h"
34		#include "irc_string.h"
35	–	#include "sprintf_irc.h"
35		#include "s_bsd.h"
36		#include "ircd.h"
37		#include "listener.h"
#	Line 54 | Line 53
53		#include "watch.h"
54
55
57	–	struct Callback *entering_umode_cb = NULL;
58	–	struct Callback *umode_cb = NULL;
59	–
56		static char umode_buffer[IRCD_BUFSIZE];
57
58		static void user_welcome(struct Client *);
#	Line 81 | Line 77 | static dlink_list support_list = { NULL,
77		MessageFile *isupportFile;
78
79		/* memory is cheap. map 0-255 to equivalent mode */
80	<	unsigned int user_modes[256] =
80	>	const unsigned int user_modes[256] =
81		{
82		/* 0x00 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x0F */
83		/* 0x10 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x1F */
#	Line 93 | Line 89 | unsigned int user_modes[256] =
89		UMODE_CCONN_FULL,   /* C */
90		UMODE_DEAF,         /* D */
91		0,                  /* E */
92	<	0,                  /* F */
92	>	UMODE_FARCONNECT,   /* F */
93		UMODE_SOFTCALLERID, /* G */
94		UMODE_HIDDEN,       /* H */
95		0,                  /* I */
#	Line 120 | Line 116 | unsigned int user_modes[256] =
116		UMODE_BOTS,         /* b */
117		UMODE_CCONN,        /* c */
118		UMODE_DEBUG,        /* d */
119	<	0,                  /* e */
119	>	UMODE_EXTERNAL,     /* e */
120		UMODE_FULL,         /* f */
121		UMODE_CALLERID,     /* g */
122		0,                  /* h */
#	Line 139 | Line 135 | unsigned int user_modes[256] =
135		UMODE_UNAUTH,       /* u */
136		0,                  /* v */
137		UMODE_WALLOP,       /* w */
138	<	UMODE_EXTERNAL,     /* x */
138	>	UMODE_HIDDENHOST,   /* x */
139		UMODE_SPY,          /* y */
140		UMODE_OPERWALL,     /* z      0x7A */
141		0,0,0,0,0,          /* 0x7B - 0x7F */
#	Line 214 | Line 210 | show_lusers(struct Client *source_p)
210		sendto_one(source_p, form_str(RPL_LUSERME),
211		from, to, Count.local, Count.myserver);
212		sendto_one(source_p, form_str(RPL_LOCALUSERS),
213	<	from, to, Count.local, Count.max_loc,
218	<	Count.local, Count.max_loc);
213	>	from, to, Count.local, Count.max_loc);
214		}
215		else
216		{
217		sendto_one(source_p, form_str(RPL_LUSERME),
218		from, to, Count.total, 0);
219		sendto_one(source_p, form_str(RPL_LOCALUSERS),
220	<	from, to, Count.total, Count.max_tot,
226	<	Count.total, Count.max_tot);
220	>	from, to, Count.total, Count.max_tot);
221		}
222
223		sendto_one(source_p, form_str(RPL_GLOBALUSERS),
224	<	from, to, Count.total, Count.max_tot,
231	<	Count.total, Count.max_tot);
224	>	from, to, Count.total, Count.max_tot);
225
226		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
227		sendto_one(source_p, form_str(RPL_STATSCONN), from, to,
#	Line 397 | Line 390 | register_local_user(struct Client *sourc
390		}
391
392		/* valid user name check */
393	<	if (valid_username(source_p->username) == 0)
393	>	if (valid_username(source_p->username, 1) == 0)
394		{
395		char tmpstr2[IRCD_BUFSIZE];
396
#	Line 558 | Line 551 | register_remote_user(struct Client *sour
551		add_user_host(source_p->username, source_p->host, 1);
552		SetUserHost(source_p);
553
554	+	if (HasFlag(source_p->servptr, FLAGS_EOB))
555	+	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
556	+	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
557	+	source_p->servptr->name,
558	+	source_p->name, source_p->username, source_p->host,
559	+	source_p->info, source_p->id);
560	+
561		introduce_client(source_p);
562		}
563
#	Line 659 | Line 659 | valid_hostname(const char *hostname)
659		if (!IsHostChar(*p))
660		return 0;
661
662	<	return 1;
662	>	return p - hostname <= HOSTLEN;
663		}
664
665		/* valid_username()
#	Line 674 | Line 674 | valid_hostname(const char *hostname)
674		* style of username
675		*/
676		int
677	<	valid_username(const char *username)
677	>	valid_username(const char *username, const int local)
678		{
679		int dots      = 0;
680		const char *p = username;
#	Line 684 | Line 684 | valid_username(const char *username)
684		if (*p == '~')
685		++p;
686
687	<	/* reject usernames that don't start with an alphanum
687	>	/*
688	>	* Reject usernames that don't start with an alphanum
689		* i.e. reject jokers who have '-@somehost' or '.@somehost'
690		* or "-hi-@somehost", "h-----@somehost" would still be accepted.
691		*/
692		if (!IsAlNum(*p))
693		return 0;
694
695	<	while (*++p)
695	>	if (local)
696		{
697	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
697	>	while (*++p)
698		{
699	<	if (++dots > ConfigFileEntry.dots_in_ident)
700	<	return 0;
701	<	if (!IsUserChar(*(p + 1)))
699	>	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
700	>	{
701	>	if (++dots > ConfigFileEntry.dots_in_ident)
702	>	return 0;
703	>	if (!IsUserChar(*(p + 1)))
704	>	return 0;
705	>	}
706	>	else if (!IsUserChar(*p))
707		return 0;
708		}
709	<	else if (!IsUserChar(*p))
710	<	return 0;
709	>	}
710	>	else
711	>	{
712	>	while (*++p)
713	>	if (!IsUserChar(*p))
714	>	return 0;
715		}
716
717	<	return 1;
717	>	return  p - username <= USERLEN;;
718		}
719
720		/* clean_nick_name()
#	Line 745 | Line 755 | report_and_set_user_flags(struct Client
755		{
756		/* If this user is being spoofed, tell them so */
757		if (IsConfDoSpoofIp(conf))
748	–	{
758		sendto_one(source_p,
759	<	":%s NOTICE %s :*** Spoofing your IP. congrats.",
759	>	":%s NOTICE %s :*** Spoofing your IP. Congrats.",
760		me.name, source_p->name);
752	–	}
761
762		/* If this user is in the exception class, Set it "E lined" */
763		if (IsConfExemptKline(conf))
764		{
765		SetExemptKline(source_p);
766		sendto_one(source_p,
767	<	":%s NOTICE %s :*** You are exempt from K/D/G lines. congrats.",
767	>	":%s NOTICE %s :*** You are exempt from K/D/G lines. Congrats.",
768		me.name, source_p->name);
769		}
770
#	Line 766 | Line 774 | report_and_set_user_flags(struct Client
774		else if (IsConfExemptGline(conf))
775		{
776		SetExemptGline(source_p);
777	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines.",
777	>	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines. Congrats.",
778		me.name, source_p->name);
779		}
780
781		if (IsConfExemptResv(conf))
782		{
783		SetExemptResv(source_p);
784	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs.",
784	>	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs. Congrats.",
785		me.name, source_p->name);
786		}
787
#	Line 782 | Line 790 | report_and_set_user_flags(struct Client
790		{
791		SetExemptLimits(source_p);
792		sendto_one(source_p,
793	<	":%s NOTICE %s :*** You are exempt from user limits. congrats.",
793	>	":%s NOTICE %s :*** You are exempt from user limits. Congrats.",
794		me.name,source_p->name);
795		}
796
#	Line 795 | Line 803 | report_and_set_user_flags(struct Client
803		}
804		}
805
798	–	/* change_simple_umode()
799	–	*
800	–	* this callback can be hooked to allow special handling of
801	–	* certain usermodes
802	–	*/
803	–	static void *
804	–	change_simple_umode(va_list args)
805	–	{
806	–	struct Client *client_p;
807	–	struct Client *source_p;
808	–	int what;
809	–	unsigned int flag;
810	–
811	–	client_p = va_arg(args, struct Client *);
812	–	source_p = va_arg(args, struct Client *);
813	–	what = va_arg(args, int);
814	–	flag = va_arg(args, unsigned int);
815	–
816	–	if (what == MODE_ADD)
817	–	AddUMode(source_p, flag);
818	–	else
819	–	DelUMode(source_p, flag);
820	–
821	–	return NULL;
822	–	}
823	–
806		/* set_user_mode()
807		*
808		* added 15/10/91 By Darren Reed.
#	Line 830 | Line 812 | change_simple_umode(va_list args)
812		*/
813		void
814		set_user_mode(struct Client *client_p, struct Client *source_p,
815	<	int parc, char *parv[])
815	>	const int parc, char *parv[])
816		{
817		unsigned int flag, setflags;
818		char **p, *m, buf[IRCD_BUFSIZE];
#	Line 847 | Line 829 | set_user_mode(struct Client *client_p, s
829		return;
830		}
831
850	–	if (IsServer(source_p))
851	–	{
852	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, SEND_NOTICE,
853	–	"*** Mode for User %s from %s",
854	–	parv[1], source_p->name);
855	–	return;
856	–	}
857	–
832		if (source_p != target_p)
833		{
834		sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
#	Line 877 | Line 851 | set_user_mode(struct Client *client_p, s
851		return;
852		}
853
880	–	execute_callback(entering_umode_cb, client_p, source_p);
881	–
854		/* find flags already set for user */
855		setflags = source_p->umodes;
856
#	Line 930 | Line 902 | set_user_mode(struct Client *client_p, s
902
903		break;
904
905	<	/* we may not get these,
906	<	* but they shouldnt be in default
935	<	*/
936	<	case 'r':
937	<	case ' ' :
938	<	case '\n':
939	<	case '\r':
940	<	case '\t':
905	>	case 'r':  /* Only services may set +r */
906	>	case 'x':  /* Only services may set +x */
907		break;
908
909		default:
#	Line 945 | Line 911 | set_user_mode(struct Client *client_p, s
911		{
912		if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
913		(ConfigFileEntry.oper_only_umodes & flag))
948	–	{
914		badflag = 1;
950	–	}
915		else
916	<	execute_callback(umode_cb, client_p, source_p, what, flag);
916	>	{
917	>	if (what == MODE_ADD)
918	>	AddUMode(source_p, flag);
919	>	else
920	>	DelUMode(source_p, flag);
921	>	}
922		}
923		else
924		{
#	Line 966 | Line 935 | set_user_mode(struct Client *client_p, s
935		sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
936		me.name, source_p->name);
937
969	–	if (HasUMode(source_p, UMODE_NCHANGE) && !HasOFlag(source_p, OPER_FLAG_N))
970	–	{
971	–	sendto_one(source_p, ":%s NOTICE %s :*** You have no nchange flag;",
972	–	me.name, source_p->name);
973	–	DelUMode(source_p, UMODE_NCHANGE);
974	–	}
975	–
938		if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
939		!HasOFlag(source_p, OPER_FLAG_ADMIN))
940		{
#	Line 1090 | Line 1052 | send_umode_out(struct Client *client_p,
1052		send_umode(client_p, source_p, old, 0xffffffff, buf);
1053		}
1054
1055	+	void
1056	+	user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
1057	+	{
1058	+	dlink_node *ptr = NULL;
1059	+
1060	+	if (!strcmp(target_p->host, hostname))
1061	+	return;
1062	+
1063	+	switch (what)
1064	+	{
1065	+	case MODE_ADD:
1066	+	AddUMode(target_p, UMODE_HIDDENHOST);
1067	+	AddFlag(target_p, FLAGS_IP_SPOOFING);
1068	+	break;
1069	+	case MODE_DEL:
1070	+	DelUMode(target_p, UMODE_HIDDENHOST);
1071	+
1072	+	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
1073	+	DelFlag(target_p, FLAGS_IP_SPOOFING);
1074	+	break;
1075	+	default: return;
1076	+	}
1077	+
1078	+	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
1079	+	target_p->name, target_p->username, target_p->host);
1080	+
1081	+	if (IsUserHostIp(target_p))
1082	+	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1083	+
1084	+	strlcpy(target_p->host, hostname, sizeof(target_p->host));
1085	+
1086	+	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1087	+	SetUserHost(target_p);
1088	+
1089	+	if (MyClient(target_p))
1090	+	{
1091	+	sendto_one(target_p, form_str(RPL_NEWHOSTIS), me.name,
1092	+	target_p->name, target_p->host);
1093	+	clear_ban_cache_client(target_p);
1094	+	}
1095	+
1096	+	DLINK_FOREACH(ptr, target_p->channel.head)
1097	+	{
1098	+	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = { '\0' };
1099	+	char *p = modebuf;
1100	+	int len = 0;
1101	+	const struct Membership *ms = ptr->data;
1102	+
1103	+	if (has_member_flags(ms, CHFL_CHANOP)) {
1104	+	*p++ = 'o';
1105	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1106	+	}
1107	+
1108	+	if (has_member_flags(ms, CHFL_HALFOP)) {
1109	+	*p++ = 'h';
1110	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1111	+	}
1112	+
1113	+	if (has_member_flags(ms, CHFL_VOICE)) {
1114	+	*p++ = 'v';
1115	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1116	+	}
1117	+
1118	+	*p = '\0';
1119	+
1120	+	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
1121	+	target_p->name, target_p->username, target_p->host,
1122	+	ms->chptr->chname);
1123	+	if (nickbuf[0])
1124	+	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
1125	+	target_p->servptr->name, ms->chptr->chname,
1126	+	modebuf, nickbuf);
1127	+
1128	+	}
1129	+
1130	+	if (target_p->away[0])
1131	+	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
1132	+	":%s!%s@%s AWAY :%s",
1133	+	target_p->name, target_p->username,
1134	+	target_p->host, target_p->away);
1135	+	}
1136	+
1137		/* user_welcome()
1138		*
1139		* inputs       - client pointer to client to welcome
#	Line 1159 | Line 1203 | check_xline(struct Client *source_p)
1203		struct MaskItem *conf = NULL;
1204		const char *reason = NULL;
1205
1206	<	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)) ||
1163	<	(conf = find_matching_name_conf(CONF_RXLINE, source_p->info, NULL, NULL, 0)))
1206	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
1207		{
1208		++conf->count;
1209
#	Line 1219 | Line 1262 | oper_up(struct Client *source_p)
1262
1263		if (HasOFlag(source_p, OPER_FLAG_ADMIN))
1264		AddUMode(source_p, UMODE_ADMIN);
1222	–	if (!HasOFlag(source_p, OPER_FLAG_N))
1223	–	DelUMode(source_p, UMODE_NCHANGE);
1265
1266		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1267		get_oper_name(source_p));
#	Line 1253 | Line 1294 | valid_sid(const char *sid)
1294		void
1295		init_uid(void)
1296		{
1297	<	int i;
1297	>	unsigned int i;
1298
1299		memset(new_uid, 0, sizeof(new_uid));
1300
#	Line 1270 | Line 1311 | init_uid(void)
1311		* -Dianora
1312		*/
1313		memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1273	–
1274	–	entering_umode_cb = register_callback("entering_umode", NULL);
1275	–	umode_cb = register_callback("changing_umode", change_simple_umode);
1314		}
1315
1316		/*
#	Line 1339 | Line 1377 | init_isupport(void)
1377		add_isupport("DEAF", "D", -1);
1378		add_isupport("KICKLEN", NULL, KICKLEN);
1379		add_isupport("MODES", NULL, MAXMODEPARAMS);
1342	–	add_isupport("NICKLEN", NULL, NICKLEN);
1380		#ifdef HALFOPS
1381		add_isupport("PREFIX", "(ohv)@%+", -1);
1382		add_isupport("STATUSMSG", "@%+", -1);
#	Line 1347 | Line 1384 | init_isupport(void)
1384		add_isupport("PREFIX", "(ov)@+", -1);
1385		add_isupport("STATUSMSG", "@+", -1);
1386		#endif
1350	–	add_isupport("TOPICLEN", NULL, TOPICLEN);
1387		}
1388
1389		/*
#	Line 1382 | Line 1418 | add_isupport(const char *name, const cha
1418		dlinkAddTail(support, &support->node, &support_list);
1419		}
1420
1421	<	DupString(support->name, name);
1421	>	support->name = xstrdup(name);
1422		if (options != NULL)
1423	<	DupString(support->options, options);
1423	>	support->options = xstrdup(options);
1424		support->number = n;
1425
1426		rebuild_isupport_message_line();
#	Line 1443 | Line 1479 | rebuild_isupport_message_line(void)
1479		{
1480		struct Isupport *support = ptr->data;
1481
1482	<	p += (n = ircsprintf(p, "%s", support->name));
1482	>	p += (n = sprintf(p, "%s", support->name));
1483		len += n;
1484
1485		if (support->options != NULL)
1486		{
1487	<	p += (n = ircsprintf(p, "=%s", support->options));
1487	>	p += (n = sprintf(p, "=%s", support->options));
1488		len += n;
1489		}
1490
1491		if (support->number > 0)
1492		{
1493	<	p += (n = ircsprintf(p, "=%d", support->number));
1493	>	p += (n = sprintf(p, "=%d", support->number));
1494		len += n;
1495		}
1496

Diff Legend

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