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 3238 by michael, Sun Mar 30 13:44:07 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 275 | Line 253 | register_local_user(struct Client *sourc
253		const char *id = NULL;
254		const struct MaskItem *conf = NULL;
255
278	–	assert(source_p != NULL);
256		assert(source_p == source_p->from);
257		assert(MyConnect(source_p));
258		assert(!source_p->localClient->registration);
#	Line 284 | Line 261 | register_local_user(struct Client *sourc
261
262		if (ConfigFileEntry.ping_cookie)
263		{
264	<	if (!IsPingSent(source_p) && source_p->localClient->random_ping == 0)
264	>	if (!IsPingSent(source_p) && !source_p->localClient->random_ping)
265		{
266		do
267		source_p->localClient->random_ping = genrand_int32();
#	Line 307 | Line 284 | register_local_user(struct Client *sourc
284		if (!check_client(source_p))
285		return;
286
287	<	if (valid_hostname(source_p->host) == 0)
287	>	if (!valid_hostname(source_p->host))
288		{
289	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You have an illegal "
290	<	"character in your hostname", me.name, source_p->name);
289	>	sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
290	>	"character in your hostname");
291		strlcpy(source_p->host, source_p->sockhost,
292		sizeof(source_p->host));
293		}
#	Line 319 | Line 296 | register_local_user(struct Client *sourc
296
297		if (!IsGotId(source_p))
298		{
299	<	char username[USERLEN + 1];
299	>	char username[USERLEN + 1] = "";
300		const char *p = username;
301		unsigned int i = 0;
302
303		if (IsNeedIdentd(conf))
304		{
305		++ServerStats.is_ref;
306	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You need to install "
307	<	"identd to use this server", me.name, source_p->name);
308	<	exit_client(source_p, &me, "Install identd");
306	>	sendto_one_notice(source_p, &me, ":*** Notice -- You need to install "
307	>	"identd to use this server");
308	>	exit_client(source_p, "Install identd");
309		return;
310		}
311
#	Line 352 | Line 329 | register_local_user(struct Client *sourc
329		if (!match_conf_password(pass, conf))
330		{
331		++ServerStats.is_ref;
332	<	sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
333	<	me.name, source_p->name);
334	<	exit_client(source_p, &me, "Bad Password");
332	>
333	>	sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
334	>	exit_client(source_p, "Bad Password");
335		return;
336		}
337		}
#	Line 385 | Line 362 | register_local_user(struct Client *sourc
362		"Too many clients, rejecting %s[%s].",
363		source_p->name, source_p->host);
364		++ServerStats.is_ref;
365	<	exit_client(source_p, &me, "Sorry, server is full - try later");
365	>	exit_client(source_p, "Sorry, server is full - try later");
366		return;
367		}
368
369		/* valid user name check */
370	<	if (valid_username(source_p->username, 1) == 0)
370	>	if (!valid_username(source_p->username, 1))
371		{
372	<	char tmpstr2[IRCD_BUFSIZE];
372	>	char tmpstr2[IRCD_BUFSIZE] = "";
373
374		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
375		"Invalid username: %s (%s@%s)",
#	Line 400 | Line 377 | register_local_user(struct Client *sourc
377		++ServerStats.is_ref;
378		snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
379		source_p->username);
380	<	exit_client(source_p, &me, tmpstr2);
380	>	exit_client(source_p, tmpstr2);
381		return;
382		}
383
384		if (check_xline(source_p))
385		return;
386
387	<	while (hash_find_id((id = uid_get())) != NULL)
387	>	while (hash_find_id((id = uid_get())))
388		;
389
390		strlcpy(source_p->id, id, sizeof(source_p->id));
#	Line 421 | Line 398 | register_local_user(struct Client *sourc
398		get_client_class(&source_p->localClient->confs),
399		source_p->info, source_p->id);
400
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	–
401		if (ConfigFileEntry.invisible_on_connect)
402		{
403		AddUMode(source_p, UMODE_INVISIBLE);
404		++Count.invisi;
405		}
406
407	<	if ((++Count.local) > Count.max_loc)
407	>	if (++Count.local > Count.max_loc)
408		{
409		Count.max_loc = Count.local;
410
#	Line 479 | Line 443 | register_local_user(struct Client *sourc
443		*              - username to register as
444		*              - host name to register as
445		*              - server name
482	–	*              - realname (gecos)
446		* output       - NONE
447		* side effects - This function is called when a remote client
448		*                is introduced by a server.
449		*/
450		void
451	<	register_remote_user(struct Client *source_p,
452	<	const char *username, const char *host, const char *server,
490	<	const char *realname)
451	>	register_remote_user(struct Client *source_p, const char *username,
452	>	const char *host, const char *server)
453		{
454		struct Client *target_p = NULL;
455
494	–	assert(source_p != NULL);
456		assert(source_p->username != username);
457
458	<	strlcpy(source_p->host, host, sizeof(source_p->host));
458	>	strlcpy(source_p->host, host, sizeof(source_p->host));
459		strlcpy(source_p->username, username, sizeof(source_p->username));
460
461		/*
#	Line 513 | Line 474 | register_remote_user(struct Client *sour
474		"No server %s for user %s[%s@%s] from %s",
475		server, source_p->name, source_p->username,
476		source_p->host, source_p->from->name);
477	<	kill_client(source_p->from, source_p, "%s (Server doesn't exist)", me.name);
477	>	sendto_one(source_p->from,
478	>	":%s KILL %s :%s (Ghosted, server %s doesn't exist)",
479	>	me.id, source_p->id, me.name, server);
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 527 | Line 490 | register_remote_user(struct Client *sour
490		source_p->from->name, source_p->name, source_p->username,
491		source_p->host, source_p->servptr->name,
492		target_p->name, target_p->from->name);
493	<	kill_client(source_p->from, source_p,
494	<	"%s (NICK from wrong direction (%s != %s))",
495	<	me.name, source_p->servptr->name, target_p->from->name);
493	>	sendto_one(source_p->from,
494	>	":%s KILL %s :%s (NICK from wrong direction (%s != %s))",
495	>	me.id, source_p->id, me.name, source_p->servptr->name,
496	>	target_p->from->name);
497	>
498		AddFlag(source_p, FLAGS_KILLED);
499	<	exit_client(source_p, &me, "USER server wrong direction");
499	>	exit_client(source_p, "USER server wrong direction");
500		return;
501		}
502
#	Line 572 | Line 537 | register_remote_user(struct Client *sour
537		static void
538		introduce_client(struct Client *source_p)
539		{
540	<	dlink_node *server_node = NULL;
541	<	static char ubuf[12];
540	>	dlink_node *ptr = NULL;
541	>	char ubuf[IRCD_BUFSIZE] = "";
542
543		if (MyClient(source_p))
544		send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
#	Line 582 | Line 547 | introduce_client(struct Client *source_p
547
548		watch_check_hash(source_p, RPL_LOGON);
549
550	<	if (*ubuf == '\0')
550	>	if (ubuf[0] == '\0')
551		{
552		ubuf[0] = '+';
553		ubuf[1] = '\0';
554		}
555
556	<	DLINK_FOREACH(server_node, serv_list.head)
556	>	DLINK_FOREACH(ptr, serv_list.head)
557		{
558	<	struct Client *server = server_node->data;
558	>	struct Client *server = ptr->data;
559
560		if (server == source_p->from)
561	<	continue;
561	>	continue;
562
563		if (IsCapable(server, CAP_SVS))
564	<	{
565	<	if (IsCapable(server, CAP_TS6) && HasID(source_p))
566	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
567	<	source_p->servptr->id,
568	<	source_p->name, source_p->hopcount+1,
569	<	(unsigned long)source_p->tsinfo,
570	<	ubuf, source_p->username, source_p->host,
571	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
572	<	"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	<	}
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,
571	>	source_p->svid,
572	>	source_p->info);
573		else
574	<	{
575	<	if (IsCapable(server, CAP_TS6) && HasID(source_p))
576	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
577	<	source_p->servptr->id,
578	<	source_p->name, source_p->hopcount+1,
579	<	(unsigned long)source_p->tsinfo,
580	<	ubuf, source_p->username, source_p->host,
581	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
582	<	"0" : source_p->sockhost, source_p->id, source_p->info);
583	<	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	<	}
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	>
582	>	if (!EmptyString(source_p->certfp))
583	>	sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
584		}
585		}
586
#	Line 650 | Line 598 | valid_hostname(const char *hostname)
598		{
599		const char *p = hostname;
600
601	<	assert(p != NULL);
601	>	assert(p);
602
603	<	if (*p == '.' || *p == ':')
603	>	if (EmptyString(p) || *p == '.' || *p == ':')
604		return 0;
605
606		for (; *p; ++p)
#	Line 679 | Line 627 | valid_username(const char *username, con
627		int dots      = 0;
628		const char *p = username;
629
630	<	assert(p != NULL);
630	>	assert(p);
631
632		if (*p == '~')
633		++p;
#	Line 730 | Line 678 | valid_nickname(const char *nickname, con
678		const char *p = nickname;
679		assert(nickname && *nickname);
680
681	+	assert(p);
682	+
683		/* nicks can't start with a digit or - or be 0 length */
684		/* This closer duplicates behaviour of hybrid-6 */
685		if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
#	Line 755 | Line 705 | report_and_set_user_flags(struct Client
705		{
706		/* If this user is being spoofed, tell them so */
707		if (IsConfDoSpoofIp(conf))
708	<	sendto_one(source_p,
759	<	":%s NOTICE %s :*** Spoofing your IP. Congrats.",
760	<	me.name, source_p->name);
708	>	sendto_one_notice(source_p, &me, ":*** Spoofing your IP. Congrats.");
709
710		/* If this user is in the exception class, Set it "E lined" */
711		if (IsConfExemptKline(conf))
712		{
713		SetExemptKline(source_p);
714	<	sendto_one(source_p,
767	<	":%s NOTICE %s :*** You are exempt from K/D/G lines. Congrats.",
768	<	me.name, source_p->name);
714	>	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D/G lines. Congrats.");
715		}
716
717	<	/* The else here is to make sure that G line exempt users
717	>	/*
718	>	* The else here is to make sure that G line exempt users
719		* do not get noticed twice.
720		*/
721		else if (IsConfExemptGline(conf))
722		{
723		SetExemptGline(source_p);
724	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines. Congrats.",
778	<	me.name, source_p->name);
724	>	sendto_one_notice(source_p, &me, ":*** You are exempt from G lines. Congrats.");
725		}
726
727		if (IsConfExemptResv(conf))
728		{
729		SetExemptResv(source_p);
730	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs. Congrats.",
785	<	me.name, source_p->name);
730	>	sendto_one_notice(source_p, &me, ":*** You are exempt from resvs. Congrats.");
731		}
732
733		/* If this user is exempt from user limits set it "F lined" */
734		if (IsConfExemptLimits(conf))
735		{
736		SetExemptLimits(source_p);
737	<	sendto_one(source_p,
793	<	":%s NOTICE %s :*** You are exempt from user limits. Congrats.",
794	<	me.name,source_p->name);
737	>	sendto_one_notice(source_p, &me, ":*** You are exempt from user limits. Congrats.");
738		}
739
740		if (IsConfCanFlood(conf))
741		{
742		SetCanFlood(source_p);
743	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
744	<	"protection, aren't you fearsome.",
802	<	me.name, source_p->name);
743	>	sendto_one_notice(source_p, &me, ":*** You are exempt from flood "
744	>	"protection, aren't you fearsome.");
745		}
746		}
747
748		/* set_user_mode()
749		*
750		* added 15/10/91 By Darren Reed.
751	<	* parv[0] - sender
751	>	* parv[0] - command
752		* parv[1] - username to change mode for
753		* parv[2] - modes to change
754		*/
755		void
756	<	set_user_mode(struct Client *client_p, struct Client *source_p,
815	<	const int parc, char *parv[])
756	>	set_user_mode(struct Client *source_p, const int parc, char *parv[])
757		{
758		unsigned int flag, setflags;
759	<	char **p, *m, buf[IRCD_BUFSIZE];
759	>	char **p, *m, buf[IRCD_BUFSIZE] = "";
760		struct Client *target_p;
761		int what = MODE_ADD, badflag = 0, i;
762
763		assert(!(parc < 2));
764
765	<	if ((target_p = find_person(client_p, parv[1])) == NULL)
765	>	if ((target_p = find_person(source_p, parv[1])) == NULL)
766		{
767		if (MyConnect(source_p))
768	<	sendto_one(source_p, form_str(ERR_NOSUCHCHANNEL),
828	<	me.name, source_p->name, parv[1]);
768	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHCHANNEL, parv[1]);
769		return;
770		}
771
772		if (source_p != target_p)
773		{
774	<	sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
835	<	me.name, source_p->name);
774	>	sendto_one_numeric(source_p, &me, ERR_USERSDONTMATCH);
775		return;
776		}
777
#	Line 841 | Line 780 | set_user_mode(struct Client *client_p, s
780		m = buf;
781		*m++ = '+';
782
783	<	for (i = 0; i < 128; i++)
783	>	for (i = 0; i < 128; ++i)
784		if (HasUMode(source_p, user_modes[i]))
785		*m++ = (char)i;
786		*m = '\0';
787
788	<	sendto_one(source_p, form_str(RPL_UMODEIS),
850	<	me.name, source_p->name, buf);
788	>	sendto_one_numeric(source_p, &me, RPL_UMODEIS, buf);
789		return;
790		}
791
#	Line 855 | Line 793 | set_user_mode(struct Client *client_p, s
793		setflags = source_p->umodes;
794
795		/* parse mode change string(s) */
796	<	for (p = &parv[2]; p && *p; p++)
796	>	for (p = &parv[2]; p && *p; ++p)
797		{
798	<	for (m = *p; *m; m++)
798	>	for (m = *p; *m; ++m)
799		{
800		switch (*m)
801		{
#	Line 870 | Line 808 | set_user_mode(struct Client *client_p, s
808		case 'o':
809		if (what == MODE_ADD)
810		{
811	<	if (IsServer(client_p) && !HasUMode(source_p, UMODE_OPER))
811	>	if (!MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER))
812		{
813		++Count.oper;
814		SetOper(source_p);
#	Line 878 | Line 816 | set_user_mode(struct Client *client_p, s
816		}
817		else
818		{
881	–	/* Only decrement the oper counts if an oper to begin with
882	–	* found by Pat Szuta, Perly , perly@xnet.com
883	–	*/
819		if (!HasUMode(source_p, UMODE_OPER))
820		break;
821
#	Line 889 | Line 824 | set_user_mode(struct Client *client_p, s
824
825		if (MyConnect(source_p))
826		{
827	<	dlink_node *dm;
827	>	dlink_node *ptr = NULL;
828
829		detach_conf(source_p, CONF_OPER);
830		ClrOFlag(source_p);
831		DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
832
833	<	if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
834	<	free_dlink_node(dm);
833	>	if ((ptr = dlinkFindDelete(&oper_list, source_p)))
834	>	free_dlink_node(ptr);
835		}
836		}
837
838		break;
839
840	+	case 'S':  /* Only servers may set +S in a burst */
841	+	case 'W':  /* Only servers may set +W in a burst */
842		case 'r':  /* Only services may set +r */
843	+	case 'x':  /* Only services may set +x */
844		break;
845
846		default:
#	Line 919 | Line 857 | set_user_mode(struct Client *client_p, s
857		DelUMode(source_p, flag);
858		}
859		}
860	<	else
861	<	{
924	<	if (MyConnect(source_p))
925	<	badflag = 1;
926	<	}
860	>	else if (MyConnect(source_p))
861	>	badflag = 1;
862
863		break;
864		}
#	Line 931 | Line 866 | set_user_mode(struct Client *client_p, s
866		}
867
868		if (badflag)
869	<	sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
935	<	me.name, source_p->name);
869	>	sendto_one_numeric(source_p, &me, ERR_UMODEUNKNOWNFLAG);
870
871		if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
872		!HasOFlag(source_p, OPER_FLAG_ADMIN))
873		{
874	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
941	<	me.name, source_p->name);
874	>	sendto_one_notice(source_p, &me, ":*** You have no admin flag;");
875		DelUMode(source_p, UMODE_ADMIN);
876		}
877
#	Line 951 | Line 884 | set_user_mode(struct Client *client_p, s
884		* compare new flags with old flags and send string which
885		* will cause servers to update correctly.
886		*/
887	<	send_umode_out(client_p, source_p, setflags);
887	>	send_umode_out(source_p, source_p, setflags);
888		}
889
890		/* send_umode()
#	Line 978 | Line 911 | send_umode(struct Client *client_p, stru
911		* build a string in umode_buf to represent the change in the user's
912		* mode between the new (source_p->umodes) and 'old'.
913		*/
914	<	for (i = 0; i < 128; i++)
914	>	for (i = 0; i < 128; ++i)
915		{
916		flag = user_modes[i];
917		if (!flag)
#	Line 1029 | Line 962 | void
962		send_umode_out(struct Client *client_p, struct Client *source_p,
963		unsigned int old)
964		{
965	<	char buf[IRCD_BUFSIZE] = { '\0' };
1033	<	dlink_node *ptr = NULL;
965	>	char buf[IRCD_BUFSIZE] = "";
966
967		send_umode(NULL, source_p, old, SEND_UMODES, buf);
968
969		if (buf[0])
970	<	{
971	<	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	<	}
970	>	sendto_server(source_p, NOCAPS, NOCAPS, ":%s MODE %s :%s",
971	>	source_p->id, source_p->id, buf);
972
973		if (client_p && MyClient(client_p))
974		send_umode(client_p, source_p, old, 0xffffffff, buf);
975		}
976
977		void
978	<	user_set_hostmask(struct Client *target_p, const char *hostname)
978	>	user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
979		{
980	<	if (!valid_hostname(hostname))
980	>	dlink_node *ptr = NULL;
981	>
982	>	if (!strcmp(target_p->host, hostname))
983		return;
984
985	+	switch (what)
986	+	{
987	+	case MODE_ADD:
988	+	AddUMode(target_p, UMODE_HIDDENHOST);
989	+	AddFlag(target_p, FLAGS_IP_SPOOFING);
990	+	break;
991	+	case MODE_DEL:
992	+	DelUMode(target_p, UMODE_HIDDENHOST);
993	+
994	+	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
995	+	DelFlag(target_p, FLAGS_IP_SPOOFING);
996	+	break;
997	+	default: return;
998	+	}
999	+
1000	+	if (ConfigFileEntry.cycle_on_host_change)
1001	+	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
1002	+	target_p->name, target_p->username, target_p->host);
1003	+
1004		if (IsUserHostIp(target_p))
1005		delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1006
1007		strlcpy(target_p->host, hostname, sizeof(target_p->host));
1064	–	SetIPSpoof(target_p);
1008
1009		add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1010		SetUserHost(target_p);
1011
1012		if (MyClient(target_p))
1013	+	{
1014	+	sendto_one_numeric(target_p, &me, RPL_NEWHOSTIS, target_p->host);
1015		clear_ban_cache_client(target_p);
1016	+	}
1017	+
1018	+	if (!ConfigFileEntry.cycle_on_host_change)
1019	+	return;
1020	+
1021	+	DLINK_FOREACH(ptr, target_p->channel.head)
1022	+	{
1023	+	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
1024	+	char *p = modebuf;
1025	+	int len = 0;
1026	+	const struct Membership *ms = ptr->data;
1027	+
1028	+	if (has_member_flags(ms, CHFL_CHANOP))
1029	+	{
1030	+	*p++ = 'o';
1031	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1032	+	}
1033	+
1034	+	if (has_member_flags(ms, CHFL_HALFOP))
1035	+	{
1036	+	*p++ = 'h';
1037	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1038	+	}
1039	+
1040	+	if (has_member_flags(ms, CHFL_VOICE))
1041	+	{
1042	+	*p++ = 'v';
1043	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1044	+	}
1045	+
1046	+	*p = '\0';
1047	+
1048	+	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
1049	+	target_p->name, target_p->username, target_p->host,
1050	+	ms->chptr->chname);
1051	+	if (nickbuf[0])
1052	+	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
1053	+	target_p->servptr->name, ms->chptr->chname,
1054	+	modebuf, nickbuf);
1055	+
1056	+	}
1057	+
1058	+	if (target_p->away[0])
1059	+	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
1060	+	":%s!%s@%s AWAY :%s",
1061	+	target_p->name, target_p->username,
1062	+	target_p->host, target_p->away);
1063		}
1064
1065		/* user_welcome()
#	Line 1086 | Line 1078 | user_welcome(struct Client *source_p)
1078		#endif
1079
1080		#ifdef HAVE_LIBCRYPTO
1081	<	if (source_p->localClient->fd.ssl != NULL)
1082	<	sendto_one(source_p, ":%s NOTICE %s :*** Connected securely via %s",
1083	<	me.name, source_p->name,
1084	<	ssl_get_cipher(source_p->localClient->fd.ssl));
1081	>	if (HasFlag(source_p, FLAGS_SSL))
1082	>	{
1083	>	AddUMode(source_p, UMODE_SSL);
1084	>	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
1085	>	ssl_get_cipher(source_p->localClient->fd.ssl));
1086	>	}
1087		#endif
1088
1089	<	sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
1090	<	ServerInfo.network_name, source_p->name);
1091	<	sendto_one(source_p, form_str(RPL_YOURHOST), me.name, source_p->name,
1092	<	get_listener_name(source_p->localClient->listener), ircd_version);
1093	<	sendto_one(source_p, form_str(RPL_CREATED),
1094	<	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);
1089	>	sendto_one_numeric(source_p, &me, RPL_WELCOME, ServerInfo.network_name,
1090	>	source_p->name);
1091	>	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
1092	>	get_listener_name(source_p->localClient->listener), ircd_version);
1093	>	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
1094	>	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
1095		show_isupport(source_p);
1096
1097	<	if (source_p->id[0] != '\0')
1098	<	sendto_one(source_p, form_str(RPL_YOURID), me.name,
1107	<	source_p->name, source_p->id);
1097	>	if (source_p->id[0])
1098	>	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
1099
1100		show_lusers(source_p);
1101	<
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);
1101	>	motd_signon(source_p);
1102		}
1103
1104		/* check_xline()
#	Line 1143 | Line 1117 | check_xline(struct Client *source_p)
1117		{
1118		++conf->count;
1119
1120	<	if (conf->reason != NULL)
1120	>	if (conf->reason)
1121		reason = conf->reason;
1122		else
1123	<	reason = "No Reason";
1123	>	reason = CONF_NOREASON;
1124
1125		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
1126		"X-line Rejecting [%s] [%s], user %s [%s]",
#	Line 1155 | Line 1129 | check_xline(struct Client *source_p)
1129		source_p->sockhost);
1130
1131		++ServerStats.is_ref;
1132	<	exit_client(source_p, &me, "Bad user info");
1132	>	exit_client(source_p, "Bad user info");
1133		return 1;
1134		}
1135
#	Line 1168 | Line 1142 | check_xline(struct Client *source_p)
1142		* output       - NONE
1143		* side effects - Blindly opers up given source_p, using conf info
1144		*                all checks on passwords have already been done.
1145	<	*                This could also be used by rsa oper routines.
1145	>	*                This could also be used by rsa oper routines.
1146		*/
1147		void
1148		oper_up(struct Client *source_p)
#	Line 1202 | Line 1176 | oper_up(struct Client *source_p)
1176		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1177		get_oper_name(source_p));
1178		send_umode_out(source_p, source_p, old);
1179	<	sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
1179	>	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
1180		}
1181
1182		static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
#	Line 1220 | Line 1194 | valid_sid(const char *sid)
1194
1195		/*
1196		* init_uid()
1197	<	*
1197	>	*
1198		* inputs       - NONE
1199		* output       - NONE
1200		* side effects - new_uid is filled in with server id portion (sid)
#	Line 1230 | Line 1204 | valid_sid(const char *sid)
1204		void
1205		init_uid(void)
1206		{
1233	–	unsigned int i;
1234	–
1207		memset(new_uid, 0, sizeof(new_uid));
1208
1209		if (!EmptyString(ServerInfo.sid))
1210		strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1211
1212	<	for (i = 0; i < IRC_MAXSID; ++i)
1213	<	if (new_uid[i] == '\0')
1212	>	for (unsigned int i = 0; i < IRC_MAXSID; ++i)
1213	>	if (new_uid[i] == '\0')
1214		new_uid[i] = 'A';
1215
1216		/* 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	–	*/
1217		memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1218		}
1219
#	Line 1306 | Line 1274 | uid_get(void)
1274		void
1275		init_isupport(void)
1276		{
1309	–	isupportFile = init_MessageLine();
1310	–
1277		add_isupport("CALLERID", NULL, -1);
1278		add_isupport("CASEMAPPING", CASEMAP, -1);
1279		add_isupport("DEAF", "D", -1);
#	Line 1320 | Line 1286 | init_isupport(void)
1286		add_isupport("PREFIX", "(ov)@+", -1);
1287		add_isupport("STATUSMSG", "@+", -1);
1288		#endif
1289	+	add_isupport("EXCEPTS", "e", -1);
1290	+	add_isupport("INVEX", "I", -1);
1291		}
1292
1293		/*
#	Line 1403 | Line 1371 | rebuild_isupport_message_line(void)
1371		{
1372		char isupportbuffer[IRCD_BUFSIZE];
1373		char *p = isupportbuffer;
1374	<	dlink_node *ptr = NULL;
1374	>	dlink_node *ptr = NULL, *ptr_next = NULL;
1375		int n = 0;
1376		int tokens = 0;
1377		size_t len = 0;
1378	<	size_t reserve = strlen(me.name) + HOSTLEN + strlen(form_str(RPL_ISUPPORT));
1378	>	size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1379
1380	<	destroy_MessageLine(isupportFile);
1380	>	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1381	>	{
1382	>	dlinkDelete(ptr, &support_list_lines);
1383	>	MyFree(ptr->data);
1384	>	free_dlink_node(ptr);
1385	>	}
1386
1387		DLINK_FOREACH(ptr, support_list.head)
1388		{
#	Line 1439 | Line 1412 | rebuild_isupport_message_line(void)
1412		if (*--p == ' ')
1413		*p = '\0';
1414
1415	<	addto_MessageLine(isupportFile, isupportbuffer);
1415	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1416		p = isupportbuffer;
1417		len = 0;
1418		n = tokens = 0;
#	Line 1450 | Line 1423 | rebuild_isupport_message_line(void)
1423		{
1424		if (*--p == ' ')
1425		*p = '\0';
1426	<	addto_MessageLine(isupportFile, isupportbuffer);
1426	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1427		}
1428		}

Diff Legend

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