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 4972 by michael, Mon Dec 1 16:28:11 2014 UTC vs.
Revision 5784 by michael, Sun Apr 5 15:17:11 2015 UTC

#	Line 1 | Line 1
1		/*
2		*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (c) 1997-2014 ircd-hybrid development team
4	>	*  Copyright (c) 1997-2015 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 19 | Line 19
19		*  USA
20		*/
21
22	<	/*! \file s_user.c
22	>	/*! \file user.c
23		* \brief User related functions.
24		* \version $Id$
25		*/
#	Line 65 | Line 65 | struct Isupport
65		static dlink_list support_list;
66		static dlink_list support_list_lines;
67
68	<	/* memory is cheap. map 0-255 to equivalent mode */
69	<	const unsigned int user_modes[256] =
68	>	const struct user_modes *umode_map[256];
69	>	const struct user_modes  umode_tab[] =
70		{
71	<	/* 0x00 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x0F */
72	<	/* 0x10 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x1F */
73	<	/* 0x20 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x2F */
74	<	/* 0x30 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x3F */
75	<	0,                  /* @ */
76	<	0,                  /* A */
77	<	0,                  /* B */
78	<	0,                  /* C */
79	<	UMODE_DEAF,         /* D */
80	<	0,                  /* E */
81	<	UMODE_FARCONNECT,   /* F */
82	<	UMODE_SOFTCALLERID, /* G */
83	<	UMODE_HIDDEN,       /* H */
84	<	0,                  /* I */
85	<	0,                  /* J */
86	<	0,                  /* K */
87	<	0,                  /* L */
88	<	0,                  /* M */
89	<	0,                  /* N */
90	<	0,                  /* O */
91	<	0,                  /* P */
92	<	0,                  /* Q */
93	<	UMODE_REGONLY,      /* R */
94	<	UMODE_SSL,          /* S */
95	<	0,                  /* T */
96	<	0,                  /* U */
97	<	0,                  /* V */
98	<	UMODE_WEBIRC,       /* W */
99	<	0,                  /* X */
100	<	0,                  /* Y */
101	<	0,                  /* Z 0x5A */
102	<	0, 0, 0, 0, 0,      /* 0x5F   */
103	<	0,                  /* 0x60   */
104	<	UMODE_ADMIN,        /* a */
105	<	UMODE_BOTS,         /* b */
106	<	UMODE_CCONN,        /* c */
107	<	UMODE_DEBUG,        /* d */
108	<	UMODE_EXTERNAL,     /* e */
109	<	UMODE_FULL,         /* f */
110	<	UMODE_CALLERID,     /* g */
111	<	0,                  /* h */
112	<	UMODE_INVISIBLE,    /* i */
113	<	UMODE_REJ,          /* j */
114	<	UMODE_SKILL,        /* k */
115	<	UMODE_LOCOPS,       /* l */
116	<	0,                  /* m */
117	<	UMODE_NCHANGE,      /* n */
118	<	UMODE_OPER,         /* o */
119	<	UMODE_HIDECHANS,    /* p */
120	<	UMODE_HIDEIDLE,     /* q */
121	<	UMODE_REGISTERED,   /* r */
122	<	UMODE_SERVNOTICE,   /* s */
123	<	0,                  /* t */
124	<	UMODE_UNAUTH,       /* u */
125	<	0,                  /* v */
126	<	UMODE_WALLOP,       /* w */
127	<	UMODE_HIDDENHOST,   /* x */
128	<	UMODE_SPY,          /* y */
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 */
133	<	/* 0x90 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x9F */
134	<	/* 0xA0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xAF */
135	<	/* 0xB0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xBF */
136	<	/* 0xC0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xCF */
137	<	/* 0xD0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xDF */
138	<	/* 0xE0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xEF */
139	<	/* 0xF0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0  /* 0xFF */
71	>	{ 'D', UMODE_DEAF         },
72	>	{ 'F', UMODE_FARCONNECT   },
73	>	{ 'G', UMODE_SOFTCALLERID },
74	>	{ 'H', UMODE_HIDDEN       },
75	>	{ 'R', UMODE_REGONLY      },
76	>	{ 'S', UMODE_SSL          },
77	>	{ 'W', UMODE_WEBIRC       },
78	>	{ 'a', UMODE_ADMIN        },
79	>	{ 'b', UMODE_BOTS         },
80	>	{ 'c', UMODE_CCONN        },
81	>	{ 'd', UMODE_DEBUG        },
82	>	{ 'e', UMODE_EXTERNAL     },
83	>	{ 'f', UMODE_FULL         },
84	>	{ 'g', UMODE_CALLERID     },
85	>	{ 'i', UMODE_INVISIBLE    },
86	>	{ 'j', UMODE_REJ          },
87	>	{ 'k', UMODE_SKILL        },
88	>	{ 'l', UMODE_LOCOPS       },
89	>	{ 'n', UMODE_NCHANGE      },
90	>	{ 'o', UMODE_OPER         },
91	>	{ 'p', UMODE_HIDECHANS    },
92	>	{ 'q', UMODE_HIDEIDLE     },
93	>	{ 'r', UMODE_REGISTERED   },
94	>	{ 's', UMODE_SERVNOTICE   },
95	>	{ 'u', UMODE_UNAUTH       },
96	>	{ 'w', UMODE_WALLOP       },
97	>	{ 'x', UMODE_HIDDENHOST   },
98	>	{ 'y', UMODE_SPY          },
99	>	{ '\0', 0 }
100		};
101
102		void
103	<	assemble_umode_buffer(void)
103	>	user_usermodes_init(void)
104		{
145	–	unsigned int idx = 0;
105		char *umode_buffer_ptr = umode_buffer;
106
107	<	for (; idx < (sizeof(user_modes) / sizeof(user_modes[0])); ++idx)
108	<	if (user_modes[idx])
109	<	*umode_buffer_ptr++ = idx;
107	>	for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
108	>	{
109	>	umode_map[tab->c] = tab;
110	>	*umode_buffer_ptr++ = tab->c;
111	>	}
112
113		*umode_buffer_ptr = '\0';
114		}
#	Line 305 | Line 266 | introduce_client(struct Client *source_p
266		continue;
267
268		if (IsCapable(server, CAP_SVS))
269	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
269	>	sendto_one(server, ":%s UID %s %u %lu %s %s %s %s %s %s :%s",
270		source_p->servptr->id,
271		source_p->name, source_p->hopcount+1,
272		(unsigned long)source_p->tsinfo,
#	Line 314 | Line 275 | introduce_client(struct Client *source_p
275		source_p->account,
276		source_p->info);
277		else
278	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
278	>	sendto_one(server, ":%s UID %s %u %lu %s %s %s %s %s :%s",
279		source_p->servptr->id,
280		source_p->name, source_p->hopcount+1,
281		(unsigned long)source_p->tsinfo,
#	Line 404 | Line 365 | register_local_user(struct Client *sourc
365
366		assert(source_p == source_p->from);
367		assert(MyConnect(source_p));
368	+	assert(IsUnknown(source_p));
369		assert(!source_p->connection->registration);
370
409	–	ClearCap(source_p, CAP_TS6);
410	–
371		if (ConfigGeneral.ping_cookie)
372		{
373		if (!IsPingSent(source_p) && !source_p->connection->random_ping)
#	Line 502 | Line 462 | register_local_user(struct Client *sourc
462		* probably be just a percentage of the MAXCLIENTS...
463		*   -Taner
464		*/
465	<	if ((Count.local >= ConfigServerInfo.max_clients + MAX_BUFFER) ||
466	<	(Count.local >= ConfigServerInfo.max_clients && !IsExemptLimits(source_p)))
465	>	if ((Count.local >= GlobalSetOptions.maxclients + MAX_BUFFER) ||
466	>	(Count.local >= GlobalSetOptions.maxclients && !IsExemptLimits(source_p)))
467		{
468		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
469		"Too many clients, rejecting %s[%s].",
#	Line 629 | Line 589 | register_remote_user(struct Client *sour
589
590		if (HasFlag(source_p->servptr, FLAGS_EOB))
591		sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
592	<	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
592	>	"Client connecting at %s: %s (%s@%s) [%s] [%s] <%s>",
593		source_p->servptr->name,
594		source_p->name, source_p->username, source_p->host,
595	<	source_p->info, source_p->id);
595	>	source_p->sockhost, source_p->info, source_p->id);
596
597		introduce_client(source_p);
598		}
#	Line 730 | Line 690 | valid_nickname(const char *nickname, con
690		{
691		const char *p = nickname;
692
693	<	assert(nickname && *nickname);
693	>	assert(p);
694
695		/*
696		* Nicks can't start with a digit or - or be 0 length.
#	Line 767 | Line 727 | send_umode(struct Client *client_p, stru
727		* Build a string in umode_buf to represent the change in the user's
728		* mode between the new (source_p->umodes) and 'old'.
729		*/
730	<	for (unsigned int i = 0; i < 128; ++i)
730	>	for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
731		{
732	<	unsigned int flag = user_modes[i];
773	<
774	<	if (!flag)
775	<	continue;
776	<
777	<	if ((flag & old) && !HasUMode(source_p, flag))
732	>	if ((tab->flag & old) && !HasUMode(source_p, tab->flag))
733		{
734		if (what == MODE_DEL)
735	<	*m++ = (char)i;
735	>	*m++ = tab->c;
736		else
737		{
738		what = MODE_DEL;
739		*m++ = '-';
740	<	*m++ = (char)i;
740	>	*m++ = tab->c;
741		}
742		}
743	<	else if (!(flag & old) && HasUMode(source_p, flag))
743	>	else if (!(tab->flag & old) && HasUMode(source_p, tab->flag))
744		{
745		if (what == MODE_ADD)
746	<	*m++ = (char)i;
746	>	*m++ = tab->c;
747		else
748		{
749		what = MODE_ADD;
750		*m++ = '+';
751	<	*m++ = (char)i;
751	>	*m++ = tab->c;
752		}
753		}
754		}
#	Line 948 | Line 903 | oper_up(struct Client *source_p)
903		if (HasOFlag(source_p, OPER_FLAG_ADMIN))
904		AddUMode(source_p, UMODE_ADMIN);
905
906	+	if (!EmptyString(conf->whois))
907	+	{
908	+	client_attach_svstag(source_p, RPL_WHOISOPERATOR, "+", conf->whois);
909	+	sendto_server(source_p, 0, 0, ":%s SVSTAG %s %lu %u + :%s",
910	+	me.id, source_p->id, (unsigned long)source_p->tsinfo,
911	+	RPL_WHOISOPERATOR, conf->whois);
912	+	}
913	+
914		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
915		get_oper_name(source_p));
916		sendto_server(NULL, 0, 0, ":%s GLOBOPS :%s is now an operator",
#	Line 975 | Line 938 | valid_sid(const char *sid)
938		* inputs       - NONE
939		* output       - NONE
940		* side effects - new_uid is filled in with server id portion (sid)
941	<	*                (first 3 bytes) or defaulted to 'A'.
942	<	*                Rest is filled in with 'A'
941	>	*                (first 3 bytes). Rest is filled in with '9'.
942	>	*
943	>	* NOTE: this function assumes that 'ConfigServerInfo.sid' has been set to a proper value
944		*/
945		void
946		init_uid(void)
947		{
948	<	memset(new_uid, 0, sizeof(new_uid));
985	<
986	<	if (!EmptyString(ConfigServerInfo.sid))
987	<	strlcpy(new_uid, ConfigServerInfo.sid, sizeof(new_uid));
988	<
989	<	for (unsigned int i = 0; i < IRC_MAXSID; ++i)
990	<	if (new_uid[i] == '\0')
991	<	new_uid[i] = 'A';
992	<
993	<	/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
994	<	memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
948	>	snprintf(new_uid, sizeof(new_uid), "%s999999", ConfigServerInfo.sid);
949		}
950
951		/*
#	Line 1005 | Line 959 | init_uid(void)
959		static void
960		add_one_to_uid(unsigned int i)
961		{
962	<	if (i != IRC_MAXSID)  /* Not reached server SID portion yet? */
962	>	if (i < IRC_MAXSID)
963	>	return;
964	>
965	>	if (new_uid[i] == 'Z')
966	>	new_uid[i] = '0';
967	>	else if (new_uid[i] == '9')
968		{
969	<	if (new_uid[i] == 'Z')
970	<	new_uid[i] = '0';
1012	<	else if (new_uid[i] == '9')
1013	<	{
1014	<	new_uid[i] = 'A';
1015	<	add_one_to_uid(i - 1);
1016	<	}
1017	<	else
1018	<	++new_uid[i];
969	>	new_uid[i] = 'A';
970	>	add_one_to_uid(i - 1);
971		}
972		else
973	<	{
1022	<	/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1023	<	if (new_uid[i] == 'Z')
1024	<	memcpy(new_uid + IRC_MAXSID, "AAAAAA", IRC_MAXUID);
1025	<	else
1026	<	++new_uid[i];
1027	<	}
973	>	++new_uid[i];
974		}
975
976		/*

Diff Legend

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