ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/svn/ircd-hybrid/trunk/src/s_user.c

Comparing:
ircd-hybrid-8/src/s_user.c (file contents), Revision 1173 by michael, Sun Aug 14 00:23:02 2011 UTC vs.
ircd-hybrid/trunk/src/s_user.c (file contents), Revision 2185 by michael, Tue Jun 4 12:29:18 2013 UTC

#	Line 29 | Line 29
29		#include "channel.h"
30		#include "channel_mode.h"
31		#include "client.h"
32	–	#include "common.h"
32		#include "fdlist.h"
33		#include "hash.h"
34		#include "irc_string.h"
36	–	#include "sprintf_irc.h"
35		#include "s_bsd.h"
36		#include "ircd.h"
37		#include "listener.h"
38		#include "motd.h"
39		#include "numeric.h"
40	<	#include "s_conf.h"
41	<	#include "s_log.h"
40	>	#include "conf.h"
41	>	#include "log.h"
42		#include "s_serv.h"
43		#include "send.h"
44		#include "supported.h"
#	Line 51 | Line 49
49		#include "userhost.h"
50		#include "hook.h"
51		#include "s_misc.h"
52	<	#include "msg.h"
52	>	#include "parse.h"
53		#include "watch.h"
54
57	–
58	–	struct Callback *entering_umode_cb = NULL;
59	–	struct Callback *umode_cb = NULL;
60	–
55		static char umode_buffer[IRCD_BUFSIZE];
56
57		static void user_welcome(struct Client *);
58	<	static void report_and_set_user_flags(struct Client *, const struct AccessItem *);
58	>	static void report_and_set_user_flags(struct Client *, const struct MaskItem *);
59		static int check_xline(struct Client *);
60		static void introduce_client(struct Client *);
61		static const char *uid_get(void);
#	Line 78 | Line 72 | struct Isupport
72		int number;
73		};
74
75	<	static dlink_list support_list = { NULL, NULL, 0 };
76	<	MessageFile *isupportFile;
75	>	static dlink_list support_list;
76	>	static dlink_list support_list_lines;
77
78		/* memory is cheap. map 0-255 to equivalent mode */
79	<	unsigned int user_modes[256] =
79	>	const unsigned int user_modes[256] =
80		{
81		/* 0x00 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x0F */
82		/* 0x10 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x1F */
#	Line 91 | Line 85 | unsigned int user_modes[256] =
85		0,                  /* @ */
86		0,                  /* A */
87		0,                  /* B */
88	<	UMODE_CCONN_FULL,   /* C */
88	>	0,                  /* C */
89		UMODE_DEAF,         /* D */
90		0,                  /* E */
91	<	0,                  /* F */
91	>	UMODE_FARCONNECT,   /* F */
92		UMODE_SOFTCALLERID, /* G */
93	<	0,                  /* H */
93	>	UMODE_HIDDEN,       /* H */
94		0,                  /* I */
95		0,                  /* J */
96		0,                  /* K */
#	Line 106 | Line 100 | unsigned int user_modes[256] =
100		0,                  /* O */
101		0,                  /* P */
102		0,                  /* Q */
103	<	0,                  /* R */
104	<	UMODE_REGONLY,      /* S */
103	>	UMODE_REGONLY,      /* R */
104	>	0,                  /* S */
105		0,                  /* T */
106		0,                  /* U */
107		0,                  /* V */
#	Line 121 | Line 115 | unsigned int user_modes[256] =
115		UMODE_BOTS,         /* b */
116		UMODE_CCONN,        /* c */
117		UMODE_DEBUG,        /* d */
118	<	0,                  /* e */
118	>	UMODE_EXTERNAL,     /* e */
119		UMODE_FULL,         /* f */
120		UMODE_CALLERID,     /* g */
121		0,                  /* h */
#	Line 140 | Line 134 | unsigned int user_modes[256] =
134		UMODE_UNAUTH,       /* u */
135		0,                  /* v */
136		UMODE_WALLOP,       /* w */
137	<	UMODE_EXTERNAL,     /* x */
137	>	UMODE_HIDDENHOST,   /* x */
138		UMODE_SPY,          /* y */
139		UMODE_OPERWALL,     /* z      0x7A */
140		0,0,0,0,0,          /* 0x7B - 0x7F */
#	Line 190 | Line 184 | show_lusers(struct Client *source_p)
184		to = source_p->name;
185		}
186
187	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
187	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
188		sendto_one(source_p, form_str(RPL_LUSERCLIENT),
189		from, to, (Count.total-Count.invisi),
190		Count.invisi, dlink_list_length(&global_serv_list));
#	Line 210 | Line 204 | show_lusers(struct Client *source_p)
204		sendto_one(source_p, form_str(RPL_LUSERCHANNELS),
205		from, to, dlink_list_length(&global_channel_list));
206
207	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
207	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
208		{
209		sendto_one(source_p, form_str(RPL_LUSERME),
210		from, to, Count.local, Count.myserver);
211		sendto_one(source_p, form_str(RPL_LOCALUSERS),
212	<	from, to, Count.local, Count.max_loc,
219	<	Count.local, Count.max_loc);
212	>	from, to, Count.local, Count.max_loc);
213		}
214		else
215		{
216		sendto_one(source_p, form_str(RPL_LUSERME),
217		from, to, Count.total, 0);
218		sendto_one(source_p, form_str(RPL_LOCALUSERS),
219	<	from, to, Count.total, Count.max_tot,
227	<	Count.total, Count.max_tot);
219	>	from, to, Count.total, Count.max_tot);
220		}
221
222		sendto_one(source_p, form_str(RPL_GLOBALUSERS),
223	<	from, to, Count.total, Count.max_tot,
232	<	Count.total, Count.max_tot);
223	>	from, to, Count.total, Count.max_tot);
224
225	<	if (!ConfigServerHide.hide_servers || IsOper(source_p))
225	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
226		sendto_one(source_p, form_str(RPL_STATSCONN), from, to,
227		Count.max_loc_con, Count.max_loc_cli, Count.totalrestartcount);
228
#	Line 251 | Line 242 | show_lusers(struct Client *source_p)
242		void
243		show_isupport(struct Client *source_p)
244		{
245	<	send_message_file(source_p, isupportFile);
245	>	const dlink_node *ptr = NULL;
246	>
247	>	DLINK_FOREACH(ptr, support_list_lines.head)
248	>	sendto_one(source_p, form_str(RPL_ISUPPORT), me.name,
249	>	source_p->name, ptr->data);
250		}
251
252		/*
#	Line 281 | Line 276 | void
276		register_local_user(struct Client *source_p)
277		{
278		const char *id = NULL;
279	<	const struct AccessItem *aconf = NULL;
285	<	dlink_node *ptr = NULL;
279	>	const struct MaskItem *conf = NULL;
280
281		assert(source_p != NULL);
282		assert(source_p == source_p->from);
#	Line 309 | Line 303 | register_local_user(struct Client *sourc
303		return;
304		}
305
306	<	source_p->localClient->last = CurrentTime;
306	>	source_p->localClient->last_privmsg = CurrentTime;
307		/* Straight up the maximum rate of flooding... */
308		source_p->localClient->allow_read = MAX_FLOOD_BURST;
309
310	<	if (!execute_callback(client_check_cb, source_p, source_p->username))
310	>	if (!check_client(source_p))
311		return;
312
313		if (valid_hostname(source_p->host) == 0)
#	Line 324 | Line 318 | register_local_user(struct Client *sourc
318		sizeof(source_p->host));
319		}
320
321	<	ptr   = source_p->localClient->confs.head;
328	<	aconf = map_to_conf(ptr->data);
321	>	conf = source_p->localClient->confs.head->data;
322
323		if (!IsGotId(source_p))
324		{
#	Line 333 | Line 326 | register_local_user(struct Client *sourc
326		const char *p = username;
327		unsigned int i = 0;
328
329	<	if (IsNeedIdentd(aconf))
329	>	if (IsNeedIdentd(conf))
330		{
331		++ServerStats.is_ref;
332		sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You need to install "
#	Line 344 | Line 337 | register_local_user(struct Client *sourc
337
338		strlcpy(username, source_p->username, sizeof(username));
339
340	<	if (!IsNoTilde(aconf))
340	>	if (!IsNoTilde(conf))
341		source_p->username[i++] = '~';
342
343		for (; *p && i < USERLEN; ++p)
#	Line 355 | Line 348 | register_local_user(struct Client *sourc
348		}
349
350		/* password check */
351	<	if (!EmptyString(aconf->passwd))
351	>	if (!EmptyString(conf->passwd))
352		{
353		const char *pass = source_p->localClient->passwd;
354
355	<	if (!match_conf_password(pass, aconf))
355	>	if (!match_conf_password(pass, conf))
356		{
357		++ServerStats.is_ref;
358		sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
#	Line 375 | Line 368 | register_local_user(struct Client *sourc
368		*/
369
370		/* report if user has &^>= etc. and set flags as needed in source_p */
371	<	report_and_set_user_flags(source_p, aconf);
371	>	report_and_set_user_flags(source_p, conf);
372
373		if (IsDead(source_p))
374		return;
#	Line 391 | Line 384 | register_local_user(struct Client *sourc
384		if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
385		(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
386		{
387	<	sendto_realops_flags(UMODE_FULL, L_ALL,
387	>	sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
388		"Too many clients, rejecting %s[%s].",
389		source_p->name, source_p->host);
390		++ServerStats.is_ref;
#	Line 400 | Line 393 | register_local_user(struct Client *sourc
393		}
394
395		/* valid user name check */
396	<	if (valid_username(source_p->username) == 0)
396	>	if (valid_username(source_p->username, 1) == 0)
397		{
398		char tmpstr2[IRCD_BUFSIZE];
399
400	<	sendto_realops_flags(UMODE_REJ, L_ALL, "Invalid username: %s (%s@%s)",
400	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
401	>	"Invalid username: %s (%s@%s)",
402		source_p->name, source_p->username, source_p->host);
403		++ServerStats.is_ref;
404		snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
#	Line 422 | Line 416 | register_local_user(struct Client *sourc
416		strlcpy(source_p->id, id, sizeof(source_p->id));
417		hash_add_id(source_p);
418
419	<	sendto_realops_flags(UMODE_CCONN, L_ALL,
419	>	sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
420		"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
421		source_p->name, source_p->username, source_p->host,
422		ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
423		"255.255.255.255" : source_p->sockhost,
424	<	get_client_class(source_p),
424	>	get_client_class(&source_p->localClient->confs),
425		source_p->info, source_p->id);
426
433	–	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL,
434	–	"CLICONN %s %s %s %s %s %s %s 0 %s",
435	–	source_p->name, source_p->username, source_p->host,
436	–	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
437	–	"255.255.255.255" : source_p->sockhost,
438	–	get_client_class(source_p),
439	–	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
440	–	"<hidden>" : source_p->localClient->client_host,
441	–	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
442	–	"<hidden>" : source_p->localClient->client_server,
443	–	source_p->info);
444	–
445	–
427		if (ConfigFileEntry.invisible_on_connect)
428		{
429	<	source_p->umodes |= UMODE_INVISIBLE;
429	>	AddUMode(source_p, UMODE_INVISIBLE);
430		++Count.invisi;
431		}
432
#	Line 454 | Line 435 | register_local_user(struct Client *sourc
435		Count.max_loc = Count.local;
436
437		if (!(Count.max_loc % 10))
438	<	sendto_realops_flags(UMODE_ALL, L_ALL, "New Max Local Clients: %d",
438	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
439	>	"New Max Local Clients: %d",
440		Count.max_loc);
441		}
442
#	Line 510 | Line 492 | register_remote_user(struct Client *sour
492		*/
493		source_p->servptr = hash_find_server(server);
494
495	<	/* Super GhostDetect:
495	>	/*
496	>	* Super GhostDetect:
497		* If we can't find the server the user is supposed to be on,
498		* then simply blow the user away.        -Taner
499		*/
500		if (source_p->servptr == NULL)
501		{
502	<	sendto_realops_flags(UMODE_ALL, L_ALL,
502	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
503		"No server %s for user %s[%s@%s] from %s",
504		server, source_p->name, source_p->username,
505		source_p->host, source_p->from->name);
506		kill_client(source_p->from, source_p, "%s (Server doesn't exist)", me.name);
507
508	<	SetKilled(source_p);
508	>	AddFlag(source_p, FLAGS_KILLED);
509		exit_client(source_p, &me, "Ghosted Client");
510		return;
511		}
512
513		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
514		{
515	<	sendto_realops_flags(UMODE_DEBUG, L_ALL,
515	>	sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
516		"Bad User [%s] :%s USER %s@%s %s, != %s[%s]",
517		source_p->from->name, source_p->name, source_p->username,
518		source_p->host, source_p->servptr->name,
#	Line 537 | Line 520 | register_remote_user(struct Client *sour
520		kill_client(source_p->from, source_p,
521		"%s (NICK from wrong direction (%s != %s))",
522		me.name, source_p->servptr->name, target_p->from->name);
523	<	SetKilled(source_p);
523	>	AddFlag(source_p, FLAGS_KILLED);
524		exit_client(source_p, &me, "USER server wrong direction");
525		return;
526		}
#	Line 546 | Line 529 | register_remote_user(struct Client *sour
529		* If the nick has been introduced by a services server,
530		* make it a service as well.
531		*/
532	<	if (IsService(source_p->servptr))
533	<	SetService(source_p);
532	>	if (HasFlag(source_p->servptr, FLAGS_SERVICE))
533	>	AddFlag(source_p, FLAGS_SERVICE);
534
535		/* Increment our total user count here */
536		if (++Count.total > Count.max_tot)
#	Line 558 | Line 541 | register_remote_user(struct Client *sour
541		add_user_host(source_p->username, source_p->host, 1);
542		SetUserHost(source_p);
543
544	+	if (HasFlag(source_p->servptr, FLAGS_EOB))
545	+	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
546	+	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
547	+	source_p->servptr->name,
548	+	source_p->name, source_p->username, source_p->host,
549	+	source_p->info, source_p->id);
550	+
551		introduce_client(source_p);
552		}
553
#	Line 595 | Line 585 | introduce_client(struct Client *source_p
585		if (server == source_p->from)
586		continue;
587
588	<	if (IsCapable(server, CAP_TS6) && HasID(source_p))
589	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
590	<	source_p->servptr->id,
591	<	source_p->name, source_p->hopcount+1,
592	<	(unsigned long)source_p->tsinfo,
593	<	ubuf, source_p->username, source_p->host,
594	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
595	<	"0" : source_p->sockhost, source_p->id, source_p->info);
588	>	if (IsCapable(server, CAP_SVS))
589	>	{
590	>	if (IsCapable(server, CAP_TS6) && HasID(source_p))
591	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
592	>	source_p->servptr->id,
593	>	source_p->name, source_p->hopcount+1,
594	>	(unsigned long)source_p->tsinfo,
595	>	ubuf, source_p->username, source_p->host,
596	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
597	>	"0" : source_p->sockhost, source_p->id,
598	>	source_p->svid,
599	>	source_p->info);
600	>	else
601	>	sendto_one(server, "NICK %s %d %lu %s %s %s %s %s :%s",
602	>	source_p->name, source_p->hopcount+1,
603	>	(unsigned long)source_p->tsinfo,
604	>	ubuf, source_p->username, source_p->host,
605	>	source_p->servptr->name, source_p->svid,
606	>	source_p->info);
607	>
608	>	}
609		else
610	<	sendto_one(server, "NICK %s %d %lu %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->info);
610	>	{
611	>	if (IsCapable(server, CAP_TS6) && HasID(source_p))
612	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
613	>	source_p->servptr->id,
614	>	source_p->name, source_p->hopcount+1,
615	>	(unsigned long)source_p->tsinfo,
616	>	ubuf, source_p->username, source_p->host,
617	>	(MyClient(source_p) && IsIPSpoof(source_p)) ?
618	>	"0" : source_p->sockhost, source_p->id, source_p->info);
619	>	else
620	>	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
621	>	source_p->name, source_p->hopcount+1,
622	>	(unsigned long)source_p->tsinfo,
623	>	ubuf, source_p->username, source_p->host,
624	>	source_p->servptr->name, source_p->info);
625	>	}
626		}
627		}
628
#	Line 635 | Line 649 | valid_hostname(const char *hostname)
649		if (!IsHostChar(*p))
650		return 0;
651
652	<	return 1;
652	>	return p - hostname <= HOSTLEN;
653		}
654
655		/* valid_username()
#	Line 650 | Line 664 | valid_hostname(const char *hostname)
664		* style of username
665		*/
666		int
667	<	valid_username(const char *username)
667	>	valid_username(const char *username, const int local)
668		{
669		int dots      = 0;
670		const char *p = username;
#	Line 660 | Line 674 | valid_username(const char *username)
674		if (*p == '~')
675		++p;
676
677	<	/* reject usernames that don't start with an alphanum
677	>	/*
678	>	* Reject usernames that don't start with an alphanum
679		* i.e. reject jokers who have '-@somehost' or '.@somehost'
680		* or "-hi-@somehost", "h-----@somehost" would still be accepted.
681		*/
682		if (!IsAlNum(*p))
683		return 0;
684
685	<	while (*++p)
685	>	if (local)
686		{
687	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
687	>	while (*++p)
688		{
689	<	if (++dots > ConfigFileEntry.dots_in_ident)
690	<	return 0;
691	<	if (!IsUserChar(*(p + 1)))
689	>	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
690	>	{
691	>	if (++dots > ConfigFileEntry.dots_in_ident)
692	>	return 0;
693	>	if (!IsUserChar(*(p + 1)))
694	>	return 0;
695	>	}
696	>	else if (!IsUserChar(*p))
697		return 0;
698		}
699	<	else if (!IsUserChar(*p))
700	<	return 0;
699	>	}
700	>	else
701	>	{
702	>	while (*++p)
703	>	if (!IsUserChar(*p))
704	>	return 0;
705		}
706
707	<	return 1;
707	>	return  p - username <= USERLEN;;
708		}
709
710		/* clean_nick_name()
#	Line 705 | Line 729 | valid_nickname(const char *nickname, con
729		if (!IsNickChar(*p))
730		return 0;
731
732	<	return p - nickname <= (NICKLEN - 1);
732	>	return p - nickname <= NICKLEN;
733		}
734
735		/* report_and_set_user_flags()
736		*
737		* inputs       - pointer to source_p
738	<	*              - pointer to aconf for this user
738	>	*              - pointer to conf for this user
739		* output       - NONE
740		* side effects - Report to user any special flags
741		*                they are getting, and set them.
742		*/
743		static void
744	<	report_and_set_user_flags(struct Client *source_p, const struct AccessItem *aconf)
744	>	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
745		{
746		/* If this user is being spoofed, tell them so */
747	<	if (IsConfDoSpoofIp(aconf))
724	<	{
747	>	if (IsConfDoSpoofIp(conf))
748		sendto_one(source_p,
749	<	":%s NOTICE %s :*** Spoofing your IP. congrats.",
749	>	":%s NOTICE %s :*** Spoofing your IP. Congrats.",
750		me.name, source_p->name);
728	–	}
751
752		/* If this user is in the exception class, Set it "E lined" */
753	<	if (IsConfExemptKline(aconf))
753	>	if (IsConfExemptKline(conf))
754		{
755		SetExemptKline(source_p);
756		sendto_one(source_p,
757	<	":%s NOTICE %s :*** You are exempt from K/D/G lines. congrats.",
757	>	":%s NOTICE %s :*** You are exempt from K/D/G lines. Congrats.",
758		me.name, source_p->name);
759		}
760
761		/* The else here is to make sure that G line exempt users
762		* do not get noticed twice.
763		*/
764	<	else if (IsConfExemptGline(aconf))
764	>	else if (IsConfExemptGline(conf))
765		{
766		SetExemptGline(source_p);
767	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines.",
767	>	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines. Congrats.",
768		me.name, source_p->name);
769		}
770
771	<	if (IsConfExemptResv(aconf))
771	>	if (IsConfExemptResv(conf))
772		{
773		SetExemptResv(source_p);
774	<	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs.",
774	>	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs. Congrats.",
775		me.name, source_p->name);
776		}
777
778		/* If this user is exempt from user limits set it "F lined" */
779	<	if (IsConfExemptLimits(aconf))
779	>	if (IsConfExemptLimits(conf))
780		{
781		SetExemptLimits(source_p);
782		sendto_one(source_p,
783	<	":%s NOTICE %s :*** You are exempt from user limits. congrats.",
783	>	":%s NOTICE %s :*** You are exempt from user limits. Congrats.",
784		me.name,source_p->name);
785		}
786
787	<	/* If this user is exempt from idle time outs */
766	<	if (IsConfIdlelined(aconf))
767	<	{
768	<	SetIdlelined(source_p);
769	<	sendto_one(source_p,
770	<	":%s NOTICE %s :*** You are exempt from idle limits. congrats.",
771	<	me.name, source_p->name);
772	<	}
773	<
774	<	if (IsConfCanFlood(aconf))
787	>	if (IsConfCanFlood(conf))
788		{
789		SetCanFlood(source_p);
790		sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
#	Line 780 | Line 793 | report_and_set_user_flags(struct Client
793		}
794		}
795
783	–	/* change_simple_umode()
784	–	*
785	–	* this callback can be hooked to allow special handling of
786	–	* certain usermodes
787	–	*/
788	–	static void *
789	–	change_simple_umode(va_list args)
790	–	{
791	–	struct Client *client_p;
792	–	struct Client *source_p;
793	–	int what;
794	–	unsigned int flag;
795	–
796	–	client_p = va_arg(args, struct Client *);
797	–	source_p = va_arg(args, struct Client *);
798	–	what = va_arg(args, int);
799	–	flag = va_arg(args, unsigned int);
800	–
801	–	if (what == MODE_ADD)
802	–	source_p->umodes |= flag;
803	–	else
804	–	source_p->umodes &= ~flag;
805	–
806	–	return NULL;
807	–	}
808	–
796		/* set_user_mode()
797		*
798		* added 15/10/91 By Darren Reed.
#	Line 815 | Line 802 | change_simple_umode(va_list args)
802		*/
803		void
804		set_user_mode(struct Client *client_p, struct Client *source_p,
805	<	int parc, char *parv[])
805	>	const int parc, char *parv[])
806		{
807		unsigned int flag, setflags;
808		char **p, *m, buf[IRCD_BUFSIZE];
#	Line 832 | Line 819 | set_user_mode(struct Client *client_p, s
819		return;
820		}
821
835	–	if (IsServer(source_p))
836	–	{
837	–	sendto_realops_flags(UMODE_ALL, L_ADMIN, "*** Mode for User %s from %s",
838	–	parv[1], source_p->name);
839	–	return;
840	–	}
841	–
822		if (source_p != target_p)
823		{
824		sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
#	Line 852 | Line 832 | set_user_mode(struct Client *client_p, s
832		*m++ = '+';
833
834		for (i = 0; i < 128; i++)
835	<	if (source_p->umodes & user_modes[i])
835	>	if (HasUMode(source_p, user_modes[i]))
836		*m++ = (char)i;
837		*m = '\0';
838
#	Line 861 | Line 841 | set_user_mode(struct Client *client_p, s
841		return;
842		}
843
864	–	execute_callback(entering_umode_cb, client_p, source_p);
865	–
844		/* find flags already set for user */
845		setflags = source_p->umodes;
846
#	Line 882 | Line 860 | set_user_mode(struct Client *client_p, s
860		case 'o':
861		if (what == MODE_ADD)
862		{
863	<	if (IsServer(client_p) && !IsOper(source_p))
863	>	if (IsServer(client_p) && !HasUMode(source_p, UMODE_OPER))
864		{
865		++Count.oper;
866		SetOper(source_p);
#	Line 893 | Line 871 | set_user_mode(struct Client *client_p, s
871		/* Only decrement the oper counts if an oper to begin with
872		* found by Pat Szuta, Perly , perly@xnet.com
873		*/
874	<	if (!IsOper(source_p))
874	>	if (!HasUMode(source_p, UMODE_OPER))
875		break;
876
877		ClearOper(source_p);
#	Line 903 | Line 881 | set_user_mode(struct Client *client_p, s
881		{
882		dlink_node *dm;
883
884	<	detach_conf(source_p, OPER_TYPE);
885	<	ClearOperFlags(source_p);
886	<	source_p->umodes &= ~ConfigFileEntry.oper_only_umodes;
884	>	detach_conf(source_p, CONF_OPER);
885	>	ClrOFlag(source_p);
886	>	DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
887
888		if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
889		free_dlink_node(dm);
#	Line 914 | Line 892 | set_user_mode(struct Client *client_p, s
892
893		break;
894
895	<	/* we may not get these,
896	<	* but they shouldnt be in default
919	<	*/
920	<	case 'r':
921	<	case ' ' :
922	<	case '\n':
923	<	case '\r':
924	<	case '\t':
895	>	case 'r':  /* Only services may set +r */
896	>	case 'x':  /* Only services may set +x */
897		break;
898
899		default:
900		if ((flag = user_modes[(unsigned char)*m]))
901		{
902	<	if (MyConnect(source_p) && !IsOper(source_p) &&
902	>	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
903		(ConfigFileEntry.oper_only_umodes & flag))
932	–	{
904		badflag = 1;
934	–	}
905		else
906	<	execute_callback(umode_cb, client_p, source_p, what, flag);
906	>	{
907	>	if (what == MODE_ADD)
908	>	AddUMode(source_p, flag);
909	>	else
910	>	DelUMode(source_p, flag);
911	>	}
912		}
913		else
914		{
#	Line 950 | Line 925 | set_user_mode(struct Client *client_p, s
925		sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
926		me.name, source_p->name);
927
928	<	if (HasUMode(source_p, UMODE_NCHANGE) && !IsOperN(source_p))
928	>	if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
929	>	!HasOFlag(source_p, OPER_FLAG_ADMIN))
930		{
931		sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
932		me.name, source_p->name);
933	<	DelUMode(source_p, UMODE_NCHANGE); /* only tcm's really need this */
933	>	DelUMode(source_p, UMODE_ADMIN);
934		}
935
936	<	if (MyConnect(source_p) && (source_p->umodes & UMODE_ADMIN) &&
961	<	!IsOperAdmin(source_p) && !IsOperHiddenAdmin(source_p))
962	<	{
963	<	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
964	<	me.name, source_p->name);
965	<	source_p->umodes &= ~UMODE_ADMIN;
966	<	}
967	<
968	<	if (!(setflags & UMODE_INVISIBLE) && IsInvisible(source_p))
936	>	if (!(setflags & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
937		++Count.invisi;
938	<	if ((setflags & UMODE_INVISIBLE) && !IsInvisible(source_p))
938	>	if ((setflags & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
939		--Count.invisi;
940
941		/*
#	Line 1010 | Line 978 | send_umode(struct Client *client_p, stru
978		if (MyClient(source_p) && !(flag & sendmask))
979		continue;
980
981	<	if ((flag & old) && !(source_p->umodes & flag))
981	>	if ((flag & old) && !HasUMode(source_p, flag))
982		{
983		if (what == MODE_DEL)
984		*m++ = (char)i;
#	Line 1021 | Line 989 | send_umode(struct Client *client_p, stru
989		*m++ = (char)i;
990		}
991		}
992	<	else if (!(flag & old) && (source_p->umodes & flag))
992	>	else if (!(flag & old) && HasUMode(source_p, flag))
993		{
994		if (what == MODE_ADD)
995		*m++ = (char)i;
#	Line 1055 | Line 1023 | send_umode_out(struct Client *client_p,
1023		char buf[IRCD_BUFSIZE] = { '\0' };
1024		dlink_node *ptr = NULL;
1025
1026	<	send_umode(NULL, source_p, old, IsOperHiddenAdmin(source_p) ?
1059	<	SEND_UMODES & ~UMODE_ADMIN : SEND_UMODES, buf);
1026	>	send_umode(NULL, source_p, old, SEND_UMODES, buf);
1027
1028		if (buf[0])
1029		{
#	Line 1075 | Line 1042 | send_umode_out(struct Client *client_p,
1042		send_umode(client_p, source_p, old, 0xffffffff, buf);
1043		}
1044
1045	+	void
1046	+	user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
1047	+	{
1048	+	dlink_node *ptr = NULL;
1049	+
1050	+	if (!strcmp(target_p->host, hostname))
1051	+	return;
1052	+
1053	+	switch (what)
1054	+	{
1055	+	case MODE_ADD:
1056	+	AddUMode(target_p, UMODE_HIDDENHOST);
1057	+	AddFlag(target_p, FLAGS_IP_SPOOFING);
1058	+	break;
1059	+	case MODE_DEL:
1060	+	DelUMode(target_p, UMODE_HIDDENHOST);
1061	+
1062	+	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
1063	+	DelFlag(target_p, FLAGS_IP_SPOOFING);
1064	+	break;
1065	+	default: return;
1066	+	}
1067	+
1068	+	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
1069	+	target_p->name, target_p->username, target_p->host);
1070	+
1071	+	if (IsUserHostIp(target_p))
1072	+	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1073	+
1074	+	strlcpy(target_p->host, hostname, sizeof(target_p->host));
1075	+
1076	+	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1077	+	SetUserHost(target_p);
1078	+
1079	+	if (MyClient(target_p))
1080	+	{
1081	+	sendto_one(target_p, form_str(RPL_NEWHOSTIS), me.name,
1082	+	target_p->name, target_p->host);
1083	+	clear_ban_cache_client(target_p);
1084	+	}
1085	+
1086	+	DLINK_FOREACH(ptr, target_p->channel.head)
1087	+	{
1088	+	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = { '\0' };
1089	+	char *p = modebuf;
1090	+	int len = 0;
1091	+	const struct Membership *ms = ptr->data;
1092	+
1093	+	if (has_member_flags(ms, CHFL_CHANOP)) {
1094	+	*p++ = 'o';
1095	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1096	+	}
1097	+
1098	+	if (has_member_flags(ms, CHFL_HALFOP)) {
1099	+	*p++ = 'h';
1100	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1101	+	}
1102	+
1103	+	if (has_member_flags(ms, CHFL_VOICE)) {
1104	+	*p++ = 'v';
1105	+	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
1106	+	}
1107	+
1108	+	*p = '\0';
1109	+
1110	+	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
1111	+	target_p->name, target_p->username, target_p->host,
1112	+	ms->chptr->chname);
1113	+	if (nickbuf[0])
1114	+	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
1115	+	target_p->servptr->name, ms->chptr->chname,
1116	+	modebuf, nickbuf);
1117	+
1118	+	}
1119	+
1120	+	if (target_p->away[0])
1121	+	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
1122	+	":%s!%s@%s AWAY :%s",
1123	+	target_p->name, target_p->username,
1124	+	target_p->host, target_p->away);
1125	+	}
1126	+
1127		/* user_welcome()
1128		*
1129		* inputs       - client pointer to client to welcome
#	Line 1112 | Line 1161 | user_welcome(struct Client *source_p)
1161		source_p->name, source_p->id);
1162
1163		show_lusers(source_p);
1164	<
1116	<	if (ConfigFileEntry.short_motd)
1117	<	{
1118	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- motd was last changed at %s",
1119	<	me.name, source_p->name, ConfigFileEntry.motd.lastChangedDate);
1120	<	sendto_one(source_p,
1121	<	":%s NOTICE %s :*** Notice -- Please read the motd if you haven't "
1122	<	"read it", me.name, source_p->name);
1123	<	sendto_one(source_p, form_str(RPL_MOTDSTART),
1124	<	me.name, source_p->name, me.name);
1125	<	sendto_one(source_p, form_str(RPL_MOTD),
1126	<	me.name, source_p->name,
1127	<	"*** This is the short motd ***");
1128	<	sendto_one(source_p, form_str(RPL_ENDOFMOTD),
1129	<	me.name, source_p->name);
1130	<	}
1131	<	else
1132	<	send_message_file(source_p, &ConfigFileEntry.motd);
1164	>	motd_signon(source_p);
1165		}
1166
1167		/* check_xline()
#	Line 1141 | Line 1173 | user_welcome(struct Client *source_p)
1173		static int
1174		check_xline(struct Client *source_p)
1175		{
1176	<	struct ConfItem *conf = NULL;
1176	>	struct MaskItem *conf = NULL;
1177		const char *reason = NULL;
1178
1179	<	if ((conf = find_matching_name_conf(XLINE_TYPE, source_p->info, NULL, NULL, 0)) ||
1148	<	(conf = find_matching_name_conf(RXLINE_TYPE, source_p->info, NULL, NULL, 0)))
1179	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
1180		{
1181	<	struct MatchItem *reg = map_to_conf(conf);
1181	>	++conf->count;
1182
1183	<	++reg->count;
1184	<
1154	<	if (reg->reason != NULL)
1155	<	reason = reg->reason;
1183	>	if (conf->reason != NULL)
1184	>	reason = conf->reason;
1185		else
1186		reason = "No Reason";
1187
1188	<	sendto_realops_flags(UMODE_REJ, L_ALL,
1188	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
1189		"X-line Rejecting [%s] [%s], user %s [%s]",
1190		source_p->info, reason,
1191		get_client_name(source_p, HIDE_IP),
1192		source_p->sockhost);
1193
1194		++ServerStats.is_ref;
1195	<	if (REJECT_HOLD_TIME > 0)
1167	<	{
1168	<	sendto_one(source_p, ":%s NOTICE %s :Bad user info",
1169	<	me.name, source_p->name);
1170	<	source_p->localClient->reject_delay = CurrentTime + REJECT_HOLD_TIME;
1171	<	SetCaptured(source_p);
1172	<	}
1173	<	else
1174	<	exit_client(source_p, &me, "Bad user info");
1195	>	exit_client(source_p, &me, "Bad user info");
1196		return 1;
1197		}
1198
#	Line 1182 | Line 1203 | check_xline(struct Client *source_p)
1203		*
1204		* inputs       - pointer to given client to oper
1205		* output       - NONE
1206	<	* side effects - Blindly opers up given source_p, using aconf info
1206	>	* side effects - Blindly opers up given source_p, using conf info
1207		*                all checks on passwords have already been done.
1208		*                This could also be used by rsa oper routines.
1209		*/
1210		void
1211		oper_up(struct Client *source_p)
1212		{
1213	<	unsigned int old = source_p->umodes;
1214	<	const char *operprivs = "";
1194	<	const struct AccessItem *oconf = NULL;
1213	>	const unsigned int old = source_p->umodes;
1214	>	const struct MaskItem *conf = source_p->localClient->confs.head->data;
1215
1216		assert(source_p->localClient->confs.head);
1197	–	oconf = map_to_conf((source_p->localClient->confs.head)->data);
1217
1218		++Count.oper;
1219		SetOper(source_p);
1220
1221	<	if (oconf->modes)
1222	<	source_p->umodes |= oconf->modes;
1221	>	if (conf->modes)
1222	>	AddUMode(source_p, conf->modes);
1223		else if (ConfigFileEntry.oper_umodes)
1224	<	source_p->umodes |= ConfigFileEntry.oper_umodes;
1206	<	else
1207	<	source_p->umodes |= (UMODE_SERVNOTICE|UMODE_OPERWALL|
1208	<	UMODE_WALLOP|UMODE_LOCOPS);
1224	>	AddUMode(source_p, ConfigFileEntry.oper_umodes);
1225
1226	<	if (!(old & UMODE_INVISIBLE) && IsInvisible(source_p))
1226	>	if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
1227		++Count.invisi;
1228	<	if ((old & UMODE_INVISIBLE) && !IsInvisible(source_p))
1228	>	if ((old & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
1229		--Count.invisi;
1230
1231		assert(dlinkFind(&oper_list, source_p) == NULL);
1232		dlinkAdd(source_p, make_dlink_node(), &oper_list);
1233
1234	<	operprivs = oper_privs_as_string(oconf->port);
1219	<
1220	<	SetOFlag(source_p, oconf->port);
1234	>	AddOFlag(source_p, conf->port);
1235
1236	<	if (IsOperAdmin(source_p) || IsOperHiddenAdmin(source_p))
1236	>	if (HasOFlag(source_p, OPER_FLAG_ADMIN))
1237		AddUMode(source_p, UMODE_ADMIN);
1224	–	if (!IsOperN(source_p))
1225	–	DelUMode(source_p, UMODE_NCHANGE);
1238
1239	<	sendto_realops_flags(UMODE_ALL, L_ALL, "%s (%s@%s) is now an operator",
1240	<	source_p->name, source_p->username, source_p->host);
1239	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1240	>	get_oper_name(source_p));
1241		send_umode_out(source_p, source_p, old);
1242		sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
1231	–	sendto_one(source_p, ":%s NOTICE %s :*** Oper privs are %s",
1232	–	me.name, source_p->name, operprivs);
1233	–	send_message_file(source_p, &ConfigFileEntry.opermotd);
1243		}
1244
1245		static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
#	Line 1258 | Line 1267 | valid_sid(const char *sid)
1267		void
1268		init_uid(void)
1269		{
1270	<	int i;
1270	>	unsigned int i;
1271
1272		memset(new_uid, 0, sizeof(new_uid));
1273
#	Line 1275 | Line 1284 | init_uid(void)
1284		* -Dianora
1285		*/
1286		memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1278	–
1279	–	entering_umode_cb = register_callback("entering_umode", NULL);
1280	–	umode_cb = register_callback("changing_umode", change_simple_umode);
1287		}
1288
1289		/*
#	Line 1337 | Line 1343 | uid_get(void)
1343		void
1344		init_isupport(void)
1345		{
1340	–	isupportFile = init_MessageLine();
1341	–
1346		add_isupport("CALLERID", NULL, -1);
1347		add_isupport("CASEMAPPING", CASEMAP, -1);
1348		add_isupport("DEAF", "D", -1);
1349		add_isupport("KICKLEN", NULL, KICKLEN);
1350		add_isupport("MODES", NULL, MAXMODEPARAMS);
1347	–	add_isupport("NICKLEN", NULL, NICKLEN-1);
1351		#ifdef HALFOPS
1352		add_isupport("PREFIX", "(ohv)@%+", -1);
1353		add_isupport("STATUSMSG", "@%+", -1);
#	Line 1352 | Line 1355 | init_isupport(void)
1355		add_isupport("PREFIX", "(ov)@+", -1);
1356		add_isupport("STATUSMSG", "@+", -1);
1357		#endif
1358	<	add_isupport("TOPICLEN", NULL, TOPICLEN);
1358	>	add_isupport("EXCEPTS", "e", -1);
1359	>	add_isupport("INVEX", "I", -1);
1360		}
1361
1362		/*
#	Line 1387 | Line 1391 | add_isupport(const char *name, const cha
1391		dlinkAddTail(support, &support->node, &support_list);
1392		}
1393
1394	<	DupString(support->name, name);
1394	>	support->name = xstrdup(name);
1395		if (options != NULL)
1396	<	DupString(support->options, options);
1396	>	support->options = xstrdup(options);
1397		support->number = n;
1398
1399		rebuild_isupport_message_line();
#	Line 1436 | Line 1440 | rebuild_isupport_message_line(void)
1440		{
1441		char isupportbuffer[IRCD_BUFSIZE];
1442		char *p = isupportbuffer;
1443	<	dlink_node *ptr = NULL;
1443	>	dlink_node *ptr = NULL, *ptr_next = NULL;
1444		int n = 0;
1445		int tokens = 0;
1446		size_t len = 0;
1447		size_t reserve = strlen(me.name) + HOSTLEN + strlen(form_str(RPL_ISUPPORT));
1448
1449	<	destroy_MessageLine(isupportFile);
1449	>	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1450	>	{
1451	>	dlinkDelete(ptr, &support_list_lines);
1452	>	MyFree(ptr->data);
1453	>	free_dlink_node(ptr);
1454	>	}
1455
1456		DLINK_FOREACH(ptr, support_list.head)
1457		{
1458		struct Isupport *support = ptr->data;
1459
1460	<	p += (n = ircsprintf(p, "%s", support->name));
1460	>	p += (n = sprintf(p, "%s", support->name));
1461		len += n;
1462
1463		if (support->options != NULL)
1464		{
1465	<	p += (n = ircsprintf(p, "=%s", support->options));
1465	>	p += (n = sprintf(p, "=%s", support->options));
1466		len += n;
1467		}
1468
1469		if (support->number > 0)
1470		{
1471	<	p += (n = ircsprintf(p, "=%d", support->number));
1471	>	p += (n = sprintf(p, "=%d", support->number));
1472		len += n;
1473		}
1474
#	Line 1472 | Line 1481 | rebuild_isupport_message_line(void)
1481		if (*--p == ' ')
1482		*p = '\0';
1483
1484	<	addto_MessageLine(isupportFile, isupportbuffer);
1484	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1485		p = isupportbuffer;
1486		len = 0;
1487		n = tokens = 0;
#	Line 1483 | Line 1492 | rebuild_isupport_message_line(void)
1492		{
1493		if (*--p == ' ')
1494		*p = '\0';
1495	<	addto_MessageLine(isupportFile, isupportbuffer);
1495	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1496		}
1497		}

Diff Legend

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