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/s_user.c (file contents), Revision 3272 by michael, Sun Apr 6 11:34:14 2014 UTC vs.
ircd-hybrid/trunk/src/user.c (file contents), Revision 4588 by michael, Tue Aug 26 15:59:07 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 26 | Line 26
26
27		#include "stdinc.h"
28		#include "list.h"
29	<	#include "s_user.h"
30	<	#include "s_misc.h"
29	>	#include "user.h"
30		#include "channel.h"
31		#include "channel_mode.h"
32		#include "client.h"
#	Line 39 | Line 38
38		#include "numeric.h"
39		#include "conf.h"
40		#include "log.h"
41	<	#include "s_serv.h"
41	>	#include "server.h"
42		#include "send.h"
44	–	#include "supported.h"
43		#include "memory.h"
44		#include "packet.h"
45		#include "rng_mt.h"
46		#include "userhost.h"
47	<	#include "s_misc.h"
47	>	#include "misc.h"
48		#include "parse.h"
49		#include "watch.h"
50
#	Line 118 | 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 128 | 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 165 | Line 163 | 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));
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);
169	>	(Count.total - Count.invisi), Count.invisi, 1);
170
171	<	if (Count.oper > 0)
171	>	if (Count.oper)
172		sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper);
173
174	<	if (dlink_list_length(&unknown_list) > 0)
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) > 0)
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 287 | 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 299 | 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 350 | 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	<
365	<	if (source_p->id[0])
366	<	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 404 | Line 400 | check_xline(struct Client *source_p)
400		return 0;
401		}
402
403	<	/*
404	<	** register_local_user
405	<	**      This function is called when both NICK and USER messages
406	<	**      have been accepted for the client, in whatever order. Only
407	<	**      after this, is the USER message propagated.
412	<	**
413	<	**      NICK's must be propagated at once when received, although
414	<	**      it would be better to delay them too until full info is
415	<	**      available. Doing it is not so simple though, would have
416	<	**      to implement the following:
417	<	**
418	<	**      (actually it has been implemented already for a while) -orabidoo
419	<	**
420	<	**      1) user telnets in and gives only "NICK foobar" and waits
421	<	**      2) another user far away logs in normally with the nick
422	<	**         "foobar" (quite legal, as this server didn't propagate
423	<	**         it).
424	<	**      3) now this server gets nick "foobar" from outside, but
425	<	**         has alread the same defined locally. Current server
426	<	**         would just issue "KILL foobar" to clean out dups. But,
427	<	**         this is not fair. It should actually request another
428	<	**         nick from local user or kill him/her...
429	<	*/
403	>	/*! \brief This function is called when both NICK and USER messages
404	>	*      have been accepted for the client, in whatever order. Only
405	>	*      after this, is the UID message propagated.
406	>	* \param source_p Pointer to given client to introduce
407	>	*/
408		void
409		register_local_user(struct Client *source_p)
410		{
#	Line 435 | 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",
429	<	source_p->localClient->random_ping);
429	>	source_p->connection->random_ping);
430		SetPingSent(source_p);
431		return;
432		}
#	Line 457 | Line 435 | register_local_user(struct Client *sourc
435		return;
436		}
437
438	<	source_p->localClient->last_privmsg = CurrentTime;
438	>	source_p->connection->last_privmsg = CurrentTime;
439		/* Straight up the maximum rate of flooding... */
440	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
440	>	source_p->connection->allow_read = MAX_FLOOD_BURST;
441
442		if (!check_client(source_p))
443		return;
#	Line 472 | Line 450 | register_local_user(struct Client *sourc
450		sizeof(source_p->host));
451		}
452
453	<	conf = source_p->localClient->confs.head->data;
453	>	conf = source_p->connection->confs.head->data;
454
455		if (!IsGotId(source_p))
456		{
#	Line 495 | Line 473 | register_local_user(struct Client *sourc
473		source_p->username[i++] = '~';
474
475		for (; *p && i < USERLEN; ++p)
476	<	if (*p != '[')
499	<	source_p->username[i++] = *p;
476	>	source_p->username[i++] = *p;
477
478		source_p->username[i] = '\0';
479		}
480
481	<	/* password check */
481	>	/* Password check */
482		if (!EmptyString(conf->passwd))
483		{
484	<	const char *pass = source_p->localClient->passwd;
508	<
509	<	if (!match_conf_password(pass, conf))
484	>	if (!match_conf_password(source_p->connection->password, conf))
485		{
486		++ServerStats.is_ref;
487
#	Line 516 | Line 491 | register_local_user(struct Client *sourc
491		}
492		}
493
494	<	/* don't free source_p->localClient->passwd here - it can be required
494	>	/*
495	>	* Don't free source_p->connection->password here - it can be required
496		* by masked /stats I if there are auth{} blocks with need_password = no;
497		* --adx
498		*/
499
500	<	/* report if user has &^>= etc. and set flags as needed in source_p */
500	>	/*
501	>	* Report if user has &^>= etc. and set flags as needed in source_p
502	>	*/
503		report_and_set_user_flags(source_p, conf);
504
505		if (IsDead(source_p))
506		return;
507
508	<	/* Limit clients -
508	>	/*
509	>	* Limit clients -
510		* We want to be able to have servers and F-line clients
511		* connect, so save room for "buffer" connections.
512		* Smaller servers may want to decrease this, and it should
513		* probably be just a percentage of the MAXCLIENTS...
514		*   -Taner
515		*/
516	<	/* Except "F:" clients */
517	<	if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
539	<	(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
516	>	if ((Count.local >= ConfigServerInfo.max_clients + MAX_BUFFER) ||
517	>	(Count.local >= ConfigServerInfo.max_clients && !IsExemptLimits(source_p)))
518		{
519		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
520		"Too many clients, rejecting %s[%s].",
#	Line 546 | Line 524 | register_local_user(struct Client *sourc
524		return;
525		}
526
549	–	/* valid user name check */
527		if (!valid_username(source_p->username, 1))
528		{
529	<	char tmpstr2[IRCD_BUFSIZE] = "";
529	>	char buf[IRCD_BUFSIZE] = "";
530
531		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
532		"Invalid username: %s (%s@%s)",
533		source_p->name, source_p->username, source_p->host);
534		++ServerStats.is_ref;
535	<	snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
536	<	source_p->username);
560	<	exit_client(source_p, tmpstr2);
535	>	snprintf(buf, sizeof(buf), "Invalid username [%s]", source_p->username);
536	>	exit_client(source_p, buf);
537		return;
538		}
539
#	Line 573 | Line 549 | register_local_user(struct Client *sourc
549		sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
550		"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
551		source_p->name, source_p->username, source_p->host,
552	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
552	>	ConfigGeneral.hide_spoof_ips && IsIPSpoof(source_p) ?
553		"255.255.255.255" : source_p->sockhost,
554	<	get_client_class(&source_p->localClient->confs),
554	>	get_client_class(&source_p->connection->confs),
555		source_p->info, source_p->id);
556
557	<	if (ConfigFileEntry.invisible_on_connect)
557	>	if (ConfigGeneral.invisible_on_connect)
558		{
559		AddUMode(source_p, UMODE_INVISIBLE);
560		++Count.invisi;
#	Line 590 | Line 566 | register_local_user(struct Client *sourc
566
567		if (!(Count.max_loc % 10))
568		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
569	<	"New Max Local Clients: %d",
569	>	"New maximum local client connections: %u",
570		Count.max_loc);
571		}
572
597	–	/* Increment our total user count here */
573		if (++Count.total > Count.max_tot)
574		Count.max_tot = Count.total;
575		++Count.totalrestartcount;
#	Line 602 | Line 577 | register_local_user(struct Client *sourc
577		assert(source_p->servptr == &me);
578		SetClient(source_p);
579		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
580	<
606	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
580	>	dlinkAdd(source_p, &source_p->node, &global_client_list);
581
582		assert(dlinkFind(&unknown_list, source_p));
583
584	<	dlink_move_node(&source_p->localClient->lclient_node,
584	>	dlink_move_node(&source_p->connection->lclient_node,
585		&unknown_list, &local_client_list);
586
587		user_welcome(source_p);
#	Line 628 | Line 602 | register_local_user(struct Client *sourc
602		*                is introduced by a server.
603		*/
604		void
605	<	register_remote_user(struct Client *source_p, const char *username,
632	<	const char *host, const char *server)
605	>	register_remote_user(struct Client *source_p)
606		{
607	<	struct Client *target_p = NULL;
635	<
636	<	assert(source_p->username != username);
637	<
638	<	strlcpy(source_p->host, host, sizeof(source_p->host));
639	<	strlcpy(source_p->username, username, sizeof(source_p->username));
640	<
641	<	/*
642	<	* coming from another server, take the servers word for it
643	<	*/
644	<	source_p->servptr = hash_find_server(server);
645	<
646	<	/*
647	<	* Super GhostDetect:
648	<	* If we can't find the server the user is supposed to be on,
649	<	* then simply blow the user away.        -Taner
650	<	*/
651	<	if (source_p->servptr == NULL)
652	<	{
653	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
654	<	"No server %s for user %s[%s@%s] from %s",
655	<	server, source_p->name, source_p->username,
656	<	source_p->host, source_p->from->name);
657	<	sendto_one(source_p->from,
658	<	":%s KILL %s :%s (Ghosted, server %s doesn't exist)",
659	<	me.id, source_p->id, me.name, server);
660	<
661	<	AddFlag(source_p, FLAGS_KILLED);
662	<	exit_client(source_p, "Ghosted Client");
663	<	return;
664	<	}
607	>	const struct Client *target_p = NULL;
608
609		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
610		{
#	Line 687 | Line 630 | register_remote_user(struct Client *sour
630		if (HasFlag(source_p->servptr, FLAGS_SERVICE))
631		AddFlag(source_p, FLAGS_SERVICE);
632
690	–	/* Increment our total user count here */
633		if (++Count.total > Count.max_tot)
634		Count.max_tot = Count.total;
635
636		SetClient(source_p);
637		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
638	+	dlinkAdd(source_p, &source_p->node, &global_client_list);
639		add_user_host(source_p->username, source_p->host, 1);
640		SetUserHost(source_p);
641
#	Line 746 | Line 689 | valid_hostname(const char *hostname)
689		int
690		valid_username(const char *username, const int local)
691		{
692	<	int dots      = 0;
692	>	unsigned int dots = 0;
693		const char *p = username;
694
695		assert(p);
#	Line 766 | Line 709 | valid_username(const char *username, con
709		{
710		while (*++p)
711		{
712	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
712	>	if (*p == '.' && ConfigGeneral.dots_in_ident)
713		{
714	<	if (++dots > ConfigFileEntry.dots_in_ident)
714	>	if (++dots > ConfigGeneral.dots_in_ident)
715		return 0;
716		if (!IsUserChar(*(p + 1)))
717		return 0;
#	Line 784 | Line 727 | valid_username(const char *username, con
727		return 0;
728		}
729
730	<	return  p - username <= USERLEN;;
730	>	return p - username <= USERLEN;
731		}
732
733		/* clean_nick_name()
#	Line 798 | Line 741 | int
741		valid_nickname(const char *nickname, const int local)
742		{
743		const char *p = nickname;
801	–	assert(nickname && *nickname);
744
745	<	assert(p);
745	>	assert(nickname && *nickname);
746
747	<	/* nicks can't start with a digit or - or be 0 length */
748	<	/* This closer duplicates behaviour of hybrid-6 */
747	>	/*
748	>	* Nicks can't start with a digit or - or be 0 length.
749	>	*/
750		if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
751		return 0;
752
#	Line 814 | Line 757 | valid_nickname(const char *nickname, con
757		return p - nickname <= NICKLEN;
758		}
759
817	–	/* set_user_mode()
818	–	*
819	–	* added 15/10/91 By Darren Reed.
820	–	* parv[0] - command
821	–	* parv[1] - username to change mode for
822	–	* parv[2] - modes to change
823	–	*/
824	–	void
825	–	set_user_mode(struct Client *source_p, const int parc, char *parv[])
826	–	{
827	–	unsigned int flag, setflags;
828	–	char **p, *m, buf[IRCD_BUFSIZE] = "";
829	–	struct Client *target_p;
830	–	int what = MODE_ADD, badflag = 0, i;
831	–
832	–	assert(!(parc < 2));
833	–
834	–	if ((target_p = find_person(source_p, parv[1])) == NULL)
835	–	{
836	–	if (MyConnect(source_p))
837	–	sendto_one_numeric(source_p, &me, ERR_NOSUCHCHANNEL, parv[1]);
838	–	return;
839	–	}
840	–
841	–	if (source_p != target_p)
842	–	{
843	–	sendto_one_numeric(source_p, &me, ERR_USERSDONTMATCH);
844	–	return;
845	–	}
846	–
847	–	if (parc < 3)
848	–	{
849	–	m = buf;
850	–	*m++ = '+';
851	–
852	–	for (i = 0; i < 128; ++i)
853	–	if (HasUMode(source_p, user_modes[i]))
854	–	*m++ = (char)i;
855	–	*m = '\0';
856	–
857	–	sendto_one_numeric(source_p, &me, RPL_UMODEIS, buf);
858	–	return;
859	–	}
860	–
861	–	/* find flags already set for user */
862	–	setflags = source_p->umodes;
863	–
864	–	/* parse mode change string(s) */
865	–	for (p = &parv[2]; p && *p; ++p)
866	–	{
867	–	for (m = *p; *m; ++m)
868	–	{
869	–	switch (*m)
870	–	{
871	–	case '+':
872	–	what = MODE_ADD;
873	–	break;
874	–	case '-':
875	–	what = MODE_DEL;
876	–	break;
877	–	case 'o':
878	–	if (what == MODE_ADD)
879	–	{
880	–	if (!MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER))
881	–	{
882	–	++Count.oper;
883	–	SetOper(source_p);
884	–	}
885	–	}
886	–	else
887	–	{
888	–	if (!HasUMode(source_p, UMODE_OPER))
889	–	break;
890	–
891	–	ClearOper(source_p);
892	–	Count.oper--;
893	–
894	–	if (MyConnect(source_p))
895	–	{
896	–	dlink_node *ptr = NULL;
897	–
898	–	detach_conf(source_p, CONF_OPER);
899	–	ClrOFlag(source_p);
900	–	DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
901	–
902	–	if ((ptr = dlinkFindDelete(&oper_list, source_p)))
903	–	free_dlink_node(ptr);
904	–	}
905	–	}
906	–
907	–	break;
908	–
909	–	case 'S':  /* Only servers may set +S in a burst */
910	–	case 'W':  /* Only servers may set +W in a burst */
911	–	case 'r':  /* Only services may set +r */
912	–	case 'x':  /* Only services may set +x */
913	–	break;
914	–
915	–	default:
916	–	if ((flag = user_modes[(unsigned char)*m]))
917	–	{
918	–	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
919	–	(ConfigFileEntry.oper_only_umodes & flag))
920	–	badflag = 1;
921	–	else
922	–	{
923	–	if (what == MODE_ADD)
924	–	AddUMode(source_p, flag);
925	–	else
926	–	DelUMode(source_p, flag);
927	–	}
928	–	}
929	–	else if (MyConnect(source_p))
930	–	badflag = 1;
931	–
932	–	break;
933	–	}
934	–	}
935	–	}
936	–
937	–	if (badflag)
938	–	sendto_one_numeric(source_p, &me, ERR_UMODEUNKNOWNFLAG);
939	–
940	–	if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
941	–	!HasOFlag(source_p, OPER_FLAG_ADMIN))
942	–	{
943	–	sendto_one_notice(source_p, &me, ":*** You have no admin flag;");
944	–	DelUMode(source_p, UMODE_ADMIN);
945	–	}
946	–
947	–	if (!(setflags & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
948	–	++Count.invisi;
949	–	if ((setflags & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
950	–	--Count.invisi;
951	–
952	–	/*
953	–	* compare new flags with old flags and send string which
954	–	* will cause servers to update correctly.
955	–	*/
956	–	send_umode_out(source_p, source_p, setflags);
957	–	}
958	–
760		/* send_umode()
761		* send the MODE string for user (user) to connection client_p
762		* -avalon
#	Line 969 | Line 770 | set_user_mode(struct Client *source_p, c
770		*/
771		void
772		send_umode(struct Client *client_p, struct Client *source_p,
773	<	unsigned int old, unsigned int sendmask, char *umode_buf)
773	>	unsigned int old, char *umode_buf)
774		{
775		char *m = umode_buf;
776		int what = 0;
976	–	unsigned int i;
977	–	unsigned int flag;
777
778		/*
779	<	* build a string in umode_buf to represent the change in the user's
779	>	* Build a string in umode_buf to represent the change in the user's
780		* mode between the new (source_p->umodes) and 'old'.
781		*/
782	<	for (i = 0; i < 128; ++i)
782	>	for (unsigned int i = 0; i < 128; ++i)
783		{
784	<	flag = user_modes[i];
986	<	if (!flag)
987	<	continue;
784	>	unsigned int flag = user_modes[i];
785
786	<	if (MyClient(source_p) && !(flag & sendmask))
786	>	if (!flag)
787		continue;
788
789		if ((flag & old) && !HasUMode(source_p, flag))
#	Line 1033 | Line 830 | send_umode_out(struct Client *client_p,
830		{
831		char buf[IRCD_BUFSIZE] = "";
832
833	<	send_umode(NULL, source_p, old, SEND_UMODES, buf);
833	>	send_umode(NULL, source_p, old, buf);
834
835		if (buf[0])
836		sendto_server(source_p, NOCAPS, NOCAPS, ":%s MODE %s :%s",
837		source_p->id, source_p->id, buf);
838
839		if (client_p && MyClient(client_p))
840	<	send_umode(client_p, source_p, old, 0xffffffff, buf);
840	>	send_umode(client_p, source_p, old, buf);
841		}
842
843		void
#	Line 1066 | Line 863 | user_set_hostmask(struct Client *target_
863		default: return;
864		}
865
866	<	if (ConfigFileEntry.cycle_on_host_change)
866	>	if (ConfigGeneral.cycle_on_host_change)
867		sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
868		target_p->name, target_p->username, target_p->host);
869
#	Line 1080 | Line 877 | user_set_hostmask(struct Client *target_
877
878		if (MyClient(target_p))
879		{
880	<	sendto_one_numeric(target_p, &me, RPL_NEWHOSTIS, target_p->host);
880	>	sendto_one_numeric(target_p, &me, RPL_VISIBLEHOST, target_p->host);
881		clear_ban_cache_client(target_p);
882		}
883
884	<	if (!ConfigFileEntry.cycle_on_host_change)
884	>	if (!ConfigGeneral.cycle_on_host_change)
885		return;
886
887		DLINK_FOREACH(ptr, target_p->channel.head)
#	Line 1131 | Line 928 | user_set_hostmask(struct Client *target_
928		target_p->host, target_p->away);
929		}
930
931	<	/* oper_up()
932	<	*
933	<	* inputs       - pointer to given client to oper
1137	<	* output       - NONE
1138	<	* side effects - Blindly opers up given source_p, using conf info
1139	<	*                all checks on passwords have already been done.
1140	<	*                This could also be used by rsa oper routines.
931	>	/*! \brief Blindly opers up given source_p, using conf info.
932	>	*         All checks on passwords have already been done.
933	>	* \param source_p Pointer to given client to oper
934		*/
935		void
936		oper_up(struct Client *source_p)
937		{
938		const unsigned int old = source_p->umodes;
939	<	const struct MaskItem *conf = source_p->localClient->confs.head->data;
939	>	const struct MaskItem *conf = source_p->connection->confs.head->data;
940
941	<	assert(source_p->localClient->confs.head);
941	>	assert(source_p->connection->confs.head);
942
943		++Count.oper;
944		SetOper(source_p);
945
946		if (conf->modes)
947		AddUMode(source_p, conf->modes);
948	<	else if (ConfigFileEntry.oper_umodes)
949	<	AddUMode(source_p, ConfigFileEntry.oper_umodes);
948	>	else if (ConfigGeneral.oper_umodes)
949	>	AddUMode(source_p, ConfigGeneral.oper_umodes);
950
951		if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
952		++Count.invisi;
#	Line 1170 | Line 963 | oper_up(struct Client *source_p)
963
964		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
965		get_oper_name(source_p));
966	+	sendto_server(NULL, NOCAPS, NOCAPS, ":%s GLOBOPS :%s is now an operator",
967	+	me.id, get_oper_name(source_p));
968		send_umode_out(source_p, source_p, old);
969		sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
970		}
971
972	<	static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
972	>	static char new_uid[TOTALSIDUID + 1];  /* Allow for \0 */
973
974		int
975		valid_sid(const char *sid)
#	Line 1201 | Line 996 | init_uid(void)
996		{
997		memset(new_uid, 0, sizeof(new_uid));
998
999	<	if (!EmptyString(ServerInfo.sid))
1000	<	strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
999	>	if (!EmptyString(ConfigServerInfo.sid))
1000	>	strlcpy(new_uid, ConfigServerInfo.sid, sizeof(new_uid));
1001
1002		for (unsigned int i = 0; i < IRC_MAXSID; ++i)
1003		if (new_uid[i] == '\0')
#	Line 1221 | Line 1016 | init_uid(void)
1016		*                note this is a recursive function
1017		*/
1018		static void
1019	<	add_one_to_uid(int i)
1019	>	add_one_to_uid(unsigned int i)
1020		{
1021	<	if (i != IRC_MAXSID)    /* Not reached server SID portion yet? */
1021	>	if (i != IRC_MAXSID)  /* Not reached server SID portion yet? */
1022		{
1023		if (new_uid[i] == 'Z')
1024		new_uid[i] = '0';
1025		else if (new_uid[i] == '9')
1026		{
1027		new_uid[i] = 'A';
1028	<	add_one_to_uid(i-1);
1028	>	add_one_to_uid(i - 1);
1029		}
1030		else
1031		++new_uid[i];
#	Line 1255 | Line 1050 | add_one_to_uid(int i)
1050		static const char *
1051		uid_get(void)
1052		{
1053	<	add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
1053	>	add_one_to_uid(TOTALSIDUID - 1);  /* Index from 0 */
1054		return new_uid;
1055		}
1056
#	Line 1270 | Line 1065 | void
1065		init_isupport(void)
1066		{
1067		add_isupport("CALLERID", NULL, -1);
1068	<	add_isupport("CASEMAPPING", CASEMAP, -1);
1068	>	add_isupport("CASEMAPPING", "rfc1459", -1);
1069		add_isupport("DEAF", "D", -1);
1070		add_isupport("KICKLEN", NULL, KICKLEN);
1071		add_isupport("MODES", NULL, MAXMODEPARAMS);
1277	–	#ifdef HALFOPS
1072		add_isupport("PREFIX", "(ohv)@%+", -1);
1073		add_isupport("STATUSMSG", "@%+", -1);
1280	–	#else
1281	–	add_isupport("PREFIX", "(ov)@+", -1);
1282	–	add_isupport("STATUSMSG", "@+", -1);
1283	–	#endif
1074		add_isupport("EXCEPTS", "e", -1);
1075		add_isupport("INVEX", "I", -1);
1076		}
#	Line 1298 | Line 1088 | void
1088		add_isupport(const char *name, const char *options, int n)
1089		{
1090		dlink_node *ptr;
1091	<	struct Isupport *support;
1091	>	struct Isupport *support = NULL;
1092
1093		DLINK_FOREACH(ptr, support_list.head)
1094		{
#	Line 1313 | Line 1103 | add_isupport(const char *name, const cha
1103
1104		if (ptr == NULL)
1105		{
1106	<	support = MyMalloc(sizeof(*support));
1106	>	support = MyCalloc(sizeof(*support));
1107		dlinkAddTail(support, &support->node, &support_list);
1108		}
1109
1110		support->name = xstrdup(name);
1111	<	if (options != NULL)
1111	>	if (options)
1112		support->options = xstrdup(options);
1113		support->number = n;
1114
#	Line 1386 | Line 1176 | rebuild_isupport_message_line(void)
1176		p += (n = sprintf(p, "%s", support->name));
1177		len += n;
1178
1179	<	if (support->options != NULL)
1179	>	if (support->options)
1180		{
1181		p += (n = sprintf(p, "=%s", support->options));
1182		len += n;
#	Line 1414 | Line 1204 | rebuild_isupport_message_line(void)
1204		}
1205		}
1206
1207	<	if (len != 0)
1207	>	if (len)
1208		{
1209		if (*--p == ' ')
1210		*p = '\0';

Diff Legend

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