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/s_user.c (file contents):
Revision 1857 by michael, Wed Apr 24 20:47:21 2013 UTC vs.
Revision 2289 by michael, Wed Jun 19 10:32:20 2013 UTC

#	Line 52 | Line 52
52		#include "parse.h"
53		#include "watch.h"
54
55	–
56	–	struct Callback *entering_umode_cb = NULL;
57	–	struct Callback *umode_cb = NULL;
58	–
55		static char umode_buffer[IRCD_BUFSIZE];
56
57		static void user_welcome(struct Client *);
#	Line 76 | Line 72 | struct Isupport
72		int number;
73		};
74
75	<	static dlink_list support_list = { NULL, NULL, 0 };
76	<	MessageFile *isupportFile;
75	>	static dlink_list support_list;
76	>	static dlink_list support_list_lines;
77
78		/* memory is cheap. map 0-255 to equivalent mode */
79	<	unsigned int user_modes[256] =
79	>	const unsigned int user_modes[256] =
80		{
81		/* 0x00 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x0F */
82		/* 0x10 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x1F */
#	Line 89 | Line 85 | unsigned int user_modes[256] =
85		0,                  /* @ */
86		0,                  /* A */
87		0,                  /* B */
88	<	UMODE_CCONN_FULL,   /* C */
88	>	0,                  /* C */
89		UMODE_DEAF,         /* D */
90		0,                  /* E */
91	<	0,                  /* F */
91	>	UMODE_FARCONNECT,   /* F */
92		UMODE_SOFTCALLERID, /* G */
93		UMODE_HIDDEN,       /* H */
94		0,                  /* I */
#	Line 105 | Line 101 | unsigned int user_modes[256] =
101		0,                  /* P */
102		0,                  /* Q */
103		UMODE_REGONLY,      /* R */
104	<	0,                  /* S */
104	>	UMODE_SSL,          /* S */
105		0,                  /* T */
106		0,                  /* U */
107		0,                  /* V */
#	Line 138 | Line 134 | unsigned int user_modes[256] =
134		UMODE_UNAUTH,       /* u */
135		0,                  /* v */
136		UMODE_WALLOP,       /* w */
137	<	0,                  /* x */
137	>	UMODE_HIDDENHOST,   /* x */
138		UMODE_SPY,          /* y */
139		UMODE_OPERWALL,     /* z      0x7A */
140		0,0,0,0,0,          /* 0x7B - 0x7F */
#	Line 246 | Line 242 | show_lusers(struct Client *source_p)
242		void
243		show_isupport(struct Client *source_p)
244		{
245	<	send_message_file(source_p, isupportFile);
245	>	const dlink_node *ptr = NULL;
246	>
247	>	DLINK_FOREACH(ptr, support_list_lines.head)
248	>	sendto_one(source_p, form_str(RPL_ISUPPORT), me.name,
249	>	source_p->name, ptr->data);
250		}
251
252		/*
#	Line 393 | Line 393 | register_local_user(struct Client *sourc
393		}
394
395		/* valid user name check */
396	<	if (valid_username(source_p->username) == 0)
396	>	if (valid_username(source_p->username, 1) == 0)
397		{
398		char tmpstr2[IRCD_BUFSIZE];
399
#	Line 424 | Line 424 | register_local_user(struct Client *sourc
424		get_client_class(&source_p->localClient->confs),
425		source_p->info, source_p->id);
426
427	–	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL, SEND_NOTICE,
428	–	"CLICONN %s %s %s %s %s %s %s 0 %s",
429	–	source_p->name, source_p->username, source_p->host,
430	–	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
431	–	"255.255.255.255" : source_p->sockhost,
432	–	get_client_class(&source_p->localClient->confs),
433	–	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
434	–	"<hidden>" : source_p->localClient->client_host,
435	–	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
436	–	"<hidden>" : source_p->localClient->client_server,
437	–	source_p->info);
438	–
439	–
427		if (ConfigFileEntry.invisible_on_connect)
428		{
429		AddUMode(source_p, UMODE_INVISIBLE);
#	Line 554 | Line 541 | register_remote_user(struct Client *sour
541		add_user_host(source_p->username, source_p->host, 1);
542		SetUserHost(source_p);
543
544	+	if (HasFlag(source_p->servptr, FLAGS_EOB))
545	+	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
546	+	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
547	+	source_p->servptr->name,
548	+	source_p->name, source_p->username, source_p->host,
549	+	source_p->info, source_p->id);
550	+
551		introduce_client(source_p);
552		}
553
#	Line 629 | Line 623 | introduce_client(struct Client *source_p
623		ubuf, source_p->username, source_p->host,
624		source_p->servptr->name, source_p->info);
625		}
626	+
627	+	if (!EmptyString(source_p->certfp))
628	+	sendto_one(server, ":%s CERTFP %s", ID(source_p), source_p->certfp);
629		}
630		}
631
#	Line 670 | Line 667 | valid_hostname(const char *hostname)
667		* style of username
668		*/
669		int
670	<	valid_username(const char *username)
670	>	valid_username(const char *username, const int local)
671		{
672		int dots      = 0;
673		const char *p = username;
#	Line 680 | Line 677 | valid_username(const char *username)
677		if (*p == '~')
678		++p;
679
680	<	/* reject usernames that don't start with an alphanum
680	>	/*
681	>	* Reject usernames that don't start with an alphanum
682		* i.e. reject jokers who have '-@somehost' or '.@somehost'
683		* or "-hi-@somehost", "h-----@somehost" would still be accepted.
684		*/
685		if (!IsAlNum(*p))
686		return 0;
687
688	<	while (*++p)
688	>	if (local)
689		{
690	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
690	>	while (*++p)
691		{
692	<	if (++dots > ConfigFileEntry.dots_in_ident)
693	<	return 0;
694	<	if (!IsUserChar(*(p + 1)))
692	>	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
693	>	{
694	>	if (++dots > ConfigFileEntry.dots_in_ident)
695	>	return 0;
696	>	if (!IsUserChar(*(p + 1)))
697	>	return 0;
698	>	}
699	>	else if (!IsUserChar(*p))
700		return 0;
701		}
702	<	else if (!IsUserChar(*p))
703	<	return 0;
702	>	}
703	>	else
704	>	{
705	>	while (*++p)
706	>	if (!IsUserChar(*p))
707	>	return 0;
708		}
709
710	<	return 1;
710	>	return  p - username <= USERLEN;;
711		}
712
713		/* clean_nick_name()
#	Line 741 | Line 748 | report_and_set_user_flags(struct Client
748		{
749		/* If this user is being spoofed, tell them so */
750		if (IsConfDoSpoofIp(conf))
744	–	{
751		sendto_one(source_p,
752	<	":%s NOTICE %s :*** Spoofing your IP. congrats.",
752	>	":%s NOTICE %s :*** Spoofing your IP. Congrats.",
753		me.name, source_p->name);
748	–	}
754
755		/* If this user is in the exception class, Set it "E lined" */
756		if (IsConfExemptKline(conf))
757		{
758		SetExemptKline(source_p);
759		sendto_one(source_p,
760	<	":%s NOTICE %s :*** You are exempt from K/D/G lines. congrats.",
760	>	":%s NOTICE %s :*** You are exempt from K/D/G lines. Congrats.",
761		me.name, source_p->name);
762		}
763
#	Line 762 | Line 767 | report_and_set_user_flags(struct Client
767		else if (IsConfExemptGline(conf))
768		{
769		SetExemptGline(source_p);
770	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines.",
770	>	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines. Congrats.",
771		me.name, source_p->name);
772		}
773
774		if (IsConfExemptResv(conf))
775		{
776		SetExemptResv(source_p);
777	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs.",
777	>	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs. Congrats.",
778		me.name, source_p->name);
779		}
780
#	Line 778 | Line 783 | report_and_set_user_flags(struct Client
783		{
784		SetExemptLimits(source_p);
785		sendto_one(source_p,
786	<	":%s NOTICE %s :*** You are exempt from user limits. congrats.",
786	>	":%s NOTICE %s :*** You are exempt from user limits. Congrats.",
787		me.name,source_p->name);
788		}
789
#	Line 791 | Line 796 | report_and_set_user_flags(struct Client
796		}
797		}
798
794	–	/* change_simple_umode()
795	–	*
796	–	* this callback can be hooked to allow special handling of
797	–	* certain usermodes
798	–	*/
799	–	static void *
800	–	change_simple_umode(va_list args)
801	–	{
802	–	struct Client *client_p;
803	–	struct Client *source_p;
804	–	int what;
805	–	unsigned int flag;
806	–
807	–	client_p = va_arg(args, struct Client *);
808	–	source_p = va_arg(args, struct Client *);
809	–	what = va_arg(args, int);
810	–	flag = va_arg(args, unsigned int);
811	–
812	–	if (what == MODE_ADD)
813	–	AddUMode(source_p, flag);
814	–	else
815	–	DelUMode(source_p, flag);
816	–
817	–	return NULL;
818	–	}
819	–
799		/* set_user_mode()
800		*
801		* added 15/10/91 By Darren Reed.
#	Line 865 | Line 844 | set_user_mode(struct Client *client_p, s
844		return;
845		}
846
868	–	execute_callback(entering_umode_cb, client_p, source_p);
869	–
847		/* find flags already set for user */
848		setflags = source_p->umodes;
849
#	Line 918 | Line 895 | set_user_mode(struct Client *client_p, s
895
896		break;
897
898	<	/* we may not get these,
899	<	* but they shouldnt be in default
900	<	*/
924	<	case 'r':
925	<	case ' ' :
926	<	case '\n':
927	<	case '\r':
928	<	case '\t':
898	>	case 'S':  /* Only servers may set +S in a burst */
899	>	case 'r':  /* Only services may set +r */
900	>	case 'x':  /* Only services may set +x */
901		break;
902
903		default:
#	Line 933 | Line 905 | set_user_mode(struct Client *client_p, s
905		{
906		if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
907		(ConfigFileEntry.oper_only_umodes & flag))
936	–	{
908		badflag = 1;
938	–	}
909		else
910	<	execute_callback(umode_cb, client_p, source_p, what, flag);
910	>	{
911	>	if (what == MODE_ADD)
912	>	AddUMode(source_p, flag);
913	>	else
914	>	DelUMode(source_p, flag);
915	>	}
916		}
917		else
918		{
#	Line 954 | Line 929 | set_user_mode(struct Client *client_p, s
929		sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
930		me.name, source_p->name);
931
957	–	if (HasUMode(source_p, UMODE_NCHANGE) && !HasOFlag(source_p, OPER_FLAG_N))
958	–	{
959	–	sendto_one(source_p, ":%s NOTICE %s :*** You have no nchange flag;",
960	–	me.name, source_p->name);
961	–	DelUMode(source_p, UMODE_NCHANGE);
962	–	}
963	–
932		if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
933		!HasOFlag(source_p, OPER_FLAG_ADMIN))
934		{
#	Line 1079 | Line 1047 | send_umode_out(struct Client *client_p,
1047		}
1048
1049		void
1050	<	user_set_hostmask(struct Client *target_p, const char *hostname)
1050	>	user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
1051		{
1052	<	if (!valid_hostname(hostname))
1052	>	dlink_node *ptr = NULL;
1053	>
1054	>	if (!strcmp(target_p->host, hostname))
1055		return;
1056
1057	+	switch (what)
1058	+	{
1059	+	case MODE_ADD:
1060	+	AddUMode(target_p, UMODE_HIDDENHOST);
1061	+	AddFlag(target_p, FLAGS_IP_SPOOFING);
1062	+	break;
1063	+	case MODE_DEL:
1064	+	DelUMode(target_p, UMODE_HIDDENHOST);
1065	+
1066	+	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
1067	+	DelFlag(target_p, FLAGS_IP_SPOOFING);
1068	+	break;
1069	+	default: return;
1070	+	}
1071	+
1072	+	if (ConfigFileEntry.cycle_on_host_change)
1073	+	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
1074	+	target_p->name, target_p->username, target_p->host);
1075	+
1076		if (IsUserHostIp(target_p))
1077		delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1078
1079		strlcpy(target_p->host, hostname, sizeof(target_p->host));
1091	–	SetIPSpoof(target_p);
1080
1081		add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1082		SetUserHost(target_p);
1083
1084		if (MyClient(target_p))
1085	+	{
1086	+	sendto_one(target_p, form_str(RPL_NEWHOSTIS), me.name,
1087	+	target_p->name, target_p->host);
1088		clear_ban_cache_client(target_p);
1089	+	}
1090	+
1091	+	if (!ConfigFileEntry.cycle_on_host_change)
1092	+	return;
1093	+
1094	+	DLINK_FOREACH(ptr, target_p->channel.head)
1095	+	{
1096	+	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = { '\0' };
1097	+	char *p = modebuf;
1098	+	int len = 0;
1099	+	const struct Membership *ms = ptr->data;
1100	+
1101	+	if (has_member_flags(ms, CHFL_CHANOP))
1102	+	{
1103	+	*p++ = 'o';
1104	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1105	+	}
1106	+
1107	+	if (has_member_flags(ms, CHFL_HALFOP))
1108	+	{
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	+	{
1115	+	*p++ = 'v';
1116	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1117	+	}
1118	+
1119	+	*p = '\0';
1120	+
1121	+	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
1122	+	target_p->name, target_p->username, target_p->host,
1123	+	ms->chptr->chname);
1124	+	if (nickbuf[0])
1125	+	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
1126	+	target_p->servptr->name, ms->chptr->chname,
1127	+	modebuf, nickbuf);
1128	+
1129	+	}
1130	+
1131	+	if (target_p->away[0])
1132	+	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
1133	+	":%s!%s@%s AWAY :%s",
1134	+	target_p->name, target_p->username,
1135	+	target_p->host, target_p->away);
1136		}
1137
1138		/* user_welcome()
#	Line 1113 | Line 1151 | user_welcome(struct Client *source_p)
1151		#endif
1152
1153		#ifdef HAVE_LIBCRYPTO
1154	<	if (source_p->localClient->fd.ssl != NULL)
1154	>	if (HasFlag(source_p, FLAGS_SSL))
1155	>	{
1156	>	AddUMode(source_p, UMODE_SSL);
1157		sendto_one(source_p, ":%s NOTICE %s :*** Connected securely via %s",
1158		me.name, source_p->name,
1159		ssl_get_cipher(source_p->localClient->fd.ssl));
1160	+	}
1161		#endif
1162
1163		sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
#	Line 1134 | Line 1175 | user_welcome(struct Client *source_p)
1175		source_p->name, source_p->id);
1176
1177		show_lusers(source_p);
1178	<
1138	<	if (ConfigFileEntry.short_motd)
1139	<	{
1140	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- motd was last changed at %s",
1141	<	me.name, source_p->name, ConfigFileEntry.motd.lastChangedDate);
1142	<	sendto_one(source_p,
1143	<	":%s NOTICE %s :*** Notice -- Please read the motd if you haven't "
1144	<	"read it", me.name, source_p->name);
1145	<	sendto_one(source_p, form_str(RPL_MOTDSTART),
1146	<	me.name, source_p->name, me.name);
1147	<	sendto_one(source_p, form_str(RPL_MOTD),
1148	<	me.name, source_p->name,
1149	<	"*** This is the short motd ***");
1150	<	sendto_one(source_p, form_str(RPL_ENDOFMOTD),
1151	<	me.name, source_p->name);
1152	<	}
1153	<	else
1154	<	send_message_file(source_p, &ConfigFileEntry.motd);
1178	>	motd_signon(source_p);
1179		}
1180
1181		/* check_xline()
#	Line 1166 | Line 1190 | check_xline(struct Client *source_p)
1190		struct MaskItem *conf = NULL;
1191		const char *reason = NULL;
1192
1193	<	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)) ||
1170	<	(conf = find_matching_name_conf(CONF_RXLINE, source_p->info, NULL, NULL, 0)))
1193	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
1194		{
1195		++conf->count;
1196
#	Line 1226 | Line 1249 | oper_up(struct Client *source_p)
1249
1250		if (HasOFlag(source_p, OPER_FLAG_ADMIN))
1251		AddUMode(source_p, UMODE_ADMIN);
1229	–	if (!HasOFlag(source_p, OPER_FLAG_N))
1230	–	DelUMode(source_p, UMODE_NCHANGE);
1252
1253		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1254		get_oper_name(source_p));
#	Line 1277 | Line 1298 | init_uid(void)
1298		* -Dianora
1299		*/
1300		memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1280	–
1281	–	entering_umode_cb = register_callback("entering_umode", NULL);
1282	–	umode_cb = register_callback("changing_umode", change_simple_umode);
1301		}
1302
1303		/*
#	Line 1339 | Line 1357 | uid_get(void)
1357		void
1358		init_isupport(void)
1359		{
1342	–	isupportFile = init_MessageLine();
1343	–
1360		add_isupport("CALLERID", NULL, -1);
1361		add_isupport("CASEMAPPING", CASEMAP, -1);
1362		add_isupport("DEAF", "D", -1);
#	Line 1353 | Line 1369 | init_isupport(void)
1369		add_isupport("PREFIX", "(ov)@+", -1);
1370		add_isupport("STATUSMSG", "@+", -1);
1371		#endif
1372	+	add_isupport("EXCEPTS", "e", -1);
1373	+	add_isupport("INVEX", "I", -1);
1374		}
1375
1376		/*
#	Line 1436 | Line 1454 | rebuild_isupport_message_line(void)
1454		{
1455		char isupportbuffer[IRCD_BUFSIZE];
1456		char *p = isupportbuffer;
1457	<	dlink_node *ptr = NULL;
1457	>	dlink_node *ptr = NULL, *ptr_next = NULL;
1458		int n = 0;
1459		int tokens = 0;
1460		size_t len = 0;
1461		size_t reserve = strlen(me.name) + HOSTLEN + strlen(form_str(RPL_ISUPPORT));
1462
1463	<	destroy_MessageLine(isupportFile);
1463	>	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1464	>	{
1465	>	dlinkDelete(ptr, &support_list_lines);
1466	>	MyFree(ptr->data);
1467	>	free_dlink_node(ptr);
1468	>	}
1469
1470		DLINK_FOREACH(ptr, support_list.head)
1471		{
#	Line 1472 | Line 1495 | rebuild_isupport_message_line(void)
1495		if (*--p == ' ')
1496		*p = '\0';
1497
1498	<	addto_MessageLine(isupportFile, isupportbuffer);
1498	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1499		p = isupportbuffer;
1500		len = 0;
1501		n = tokens = 0;
#	Line 1483 | Line 1506 | rebuild_isupport_message_line(void)
1506		{
1507		if (*--p == ' ')
1508		*p = '\0';
1509	<	addto_MessageLine(isupportFile, isupportbuffer);
1509	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1510		}
1511		}

Diff Legend

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