ViewVC Help

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

root/svn/ircd-hybrid/branches/8.2.x/src/user.c

Comparing ircd-hybrid/branches/8.2.x/src/user.c (file contents):
Revision 4939 by michael, Thu Nov 27 15:07:36 2014 UTC vs.
Revision 6812 by michael, Wed Nov 18 17:43:52 2015 UTC

#	Line 1 | Line 1
1		/*
2		*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (c) 1997-2014 ircd-hybrid development team
4	>	*  Copyright (c) 1997-2015 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 19 | Line 19
19		*  USA
20		*/
21
22	<	/*! \file s_user.c
22	>	/*! \file user.c
23		* \brief User related functions.
24		* \version $Id$
25		*/
#	Line 31 | Line 31
31		#include "channel_mode.h"
32		#include "client.h"
33		#include "hash.h"
34	+	#include "id.h"
35		#include "irc_string.h"
36		#include "ircd.h"
37		#include "listener.h"
#	Line 47 | Line 48
48		#include "misc.h"
49		#include "parse.h"
50		#include "watch.h"
51	+	#include "isupport.h"
52
53		static char umode_buffer[IRCD_BUFSIZE];
52	–	static const char *uid_get(void);
54
55	<	/* Used for building up the isupport string,
56	<	* used with init_isupport, add_isupport, delete_isupport
56	<	*/
57	<	struct Isupport
58	<	{
59	<	dlink_node node;
60	<	char *name;
61	<	char *options;
62	<	int number;
63	<	};
64	<
65	<	static dlink_list support_list;
66	<	static dlink_list support_list_lines;
67	<
68	<	/* memory is cheap. map 0-255 to equivalent mode */
69	<	const unsigned int user_modes[256] =
55	>	const struct user_modes *umode_map[256];
56	>	const struct user_modes  umode_tab[] =
57		{
58	<	/* 0x00 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x0F */
59	<	/* 0x10 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x1F */
60	<	/* 0x20 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x2F */
61	<	/* 0x30 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x3F */
62	<	0,                  /* @ */
63	<	0,                  /* A */
64	<	0,                  /* B */
65	<	0,                  /* C */
66	<	UMODE_DEAF,         /* D */
67	<	0,                  /* E */
68	<	UMODE_FARCONNECT,   /* F */
69	<	UMODE_SOFTCALLERID, /* G */
70	<	UMODE_HIDDEN,       /* H */
71	<	0,                  /* I */
72	<	0,                  /* J */
73	<	0,                  /* K */
74	<	0,                  /* L */
75	<	0,                  /* M */
76	<	0,                  /* N */
77	<	0,                  /* O */
78	<	0,                  /* P */
79	<	0,                  /* Q */
80	<	UMODE_REGONLY,      /* R */
81	<	UMODE_SSL,          /* S */
82	<	0,                  /* T */
83	<	0,                  /* U */
84	<	0,                  /* V */
85	<	UMODE_WEBIRC,       /* W */
86	<	0,                  /* X */
100	<	0,                  /* Y */
101	<	0,                  /* Z 0x5A */
102	<	0, 0, 0, 0, 0,      /* 0x5F   */
103	<	0,                  /* 0x60   */
104	<	UMODE_ADMIN,        /* a */
105	<	UMODE_BOTS,         /* b */
106	<	UMODE_CCONN,        /* c */
107	<	UMODE_DEBUG,        /* d */
108	<	UMODE_EXTERNAL,     /* e */
109	<	UMODE_FULL,         /* f */
110	<	UMODE_CALLERID,     /* g */
111	<	0,                  /* h */
112	<	UMODE_INVISIBLE,    /* i */
113	<	UMODE_REJ,          /* j */
114	<	UMODE_SKILL,        /* k */
115	<	UMODE_LOCOPS,       /* l */
116	<	0,                  /* m */
117	<	UMODE_NCHANGE,      /* n */
118	<	UMODE_OPER,         /* o */
119	<	UMODE_HIDECHANS,    /* p */
120	<	UMODE_HIDEIDLE,     /* q */
121	<	UMODE_REGISTERED,   /* r */
122	<	UMODE_SERVNOTICE,   /* s */
123	<	0,                  /* t */
124	<	UMODE_UNAUTH,       /* u */
125	<	0,                  /* v */
126	<	UMODE_WALLOP,       /* w */
127	<	UMODE_HIDDENHOST,   /* x */
128	<	UMODE_SPY,          /* y */
129	<	0,                  /* z      0x7A */
130	<	0,0,0,0,0,          /* 0x7B - 0x7F */
131	<
132	<	/* 0x80 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x8F */
133	<	/* 0x90 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x9F */
134	<	/* 0xA0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xAF */
135	<	/* 0xB0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xBF */
136	<	/* 0xC0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xCF */
137	<	/* 0xD0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xDF */
138	<	/* 0xE0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xEF */
139	<	/* 0xF0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0  /* 0xFF */
58	>	{ 'D', UMODE_DEAF         },
59	>	{ 'F', UMODE_FARCONNECT   },
60	>	{ 'G', UMODE_SOFTCALLERID },
61	>	{ 'H', UMODE_HIDDEN       },
62	>	{ 'R', UMODE_REGONLY      },
63	>	{ 'S', UMODE_SSL          },
64	>	{ 'W', UMODE_WEBIRC       },
65	>	{ 'a', UMODE_ADMIN        },
66	>	{ 'b', UMODE_BOTS         },
67	>	{ 'c', UMODE_CCONN        },
68	>	{ 'd', UMODE_DEBUG        },
69	>	{ 'e', UMODE_EXTERNAL     },
70	>	{ 'f', UMODE_FULL         },
71	>	{ 'g', UMODE_CALLERID     },
72	>	{ 'i', UMODE_INVISIBLE    },
73	>	{ 'j', UMODE_REJ          },
74	>	{ 'k', UMODE_SKILL        },
75	>	{ 'l', UMODE_LOCOPS       },
76	>	{ 'n', UMODE_NCHANGE      },
77	>	{ 'o', UMODE_OPER         },
78	>	{ 'p', UMODE_HIDECHANS    },
79	>	{ 'q', UMODE_HIDEIDLE     },
80	>	{ 'r', UMODE_REGISTERED   },
81	>	{ 's', UMODE_SERVNOTICE   },
82	>	{ 'u', UMODE_UNAUTH       },
83	>	{ 'w', UMODE_WALLOP       },
84	>	{ 'x', UMODE_HIDDENHOST   },
85	>	{ 'y', UMODE_SPY          },
86	>	{ '\0', 0 }
87		};
88
89		void
90	<	assemble_umode_buffer(void)
90	>	user_modes_init(void)
91		{
145	–	unsigned int idx = 0;
92		char *umode_buffer_ptr = umode_buffer;
93
94	<	for (; idx < (sizeof(user_modes) / sizeof(user_modes[0])); ++idx)
95	<	if (user_modes[idx])
96	<	*umode_buffer_ptr++ = idx;
94	>	for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
95	>	{
96	>	umode_map[tab->c] = tab;
97	>	*umode_buffer_ptr++ = tab->c;
98	>	}
99
100		*umode_buffer_ptr = '\0';
101		}
#	Line 201 | Line 149 | show_lusers(struct Client *source_p)
149		Count.max_loc_con = Count.local + Count.myserver;
150		}
151
204	–	/* show_isupport()
205	–	*
206	–	* inputs       - pointer to client
207	–	* output       - NONE
208	–	* side effects - display to client what we support (for them)
209	–	*/
210	–	void
211	–	show_isupport(struct Client *source_p)
212	–	{
213	–	const dlink_node *node = NULL;
214	–
215	–	DLINK_FOREACH(node, support_list_lines.head)
216	–	sendto_one_numeric(source_p, &me, RPL_ISUPPORT, node->data);
217	–	}
218	–
219	–
152		/* report_and_set_user_flags()
153		*
154		* inputs       - pointer to source_p
#	Line 230 | Line 162 | report_and_set_user_flags(struct Client
162		{
163		/* If this user is being spoofed, tell them so */
164		if (IsConfDoSpoofIp(conf))
165	<	sendto_one_notice(source_p, &me, ":*** Spoofing your IP. Congrats.");
165	>	sendto_one_notice(source_p, &me, ":*** Spoofing your IP");
166
167		/* If this user is in the exception class, set it "E lined" */
168		if (IsConfExemptKline(conf))
169		{
170	<	SetExemptKline(source_p);
171	<	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D/G lines. Congrats.");
170	>	AddFlag(source_p, FLAGS_EXEMPTKLINE);
171	>	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D lines");
172		}
173
174	<	/*
243	<	* The else here is to make sure that G line exempt users
244	<	* do not get noticed twice.
245	<	*/
246	<	else if (IsConfExemptGline(conf))
174	>	if (IsConfExemptXline(conf))
175		{
176	<	SetExemptGline(source_p);
177	<	sendto_one_notice(source_p, &me, ":*** You are exempt from G lines. Congrats.");
176	>	AddFlag(source_p, FLAGS_EXEMPTXLINE);
177	>	sendto_one_notice(source_p, &me, ":*** You are exempt from X lines");
178		}
179
180		if (IsConfExemptResv(conf))
181		{
182	<	SetExemptResv(source_p);
183	<	sendto_one_notice(source_p, &me, ":*** You are exempt from resvs. Congrats.");
182	>	AddFlag(source_p, FLAGS_EXEMPTRESV);
183	>	sendto_one_notice(source_p, &me, ":*** You are exempt from resvs");
184		}
185
186		/* If this user is exempt from user limits set it "F lined" */
187		if (IsConfExemptLimits(conf))
188		{
189	<	SetExemptLimits(source_p);
190	<	sendto_one_notice(source_p, &me, ":*** You are exempt from user limits. Congrats.");
189	>	AddFlag(source_p, FLAGS_NOLIMIT);
190	>	sendto_one_notice(source_p, &me, ":*** You are exempt from user limits");
191		}
192
193		if (IsConfCanFlood(conf))
194		{
195	<	SetCanFlood(source_p);
196	<	sendto_one_notice(source_p, &me, ":*** You are exempt from flood "
269	<	"protection, aren't you fearsome.");
195	>	AddFlag(source_p, FLAGS_CANFLOOD);
196	>	sendto_one_notice(source_p, &me, ":*** You are exempt from flood protection");
197		}
198		}
199
#	Line 304 | Line 231 | introduce_client(struct Client *source_p
231		if (server == source_p->from)
232		continue;
233
234	<	if (IsCapable(server, CAP_SVS))
235	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
234	>	if (IsCapable(server, CAPAB_SVS))
235	>	sendto_one(server, ":%s UID %s %u %ju %s %s %s %s %s %s :%s",
236		source_p->servptr->id,
237		source_p->name, source_p->hopcount+1,
238	<	(unsigned long)source_p->tsinfo,
238	>	source_p->tsinfo,
239		ubuf, source_p->username, source_p->host,
240	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
314	<	"0" : source_p->sockhost, source_p->id,
240	>	source_p->sockhost, source_p->id,
241		source_p->account,
242		source_p->info);
243		else
244	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
244	>	sendto_one(server, ":%s UID %s %u %ju %s %s %s %s %s :%s",
245		source_p->servptr->id,
246		source_p->name, source_p->hopcount+1,
247	<	(unsigned long)source_p->tsinfo,
247	>	source_p->tsinfo,
248		ubuf, source_p->username, source_p->host,
249	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
324	<	"0" : source_p->sockhost, source_p->id, source_p->info);
249	>	source_p->sockhost, source_p->id, source_p->info);
250
251		if (!EmptyString(source_p->certfp))
252		sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
#	Line 337 | Line 262 | introduce_client(struct Client *source_p
262		static void
263		user_welcome(struct Client *source_p)
264		{
340	–	#if defined(__TIME__) && defined(__DATE__)
265		static const char built_date[] = __DATE__ " at " __TIME__;
342	–	#else
343	–	static const char built_date[] = "unknown";
344	–	#endif
266
267		#ifdef HAVE_LIBCRYPTO
268		if (HasFlag(source_p, FLAGS_SSL))
#	Line 355 | Line 276 | user_welcome(struct Client *source_p)
276		sendto_one_numeric(source_p, &me, RPL_WELCOME, ConfigServerInfo.network_name,
277		source_p->name);
278		sendto_one_numeric(source_p, &me, RPL_YOURHOST,
279	<	get_listener_name(source_p->connection->listener), ircd_version);
279	>	listener_get_name(source_p->connection->listener), ircd_version);
280		sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
281		sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
361	–	show_isupport(source_p);
362	–	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
282
283	+	isupport_show(source_p);
284		show_lusers(source_p);
285		motd_signon(source_p);
286		}
#	Line 376 | Line 296 | check_xline(struct Client *source_p)
296		{
297		struct MaskItem *conf = NULL;
298
299	+	if (HasFlag(source_p, FLAGS_EXEMPTXLINE))
300	+	return 0;
301	+
302		if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
303		{
304		++conf->count;
#	Line 406 | Line 329 | register_local_user(struct Client *sourc
329
330		assert(source_p == source_p->from);
331		assert(MyConnect(source_p));
332	+	assert(IsUnknown(source_p));
333		assert(!source_p->connection->registration);
334
411	–	ClearCap(source_p, CAP_TS6);
412	–
335		if (ConfigGeneral.ping_cookie)
336		{
337	<	if (!IsPingSent(source_p) && !source_p->connection->random_ping)
337	>	if (!HasFlag(source_p, FLAGS_PINGSENT) && !source_p->connection->random_ping)
338		{
339		do
340		source_p->connection->random_ping = genrand_int32();
341		while (!source_p->connection->random_ping);
342
343		sendto_one(source_p, "PING :%u", source_p->connection->random_ping);
344	<	SetPingSent(source_p);
344	>	AddFlag(source_p, FLAGS_PINGSENT);
345		return;
346		}
347
348	<	if (!HasPingCookie(source_p))
348	>	if (!HasFlag(source_p, FLAGS_PING_COOKIE))
349		return;
350		}
351
#	Line 443 | Line 365 | register_local_user(struct Client *sourc
365
366		conf = source_p->connection->confs.head->data;
367
368	<	if (!IsGotId(source_p))
368	>	if (!HasFlag(source_p, FLAGS_GOTID))
369		{
370		char username[USERLEN + 1] = "";
449	–	const char *p = username;
371		unsigned int i = 0;
372
373		if (IsNeedIdentd(conf))
#	Line 463 | Line 384 | register_local_user(struct Client *sourc
384		if (!IsNoTilde(conf))
385		source_p->username[i++] = '~';
386
387	<	for (; *p && i < USERLEN; ++p)
387	>	for (const char *p = username; *p && i < USERLEN; ++p)
388		source_p->username[i++] = *p;
389
390		source_p->username[i] = '\0';
#	Line 504 | Line 425 | register_local_user(struct Client *sourc
425		* probably be just a percentage of the MAXCLIENTS...
426		*   -Taner
427		*/
428	<	if ((Count.local >= ConfigServerInfo.max_clients + MAX_BUFFER) ||
429	<	(Count.local >= ConfigServerInfo.max_clients && !IsExemptLimits(source_p)))
428	>	if ((Count.local >= GlobalSetOptions.maxclients + MAX_BUFFER) ||
429	>	(Count.local >= GlobalSetOptions.maxclients && !HasFlag(source_p, FLAGS_NOLIMIT)))
430		{
431		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
432		"Too many clients, rejecting %s[%s].",
#	Line 540 | Line 461 | register_local_user(struct Client *sourc
461		sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
462		"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
463		source_p->name, source_p->username, source_p->host,
464	<	ConfigGeneral.hide_spoof_ips && IsIPSpoof(source_p) ?
544	<	"255.255.255.255" : source_p->sockhost,
464	>	source_p->sockhost,
465		get_client_class(&source_p->connection->confs),
466		source_p->info, source_p->id);
467
#	Line 556 | Line 476 | register_local_user(struct Client *sourc
476		Count.max_loc = Count.local;
477
478		if (!(Count.max_loc % 10))
479	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
479	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
480		"New maximum local client connections: %u",
481		Count.max_loc);
482		}
#	Line 576 | Line 496 | register_local_user(struct Client *sourc
496		&unknown_list, &local_client_list);
497
498		user_welcome(source_p);
499	<	add_user_host(source_p->username, source_p->host, 0);
500	<	SetUserHost(source_p);
499	>	userhost_add(source_p->username, source_p->host, 0);
500	>	AddFlag(source_p, FLAGS_USERHOST);
501
502		introduce_client(source_p);
503		}
#	Line 605 | Line 525 | register_remote_user(struct Client *sour
525		source_p->host, source_p->servptr->name,
526		target_p->name, target_p->from->name);
527		sendto_one(source_p->from,
528	<	":%s KILL %s :%s (NICK from wrong direction (%s != %s))",
528	>	":%s KILL %s :%s (UID from wrong direction (%s != %s))",
529		me.id, source_p->id, me.name, source_p->servptr->name,
530		target_p->from->name);
531
532		AddFlag(source_p, FLAGS_KILLED);
533	<	exit_client(source_p, "USER server wrong direction");
533	>	exit_client(source_p, "UID server wrong direction");
534		return;
535		}
536
#	Line 627 | Line 547 | register_remote_user(struct Client *sour
547		SetClient(source_p);
548		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
549		dlinkAdd(source_p, &source_p->node, &global_client_list);
550	<	add_user_host(source_p->username, source_p->host, 1);
551	<	SetUserHost(source_p);
550	>	userhost_add(source_p->username, source_p->host, 1);
551	>	AddFlag(source_p, FLAGS_USERHOST);
552
553		if (HasFlag(source_p->servptr, FLAGS_EOB))
554		sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
555	<	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
555	>	"Client connecting at %s: %s (%s@%s) [%s] [%s] <%s>",
556		source_p->servptr->name,
557		source_p->name, source_p->username, source_p->host,
558	<	source_p->info, source_p->id);
558	>	source_p->sockhost, source_p->info, source_p->id);
559
560		introduce_client(source_p);
561		}
#	Line 680 | Line 600 | valid_hostname(const char *hostname)
600		int
601		valid_username(const char *username, const int local)
602		{
683	–	unsigned int dots = 0;
603		const char *p = username;
604
605		assert(p);
#	Line 698 | Line 617 | valid_username(const char *username, con
617
618		if (local)
619		{
620	+	unsigned int dots = 0;
621	+
622		while (*++p)
623		{
624		if (*p == '.' && ConfigGeneral.dots_in_ident)
#	Line 733 | Line 654 | valid_nickname(const char *nickname, con
654		{
655		const char *p = nickname;
656
657	<	assert(nickname && *nickname);
657	>	assert(p);
658
659		/*
660		* Nicks can't start with a digit or - or be 0 length.
#	Line 755 | Line 676 | valid_nickname(const char *nickname, con
676		* inputs       - client_p
677		*              - source_p
678		*              - int old
758	–	*              - sendmask mask of modes to send
679		*              - suplied umode_buf
680		* output       - NONE
681		*/
#	Line 770 | Line 690 | send_umode(struct Client *client_p, stru
690		* Build a string in umode_buf to represent the change in the user's
691		* mode between the new (source_p->umodes) and 'old'.
692		*/
693	<	for (unsigned int i = 0; i < 128; ++i)
693	>	for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
694		{
695	<	unsigned int flag = user_modes[i];
776	<
777	<	if (!flag)
778	<	continue;
779	<
780	<	if ((flag & old) && !HasUMode(source_p, flag))
695	>	if ((tab->flag & old) && !HasUMode(source_p, tab->flag))
696		{
697		if (what == MODE_DEL)
698	<	*m++ = (char)i;
698	>	*m++ = tab->c;
699		else
700		{
701		what = MODE_DEL;
702		*m++ = '-';
703	<	*m++ = (char)i;
703	>	*m++ = tab->c;
704		}
705		}
706	<	else if (!(flag & old) && HasUMode(source_p, flag))
706	>	else if (!(tab->flag & old) && HasUMode(source_p, tab->flag))
707		{
708		if (what == MODE_ADD)
709	<	*m++ = (char)i;
709	>	*m++ = tab->c;
710		else
711		{
712		what = MODE_ADD;
713		*m++ = '+';
714	<	*m++ = (char)i;
714	>	*m++ = tab->c;
715		}
716		}
717		}
#	Line 823 | Line 738 | send_umode_out(struct Client *source_p,
738		send_umode(MyClient(source_p) ? source_p : NULL, source_p, old, buf);
739
740		if (buf[0])
741	<	sendto_server(source_p, NOCAPS, NOCAPS, ":%s MODE %s :%s",
741	>	sendto_server(source_p, 0, 0, ":%s MODE %s :%s",
742		source_p->id, source_p->id, buf);
743		}
744
#	Line 839 | Line 754 | user_set_hostmask(struct Client *target_
754		{
755		case MODE_ADD:
756		AddUMode(target_p, UMODE_HIDDENHOST);
842	–	AddFlag(target_p, FLAGS_IP_SPOOFING);
757		break;
758		case MODE_DEL:
759		DelUMode(target_p, UMODE_HIDDENHOST);
846	–
847	–	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
848	–	DelFlag(target_p, FLAGS_IP_SPOOFING);
760		break;
761		default: return;
762		}
763
764		if (ConfigGeneral.cycle_on_host_change)
765	<	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
765	>	sendto_common_channels_local(target_p, 0, 0, CAP_CHGHOST, ":%s!%s@%s QUIT :Changing hostname",
766		target_p->name, target_p->username, target_p->host);
767
768	<	if (IsUserHostIp(target_p))
769	<	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
768	>	sendto_common_channels_local(target_p, 0, CAP_CHGHOST, 0, ":%s!%s@%s CHGHOST %s %s",
769	>	target_p->name, target_p->username,
770	>	target_p->host, target_p->username, hostname);
771	>
772	>	if (HasFlag(target_p, FLAGS_USERHOST))
773	>	userhost_del(target_p->username, target_p->host, !MyConnect(target_p));
774
775		strlcpy(target_p->host, hostname, sizeof(target_p->host));
776
777	<	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
778	<	SetUserHost(target_p);
777	>	userhost_add(target_p->username, target_p->host, !MyConnect(target_p));
778	>	AddFlag(target_p, FLAGS_USERHOST);
779
780	<	if (MyClient(target_p))
780	>	if (MyConnect(target_p))
781		{
782		sendto_one_numeric(target_p, &me, RPL_VISIBLEHOST, target_p->host);
783		clear_ban_cache_client(target_p);
#	Line 898 | Line 813 | user_set_hostmask(struct Client *target_
813
814		*p = '\0';
815
816	<
817	<	sendto_channel_local_butone(NULL, CAP_EXTENDED_JOIN, 0, member->chptr, ":%s!%s@%s JOIN %s %s :%s",
818	<	target_p->name, target_p->username,
819	<	target_p->host, member->chptr->name,
820	<	(!IsDigit(target_p->account[0]) && target_p->account[0] != '*') ? target_p->account : "*",
821	<	target_p->info);
822	<	sendto_channel_local_butone(NULL, 0, CAP_EXTENDED_JOIN, member->chptr, ":%s!%s@%s JOIN :%s",
823	<	target_p->name, target_p->username,
909	<	target_p->host, member->chptr->name);
816	>	sendto_channel_local(target_p, member->chptr, 0, CAP_EXTENDED_JOIN, CAP_CHGHOST, ":%s!%s@%s JOIN %s %s :%s",
817	>	target_p->name, target_p->username,
818	>	target_p->host, member->chptr->name,
819	>	(!IsDigit(target_p->account[0]) && target_p->account[0] != '*') ? target_p->account : "*",
820	>	target_p->info);
821	>	sendto_channel_local(target_p, member->chptr, 0, 0, CAP_EXTENDED_JOIN | CAP_CHGHOST, ":%s!%s@%s JOIN :%s",
822	>	target_p->name, target_p->username,
823	>	target_p->host, member->chptr->name);
824
825		if (nickbuf[0])
826	<	sendto_channel_local_butone(target_p, 0, 0, member->chptr, ":%s MODE %s +%s %s",
827	<	target_p->servptr->name, member->chptr->name,
828	<	modebuf, nickbuf);
915	<
826	>	sendto_channel_local(target_p, member->chptr, 0, 0, CAP_CHGHOST, ":%s MODE %s +%s %s",
827	>	target_p->servptr->name, member->chptr->name,
828	>	modebuf, nickbuf);
829		}
830
831		if (target_p->away[0])
832	<	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
832	>	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY, CAP_CHGHOST,
833		":%s!%s@%s AWAY :%s",
834		target_p->name, target_p->username,
835		target_p->host, target_p->away);
836		}
924	–
925	–	/*! \brief Blindly opers up given source_p, using conf info.
926	–	*         All checks on passwords have already been done.
927	–	* \param source_p Pointer to given client to oper
928	–	*/
929	–	void
930	–	oper_up(struct Client *source_p)
931	–	{
932	–	const unsigned int old = source_p->umodes;
933	–	const struct MaskItem *const conf = source_p->connection->confs.head->data;
934	–
935	–	assert(source_p->connection->confs.head);
936	–
937	–	++Count.oper;
938	–	SetOper(source_p);
939	–
940	–	if (conf->modes)
941	–	AddUMode(source_p, conf->modes);
942	–	else if (ConfigGeneral.oper_umodes)
943	–	AddUMode(source_p, ConfigGeneral.oper_umodes);
944	–
945	–	if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
946	–	++Count.invisi;
947	–	if ((old & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
948	–	--Count.invisi;
949	–
950	–	assert(dlinkFind(&oper_list, source_p) == NULL);
951	–	dlinkAdd(source_p, make_dlink_node(), &oper_list);
952	–
953	–	AddOFlag(source_p, conf->port);
954	–
955	–	if (HasOFlag(source_p, OPER_FLAG_ADMIN))
956	–	AddUMode(source_p, UMODE_ADMIN);
957	–
958	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
959	–	get_oper_name(source_p));
960	–	sendto_server(NULL, NOCAPS, NOCAPS, ":%s GLOBOPS :%s is now an operator",
961	–	me.id, get_oper_name(source_p));
962	–	send_umode_out(source_p, old);
963	–	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
964	–	}
965	–
966	–	static char new_uid[TOTALSIDUID + 1];  /* Allow for \0 */
967	–
968	–	int
969	–	valid_sid(const char *sid)
970	–	{
971	–	if (strlen(sid) == IRC_MAXSID)
972	–	if (IsDigit(*sid))
973	–	if (IsAlNum(*(sid + 1)) && IsAlNum(*(sid + 2)))
974	–	return 1;
975	–
976	–	return 0;
977	–	}
978	–
979	–	/*
980	–	* init_uid()
981	–	*
982	–	* inputs       - NONE
983	–	* output       - NONE
984	–	* side effects - new_uid is filled in with server id portion (sid)
985	–	*                (first 3 bytes) or defaulted to 'A'.
986	–	*                Rest is filled in with 'A'
987	–	*/
988	–	void
989	–	init_uid(void)
990	–	{
991	–	memset(new_uid, 0, sizeof(new_uid));
992	–
993	–	if (!EmptyString(ConfigServerInfo.sid))
994	–	strlcpy(new_uid, ConfigServerInfo.sid, sizeof(new_uid));
995	–
996	–	for (unsigned int i = 0; i < IRC_MAXSID; ++i)
997	–	if (new_uid[i] == '\0')
998	–	new_uid[i] = 'A';
999	–
1000	–	/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1001	–	memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1002	–	}
1003	–
1004	–	/*
1005	–	* add_one_to_uid
1006	–	*
1007	–	* inputs       - index number into new_uid
1008	–	* output       - NONE
1009	–	* side effects - new_uid is incremented by one
1010	–	*                note this is a recursive function
1011	–	*/
1012	–	static void
1013	–	add_one_to_uid(unsigned int i)
1014	–	{
1015	–	if (i != IRC_MAXSID)  /* Not reached server SID portion yet? */
1016	–	{
1017	–	if (new_uid[i] == 'Z')
1018	–	new_uid[i] = '0';
1019	–	else if (new_uid[i] == '9')
1020	–	{
1021	–	new_uid[i] = 'A';
1022	–	add_one_to_uid(i - 1);
1023	–	}
1024	–	else
1025	–	++new_uid[i];
1026	–	}
1027	–	else
1028	–	{
1029	–	/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1030	–	if (new_uid[i] == 'Z')
1031	–	memcpy(new_uid + IRC_MAXSID, "AAAAAA", IRC_MAXUID);
1032	–	else
1033	–	++new_uid[i];
1034	–	}
1035	–	}
1036	–
1037	–	/*
1038	–	* uid_get
1039	–	*
1040	–	* inputs       - struct Client *
1041	–	* output       - new UID is returned to caller
1042	–	* side effects - new_uid is incremented by one.
1043	–	*/
1044	–	static const char *
1045	–	uid_get(void)
1046	–	{
1047	–	add_one_to_uid(TOTALSIDUID - 1);  /* Index from 0 */
1048	–	return new_uid;
1049	–	}
1050	–
1051	–	/*
1052	–	* init_isupport()
1053	–	*
1054	–	* input        - NONE
1055	–	* output       - NONE
1056	–	* side effects - Must be called before isupport is enabled
1057	–	*/
1058	–	void
1059	–	init_isupport(void)
1060	–	{
1061	–	add_isupport("CALLERID", NULL, -1);
1062	–	add_isupport("CASEMAPPING", "rfc1459", -1);
1063	–	add_isupport("DEAF", "D", -1);
1064	–	add_isupport("KICKLEN", NULL, KICKLEN);
1065	–	add_isupport("MODES", NULL, MAXMODEPARAMS);
1066	–	add_isupport("PREFIX", "(ohv)@%+", -1);
1067	–	add_isupport("STATUSMSG", "@%+", -1);
1068	–	add_isupport("EXCEPTS", NULL, -1);
1069	–	add_isupport("INVEX", NULL, -1);
1070	–	}
1071	–
1072	–	/*
1073	–	* add_isupport()
1074	–	*
1075	–	* input        - name of supported function
1076	–	*              - options if any
1077	–	*              - number if any
1078	–	* output       - NONE
1079	–	* side effects - Each supported item must call this when activated
1080	–	*/
1081	–	void
1082	–	add_isupport(const char *name, const char *options, int n)
1083	–	{
1084	–	dlink_node *node = NULL;
1085	–	struct Isupport *support = NULL;
1086	–
1087	–	DLINK_FOREACH(node, support_list.head)
1088	–	{
1089	–	support = node->data;
1090	–	if (irccmp(support->name, name) == 0)
1091	–	{
1092	–	MyFree(support->name);
1093	–	MyFree(support->options);
1094	–	break;
1095	–	}
1096	–	}
1097	–
1098	–	if (node == NULL)
1099	–	{
1100	–	support = MyCalloc(sizeof(*support));
1101	–	dlinkAddTail(support, &support->node, &support_list);
1102	–	}
1103	–
1104	–	support->name = xstrdup(name);
1105	–	if (options)
1106	–	support->options = xstrdup(options);
1107	–	support->number = n;
1108	–
1109	–	rebuild_isupport_message_line();
1110	–	}
1111	–
1112	–	/*
1113	–	* delete_isupport()
1114	–	*
1115	–	* input        - name of supported function
1116	–	* output       - NONE
1117	–	* side effects - Each supported item must call this when deactivated
1118	–	*/
1119	–	void
1120	–	delete_isupport(const char *name)
1121	–	{
1122	–	dlink_node *node = NULL;
1123	–
1124	–	DLINK_FOREACH(node, support_list.head)
1125	–	{
1126	–	struct Isupport *support = node->data;
1127	–
1128	–	if (irccmp(support->name, name) == 0)
1129	–	{
1130	–	dlinkDelete(node, &support_list);
1131	–	MyFree(support->name);
1132	–	MyFree(support->options);
1133	–	MyFree(support);
1134	–	break;
1135	–	}
1136	–	}
1137	–
1138	–	rebuild_isupport_message_line();
1139	–	}
1140	–
1141	–	/*
1142	–	* rebuild_isupport_message_line
1143	–	*
1144	–	* input        - NONE
1145	–	* output       - NONE
1146	–	* side effects - Destroy the isupport MessageFile lines, and rebuild.
1147	–	*/
1148	–	void
1149	–	rebuild_isupport_message_line(void)
1150	–	{
1151	–	char isupportbuffer[IRCD_BUFSIZE];
1152	–	char *p = isupportbuffer;
1153	–	dlink_node *node = NULL, *node_next = NULL;
1154	–	int n = 0;
1155	–	int tokens = 0;
1156	–	size_t len = 0;
1157	–	size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1158	–
1159	–	DLINK_FOREACH_SAFE(node, node_next, support_list_lines.head)
1160	–	{
1161	–	dlinkDelete(node, &support_list_lines);
1162	–	MyFree(node->data);
1163	–	free_dlink_node(node);
1164	–	}
1165	–
1166	–	DLINK_FOREACH(node, support_list.head)
1167	–	{
1168	–	struct Isupport *support = node->data;
1169	–
1170	–	p += (n = sprintf(p, "%s", support->name));
1171	–	len += n;
1172	–
1173	–	if (support->options)
1174	–	{
1175	–	p += (n = sprintf(p, "=%s", support->options));
1176	–	len += n;
1177	–	}
1178	–
1179	–	if (support->number > 0)
1180	–	{
1181	–	p += (n = sprintf(p, "=%d", support->number));
1182	–	len += n;
1183	–	}
1184	–
1185	–	*p++ = ' ';
1186	–	len++;
1187	–	*p = '\0';
1188	–
1189	–	if (++tokens == (MAXPARA-2) || len >= (sizeof(isupportbuffer)-reserve))
1190	–	{ /* arbritrary for now */
1191	–	if (*--p == ' ')
1192	–	*p = '\0';
1193	–
1194	–	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1195	–	p = isupportbuffer;
1196	–	len = 0;
1197	–	n = tokens = 0;
1198	–	}
1199	–	}
1200	–
1201	–	if (len)
1202	–	{
1203	–	if (*--p == ' ')
1204	–	*p = '\0';
1205	–	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1206	–	}
1207	–	}

Diff Legend

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