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 1832 by michael, Fri Apr 19 19:16:09 2013 UTC vs.
Revision 3135 by michael, Mon Mar 10 21:11:25 2014 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  s_user.c: User related functions.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2002 by the past and present ircd coders, and others.
4	>	*  Copyright (c) 1997-2014 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 18 | Line 17
17		*  along with this program; if not, write to the Free Software
18		*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
19		*  USA
20	<	*
21	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file s_user.c
23	>	* \brief User related functions.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
#	Line 29 | Line 31
31		#include "channel.h"
32		#include "channel_mode.h"
33		#include "client.h"
32	–	#include "fdlist.h"
34		#include "hash.h"
35		#include "irc_string.h"
35	–	#include "s_bsd.h"
36		#include "ircd.h"
37		#include "listener.h"
38		#include "motd.h"
#	Line 42 | Line 42
42		#include "s_serv.h"
43		#include "send.h"
44		#include "supported.h"
45	–	#include "whowas.h"
45		#include "memory.h"
46		#include "packet.h"
47		#include "rng_mt.h"
48		#include "userhost.h"
50	–	#include "hook.h"
49		#include "s_misc.h"
50		#include "parse.h"
51		#include "watch.h"
52
55	–
56	–	struct Callback *entering_umode_cb = NULL;
57	–	struct Callback *umode_cb = NULL;
58	–
53		static char umode_buffer[IRCD_BUFSIZE];
54
55		static void user_welcome(struct Client *);
#	Line 68 | Line 62 | static const char *uid_get(void);
62		* used with init_isupport, add_isupport, delete_isupport
63		*/
64
65	<	struct Isupport
65	>	struct Isupport
66		{
67		dlink_node node;
68		char *name;
#	Line 76 | Line 70 | struct Isupport
70		int number;
71		};
72
73	<	static dlink_list support_list = { NULL, NULL, 0 };
74	<	MessageFile *isupportFile;
73	>	static dlink_list support_list;
74	>	static dlink_list support_list_lines;
75
76		/* memory is cheap. map 0-255 to equivalent mode */
77	<	unsigned int user_modes[256] =
77	>	const unsigned int user_modes[256] =
78		{
79		/* 0x00 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x0F */
80		/* 0x10 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x1F */
#	Line 89 | Line 83 | unsigned int user_modes[256] =
83		0,                  /* @ */
84		0,                  /* A */
85		0,                  /* B */
86	<	UMODE_CCONN_FULL,   /* C */
86	>	0,                  /* C */
87		UMODE_DEAF,         /* D */
88		0,                  /* E */
89	<	0,                  /* F */
89	>	UMODE_FARCONNECT,   /* F */
90		UMODE_SOFTCALLERID, /* G */
91		UMODE_HIDDEN,       /* H */
92		0,                  /* I */
#	Line 105 | Line 99 | unsigned int user_modes[256] =
99		0,                  /* P */
100		0,                  /* Q */
101		UMODE_REGONLY,      /* R */
102	<	0,                  /* S */
102	>	UMODE_SSL,          /* S */
103		0,                  /* T */
104		0,                  /* U */
105		0,                  /* V */
106	<	0,                  /* W */
106	>	UMODE_WEBIRC,       /* W */
107		0,                  /* X */
108		0,                  /* Y */
109		0,                  /* Z 0x5A */
110	<	0, 0, 0, 0, 0,      /* 0x5F   */
110	>	0, 0, 0, 0, 0,      /* 0x5F   */
111		0,                  /* 0x60   */
112		UMODE_ADMIN,        /* a */
113		UMODE_BOTS,         /* b */
#	Line 138 | Line 132 | unsigned int user_modes[256] =
132		UMODE_UNAUTH,       /* u */
133		0,                  /* v */
134		UMODE_WALLOP,       /* w */
135	<	0,                  /* x */
135	>	UMODE_HIDDENHOST,   /* x */
136		UMODE_SPY,          /* y */
137		UMODE_OPERWALL,     /* z      0x7A */
138		0,0,0,0,0,          /* 0x7B - 0x7F */
#	Line 173 | Line 167 | assemble_umode_buffer(void)
167		* side effects - display to client user counts etc.
168		*/
169		void
170	<	show_lusers(struct Client *source_p)
170	>	show_lusers(struct Client *source_p)
171		{
178	–	const char *from, *to;
179	–
180	–	if (!MyConnect(source_p) && IsCapable(source_p->from, CAP_TS6) && HasID(source_p))
181	–	{
182	–	from = me.id;
183	–	to = source_p->id;
184	–	}
185	–	else
186	–	{
187	–	from = me.name;
188	–	to = source_p->name;
189	–	}
190	–
172		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
173	<	sendto_one(source_p, RPL_LUSERCLIENT,
174	<	from, to, (Count.total-Count.invisi),
194	<	Count.invisi, dlink_list_length(&global_serv_list));
173	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total-Count.invisi),
174	>	Count.invisi, dlink_list_length(&global_serv_list));
175		else
176	<	sendto_one(source_p, RPL_LUSERCLIENT, from, to,
177	<	(Count.total-Count.invisi), Count.invisi, 1);
176	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT,
177	>	(Count.total-Count.invisi), Count.invisi, 1);
178
179		if (Count.oper > 0)
180	<	sendto_one(source_p, RPL_LUSEROP,
201	<	from, to, Count.oper);
180	>	sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper);
181
182		if (dlink_list_length(&unknown_list) > 0)
183	<	sendto_one(source_p, RPL_LUSERUNKNOWN,
205	<	from, to, dlink_list_length(&unknown_list));
183	>	sendto_one_numeric(source_p, &me, RPL_LUSERUNKNOWN, dlink_list_length(&unknown_list));
184
185		if (dlink_list_length(&global_channel_list) > 0)
186	<	sendto_one(source_p, RPL_LUSERCHANNELS,
209	<	from, to, dlink_list_length(&global_channel_list));
186	>	sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&global_channel_list));
187
188		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
189		{
190	<	sendto_one(source_p, RPL_LUSERME,
191	<	from, to, Count.local, Count.myserver);
215	<	sendto_one(source_p, RPL_LOCALUSERS,
216	<	from, to, Count.local, Count.max_loc,
217	<	Count.local, Count.max_loc);
190	>	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.local, Count.myserver);
191	>	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.local, Count.max_loc);
192		}
193		else
194		{
195	<	sendto_one(source_p, RPL_LUSERME,
196	<	from, to, Count.total, 0);
223	<	sendto_one(source_p, RPL_LOCALUSERS,
224	<	from, to, Count.total, Count.max_tot,
225	<	Count.total, Count.max_tot);
195	>	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.total, 0);
196	>	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.total, Count.max_tot);
197		}
198
199	<	sendto_one(source_p, RPL_GLOBALUSERS,
229	<	from, to, Count.total, Count.max_tot,
230	<	Count.total, Count.max_tot);
199	>	sendto_one_numeric(source_p, &me, RPL_GLOBALUSERS, Count.total, Count.max_tot);
200
201		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
202	<	sendto_one(source_p, RPL_STATSCONN, from, to,
203	<	Count.max_loc_con, Count.max_loc_cli, Count.totalrestartcount);
202	>	sendto_one_numeric(source_p, &me, RPL_STATSCONN, Count.max_loc_con,
203	>	Count.max_loc_cli, Count.totalrestartcount);
204
205		if (Count.local > Count.max_loc_cli)
206		Count.max_loc_cli = Count.local;
207
208		if ((Count.local + Count.myserver) > Count.max_loc_con)
209	<	Count.max_loc_con = Count.local + Count.myserver;
209	>	Count.max_loc_con = Count.local + Count.myserver;
210		}
211
212		/* show_isupport()
#	Line 247 | Line 216 | show_lusers(struct Client *source_p)
216		* side effects - display to client what we support (for them)
217		*/
218		void
219	<	show_isupport(struct Client *source_p)
219	>	show_isupport(struct Client *source_p)
220		{
221	<	send_message_file(source_p, isupportFile);
221	>	const dlink_node *ptr = NULL;
222	>
223	>	DLINK_FOREACH(ptr, support_list_lines.head)
224	>	sendto_one_numeric(source_p, &me, RPL_ISUPPORT, ptr->data);
225		}
226
227		/*
#	Line 290 | Line 262 | register_local_user(struct Client *sourc
262
263		if (ConfigFileEntry.ping_cookie)
264		{
265	<	if (!IsPingSent(source_p) && source_p->localClient->random_ping == 0)
265	>	if (!IsPingSent(source_p) && !source_p->localClient->random_ping)
266		{
267		do
268		source_p->localClient->random_ping = genrand_int32();
#	Line 313 | Line 285 | register_local_user(struct Client *sourc
285		if (!check_client(source_p))
286		return;
287
288	<	if (valid_hostname(source_p->host) == 0)
288	>	if (!valid_hostname(source_p->host))
289		{
290	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You have an illegal "
291	<	"character in your hostname", me.name, source_p->name);
290	>	sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
291	>	"character in your hostname");
292		strlcpy(source_p->host, source_p->sockhost,
293		sizeof(source_p->host));
294		}
#	Line 332 | Line 304 | register_local_user(struct Client *sourc
304		if (IsNeedIdentd(conf))
305		{
306		++ServerStats.is_ref;
307	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You need to install "
308	<	"identd to use this server", me.name, source_p->name);
307	>	sendto_one_notice(source_p, &me, ":*** Notice -- You need to install "
308	>	"identd to use this server");
309		exit_client(source_p, &me, "Install identd");
310		return;
311		}
#	Line 358 | Line 330 | register_local_user(struct Client *sourc
330		if (!match_conf_password(pass, conf))
331		{
332		++ServerStats.is_ref;
333	<	sendto_one(source_p, ERR_PASSWDMISMATCH,
334	<	me.name, source_p->name);
333	>
334	>	sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
335		exit_client(source_p, &me, "Bad Password");
336		return;
337		}
#	Line 396 | Line 368 | register_local_user(struct Client *sourc
368		}
369
370		/* valid user name check */
371	<	if (valid_username(source_p->username) == 0)
371	>	if (!valid_username(source_p->username, 1))
372		{
373		char tmpstr2[IRCD_BUFSIZE];
374
#	Line 427 | Line 399 | register_local_user(struct Client *sourc
399		get_client_class(&source_p->localClient->confs),
400		source_p->info, source_p->id);
401
430	–	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL, SEND_NOTICE,
431	–	"CLICONN %s %s %s %s %s %s %s 0 %s",
432	–	source_p->name, source_p->username, source_p->host,
433	–	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
434	–	"255.255.255.255" : source_p->sockhost,
435	–	get_client_class(&source_p->localClient->confs),
436	–	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
437	–	"<hidden>" : source_p->localClient->client_host,
438	–	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
439	–	"<hidden>" : source_p->localClient->client_server,
440	–	source_p->info);
441	–
442	–
402		if (ConfigFileEntry.invisible_on_connect)
403		{
404		AddUMode(source_p, UMODE_INVISIBLE);
405		++Count.invisi;
406		}
407
408	<	if ((++Count.local) > Count.max_loc)
408	>	if (++Count.local > Count.max_loc)
409		{
410		Count.max_loc = Count.local;
411
#	Line 485 | Line 444 | register_local_user(struct Client *sourc
444		*              - username to register as
445		*              - host name to register as
446		*              - server name
488	–	*              - realname (gecos)
447		* output       - NONE
448		* side effects - This function is called when a remote client
449		*                is introduced by a server.
450		*/
451		void
452	<	register_remote_user(struct Client *source_p,
453	<	const char *username, const char *host, const char *server,
496	<	const char *realname)
452	>	register_remote_user(struct Client *source_p, const char *username,
453	>	const char *host, const char *server)
454		{
455		struct Client *target_p = NULL;
456
457		assert(source_p != NULL);
458		assert(source_p->username != username);
459
460	<	strlcpy(source_p->host, host, sizeof(source_p->host));
460	>	strlcpy(source_p->host, host, sizeof(source_p->host));
461		strlcpy(source_p->username, username, sizeof(source_p->username));
462
463		/*
#	Line 557 | Line 514 | register_remote_user(struct Client *sour
514		add_user_host(source_p->username, source_p->host, 1);
515		SetUserHost(source_p);
516
517	+	if (HasFlag(source_p->servptr, FLAGS_EOB))
518	+	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
519	+	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
520	+	source_p->servptr->name,
521	+	source_p->name, source_p->username, source_p->host,
522	+	source_p->info, source_p->id);
523	+
524		introduce_client(source_p);
525		}
526
#	Line 572 | Line 536 | static void
536		introduce_client(struct Client *source_p)
537		{
538		dlink_node *server_node = NULL;
539	<	static char ubuf[12];
539	>	char ubuf[IRCD_BUFSIZE];
540
541		if (MyClient(source_p))
542		send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
#	Line 581 | Line 545 | introduce_client(struct Client *source_p
545
546		watch_check_hash(source_p, RPL_LOGON);
547
548	<	if (*ubuf == '\0')
548	>	if (ubuf[0] == '\0')
549		{
550		ubuf[0] = '+';
551		ubuf[1] = '\0';
#	Line 595 | Line 559 | introduce_client(struct Client *source_p
559		continue;
560
561		if (IsCapable(server, CAP_SVS))
562	<	{
563	<	if (IsCapable(server, CAP_TS6) && HasID(source_p))
564	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
565	<	source_p->servptr->id,
566	<	source_p->name, source_p->hopcount+1,
567	<	(unsigned long)source_p->tsinfo,
568	<	ubuf, source_p->username, source_p->host,
569	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
570	<	"0" : source_p->sockhost, source_p->id,
607	<	source_p->svid,
608	<	source_p->info);
609	<	else
610	<	sendto_one(server, "NICK %s %d %lu %s %s %s %s %s :%s",
611	<	source_p->name, source_p->hopcount+1,
612	<	(unsigned long)source_p->tsinfo,
613	<	ubuf, source_p->username, source_p->host,
614	<	source_p->servptr->name, source_p->svid,
615	<	source_p->info);
616	<
617	<	}
562	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
563	>	source_p->servptr->id,
564	>	source_p->name, source_p->hopcount+1,
565	>	(unsigned long)source_p->tsinfo,
566	>	ubuf, source_p->username, source_p->host,
567	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
568	>	"0" : source_p->sockhost, source_p->id,
569	>	source_p->svid,
570	>	source_p->info);
571		else
572	<	{
573	<	if (IsCapable(server, CAP_TS6) && HasID(source_p))
574	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
575	<	source_p->servptr->id,
576	<	source_p->name, source_p->hopcount+1,
577	<	(unsigned long)source_p->tsinfo,
578	<	ubuf, source_p->username, source_p->host,
579	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
580	<	"0" : source_p->sockhost, source_p->id, source_p->info);
581	<	else
629	<	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
630	<	source_p->name, source_p->hopcount+1,
631	<	(unsigned long)source_p->tsinfo,
632	<	ubuf, source_p->username, source_p->host,
633	<	source_p->servptr->name, source_p->info);
634	<	}
572	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
573	>	source_p->servptr->id,
574	>	source_p->name, source_p->hopcount+1,
575	>	(unsigned long)source_p->tsinfo,
576	>	ubuf, source_p->username, source_p->host,
577	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
578	>	"0" : source_p->sockhost, source_p->id, source_p->info);
579	>
580	>	if (!EmptyString(source_p->certfp))
581	>	sendto_one(server, ":%s CERTFP %s", ID(source_p), source_p->certfp);
582		}
583		}
584
#	Line 651 | Line 598 | valid_hostname(const char *hostname)
598
599		assert(p != NULL);
600
601	<	if (*p == '.' || *p == ':')
601	>	if (EmptyString(p) || *p == '.' || *p == ':')
602		return 0;
603
604		for (; *p; ++p)
#	Line 673 | Line 620 | valid_hostname(const char *hostname)
620		* style of username
621		*/
622		int
623	<	valid_username(const char *username)
623	>	valid_username(const char *username, const int local)
624		{
625		int dots      = 0;
626		const char *p = username;
#	Line 683 | Line 630 | valid_username(const char *username)
630		if (*p == '~')
631		++p;
632
633	<	/* reject usernames that don't start with an alphanum
633	>	/*
634	>	* Reject usernames that don't start with an alphanum
635		* i.e. reject jokers who have '-@somehost' or '.@somehost'
636		* or "-hi-@somehost", "h-----@somehost" would still be accepted.
637		*/
638		if (!IsAlNum(*p))
639		return 0;
640
641	<	while (*++p)
641	>	if (local)
642		{
643	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
643	>	while (*++p)
644		{
645	<	if (++dots > ConfigFileEntry.dots_in_ident)
646	<	return 0;
647	<	if (!IsUserChar(*(p + 1)))
645	>	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
646	>	{
647	>	if (++dots > ConfigFileEntry.dots_in_ident)
648	>	return 0;
649	>	if (!IsUserChar(*(p + 1)))
650	>	return 0;
651	>	}
652	>	else if (!IsUserChar(*p))
653		return 0;
654		}
655	<	else if (!IsUserChar(*p))
656	<	return 0;
655	>	}
656	>	else
657	>	{
658	>	while (*++p)
659	>	if (!IsUserChar(*p))
660	>	return 0;
661		}
662
663	<	return 1;
663	>	return  p - username <= USERLEN;;
664		}
665
666		/* clean_nick_name()
#	Line 744 | Line 701 | report_and_set_user_flags(struct Client
701		{
702		/* If this user is being spoofed, tell them so */
703		if (IsConfDoSpoofIp(conf))
704	<	{
748	<	sendto_one(source_p,
749	<	":%s NOTICE %s :*** Spoofing your IP. congrats.",
750	<	me.name, source_p->name);
751	<	}
704	>	sendto_one_notice(source_p, &me, ":*** Spoofing your IP. Congrats.");
705
706		/* If this user is in the exception class, Set it "E lined" */
707		if (IsConfExemptKline(conf))
708		{
709		SetExemptKline(source_p);
710	<	sendto_one(source_p,
758	<	":%s NOTICE %s :*** You are exempt from K/D/G lines. congrats.",
759	<	me.name, source_p->name);
710	>	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D/G lines. Congrats.");
711		}
712
713	<	/* The else here is to make sure that G line exempt users
713	>	/*
714	>	* The else here is to make sure that G line exempt users
715		* do not get noticed twice.
716		*/
717		else if (IsConfExemptGline(conf))
718		{
719		SetExemptGline(source_p);
720	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines.",
769	<	me.name, source_p->name);
720	>	sendto_one_notice(source_p, &me, ":*** You are exempt from G lines. Congrats.");
721		}
722
723		if (IsConfExemptResv(conf))
724		{
725		SetExemptResv(source_p);
726	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs.",
776	<	me.name, source_p->name);
726	>	sendto_one_notice(source_p, &me, ":*** You are exempt from resvs. Congrats.");
727		}
728
729		/* If this user is exempt from user limits set it "F lined" */
730		if (IsConfExemptLimits(conf))
731		{
732		SetExemptLimits(source_p);
733	<	sendto_one(source_p,
784	<	":%s NOTICE %s :*** You are exempt from user limits. congrats.",
785	<	me.name,source_p->name);
733	>	sendto_one_notice(source_p, &me, ":*** You are exempt from user limits. Congrats.");
734		}
735
736		if (IsConfCanFlood(conf))
737		{
738		SetCanFlood(source_p);
739	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
740	<	"protection, aren't you fearsome.",
793	<	me.name, source_p->name);
739	>	sendto_one_notice(source_p, &me, ":*** You are exempt from flood "
740	>	"protection, aren't you fearsome.");
741		}
742		}
743
797	–	/* change_simple_umode()
798	–	*
799	–	* this callback can be hooked to allow special handling of
800	–	* certain usermodes
801	–	*/
802	–	static void *
803	–	change_simple_umode(va_list args)
804	–	{
805	–	struct Client *client_p;
806	–	struct Client *source_p;
807	–	int what;
808	–	unsigned int flag;
809	–
810	–	client_p = va_arg(args, struct Client *);
811	–	source_p = va_arg(args, struct Client *);
812	–	what = va_arg(args, int);
813	–	flag = va_arg(args, unsigned int);
814	–
815	–	if (what == MODE_ADD)
816	–	AddUMode(source_p, flag);
817	–	else
818	–	DelUMode(source_p, flag);
819	–
820	–	return NULL;
821	–	}
822	–
744		/* set_user_mode()
745		*
746		* added 15/10/91 By Darren Reed.
#	Line 829 | Line 750 | change_simple_umode(va_list args)
750		*/
751		void
752		set_user_mode(struct Client *client_p, struct Client *source_p,
753	<	int parc, char *parv[])
753	>	const int parc, char *parv[])
754		{
755		unsigned int flag, setflags;
756		char **p, *m, buf[IRCD_BUFSIZE];
#	Line 841 | Line 762 | set_user_mode(struct Client *client_p, s
762		if ((target_p = find_person(client_p, parv[1])) == NULL)
763		{
764		if (MyConnect(source_p))
765	<	sendto_one(source_p, ERR_NOSUCHCHANNEL,
845	<	me.name, source_p->name, parv[1]);
765	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHCHANNEL, parv[1]);
766		return;
767		}
768
769		if (source_p != target_p)
770		{
771	<	sendto_one(source_p, ERR_USERSDONTMATCH,
852	<	me.name, source_p->name);
771	>	sendto_one_numeric(source_p, &me, ERR_USERSDONTMATCH);
772		return;
773		}
774
#	Line 858 | Line 777 | set_user_mode(struct Client *client_p, s
777		m = buf;
778		*m++ = '+';
779
780	<	for (i = 0; i < 128; i++)
780	>	for (i = 0; i < 128; ++i)
781		if (HasUMode(source_p, user_modes[i]))
782		*m++ = (char)i;
783		*m = '\0';
784
785	<	sendto_one(source_p, RPL_UMODEIS,
867	<	me.name, source_p->name, buf);
785	>	sendto_one_numeric(source_p, &me, RPL_UMODEIS, buf);
786		return;
787		}
788
871	–	execute_callback(entering_umode_cb, client_p, source_p);
872	–
789		/* find flags already set for user */
790		setflags = source_p->umodes;
791
792		/* parse mode change string(s) */
793	<	for (p = &parv[2]; p && *p; p++)
793	>	for (p = &parv[2]; p && *p; ++p)
794		{
795	<	for (m = *p; *m; m++)
795	>	for (m = *p; *m; ++m)
796		{
797		switch (*m)
798		{
#	Line 897 | Line 813 | set_user_mode(struct Client *client_p, s
813		}
814		else
815		{
900	–	/* Only decrement the oper counts if an oper to begin with
901	–	* found by Pat Szuta, Perly , perly@xnet.com
902	–	*/
816		if (!HasUMode(source_p, UMODE_OPER))
817		break;
818
#	Line 908 | Line 821 | set_user_mode(struct Client *client_p, s
821
822		if (MyConnect(source_p))
823		{
824	<	dlink_node *dm;
824	>	dlink_node *dm = NULL;
825
826		detach_conf(source_p, CONF_OPER);
827		ClrOFlag(source_p);
#	Line 921 | Line 834 | set_user_mode(struct Client *client_p, s
834
835		break;
836
837	<	/* we may not get these,
838	<	* but they shouldnt be in default
839	<	*/
840	<	case 'r':
928	<	case ' ' :
929	<	case '\n':
930	<	case '\r':
931	<	case '\t':
837	>	case 'S':  /* Only servers may set +S in a burst */
838	>	case 'W':  /* Only servers may set +W in a burst */
839	>	case 'r':  /* Only services may set +r */
840	>	case 'x':  /* Only services may set +x */
841		break;
842
843		default:
#	Line 936 | Line 845 | set_user_mode(struct Client *client_p, s
845		{
846		if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
847		(ConfigFileEntry.oper_only_umodes & flag))
939	–	{
848		badflag = 1;
941	–	}
849		else
850	<	execute_callback(umode_cb, client_p, source_p, what, flag);
851	<	}
852	<	else
853	<	{
854	<	if (MyConnect(source_p))
855	<	badflag = 1;
850	>	{
851	>	if (what == MODE_ADD)
852	>	AddUMode(source_p, flag);
853	>	else
854	>	DelUMode(source_p, flag);
855	>	}
856		}
857	+	else if (MyConnect(source_p))
858	+	badflag = 1;
859
860		break;
861		}
#	Line 954 | Line 863 | set_user_mode(struct Client *client_p, s
863		}
864
865		if (badflag)
866	<	sendto_one(source_p, ERR_UMODEUNKNOWNFLAG,
958	<	me.name, source_p->name);
959	<
960	<	if (HasUMode(source_p, UMODE_NCHANGE) && !HasOFlag(source_p, OPER_FLAG_N))
961	<	{
962	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no nchange flag;",
963	<	me.name, source_p->name);
964	<	DelUMode(source_p, UMODE_NCHANGE);
965	<	}
866	>	sendto_one_numeric(source_p, &me, ERR_UMODEUNKNOWNFLAG);
867
868		if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
869		!HasOFlag(source_p, OPER_FLAG_ADMIN))
870		{
871	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
971	<	me.name, source_p->name);
871	>	sendto_one_notice(source_p, &me, ":*** You have no admin flag;");
872		DelUMode(source_p, UMODE_ADMIN);
873		}
874
#	Line 1008 | Line 908 | send_umode(struct Client *client_p, stru
908		* build a string in umode_buf to represent the change in the user's
909		* mode between the new (source_p->umodes) and 'old'.
910		*/
911	<	for (i = 0; i < 128; i++)
911	>	for (i = 0; i < 128; ++i)
912		{
913		flag = user_modes[i];
914		if (!flag)
#	Line 1082 | Line 982 | send_umode_out(struct Client *client_p,
982		}
983
984		void
985	<	user_set_hostmask(struct Client *target_p, const char *hostname)
985	>	user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
986		{
987	<	if (!valid_hostname(hostname))
987	>	dlink_node *ptr = NULL;
988	>
989	>	if (!strcmp(target_p->host, hostname))
990		return;
991
992	+	switch (what)
993	+	{
994	+	case MODE_ADD:
995	+	AddUMode(target_p, UMODE_HIDDENHOST);
996	+	AddFlag(target_p, FLAGS_IP_SPOOFING);
997	+	break;
998	+	case MODE_DEL:
999	+	DelUMode(target_p, UMODE_HIDDENHOST);
1000	+
1001	+	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
1002	+	DelFlag(target_p, FLAGS_IP_SPOOFING);
1003	+	break;
1004	+	default: return;
1005	+	}
1006	+
1007	+	if (ConfigFileEntry.cycle_on_host_change)
1008	+	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
1009	+	target_p->name, target_p->username, target_p->host);
1010	+
1011		if (IsUserHostIp(target_p))
1012		delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1013
1014		strlcpy(target_p->host, hostname, sizeof(target_p->host));
1094	–	SetIPSpoof(target_p);
1015
1016		add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1017		SetUserHost(target_p);
1018
1019		if (MyClient(target_p))
1020	+	{
1021	+	sendto_one_numeric(target_p, &me, RPL_NEWHOSTIS, target_p->host);
1022		clear_ban_cache_client(target_p);
1023	+	}
1024	+
1025	+	if (!ConfigFileEntry.cycle_on_host_change)
1026	+	return;
1027	+
1028	+	DLINK_FOREACH(ptr, target_p->channel.head)
1029	+	{
1030	+	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = { '\0' };
1031	+	char *p = modebuf;
1032	+	int len = 0;
1033	+	const struct Membership *ms = ptr->data;
1034	+
1035	+	if (has_member_flags(ms, CHFL_CHANOP))
1036	+	{
1037	+	*p++ = 'o';
1038	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1039	+	}
1040	+
1041	+	if (has_member_flags(ms, CHFL_HALFOP))
1042	+	{
1043	+	*p++ = 'h';
1044	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1045	+	}
1046	+
1047	+	if (has_member_flags(ms, CHFL_VOICE))
1048	+	{
1049	+	*p++ = 'v';
1050	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1051	+	}
1052	+
1053	+	*p = '\0';
1054	+
1055	+	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
1056	+	target_p->name, target_p->username, target_p->host,
1057	+	ms->chptr->chname);
1058	+	if (nickbuf[0])
1059	+	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
1060	+	target_p->servptr->name, ms->chptr->chname,
1061	+	modebuf, nickbuf);
1062	+
1063	+	}
1064	+
1065	+	if (target_p->away[0])
1066	+	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
1067	+	":%s!%s@%s AWAY :%s",
1068	+	target_p->name, target_p->username,
1069	+	target_p->host, target_p->away);
1070		}
1071
1072		/* user_welcome()
#	Line 1116 | Line 1085 | user_welcome(struct Client *source_p)
1085		#endif
1086
1087		#ifdef HAVE_LIBCRYPTO
1088	<	if (source_p->localClient->fd.ssl != NULL)
1089	<	sendto_one(source_p, ":%s NOTICE %s :*** Connected securely via %s",
1090	<	me.name, source_p->name,
1091	<	ssl_get_cipher(source_p->localClient->fd.ssl));
1088	>	if (HasFlag(source_p, FLAGS_SSL))
1089	>	{
1090	>	AddUMode(source_p, UMODE_SSL);
1091	>	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
1092	>	ssl_get_cipher(source_p->localClient->fd.ssl));
1093	>	}
1094		#endif
1095
1096	<	sendto_one(source_p, RPL_WELCOME, me.name, source_p->name,
1097	<	ServerInfo.network_name, source_p->name);
1098	<	sendto_one(source_p, RPL_YOURHOST, me.name, source_p->name,
1099	<	get_listener_name(source_p->localClient->listener), ircd_version);
1100	<	sendto_one(source_p, RPL_CREATED,
1101	<	me.name, source_p->name, built_date);
1131	<	sendto_one(source_p, RPL_MYINFO,
1132	<	me.name, source_p->name, me.name, ircd_version, umode_buffer);
1096	>	sendto_one_numeric(source_p, &me, RPL_WELCOME, ServerInfo.network_name,
1097	>	source_p->name);
1098	>	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
1099	>	get_listener_name(source_p->localClient->listener), ircd_version);
1100	>	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
1101	>	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
1102		show_isupport(source_p);
1103
1104		if (source_p->id[0] != '\0')
1105	<	sendto_one(source_p, RPL_YOURID, me.name,
1137	<	source_p->name, source_p->id);
1105	>	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
1106
1107		show_lusers(source_p);
1108	<
1141	<	if (ConfigFileEntry.short_motd)
1142	<	{
1143	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- motd was last changed at %s",
1144	<	me.name, source_p->name, ConfigFileEntry.motd.lastChangedDate);
1145	<	sendto_one(source_p,
1146	<	":%s NOTICE %s :*** Notice -- Please read the motd if you haven't "
1147	<	"read it", me.name, source_p->name);
1148	<	sendto_one(source_p, RPL_MOTDSTART,
1149	<	me.name, source_p->name, me.name);
1150	<	sendto_one(source_p, RPL_MOTD,
1151	<	me.name, source_p->name,
1152	<	"*** This is the short motd ***");
1153	<	sendto_one(source_p, RPL_ENDOFMOTD,
1154	<	me.name, source_p->name);
1155	<	}
1156	<	else
1157	<	send_message_file(source_p, &ConfigFileEntry.motd);
1108	>	motd_signon(source_p);
1109		}
1110
1111		/* check_xline()
#	Line 1169 | Line 1120 | check_xline(struct Client *source_p)
1120		struct MaskItem *conf = NULL;
1121		const char *reason = NULL;
1122
1123	<	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)) ||
1173	<	(conf = find_matching_name_conf(CONF_RXLINE, source_p->info, NULL, NULL, 0)))
1123	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
1124		{
1125		++conf->count;
1126
#	Line 1199 | Line 1149 | check_xline(struct Client *source_p)
1149		* output       - NONE
1150		* side effects - Blindly opers up given source_p, using conf info
1151		*                all checks on passwords have already been done.
1152	<	*                This could also be used by rsa oper routines.
1152	>	*                This could also be used by rsa oper routines.
1153		*/
1154		void
1155		oper_up(struct Client *source_p)
#	Line 1229 | Line 1179 | oper_up(struct Client *source_p)
1179
1180		if (HasOFlag(source_p, OPER_FLAG_ADMIN))
1181		AddUMode(source_p, UMODE_ADMIN);
1232	–	if (!HasOFlag(source_p, OPER_FLAG_N))
1233	–	DelUMode(source_p, UMODE_NCHANGE);
1182
1183		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1184		get_oper_name(source_p));
1185		send_umode_out(source_p, source_p, old);
1186	<	sendto_one(source_p, RPL_YOUREOPER, me.name, source_p->name);
1186	>	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
1187		}
1188
1189		static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
#	Line 1253 | Line 1201 | valid_sid(const char *sid)
1201
1202		/*
1203		* init_uid()
1204	<	*
1204	>	*
1205		* inputs       - NONE
1206		* output       - NONE
1207		* side effects - new_uid is filled in with server id portion (sid)
#	Line 1263 | Line 1211 | valid_sid(const char *sid)
1211		void
1212		init_uid(void)
1213		{
1214	<	int i;
1214	>	unsigned int i;
1215
1216		memset(new_uid, 0, sizeof(new_uid));
1217
#	Line 1271 | Line 1219 | init_uid(void)
1219		strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1220
1221		for (i = 0; i < IRC_MAXSID; ++i)
1222	<	if (new_uid[i] == '\0')
1222	>	if (new_uid[i] == '\0')
1223		new_uid[i] = 'A';
1224
1225		/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1278	–	/* Yes nenolod, I have known it was off by one ever since I wrote it
1279	–	* But *JUST* for you, though, it really doesn't look as *pretty*
1280	–	* -Dianora
1281	–	*/
1226		memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1283	–
1284	–	entering_umode_cb = register_callback("entering_umode", NULL);
1285	–	umode_cb = register_callback("changing_umode", change_simple_umode);
1227		}
1228
1229		/*
#	Line 1342 | Line 1283 | uid_get(void)
1283		void
1284		init_isupport(void)
1285		{
1345	–	isupportFile = init_MessageLine();
1346	–
1286		add_isupport("CALLERID", NULL, -1);
1287		add_isupport("CASEMAPPING", CASEMAP, -1);
1288		add_isupport("DEAF", "D", -1);
#	Line 1356 | Line 1295 | init_isupport(void)
1295		add_isupport("PREFIX", "(ov)@+", -1);
1296		add_isupport("STATUSMSG", "@+", -1);
1297		#endif
1298	+	add_isupport("EXCEPTS", "e", -1);
1299	+	add_isupport("INVEX", "I", -1);
1300		}
1301
1302		/*
#	Line 1439 | Line 1380 | rebuild_isupport_message_line(void)
1380		{
1381		char isupportbuffer[IRCD_BUFSIZE];
1382		char *p = isupportbuffer;
1383	<	dlink_node *ptr = NULL;
1383	>	dlink_node *ptr = NULL, *ptr_next = NULL;
1384		int n = 0;
1385		int tokens = 0;
1386		size_t len = 0;
1387	<	size_t reserve = strlen(me.name) + HOSTLEN + strlen(RPL_ISUPPORT);
1387	>	size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1388
1389	<	destroy_MessageLine(isupportFile);
1389	>	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1390	>	{
1391	>	dlinkDelete(ptr, &support_list_lines);
1392	>	MyFree(ptr->data);
1393	>	free_dlink_node(ptr);
1394	>	}
1395
1396		DLINK_FOREACH(ptr, support_list.head)
1397		{
#	Line 1475 | Line 1421 | rebuild_isupport_message_line(void)
1421		if (*--p == ' ')
1422		*p = '\0';
1423
1424	<	addto_MessageLine(isupportFile, isupportbuffer);
1424	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1425		p = isupportbuffer;
1426		len = 0;
1427		n = tokens = 0;
#	Line 1486 | Line 1432 | rebuild_isupport_message_line(void)
1432		{
1433		if (*--p == ' ')
1434		*p = '\0';
1435	<	addto_MessageLine(isupportFile, isupportbuffer);
1435	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1436		}
1437		}

Diff Legend

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