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 3316 by michael, Tue Apr 15 14:09:39 2014 UTC vs.
ircd-hybrid/trunk/src/user.c (file contents), Revision 4967 by michael, Mon Dec 1 14:34:29 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 164 | Line 162 | void
162		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));
165	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
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);
168	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
169	>	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 212 | Line 210 | show_lusers(struct Client *source_p)
210		void
211		show_isupport(struct Client *source_p)
212		{
213	<	const dlink_node *ptr = NULL;
213	>	const dlink_node *node = NULL;
214
215	<	DLINK_FOREACH(ptr, support_list_lines.head)
216	<	sendto_one_numeric(source_p, &me, RPL_ISUPPORT, ptr->data);
215	>	DLINK_FOREACH(node, support_list_lines.head)
216	>	sendto_one_numeric(source_p, &me, RPL_ISUPPORT, node->data);
217		}
218
219
#	Line 234 | Line 232 | report_and_set_user_flags(struct Client
232		if (IsConfDoSpoofIp(conf))
233		sendto_one_notice(source_p, &me, ":*** Spoofing your IP. Congrats.");
234
235	<	/* If this user is in the exception class, Set it "E lined" */
235	>	/* If this user is in the exception class, set it "E lined" */
236		if (IsConfExemptKline(conf))
237		{
238		SetExemptKline(source_p);
#	Line 283 | Line 281 | report_and_set_user_flags(struct Client
281		static void
282		introduce_client(struct Client *source_p)
283		{
284	<	dlink_node *ptr = NULL;
284	>	dlink_node *node = NULL;
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(node, local_server_list.head)
301		{
302	<	struct Client *server = ptr->data;
302	>	struct Client *server = node->data;
303
304		if (server == source_p->from)
305		continue;
#	Line 312 | Line 310 | introduce_client(struct Client *source_p
310		source_p->name, source_p->hopcount+1,
311		(unsigned long)source_p->tsinfo,
312		ubuf, source_p->username, source_p->host,
313	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
314	<	"0" : source_p->sockhost, source_p->id,
317	<	source_p->svid,
313	>	source_p->sockhost, source_p->id,
314	>	source_p->account,
315		source_p->info);
316		else
317		sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
#	Line 322 | Line 319 | introduce_client(struct Client *source_p
319		source_p->name, source_p->hopcount+1,
320		(unsigned long)source_p->tsinfo,
321		ubuf, source_p->username, source_p->host,
322	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
326	<	"0" : source_p->sockhost, source_p->id, source_p->info);
322	>	source_p->sockhost, source_p->id, source_p->info);
323
324		if (!EmptyString(source_p->certfp))
325		sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
#	Line 350 | Line 346 | user_welcome(struct Client *source_p)
346		{
347		AddUMode(source_p, UMODE_SSL);
348		sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
349	<	ssl_get_cipher(source_p->localClient->fd.ssl));
349	>	ssl_get_cipher(source_p->connection->fd.ssl));
350		}
351		#endif
352
353	<	sendto_one_numeric(source_p, &me, RPL_WELCOME, ServerInfo.network_name,
353	>	sendto_one_numeric(source_p, &me, RPL_WELCOME, ConfigServerInfo.network_name,
354		source_p->name);
355		sendto_one_numeric(source_p, &me, RPL_YOURHOST,
356	<	get_listener_name(source_p->localClient->listener), ircd_version);
356	>	get_listener_name(source_p->connection->listener), ircd_version);
357		sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
358		sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
359		show_isupport(source_p);
360	<
365	<	if (source_p->id[0])
366	<	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
360	>	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
361
362		show_lusers(source_p);
363		motd_signon(source_p);
#	Line 379 | Line 373 | static int
373		check_xline(struct Client *source_p)
374		{
375		struct MaskItem *conf = NULL;
382	–	const char *reason = NULL;
376
377		if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
378		{
379		++conf->count;
387	–
388	–	if (conf->reason)
389	–	reason = conf->reason;
390	–	else
391	–	reason = CONF_NOREASON;
392	–
380		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
381		"X-line Rejecting [%s] [%s], user %s [%s]",
382	<	source_p->info, reason,
382	>	source_p->info, conf->reason,
383		get_client_name(source_p, HIDE_IP),
384		source_p->sockhost);
385
#	Line 404 | Line 391 | check_xline(struct Client *source_p)
391		return 0;
392		}
393
394	<	/*
408	<	* register_local_user
409	<	*      This function is called when both NICK and USER messages
394	>	/*! \brief This function is called when both NICK and USER messages
395		*      have been accepted for the client, in whatever order. Only
396		*      after this, is the UID message propagated.
397	<	*
413	<	*      1) user telnets in and gives only "NICK foobar" and waits
414	<	*      2) another user far away logs in normally with the nick
415	<	*         "foobar" (quite legal, as this server didn't propagate
416	<	*         it).
417	<	*      3) now this server gets nick "foobar" from outside, but
418	<	*         has alread the same defined locally. Current server
419	<	*         would just issue "KILL foobar" to clean out dups. But,
420	<	*         this is not fair. It should actually request another
421	<	*         nick from local user or kill him/her...
397	>	* \param source_p Pointer to given client to introduce
398		*/
399		void
400		register_local_user(struct Client *source_p)
#	Line 428 | Line 404 | register_local_user(struct Client *sourc
404
405		assert(source_p == source_p->from);
406		assert(MyConnect(source_p));
407	<	assert(!source_p->localClient->registration);
407	>	assert(!source_p->connection->registration);
408
409		ClearCap(source_p, CAP_TS6);
410
411	<	if (ConfigFileEntry.ping_cookie)
411	>	if (ConfigGeneral.ping_cookie)
412		{
413	<	if (!IsPingSent(source_p) && !source_p->localClient->random_ping)
413	>	if (!IsPingSent(source_p) && !source_p->connection->random_ping)
414		{
415		do
416	<	source_p->localClient->random_ping = genrand_int32();
417	<	while (!source_p->localClient->random_ping);
416	>	source_p->connection->random_ping = genrand_int32();
417	>	while (!source_p->connection->random_ping);
418
419	<	sendto_one(source_p, "PING :%u",
444	<	source_p->localClient->random_ping);
419	>	sendto_one(source_p, "PING :%u", source_p->connection->random_ping);
420		SetPingSent(source_p);
421		return;
422		}
#	Line 450 | Line 425 | register_local_user(struct Client *sourc
425		return;
426		}
427
428	<	source_p->localClient->last_privmsg = CurrentTime;
428	>	source_p->connection->last_privmsg = CurrentTime;
429		/* Straight up the maximum rate of flooding... */
430	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
430	>	source_p->connection->allow_read = MAX_FLOOD_BURST;
431
432		if (!check_client(source_p))
433		return;
#	Line 461 | Line 436 | register_local_user(struct Client *sourc
436		{
437		sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
438		"character in your hostname");
439	<	strlcpy(source_p->host, source_p->sockhost,
465	<	sizeof(source_p->host));
439	>	strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
440		}
441
442	<	conf = source_p->localClient->confs.head->data;
442	>	conf = source_p->connection->confs.head->data;
443
444		if (!IsGotId(source_p))
445		{
#	Line 488 | Line 462 | register_local_user(struct Client *sourc
462		source_p->username[i++] = '~';
463
464		for (; *p && i < USERLEN; ++p)
465	<	if (*p != '[')
492	<	source_p->username[i++] = *p;
465	>	source_p->username[i++] = *p;
466
467		source_p->username[i] = '\0';
468		}
469
470	<	/* password check */
470	>	/* Password check */
471		if (!EmptyString(conf->passwd))
472		{
473	<	const char *pass = source_p->localClient->passwd;
501	<
502	<	if (!match_conf_password(pass, conf))
473	>	if (!match_conf_password(source_p->connection->password, conf))
474		{
475		++ServerStats.is_ref;
476
#	Line 509 | Line 480 | register_local_user(struct Client *sourc
480		}
481		}
482
483	<	/* don't free source_p->localClient->passwd here - it can be required
484	<	* by masked /stats I if there are auth{} blocks with need_password = no;
483	>	/*
484	>	* Don't free source_p->connection->password here - it can be required
485	>	* by masked /stats I if there are auth {} blocks with need_password = no;
486		* --adx
487		*/
488
489	<	/* report if user has &^>= etc. and set flags as needed in source_p */
489	>	/*
490	>	* Report if user has &^>= etc. and set flags as needed in source_p
491	>	*/
492		report_and_set_user_flags(source_p, conf);
493
494		if (IsDead(source_p))
495		return;
496
497	<	/* Limit clients -
497	>	/*
498	>	* Limit clients -
499		* We want to be able to have servers and F-line clients
500		* connect, so save room for "buffer" connections.
501		* Smaller servers may want to decrease this, and it should
502		* probably be just a percentage of the MAXCLIENTS...
503		*   -Taner
504		*/
505	<	/* Except "F:" clients */
506	<	if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
532	<	(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
505	>	if ((Count.local >= ConfigServerInfo.max_clients + MAX_BUFFER) ||
506	>	(Count.local >= ConfigServerInfo.max_clients && !IsExemptLimits(source_p)))
507		{
508		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
509		"Too many clients, rejecting %s[%s].",
#	Line 539 | Line 513 | register_local_user(struct Client *sourc
513		return;
514		}
515
542	–	/* valid user name check */
516		if (!valid_username(source_p->username, 1))
517		{
518	<	char tmpstr2[IRCD_BUFSIZE] = "";
518	>	char buf[IRCD_BUFSIZE] = "";
519
520		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
521		"Invalid username: %s (%s@%s)",
522		source_p->name, source_p->username, source_p->host);
523		++ServerStats.is_ref;
524	<	snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
525	<	source_p->username);
553	<	exit_client(source_p, tmpstr2);
524	>	snprintf(buf, sizeof(buf), "Invalid username [%s]", source_p->username);
525	>	exit_client(source_p, buf);
526		return;
527		}
528
#	Line 566 | Line 538 | register_local_user(struct Client *sourc
538		sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
539		"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
540		source_p->name, source_p->username, source_p->host,
541	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
542	<	"255.255.255.255" : source_p->sockhost,
571	<	get_client_class(&source_p->localClient->confs),
541	>	source_p->sockhost,
542	>	get_client_class(&source_p->connection->confs),
543		source_p->info, source_p->id);
544
545	<	if (ConfigFileEntry.invisible_on_connect)
545	>	if (ConfigGeneral.invisible_on_connect)
546		{
547		AddUMode(source_p, UMODE_INVISIBLE);
548		++Count.invisi;
#	Line 583 | Line 554 | register_local_user(struct Client *sourc
554
555		if (!(Count.max_loc % 10))
556		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
557	<	"New Max Local Clients: %d",
557	>	"New maximum local client connections: %u",
558		Count.max_loc);
559		}
560
590	–	/* Increment our total user count here */
561		if (++Count.total > Count.max_tot)
562		Count.max_tot = Count.total;
563		++Count.totalrestartcount;
#	Line 595 | Line 565 | register_local_user(struct Client *sourc
565		assert(source_p->servptr == &me);
566		SetClient(source_p);
567		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
568	<
599	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
568	>	dlinkAdd(source_p, &source_p->node, &global_client_list);
569
570		assert(dlinkFind(&unknown_list, source_p));
571
572	<	dlink_move_node(&source_p->localClient->lclient_node,
572	>	dlink_move_node(&source_p->connection->lclient_node,
573		&unknown_list, &local_client_list);
574
575		user_welcome(source_p);
#	Line 621 | Line 590 | register_local_user(struct Client *sourc
590		*                is introduced by a server.
591		*/
592		void
593	<	register_remote_user(struct Client *source_p, const char *username,
625	<	const char *host, const char *server)
593	>	register_remote_user(struct Client *source_p)
594		{
595	<	struct Client *target_p = NULL;
628	<
629	<	assert(source_p->username != username);
630	<
631	<	strlcpy(source_p->host, host, sizeof(source_p->host));
632	<	strlcpy(source_p->username, username, sizeof(source_p->username));
633	<
634	<	/*
635	<	* coming from another server, take the servers word for it
636	<	*/
637	<	source_p->servptr = hash_find_server(server);
638	<
639	<	/*
640	<	* Super GhostDetect:
641	<	* If we can't find the server the user is supposed to be on,
642	<	* then simply blow the user away.        -Taner
643	<	*/
644	<	if (source_p->servptr == NULL)
645	<	{
646	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
647	<	"No server %s for user %s[%s@%s] from %s",
648	<	server, source_p->name, source_p->username,
649	<	source_p->host, source_p->from->name);
650	<	sendto_one(source_p->from,
651	<	":%s KILL %s :%s (Ghosted, server %s doesn't exist)",
652	<	me.id, source_p->id, me.name, server);
653	<
654	<	AddFlag(source_p, FLAGS_KILLED);
655	<	exit_client(source_p, "Ghosted Client");
656	<	return;
657	<	}
595	>	const struct Client *target_p = NULL;
596
597		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
598		{
#	Line 680 | Line 618 | register_remote_user(struct Client *sour
618		if (HasFlag(source_p->servptr, FLAGS_SERVICE))
619		AddFlag(source_p, FLAGS_SERVICE);
620
683	–	/* Increment our total user count here */
621		if (++Count.total > Count.max_tot)
622		Count.max_tot = Count.total;
623
624		SetClient(source_p);
625		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
626	+	dlinkAdd(source_p, &source_p->node, &global_client_list);
627		add_user_host(source_p->username, source_p->host, 1);
628		SetUserHost(source_p);
629
#	Line 739 | Line 677 | valid_hostname(const char *hostname)
677		int
678		valid_username(const char *username, const int local)
679		{
680	<	int dots      = 0;
680	>	unsigned int dots = 0;
681		const char *p = username;
682
683		assert(p);
#	Line 759 | Line 697 | valid_username(const char *username, con
697		{
698		while (*++p)
699		{
700	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
700	>	if (*p == '.' && ConfigGeneral.dots_in_ident)
701		{
702	<	if (++dots > ConfigFileEntry.dots_in_ident)
702	>	if (++dots > ConfigGeneral.dots_in_ident)
703		return 0;
704		if (!IsUserChar(*(p + 1)))
705		return 0;
#	Line 777 | Line 715 | valid_username(const char *username, con
715		return 0;
716		}
717
718	<	return  p - username <= USERLEN;;
718	>	return p - username <= USERLEN;
719		}
720
721		/* clean_nick_name()
#	Line 791 | Line 729 | int
729		valid_nickname(const char *nickname, const int local)
730		{
731		const char *p = nickname;
794	–	assert(nickname && *nickname);
732
733	<	assert(p);
733	>	assert(nickname && *nickname);
734
735	<	/* nicks can't start with a digit or - or be 0 length */
736	<	/* This closer duplicates behaviour of hybrid-6 */
737	<	if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
735	>	/*
736	>	* Nicks can't start with a digit or - or be 0 length.
737	>	*/
738	>	if (EmptyString(p) || *p == '-' || (IsDigit(*p) && local))
739		return 0;
740
741		for (; *p; ++p)
#	Line 820 | Line 758 | valid_nickname(const char *nickname, con
758		*/
759		void
760		send_umode(struct Client *client_p, struct Client *source_p,
761	<	unsigned int old, unsigned int sendmask, char *umode_buf)
761	>	unsigned int old, char *umode_buf)
762		{
763		char *m = umode_buf;
764		int what = 0;
827	–	unsigned int i;
828	–	unsigned int flag;
765
766		/*
767	<	* build a string in umode_buf to represent the change in the user's
767	>	* Build a string in umode_buf to represent the change in the user's
768		* mode between the new (source_p->umodes) and 'old'.
769		*/
770	<	for (i = 0; i < 128; ++i)
770	>	for (unsigned int i = 0; i < 128; ++i)
771		{
772	<	flag = user_modes[i];
837	<	if (!flag)
838	<	continue;
772	>	unsigned int flag = user_modes[i];
773
774	<	if (MyClient(source_p) && !(flag & sendmask))
774	>	if (!flag)
775		continue;
776
777		if ((flag & old) && !HasUMode(source_p, flag))
#	Line 868 | Line 802 | send_umode(struct Client *client_p, stru
802
803		if (*umode_buf && client_p)
804		sendto_one(client_p, ":%s!%s@%s MODE %s :%s",
805	<	source_p->name, source_p->username,
806	<	source_p->host, source_p->name, umode_buf);
805	>	client_p->name, client_p->username,
806	>	client_p->host, client_p->name, umode_buf);
807		}
808
809		/* send_umode_out()
#	Line 879 | Line 813 | send_umode(struct Client *client_p, stru
813		* side effects - Only send ubuf out to servers that know about this client
814		*/
815		void
816	<	send_umode_out(struct Client *client_p, struct Client *source_p,
883	<	unsigned int old)
816	>	send_umode_out(struct Client *source_p, unsigned int old)
817		{
818		char buf[IRCD_BUFSIZE] = "";
819
820	<	send_umode(NULL, source_p, old, SEND_UMODES, buf);
820	>	send_umode(MyClient(source_p) ? source_p : NULL, source_p, old, buf);
821
822		if (buf[0])
823	<	sendto_server(source_p, NOCAPS, NOCAPS, ":%s MODE %s :%s",
823	>	sendto_server(source_p, 0, 0, ":%s MODE %s :%s",
824		source_p->id, source_p->id, buf);
892	–
893	–	if (client_p && MyClient(client_p))
894	–	send_umode(client_p, source_p, old, 0xffffffff, buf);
825		}
826
827		void
828		user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
829		{
830	<	dlink_node *ptr = NULL;
830	>	dlink_node *node = NULL;
831
832		if (!strcmp(target_p->host, hostname))
833		return;
#	Line 906 | Line 836 | user_set_hostmask(struct Client *target_
836		{
837		case MODE_ADD:
838		AddUMode(target_p, UMODE_HIDDENHOST);
909	–	AddFlag(target_p, FLAGS_IP_SPOOFING);
839		break;
840		case MODE_DEL:
841		DelUMode(target_p, UMODE_HIDDENHOST);
913	–
914	–	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
915	–	DelFlag(target_p, FLAGS_IP_SPOOFING);
842		break;
843		default: return;
844		}
845
846	<	if (ConfigFileEntry.cycle_on_host_change)
846	>	if (ConfigGeneral.cycle_on_host_change)
847		sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
848		target_p->name, target_p->username, target_p->host);
849
#	Line 931 | Line 857 | user_set_hostmask(struct Client *target_
857
858		if (MyClient(target_p))
859		{
860	<	sendto_one_numeric(target_p, &me, RPL_NEWHOSTIS, target_p->host);
860	>	sendto_one_numeric(target_p, &me, RPL_VISIBLEHOST, target_p->host);
861		clear_ban_cache_client(target_p);
862		}
863
864	<	if (!ConfigFileEntry.cycle_on_host_change)
864	>	if (!ConfigGeneral.cycle_on_host_change)
865		return;
866
867	<	DLINK_FOREACH(ptr, target_p->channel.head)
867	>	DLINK_FOREACH(node, target_p->channel.head)
868		{
869		char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
870		char *p = modebuf;
871		int len = 0;
872	<	const struct Membership *ms = ptr->data;
872	>	const struct Membership *member = node->data;
873
874	<	if (has_member_flags(ms, CHFL_CHANOP))
874	>	if (has_member_flags(member, CHFL_CHANOP))
875		{
876		*p++ = 'o';
877		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
878		}
879
880	<	if (has_member_flags(ms, CHFL_HALFOP))
880	>	if (has_member_flags(member, CHFL_HALFOP))
881		{
882		*p++ = 'h';
883		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
884		}
885
886	<	if (has_member_flags(ms, CHFL_VOICE))
886	>	if (has_member_flags(member, CHFL_VOICE))
887		{
888		*p++ = 'v';
889		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
#	Line 965 | Line 891 | user_set_hostmask(struct Client *target_
891
892		*p = '\0';
893
894	<	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
895	<	target_p->name, target_p->username, target_p->host,
896	<	ms->chptr->chname);
894	>
895	>	sendto_channel_local_butone(target_p, CAP_EXTENDED_JOIN, 0, member->chptr, ":%s!%s@%s JOIN %s %s :%s",
896	>	target_p->name, target_p->username,
897	>	target_p->host, member->chptr->name,
898	>	(!IsDigit(target_p->account[0]) && target_p->account[0] != '*') ? target_p->account : "*",
899	>	target_p->info);
900	>	sendto_channel_local_butone(target_p, 0, CAP_EXTENDED_JOIN, member->chptr, ":%s!%s@%s JOIN :%s",
901	>	target_p->name, target_p->username,
902	>	target_p->host, member->chptr->name);
903	>
904		if (nickbuf[0])
905	<	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
906	<	target_p->servptr->name, ms->chptr->chname,
905	>	sendto_channel_local_butone(target_p, 0, 0, member->chptr, ":%s MODE %s +%s %s",
906	>	target_p->servptr->name, member->chptr->name,
907		modebuf, nickbuf);
908
909		}
#	Line 982 | Line 915 | user_set_hostmask(struct Client *target_
915		target_p->host, target_p->away);
916		}
917
918	<	/* oper_up()
919	<	*
920	<	* inputs       - pointer to given client to oper
988	<	* output       - NONE
989	<	* side effects - Blindly opers up given source_p, using conf info
990	<	*                all checks on passwords have already been done.
991	<	*                This could also be used by rsa oper routines.
918	>	/*! \brief Blindly opers up given source_p, using conf info.
919	>	*         All checks on passwords have already been done.
920	>	* \param source_p Pointer to given client to oper
921		*/
922		void
923		oper_up(struct Client *source_p)
924		{
925		const unsigned int old = source_p->umodes;
926	<	const struct MaskItem *conf = source_p->localClient->confs.head->data;
926	>	const struct MaskItem *const conf = source_p->connection->confs.head->data;
927
928	<	assert(source_p->localClient->confs.head);
928	>	assert(source_p->connection->confs.head);
929
930		++Count.oper;
931		SetOper(source_p);
932
933		if (conf->modes)
934		AddUMode(source_p, conf->modes);
935	<	else if (ConfigFileEntry.oper_umodes)
936	<	AddUMode(source_p, ConfigFileEntry.oper_umodes);
935	>	else if (ConfigGeneral.oper_umodes)
936	>	AddUMode(source_p, ConfigGeneral.oper_umodes);
937
938		if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
939		++Count.invisi;
#	Line 1021 | Line 950 | oper_up(struct Client *source_p)
950
951		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
952		get_oper_name(source_p));
953	<	send_umode_out(source_p, source_p, old);
953	>	sendto_server(NULL, 0, 0, ":%s GLOBOPS :%s is now an operator",
954	>	me.id, get_oper_name(source_p));
955	>	send_umode_out(source_p, old);
956		sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
957		}
958
959	<	static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
959	>	static char new_uid[TOTALSIDUID + 1];  /* Allow for \0 */
960
961		int
962		valid_sid(const char *sid)
#	Line 1052 | Line 983 | init_uid(void)
983		{
984		memset(new_uid, 0, sizeof(new_uid));
985
986	<	if (!EmptyString(ServerInfo.sid))
987	<	strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
986	>	if (!EmptyString(ConfigServerInfo.sid))
987	>	strlcpy(new_uid, ConfigServerInfo.sid, sizeof(new_uid));
988
989		for (unsigned int i = 0; i < IRC_MAXSID; ++i)
990		if (new_uid[i] == '\0')
#	Line 1072 | Line 1003 | init_uid(void)
1003		*                note this is a recursive function
1004		*/
1005		static void
1006	<	add_one_to_uid(int i)
1006	>	add_one_to_uid(unsigned int i)
1007		{
1008	<	if (i != IRC_MAXSID)    /* Not reached server SID portion yet? */
1008	>	if (i != IRC_MAXSID)  /* Not reached server SID portion yet? */
1009		{
1010		if (new_uid[i] == 'Z')
1011		new_uid[i] = '0';
1012		else if (new_uid[i] == '9')
1013		{
1014		new_uid[i] = 'A';
1015	<	add_one_to_uid(i-1);
1015	>	add_one_to_uid(i - 1);
1016		}
1017		else
1018		++new_uid[i];
#	Line 1106 | Line 1037 | add_one_to_uid(int i)
1037		static const char *
1038		uid_get(void)
1039		{
1040	<	add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
1040	>	add_one_to_uid(TOTALSIDUID - 1);  /* Index from 0 */
1041		return new_uid;
1042		}
1043
#	Line 1121 | Line 1052 | void
1052		init_isupport(void)
1053		{
1054		add_isupport("CALLERID", NULL, -1);
1055	<	add_isupport("CASEMAPPING", CASEMAP, -1);
1055	>	add_isupport("CASEMAPPING", "rfc1459", -1);
1056		add_isupport("DEAF", "D", -1);
1057		add_isupport("KICKLEN", NULL, KICKLEN);
1058		add_isupport("MODES", NULL, MAXMODEPARAMS);
1128	–	#ifdef HALFOPS
1059		add_isupport("PREFIX", "(ohv)@%+", -1);
1060		add_isupport("STATUSMSG", "@%+", -1);
1061	<	#else
1062	<	add_isupport("PREFIX", "(ov)@+", -1);
1133	<	add_isupport("STATUSMSG", "@+", -1);
1134	<	#endif
1135	<	add_isupport("EXCEPTS", "e", -1);
1136	<	add_isupport("INVEX", "I", -1);
1061	>	add_isupport("EXCEPTS", NULL, -1);
1062	>	add_isupport("INVEX", NULL, -1);
1063		}
1064
1065		/*
#	Line 1148 | Line 1074 | init_isupport(void)
1074		void
1075		add_isupport(const char *name, const char *options, int n)
1076		{
1077	<	dlink_node *ptr;
1078	<	struct Isupport *support;
1077	>	dlink_node *node = NULL;
1078	>	struct Isupport *support = NULL;
1079
1080	<	DLINK_FOREACH(ptr, support_list.head)
1080	>	DLINK_FOREACH(node, support_list.head)
1081		{
1082	<	support = ptr->data;
1082	>	support = node->data;
1083		if (irccmp(support->name, name) == 0)
1084		{
1085		MyFree(support->name);
#	Line 1162 | Line 1088 | add_isupport(const char *name, const cha
1088		}
1089		}
1090
1091	<	if (ptr == NULL)
1091	>	if (node == NULL)
1092		{
1093	<	support = MyMalloc(sizeof(*support));
1093	>	support = MyCalloc(sizeof(*support));
1094		dlinkAddTail(support, &support->node, &support_list);
1095		}
1096
1097		support->name = xstrdup(name);
1098	<	if (options != NULL)
1098	>	if (options)
1099		support->options = xstrdup(options);
1100		support->number = n;
1101
#	Line 1186 | Line 1112 | add_isupport(const char *name, const cha
1112		void
1113		delete_isupport(const char *name)
1114		{
1115	<	dlink_node *ptr;
1190	<	struct Isupport *support;
1115	>	dlink_node *node = NULL;
1116
1117	<	DLINK_FOREACH(ptr, support_list.head)
1117	>	DLINK_FOREACH(node, support_list.head)
1118		{
1119	<	support = ptr->data;
1119	>	struct Isupport *support = node->data;
1120	>
1121		if (irccmp(support->name, name) == 0)
1122		{
1123	<	dlinkDelete(ptr, &support_list);
1123	>	dlinkDelete(node, &support_list);
1124		MyFree(support->name);
1125		MyFree(support->options);
1126		MyFree(support);
#	Line 1217 | Line 1143 | rebuild_isupport_message_line(void)
1143		{
1144		char isupportbuffer[IRCD_BUFSIZE];
1145		char *p = isupportbuffer;
1146	<	dlink_node *ptr = NULL, *ptr_next = NULL;
1146	>	dlink_node *node = NULL, *node_next = NULL;
1147		int n = 0;
1148		int tokens = 0;
1149		size_t len = 0;
1150		size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1151
1152	<	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1152	>	DLINK_FOREACH_SAFE(node, node_next, support_list_lines.head)
1153		{
1154	<	dlinkDelete(ptr, &support_list_lines);
1155	<	MyFree(ptr->data);
1156	<	free_dlink_node(ptr);
1154	>	dlinkDelete(node, &support_list_lines);
1155	>	MyFree(node->data);
1156	>	free_dlink_node(node);
1157		}
1158
1159	<	DLINK_FOREACH(ptr, support_list.head)
1159	>	DLINK_FOREACH(node, support_list.head)
1160		{
1161	<	struct Isupport *support = ptr->data;
1161	>	struct Isupport *support = node->data;
1162
1163		p += (n = sprintf(p, "%s", support->name));
1164		len += n;
1165
1166	<	if (support->options != NULL)
1166	>	if (support->options)
1167		{
1168		p += (n = sprintf(p, "=%s", support->options));
1169		len += n;
#	Line 1265 | Line 1191 | rebuild_isupport_message_line(void)
1191		}
1192		}
1193
1194	<	if (len != 0)
1194	>	if (len)
1195		{
1196		if (*--p == ' ')
1197		*p = '\0';

Diff Legend

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