ViewVC Help

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

root/svn/ircd-hybrid/trunk/src/s_user.c

Comparing:
ircd-hybrid-7.2/src/s_user.c (file contents), Revision 1011 by michael, Fri Sep 18 10:14:09 2009 UTC vs.
ircd-hybrid-8/src/s_user.c (file contents), Revision 1175 by michael, Sun Aug 14 10:47:48 2011 UTC

#	Line 54 | Line 54
54		#include "msg.h"
55		#include "watch.h"
56
57	<	int MaxClientCount     = 1;
58	<	int MaxConnectionCount = 1;
57	>
58		struct Callback *entering_umode_cb = NULL;
59		struct Callback *umode_cb = NULL;
61	–	struct Callback *uid_get_cb = NULL;
60
61		static char umode_buffer[IRCD_BUFSIZE];
62
63		static void user_welcome(struct Client *);
64		static void report_and_set_user_flags(struct Client *, const struct AccessItem *);
65		static int check_xline(struct Client *);
66	<	static void introduce_client(struct Client *, struct Client *);
67	<	static void *uid_get(va_list);
66	>	static void introduce_client(struct Client *);
67	>	static const char *uid_get(void);
68
69		/* Used for building up the isupport string,
70		* used with init_isupport, add_isupport, delete_isupport
#	Line 108 | Line 106 | unsigned int user_modes[256] =
106		0,                  /* O */
107		0,                  /* P */
108		0,                  /* Q */
109	<	0,                  /* R */
109	>	UMODE_REGONLY,      /* R */
110		0,                  /* S */
111		0,                  /* T */
112		0,                  /* U */
#	Line 128 | Line 126 | unsigned int user_modes[256] =
126		UMODE_CALLERID,     /* g */
127		0,                  /* h */
128		UMODE_INVISIBLE,    /* i */
129	<	0,                  /* j */
129	>	UMODE_REJ,          /* j */
130		UMODE_SKILL,        /* k */
131		UMODE_LOCOPS,       /* l */
132		0,                  /* m */
#	Line 136 | Line 134 | unsigned int user_modes[256] =
134		UMODE_OPER,         /* o */
135		0,                  /* p */
136		0,                  /* q */
137	<	UMODE_REJ,          /* r */
137	>	UMODE_REGISTERED,   /* r */
138		UMODE_SERVNOTICE,   /* s */
139		0,                  /* t */
140		UMODE_UNAUTH,       /* u */
#	Line 163 | Line 161 | assemble_umode_buffer(void)
161		unsigned int idx = 0;
162		char *umode_buffer_ptr = umode_buffer;
163
164	<	for (; idx < (sizeof(user_modes) / sizeof(int)); ++idx)
164	>	for (; idx < (sizeof(user_modes) / sizeof(user_modes[0])); ++idx)
165		if (user_modes[idx])
166		*umode_buffer_ptr++ = idx;
167
#	Line 235 | Line 233 | show_lusers(struct Client *source_p)
233
234		if (!ConfigServerHide.hide_servers || IsOper(source_p))
235		sendto_one(source_p, form_str(RPL_STATSCONN), from, to,
236	<	MaxConnectionCount, MaxClientCount, Count.totalrestartcount);
236	>	Count.max_loc_con, Count.max_loc_cli, Count.totalrestartcount);
237
238	<	if (Count.local > MaxClientCount)
239	<	MaxClientCount = Count.local;
238	>	if (Count.local > Count.max_loc_cli)
239	>	Count.max_loc_cli = Count.local;
240
241	<	if ((Count.local + Count.myserver) > MaxConnectionCount)
242	<	MaxConnectionCount = Count.local + Count.myserver;
241	>	if ((Count.local + Count.myserver) > Count.max_loc_con)
242	>	Count.max_loc_con = Count.local + Count.myserver;
243		}
244
245		/* show_isupport()
#	Line 280 | Line 278 | show_isupport(struct Client *source_p)
278		**         nick from local user or kill him/her...
279		*/
280		void
281	<	register_local_user(struct Client *client_p, struct Client *source_p,
284	<	const char *nick, const char *username)
281	>	register_local_user(struct Client *source_p)
282		{
283	+	const char *id = NULL;
284		const struct AccessItem *aconf = NULL;
285		dlink_node *ptr = NULL;
288	–	dlink_node *m = NULL;
286
287		assert(source_p != NULL);
288	+	assert(source_p == source_p->from);
289		assert(MyConnect(source_p));
292	–	assert(source_p->username != username);
290		assert(!source_p->localClient->registration);
291
292	<	ClearCap(client_p, CAP_TS6);
292	>	ClearCap(source_p, CAP_TS6);
293
294		if (ConfigFileEntry.ping_cookie)
295		{
296	<	if (!IsPingSent(source_p) &&
300	<	source_p->localClient->random_ping == 0)
296	>	if (!IsPingSent(source_p) && source_p->localClient->random_ping == 0)
297		{
298		do
299		source_p->localClient->random_ping = genrand_int32();
#	Line 317 | Line 313 | register_local_user(struct Client *clien
313		/* Straight up the maximum rate of flooding... */
314		source_p->localClient->allow_read = MAX_FLOOD_BURST;
315
316	<	if (!execute_callback(client_check_cb, source_p, username))
316	>	if (!execute_callback(client_check_cb, source_p, source_p->username))
317		return;
318
319		if (valid_hostname(source_p->host) == 0)
#	Line 333 | Line 329 | register_local_user(struct Client *clien
329
330		if (!IsGotId(source_p))
331		{
332	<	const char *p = NULL;
332	>	char username[USERLEN + 1];
333	>	const char *p = username;
334		unsigned int i = 0;
335
336		if (IsNeedIdentd(aconf))
#	Line 345 | Line 342 | register_local_user(struct Client *clien
342		return;
343		}
344
345	<	p = username;
345	>	strlcpy(username, source_p->username, sizeof(username));
346
347		if (!IsNoTilde(aconf))
348		source_p->username[i++] = '~';
349
350	<	while (*p && i < USERLEN)
354	<	{
350	>	for (; *p && i < USERLEN; ++p)
351		if (*p != '[')
352		source_p->username[i++] = *p;
357	–	p++;
358	–	}
353
354		source_p->username[i] = '\0';
355		}
#	Line 383 | Line 377 | register_local_user(struct Client *clien
377		/* report if user has &^>= etc. and set flags as needed in source_p */
378		report_and_set_user_flags(source_p, aconf);
379
380	<	if (IsDead(client_p))
380	>	if (IsDead(source_p))
381		return;
382
383		/* Limit clients -
#	Line 399 | Line 393 | register_local_user(struct Client *clien
393		{
394		sendto_realops_flags(UMODE_FULL, L_ALL,
395		"Too many clients, rejecting %s[%s].",
396	<	nick, source_p->host);
396	>	source_p->name, source_p->host);
397		++ServerStats.is_ref;
398		exit_client(source_p, &me, "Sorry, server is full - try later");
399		return;
#	Line 411 | Line 405 | register_local_user(struct Client *clien
405		char tmpstr2[IRCD_BUFSIZE];
406
407		sendto_realops_flags(UMODE_REJ, L_ALL, "Invalid username: %s (%s@%s)",
408	<	nick, source_p->username, source_p->host);
408	>	source_p->name, source_p->username, source_p->host);
409		++ServerStats.is_ref;
410	<	ircsprintf(tmpstr2, "Invalid username [%s]", source_p->username);
410	>	snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
411	>	source_p->username);
412		exit_client(source_p, &me, tmpstr2);
413		return;
414		}
415
421	–	assert(source_p == client_p);
422	–
416		if (check_xline(source_p))
417		return;
418
419	<	if (me.id[0])
420	<	{
428	<	const char *id = execute_callback(uid_get_cb, source_p);
429	<
430	<	while (hash_find_id(id) != NULL)
431	<	id = uid_get(NULL);
419	>	while (hash_find_id((id = uid_get())) != NULL)
420	>	;
421
422	<	strlcpy(source_p->id, id, sizeof(source_p->id));
423	<	hash_add_id(source_p);
435	<	}
422	>	strlcpy(source_p->id, id, sizeof(source_p->id));
423	>	hash_add_id(source_p);
424
425		sendto_realops_flags(UMODE_CCONN, L_ALL,
426	<	"Client connecting: %s (%s@%s) [%s] {%s} [%s]",
427	<	nick, source_p->username, source_p->host,
426	>	"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
427	>	source_p->name, source_p->username, source_p->host,
428		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
429		"255.255.255.255" : source_p->sockhost,
430		get_client_class(source_p),
431	<	source_p->info);
431	>	source_p->info, source_p->id);
432
433		sendto_realops_flags(UMODE_CCONN_FULL, L_ALL,
434		"CLICONN %s %s %s %s %s %s %s 0 %s",
435	<	nick, source_p->username, source_p->host,
435	>	source_p->name, source_p->username, source_p->host,
436		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
437		"255.255.255.255" : source_p->sockhost,
438		get_client_class(source_p),
439		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
440	<	"<hidden>" : source_p->client_host,
440	>	"<hidden>" : source_p->localClient->client_host,
441		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
442	<	"<hidden>" : source_p->client_server,
442	>	"<hidden>" : source_p->localClient->client_server,
443		source_p->info);
444
445
#	Line 470 | Line 458 | register_local_user(struct Client *clien
458		Count.max_loc);
459		}
460
473	–	SetClient(source_p);
474	–
475	–	source_p->servptr = &me;
476	–	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
477	–
461		/* Increment our total user count here */
462		if (++Count.total > Count.max_tot)
463		Count.max_tot = Count.total;
464		++Count.totalrestartcount;
465
466	+	assert(source_p->servptr == &me);
467	+	SetClient(source_p);
468	+	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
469	+
470		source_p->localClient->allow_read = MAX_FLOOD_BURST;
471
472	<	if ((m = dlinkFindDelete(&unknown_list, source_p)) != NULL)
473	<	{
474	<	free_dlink_node(m);
475	<	dlinkAdd(source_p, &source_p->localClient->lclient_node, &local_client_list);
489	<	}
490	<	else assert(0);
472	>	assert(dlinkFind(&unknown_list, source_p));
473	>
474	>	dlink_move_node(&source_p->localClient->lclient_node,
475	>	&unknown_list, &local_client_list);
476
477		user_welcome(source_p);
478		add_user_host(source_p->username, source_p->host, 0);
479		SetUserHost(source_p);
480
481	<	introduce_client(client_p, source_p);
481	>	introduce_client(source_p);
482		}
483
484		/* register_remote_user()
485		*
486	<	* inputs       - client_p directly connected client
502	<	*              - source_p remote or directly connected client
486	>	* inputs       - source_p remote or directly connected client
487		*              - username to register as
488		*              - host name to register as
489		*              - server name
#	Line 509 | Line 493 | register_local_user(struct Client *clien
493		*                is introduced by a server.
494		*/
495		void
496	<	register_remote_user(struct Client *client_p, struct Client *source_p,
496	>	register_remote_user(struct Client *source_p,
497		const char *username, const char *host, const char *server,
498		const char *realname)
499		{
#	Line 524 | Line 508 | register_remote_user(struct Client *clie
508		/*
509		* coming from another server, take the servers word for it
510		*/
511	<	source_p->servptr = find_server(server);
511	>	source_p->servptr = hash_find_server(server);
512
513		/* Super GhostDetect:
514		* If we can't find the server the user is supposed to be on,
#	Line 536 | Line 520 | register_remote_user(struct Client *clie
520		"No server %s for user %s[%s@%s] from %s",
521		server, source_p->name, source_p->username,
522		source_p->host, source_p->from->name);
523	<	kill_client(client_p, source_p, "%s (Server doesn't exist)", me.name);
523	>	kill_client(source_p->from, source_p, "%s (Server doesn't exist)", me.name);
524
525		SetKilled(source_p);
526		exit_client(source_p, &me, "Ghosted Client");
#	Line 547 | Line 531 | register_remote_user(struct Client *clie
531		{
532		sendto_realops_flags(UMODE_DEBUG, L_ALL,
533		"Bad User [%s] :%s USER %s@%s %s, != %s[%s]",
534	<	client_p->name, source_p->name, source_p->username,
534	>	source_p->from->name, source_p->name, source_p->username,
535		source_p->host, source_p->servptr->name,
536		target_p->name, target_p->from->name);
537	<	kill_client(client_p, source_p,
537	>	kill_client(source_p->from, source_p,
538		"%s (NICK from wrong direction (%s != %s))",
539		me.name, source_p->servptr->name, target_p->from->name);
540		SetKilled(source_p);
#	Line 558 | Line 542 | register_remote_user(struct Client *clie
542		return;
543		}
544
545	+	/*
546	+	* If the nick has been introduced by a services server,
547	+	* make it a service as well.
548	+	*/
549	+	if (IsService(source_p->servptr))
550	+	SetService(source_p);
551	+
552		/* Increment our total user count here */
553		if (++Count.total > Count.max_tot)
554		Count.max_tot = Count.total;
#	Line 567 | Line 558 | register_remote_user(struct Client *clie
558		add_user_host(source_p->username, source_p->host, 1);
559		SetUserHost(source_p);
560
561	<	introduce_client(client_p, source_p);
561	>	introduce_client(source_p);
562		}
563
564		/* introduce_client()
565		*
566	<	* inputs       - client_p
576	<	*              - source_p
566	>	* inputs       - source_p
567		* output       - NONE
568		* side effects - This common function introduces a client to the rest
569		*                of the net, either from a local client connect or
570		*                from a remote connect.
571		*/
572		static void
573	<	introduce_client(struct Client *client_p, struct Client *source_p)
573	>	introduce_client(struct Client *source_p)
574		{
575		dlink_node *server_node = NULL;
576		static char ubuf[12];
#	Line 602 | Line 592 | introduce_client(struct Client *client_p
592		{
593		struct Client *server = server_node->data;
594
595	<	if (server == client_p)
595	>	if (server == source_p->from)
596		continue;
597
598		if (IsCapable(server, CAP_TS6) && HasID(source_p))
#	Line 638 | Line 628 | valid_hostname(const char *hostname)
628
629		assert(p != NULL);
630
631	<	if ('.' == *p || ':' == *p)
631	>	if (*p == '.' || *p == ':')
632		return 0;
633
634	<	while (*p)
645	<	{
634	>	for (; *p; ++p)
635		if (!IsHostChar(*p))
636		return 0;
648	–	p++;
649	–	}
637
638		return 1;
639		}
#	Line 670 | Line 657 | valid_username(const char *username)
657
658		assert(p != NULL);
659
660	<	if ('~' == *p)
660	>	if (*p == '~')
661		++p;
662
663		/* reject usernames that don't start with an alphanum
#	Line 684 | Line 671 | valid_username(const char *username)
671		{
672		if ((*p == '.') && ConfigFileEntry.dots_in_ident)
673		{
674	<	dots++;
688	<
689	<	if (dots > ConfigFileEntry.dots_in_ident)
674	>	if (++dots > ConfigFileEntry.dots_in_ident)
675		return 0;
676	<	if (!IsUserChar(p[1]))
676	>	if (!IsUserChar(*(p + 1)))
677		return 0;
678		}
679		else if (!IsUserChar(*p))
#	Line 698 | Line 683 | valid_username(const char *username)
683		return 1;
684		}
685
686	+	/* clean_nick_name()
687	+	*
688	+	* input        - nickname
689	+	*              - whether it's a local nick (1) or remote (0)
690	+	* output       - none
691	+	* side effects - walks through the nickname, returning 0 if erroneous
692	+	*/
693	+	int
694	+	valid_nickname(const char *nickname, const int local)
695	+	{
696	+	const char *p = nickname;
697	+	assert(nickname && *nickname);
698	+
699	+	/* nicks can't start with a digit or - or be 0 length */
700	+	/* This closer duplicates behaviour of hybrid-6 */
701	+	if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
702	+	return 0;
703	+
704	+	for (; *p; ++p)
705	+	if (!IsNickChar(*p))
706	+	return 0;
707	+
708	+	return p - nickname <= (NICKLEN - 1);
709	+	}
710	+
711		/* report_and_set_user_flags()
712		*
713		* inputs       - pointer to source_p
#	Line 770 | Line 780 | report_and_set_user_flags(struct Client
780		}
781		}
782
773	–	/* do_local_user()
774	–	*
775	–	* inputs       -
776	–	* output       - NONE
777	–	* side effects -
778	–	*/
779	–	void
780	–	do_local_user(const char *nick, struct Client *client_p, struct Client *source_p,
781	–	const char *username, const char *host, const char *server,
782	–	const char *realname)
783	–	{
784	–	assert(source_p != NULL);
785	–	assert(source_p->username != username);
786	–
787	–	if (source_p == NULL)
788	–	return;
789	–
790	–	if (!IsUnknown(source_p))
791	–	{
792	–	sendto_one(source_p, form_str(ERR_ALREADYREGISTRED),
793	–	me.name, nick);
794	–	return;
795	–	}
796	–
797	–	source_p->localClient->registration &= ~REG_NEED_USER;
798	–
799	–	/*
800	–	* don't take the clients word for it, ever
801	–	*/
802	–	source_p->servptr = &me;
803	–
804	–	strlcpy(source_p->info, realname, sizeof(source_p->info));
805	–
806	–	/* stash for later */
807	–	strlcpy(source_p->client_host, host, sizeof(source_p->client_host));
808	–	strlcpy(source_p->client_server, server, sizeof(source_p->client_server));
809	–
810	–	if (!IsGotId(source_p))
811	–	{
812	–	/* save the username in the client
813	–	* If you move this you'll break ping cookies..you've been warned
814	–	*/
815	–	strlcpy(source_p->username, username, sizeof(source_p->username));
816	–	}
817	–
818	–	if (!source_p->localClient->registration)
819	–	/* NICK already received, now I have USER... */
820	–	register_local_user(client_p, source_p, source_p->name, username);
821	–	}
822	–
783		/* change_simple_umode()
784		*
785		* this callback can be hooked to allow special handling of
#	Line 879 | Line 839 | set_user_mode(struct Client *client_p, s
839		return;
840		}
841
842	<	if (source_p != target_p || target_p->from != source_p->from)
842	>	if (source_p != target_p)
843		{
844		sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
845		me.name, source_p->name);
#	Line 937 | Line 897 | set_user_mode(struct Client *client_p, s
897		break;
898
899		ClearOper(source_p);
940	–	source_p->umodes &= ~ConfigFileEntry.oper_only_umodes;
900		Count.oper--;
901
902		if (MyConnect(source_p))
#	Line 946 | Line 905 | set_user_mode(struct Client *client_p, s
905
906		detach_conf(source_p, OPER_TYPE);
907		ClearOperFlags(source_p);
908	+	source_p->umodes &= ~ConfigFileEntry.oper_only_umodes;
909
910		if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
911		free_dlink_node(dm);
#	Line 957 | Line 917 | set_user_mode(struct Client *client_p, s
917		/* we may not get these,
918		* but they shouldnt be in default
919		*/
920	+	case 'r':
921		case ' ' :
922		case '\n':
923		case '\r':
#	Line 989 | Line 950 | set_user_mode(struct Client *client_p, s
950		sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
951		me.name, source_p->name);
952
953	<	if ((source_p->umodes & UMODE_NCHANGE) && !IsOperN(source_p))
953	>	if (HasUMode(source_p, UMODE_NCHANGE) && !IsOperN(source_p))
954		{
955		sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
956		me.name, source_p->name);
957	<	source_p->umodes &= ~UMODE_NCHANGE; /* only tcm's really need this */
957	>	DelUMode(source_p, UMODE_NCHANGE); /* only tcm's really need this */
958		}
959
960		if (MyConnect(source_p) && (source_p->umodes & UMODE_ADMIN) &&
#	Line 1031 | Line 992 | void
992		send_umode(struct Client *client_p, struct Client *source_p,
993		unsigned int old, unsigned int sendmask, char *umode_buf)
994		{
995	+	char *m = umode_buf;
996		int what = 0;
997		unsigned int i;
998		unsigned int flag;
1037	–	char *m = umode_buf;
999
1000		/*
1001		* build a string in umode_buf to represent the change in the user's
#	Line 1154 | Line 1115 | user_welcome(struct Client *source_p)
1115
1116		if (ConfigFileEntry.short_motd)
1117		{
1118	<	sendto_one(source_p, "NOTICE %s :*** Notice -- motd was last changed at %s",
1119	<	source_p->name, ConfigFileEntry.motd.lastChangedDate);
1118	>	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- motd was last changed at %s",
1119	>	me.name, source_p->name, ConfigFileEntry.motd.lastChangedDate);
1120		sendto_one(source_p,
1121	<	"NOTICE %s :*** Notice -- Please read the motd if you haven't "
1122	<	"read it", source_p->name);
1121	>	":%s NOTICE %s :*** Notice -- Please read the motd if you haven't "
1122	>	"read it", me.name, source_p->name);
1123		sendto_one(source_p, form_str(RPL_MOTDSTART),
1124		me.name, source_p->name, me.name);
1125		sendto_one(source_p, form_str(RPL_MOTD),
#	Line 1259 | Line 1220 | oper_up(struct Client *source_p)
1220		SetOFlag(source_p, oconf->port);
1221
1222		if (IsOperAdmin(source_p) || IsOperHiddenAdmin(source_p))
1223	<	source_p->umodes |= UMODE_ADMIN;
1223	>	AddUMode(source_p, UMODE_ADMIN);
1224		if (!IsOperN(source_p))
1225	<	source_p->umodes &= ~UMODE_NCHANGE;
1225	>	DelUMode(source_p, UMODE_NCHANGE);
1226
1227		sendto_realops_flags(UMODE_ALL, L_ALL, "%s (%s@%s) is now an operator",
1228		source_p->name, source_p->username, source_p->host);
#	Line 1277 | Line 1238 | static char new_uid[TOTALSIDUID + 1];
1238		int
1239		valid_sid(const char *sid)
1240		{
1280	–
1241		if (strlen(sid) == IRC_MAXSID)
1242		if (IsDigit(*sid))
1243		if (IsAlNum(*(sid + 1)) && IsAlNum(*(sid + 2)))
#	Line 1302 | Line 1262 | init_uid(void)
1262
1263		memset(new_uid, 0, sizeof(new_uid));
1264
1265	<	if (ServerInfo.sid != NULL)
1306	<	{
1265	>	if (!EmptyString(ServerInfo.sid))
1266		strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1308	–	strlcpy(me.id, ServerInfo.sid, sizeof(me.id));
1309	–
1310	–	hash_add_id(&me);
1311	–	}
1267
1268	<	for (i = 0; i < IRC_MAXSID; i++)
1268	>	for (i = 0; i < IRC_MAXSID; ++i)
1269		if (new_uid[i] == '\0')
1270		new_uid[i] = 'A';
1271
#	Line 1323 | Line 1278 | init_uid(void)
1278
1279		entering_umode_cb = register_callback("entering_umode", NULL);
1280		umode_cb = register_callback("changing_umode", change_simple_umode);
1326	–	uid_get_cb = register_callback("uid_get", uid_get);
1281		}
1282
1283		/*
#	Line 1366 | Line 1320 | add_one_to_uid(int i)
1320		* output       - new UID is returned to caller
1321		* side effects - new_uid is incremented by one.
1322		*/
1323	<	static void *
1324	<	uid_get(va_list args)
1323	>	static const char *
1324	>	uid_get(void)
1325		{
1326		add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
1327		return new_uid;

Diff Legend

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