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 980 by michael, Sun Aug 9 12:51:45 2009 UTC vs.
ircd-hybrid-8/src/s_user.c (file contents), Revision 1232 by michael, Thu Sep 22 20:25:00 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 36 | Line 36
36		#include "sprintf_irc.h"
37		#include "s_bsd.h"
38		#include "ircd.h"
39	–	#include "list.h"
39		#include "listener.h"
40		#include "motd.h"
41		#include "numeric.h"
#	Line 48 | Line 47
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"
55	–	#include "pcre.h"
55		#include "watch.h"
56
57	<	int MaxClientCount     = 1;
59	<	int MaxConnectionCount = 1;
57	>
58		struct Callback *entering_umode_cb = NULL;
59		struct Callback *umode_cb = NULL;
62	–	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 109 | 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 129 | 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 137 | 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 164 | 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 193 | Line 190 | show_lusers(struct Client *source_p)
190		to = source_p->name;
191		}
192
193	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
193	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
194		sendto_one(source_p, form_str(RPL_LUSERCLIENT),
195		from, to, (Count.total-Count.invisi),
196		Count.invisi, dlink_list_length(&global_serv_list));
#	Line 213 | Line 210 | show_lusers(struct Client *source_p)
210		sendto_one(source_p, form_str(RPL_LUSERCHANNELS),
211		from, to, dlink_list_length(&global_channel_list));
212
213	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
213	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
214		{
215		sendto_one(source_p, form_str(RPL_LUSERME),
216		from, to, Count.local, Count.myserver);
#	Line 234 | Line 231 | show_lusers(struct Client *source_p)
231		from, to, Count.total, Count.max_tot,
232		Count.total, Count.max_tot);
233
234	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
234	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
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 281 | 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,
285	<	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;
289	–	dlink_node *m = NULL;
286
287		assert(source_p != NULL);
288	+	assert(source_p == source_p->from);
289		assert(MyConnect(source_p));
293	–	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) &&
301	<	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 311 | Line 309 | register_local_user(struct Client *clien
309		return;
310		}
311
312	<	source_p->localClient->last = CurrentTime;
312	>	source_p->localClient->last_privmsg = CurrentTime;
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 331 | 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 343 | 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)
352	<	{
350	>	for (; *p && i < USERLEN; ++p)
351		if (*p != '[')
352		source_p->username[i++] = *p;
355	–	p++;
356	–	}
353
354		source_p->username[i] = '\0';
355		}
#	Line 381 | 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 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);
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 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);
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
419	–	assert(source_p == client_p);
420	–
416		if (check_xline(source_p))
417		return;
418
419	<	if (me.id[0])
420	<	{
426	<	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);
430	<
431	<	strlcpy(source_p->id, id, sizeof(source_p->id));
432	<	hash_add_id(source_p);
433	<	}
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
446		if (ConfigFileEntry.invisible_on_connect)
447		{
448	<	source_p->umodes |= UMODE_INVISIBLE;
448	>	AddUMode(source_p, UMODE_INVISIBLE);
449		++Count.invisi;
450		}
451
#	Line 468 | Line 458 | register_local_user(struct Client *clien
458		Count.max_loc);
459		}
460
471	–	SetClient(source_p);
472	–
473	–	source_p->servptr = &me;
474	–	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
475	–
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);
487	<	}
488	<	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
500	<	*              - 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 507 | 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 517 | 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));
520	–	strlcpy(source_p->info, realname, sizeof(source_p->info));
506		strlcpy(source_p->username, username, sizeof(source_p->username));
507
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 535 | 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);
525	>	AddFlag(source_p, FLAGS_KILLED);
526		exit_client(source_p, &me, "Ghosted Client");
527		return;
528		}
#	Line 546 | 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);
540	>	AddFlag(source_p, FLAGS_KILLED);
541		exit_client(source_p, &me, "USER server wrong direction");
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 (HasFlag(source_p->servptr, FLAGS_SERVICE))
550	+	AddFlag(source_p, FLAGS_SERVICE);
551	+
552		/* Increment our total user count here */
553		if (++Count.total > Count.max_tot)
554		Count.max_tot = Count.total;
#	Line 566 | 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
575	<	*              - 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 601 | 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))
599	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
600	<	source_p->servptr->id,
601	<	source_p->name, source_p->hopcount+1,
602	<	(unsigned long)source_p->tsinfo,
603	<	ubuf, source_p->username, source_p->host,
604	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
605	<	"0" : source_p->sockhost, source_p->id, source_p->info);
598	>	if (IsCapable(server, CAP_SVS))
599	>	{
600	>	if (IsCapable(server, CAP_TS6) && HasID(source_p))
601	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %lu :%s",
602	>	source_p->servptr->id,
603	>	source_p->name, source_p->hopcount+1,
604	>	(unsigned long)source_p->tsinfo,
605	>	ubuf, source_p->username, source_p->host,
606	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
607	>	"0" : source_p->sockhost, source_p->id,
608	>	(unsigned long)source_p->servicestamp,
609	>	source_p->info);
610	>	else
611	>	sendto_one(server, "NICK %s %d %lu %s %s %s %s %lu :%s",
612	>	source_p->name, source_p->hopcount+1,
613	>	(unsigned long)source_p->tsinfo,
614	>	ubuf, source_p->username, source_p->host,
615	>	source_p->servptr->name, (unsigned long)source_p->servicestamp,
616	>	source_p->info);
617	>
618	>	}
619		else
620	<	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
621	<	source_p->name, source_p->hopcount+1,
622	<	(unsigned long)source_p->tsinfo,
623	<	ubuf, source_p->username, source_p->host,
624	<	source_p->servptr->name, source_p->info);
620	>	{
621	>	if (IsCapable(server, CAP_TS6) && HasID(source_p))
622	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
623	>	source_p->servptr->id,
624	>	source_p->name, source_p->hopcount+1,
625	>	(unsigned long)source_p->tsinfo,
626	>	ubuf, source_p->username, source_p->host,
627	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
628	>	"0" : source_p->sockhost, source_p->id, source_p->info);
629	>	else
630	>	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
631	>	source_p->name, source_p->hopcount+1,
632	>	(unsigned long)source_p->tsinfo,
633	>	ubuf, source_p->username, source_p->host,
634	>	source_p->servptr->name, source_p->info);
635	>	}
636		}
637		}
638
#	Line 637 | Line 652 | valid_hostname(const char *hostname)
652
653		assert(p != NULL);
654
655	<	if ('.' == *p || ':' == *p)
655	>	if (*p == '.' || *p == ':')
656		return 0;
657
658	<	while (*p)
644	<	{
658	>	for (; *p; ++p)
659		if (!IsHostChar(*p))
660		return 0;
647	–	p++;
648	–	}
661
662		return 1;
663		}
#	Line 669 | Line 681 | valid_username(const char *username)
681
682		assert(p != NULL);
683
684	<	if ('~' == *p)
684	>	if (*p == '~')
685		++p;
686
687		/* reject usernames that don't start with an alphanum
#	Line 683 | Line 695 | valid_username(const char *username)
695		{
696		if ((*p == '.') && ConfigFileEntry.dots_in_ident)
697		{
698	<	dots++;
687	<
688	<	if (dots > ConfigFileEntry.dots_in_ident)
698	>	if (++dots > ConfigFileEntry.dots_in_ident)
699		return 0;
700	<	if (!IsUserChar(p[1]))
700	>	if (!IsUserChar(*(p + 1)))
701		return 0;
702		}
703		else if (!IsUserChar(*p))
#	Line 697 | Line 707 | valid_username(const char *username)
707		return 1;
708		}
709
710	+	/* clean_nick_name()
711	+	*
712	+	* input        - nickname
713	+	*              - whether it's a local nick (1) or remote (0)
714	+	* output       - none
715	+	* side effects - walks through the nickname, returning 0 if erroneous
716	+	*/
717	+	int
718	+	valid_nickname(const char *nickname, const int local)
719	+	{
720	+	const char *p = nickname;
721	+	assert(nickname && *nickname);
722	+
723	+	/* nicks can't start with a digit or - or be 0 length */
724	+	/* This closer duplicates behaviour of hybrid-6 */
725	+	if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
726	+	return 0;
727	+
728	+	for (; *p; ++p)
729	+	if (!IsNickChar(*p))
730	+	return 0;
731	+
732	+	return p - nickname <= (NICKLEN - 1);
733	+	}
734	+
735		/* report_and_set_user_flags()
736		*
737		* inputs       - pointer to source_p
#	Line 751 | Line 786 | report_and_set_user_flags(struct Client
786		me.name,source_p->name);
787		}
788
754	–	/* If this user is exempt from idle time outs */
755	–	if (IsConfIdlelined(aconf))
756	–	{
757	–	SetIdlelined(source_p);
758	–	sendto_one(source_p,
759	–	":%s NOTICE %s :*** You are exempt from idle limits. congrats.",
760	–	me.name, source_p->name);
761	–	}
762	–
789		if (IsConfCanFlood(aconf))
790		{
791		SetCanFlood(source_p);
#	Line 769 | Line 795 | report_and_set_user_flags(struct Client
795		}
796		}
797
772	–	/* do_local_user()
773	–	*
774	–	* inputs       -
775	–	* output       - NONE
776	–	* side effects -
777	–	*/
778	–	void
779	–	do_local_user(const char *nick, struct Client *client_p, struct Client *source_p,
780	–	const char *username, const char *host, const char *server,
781	–	const char *realname)
782	–	{
783	–	assert(source_p != NULL);
784	–	assert(source_p->username != username);
785	–
786	–	if (source_p == NULL)
787	–	return;
788	–
789	–	if (!IsUnknown(source_p))
790	–	{
791	–	sendto_one(source_p, form_str(ERR_ALREADYREGISTRED),
792	–	me.name, nick);
793	–	return;
794	–	}
795	–
796	–	source_p->localClient->registration &= ~REG_NEED_USER;
797	–
798	–	/*
799	–	* don't take the clients word for it, ever
800	–	*/
801	–	source_p->servptr = &me;
802	–
803	–	strlcpy(source_p->info, realname, sizeof(source_p->info));
804	–
805	–	/* stash for later */
806	–	strlcpy(source_p->client_host, host, sizeof(source_p->client_host));
807	–	strlcpy(source_p->client_server, server, sizeof(source_p->client_server));
808	–
809	–	if (!IsGotId(source_p))
810	–	{
811	–	/* save the username in the client
812	–	* If you move this you'll break ping cookies..you've been warned
813	–	*/
814	–	strlcpy(source_p->username, username, sizeof(source_p->username));
815	–	}
816	–
817	–	if (!source_p->localClient->registration)
818	–	/* NICK already received, now I have USER... */
819	–	register_local_user(client_p, source_p, source_p->name, username);
820	–	}
821	–
798		/* change_simple_umode()
799		*
800		* this callback can be hooked to allow special handling of
#	Line 838 | Line 814 | change_simple_umode(va_list args)
814		flag = va_arg(args, unsigned int);
815
816		if (what == MODE_ADD)
817	<	source_p->umodes |= flag;
817	>	AddUMode(source_p, flag);
818		else
819	<	source_p->umodes &= ~flag;
819	>	DelUMode(source_p, flag);
820
821		return NULL;
822		}
#	Line 878 | Line 854 | set_user_mode(struct Client *client_p, s
854		return;
855		}
856
857	<	if (source_p != target_p || target_p->from != source_p->from)
857	>	if (source_p != target_p)
858		{
859		sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
860		me.name, source_p->name);
#	Line 891 | Line 867 | set_user_mode(struct Client *client_p, s
867		*m++ = '+';
868
869		for (i = 0; i < 128; i++)
870	<	if (source_p->umodes & user_modes[i])
870	>	if (HasUMode(source_p, user_modes[i]))
871		*m++ = (char)i;
872		*m = '\0';
873
#	Line 921 | Line 897 | set_user_mode(struct Client *client_p, s
897		case 'o':
898		if (what == MODE_ADD)
899		{
900	<	if (IsServer(client_p) && !IsOper(source_p))
900	>	if (IsServer(client_p) && !HasUMode(source_p, UMODE_OPER))
901		{
902		++Count.oper;
903		SetOper(source_p);
#	Line 932 | Line 908 | set_user_mode(struct Client *client_p, s
908		/* Only decrement the oper counts if an oper to begin with
909		* found by Pat Szuta, Perly , perly@xnet.com
910		*/
911	<	if (!IsOper(source_p))
911	>	if (!HasUMode(source_p, UMODE_OPER))
912		break;
913
914		ClearOper(source_p);
939	–	source_p->umodes &= ~ConfigFileEntry.oper_only_umodes;
915		Count.oper--;
916
917		if (MyConnect(source_p))
#	Line 944 | Line 919 | set_user_mode(struct Client *client_p, s
919		dlink_node *dm;
920
921		detach_conf(source_p, OPER_TYPE);
922	<	ClearOperFlags(source_p);
922	>	ClrOFlag(source_p);
923	>	DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
924
925		if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
926		free_dlink_node(dm);
#	Line 956 | Line 932 | set_user_mode(struct Client *client_p, s
932		/* we may not get these,
933		* but they shouldnt be in default
934		*/
935	+	case 'r':
936		case ' ' :
937		case '\n':
938		case '\r':
#	Line 965 | Line 942 | set_user_mode(struct Client *client_p, s
942		default:
943		if ((flag = user_modes[(unsigned char)*m]))
944		{
945	<	if (MyConnect(source_p) && !IsOper(source_p) &&
945	>	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
946		(ConfigFileEntry.oper_only_umodes & flag))
947		{
948		badflag = 1;
#	Line 988 | Line 965 | set_user_mode(struct Client *client_p, s
965		sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
966		me.name, source_p->name);
967
968	<	if ((source_p->umodes & UMODE_NCHANGE) && !IsOperN(source_p))
968	>	if (HasUMode(source_p, UMODE_NCHANGE) && !HasOFlag(source_p, OPER_FLAG_N))
969		{
970	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
970	>	sendto_one(source_p, ":%s NOTICE %s :*** You have no nchange flag;",
971		me.name, source_p->name);
972	<	source_p->umodes &= ~UMODE_NCHANGE; /* only tcm's really need this */
972	>	DelUMode(source_p, UMODE_NCHANGE);
973		}
974
975	<	if (MyConnect(source_p) && (source_p->umodes & UMODE_ADMIN) &&
976	<	!IsOperAdmin(source_p) && !IsOperHiddenAdmin(source_p))
975	>	if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
976	>	!HasOFlag(source_p, OPER_FLAG_HIDDEN_ADMIN|OPER_FLAG_ADMIN))
977		{
978		sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
979		me.name, source_p->name);
980	<	source_p->umodes &= ~UMODE_ADMIN;
980	>	DelUMode(source_p, UMODE_ADMIN);
981		}
982
983	<	if (!(setflags & UMODE_INVISIBLE) && IsInvisible(source_p))
983	>	if (!(setflags & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
984		++Count.invisi;
985	<	if ((setflags & UMODE_INVISIBLE) && !IsInvisible(source_p))
985	>	if ((setflags & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
986		--Count.invisi;
987
988		/*
#	Line 1030 | Line 1007 | void
1007		send_umode(struct Client *client_p, struct Client *source_p,
1008		unsigned int old, unsigned int sendmask, char *umode_buf)
1009		{
1010	+	char *m = umode_buf;
1011		int what = 0;
1012		unsigned int i;
1013		unsigned int flag;
1036	–	char *m = umode_buf;
1014
1015		/*
1016		* build a string in umode_buf to represent the change in the user's
#	Line 1048 | Line 1025 | send_umode(struct Client *client_p, stru
1025		if (MyClient(source_p) && !(flag & sendmask))
1026		continue;
1027
1028	<	if ((flag & old) && !(source_p->umodes & flag))
1028	>	if ((flag & old) && !HasUMode(source_p, flag))
1029		{
1030		if (what == MODE_DEL)
1031		*m++ = (char)i;
#	Line 1059 | Line 1036 | send_umode(struct Client *client_p, stru
1036		*m++ = (char)i;
1037		}
1038		}
1039	<	else if (!(flag & old) && (source_p->umodes & flag))
1039	>	else if (!(flag & old) && HasUMode(source_p, flag))
1040		{
1041		if (what == MODE_ADD)
1042		*m++ = (char)i;
#	Line 1093 | Line 1070 | send_umode_out(struct Client *client_p,
1070		char buf[IRCD_BUFSIZE] = { '\0' };
1071		dlink_node *ptr = NULL;
1072
1073	<	send_umode(NULL, source_p, old, IsOperHiddenAdmin(source_p) ?
1073	>	send_umode(NULL, source_p, old, HasOFlag(source_p, OPER_FLAG_HIDDEN_ADMIN) ?
1074		SEND_UMODES & ~UMODE_ADMIN : SEND_UMODES, buf);
1075
1076		if (buf[0])
#	Line 1153 | Line 1130 | user_welcome(struct Client *source_p)
1130
1131		if (ConfigFileEntry.short_motd)
1132		{
1133	<	sendto_one(source_p, "NOTICE %s :*** Notice -- motd was last changed at %s",
1134	<	source_p->name, ConfigFileEntry.motd.lastChangedDate);
1133	>	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- motd was last changed at %s",
1134	>	me.name, source_p->name, ConfigFileEntry.motd.lastChangedDate);
1135		sendto_one(source_p,
1136	<	"NOTICE %s :*** Notice -- Please read the motd if you haven't "
1137	<	"read it", source_p->name);
1136	>	":%s NOTICE %s :*** Notice -- Please read the motd if you haven't "
1137	>	"read it", me.name, source_p->name);
1138		sendto_one(source_p, form_str(RPL_MOTDSTART),
1139		me.name, source_p->name, me.name);
1140		sendto_one(source_p, form_str(RPL_MOTD),
#	Line 1238 | Line 1215 | oper_up(struct Client *source_p)
1215		SetOper(source_p);
1216
1217		if (oconf->modes)
1218	<	source_p->umodes |= oconf->modes;
1218	>	AddUMode(source_p, oconf->modes);
1219		else if (ConfigFileEntry.oper_umodes)
1220	<	source_p->umodes |= ConfigFileEntry.oper_umodes;
1244	<	else
1245	<	source_p->umodes |= (UMODE_SERVNOTICE|UMODE_OPERWALL|
1246	<	UMODE_WALLOP|UMODE_LOCOPS);
1220	>	AddUMode(source_p, ConfigFileEntry.oper_umodes);
1221
1222	<	if (!(old & UMODE_INVISIBLE) && IsInvisible(source_p))
1222	>	if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
1223		++Count.invisi;
1224	<	if ((old & UMODE_INVISIBLE) && !IsInvisible(source_p))
1224	>	if ((old & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
1225		--Count.invisi;
1226
1227		assert(dlinkFind(&oper_list, source_p) == NULL);
#	Line 1255 | Line 1229 | oper_up(struct Client *source_p)
1229
1230		operprivs = oper_privs_as_string(oconf->port);
1231
1232	<	SetOFlag(source_p, oconf->port);
1232	>	AddOFlag(source_p, oconf->port);
1233
1234	<	if (IsOperAdmin(source_p) || IsOperHiddenAdmin(source_p))
1235	<	source_p->umodes |= UMODE_ADMIN;
1236	<	if (!IsOperN(source_p))
1237	<	source_p->umodes &= ~UMODE_NCHANGE;
1234	>	if (HasOFlag(source_p, OPER_FLAG_HIDDEN_ADMIN|OPER_FLAG_ADMIN))
1235	>	AddUMode(source_p, UMODE_ADMIN);
1236	>	if (!HasOFlag(source_p, OPER_FLAG_N))
1237	>	DelUMode(source_p, UMODE_NCHANGE);
1238
1239		sendto_realops_flags(UMODE_ALL, L_ALL, "%s (%s@%s) is now an operator",
1240		source_p->name, source_p->username, source_p->host);
#	Line 1276 | Line 1250 | static char new_uid[TOTALSIDUID + 1];
1250		int
1251		valid_sid(const char *sid)
1252		{
1279	–
1253		if (strlen(sid) == IRC_MAXSID)
1254		if (IsDigit(*sid))
1255		if (IsAlNum(*(sid + 1)) && IsAlNum(*(sid + 2)))
#	Line 1301 | Line 1274 | init_uid(void)
1274
1275		memset(new_uid, 0, sizeof(new_uid));
1276
1277	<	if (ServerInfo.sid != NULL)
1305	<	{
1277	>	if (!EmptyString(ServerInfo.sid))
1278		strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1307	–	strlcpy(me.id, ServerInfo.sid, sizeof(me.id));
1279
1280	<	hash_add_id(&me);
1310	<	}
1311	<
1312	<	for (i = 0; i < IRC_MAXSID; i++)
1280	>	for (i = 0; i < IRC_MAXSID; ++i)
1281		if (new_uid[i] == '\0')
1282		new_uid[i] = 'A';
1283
#	Line 1322 | Line 1290 | init_uid(void)
1290
1291		entering_umode_cb = register_callback("entering_umode", NULL);
1292		umode_cb = register_callback("changing_umode", change_simple_umode);
1325	–	uid_get_cb = register_callback("uid_get", uid_get);
1293		}
1294
1295		/*
#	Line 1365 | Line 1332 | add_one_to_uid(int i)
1332		* output       - new UID is returned to caller
1333		* side effects - new_uid is incremented by one.
1334		*/
1335	<	static void *
1336	<	uid_get(va_list args)
1335	>	static const char *
1336	>	uid_get(void)
1337		{
1338		add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
1339		return new_uid;

Diff Legend

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