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 2231 by michael, Thu Jun 13 20:29:59 2013 UTC vs.
Revision 3109 by michael, Thu Mar 6 19:25:12 2014 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  s_user.c: User related functions.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2002 by the past and present ircd coders, and others.
4	>	*  Copyright (c) 1997-2014 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 18 | Line 17
17		*  along with this program; if not, write to the Free Software
18		*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
19		*  USA
20	<	*
21	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file s_user.c
23	>	* \brief User related functions.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
#	Line 64 | Line 66 | static const char *uid_get(void);
66		* used with init_isupport, add_isupport, delete_isupport
67		*/
68
69	<	struct Isupport
69	>	struct Isupport
70		{
71		dlink_node node;
72		char *name;
#	Line 101 | Line 103 | const unsigned int user_modes[256] =
103		0,                  /* P */
104		0,                  /* Q */
105		UMODE_REGONLY,      /* R */
106	<	0,                  /* S */
106	>	UMODE_SSL,          /* S */
107		0,                  /* T */
108		0,                  /* U */
109		0,                  /* V */
110	<	0,                  /* W */
110	>	UMODE_WEBIRC,       /* W */
111		0,                  /* X */
112		0,                  /* Y */
113		0,                  /* Z 0x5A */
114	<	0, 0, 0, 0, 0,      /* 0x5F   */
114	>	0, 0, 0, 0, 0,      /* 0x5F   */
115		0,                  /* 0x60   */
116		UMODE_ADMIN,        /* a */
117		UMODE_BOTS,         /* b */
#	Line 169 | Line 171 | assemble_umode_buffer(void)
171		* side effects - display to client user counts etc.
172		*/
173		void
174	<	show_lusers(struct Client *source_p)
174	>	show_lusers(struct Client *source_p)
175		{
174	–	const char *from, *to;
175	–
176	–	if (!MyConnect(source_p) && IsCapable(source_p->from, CAP_TS6) && HasID(source_p))
177	–	{
178	–	from = me.id;
179	–	to = source_p->id;
180	–	}
181	–	else
182	–	{
183	–	from = me.name;
184	–	to = source_p->name;
185	–	}
186	–
176		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
177	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT),
178	<	from, to, (Count.total-Count.invisi),
190	<	Count.invisi, dlink_list_length(&global_serv_list));
177	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total-Count.invisi),
178	>	Count.invisi, dlink_list_length(&global_serv_list));
179		else
180	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT), from, to,
181	<	(Count.total-Count.invisi), Count.invisi, 1);
180	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT,
181	>	(Count.total-Count.invisi), Count.invisi, 1);
182
183		if (Count.oper > 0)
184	<	sendto_one(source_p, form_str(RPL_LUSEROP),
197	<	from, to, Count.oper);
184	>	sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper);
185
186		if (dlink_list_length(&unknown_list) > 0)
187	<	sendto_one(source_p, form_str(RPL_LUSERUNKNOWN),
201	<	from, to, dlink_list_length(&unknown_list));
187	>	sendto_one_numeric(source_p, &me, RPL_LUSERUNKNOWN, dlink_list_length(&unknown_list));
188
189		if (dlink_list_length(&global_channel_list) > 0)
190	<	sendto_one(source_p, form_str(RPL_LUSERCHANNELS),
205	<	from, to, dlink_list_length(&global_channel_list));
190	>	sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&global_channel_list));
191
192		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
193		{
194	<	sendto_one(source_p, form_str(RPL_LUSERME),
195	<	from, to, Count.local, Count.myserver);
211	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
212	<	from, to, Count.local, Count.max_loc);
194	>	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.local, Count.myserver);
195	>	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.local, Count.max_loc);
196		}
197		else
198		{
199	<	sendto_one(source_p, form_str(RPL_LUSERME),
200	<	from, to, Count.total, 0);
218	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
219	<	from, to, Count.total, Count.max_tot);
199	>	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.total, 0);
200	>	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.total, Count.max_tot);
201		}
202
203	<	sendto_one(source_p, form_str(RPL_GLOBALUSERS),
223	<	from, to, Count.total, Count.max_tot);
203	>	sendto_one_numeric(source_p, &me, RPL_GLOBALUSERS, Count.total, Count.max_tot);
204
205		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
206	<	sendto_one(source_p, form_str(RPL_STATSCONN), from, to,
207	<	Count.max_loc_con, Count.max_loc_cli, Count.totalrestartcount);
206	>	sendto_one_numeric(source_p, &me, RPL_STATSCONN, Count.max_loc_con,
207	>	Count.max_loc_cli, Count.totalrestartcount);
208
209		if (Count.local > Count.max_loc_cli)
210		Count.max_loc_cli = Count.local;
211
212		if ((Count.local + Count.myserver) > Count.max_loc_con)
213	<	Count.max_loc_con = Count.local + Count.myserver;
213	>	Count.max_loc_con = Count.local + Count.myserver;
214		}
215
216		/* show_isupport()
#	Line 240 | Line 220 | show_lusers(struct Client *source_p)
220		* side effects - display to client what we support (for them)
221		*/
222		void
223	<	show_isupport(struct Client *source_p)
223	>	show_isupport(struct Client *source_p)
224		{
225		const dlink_node *ptr = NULL;
226
227		DLINK_FOREACH(ptr, support_list_lines.head)
228	<	sendto_one(source_p, form_str(RPL_ISUPPORT), me.name,
249	<	source_p->name, ptr->data);
228	>	sendto_one_numeric(source_p, &me, RPL_ISUPPORT, ptr->data);
229		}
230
231		/*
#	Line 287 | Line 266 | register_local_user(struct Client *sourc
266
267		if (ConfigFileEntry.ping_cookie)
268		{
269	<	if (!IsPingSent(source_p) && source_p->localClient->random_ping == 0)
269	>	if (!IsPingSent(source_p) && !source_p->localClient->random_ping)
270		{
271		do
272		source_p->localClient->random_ping = genrand_int32();
#	Line 310 | Line 289 | register_local_user(struct Client *sourc
289		if (!check_client(source_p))
290		return;
291
292	<	if (valid_hostname(source_p->host) == 0)
292	>	if (!valid_hostname(source_p->host))
293		{
294		sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You have an illegal "
295		"character in your hostname", me.name, source_p->name);
#	Line 355 | Line 334 | register_local_user(struct Client *sourc
334		if (!match_conf_password(pass, conf))
335		{
336		++ServerStats.is_ref;
337	<	sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
338	<	me.name, source_p->name);
337	>
338	>	sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
339		exit_client(source_p, &me, "Bad Password");
340		return;
341		}
#	Line 393 | Line 372 | register_local_user(struct Client *sourc
372		}
373
374		/* valid user name check */
375	<	if (valid_username(source_p->username, 1) == 0)
375	>	if (!valid_username(source_p->username, 1))
376		{
377		char tmpstr2[IRCD_BUFSIZE];
378
#	Line 430 | Line 409 | register_local_user(struct Client *sourc
409		++Count.invisi;
410		}
411
412	<	if ((++Count.local) > Count.max_loc)
412	>	if (++Count.local > Count.max_loc)
413		{
414		Count.max_loc = Count.local;
415
#	Line 469 | Line 448 | register_local_user(struct Client *sourc
448		*              - username to register as
449		*              - host name to register as
450		*              - server name
472	–	*              - realname (gecos)
451		* output       - NONE
452		* side effects - This function is called when a remote client
453		*                is introduced by a server.
454		*/
455		void
456	<	register_remote_user(struct Client *source_p,
457	<	const char *username, const char *host, const char *server,
480	<	const char *realname)
456	>	register_remote_user(struct Client *source_p, const char *username,
457	>	const char *host, const char *server)
458		{
459		struct Client *target_p = NULL;
460
461		assert(source_p != NULL);
462		assert(source_p->username != username);
463
464	<	strlcpy(source_p->host, host, sizeof(source_p->host));
464	>	strlcpy(source_p->host, host, sizeof(source_p->host));
465		strlcpy(source_p->username, username, sizeof(source_p->username));
466
467		/*
#	Line 563 | Line 540 | static void
540		introduce_client(struct Client *source_p)
541		{
542		dlink_node *server_node = NULL;
543	<	static char ubuf[12];
543	>	char ubuf[IRCD_BUFSIZE];
544
545		if (MyClient(source_p))
546		send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
#	Line 572 | Line 549 | introduce_client(struct Client *source_p
549
550		watch_check_hash(source_p, RPL_LOGON);
551
552	<	if (*ubuf == '\0')
552	>	if (ubuf[0] == '\0')
553		{
554		ubuf[0] = '+';
555		ubuf[1] = '\0';
#	Line 645 | Line 622 | valid_hostname(const char *hostname)
622
623		assert(p != NULL);
624
625	<	if (*p == '.' || *p == ':')
625	>	if (EmptyString(p) || *p == '.' || *p == ':')
626		return 0;
627
628		for (; *p; ++p)
#	Line 761 | Line 738 | report_and_set_user_flags(struct Client
738		me.name, source_p->name);
739		}
740
741	<	/* The else here is to make sure that G line exempt users
741	>	/*
742	>	* The else here is to make sure that G line exempt users
743		* do not get noticed twice.
744		*/
745		else if (IsConfExemptGline(conf))
#	Line 784 | Line 762 | report_and_set_user_flags(struct Client
762		SetExemptLimits(source_p);
763		sendto_one(source_p,
764		":%s NOTICE %s :*** You are exempt from user limits. Congrats.",
765	<	me.name,source_p->name);
765	>	me.name, source_p->name);
766		}
767
768		if (IsConfCanFlood(conf))
#	Line 817 | Line 795 | set_user_mode(struct Client *client_p, s
795		if ((target_p = find_person(client_p, parv[1])) == NULL)
796		{
797		if (MyConnect(source_p))
798	<	sendto_one(source_p, form_str(ERR_NOSUCHCHANNEL),
821	<	me.name, source_p->name, parv[1]);
798	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHCHANNEL, parv[1]);
799		return;
800		}
801
802		if (source_p != target_p)
803		{
804	<	sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
828	<	me.name, source_p->name);
804	>	sendto_one_numeric(source_p, &me, ERR_USERSDONTMATCH);
805		return;
806		}
807
#	Line 834 | Line 810 | set_user_mode(struct Client *client_p, s
810		m = buf;
811		*m++ = '+';
812
813	<	for (i = 0; i < 128; i++)
813	>	for (i = 0; i < 128; ++i)
814		if (HasUMode(source_p, user_modes[i]))
815		*m++ = (char)i;
816		*m = '\0';
817
818	<	sendto_one(source_p, form_str(RPL_UMODEIS),
843	<	me.name, source_p->name, buf);
818	>	sendto_one_numeric(source_p, &me, RPL_UMODEIS, buf);
819		return;
820		}
821
#	Line 848 | Line 823 | set_user_mode(struct Client *client_p, s
823		setflags = source_p->umodes;
824
825		/* parse mode change string(s) */
826	<	for (p = &parv[2]; p && *p; p++)
826	>	for (p = &parv[2]; p && *p; ++p)
827		{
828	<	for (m = *p; *m; m++)
828	>	for (m = *p; *m; ++m)
829		{
830		switch (*m)
831		{
#	Line 871 | Line 846 | set_user_mode(struct Client *client_p, s
846		}
847		else
848		{
874	–	/* Only decrement the oper counts if an oper to begin with
875	–	* found by Pat Szuta, Perly , perly@xnet.com
876	–	*/
849		if (!HasUMode(source_p, UMODE_OPER))
850		break;
851
#	Line 882 | Line 854 | set_user_mode(struct Client *client_p, s
854
855		if (MyConnect(source_p))
856		{
857	<	dlink_node *dm;
857	>	dlink_node *dm = NULL;
858
859		detach_conf(source_p, CONF_OPER);
860		ClrOFlag(source_p);
#	Line 895 | Line 867 | set_user_mode(struct Client *client_p, s
867
868		break;
869
870	+	case 'S':  /* Only servers may set +S in a burst */
871	+	case 'W':  /* Only servers may set +W in a burst */
872		case 'r':  /* Only services may set +r */
873		case 'x':  /* Only services may set +x */
874		break;
#	Line 913 | Line 887 | set_user_mode(struct Client *client_p, s
887		DelUMode(source_p, flag);
888		}
889		}
890	<	else
891	<	{
918	<	if (MyConnect(source_p))
919	<	badflag = 1;
920	<	}
890	>	else if (MyConnect(source_p))
891	>	badflag = 1;
892
893		break;
894		}
#	Line 925 | Line 896 | set_user_mode(struct Client *client_p, s
896		}
897
898		if (badflag)
899	<	sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
929	<	me.name, source_p->name);
899	>	sendto_one_numeric(source_p, &me, ERR_UMODEUNKNOWNFLAG);
900
901		if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
902		!HasOFlag(source_p, OPER_FLAG_ADMIN))
#	Line 972 | Line 942 | send_umode(struct Client *client_p, stru
942		* build a string in umode_buf to represent the change in the user's
943		* mode between the new (source_p->umodes) and 'old'.
944		*/
945	<	for (i = 0; i < 128; i++)
945	>	for (i = 0; i < 128; ++i)
946		{
947		flag = user_modes[i];
948		if (!flag)
#	Line 1068 | Line 1038 | user_set_hostmask(struct Client *target_
1038		default: return;
1039		}
1040
1041	<	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
1042	<	target_p->name, target_p->username, target_p->host);
1041	>	if (ConfigFileEntry.cycle_on_host_change)
1042	>	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
1043	>	target_p->name, target_p->username, target_p->host);
1044
1045		if (IsUserHostIp(target_p))
1046		delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
#	Line 1081 | Line 1052 | user_set_hostmask(struct Client *target_
1052
1053		if (MyClient(target_p))
1054		{
1055	<	sendto_one(target_p, form_str(RPL_NEWHOSTIS), me.name,
1085	<	target_p->name, target_p->host);
1055	>	sendto_one_numeric(target_p, &me, RPL_NEWHOSTIS, target_p->host);
1056		clear_ban_cache_client(target_p);
1057		}
1058
1059	+	if (!ConfigFileEntry.cycle_on_host_change)
1060	+	return;
1061	+
1062		DLINK_FOREACH(ptr, target_p->channel.head)
1063		{
1064		char modebuf[4], nickbuf[NICKLEN * 3 + 3] = { '\0' };
#	Line 1093 | Line 1066 | user_set_hostmask(struct Client *target_
1066		int len = 0;
1067		const struct Membership *ms = ptr->data;
1068
1069	<	if (has_member_flags(ms, CHFL_CHANOP)) {
1069	>	if (has_member_flags(ms, CHFL_CHANOP))
1070	>	{
1071		*p++ = 'o';
1072		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1073		}
1074
1075	<	if (has_member_flags(ms, CHFL_HALFOP)) {
1075	>	if (has_member_flags(ms, CHFL_HALFOP))
1076	>	{
1077		*p++ = 'h';
1078		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1079		}
1080
1081	<	if (has_member_flags(ms, CHFL_VOICE)) {
1081	>	if (has_member_flags(ms, CHFL_VOICE))
1082	>	{
1083		*p++ = 'v';
1084		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1085		}
#	Line 1143 | Line 1119 | user_welcome(struct Client *source_p)
1119		#endif
1120
1121		#ifdef HAVE_LIBCRYPTO
1122	<	if (source_p->localClient->fd.ssl != NULL)
1122	>	if (HasFlag(source_p, FLAGS_SSL))
1123	>	{
1124	>	AddUMode(source_p, UMODE_SSL);
1125		sendto_one(source_p, ":%s NOTICE %s :*** Connected securely via %s",
1126		me.name, source_p->name,
1127		ssl_get_cipher(source_p->localClient->fd.ssl));
1128	+	}
1129		#endif
1130
1131	<	sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
1132	<	ServerInfo.network_name, source_p->name);
1133	<	sendto_one(source_p, form_str(RPL_YOURHOST), me.name, source_p->name,
1134	<	get_listener_name(source_p->localClient->listener), ircd_version);
1135	<	sendto_one(source_p, form_str(RPL_CREATED),
1136	<	me.name, source_p->name, built_date);
1158	<	sendto_one(source_p, form_str(RPL_MYINFO),
1159	<	me.name, source_p->name, me.name, ircd_version, umode_buffer);
1131	>	sendto_one_numeric(source_p, &me, RPL_WELCOME, ServerInfo.network_name,
1132	>	source_p->name);
1133	>	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
1134	>	get_listener_name(source_p->localClient->listener), ircd_version);
1135	>	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
1136	>	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
1137		show_isupport(source_p);
1138
1139		if (source_p->id[0] != '\0')
1140	<	sendto_one(source_p, form_str(RPL_YOURID), me.name,
1164	<	source_p->name, source_p->id);
1140	>	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
1141
1142		show_lusers(source_p);
1143		motd_signon(source_p);
#	Line 1208 | Line 1184 | check_xline(struct Client *source_p)
1184		* output       - NONE
1185		* side effects - Blindly opers up given source_p, using conf info
1186		*                all checks on passwords have already been done.
1187	<	*                This could also be used by rsa oper routines.
1187	>	*                This could also be used by rsa oper routines.
1188		*/
1189		void
1190		oper_up(struct Client *source_p)
#	Line 1242 | Line 1218 | oper_up(struct Client *source_p)
1218		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1219		get_oper_name(source_p));
1220		send_umode_out(source_p, source_p, old);
1221	<	sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
1221	>	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
1222		}
1223
1224		static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
#	Line 1260 | Line 1236 | valid_sid(const char *sid)
1236
1237		/*
1238		* init_uid()
1239	<	*
1239	>	*
1240		* inputs       - NONE
1241		* output       - NONE
1242		* side effects - new_uid is filled in with server id portion (sid)
#	Line 1278 | Line 1254 | init_uid(void)
1254		strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1255
1256		for (i = 0; i < IRC_MAXSID; ++i)
1257	<	if (new_uid[i] == '\0')
1257	>	if (new_uid[i] == '\0')
1258		new_uid[i] = 'A';
1259
1260		/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1285	–	/* Yes nenolod, I have known it was off by one ever since I wrote it
1286	–	* But *JUST* for you, though, it really doesn't look as *pretty*
1287	–	* -Dianora
1288	–	*/
1261		memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1262		}
1263
#	Line 1447 | Line 1419 | rebuild_isupport_message_line(void)
1419		int n = 0;
1420		int tokens = 0;
1421		size_t len = 0;
1422	<	size_t reserve = strlen(me.name) + HOSTLEN + strlen(form_str(RPL_ISUPPORT));
1422	>	size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1423
1424		DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1425		{

Diff Legend

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