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 3109 by michael, Thu Mar 6 19:25:12 2014 UTC vs.
ircd-hybrid/trunk/src/user.c (file contents), Revision 7006 by michael, Fri Jan 1 00:07:54 2016 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-2016 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 15 | Line 15
15		*
16		*  You should have received a copy of the GNU General Public License
17		*  along with this program; if not, write to the Free Software
18	<	*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
18	>	*  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
19		*  USA
20		*/
21
22	<	/*! \file s_user.c
22	>	/*! \file user.c
23		* \brief User related functions.
24		* \version $Id$
25		*/
26
27		#include "stdinc.h"
28		#include "list.h"
29	<	#include "s_user.h"
30	<	#include "s_misc.h"
29	>	#include "user.h"
30		#include "channel.h"
31		#include "channel_mode.h"
32		#include "client.h"
34	–	#include "fdlist.h"
33		#include "hash.h"
34	+	#include "id.h"
35		#include "irc_string.h"
37	–	#include "s_bsd.h"
36		#include "ircd.h"
37		#include "listener.h"
38		#include "motd.h"
39		#include "numeric.h"
40		#include "conf.h"
41		#include "log.h"
42	<	#include "s_serv.h"
42	>	#include "server.h"
43		#include "send.h"
46	–	#include "supported.h"
47	–	#include "whowas.h"
44		#include "memory.h"
45		#include "packet.h"
46		#include "rng_mt.h"
47		#include "userhost.h"
48	<	#include "hook.h"
53	<	#include "s_misc.h"
48	>	#include "misc.h"
49		#include "parse.h"
50		#include "watch.h"
51	+	#include "isupport.h"
52
53		static char umode_buffer[IRCD_BUFSIZE];
54
55	<	static void user_welcome(struct Client *);
56	<	static void report_and_set_user_flags(struct Client *, const struct MaskItem *);
61	<	static int check_xline(struct Client *);
62	<	static void introduce_client(struct Client *);
63	<	static const char *uid_get(void);
64	<
65	<	/* Used for building up the isupport string,
66	<	* used with init_isupport, add_isupport, delete_isupport
67	<	*/
68	<
69	<	struct Isupport
70	<	{
71	<	dlink_node node;
72	<	char *name;
73	<	char *options;
74	<	int number;
75	<	};
76	<
77	<	static dlink_list support_list;
78	<	static dlink_list support_list_lines;
79	<
80	<	/* memory is cheap. map 0-255 to equivalent mode */
81	<	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 */
112	<	0,                  /* Y */
113	<	0,                  /* Z 0x5A */
114	<	0, 0, 0, 0, 0,      /* 0x5F   */
115	<	0,                  /* 0x60   */
116	<	UMODE_ADMIN,        /* a */
117	<	UMODE_BOTS,         /* b */
118	<	UMODE_CCONN,        /* c */
119	<	UMODE_DEBUG,        /* d */
120	<	UMODE_EXTERNAL,     /* e */
121	<	UMODE_FULL,         /* f */
122	<	UMODE_CALLERID,     /* g */
123	<	0,                  /* h */
124	<	UMODE_INVISIBLE,    /* i */
125	<	UMODE_REJ,          /* j */
126	<	UMODE_SKILL,        /* k */
127	<	UMODE_LOCOPS,       /* l */
128	<	0,                  /* m */
129	<	UMODE_NCHANGE,      /* n */
130	<	UMODE_OPER,         /* o */
131	<	0,                  /* p */
132	<	0,                  /* q */
133	<	UMODE_REGISTERED,   /* r */
134	<	UMODE_SERVNOTICE,   /* s */
135	<	0,                  /* t */
136	<	UMODE_UNAUTH,       /* u */
137	<	0,                  /* v */
138	<	UMODE_WALLOP,       /* w */
139	<	UMODE_HIDDENHOST,   /* x */
140	<	UMODE_SPY,          /* y */
141	<	UMODE_OPERWALL,     /* z      0x7A */
142	<	0,0,0,0,0,          /* 0x7B - 0x7F */
143	<
144	<	/* 0x80 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x8F */
145	<	/* 0x90 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x9F */
146	<	/* 0xA0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xAF */
147	<	/* 0xB0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xBF */
148	<	/* 0xC0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xCF */
149	<	/* 0xD0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xDF */
150	<	/* 0xE0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xEF */
151	<	/* 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		{
157	–	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 174 | Line 110 | void
110		show_lusers(struct Client *source_p)
111		{
112		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
113	<	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total-Count.invisi),
114	<	Count.invisi, dlink_list_length(&global_serv_list));
113	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
114	>	Count.invisi, dlink_list_length(&global_server_list));
115		else
116	<	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT,
117	<	(Count.total-Count.invisi), Count.invisi, 1);
116	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
117	>	Count.invisi, 1);
118
119	<	if (Count.oper > 0)
119	>	if (Count.oper)
120		sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper);
121
122	<	if (dlink_list_length(&unknown_list) > 0)
122	>	if (dlink_list_length(&unknown_list))
123		sendto_one_numeric(source_p, &me, RPL_LUSERUNKNOWN, dlink_list_length(&unknown_list));
124
125	<	if (dlink_list_length(&global_channel_list) > 0)
126	<	sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&global_channel_list));
125	>	if (dlink_list_length(&channel_list))
126	>	sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&channel_list));
127
128		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
129		{
#	Line 213 | Line 149 | show_lusers(struct Client *source_p)
149		Count.max_loc_con = Count.local + Count.myserver;
150		}
151
152	<	/* show_isupport()
152	>	/* report_and_set_user_flags()
153		*
154	<	* inputs       - pointer to client
154	>	* inputs       - pointer to source_p
155	>	*              - pointer to conf for this user
156		* output       - NONE
157	<	* side effects - display to client what we support (for them)
157	>	* side effects - Report to user any special flags
158	>	*                they are getting, and set them.
159		*/
160	<	void
161	<	show_isupport(struct Client *source_p)
160	>	static void
161	>	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
162		{
163	<	const dlink_node *ptr = NULL;
163	>	/* If this user is being spoofed, tell them so */
164	>	if (IsConfDoSpoofIp(conf))
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	>	AddFlag(source_p, FLAGS_EXEMPTKLINE);
171	>	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D lines");
172	>	}
173	>
174	>	if (IsConfExemptXline(conf))
175	>	{
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	>	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	>	AddFlag(source_p, FLAGS_NOLIMIT);
190	>	sendto_one_notice(source_p, &me, ":*** You are exempt from user limits");
191	>	}
192
193	<	DLINK_FOREACH(ptr, support_list_lines.head)
194	<	sendto_one_numeric(source_p, &me, RPL_ISUPPORT, ptr->data);
193	>	if (IsConfCanFlood(conf))
194	>	{
195	>	AddFlag(source_p, FLAGS_CANFLOOD);
196	>	sendto_one_notice(source_p, &me, ":*** You are exempt from flood protection");
197	>	}
198		}
199
200	<	/*
201	<	** register_local_user
202	<	**      This function is called when both NICK and USER messages
203	<	**      have been accepted for the client, in whatever order. Only
204	<	**      after this, is the USER message propagated.
205	<	**
206	<	**      NICK's must be propagated at once when received, although
207	<	**      it would be better to delay them too until full info is
208	<	**      available. Doing it is not so simple though, would have
209	<	**      to implement the following:
210	<	**
211	<	**      (actually it has been implemented already for a while) -orabidoo
212	<	**
213	<	**      1) user telnets in and gives only "NICK foobar" and waits
214	<	**      2) another user far away logs in normally with the nick
215	<	**         "foobar" (quite legal, as this server didn't propagate
216	<	**         it).
217	<	**      3) now this server gets nick "foobar" from outside, but
218	<	**         has alread the same defined locally. Current server
219	<	**         would just issue "KILL foobar" to clean out dups. But,
220	<	**         this is not fair. It should actually request another
221	<	**         nick from local user or kill him/her...
222	<	*/
200	>	/* introduce_client()
201	>	*
202	>	* inputs       - source_p
203	>	* output       - NONE
204	>	* side effects - This common function introduces a client to the rest
205	>	*                of the net, either from a local client connect or
206	>	*                from a remote connect.
207	>	*/
208	>	static void
209	>	introduce_client(struct Client *source_p)
210	>	{
211	>	dlink_node *node = NULL;
212	>	char ubuf[IRCD_BUFSIZE] = "";
213	>
214	>	if (MyClient(source_p))
215	>	send_umode(source_p, source_p, 0, ubuf);
216	>	else
217	>	send_umode(NULL, source_p, 0, ubuf);
218	>
219	>	watch_check_hash(source_p, RPL_LOGON);
220	>
221	>	if (ubuf[0] == '\0')
222	>	{
223	>	ubuf[0] = '+';
224	>	ubuf[1] = '\0';
225	>	}
226	>
227	>	DLINK_FOREACH(node, local_server_list.head)
228	>	{
229	>	struct Client *server = node->data;
230	>
231	>	if (server == source_p->from)
232	>	continue;
233	>
234	>	sendto_one(server, ":%s UID %s %u %ju %s %s %s %s %s %s :%s",
235	>	source_p->servptr->id,
236	>	source_p->name, source_p->hopcount+1,
237	>	source_p->tsinfo,
238	>	ubuf, source_p->username, source_p->host,
239	>	source_p->sockhost, source_p->id,
240	>	source_p->account,
241	>	source_p->info);
242	>
243	>	if (!EmptyString(source_p->certfp))
244	>	sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
245	>	}
246	>	}
247	>
248	>	/* user_welcome()
249	>	*
250	>	* inputs       - client pointer to client to welcome
251	>	* output       - NONE
252	>	* side effects -
253	>	*/
254	>	static void
255	>	user_welcome(struct Client *source_p)
256	>	{
257	>	static const char built_date[] = __DATE__ " at " __TIME__;
258	>
259	>	#ifdef HAVE_LIBCRYPTO
260	>	if (HasFlag(source_p, FLAGS_SSL))
261	>	{
262	>	AddUMode(source_p, UMODE_SSL);
263	>	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
264	>	ssl_get_cipher(source_p->connection->fd.ssl));
265	>	}
266	>	#endif
267	>
268	>	sendto_one_numeric(source_p, &me, RPL_WELCOME, ConfigServerInfo.network_name,
269	>	source_p->name);
270	>	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
271	>	listener_get_name(source_p->connection->listener), ircd_version);
272	>	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
273	>	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
274	>
275	>	isupport_show(source_p);
276	>	show_lusers(source_p);
277	>	motd_signon(source_p);
278	>	}
279	>
280	>	/* check_xline()
281	>	*
282	>	* inputs       - pointer to client to test
283	>	* outupt       - 1 if exiting 0 if ok
284	>	* side effects -
285	>	*/
286	>	static int
287	>	check_xline(struct Client *source_p)
288	>	{
289	>	struct MaskItem *conf = NULL;
290	>
291	>	if (HasFlag(source_p, FLAGS_EXEMPTXLINE))
292	>	return 0;
293	>
294	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
295	>	{
296	>	++conf->count;
297	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
298	>	"X-line Rejecting [%s] [%s], user %s [%s]",
299	>	source_p->info, conf->reason,
300	>	get_client_name(source_p, HIDE_IP),
301	>	source_p->sockhost);
302	>
303	>	++ServerStats.is_ref;
304	>	exit_client(source_p, "Bad user info");
305	>	return 1;
306	>	}
307	>
308	>	return 0;
309	>	}
310	>
311	>	/*! \brief This function is called when both NICK and USER messages
312	>	*      have been accepted for the client, in whatever order. Only
313	>	*      after this, is the UID message propagated.
314	>	* \param source_p Pointer to given client to introduce
315	>	*/
316		void
317		register_local_user(struct Client *source_p)
318		{
319		const char *id = NULL;
320		const struct MaskItem *conf = NULL;
321
260	–	assert(source_p != NULL);
322		assert(source_p == source_p->from);
323		assert(MyConnect(source_p));
324	<	assert(!source_p->localClient->registration);
324	>	assert(IsUnknown(source_p));
325	>	assert(!source_p->connection->registration);
326
327	<	ClearCap(source_p, CAP_TS6);
266	<
267	<	if (ConfigFileEntry.ping_cookie)
327	>	if (ConfigGeneral.ping_cookie)
328		{
329	<	if (!IsPingSent(source_p) && !source_p->localClient->random_ping)
329	>	if (!HasFlag(source_p, FLAGS_PINGSENT) && !source_p->connection->random_ping)
330		{
331		do
332	<	source_p->localClient->random_ping = genrand_int32();
333	<	while (!source_p->localClient->random_ping);
332	>	source_p->connection->random_ping = genrand_int32();
333	>	while (!source_p->connection->random_ping);
334
335	<	sendto_one(source_p, "PING :%u",
336	<	source_p->localClient->random_ping);
277	<	SetPingSent(source_p);
335	>	sendto_one(source_p, "PING :%u", source_p->connection->random_ping);
336	>	AddFlag(source_p, FLAGS_PINGSENT);
337		return;
338		}
339
340	<	if (!HasPingCookie(source_p))
340	>	if (!HasFlag(source_p, FLAGS_PING_COOKIE))
341		return;
342		}
343
344	<	source_p->localClient->last_privmsg = CurrentTime;
344	>	source_p->connection->last_privmsg = CurrentTime;
345		/* Straight up the maximum rate of flooding... */
346	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
346	>	source_p->connection->allow_read = MAX_FLOOD_BURST;
347
348		if (!check_client(source_p))
349		return;
350
351		if (!valid_hostname(source_p->host))
352		{
353	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You have an illegal "
354	<	"character in your hostname", me.name, source_p->name);
355	<	strlcpy(source_p->host, source_p->sockhost,
297	<	sizeof(source_p->host));
353	>	sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
354	>	"character in your hostname");
355	>	strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
356		}
357
358	<	conf = source_p->localClient->confs.head->data;
358	>	conf = source_p->connection->confs.head->data;
359
360	<	if (!IsGotId(source_p))
360	>	if (!HasFlag(source_p, FLAGS_GOTID))
361		{
362	<	char username[USERLEN + 1];
305	<	const char *p = username;
362	>	char username[USERLEN + 1] = "";
363		unsigned int i = 0;
364
365		if (IsNeedIdentd(conf))
366		{
367		++ServerStats.is_ref;
368	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You need to install "
369	<	"identd to use this server", me.name, source_p->name);
370	<	exit_client(source_p, &me, "Install identd");
368	>	sendto_one_notice(source_p, &me, ":*** Notice -- You need to install "
369	>	"identd to use this server");
370	>	exit_client(source_p, "Install identd");
371		return;
372		}
373
#	Line 319 | Line 376 | register_local_user(struct Client *sourc
376		if (!IsNoTilde(conf))
377		source_p->username[i++] = '~';
378
379	<	for (; *p && i < USERLEN; ++p)
380	<	if (*p != '[')
324	<	source_p->username[i++] = *p;
379	>	for (const char *p = username; *p && i < USERLEN; ++p)
380	>	source_p->username[i++] = *p;
381
382		source_p->username[i] = '\0';
383		}
384
385	<	/* password check */
385	>	/* Password check */
386		if (!EmptyString(conf->passwd))
387		{
388	<	const char *pass = source_p->localClient->passwd;
333	<
334	<	if (!match_conf_password(pass, conf))
388	>	if (!match_conf_password(source_p->connection->password, conf))
389		{
390		++ServerStats.is_ref;
391
392		sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
393	<	exit_client(source_p, &me, "Bad Password");
393	>	exit_client(source_p, "Bad Password");
394		return;
395		}
396		}
397
398	<	/* don't free source_p->localClient->passwd here - it can be required
399	<	* by masked /stats I if there are auth{} blocks with need_password = no;
398	>	/*
399	>	* Don't free source_p->connection->password here - it can be required
400	>	* by masked /stats I if there are auth {} blocks with need_password = no;
401		* --adx
402		*/
403
404	<	/* report if user has &^>= etc. and set flags as needed in source_p */
404	>	/*
405	>	* Report if user has &^>= etc. and set flags as needed in source_p
406	>	*/
407		report_and_set_user_flags(source_p, conf);
408
409		if (IsDead(source_p))
410		return;
411
412	<	/* Limit clients -
412	>	/*
413	>	* Limit clients -
414		* We want to be able to have servers and F-line clients
415		* connect, so save room for "buffer" connections.
416		* Smaller servers may want to decrease this, and it should
417		* probably be just a percentage of the MAXCLIENTS...
418		*   -Taner
419		*/
420	<	/* Except "F:" clients */
421	<	if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
364	<	(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
420	>	if ((Count.local >= GlobalSetOptions.maxclients + MAX_BUFFER) ||
421	>	(Count.local >= GlobalSetOptions.maxclients && !HasFlag(source_p, FLAGS_NOLIMIT)))
422		{
423		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
424		"Too many clients, rejecting %s[%s].",
425		source_p->name, source_p->host);
426		++ServerStats.is_ref;
427	<	exit_client(source_p, &me, "Sorry, server is full - try later");
427	>	exit_client(source_p, "Sorry, server is full - try later");
428		return;
429		}
430
374	–	/* valid user name check */
431		if (!valid_username(source_p->username, 1))
432		{
433	<	char tmpstr2[IRCD_BUFSIZE];
433	>	char buf[IRCD_BUFSIZE] = "";
434
435		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
436		"Invalid username: %s (%s@%s)",
437		source_p->name, source_p->username, source_p->host);
438		++ServerStats.is_ref;
439	<	snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
440	<	source_p->username);
385	<	exit_client(source_p, &me, tmpstr2);
439	>	snprintf(buf, sizeof(buf), "Invalid username [%s]", source_p->username);
440	>	exit_client(source_p, buf);
441		return;
442		}
443
444		if (check_xline(source_p))
445		return;
446
447	<	while (hash_find_id((id = uid_get())) != NULL)
447	>	while (hash_find_id((id = uid_get())))
448		;
449
450		strlcpy(source_p->id, id, sizeof(source_p->id));
#	Line 398 | Line 453 | register_local_user(struct Client *sourc
453		sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
454		"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
455		source_p->name, source_p->username, source_p->host,
456	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
457	<	"255.255.255.255" : source_p->sockhost,
403	<	get_client_class(&source_p->localClient->confs),
456	>	source_p->sockhost,
457	>	get_client_class(&source_p->connection->confs),
458		source_p->info, source_p->id);
459
460	<	if (ConfigFileEntry.invisible_on_connect)
460	>	if (ConfigGeneral.invisible_on_connect)
461		{
462		AddUMode(source_p, UMODE_INVISIBLE);
463		++Count.invisi;
#	Line 414 | Line 468 | register_local_user(struct Client *sourc
468		Count.max_loc = Count.local;
469
470		if (!(Count.max_loc % 10))
471	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
472	<	"New Max Local Clients: %d",
471	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
472	>	"New maximum local client connections: %u",
473		Count.max_loc);
474		}
475
422	–	/* Increment our total user count here */
476		if (++Count.total > Count.max_tot)
477		Count.max_tot = Count.total;
478		++Count.totalrestartcount;
#	Line 427 | Line 480 | register_local_user(struct Client *sourc
480		assert(source_p->servptr == &me);
481		SetClient(source_p);
482		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
483	<
431	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
483	>	dlinkAdd(source_p, &source_p->node, &global_client_list);
484
485		assert(dlinkFind(&unknown_list, source_p));
486
487	<	dlink_move_node(&source_p->localClient->lclient_node,
487	>	dlink_move_node(&source_p->connection->lclient_node,
488		&unknown_list, &local_client_list);
489
490		user_welcome(source_p);
491	<	add_user_host(source_p->username, source_p->host, 0);
492	<	SetUserHost(source_p);
491	>	userhost_add(source_p->username, source_p->host, 0);
492	>	AddFlag(source_p, FLAGS_USERHOST);
493
494		introduce_client(source_p);
495		}
#	Line 453 | Line 505 | register_local_user(struct Client *sourc
505		*                is introduced by a server.
506		*/
507		void
508	<	register_remote_user(struct Client *source_p, const char *username,
457	<	const char *host, const char *server)
508	>	register_remote_user(struct Client *source_p)
509		{
510	<	struct Client *target_p = NULL;
460	<
461	<	assert(source_p != NULL);
462	<	assert(source_p->username != username);
463	<
464	<	strlcpy(source_p->host, host, sizeof(source_p->host));
465	<	strlcpy(source_p->username, username, sizeof(source_p->username));
466	<
467	<	/*
468	<	* coming from another server, take the servers word for it
469	<	*/
470	<	source_p->servptr = hash_find_server(server);
471	<
472	<	/*
473	<	* Super GhostDetect:
474	<	* If we can't find the server the user is supposed to be on,
475	<	* then simply blow the user away.        -Taner
476	<	*/
477	<	if (source_p->servptr == NULL)
478	<	{
479	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
480	<	"No server %s for user %s[%s@%s] from %s",
481	<	server, source_p->name, source_p->username,
482	<	source_p->host, source_p->from->name);
483	<	kill_client(source_p->from, source_p, "%s (Server doesn't exist)", me.name);
484	<
485	<	AddFlag(source_p, FLAGS_KILLED);
486	<	exit_client(source_p, &me, "Ghosted Client");
487	<	return;
488	<	}
510	>	const struct Client *target_p = NULL;
511
512		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
513		{
#	Line 494 | Line 516 | register_remote_user(struct Client *sour
516		source_p->from->name, source_p->name, source_p->username,
517		source_p->host, source_p->servptr->name,
518		target_p->name, target_p->from->name);
519	<	kill_client(source_p->from, source_p,
520	<	"%s (NICK from wrong direction (%s != %s))",
521	<	me.name, source_p->servptr->name, target_p->from->name);
519	>	sendto_one(source_p->from,
520	>	":%s KILL %s :%s (UID from wrong direction (%s != %s))",
521	>	me.id, source_p->id, me.name, source_p->servptr->name,
522	>	target_p->from->name);
523	>
524		AddFlag(source_p, FLAGS_KILLED);
525	<	exit_client(source_p, &me, "USER server wrong direction");
525	>	exit_client(source_p, "UID server wrong direction");
526		return;
527		}
528
#	Line 509 | Line 533 | register_remote_user(struct Client *sour
533		if (HasFlag(source_p->servptr, FLAGS_SERVICE))
534		AddFlag(source_p, FLAGS_SERVICE);
535
512	–	/* Increment our total user count here */
536		if (++Count.total > Count.max_tot)
537		Count.max_tot = Count.total;
538
539		SetClient(source_p);
540		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
541	<	add_user_host(source_p->username, source_p->host, 1);
542	<	SetUserHost(source_p);
541	>	dlinkAdd(source_p, &source_p->node, &global_client_list);
542	>	userhost_add(source_p->username, source_p->host, 1);
543	>	AddFlag(source_p, FLAGS_USERHOST);
544
545		if (HasFlag(source_p->servptr, FLAGS_EOB))
546		sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
547	<	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
547	>	"Client connecting at %s: %s (%s@%s) [%s] [%s] <%s>",
548		source_p->servptr->name,
549		source_p->name, source_p->username, source_p->host,
550	<	source_p->info, source_p->id);
550	>	source_p->sockhost, source_p->info, source_p->id);
551
552		introduce_client(source_p);
553		}
554
531	–	/* introduce_client()
532	–	*
533	–	* inputs       - source_p
534	–	* output       - NONE
535	–	* side effects - This common function introduces a client to the rest
536	–	*                of the net, either from a local client connect or
537	–	*                from a remote connect.
538	–	*/
539	–	static void
540	–	introduce_client(struct Client *source_p)
541	–	{
542	–	dlink_node *server_node = NULL;
543	–	char ubuf[IRCD_BUFSIZE];
544	–
545	–	if (MyClient(source_p))
546	–	send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
547	–	else
548	–	send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
549	–
550	–	watch_check_hash(source_p, RPL_LOGON);
551	–
552	–	if (ubuf[0] == '\0')
553	–	{
554	–	ubuf[0] = '+';
555	–	ubuf[1] = '\0';
556	–	}
557	–
558	–	DLINK_FOREACH(server_node, serv_list.head)
559	–	{
560	–	struct Client *server = server_node->data;
561	–
562	–	if (server == source_p->from)
563	–	continue;
564	–
565	–	if (IsCapable(server, CAP_SVS))
566	–	{
567	–	if (IsCapable(server, CAP_TS6) && HasID(source_p))
568	–	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
569	–	source_p->servptr->id,
570	–	source_p->name, source_p->hopcount+1,
571	–	(unsigned long)source_p->tsinfo,
572	–	ubuf, source_p->username, source_p->host,
573	–	(MyClient(source_p) && IsIPSpoof(source_p)) ?
574	–	"0" : source_p->sockhost, source_p->id,
575	–	source_p->svid,
576	–	source_p->info);
577	–	else
578	–	sendto_one(server, "NICK %s %d %lu %s %s %s %s %s :%s",
579	–	source_p->name, source_p->hopcount+1,
580	–	(unsigned long)source_p->tsinfo,
581	–	ubuf, source_p->username, source_p->host,
582	–	source_p->servptr->name, source_p->svid,
583	–	source_p->info);
584	–
585	–	}
586	–	else
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);
596	–	else
597	–	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
598	–	source_p->name, source_p->hopcount+1,
599	–	(unsigned long)source_p->tsinfo,
600	–	ubuf, source_p->username, source_p->host,
601	–	source_p->servptr->name, source_p->info);
602	–	}
603	–
604	–	if (!EmptyString(source_p->certfp))
605	–	sendto_one(server, ":%s CERTFP %s", ID(source_p), source_p->certfp);
606	–	}
607	–	}
608	–
555		/* valid_hostname()
556		*
557		* Inputs       - pointer to hostname
#	Line 620 | Line 566 | valid_hostname(const char *hostname)
566		{
567		const char *p = hostname;
568
569	<	assert(p != NULL);
569	>	assert(p);
570
571		if (EmptyString(p) || *p == '.' || *p == ':')
572		return 0;
#	Line 646 | Line 592 | valid_hostname(const char *hostname)
592		int
593		valid_username(const char *username, const int local)
594		{
649	–	int dots      = 0;
595		const char *p = username;
596
597	<	assert(p != NULL);
597	>	assert(p);
598
599		if (*p == '~')
600		++p;
#	Line 664 | Line 609 | valid_username(const char *username, con
609
610		if (local)
611		{
612	+	unsigned int dots = 0;
613	+
614		while (*++p)
615		{
616	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
616	>	if (*p == '.' && ConfigGeneral.dots_in_ident)
617		{
618	<	if (++dots > ConfigFileEntry.dots_in_ident)
618	>	if (++dots > ConfigGeneral.dots_in_ident)
619		return 0;
620		if (!IsUserChar(*(p + 1)))
621		return 0;
#	Line 684 | Line 631 | valid_username(const char *username, con
631		return 0;
632		}
633
634	<	return  p - username <= USERLEN;;
634	>	return p - username <= USERLEN;
635		}
636
637		/* clean_nick_name()
#	Line 698 | Line 645 | int
645		valid_nickname(const char *nickname, const int local)
646		{
647		const char *p = nickname;
701	–	assert(nickname && *nickname);
648
649	<	/* nicks can't start with a digit or - or be 0 length */
650	<	/* This closer duplicates behaviour of hybrid-6 */
651	<	if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
649	>	assert(p);
650	>
651	>	/*
652	>	* Nicks can't start with a digit or - or be 0 length.
653	>	*/
654	>	if (EmptyString(p) || *p == '-' || (IsDigit(*p) && local))
655		return 0;
656
657		for (; *p; ++p)
#	Line 712 | Line 661 | valid_nickname(const char *nickname, con
661		return p - nickname <= NICKLEN;
662		}
663
715	–	/* report_and_set_user_flags()
716	–	*
717	–	* inputs       - pointer to source_p
718	–	*              - pointer to conf for this user
719	–	* output       - NONE
720	–	* side effects - Report to user any special flags
721	–	*                they are getting, and set them.
722	–	*/
723	–	static void
724	–	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
725	–	{
726	–	/* If this user is being spoofed, tell them so */
727	–	if (IsConfDoSpoofIp(conf))
728	–	sendto_one(source_p,
729	–	":%s NOTICE %s :*** Spoofing your IP. Congrats.",
730	–	me.name, source_p->name);
731	–
732	–	/* If this user is in the exception class, Set it "E lined" */
733	–	if (IsConfExemptKline(conf))
734	–	{
735	–	SetExemptKline(source_p);
736	–	sendto_one(source_p,
737	–	":%s NOTICE %s :*** You are exempt from K/D/G lines. Congrats.",
738	–	me.name, source_p->name);
739	–	}
740	–
741	–	/*
742	–	* The else here is to make sure that G line exempt users
743	–	* do not get noticed twice.
744	–	*/
745	–	else if (IsConfExemptGline(conf))
746	–	{
747	–	SetExemptGline(source_p);
748	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines. Congrats.",
749	–	me.name, source_p->name);
750	–	}
751	–
752	–	if (IsConfExemptResv(conf))
753	–	{
754	–	SetExemptResv(source_p);
755	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs. Congrats.",
756	–	me.name, source_p->name);
757	–	}
758	–
759	–	/* If this user is exempt from user limits set it "F lined" */
760	–	if (IsConfExemptLimits(conf))
761	–	{
762	–	SetExemptLimits(source_p);
763	–	sendto_one(source_p,
764	–	":%s NOTICE %s :*** You are exempt from user limits. Congrats.",
765	–	me.name, source_p->name);
766	–	}
767	–
768	–	if (IsConfCanFlood(conf))
769	–	{
770	–	SetCanFlood(source_p);
771	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
772	–	"protection, aren't you fearsome.",
773	–	me.name, source_p->name);
774	–	}
775	–	}
776	–
777	–	/* set_user_mode()
778	–	*
779	–	* added 15/10/91 By Darren Reed.
780	–	* parv[0] - sender
781	–	* parv[1] - username to change mode for
782	–	* parv[2] - modes to change
783	–	*/
784	–	void
785	–	set_user_mode(struct Client *client_p, struct Client *source_p,
786	–	const int parc, char *parv[])
787	–	{
788	–	unsigned int flag, setflags;
789	–	char **p, *m, buf[IRCD_BUFSIZE];
790	–	struct Client *target_p;
791	–	int what = MODE_ADD, badflag = 0, i;
792	–
793	–	assert(!(parc < 2));
794	–
795	–	if ((target_p = find_person(client_p, parv[1])) == NULL)
796	–	{
797	–	if (MyConnect(source_p))
798	–	sendto_one_numeric(source_p, &me, ERR_NOSUCHCHANNEL, parv[1]);
799	–	return;
800	–	}
801	–
802	–	if (source_p != target_p)
803	–	{
804	–	sendto_one_numeric(source_p, &me, ERR_USERSDONTMATCH);
805	–	return;
806	–	}
807	–
808	–	if (parc < 3)
809	–	{
810	–	m = buf;
811	–	*m++ = '+';
812	–
813	–	for (i = 0; i < 128; ++i)
814	–	if (HasUMode(source_p, user_modes[i]))
815	–	*m++ = (char)i;
816	–	*m = '\0';
817	–
818	–	sendto_one_numeric(source_p, &me, RPL_UMODEIS, buf);
819	–	return;
820	–	}
821	–
822	–	/* find flags already set for user */
823	–	setflags = source_p->umodes;
824	–
825	–	/* parse mode change string(s) */
826	–	for (p = &parv[2]; p && *p; ++p)
827	–	{
828	–	for (m = *p; *m; ++m)
829	–	{
830	–	switch (*m)
831	–	{
832	–	case '+':
833	–	what = MODE_ADD;
834	–	break;
835	–	case '-':
836	–	what = MODE_DEL;
837	–	break;
838	–	case 'o':
839	–	if (what == MODE_ADD)
840	–	{
841	–	if (IsServer(client_p) && !HasUMode(source_p, UMODE_OPER))
842	–	{
843	–	++Count.oper;
844	–	SetOper(source_p);
845	–	}
846	–	}
847	–	else
848	–	{
849	–	if (!HasUMode(source_p, UMODE_OPER))
850	–	break;
851	–
852	–	ClearOper(source_p);
853	–	Count.oper--;
854	–
855	–	if (MyConnect(source_p))
856	–	{
857	–	dlink_node *dm = NULL;
858	–
859	–	detach_conf(source_p, CONF_OPER);
860	–	ClrOFlag(source_p);
861	–	DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
862	–
863	–	if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
864	–	free_dlink_node(dm);
865	–	}
866	–	}
867	–
868	–	break;
869	–
870	–	case 'S':  /* Only servers may set +S in a burst */
871	–	case 'W':  /* Only servers may set +W in a burst */
872	–	case 'r':  /* Only services may set +r */
873	–	case 'x':  /* Only services may set +x */
874	–	break;
875	–
876	–	default:
877	–	if ((flag = user_modes[(unsigned char)*m]))
878	–	{
879	–	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
880	–	(ConfigFileEntry.oper_only_umodes & flag))
881	–	badflag = 1;
882	–	else
883	–	{
884	–	if (what == MODE_ADD)
885	–	AddUMode(source_p, flag);
886	–	else
887	–	DelUMode(source_p, flag);
888	–	}
889	–	}
890	–	else if (MyConnect(source_p))
891	–	badflag = 1;
892	–
893	–	break;
894	–	}
895	–	}
896	–	}
897	–
898	–	if (badflag)
899	–	sendto_one_numeric(source_p, &me, ERR_UMODEUNKNOWNFLAG);
900	–
901	–	if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
902	–	!HasOFlag(source_p, OPER_FLAG_ADMIN))
903	–	{
904	–	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
905	–	me.name, source_p->name);
906	–	DelUMode(source_p, UMODE_ADMIN);
907	–	}
908	–
909	–	if (!(setflags & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
910	–	++Count.invisi;
911	–	if ((setflags & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
912	–	--Count.invisi;
913	–
914	–	/*
915	–	* compare new flags with old flags and send string which
916	–	* will cause servers to update correctly.
917	–	*/
918	–	send_umode_out(client_p, source_p, setflags);
919	–	}
920	–
664		/* send_umode()
665		* send the MODE string for user (user) to connection client_p
666		* -avalon
#	Line 925 | Line 668 | set_user_mode(struct Client *client_p, s
668		* inputs       - client_p
669		*              - source_p
670		*              - int old
928	–	*              - sendmask mask of modes to send
671		*              - suplied umode_buf
672		* output       - NONE
673		*/
674		void
675		send_umode(struct Client *client_p, struct Client *source_p,
676	<	unsigned int old, unsigned int sendmask, char *umode_buf)
676	>	unsigned int old, char *umode_buf)
677		{
678		char *m = umode_buf;
679		int what = 0;
938	–	unsigned int i;
939	–	unsigned int flag;
680
681		/*
682	<	* build a string in umode_buf to represent the change in the user's
682	>	* Build a string in umode_buf to represent the change in the user's
683		* mode between the new (source_p->umodes) and 'old'.
684		*/
685	<	for (i = 0; i < 128; ++i)
685	>	for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
686		{
687	<	flag = user_modes[i];
948	<	if (!flag)
949	<	continue;
950	<
951	<	if (MyClient(source_p) && !(flag & sendmask))
952	<	continue;
953	<
954	<	if ((flag & old) && !HasUMode(source_p, flag))
687	>	if ((tab->flag & old) && !HasUMode(source_p, tab->flag))
688		{
689		if (what == MODE_DEL)
690	<	*m++ = (char)i;
690	>	*m++ = tab->c;
691		else
692		{
693		what = MODE_DEL;
694		*m++ = '-';
695	<	*m++ = (char)i;
695	>	*m++ = tab->c;
696		}
697		}
698	<	else if (!(flag & old) && HasUMode(source_p, flag))
698	>	else if (!(tab->flag & old) && HasUMode(source_p, tab->flag))
699		{
700		if (what == MODE_ADD)
701	<	*m++ = (char)i;
701	>	*m++ = tab->c;
702		else
703		{
704		what = MODE_ADD;
705		*m++ = '+';
706	<	*m++ = (char)i;
706	>	*m++ = tab->c;
707		}
708		}
709		}
#	Line 979 | Line 712 | send_umode(struct Client *client_p, stru
712
713		if (*umode_buf && client_p)
714		sendto_one(client_p, ":%s!%s@%s MODE %s :%s",
715	<	source_p->name, source_p->username,
716	<	source_p->host, source_p->name, umode_buf);
715	>	client_p->name, client_p->username,
716	>	client_p->host, client_p->name, umode_buf);
717		}
718
719		/* send_umode_out()
#	Line 990 | Line 723 | send_umode(struct Client *client_p, stru
723		* side effects - Only send ubuf out to servers that know about this client
724		*/
725		void
726	<	send_umode_out(struct Client *client_p, struct Client *source_p,
994	<	unsigned int old)
726	>	send_umode_out(struct Client *source_p, unsigned int old)
727		{
728	<	char buf[IRCD_BUFSIZE] = { '\0' };
997	<	dlink_node *ptr = NULL;
728	>	char buf[IRCD_BUFSIZE] = "";
729
730	<	send_umode(NULL, source_p, old, SEND_UMODES, buf);
730	>	send_umode(MyClient(source_p) ? source_p : NULL, source_p, old, buf);
731
732		if (buf[0])
733	<	{
734	<	DLINK_FOREACH(ptr, serv_list.head)
1004	<	{
1005	<	struct Client *target_p = ptr->data;
1006	<
1007	<	if ((target_p != client_p) && (target_p != source_p))
1008	<	sendto_one(target_p, ":%s MODE %s :%s",
1009	<	ID_or_name(source_p, target_p),
1010	<	ID_or_name(source_p, target_p), buf);
1011	<	}
1012	<	}
1013	<
1014	<	if (client_p && MyClient(client_p))
1015	<	send_umode(client_p, source_p, old, 0xffffffff, buf);
733	>	sendto_server(source_p, 0, 0, ":%s MODE %s :%s",
734	>	source_p->id, source_p->id, buf);
735		}
736
737		void
738		user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
739		{
740	<	dlink_node *ptr = NULL;
740	>	dlink_node *node = NULL;
741
742		if (!strcmp(target_p->host, hostname))
743		return;
#	Line 1027 | Line 746 | user_set_hostmask(struct Client *target_
746		{
747		case MODE_ADD:
748		AddUMode(target_p, UMODE_HIDDENHOST);
1030	–	AddFlag(target_p, FLAGS_IP_SPOOFING);
749		break;
750		case MODE_DEL:
751		DelUMode(target_p, UMODE_HIDDENHOST);
1034	–
1035	–	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
1036	–	DelFlag(target_p, FLAGS_IP_SPOOFING);
752		break;
753		default: return;
754		}
755
756	<	if (ConfigFileEntry.cycle_on_host_change)
757	<	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
756	>	if (ConfigGeneral.cycle_on_host_change)
757	>	sendto_common_channels_local(target_p, 0, 0, CAP_CHGHOST, ":%s!%s@%s QUIT :Changing hostname",
758		target_p->name, target_p->username, target_p->host);
759
760	<	if (IsUserHostIp(target_p))
761	<	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
760	>	sendto_common_channels_local(target_p, 0, CAP_CHGHOST, 0, ":%s!%s@%s CHGHOST %s %s",
761	>	target_p->name, target_p->username,
762	>	target_p->host, target_p->username, hostname);
763	>
764	>	if (HasFlag(target_p, FLAGS_USERHOST))
765	>	userhost_del(target_p->username, target_p->host, !MyConnect(target_p));
766
767		strlcpy(target_p->host, hostname, sizeof(target_p->host));
768
769	<	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
770	<	SetUserHost(target_p);
769	>	userhost_add(target_p->username, target_p->host, !MyConnect(target_p));
770	>	AddFlag(target_p, FLAGS_USERHOST);
771
772	<	if (MyClient(target_p))
772	>	if (MyConnect(target_p))
773		{
774	<	sendto_one_numeric(target_p, &me, RPL_NEWHOSTIS, target_p->host);
774	>	sendto_one_numeric(target_p, &me, RPL_VISIBLEHOST, target_p->host);
775		clear_ban_cache_client(target_p);
776		}
777
778	<	if (!ConfigFileEntry.cycle_on_host_change)
778	>	if (!ConfigGeneral.cycle_on_host_change)
779		return;
780
781	<	DLINK_FOREACH(ptr, target_p->channel.head)
781	>	DLINK_FOREACH(node, target_p->channel.head)
782		{
783	<	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = { '\0' };
783	>	char modebuf[CMEMBER_STATUS_FLAGS_LEN + 1];
784	>	char nickbuf[CMEMBER_STATUS_FLAGS_LEN * NICKLEN + CMEMBER_STATUS_FLAGS_LEN] = "";
785		char *p = modebuf;
786		int len = 0;
787	<	const struct Membership *ms = ptr->data;
787	>	const struct Membership *member = node->data;
788
789	<	if (has_member_flags(ms, CHFL_CHANOP))
789	>	if (has_member_flags(member, CHFL_CHANOP))
790		{
791		*p++ = 'o';
792		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
793		}
794
795	<	if (has_member_flags(ms, CHFL_HALFOP))
795	>	if (has_member_flags(member, CHFL_HALFOP))
796		{
797		*p++ = 'h';
798		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
799		}
800
801	<	if (has_member_flags(ms, CHFL_VOICE))
801	>	if (has_member_flags(member, CHFL_VOICE))
802		{
803		*p++ = 'v';
804		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
#	Line 1086 | Line 806 | user_set_hostmask(struct Client *target_
806
807		*p = '\0';
808
809	<	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
810	<	target_p->name, target_p->username, target_p->host,
811	<	ms->chptr->chname);
812	<	if (nickbuf[0])
813	<	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
814	<	target_p->servptr->name, ms->chptr->chname,
815	<	modebuf, nickbuf);
809	>	sendto_channel_local(target_p, member->chptr, 0, CAP_EXTENDED_JOIN, CAP_CHGHOST, ":%s!%s@%s JOIN %s %s :%s",
810	>	target_p->name, target_p->username,
811	>	target_p->host, member->chptr->name,
812	>	target_p->account, target_p->info);
813	>	sendto_channel_local(target_p, member->chptr, 0, 0, CAP_EXTENDED_JOIN | CAP_CHGHOST, ":%s!%s@%s JOIN :%s",
814	>	target_p->name, target_p->username,
815	>	target_p->host, member->chptr->name);
816
817	+	if (nickbuf[0])
818	+	sendto_channel_local(target_p, member->chptr, 0, 0, CAP_CHGHOST, ":%s MODE %s +%s %s",
819	+	target_p->servptr->name, member->chptr->name,
820	+	modebuf, nickbuf);
821		}
822
823		if (target_p->away[0])
824	<	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
824	>	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY, CAP_CHGHOST,
825		":%s!%s@%s AWAY :%s",
826		target_p->name, target_p->username,
827		target_p->host, target_p->away);
828		}
1105	–
1106	–	/* user_welcome()
1107	–	*
1108	–	* inputs       - client pointer to client to welcome
1109	–	* output       - NONE
1110	–	* side effects -
1111	–	*/
1112	–	static void
1113	–	user_welcome(struct Client *source_p)
1114	–	{
1115	–	#if defined(__TIME__) && defined(__DATE__)
1116	–	static const char built_date[] = __DATE__ " at " __TIME__;
1117	–	#else
1118	–	static const char built_date[] = "unknown";
1119	–	#endif
1120	–
1121	–	#ifdef HAVE_LIBCRYPTO
1122	–	if (HasFlag(source_p, FLAGS_SSL))
1123	–	{
1124	–	AddUMode(source_p, UMODE_SSL);
1125	–	sendto_one(source_p, ":%s NOTICE %s :*** Connected securely via %s",
1126	–	me.name, source_p->name,
1127	–	ssl_get_cipher(source_p->localClient->fd.ssl));
1128	–	}
1129	–	#endif
1130	–
1131	–	sendto_one_numeric(source_p, &me, RPL_WELCOME, ServerInfo.network_name,
1132	–	source_p->name);
1133	–	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
1134	–	get_listener_name(source_p->localClient->listener), ircd_version);
1135	–	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
1136	–	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
1137	–	show_isupport(source_p);
1138	–
1139	–	if (source_p->id[0] != '\0')
1140	–	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
1141	–
1142	–	show_lusers(source_p);
1143	–	motd_signon(source_p);
1144	–	}
1145	–
1146	–	/* check_xline()
1147	–	*
1148	–	* inputs       - pointer to client to test
1149	–	* outupt       - 1 if exiting 0 if ok
1150	–	* side effects -
1151	–	*/
1152	–	static int
1153	–	check_xline(struct Client *source_p)
1154	–	{
1155	–	struct MaskItem *conf = NULL;
1156	–	const char *reason = NULL;
1157	–
1158	–	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
1159	–	{
1160	–	++conf->count;
1161	–
1162	–	if (conf->reason != NULL)
1163	–	reason = conf->reason;
1164	–	else
1165	–	reason = "No Reason";
1166	–
1167	–	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
1168	–	"X-line Rejecting [%s] [%s], user %s [%s]",
1169	–	source_p->info, reason,
1170	–	get_client_name(source_p, HIDE_IP),
1171	–	source_p->sockhost);
1172	–
1173	–	++ServerStats.is_ref;
1174	–	exit_client(source_p, &me, "Bad user info");
1175	–	return 1;
1176	–	}
1177	–
1178	–	return 0;
1179	–	}
1180	–
1181	–	/* oper_up()
1182	–	*
1183	–	* inputs       - pointer to given client to oper
1184	–	* output       - NONE
1185	–	* side effects - Blindly opers up given source_p, using conf info
1186	–	*                all checks on passwords have already been done.
1187	–	*                This could also be used by rsa oper routines.
1188	–	*/
1189	–	void
1190	–	oper_up(struct Client *source_p)
1191	–	{
1192	–	const unsigned int old = source_p->umodes;
1193	–	const struct MaskItem *conf = source_p->localClient->confs.head->data;
1194	–
1195	–	assert(source_p->localClient->confs.head);
1196	–
1197	–	++Count.oper;
1198	–	SetOper(source_p);
1199	–
1200	–	if (conf->modes)
1201	–	AddUMode(source_p, conf->modes);
1202	–	else if (ConfigFileEntry.oper_umodes)
1203	–	AddUMode(source_p, ConfigFileEntry.oper_umodes);
1204	–
1205	–	if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
1206	–	++Count.invisi;
1207	–	if ((old & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
1208	–	--Count.invisi;
1209	–
1210	–	assert(dlinkFind(&oper_list, source_p) == NULL);
1211	–	dlinkAdd(source_p, make_dlink_node(), &oper_list);
1212	–
1213	–	AddOFlag(source_p, conf->port);
1214	–
1215	–	if (HasOFlag(source_p, OPER_FLAG_ADMIN))
1216	–	AddUMode(source_p, UMODE_ADMIN);
1217	–
1218	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1219	–	get_oper_name(source_p));
1220	–	send_umode_out(source_p, source_p, old);
1221	–	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
1222	–	}
1223	–
1224	–	static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
1225	–
1226	–	int
1227	–	valid_sid(const char *sid)
1228	–	{
1229	–	if (strlen(sid) == IRC_MAXSID)
1230	–	if (IsDigit(*sid))
1231	–	if (IsAlNum(*(sid + 1)) && IsAlNum(*(sid + 2)))
1232	–	return 1;
1233	–
1234	–	return 0;
1235	–	}
1236	–
1237	–	/*
1238	–	* init_uid()
1239	–	*
1240	–	* inputs       - NONE
1241	–	* output       - NONE
1242	–	* side effects - new_uid is filled in with server id portion (sid)
1243	–	*                (first 3 bytes) or defaulted to 'A'.
1244	–	*                Rest is filled in with 'A'
1245	–	*/
1246	–	void
1247	–	init_uid(void)
1248	–	{
1249	–	unsigned int i;
1250	–
1251	–	memset(new_uid, 0, sizeof(new_uid));
1252	–
1253	–	if (!EmptyString(ServerInfo.sid))
1254	–	strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1255	–
1256	–	for (i = 0; i < IRC_MAXSID; ++i)
1257	–	if (new_uid[i] == '\0')
1258	–	new_uid[i] = 'A';
1259	–
1260	–	/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1261	–	memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1262	–	}
1263	–
1264	–	/*
1265	–	* add_one_to_uid
1266	–	*
1267	–	* inputs       - index number into new_uid
1268	–	* output       - NONE
1269	–	* side effects - new_uid is incremented by one
1270	–	*                note this is a recursive function
1271	–	*/
1272	–	static void
1273	–	add_one_to_uid(int i)
1274	–	{
1275	–	if (i != IRC_MAXSID)    /* Not reached server SID portion yet? */
1276	–	{
1277	–	if (new_uid[i] == 'Z')
1278	–	new_uid[i] = '0';
1279	–	else if (new_uid[i] == '9')
1280	–	{
1281	–	new_uid[i] = 'A';
1282	–	add_one_to_uid(i-1);
1283	–	}
1284	–	else
1285	–	++new_uid[i];
1286	–	}
1287	–	else
1288	–	{
1289	–	/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1290	–	if (new_uid[i] == 'Z')
1291	–	memcpy(new_uid + IRC_MAXSID, "AAAAAA", IRC_MAXUID);
1292	–	else
1293	–	++new_uid[i];
1294	–	}
1295	–	}
1296	–
1297	–	/*
1298	–	* uid_get
1299	–	*
1300	–	* inputs       - struct Client *
1301	–	* output       - new UID is returned to caller
1302	–	* side effects - new_uid is incremented by one.
1303	–	*/
1304	–	static const char *
1305	–	uid_get(void)
1306	–	{
1307	–	add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
1308	–	return new_uid;
1309	–	}
1310	–
1311	–	/*
1312	–	* init_isupport()
1313	–	*
1314	–	* input        - NONE
1315	–	* output       - NONE
1316	–	* side effects - Must be called before isupport is enabled
1317	–	*/
1318	–	void
1319	–	init_isupport(void)
1320	–	{
1321	–	add_isupport("CALLERID", NULL, -1);
1322	–	add_isupport("CASEMAPPING", CASEMAP, -1);
1323	–	add_isupport("DEAF", "D", -1);
1324	–	add_isupport("KICKLEN", NULL, KICKLEN);
1325	–	add_isupport("MODES", NULL, MAXMODEPARAMS);
1326	–	#ifdef HALFOPS
1327	–	add_isupport("PREFIX", "(ohv)@%+", -1);
1328	–	add_isupport("STATUSMSG", "@%+", -1);
1329	–	#else
1330	–	add_isupport("PREFIX", "(ov)@+", -1);
1331	–	add_isupport("STATUSMSG", "@+", -1);
1332	–	#endif
1333	–	add_isupport("EXCEPTS", "e", -1);
1334	–	add_isupport("INVEX", "I", -1);
1335	–	}
1336	–
1337	–	/*
1338	–	* add_isupport()
1339	–	*
1340	–	* input        - name of supported function
1341	–	*              - options if any
1342	–	*              - number if any
1343	–	* output       - NONE
1344	–	* side effects - Each supported item must call this when activated
1345	–	*/
1346	–	void
1347	–	add_isupport(const char *name, const char *options, int n)
1348	–	{
1349	–	dlink_node *ptr;
1350	–	struct Isupport *support;
1351	–
1352	–	DLINK_FOREACH(ptr, support_list.head)
1353	–	{
1354	–	support = ptr->data;
1355	–	if (irccmp(support->name, name) == 0)
1356	–	{
1357	–	MyFree(support->name);
1358	–	MyFree(support->options);
1359	–	break;
1360	–	}
1361	–	}
1362	–
1363	–	if (ptr == NULL)
1364	–	{
1365	–	support = MyMalloc(sizeof(*support));
1366	–	dlinkAddTail(support, &support->node, &support_list);
1367	–	}
1368	–
1369	–	support->name = xstrdup(name);
1370	–	if (options != NULL)
1371	–	support->options = xstrdup(options);
1372	–	support->number = n;
1373	–
1374	–	rebuild_isupport_message_line();
1375	–	}
1376	–
1377	–	/*
1378	–	* delete_isupport()
1379	–	*
1380	–	* input        - name of supported function
1381	–	* output       - NONE
1382	–	* side effects - Each supported item must call this when deactivated
1383	–	*/
1384	–	void
1385	–	delete_isupport(const char *name)
1386	–	{
1387	–	dlink_node *ptr;
1388	–	struct Isupport *support;
1389	–
1390	–	DLINK_FOREACH(ptr, support_list.head)
1391	–	{
1392	–	support = ptr->data;
1393	–	if (irccmp(support->name, name) == 0)
1394	–	{
1395	–	dlinkDelete(ptr, &support_list);
1396	–	MyFree(support->name);
1397	–	MyFree(support->options);
1398	–	MyFree(support);
1399	–	break;
1400	–	}
1401	–	}
1402	–
1403	–	rebuild_isupport_message_line();
1404	–	}
1405	–
1406	–	/*
1407	–	* rebuild_isupport_message_line
1408	–	*
1409	–	* input        - NONE
1410	–	* output       - NONE
1411	–	* side effects - Destroy the isupport MessageFile lines, and rebuild.
1412	–	*/
1413	–	void
1414	–	rebuild_isupport_message_line(void)
1415	–	{
1416	–	char isupportbuffer[IRCD_BUFSIZE];
1417	–	char *p = isupportbuffer;
1418	–	dlink_node *ptr = NULL, *ptr_next = NULL;
1419	–	int n = 0;
1420	–	int tokens = 0;
1421	–	size_t len = 0;
1422	–	size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1423	–
1424	–	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1425	–	{
1426	–	dlinkDelete(ptr, &support_list_lines);
1427	–	MyFree(ptr->data);
1428	–	free_dlink_node(ptr);
1429	–	}
1430	–
1431	–	DLINK_FOREACH(ptr, support_list.head)
1432	–	{
1433	–	struct Isupport *support = ptr->data;
1434	–
1435	–	p += (n = sprintf(p, "%s", support->name));
1436	–	len += n;
1437	–
1438	–	if (support->options != NULL)
1439	–	{
1440	–	p += (n = sprintf(p, "=%s", support->options));
1441	–	len += n;
1442	–	}
1443	–
1444	–	if (support->number > 0)
1445	–	{
1446	–	p += (n = sprintf(p, "=%d", support->number));
1447	–	len += n;
1448	–	}
1449	–
1450	–	*p++ = ' ';
1451	–	len++;
1452	–	*p = '\0';
1453	–
1454	–	if (++tokens == (MAXPARA-2) || len >= (sizeof(isupportbuffer)-reserve))
1455	–	{ /* arbritrary for now */
1456	–	if (*--p == ' ')
1457	–	*p = '\0';
1458	–
1459	–	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1460	–	p = isupportbuffer;
1461	–	len = 0;
1462	–	n = tokens = 0;
1463	–	}
1464	–	}
1465	–
1466	–	if (len != 0)
1467	–	{
1468	–	if (*--p == ' ')
1469	–	*p = '\0';
1470	–	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1471	–	}
1472	–	}

Diff Legend

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