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 2134 by michael, Wed May 29 18:59:39 2013 UTC vs.
Revision 3171 by michael, Sun Mar 16 11:51:48 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	–
53		static char umode_buffer[IRCD_BUFSIZE];
54
55		static void user_welcome(struct Client *);
#	Line 65 | 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 73 | 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		const unsigned int user_modes[256] =
#	Line 86 | Line 83 | const 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		UMODE_FARCONNECT,   /* F */
#	Line 102 | Line 99 | const 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 135 | Line 132 | const 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 170 | 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		{
175	–	const char *from, *to;
176	–
177	–	if (!MyConnect(source_p) && IsCapable(source_p->from, CAP_TS6) && HasID(source_p))
178	–	{
179	–	from = me.id;
180	–	to = source_p->id;
181	–	}
182	–	else
183	–	{
184	–	from = me.name;
185	–	to = source_p->name;
186	–	}
187	–
172		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
173	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT),
174	<	from, to, (Count.total-Count.invisi),
191	<	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, form_str(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, form_str(RPL_LUSEROP),
198	<	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, form_str(RPL_LUSERUNKNOWN),
202	<	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, form_str(RPL_LUSERCHANNELS),
206	<	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, form_str(RPL_LUSERME),
191	<	from, to, Count.local, Count.myserver);
212	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
213	<	from, to, 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, form_str(RPL_LUSERME),
196	<	from, to, Count.total, 0);
219	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
220	<	from, to, 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, form_str(RPL_GLOBALUSERS),
224	<	from, to, 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, form_str(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 241 | 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 284 | 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 307 | 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 326 | 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);
309	<	exit_client(source_p, &me, "Install identd");
307	>	sendto_one_notice(source_p, &me, ":*** Notice -- You need to install "
308	>	"identd to use this server");
309	>	exit_client(source_p, "Install identd");
310		return;
311		}
312
#	Line 352 | 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, form_str(ERR_PASSWDMISMATCH),
334	<	me.name, source_p->name);
335	<	exit_client(source_p, &me, "Bad Password");
333	>
334	>	sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
335	>	exit_client(source_p, "Bad Password");
336		return;
337		}
338		}
#	Line 385 | Line 363 | register_local_user(struct Client *sourc
363		"Too many clients, rejecting %s[%s].",
364		source_p->name, source_p->host);
365		++ServerStats.is_ref;
366	<	exit_client(source_p, &me, "Sorry, server is full - try later");
366	>	exit_client(source_p, "Sorry, server is full - try later");
367		return;
368		}
369
370		/* valid user name check */
371	<	if (valid_username(source_p->username, 1) == 0)
371	>	if (!valid_username(source_p->username, 1))
372		{
373		char tmpstr2[IRCD_BUFSIZE];
374
#	Line 400 | Line 378 | register_local_user(struct Client *sourc
378		++ServerStats.is_ref;
379		snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
380		source_p->username);
381	<	exit_client(source_p, &me, tmpstr2);
381	>	exit_client(source_p, tmpstr2);
382		return;
383		}
384
#	Line 421 | Line 399 | register_local_user(struct Client *sourc
399		get_client_class(&source_p->localClient->confs),
400		source_p->info, source_p->id);
401
424	–	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL, SEND_NOTICE,
425	–	"CLICONN %s %s %s %s %s %s %s 0 %s",
426	–	source_p->name, source_p->username, source_p->host,
427	–	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
428	–	"255.255.255.255" : source_p->sockhost,
429	–	get_client_class(&source_p->localClient->confs),
430	–	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
431	–	"<hidden>" : source_p->localClient->client_host,
432	–	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
433	–	"<hidden>" : source_p->localClient->client_server,
434	–	source_p->info);
435	–
436	–
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 479 | Line 444 | register_local_user(struct Client *sourc
444		*              - username to register as
445		*              - host name to register as
446		*              - server name
482	–	*              - 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,
490	<	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 516 | Line 479 | register_remote_user(struct Client *sour
479		kill_client(source_p->from, source_p, "%s (Server doesn't exist)", me.name);
480
481		AddFlag(source_p, FLAGS_KILLED);
482	<	exit_client(source_p, &me, "Ghosted Client");
482	>	exit_client(source_p, "Ghosted Client");
483		return;
484		}
485
#	Line 531 | Line 494 | register_remote_user(struct Client *sour
494		"%s (NICK from wrong direction (%s != %s))",
495		me.name, source_p->servptr->name, target_p->from->name);
496		AddFlag(source_p, FLAGS_KILLED);
497	<	exit_client(source_p, &me, "USER server wrong direction");
497	>	exit_client(source_p, "USER server wrong direction");
498		return;
499		}
500
#	Line 573 | 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 582 | 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 596 | 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,
608	<	source_p->svid,
609	<	source_p->info);
610	<	else
611	<	sendto_one(server, "NICK %s %d %lu %s %s %s %s %s :%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, source_p->svid,
616	<	source_p->info);
617	<
618	<	}
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
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	<	}
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 652 | 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 755 | 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	<	sendto_one(source_p,
759	<	":%s NOTICE %s :*** Spoofing your IP. Congrats.",
760	<	me.name, source_p->name);
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,
767	<	":%s NOTICE %s :*** You are exempt from K/D/G lines. Congrats.",
768	<	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. Congrats.",
778	<	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. Congrats.",
785	<	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,
793	<	":%s NOTICE %s :*** You are exempt from user limits. Congrats.",
794	<	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.",
802	<	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
744		/* set_user_mode()
745		*
746		* added 15/10/91 By Darren Reed.
747	<	* parv[0] - sender
747	>	* parv[0] - command
748		* parv[1] - username to change mode for
749		* parv[2] - modes to change
750		*/
751		void
752	<	set_user_mode(struct Client *client_p, struct Client *source_p,
815	<	const int parc, char *parv[])
752	>	set_user_mode(struct Client *source_p, const int parc, char *parv[])
753		{
754		unsigned int flag, setflags;
755		char **p, *m, buf[IRCD_BUFSIZE];
#	Line 821 | Line 758 | set_user_mode(struct Client *client_p, s
758
759		assert(!(parc < 2));
760
761	<	if ((target_p = find_person(client_p, parv[1])) == NULL)
761	>	if ((target_p = find_person(source_p, parv[1])) == NULL)
762		{
763		if (MyConnect(source_p))
764	<	sendto_one(source_p, form_str(ERR_NOSUCHCHANNEL),
828	<	me.name, source_p->name, parv[1]);
764	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHCHANNEL, parv[1]);
765		return;
766		}
767
768		if (source_p != target_p)
769		{
770	<	sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
835	<	me.name, source_p->name);
770	>	sendto_one_numeric(source_p, &me, ERR_USERSDONTMATCH);
771		return;
772		}
773
#	Line 841 | Line 776 | set_user_mode(struct Client *client_p, s
776		m = buf;
777		*m++ = '+';
778
779	<	for (i = 0; i < 128; i++)
779	>	for (i = 0; i < 128; ++i)
780		if (HasUMode(source_p, user_modes[i]))
781		*m++ = (char)i;
782		*m = '\0';
783
784	<	sendto_one(source_p, form_str(RPL_UMODEIS),
850	<	me.name, source_p->name, buf);
784	>	sendto_one_numeric(source_p, &me, RPL_UMODEIS, buf);
785		return;
786		}
787
#	Line 855 | Line 789 | set_user_mode(struct Client *client_p, s
789		setflags = source_p->umodes;
790
791		/* parse mode change string(s) */
792	<	for (p = &parv[2]; p && *p; p++)
792	>	for (p = &parv[2]; p && *p; ++p)
793		{
794	<	for (m = *p; *m; m++)
794	>	for (m = *p; *m; ++m)
795		{
796		switch (*m)
797		{
#	Line 870 | Line 804 | set_user_mode(struct Client *client_p, s
804		case 'o':
805		if (what == MODE_ADD)
806		{
807	<	if (IsServer(client_p) && !HasUMode(source_p, UMODE_OPER))
807	>	if (!MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER))
808		{
809		++Count.oper;
810		SetOper(source_p);
#	Line 878 | Line 812 | set_user_mode(struct Client *client_p, s
812		}
813		else
814		{
881	–	/* Only decrement the oper counts if an oper to begin with
882	–	* found by Pat Szuta, Perly , perly@xnet.com
883	–	*/
815		if (!HasUMode(source_p, UMODE_OPER))
816		break;
817
#	Line 889 | Line 820 | set_user_mode(struct Client *client_p, s
820
821		if (MyConnect(source_p))
822		{
823	<	dlink_node *dm;
823	>	dlink_node *dm = NULL;
824
825		detach_conf(source_p, CONF_OPER);
826		ClrOFlag(source_p);
#	Line 902 | Line 833 | set_user_mode(struct Client *client_p, s
833
834		break;
835
836	+	case 'S':  /* Only servers may set +S in a burst */
837	+	case 'W':  /* Only servers may set +W in a burst */
838		case 'r':  /* Only services may set +r */
839	+	case 'x':  /* Only services may set +x */
840		break;
841
842		default:
#	Line 919 | Line 853 | set_user_mode(struct Client *client_p, s
853		DelUMode(source_p, flag);
854		}
855		}
856	<	else
857	<	{
924	<	if (MyConnect(source_p))
925	<	badflag = 1;
926	<	}
856	>	else if (MyConnect(source_p))
857	>	badflag = 1;
858
859		break;
860		}
#	Line 931 | Line 862 | set_user_mode(struct Client *client_p, s
862		}
863
864		if (badflag)
865	<	sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
935	<	me.name, source_p->name);
865	>	sendto_one_numeric(source_p, &me, ERR_UMODEUNKNOWNFLAG);
866
867		if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
868		!HasOFlag(source_p, OPER_FLAG_ADMIN))
869		{
870	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
941	<	me.name, source_p->name);
870	>	sendto_one_notice(source_p, &me, ":*** You have no admin flag;");
871		DelUMode(source_p, UMODE_ADMIN);
872		}
873
#	Line 951 | Line 880 | set_user_mode(struct Client *client_p, s
880		* compare new flags with old flags and send string which
881		* will cause servers to update correctly.
882		*/
883	<	send_umode_out(client_p, source_p, setflags);
883	>	send_umode_out(source_p, source_p, setflags);
884		}
885
886		/* send_umode()
#	Line 978 | Line 907 | send_umode(struct Client *client_p, stru
907		* build a string in umode_buf to represent the change in the user's
908		* mode between the new (source_p->umodes) and 'old'.
909		*/
910	<	for (i = 0; i < 128; i++)
910	>	for (i = 0; i < 128; ++i)
911		{
912		flag = user_modes[i];
913		if (!flag)
#	Line 1035 | Line 964 | send_umode_out(struct Client *client_p,
964		send_umode(NULL, source_p, old, SEND_UMODES, buf);
965
966		if (buf[0])
967	<	{
968	<	DLINK_FOREACH(ptr, serv_list.head)
1040	<	{
1041	<	struct Client *target_p = ptr->data;
1042	<
1043	<	if ((target_p != client_p) && (target_p != source_p))
1044	<	sendto_one(target_p, ":%s MODE %s :%s",
1045	<	ID_or_name(source_p, target_p),
1046	<	ID_or_name(source_p, target_p), buf);
1047	<	}
1048	<	}
967	>	sendto_server(source_p, NOCAPS, NOCAPS, ":%s MODE %s :%s",
968	>	ID(source_p), ID(source_p), buf);
969
970		if (client_p && MyClient(client_p))
971		send_umode(client_p, source_p, old, 0xffffffff, buf);
972		}
973
974		void
975	<	user_set_hostmask(struct Client *target_p, const char *hostname)
975	>	user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
976		{
977	<	if (!valid_hostname(hostname))
977	>	dlink_node *ptr = NULL;
978	>
979	>	if (!strcmp(target_p->host, hostname))
980		return;
981
982	+	switch (what)
983	+	{
984	+	case MODE_ADD:
985	+	AddUMode(target_p, UMODE_HIDDENHOST);
986	+	AddFlag(target_p, FLAGS_IP_SPOOFING);
987	+	break;
988	+	case MODE_DEL:
989	+	DelUMode(target_p, UMODE_HIDDENHOST);
990	+
991	+	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
992	+	DelFlag(target_p, FLAGS_IP_SPOOFING);
993	+	break;
994	+	default: return;
995	+	}
996	+
997	+	if (ConfigFileEntry.cycle_on_host_change)
998	+	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
999	+	target_p->name, target_p->username, target_p->host);
1000	+
1001		if (IsUserHostIp(target_p))
1002		delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1003
1004		strlcpy(target_p->host, hostname, sizeof(target_p->host));
1064	–	SetIPSpoof(target_p);
1005
1006		add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1007		SetUserHost(target_p);
1008
1009		if (MyClient(target_p))
1010	+	{
1011	+	sendto_one_numeric(target_p, &me, RPL_NEWHOSTIS, target_p->host);
1012		clear_ban_cache_client(target_p);
1013	+	}
1014	+
1015	+	if (!ConfigFileEntry.cycle_on_host_change)
1016	+	return;
1017	+
1018	+	DLINK_FOREACH(ptr, target_p->channel.head)
1019	+	{
1020	+	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = { '\0' };
1021	+	char *p = modebuf;
1022	+	int len = 0;
1023	+	const struct Membership *ms = ptr->data;
1024	+
1025	+	if (has_member_flags(ms, CHFL_CHANOP))
1026	+	{
1027	+	*p++ = 'o';
1028	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1029	+	}
1030	+
1031	+	if (has_member_flags(ms, CHFL_HALFOP))
1032	+	{
1033	+	*p++ = 'h';
1034	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1035	+	}
1036	+
1037	+	if (has_member_flags(ms, CHFL_VOICE))
1038	+	{
1039	+	*p++ = 'v';
1040	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1041	+	}
1042	+
1043	+	*p = '\0';
1044	+
1045	+	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
1046	+	target_p->name, target_p->username, target_p->host,
1047	+	ms->chptr->chname);
1048	+	if (nickbuf[0])
1049	+	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
1050	+	target_p->servptr->name, ms->chptr->chname,
1051	+	modebuf, nickbuf);
1052	+
1053	+	}
1054	+
1055	+	if (target_p->away[0])
1056	+	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
1057	+	":%s!%s@%s AWAY :%s",
1058	+	target_p->name, target_p->username,
1059	+	target_p->host, target_p->away);
1060		}
1061
1062		/* user_welcome()
#	Line 1086 | Line 1075 | user_welcome(struct Client *source_p)
1075		#endif
1076
1077		#ifdef HAVE_LIBCRYPTO
1078	<	if (source_p->localClient->fd.ssl != NULL)
1079	<	sendto_one(source_p, ":%s NOTICE %s :*** Connected securely via %s",
1080	<	me.name, source_p->name,
1081	<	ssl_get_cipher(source_p->localClient->fd.ssl));
1078	>	if (HasFlag(source_p, FLAGS_SSL))
1079	>	{
1080	>	AddUMode(source_p, UMODE_SSL);
1081	>	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
1082	>	ssl_get_cipher(source_p->localClient->fd.ssl));
1083	>	}
1084		#endif
1085
1086	<	sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
1087	<	ServerInfo.network_name, source_p->name);
1088	<	sendto_one(source_p, form_str(RPL_YOURHOST), me.name, source_p->name,
1089	<	get_listener_name(source_p->localClient->listener), ircd_version);
1090	<	sendto_one(source_p, form_str(RPL_CREATED),
1091	<	me.name, source_p->name, built_date);
1101	<	sendto_one(source_p, form_str(RPL_MYINFO),
1102	<	me.name, source_p->name, me.name, ircd_version, umode_buffer);
1086	>	sendto_one_numeric(source_p, &me, RPL_WELCOME, ServerInfo.network_name,
1087	>	source_p->name);
1088	>	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
1089	>	get_listener_name(source_p->localClient->listener), ircd_version);
1090	>	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
1091	>	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
1092		show_isupport(source_p);
1093
1094		if (source_p->id[0] != '\0')
1095	<	sendto_one(source_p, form_str(RPL_YOURID), me.name,
1107	<	source_p->name, source_p->id);
1095	>	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
1096
1097		show_lusers(source_p);
1098	<
1111	<	if (ConfigFileEntry.short_motd)
1112	<	{
1113	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- motd was last changed at %s",
1114	<	me.name, source_p->name, ConfigFileEntry.motd.lastChangedDate);
1115	<	sendto_one(source_p,
1116	<	":%s NOTICE %s :*** Notice -- Please read the motd if you haven't "
1117	<	"read it", me.name, source_p->name);
1118	<	sendto_one(source_p, form_str(RPL_MOTDSTART),
1119	<	me.name, source_p->name, me.name);
1120	<	sendto_one(source_p, form_str(RPL_MOTD),
1121	<	me.name, source_p->name,
1122	<	"*** This is the short motd ***");
1123	<	sendto_one(source_p, form_str(RPL_ENDOFMOTD),
1124	<	me.name, source_p->name);
1125	<	}
1126	<	else
1127	<	send_message_file(source_p, &ConfigFileEntry.motd);
1098	>	motd_signon(source_p);
1099		}
1100
1101		/* check_xline()
#	Line 1155 | Line 1126 | check_xline(struct Client *source_p)
1126		source_p->sockhost);
1127
1128		++ServerStats.is_ref;
1129	<	exit_client(source_p, &me, "Bad user info");
1129	>	exit_client(source_p, "Bad user info");
1130		return 1;
1131		}
1132
#	Line 1168 | Line 1139 | check_xline(struct Client *source_p)
1139		* output       - NONE
1140		* side effects - Blindly opers up given source_p, using conf info
1141		*                all checks on passwords have already been done.
1142	<	*                This could also be used by rsa oper routines.
1142	>	*                This could also be used by rsa oper routines.
1143		*/
1144		void
1145		oper_up(struct Client *source_p)
#	Line 1202 | Line 1173 | oper_up(struct Client *source_p)
1173		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1174		get_oper_name(source_p));
1175		send_umode_out(source_p, source_p, old);
1176	<	sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
1176	>	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
1177		}
1178
1179		static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
#	Line 1220 | Line 1191 | valid_sid(const char *sid)
1191
1192		/*
1193		* init_uid()
1194	<	*
1194	>	*
1195		* inputs       - NONE
1196		* output       - NONE
1197		* side effects - new_uid is filled in with server id portion (sid)
#	Line 1238 | Line 1209 | init_uid(void)
1209		strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1210
1211		for (i = 0; i < IRC_MAXSID; ++i)
1212	<	if (new_uid[i] == '\0')
1212	>	if (new_uid[i] == '\0')
1213		new_uid[i] = 'A';
1214
1215		/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1245	–	/* Yes nenolod, I have known it was off by one ever since I wrote it
1246	–	* But *JUST* for you, though, it really doesn't look as *pretty*
1247	–	* -Dianora
1248	–	*/
1216		memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1217		}
1218
#	Line 1306 | Line 1273 | uid_get(void)
1273		void
1274		init_isupport(void)
1275		{
1309	–	isupportFile = init_MessageLine();
1310	–
1276		add_isupport("CALLERID", NULL, -1);
1277		add_isupport("CASEMAPPING", CASEMAP, -1);
1278		add_isupport("DEAF", "D", -1);
#	Line 1320 | Line 1285 | init_isupport(void)
1285		add_isupport("PREFIX", "(ov)@+", -1);
1286		add_isupport("STATUSMSG", "@+", -1);
1287		#endif
1288	+	add_isupport("EXCEPTS", "e", -1);
1289	+	add_isupport("INVEX", "I", -1);
1290		}
1291
1292		/*
#	Line 1403 | Line 1370 | rebuild_isupport_message_line(void)
1370		{
1371		char isupportbuffer[IRCD_BUFSIZE];
1372		char *p = isupportbuffer;
1373	<	dlink_node *ptr = NULL;
1373	>	dlink_node *ptr = NULL, *ptr_next = NULL;
1374		int n = 0;
1375		int tokens = 0;
1376		size_t len = 0;
1377	<	size_t reserve = strlen(me.name) + HOSTLEN + strlen(form_str(RPL_ISUPPORT));
1377	>	size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1378
1379	<	destroy_MessageLine(isupportFile);
1379	>	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1380	>	{
1381	>	dlinkDelete(ptr, &support_list_lines);
1382	>	MyFree(ptr->data);
1383	>	free_dlink_node(ptr);
1384	>	}
1385
1386		DLINK_FOREACH(ptr, support_list.head)
1387		{
#	Line 1439 | Line 1411 | rebuild_isupport_message_line(void)
1411		if (*--p == ' ')
1412		*p = '\0';
1413
1414	<	addto_MessageLine(isupportFile, isupportbuffer);
1414	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1415		p = isupportbuffer;
1416		len = 0;
1417		n = tokens = 0;
#	Line 1450 | Line 1422 | rebuild_isupport_message_line(void)
1422		{
1423		if (*--p == ' ')
1424		*p = '\0';
1425	<	addto_MessageLine(isupportFile, isupportbuffer);
1425	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1426		}
1427		}

Diff Legend

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