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 7599 by michael, Mon Jun 13 18:56:33 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 "conf_gecos.h"
42		#include "log.h"
43	<	#include "s_serv.h"
43	>	#include "server.h"
44		#include "send.h"
46	–	#include "supported.h"
47	–	#include "whowas.h"
45		#include "memory.h"
46		#include "packet.h"
47		#include "rng_mt.h"
48		#include "userhost.h"
49	<	#include "hook.h"
53	<	#include "s_misc.h"
49	>	#include "misc.h"
50		#include "parse.h"
51		#include "watch.h"
52	+	#include "isupport.h"
53	+	#include "tls.h"
54
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 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] =
57	>	const struct user_modes *umode_map[256];
58	>	const struct user_modes  umode_tab[] =
59		{
60	<	/* 0x00 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x0F */
61	<	/* 0x10 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x1F */
62	<	/* 0x20 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x2F */
63	<	/* 0x30 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x3F */
64	<	0,                  /* @ */
65	<	0,                  /* A */
66	<	0,                  /* B */
67	<	0,                  /* C */
68	<	UMODE_DEAF,         /* D */
69	<	0,                  /* E */
70	<	UMODE_FARCONNECT,   /* F */
71	<	UMODE_SOFTCALLERID, /* G */
72	<	UMODE_HIDDEN,       /* H */
73	<	0,                  /* I */
74	<	0,                  /* J */
75	<	0,                  /* K */
76	<	0,                  /* L */
77	<	0,                  /* M */
78	<	0,                  /* N */
79	<	0,                  /* O */
80	<	0,                  /* P */
81	<	0,                  /* Q */
82	<	UMODE_REGONLY,      /* R */
83	<	UMODE_SSL,          /* S */
84	<	0,                  /* T */
85	<	0,                  /* U */
86	<	0,                  /* V */
87	<	UMODE_WEBIRC,       /* W */
88	<	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 */
60	>	{ 'D', UMODE_DEAF         },
61	>	{ 'F', UMODE_FARCONNECT   },
62	>	{ 'G', UMODE_SOFTCALLERID },
63	>	{ 'H', UMODE_HIDDEN       },
64	>	{ 'R', UMODE_REGONLY      },
65	>	{ 'S', UMODE_SSL          },
66	>	{ 'W', UMODE_WEBIRC       },
67	>	{ 'a', UMODE_ADMIN        },
68	>	{ 'b', UMODE_BOTS         },
69	>	{ 'c', UMODE_CCONN        },
70	>	{ 'd', UMODE_DEBUG        },
71	>	{ 'e', UMODE_EXTERNAL     },
72	>	{ 'f', UMODE_FULL         },
73	>	{ 'g', UMODE_CALLERID     },
74	>	{ 'i', UMODE_INVISIBLE    },
75	>	{ 'j', UMODE_REJ          },
76	>	{ 'k', UMODE_SKILL        },
77	>	{ 'l', UMODE_LOCOPS       },
78	>	{ 'n', UMODE_NCHANGE      },
79	>	{ 'o', UMODE_OPER         },
80	>	{ 'p', UMODE_HIDECHANS    },
81	>	{ 'q', UMODE_HIDEIDLE     },
82	>	{ 'r', UMODE_REGISTERED   },
83	>	{ 's', UMODE_SERVNOTICE   },
84	>	{ 'u', UMODE_UNAUTH       },
85	>	{ 'w', UMODE_WALLOP       },
86	>	{ 'x', UMODE_HIDDENHOST   },
87	>	{ 'y', UMODE_SPY          },
88	>	{ '\0', 0 }
89		};
90
91		void
92	<	assemble_umode_buffer(void)
92	>	user_modes_init(void)
93		{
157	–	unsigned int idx = 0;
94		char *umode_buffer_ptr = umode_buffer;
95
96	<	for (; idx < (sizeof(user_modes) / sizeof(user_modes[0])); ++idx)
97	<	if (user_modes[idx])
98	<	*umode_buffer_ptr++ = idx;
96	>	for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
97	>	{
98	>	umode_map[tab->c] = tab;
99	>	*umode_buffer_ptr++ = tab->c;
100	>	}
101
102		*umode_buffer_ptr = '\0';
103		}
#	Line 174 | Line 112 | void
112		show_lusers(struct Client *source_p)
113		{
114		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
115	<	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total-Count.invisi),
116	<	Count.invisi, dlink_list_length(&global_serv_list));
115	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
116	>	Count.invisi, dlink_list_length(&global_server_list));
117		else
118	<	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT,
119	<	(Count.total-Count.invisi), Count.invisi, 1);
118	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
119	>	Count.invisi, 1);
120
121	<	if (Count.oper > 0)
121	>	if (Count.oper)
122		sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper);
123
124	<	if (dlink_list_length(&unknown_list) > 0)
124	>	if (dlink_list_length(&unknown_list))
125		sendto_one_numeric(source_p, &me, RPL_LUSERUNKNOWN, dlink_list_length(&unknown_list));
126
127	<	if (dlink_list_length(&global_channel_list) > 0)
128	<	sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&global_channel_list));
127	>	if (dlink_list_length(&channel_list))
128	>	sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&channel_list));
129
130		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
131		{
#	Line 213 | Line 151 | show_lusers(struct Client *source_p)
151		Count.max_loc_con = Count.local + Count.myserver;
152		}
153
154	<	/* show_isupport()
154	>	/* report_and_set_user_flags()
155		*
156	<	* inputs       - pointer to client
156	>	* inputs       - pointer to source_p
157	>	*              - pointer to conf for this user
158		* output       - NONE
159	<	* side effects - display to client what we support (for them)
159	>	* side effects - Report to user any special flags
160	>	*                they are getting, and set them.
161		*/
162	<	void
163	<	show_isupport(struct Client *source_p)
162	>	static void
163	>	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
164		{
165	<	const dlink_node *ptr = NULL;
165	>	/* If this user is being spoofed, tell them so */
166	>	if (IsConfDoSpoofIp(conf))
167	>	sendto_one_notice(source_p, &me, ":*** Spoofing your IP");
168	>
169	>	/* If this user is in the exception class, set it "E lined" */
170	>	if (IsConfExemptKline(conf))
171	>	{
172	>	AddFlag(source_p, FLAGS_EXEMPTKLINE);
173	>	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D lines");
174	>	}
175	>
176	>	if (IsConfExemptXline(conf))
177	>	{
178	>	AddFlag(source_p, FLAGS_EXEMPTXLINE);
179	>	sendto_one_notice(source_p, &me, ":*** You are exempt from X lines");
180	>	}
181	>
182	>	if (IsConfExemptResv(conf))
183	>	{
184	>	AddFlag(source_p, FLAGS_EXEMPTRESV);
185	>	sendto_one_notice(source_p, &me, ":*** You are exempt from resvs");
186	>	}
187	>
188	>	/* If this user is exempt from user limits set it "F lined" */
189	>	if (IsConfExemptLimits(conf))
190	>	{
191	>	AddFlag(source_p, FLAGS_NOLIMIT);
192	>	sendto_one_notice(source_p, &me, ":*** You are exempt from user limits");
193	>	}
194
195	<	DLINK_FOREACH(ptr, support_list_lines.head)
196	<	sendto_one_numeric(source_p, &me, RPL_ISUPPORT, ptr->data);
195	>	if (IsConfCanFlood(conf))
196	>	{
197	>	AddFlag(source_p, FLAGS_CANFLOOD);
198	>	sendto_one_notice(source_p, &me, ":*** You are exempt from flood protection");
199	>	}
200		}
201
202	<	/*
203	<	** register_local_user
204	<	**      This function is called when both NICK and USER messages
205	<	**      have been accepted for the client, in whatever order. Only
206	<	**      after this, is the USER message propagated.
207	<	**
208	<	**      NICK's must be propagated at once when received, although
209	<	**      it would be better to delay them too until full info is
210	<	**      available. Doing it is not so simple though, would have
211	<	**      to implement the following:
212	<	**
213	<	**      (actually it has been implemented already for a while) -orabidoo
214	<	**
215	<	**      1) user telnets in and gives only "NICK foobar" and waits
216	<	**      2) another user far away logs in normally with the nick
217	<	**         "foobar" (quite legal, as this server didn't propagate
218	<	**         it).
219	<	**      3) now this server gets nick "foobar" from outside, but
220	<	**         has alread the same defined locally. Current server
221	<	**         would just issue "KILL foobar" to clean out dups. But,
222	<	**         this is not fair. It should actually request another
223	<	**         nick from local user or kill him/her...
224	<	*/
202	>	/* introduce_client()
203	>	*
204	>	* inputs       - source_p
205	>	* output       - NONE
206	>	* side effects - This common function introduces a client to the rest
207	>	*                of the net, either from a local client connect or
208	>	*                from a remote connect.
209	>	*/
210	>	static void
211	>	introduce_client(struct Client *source_p)
212	>	{
213	>	dlink_node *node = NULL;
214	>	char ubuf[IRCD_BUFSIZE] = "";
215	>
216	>	send_umode(source_p, MyConnect(source_p), 0, ubuf);
217	>	watch_check_hash(source_p, RPL_LOGON);
218	>
219	>	if (ubuf[0] == '\0')
220	>	{
221	>	ubuf[0] = '+';
222	>	ubuf[1] = '\0';
223	>	}
224	>
225	>	DLINK_FOREACH(node, local_server_list.head)
226	>	{
227	>	struct Client *server = node->data;
228	>
229	>	if (server == source_p->from)
230	>	continue;
231	>
232	>	sendto_one(server, ":%s UID %s %u %ju %s %s %s %s %s %s :%s",
233	>	source_p->servptr->id,
234	>	source_p->name, source_p->hopcount+1,
235	>	source_p->tsinfo,
236	>	ubuf, source_p->username, source_p->host,
237	>	source_p->sockhost, source_p->id,
238	>	source_p->account,
239	>	source_p->info);
240	>
241	>	if (!EmptyString(source_p->certfp))
242	>	sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
243	>	}
244	>	}
245	>
246	>	/* user_welcome()
247	>	*
248	>	* inputs       - client pointer to client to welcome
249	>	* output       - NONE
250	>	* side effects -
251	>	*/
252	>	static void
253	>	user_welcome(struct Client *source_p)
254	>	{
255	>	static const char built_date[] = __DATE__ " at " __TIME__;
256	>
257	>	if (HasFlag(source_p, FLAGS_SSL))
258	>	{
259	>	AddUMode(source_p, UMODE_SSL);
260	>	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
261	>	tls_get_cipher(&source_p->connection->fd.ssl));
262	>	}
263	>
264	>	sendto_one_numeric(source_p, &me, RPL_WELCOME, ConfigServerInfo.network_name,
265	>	source_p->name);
266	>	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
267	>	listener_get_name(source_p->connection->listener), ircd_version);
268	>	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
269	>	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
270	>
271	>	isupport_show(source_p);
272	>	show_lusers(source_p);
273	>	motd_signon(source_p);
274	>	}
275	>
276	>	/* check_xline()
277	>	*
278	>	* inputs       - pointer to client to test
279	>	* outupt       - 1 if exiting 0 if ok
280	>	* side effects -
281	>	*/
282	>	static int
283	>	check_xline(struct Client *source_p)
284	>	{
285	>	const struct GecosItem *gecos = NULL;
286	>
287	>	if (HasFlag(source_p, FLAGS_EXEMPTXLINE))
288	>	return 0;
289	>
290	>	if ((gecos = gecos_find(source_p->info, match)))
291	>	{
292	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
293	>	"X-line Rejecting [%s] [%s], user %s [%s]",
294	>	source_p->info, gecos->reason,
295	>	get_client_name(source_p, HIDE_IP),
296	>	source_p->sockhost);
297	>
298	>	++ServerStats.is_ref;
299	>	exit_client(source_p, "Bad user info");
300	>	return 1;
301	>	}
302	>
303	>	return 0;
304	>	}
305	>
306	>	/*! \brief This function is called when both NICK and USER messages
307	>	*      have been accepted for the client, in whatever order. Only
308	>	*      after this, is the UID message propagated.
309	>	* \param source_p Pointer to given client to introduce
310	>	*/
311		void
312		register_local_user(struct Client *source_p)
313		{
257	–	const char *id = NULL;
314		const struct MaskItem *conf = NULL;
315
260	–	assert(source_p != NULL);
316		assert(source_p == source_p->from);
317		assert(MyConnect(source_p));
318	<	assert(!source_p->localClient->registration);
319	<
265	<	ClearCap(source_p, CAP_TS6);
318	>	assert(IsUnknown(source_p));
319	>	assert(!source_p->connection->registration);
320
321	<	if (ConfigFileEntry.ping_cookie)
321	>	if (ConfigGeneral.ping_cookie)
322		{
323	<	if (!IsPingSent(source_p) && !source_p->localClient->random_ping)
323	>	if (!HasFlag(source_p, FLAGS_PINGSENT) && !source_p->connection->random_ping)
324		{
325		do
326	<	source_p->localClient->random_ping = genrand_int32();
327	<	while (!source_p->localClient->random_ping);
326	>	source_p->connection->random_ping = genrand_int32();
327	>	while (!source_p->connection->random_ping);
328
329	<	sendto_one(source_p, "PING :%u",
330	<	source_p->localClient->random_ping);
277	<	SetPingSent(source_p);
329	>	sendto_one(source_p, "PING :%u", source_p->connection->random_ping);
330	>	AddFlag(source_p, FLAGS_PINGSENT);
331		return;
332		}
333
334	<	if (!HasPingCookie(source_p))
334	>	if (!HasFlag(source_p, FLAGS_PING_COOKIE))
335		return;
336		}
337
338	<	source_p->localClient->last_privmsg = CurrentTime;
338	>	source_p->connection->last_privmsg = CurrentTime;
339		/* Straight up the maximum rate of flooding... */
340	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
340	>	source_p->connection->allow_read = MAX_FLOOD_BURST;
341
342		if (!check_client(source_p))
343		return;
344
345		if (!valid_hostname(source_p->host))
346		{
347	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You have an illegal "
348	<	"character in your hostname", me.name, source_p->name);
349	<	strlcpy(source_p->host, source_p->sockhost,
297	<	sizeof(source_p->host));
347	>	sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
348	>	"character in your hostname");
349	>	strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
350		}
351
352	<	conf = source_p->localClient->confs.head->data;
352	>	conf = source_p->connection->confs.head->data;
353
354	<	if (!IsGotId(source_p))
354	>	if (!HasFlag(source_p, FLAGS_GOTID))
355		{
356	<	char username[USERLEN + 1];
305	<	const char *p = username;
356	>	char username[USERLEN + 1] = "";
357		unsigned int i = 0;
358
359		if (IsNeedIdentd(conf))
360		{
361		++ServerStats.is_ref;
362	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You need to install "
363	<	"identd to use this server", me.name, source_p->name);
364	<	exit_client(source_p, &me, "Install identd");
362	>	sendto_one_notice(source_p, &me, ":*** Notice -- You need to install "
363	>	"identd to use this server");
364	>	exit_client(source_p, "Install identd");
365		return;
366		}
367
#	Line 319 | Line 370 | register_local_user(struct Client *sourc
370		if (!IsNoTilde(conf))
371		source_p->username[i++] = '~';
372
373	<	for (; *p && i < USERLEN; ++p)
374	<	if (*p != '[')
324	<	source_p->username[i++] = *p;
373	>	for (const char *p = username; *p && i < USERLEN; ++p)
374	>	source_p->username[i++] = *p;
375
376		source_p->username[i] = '\0';
377		}
378
379	<	/* password check */
379	>	/* Password check */
380		if (!EmptyString(conf->passwd))
381		{
382	<	const char *pass = source_p->localClient->passwd;
333	<
334	<	if (!match_conf_password(pass, conf))
382	>	if (!match_conf_password(source_p->connection->password, conf))
383		{
384		++ServerStats.is_ref;
385
386		sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
387	<	exit_client(source_p, &me, "Bad Password");
387	>	exit_client(source_p, "Bad Password");
388		return;
389		}
390		}
391
392	<	/* don't free source_p->localClient->passwd here - it can be required
393	<	* by masked /stats I if there are auth{} blocks with need_password = no;
392	>	/*
393	>	* Don't free source_p->connection->password here - it can be required
394	>	* by masked /stats I if there are auth {} blocks with need_password = no;
395		* --adx
396		*/
397
398	<	/* report if user has &^>= etc. and set flags as needed in source_p */
398	>	/*
399	>	* Report if user has &^>= etc. and set flags as needed in source_p
400	>	*/
401		report_and_set_user_flags(source_p, conf);
402
403		if (IsDead(source_p))
404		return;
405
406	<	/* Limit clients -
406	>	/*
407	>	* Limit clients -
408		* We want to be able to have servers and F-line clients
409		* connect, so save room for "buffer" connections.
410		* Smaller servers may want to decrease this, and it should
411		* probably be just a percentage of the MAXCLIENTS...
412		*   -Taner
413		*/
414	<	/* Except "F:" clients */
415	<	if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
364	<	(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
414	>	if ((Count.local >= GlobalSetOptions.maxclients + MAX_BUFFER) ||
415	>	(Count.local >= GlobalSetOptions.maxclients && !HasFlag(source_p, FLAGS_NOLIMIT)))
416		{
417		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
418		"Too many clients, rejecting %s[%s].",
419		source_p->name, source_p->host);
420		++ServerStats.is_ref;
421	<	exit_client(source_p, &me, "Sorry, server is full - try later");
421	>	exit_client(source_p, "Sorry, server is full - try later");
422		return;
423		}
424
374	–	/* valid user name check */
425		if (!valid_username(source_p->username, 1))
426		{
427	<	char tmpstr2[IRCD_BUFSIZE];
427	>	char buf[IRCD_BUFSIZE] = "";
428
429		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
430		"Invalid username: %s (%s@%s)",
431		source_p->name, source_p->username, source_p->host);
432		++ServerStats.is_ref;
433	<	snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
434	<	source_p->username);
385	<	exit_client(source_p, &me, tmpstr2);
433	>	snprintf(buf, sizeof(buf), "Invalid username [%s]", source_p->username);
434	>	exit_client(source_p, buf);
435		return;
436		}
437
438		if (check_xline(source_p))
439		return;
440
441	<	while (hash_find_id((id = uid_get())) != NULL)
441	>	const char *id;
442	>	while (hash_find_id((id = uid_get())))
443		;
444
445		strlcpy(source_p->id, id, sizeof(source_p->id));
#	Line 398 | Line 448 | register_local_user(struct Client *sourc
448		sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
449		"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
450		source_p->name, source_p->username, source_p->host,
451	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
452	<	"255.255.255.255" : source_p->sockhost,
403	<	get_client_class(&source_p->localClient->confs),
451	>	source_p->sockhost,
452	>	get_client_class(&source_p->connection->confs),
453		source_p->info, source_p->id);
454
455	<	if (ConfigFileEntry.invisible_on_connect)
455	>	if (ConfigGeneral.invisible_on_connect)
456		{
457		AddUMode(source_p, UMODE_INVISIBLE);
458		++Count.invisi;
#	Line 414 | Line 463 | register_local_user(struct Client *sourc
463		Count.max_loc = Count.local;
464
465		if (!(Count.max_loc % 10))
466	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
467	<	"New Max Local Clients: %d",
466	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
467	>	"New maximum local client connections: %u",
468		Count.max_loc);
469		}
470
422	–	/* Increment our total user count here */
471		if (++Count.total > Count.max_tot)
472		Count.max_tot = Count.total;
473		++Count.totalrestartcount;
#	Line 427 | Line 475 | register_local_user(struct Client *sourc
475		assert(source_p->servptr == &me);
476		SetClient(source_p);
477		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
478	<
431	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
478	>	dlinkAdd(source_p, &source_p->node, &global_client_list);
479
480		assert(dlinkFind(&unknown_list, source_p));
481
482	<	dlink_move_node(&source_p->localClient->lclient_node,
482	>	dlink_move_node(&source_p->connection->lclient_node,
483		&unknown_list, &local_client_list);
484
485		user_welcome(source_p);
486	<	add_user_host(source_p->username, source_p->host, 0);
487	<	SetUserHost(source_p);
486	>	userhost_add(source_p->username, source_p->host, 0);
487	>	AddFlag(source_p, FLAGS_USERHOST);
488
489		introduce_client(source_p);
490		}
#	Line 453 | Line 500 | register_local_user(struct Client *sourc
500		*                is introduced by a server.
501		*/
502		void
503	<	register_remote_user(struct Client *source_p, const char *username,
457	<	const char *host, const char *server)
503	>	register_remote_user(struct Client *source_p)
504		{
505	<	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	<	}
505	>	const struct Client *target_p = NULL;
506
507		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
508		{
#	Line 494 | Line 511 | register_remote_user(struct Client *sour
511		source_p->from->name, source_p->name, source_p->username,
512		source_p->host, source_p->servptr->name,
513		target_p->name, target_p->from->name);
514	<	kill_client(source_p->from, source_p,
515	<	"%s (NICK from wrong direction (%s != %s))",
516	<	me.name, source_p->servptr->name, target_p->from->name);
514	>	sendto_one(source_p->from,
515	>	":%s KILL %s :%s (UID from wrong direction (%s != %s))",
516	>	me.id, source_p->id, me.name, source_p->servptr->name,
517	>	target_p->from->name);
518	>
519		AddFlag(source_p, FLAGS_KILLED);
520	<	exit_client(source_p, &me, "USER server wrong direction");
520	>	exit_client(source_p, "UID server wrong direction");
521		return;
522		}
523
#	Line 509 | Line 528 | register_remote_user(struct Client *sour
528		if (HasFlag(source_p->servptr, FLAGS_SERVICE))
529		AddFlag(source_p, FLAGS_SERVICE);
530
512	–	/* Increment our total user count here */
531		if (++Count.total > Count.max_tot)
532		Count.max_tot = Count.total;
533
534		SetClient(source_p);
535		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
536	<	add_user_host(source_p->username, source_p->host, 1);
537	<	SetUserHost(source_p);
536	>	dlinkAdd(source_p, &source_p->node, &global_client_list);
537	>	userhost_add(source_p->username, source_p->host, 1);
538	>	AddFlag(source_p, FLAGS_USERHOST);
539
540		if (HasFlag(source_p->servptr, FLAGS_EOB))
541		sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
542	<	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
542	>	"Client connecting at %s: %s (%s@%s) [%s] [%s] <%s>",
543		source_p->servptr->name,
544		source_p->name, source_p->username, source_p->host,
545	<	source_p->info, source_p->id);
545	>	source_p->sockhost, source_p->info, source_p->id);
546
547		introduce_client(source_p);
548		}
549
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	–
550		/* valid_hostname()
551		*
552		* Inputs       - pointer to hostname
#	Line 620 | Line 561 | valid_hostname(const char *hostname)
561		{
562		const char *p = hostname;
563
564	<	assert(p != NULL);
564	>	assert(p);
565
566		if (EmptyString(p) || *p == '.' || *p == ':')
567		return 0;
#	Line 646 | Line 587 | valid_hostname(const char *hostname)
587		int
588		valid_username(const char *username, const int local)
589		{
649	–	int dots      = 0;
590		const char *p = username;
591
592	<	assert(p != NULL);
592	>	assert(p);
593
594		if (*p == '~')
595		++p;
#	Line 664 | Line 604 | valid_username(const char *username, con
604
605		if (local)
606		{
607	+	unsigned int dots = 0;
608	+
609		while (*++p)
610		{
611	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
611	>	if (*p == '.' && ConfigGeneral.dots_in_ident)
612		{
613	<	if (++dots > ConfigFileEntry.dots_in_ident)
613	>	if (++dots > ConfigGeneral.dots_in_ident)
614		return 0;
615		if (!IsUserChar(*(p + 1)))
616		return 0;
#	Line 684 | Line 626 | valid_username(const char *username, con
626		return 0;
627		}
628
629	<	return  p - username <= USERLEN;;
629	>	return p - username <= USERLEN;
630		}
631
632		/* clean_nick_name()
#	Line 698 | Line 640 | int
640		valid_nickname(const char *nickname, const int local)
641		{
642		const char *p = nickname;
701	–	assert(nickname && *nickname);
643
644	<	/* nicks can't start with a digit or - or be 0 length */
645	<	/* This closer duplicates behaviour of hybrid-6 */
646	<	if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
644	>	assert(p);
645	>
646	>	/*
647	>	* Nicks can't start with a digit or - or be 0 length.
648	>	*/
649	>	if (EmptyString(p) || *p == '-' || (IsDigit(*p) && local))
650		return 0;
651
652		for (; *p; ++p)
#	Line 712 | Line 656 | valid_nickname(const char *nickname, con
656		return p - nickname <= NICKLEN;
657		}
658
659	<	/* report_and_set_user_flags()
660	<	*
661	<	* inputs       - pointer to source_p
662	<	*              - pointer to conf for this user
663	<	* 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
659	>	/*! \brief Builds a mode change string to buffer pointed by \a buf
660	>	* \param client_p  Pointer to client
661	>	* \param send      Whether to send a MODE message to client_p
662	>	* \param old       Old user mode to compare against when building new mode buffer
663	>	* \param buf       Pointer to buffer to build string in
664		*/
665		void
666	<	set_user_mode(struct Client *client_p, struct Client *source_p,
667	<	const int parc, char *parv[])
666	>	send_umode(struct Client *client_p, unsigned int send,
667	>	unsigned int old, char *buf)
668		{
669	<	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	<
921	<	/* send_umode()
922	<	* send the MODE string for user (user) to connection client_p
923	<	* -avalon
924	<	*
925	<	* inputs       - client_p
926	<	*              - source_p
927	<	*              - int old
928	<	*              - sendmask mask of modes to send
929	<	*              - suplied umode_buf
930	<	* output       - NONE
931	<	*/
932	<	void
933	<	send_umode(struct Client *client_p, struct Client *source_p,
934	<	unsigned int old, unsigned int sendmask, char *umode_buf)
935	<	{
936	<	char *m = umode_buf;
669	>	char *m = buf;
670		int what = 0;
938	–	unsigned int i;
939	–	unsigned int flag;
671
672		/*
673	<	* build a string in umode_buf to represent the change in the user's
673	>	* Build a string in umode_buf to represent the change in the user's
674		* mode between the new (source_p->umodes) and 'old'.
675		*/
676	<	for (i = 0; i < 128; ++i)
676	>	for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
677		{
678	<	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))
678	>	if ((tab->flag & old) && !HasUMode(client_p, tab->flag))
679		{
680		if (what == MODE_DEL)
681	<	*m++ = (char)i;
681	>	*m++ = tab->c;
682		else
683		{
684		what = MODE_DEL;
685		*m++ = '-';
686	<	*m++ = (char)i;
686	>	*m++ = tab->c;
687		}
688		}
689	<	else if (!(flag & old) && HasUMode(source_p, flag))
689	>	else if (!(tab->flag & old) && HasUMode(client_p, tab->flag))
690		{
691		if (what == MODE_ADD)
692	<	*m++ = (char)i;
692	>	*m++ = tab->c;
693		else
694		{
695		what = MODE_ADD;
696		*m++ = '+';
697	<	*m++ = (char)i;
697	>	*m++ = tab->c;
698		}
699		}
700		}
701
702		*m = '\0';
703
704	<	if (*umode_buf && client_p)
704	>	if (send && *buf)
705		sendto_one(client_p, ":%s!%s@%s MODE %s :%s",
706	<	source_p->name, source_p->username,
707	<	source_p->host, source_p->name, umode_buf);
706	>	client_p->name, client_p->username,
707	>	client_p->host, client_p->name, buf);
708		}
709
710		/* send_umode_out()
#	Line 990 | Line 714 | send_umode(struct Client *client_p, stru
714		* side effects - Only send ubuf out to servers that know about this client
715		*/
716		void
717	<	send_umode_out(struct Client *client_p, struct Client *source_p,
994	<	unsigned int old)
717	>	send_umode_out(struct Client *source_p, unsigned int old)
718		{
719	<	char buf[IRCD_BUFSIZE] = { '\0' };
997	<	dlink_node *ptr = NULL;
719	>	char buf[IRCD_BUFSIZE] = "";
720
721	<	send_umode(NULL, source_p, old, SEND_UMODES, buf);
721	>	send_umode(source_p, MyClient(source_p), old, buf);
722
723		if (buf[0])
724	<	{
725	<	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);
724	>	sendto_server(source_p, 0, 0, ":%s MODE %s :%s",
725	>	source_p->id, source_p->id, buf);
726		}
727
728		void
729		user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
730		{
731	<	dlink_node *ptr = NULL;
731	>	dlink_node *node = NULL;
732
733		if (!strcmp(target_p->host, hostname))
734		return;
#	Line 1027 | Line 737 | user_set_hostmask(struct Client *target_
737		{
738		case MODE_ADD:
739		AddUMode(target_p, UMODE_HIDDENHOST);
1030	–	AddFlag(target_p, FLAGS_IP_SPOOFING);
740		break;
741		case MODE_DEL:
742		DelUMode(target_p, UMODE_HIDDENHOST);
1034	–
1035	–	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
1036	–	DelFlag(target_p, FLAGS_IP_SPOOFING);
743		break;
744		default: return;
745		}
746
747	<	if (ConfigFileEntry.cycle_on_host_change)
748	<	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
747	>	if (ConfigGeneral.cycle_on_host_change)
748	>	sendto_common_channels_local(target_p, 0, 0, CAP_CHGHOST, ":%s!%s@%s QUIT :Changing hostname",
749		target_p->name, target_p->username, target_p->host);
750
751	<	if (IsUserHostIp(target_p))
752	<	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
751	>	sendto_common_channels_local(target_p, 0, CAP_CHGHOST, 0, ":%s!%s@%s CHGHOST %s %s",
752	>	target_p->name, target_p->username,
753	>	target_p->host, target_p->username, hostname);
754	>
755	>	if (HasFlag(target_p, FLAGS_USERHOST))
756	>	userhost_del(target_p->username, target_p->host, !MyConnect(target_p));
757
758		strlcpy(target_p->host, hostname, sizeof(target_p->host));
759
760	<	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
761	<	SetUserHost(target_p);
760	>	userhost_add(target_p->username, target_p->host, !MyConnect(target_p));
761	>	AddFlag(target_p, FLAGS_USERHOST);
762
763	<	if (MyClient(target_p))
763	>	if (MyConnect(target_p))
764		{
765	<	sendto_one_numeric(target_p, &me, RPL_NEWHOSTIS, target_p->host);
765	>	sendto_one_numeric(target_p, &me, RPL_VISIBLEHOST, target_p->host);
766		clear_ban_cache_client(target_p);
767		}
768
769	<	if (!ConfigFileEntry.cycle_on_host_change)
769	>	if (!ConfigGeneral.cycle_on_host_change)
770		return;
771
772	<	DLINK_FOREACH(ptr, target_p->channel.head)
772	>	DLINK_FOREACH(node, target_p->channel.head)
773		{
774	<	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = { '\0' };
774	>	char modebuf[CMEMBER_STATUS_FLAGS_LEN + 1];
775	>	char nickbuf[CMEMBER_STATUS_FLAGS_LEN * NICKLEN + CMEMBER_STATUS_FLAGS_LEN] = "";
776		char *p = modebuf;
777		int len = 0;
778	<	const struct Membership *ms = ptr->data;
778	>	const struct Membership *member = node->data;
779
780	<	if (has_member_flags(ms, CHFL_CHANOP))
780	>	if (has_member_flags(member, CHFL_CHANOP))
781		{
782		*p++ = 'o';
783		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
784		}
785
786	<	if (has_member_flags(ms, CHFL_HALFOP))
786	>	if (has_member_flags(member, CHFL_HALFOP))
787		{
788		*p++ = 'h';
789		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
790		}
791
792	<	if (has_member_flags(ms, CHFL_VOICE))
792	>	if (has_member_flags(member, CHFL_VOICE))
793		{
794		*p++ = 'v';
795		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
#	Line 1086 | Line 797 | user_set_hostmask(struct Client *target_
797
798		*p = '\0';
799
800	<	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
801	<	target_p->name, target_p->username, target_p->host,
802	<	ms->chptr->chname);
803	<	if (nickbuf[0])
804	<	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
805	<	target_p->servptr->name, ms->chptr->chname,
806	<	modebuf, nickbuf);
800	>	sendto_channel_local(target_p, member->chptr, 0, CAP_EXTENDED_JOIN, CAP_CHGHOST, ":%s!%s@%s JOIN %s %s :%s",
801	>	target_p->name, target_p->username,
802	>	target_p->host, member->chptr->name,
803	>	target_p->account, target_p->info);
804	>	sendto_channel_local(target_p, member->chptr, 0, 0, CAP_EXTENDED_JOIN | CAP_CHGHOST, ":%s!%s@%s JOIN :%s",
805	>	target_p->name, target_p->username,
806	>	target_p->host, member->chptr->name);
807
808	+	if (nickbuf[0])
809	+	sendto_channel_local(target_p, member->chptr, 0, 0, CAP_CHGHOST, ":%s MODE %s +%s %s",
810	+	target_p->servptr->name, member->chptr->name,
811	+	modebuf, nickbuf);
812		}
813
814		if (target_p->away[0])
815	<	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
815	>	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY, CAP_CHGHOST,
816		":%s!%s@%s AWAY :%s",
817		target_p->name, target_p->username,
818		target_p->host, target_p->away);
819		}
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)