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 3504 by michael, Sat May 10 19:51:29 2014 UTC vs.
Revision 4724 by michael, Tue Oct 7 18:44:35 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 117 | Line 116 | const unsigned int user_modes[256] =
116		0,                  /* m */
117		UMODE_NCHANGE,      /* n */
118		UMODE_OPER,         /* o */
119	<	0,                  /* p */
120	<	0,                  /* q */
119	>	UMODE_HIDECHANS,    /* p */
120	>	UMODE_HIDEIDLE,     /* q */
121		UMODE_REGISTERED,   /* r */
122		UMODE_SERVNOTICE,   /* s */
123		0,                  /* t */
#	Line 127 | Line 126 | const unsigned int user_modes[256] =
126		UMODE_WALLOP,       /* w */
127		UMODE_HIDDENHOST,   /* x */
128		UMODE_SPY,          /* y */
129	<	UMODE_OPERWALL,     /* z      0x7A */
129	>	0,                  /* z      0x7A */
130		0,0,0,0,0,          /* 0x7B - 0x7F */
131
132		/* 0x80 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x8F */
#	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 286 | Line 285 | introduce_client(struct Client *source_p
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(ptr, local_server_list.head)
301		{
302		struct Client *server = ptr->data;
303
#	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 416 | Line 413 | register_local_user(struct Client *sourc
413
414		assert(source_p == source_p->from);
415		assert(MyConnect(source_p));
416	<	assert(!source_p->localClient->registration);
416	>	assert(!source_p->connection->registration);
417
418		ClearCap(source_p, CAP_TS6);
419
420	<	if (ConfigFileEntry.ping_cookie)
420	>	if (ConfigGeneral.ping_cookie)
421		{
422	<	if (!IsPingSent(source_p) && !source_p->localClient->random_ping)
422	>	if (!IsPingSent(source_p) && !source_p->connection->random_ping)
423		{
424		do
425	<	source_p->localClient->random_ping = genrand_int32();
426	<	while (!source_p->localClient->random_ping);
425	>	source_p->connection->random_ping = genrand_int32();
426	>	while (!source_p->connection->random_ping);
427
428	<	sendto_one(source_p, "PING :%u",
432	<	source_p->localClient->random_ping);
428	>	sendto_one(source_p, "PING :%u", source_p->connection->random_ping);
429		SetPingSent(source_p);
430		return;
431		}
#	Line 438 | Line 434 | register_local_user(struct Client *sourc
434		return;
435		}
436
437	<	source_p->localClient->last_privmsg = CurrentTime;
437	>	source_p->connection->last_privmsg = CurrentTime;
438		/* Straight up the maximum rate of flooding... */
439	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
439	>	source_p->connection->allow_read = MAX_FLOOD_BURST;
440
441		if (!check_client(source_p))
442		return;
#	Line 449 | Line 445 | register_local_user(struct Client *sourc
445		{
446		sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
447		"character in your hostname");
448	<	strlcpy(source_p->host, source_p->sockhost,
453	<	sizeof(source_p->host));
448	>	strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
449		}
450
451	<	conf = source_p->localClient->confs.head->data;
451	>	conf = source_p->connection->confs.head->data;
452
453		if (!IsGotId(source_p))
454		{
#	Line 476 | Line 471 | register_local_user(struct Client *sourc
471		source_p->username[i++] = '~';
472
473		for (; *p && i < USERLEN; ++p)
474	<	if (*p != '[')
480	<	source_p->username[i++] = *p;
474	>	source_p->username[i++] = *p;
475
476		source_p->username[i] = '\0';
477		}
#	Line 485 | Line 479 | register_local_user(struct Client *sourc
479		/* Password check */
480		if (!EmptyString(conf->passwd))
481		{
482	<	const char *pass = source_p->localClient->passwd;
489	<
490	<	if (!match_conf_password(pass, conf))
482	>	if (!match_conf_password(source_p->connection->password, conf))
483		{
484		++ServerStats.is_ref;
485
#	Line 498 | Line 490 | register_local_user(struct Client *sourc
490		}
491
492		/*
493	<	* Don't free source_p->localClient->passwd here - it can be required
494	<	* by masked /stats I if there are auth{} blocks with need_password = no;
493	>	* Don't free source_p->connection->password here - it can be required
494	>	* by masked /stats I if there are auth {} blocks with need_password = no;
495		* --adx
496		*/
497
#	Line 519 | Line 511 | register_local_user(struct Client *sourc
511		* probably be just a percentage of the MAXCLIENTS...
512		*   -Taner
513		*/
514	<	if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
515	<	(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
514	>	if ((Count.local >= ConfigServerInfo.max_clients + MAX_BUFFER) ||
515	>	(Count.local >= ConfigServerInfo.max_clients && !IsExemptLimits(source_p)))
516		{
517		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
518		"Too many clients, rejecting %s[%s].",
#	Line 555 | Line 547 | register_local_user(struct Client *sourc
547		sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
548		"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
549		source_p->name, source_p->username, source_p->host,
550	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
550	>	ConfigGeneral.hide_spoof_ips && IsIPSpoof(source_p) ?
551		"255.255.255.255" : source_p->sockhost,
552	<	get_client_class(&source_p->localClient->confs),
552	>	get_client_class(&source_p->connection->confs),
553		source_p->info, source_p->id);
554
555	<	if (ConfigFileEntry.invisible_on_connect)
555	>	if (ConfigGeneral.invisible_on_connect)
556		{
557		AddUMode(source_p, UMODE_INVISIBLE);
558		++Count.invisi;
#	Line 572 | Line 564 | register_local_user(struct Client *sourc
564
565		if (!(Count.max_loc % 10))
566		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
567	<	"New Max Local Clients: %d",
567	>	"New maximum local client connections: %u",
568		Count.max_loc);
569		}
570
#	Line 583 | Line 575 | register_local_user(struct Client *sourc
575		assert(source_p->servptr == &me);
576		SetClient(source_p);
577		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
578	<
587	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
578	>	dlinkAdd(source_p, &source_p->node, &global_client_list);
579
580		assert(dlinkFind(&unknown_list, source_p));
581
582	<	dlink_move_node(&source_p->localClient->lclient_node,
582	>	dlink_move_node(&source_p->connection->lclient_node,
583		&unknown_list, &local_client_list);
584
585		user_welcome(source_p);
#	Line 609 | Line 600 | register_local_user(struct Client *sourc
600		*                is introduced by a server.
601		*/
602		void
603	<	register_remote_user(struct Client *source_p, const char *username,
613	<	const char *host, const char *server)
603	>	register_remote_user(struct Client *source_p)
604		{
605	<	struct Client *target_p = NULL;
616	<
617	<	assert(source_p->username != username);
618	<
619	<	strlcpy(source_p->host, host, sizeof(source_p->host));
620	<	strlcpy(source_p->username, username, sizeof(source_p->username));
621	<
622	<	/*
623	<	* Coming from another server, take the servers word for it
624	<	*/
625	<	source_p->servptr = hash_find_server(server);
626	<
627	<	/*
628	<	* Super GhostDetect:
629	<	* If we can't find the server the user is supposed to be on,
630	<	* then simply blow the user away.        -Taner
631	<	*/
632	<	if (source_p->servptr == NULL)
633	<	{
634	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
635	<	"No server %s for user %s[%s@%s] from %s",
636	<	server, source_p->name, source_p->username,
637	<	source_p->host, source_p->from->name);
638	<	sendto_one(source_p->from,
639	<	":%s KILL %s :%s (Ghosted, server %s doesn't exist)",
640	<	me.id, source_p->id, me.name, server);
641	<
642	<	AddFlag(source_p, FLAGS_KILLED);
643	<	exit_client(source_p, "Ghosted Client");
644	<	return;
645	<	}
605	>	const struct Client *target_p = NULL;
606
607		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
608		{
#	Line 673 | Line 633 | register_remote_user(struct Client *sour
633
634		SetClient(source_p);
635		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
636	+	dlinkAdd(source_p, &source_p->node, &global_client_list);
637		add_user_host(source_p->username, source_p->host, 1);
638		SetUserHost(source_p);
639
#	Line 726 | Line 687 | valid_hostname(const char *hostname)
687		int
688		valid_username(const char *username, const int local)
689		{
690	<	int dots      = 0;
690	>	unsigned int dots = 0;
691		const char *p = username;
692
693		assert(p);
#	Line 746 | Line 707 | valid_username(const char *username, con
707		{
708		while (*++p)
709		{
710	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
710	>	if (*p == '.' && ConfigGeneral.dots_in_ident)
711		{
712	<	if (++dots > ConfigFileEntry.dots_in_ident)
712	>	if (++dots > ConfigGeneral.dots_in_ident)
713		return 0;
714		if (!IsUserChar(*(p + 1)))
715		return 0;
#	Line 764 | Line 725 | valid_username(const char *username, con
725		return 0;
726		}
727
728	<	return  p - username <= USERLEN;;
728	>	return p - username <= USERLEN;
729		}
730
731		/* clean_nick_name()
#	Line 784 | Line 745 | valid_nickname(const char *nickname, con
745		/*
746		* Nicks can't start with a digit or - or be 0 length.
747		*/
748	<	if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
748	>	if (EmptyString(p) || *p == '-' || (IsDigit(*p) && local))
749		return 0;
750
751		for (; *p; ++p)
#	Line 807 | Line 768 | valid_nickname(const char *nickname, con
768		*/
769		void
770		send_umode(struct Client *client_p, struct Client *source_p,
771	<	unsigned int old, unsigned int sendmask, char *umode_buf)
771	>	unsigned int old, char *umode_buf)
772		{
773		char *m = umode_buf;
774		int what = 0;
#	Line 823 | Line 784 | send_umode(struct Client *client_p, stru
784		if (!flag)
785		continue;
786
826	–	if (MyClient(source_p) && !(flag & sendmask))
827	–	continue;
828	–
787		if ((flag & old) && !HasUMode(source_p, flag))
788		{
789		if (what == MODE_DEL)
#	Line 854 | Line 812 | send_umode(struct Client *client_p, stru
812
813		if (*umode_buf && client_p)
814		sendto_one(client_p, ":%s!%s@%s MODE %s :%s",
815	<	source_p->name, source_p->username,
816	<	source_p->host, source_p->name, umode_buf);
815	>	client_p->name, client_p->username,
816	>	client_p->host, client_p->name, umode_buf);
817		}
818
819		/* send_umode_out()
#	Line 865 | Line 823 | send_umode(struct Client *client_p, stru
823		* side effects - Only send ubuf out to servers that know about this client
824		*/
825		void
826	<	send_umode_out(struct Client *client_p, struct Client *source_p,
869	<	unsigned int old)
826	>	send_umode_out(struct Client *source_p, unsigned int old)
827		{
828		char buf[IRCD_BUFSIZE] = "";
829
830	<	send_umode(NULL, source_p, old, SEND_UMODES, buf);
830	>	send_umode(MyClient(source_p) ? source_p : NULL, source_p, old, buf);
831
832		if (buf[0])
833		sendto_server(source_p, NOCAPS, NOCAPS, ":%s MODE %s :%s",
834		source_p->id, source_p->id, buf);
878	–
879	–	if (client_p && MyClient(client_p))
880	–	send_umode(client_p, source_p, old, 0xffffffff, buf);
835		}
836
837		void
#	Line 903 | Line 857 | user_set_hostmask(struct Client *target_
857		default: return;
858		}
859
860	<	if (ConfigFileEntry.cycle_on_host_change)
860	>	if (ConfigGeneral.cycle_on_host_change)
861		sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
862		target_p->name, target_p->username, target_p->host);
863
#	Line 917 | Line 871 | user_set_hostmask(struct Client *target_
871
872		if (MyClient(target_p))
873		{
874	<	sendto_one_numeric(target_p, &me, RPL_NEWHOSTIS, target_p->host);
874	>	sendto_one_numeric(target_p, &me, RPL_VISIBLEHOST, target_p->host);
875		clear_ban_cache_client(target_p);
876		}
877
878	<	if (!ConfigFileEntry.cycle_on_host_change)
878	>	if (!ConfigGeneral.cycle_on_host_change)
879		return;
880
881		DLINK_FOREACH(ptr, target_p->channel.head)
#	Line 953 | Line 907 | user_set_hostmask(struct Client *target_
907
908		sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
909		target_p->name, target_p->username, target_p->host,
910	<	ms->chptr->chname);
910	>	ms->chptr->name);
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,
913	>	target_p->servptr->name, ms->chptr->name,
914		modebuf, nickbuf);
915
916		}
#	Line 976 | 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 *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 1003 | 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, NOCAPS, NOCAPS, ":%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 1034 | 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 1054 | Line 1010 | init_uid(void)
1010		*                note this is a recursive function
1011		*/
1012		static void
1013	<	add_one_to_uid(int i)
1013	>	add_one_to_uid(unsigned int i)
1014		{
1015		if (i != IRC_MAXSID)  /* Not reached server SID portion yet? */
1016		{
#	Line 1063 | Line 1019 | add_one_to_uid(int i)
1019		else if (new_uid[i] == '9')
1020		{
1021		new_uid[i] = 'A';
1022	<	add_one_to_uid(i-1);
1022	>	add_one_to_uid(i - 1);
1023		}
1024		else
1025		++new_uid[i];
#	Line 1103 | 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);
1110	–	#ifdef HALFOPS
1066		add_isupport("PREFIX", "(ohv)@%+", -1);
1067		add_isupport("STATUSMSG", "@%+", -1);
1113	–	#else
1114	–	add_isupport("PREFIX", "(ov)@+", -1);
1115	–	add_isupport("STATUSMSG", "@+", -1);
1116	–	#endif
1068		add_isupport("EXCEPTS", "e", -1);
1069		add_isupport("INVEX", "I", -1);
1070		}
#	Line 1131 | Line 1082 | void
1082		add_isupport(const char *name, const char *options, int n)
1083		{
1084		dlink_node *ptr;
1085	<	struct Isupport *support;
1085	>	struct Isupport *support = NULL;
1086
1087		DLINK_FOREACH(ptr, support_list.head)
1088		{

Diff Legend

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