ViewVC Help

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

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

Comparing:
ircd-hybrid-7.2/src/s_user.c (file contents), Revision 889 by michael, Thu Nov 1 12:59:05 2007 UTC vs.
ircd-hybrid-8/src/s_user.c (file contents), Revision 1156 by michael, Tue Aug 9 20:29:20 2011 UTC

#	Line 23 | Line 23
23		*/
24
25		#include "stdinc.h"
26	<	#include "tools.h"
26	>	#include "list.h"
27		#include "s_user.h"
28		#include "s_misc.h"
29		#include "channel.h"
#	Line 35 | Line 35
35		#include "irc_string.h"
36		#include "sprintf_irc.h"
37		#include "s_bsd.h"
38	–	#include "irc_getnameinfo.h"
38		#include "ircd.h"
40	–	#include "list.h"
39		#include "listener.h"
40		#include "motd.h"
41		#include "numeric.h"
42		#include "s_conf.h"
43		#include "s_log.h"
44		#include "s_serv.h"
47	–	#include "s_stats.h"
45		#include "send.h"
46		#include "supported.h"
47		#include "whowas.h"
48		#include "memory.h"
49		#include "packet.h"
50	+	#include "rng_mt.h"
51		#include "userhost.h"
52		#include "hook.h"
53		#include "s_misc.h"
54		#include "msg.h"
57	–	#include "pcre.h"
55		#include "watch.h"
56
57	<	int MaxClientCount     = 1;
61	<	int MaxConnectionCount = 1;
57	>
58		struct Callback *entering_umode_cb = NULL;
59		struct Callback *umode_cb = NULL;
64	–	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 166 | 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 238 | 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 283 | 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,
287	<	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;
290	–	char ipaddr[HOSTIPLEN];
285		dlink_node *ptr = NULL;
292	–	dlink_node *m = NULL;
286
287		assert(source_p != NULL);
288	+	assert(source_p == source_p->from);
289		assert(MyConnect(source_p));
296	–	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) &&
304	<	source_p->localClient->random_ping == 0)
296	>	if (!IsPingSent(source_p) && source_p->localClient->random_ping == 0)
297		{
298	<	source_p->localClient->random_ping = (unsigned long)rand();
299	<	sendto_one(source_p, "PING :%lu",
298	>	do
299	>	source_p->localClient->random_ping = genrand_int32();
300	>	while (!source_p->localClient->random_ping);
301	>
302	>	sendto_one(source_p, "PING :%u",
303		source_p->localClient->random_ping);
304		SetPingSent(source_p);
305		return;
#	Line 318 | 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 334 | 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))
337		{
338	<	ServerStats->is_ref++;
338	>	++ServerStats.is_ref;
339		sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You need to install "
340		"identd to use this server", me.name, source_p->name);
341		exit_client(source_p, &me, "Install identd");
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)
355	<	{
350	>	for (; *p && i < USERLEN; ++p)
351		if (*p != '[')
352		source_p->username[i++] = *p;
358	–	p++;
359	–	}
353
354		source_p->username[i] = '\0';
355		}
#	Line 368 | Line 361 | register_local_user(struct Client *clien
361
362		if (!match_conf_password(pass, aconf))
363		{
364	<	ServerStats->is_ref++;
364	>	++ServerStats.is_ref;
365		sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
366		me.name, source_p->name);
367		exit_client(source_p, &me, "Bad Password");
#	Line 384 | 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(source_p))
381	+	return;
382	+
383		/* Limit clients -
384		* We want to be able to have servers and F-line clients
385		* connect, so save room for "buffer" connections.
#	Line 397 | 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);
397	<	ServerStats->is_ref++;
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;
400		}
#	Line 409 | 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);
409	<	ServerStats->is_ref++;
410	<	ircsprintf(tmpstr2, "Invalid username [%s]", source_p->username);
408	>	source_p->name, source_p->username, source_p->host);
409	>	++ServerStats.is_ref;
410	>	snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
411	>	source_p->username);
412		exit_client(source_p, &me, tmpstr2);
413		return;
414		}
415
419	–	assert(source_p == client_p);
420	–
416		if (check_xline(source_p))
417		return;
418
419	<	if (IsDead(client_p))
420	<	return;
426	<
427	<	if (me.id[0])
428	<	{
429	<	const char *id = execute_callback(uid_get_cb, source_p);
419	>	while (hash_find_id((id = uid_get())) != NULL)
420	>	;
421
422	<	while (hash_find_id(id) != NULL)
423	<	id = uid_get(NULL);
433	<
434	<	strlcpy(source_p->id, id, sizeof(source_p->id));
435	<	hash_add_id(source_p);
436	<	}
437	<
438	<	irc_getnameinfo((struct sockaddr *)&source_p->localClient->ip,
439	<	source_p->localClient->ip.ss_len, ipaddr,
440	<	HOSTIPLEN, NULL, 0, NI_NUMERICHOST);
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" : ipaddr, get_client_class(source_p),
430	<	source_p->info);
429	>	"255.255.255.255" : source_p->sockhost,
430	>	get_client_class(source_p),
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" : ipaddr,
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
462	–	/* If they have died in send_* don't do anything. */
463	–	if (IsDead(source_p))
464	–	return;
465	–
446		if (ConfigFileEntry.invisible_on_connect)
447		{
448		source_p->umodes |= UMODE_INVISIBLE;
449	<	Count.invisi++;
449	>	++Count.invisi;
450		}
451
452		if ((++Count.local) > Count.max_loc)
#	Line 478 | Line 458 | register_local_user(struct Client *clien
458		Count.max_loc);
459		}
460
481	–	SetClient(source_p);
482	–
483	–	source_p->servptr = &me;
484	–	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
485	–
461		/* Increment our total user count here */
462		if (++Count.total > Count.max_tot)
463		Count.max_tot = Count.total;
464	<	Count.totalrestartcount++;
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);
497	<	}
498	<	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
510	<	*              - 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 517 | 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 527 | Line 503 | register_remote_user(struct Client *clie
503		assert(source_p->username != username);
504
505		strlcpy(source_p->host, host, sizeof(source_p->host));
530	–	strlcpy(source_p->info, realname, sizeof(source_p->info));
506		strlcpy(source_p->username, username, sizeof(source_p->username));
507
508		/*
#	Line 545 | 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 556 | 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 576 | Line 551 | register_remote_user(struct Client *clie
551		add_user_host(source_p->username, source_p->host, 1);
552		SetUserHost(source_p);
553
554	<	introduce_client(client_p, source_p);
554	>	introduce_client(source_p);
555		}
556
557		/* introduce_client()
558		*
559	<	* inputs       - client_p
585	<	*              - source_p
559	>	* inputs       - source_p
560		* output       - NONE
561		* side effects - This common function introduces a client to the rest
562		*                of the net, either from a local client connect or
563		*                from a remote connect.
564		*/
565		static void
566	<	introduce_client(struct Client *client_p, struct Client *source_p)
566	>	introduce_client(struct Client *source_p)
567		{
568		dlink_node *server_node = NULL;
569		static char ubuf[12];
#	Line 611 | Line 585 | introduce_client(struct Client *client_p
585		{
586		struct Client *server = server_node->data;
587
588	<	if (server == client_p)
588	>	if (server == source_p->from)
589		continue;
590
591		if (IsCapable(server, CAP_TS6) && HasID(source_p))
#	Line 647 | Line 621 | valid_hostname(const char *hostname)
621
622		assert(p != NULL);
623
624	<	if ('.' == *p || ':' == *p)
624	>	if (*p == '.' || *p == ':')
625		return 0;
626
627	<	while (*p)
654	<	{
627	>	for (; *p; ++p)
628		if (!IsHostChar(*p))
629		return 0;
657	–	p++;
658	–	}
630
631		return 1;
632		}
#	Line 679 | Line 650 | valid_username(const char *username)
650
651		assert(p != NULL);
652
653	<	if ('~' == *p)
653	>	if (*p == '~')
654		++p;
655
656		/* reject usernames that don't start with an alphanum
#	Line 693 | Line 664 | valid_username(const char *username)
664		{
665		if ((*p == '.') && ConfigFileEntry.dots_in_ident)
666		{
667	<	dots++;
697	<
698	<	if (dots > ConfigFileEntry.dots_in_ident)
667	>	if (++dots > ConfigFileEntry.dots_in_ident)
668		return 0;
669	<	if (!IsUserChar(p[1]))
669	>	if (!IsUserChar(*(p + 1)))
670		return 0;
671		}
672		else if (!IsUserChar(*p))
#	Line 779 | Line 748 | report_and_set_user_flags(struct Client
748		}
749		}
750
782	–	/* do_local_user()
783	–	*
784	–	* inputs       -
785	–	* output       - NONE
786	–	* side effects -
787	–	*/
788	–	void
789	–	do_local_user(const char *nick, struct Client *client_p, struct Client *source_p,
790	–	const char *username, const char *host, const char *server,
791	–	const char *realname)
792	–	{
793	–	assert(source_p != NULL);
794	–	assert(source_p->username != username);
795	–
796	–	if (source_p == NULL)
797	–	return;
798	–
799	–	if (!IsUnknown(source_p))
800	–	{
801	–	sendto_one(source_p, form_str(ERR_ALREADYREGISTRED),
802	–	me.name, nick);
803	–	return;
804	–	}
805	–
806	–	source_p->localClient->registration &= ~REG_NEED_USER;
807	–
808	–	/*
809	–	* don't take the clients word for it, ever
810	–	*/
811	–	source_p->servptr = &me;
812	–
813	–	strlcpy(source_p->info, realname, sizeof(source_p->info));
814	–
815	–	/* stash for later */
816	–	strlcpy(source_p->client_host, host, sizeof(source_p->client_host));
817	–	strlcpy(source_p->client_server, server, sizeof(source_p->client_server));
818	–
819	–	if (!IsGotId(source_p))
820	–	{
821	–	/* save the username in the client
822	–	* If you move this you'll break ping cookies..you've been warned
823	–	*/
824	–	strlcpy(source_p->username, username, sizeof(source_p->username));
825	–	}
826	–
827	–	if (!source_p->localClient->registration)
828	–	/* NICK already received, now I have USER... */
829	–	register_local_user(client_p, source_p, source_p->name, username);
830	–	}
831	–
751		/* change_simple_umode()
752		*
753		* this callback can be hooked to allow special handling of
#	Line 888 | Line 807 | set_user_mode(struct Client *client_p, s
807		return;
808		}
809
810	<	if (source_p != target_p || target_p->from != source_p->from)
810	>	if (source_p != target_p)
811		{
812		sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
813		me.name, source_p->name);
#	Line 946 | Line 865 | set_user_mode(struct Client *client_p, s
865		break;
866
867		ClearOper(source_p);
949	–	source_p->umodes &= ~ConfigFileEntry.oper_only_umodes;
868		Count.oper--;
869
870		if (MyConnect(source_p))
#	Line 955 | Line 873 | set_user_mode(struct Client *client_p, s
873
874		detach_conf(source_p, OPER_TYPE);
875		ClearOperFlags(source_p);
876	+	source_p->umodes &= ~ConfigFileEntry.oper_only_umodes;
877
878		if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
879		free_dlink_node(dm);
#	Line 1040 | Line 959 | void
959		send_umode(struct Client *client_p, struct Client *source_p,
960		unsigned int old, unsigned int sendmask, char *umode_buf)
961		{
962	+	char *m = umode_buf;
963		int what = 0;
964		unsigned int i;
965		unsigned int flag;
1046	–	char *m = umode_buf;
966
967		/*
968		* build a string in umode_buf to represent the change in the user's
#	Line 1163 | Line 1082 | user_welcome(struct Client *source_p)
1082
1083		if (ConfigFileEntry.short_motd)
1084		{
1085	<	sendto_one(source_p, "NOTICE %s :*** Notice -- motd was last changed at %s",
1086	<	source_p->name, ConfigFileEntry.motd.lastChangedDate);
1085	>	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- motd was last changed at %s",
1086	>	me.name, source_p->name, ConfigFileEntry.motd.lastChangedDate);
1087		sendto_one(source_p,
1088	<	"NOTICE %s :*** Notice -- Please read the motd if you haven't "
1089	<	"read it", source_p->name);
1088	>	":%s NOTICE %s :*** Notice -- Please read the motd if you haven't "
1089	>	"read it", me.name, source_p->name);
1090		sendto_one(source_p, form_str(RPL_MOTDSTART),
1091		me.name, source_p->name, me.name);
1092		sendto_one(source_p, form_str(RPL_MOTD),
#	Line 1210 | Line 1129 | check_xline(struct Client *source_p)
1129		get_client_name(source_p, HIDE_IP),
1130		source_p->sockhost);
1131
1132	<	ServerStats->is_ref++;
1132	>	++ServerStats.is_ref;
1133		if (REJECT_HOLD_TIME > 0)
1134		{
1135		sendto_one(source_p, ":%s NOTICE %s :Bad user info",
#	Line 1286 | Line 1205 | static char new_uid[TOTALSIDUID + 1];
1205		int
1206		valid_sid(const char *sid)
1207		{
1289	–
1208		if (strlen(sid) == IRC_MAXSID)
1209		if (IsDigit(*sid))
1210		if (IsAlNum(*(sid + 1)) && IsAlNum(*(sid + 2)))
#	Line 1311 | Line 1229 | init_uid(void)
1229
1230		memset(new_uid, 0, sizeof(new_uid));
1231
1232	<	if (ServerInfo.sid != NULL)
1315	<	{
1232	>	if (!EmptyString(ServerInfo.sid))
1233		strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1317	–	strlcpy(me.id, ServerInfo.sid, sizeof(me.id));
1318	–
1319	–	hash_add_id(&me);
1320	–	}
1234
1235	<	for (i = 0; i < IRC_MAXSID; i++)
1235	>	for (i = 0; i < IRC_MAXSID; ++i)
1236		if (new_uid[i] == '\0')
1237		new_uid[i] = 'A';
1238
#	Line 1332 | Line 1245 | init_uid(void)
1245
1246		entering_umode_cb = register_callback("entering_umode", NULL);
1247		umode_cb = register_callback("changing_umode", change_simple_umode);
1335	–	uid_get_cb = register_callback("uid_get", uid_get);
1248		}
1249
1250		/*
#	Line 1375 | Line 1287 | add_one_to_uid(int i)
1287		* output       - new UID is returned to caller
1288		* side effects - new_uid is incremented by one.
1289		*/
1290	<	static void *
1291	<	uid_get(va_list args)
1290	>	static const char *
1291	>	uid_get(void)
1292		{
1293		add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
1294		return new_uid;

Diff Legend

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