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 1976 by michael, Wed May 8 19:33:06 2013 UTC vs.
ircd-hybrid/trunk/src/user.c (file contents), Revision 7570 by michael, Tue May 24 16:29:23 2016 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  s_user.c: User related functions.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2002 by the past and present ircd coders, and others.
4	>	*  Copyright (c) 1997-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 16 | 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	<	*  $Id$
20	>	*/
21	>
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"
28	<	#include "s_misc.h"
29	>	#include "user.h"
30		#include "channel.h"
31		#include "channel_mode.h"
32		#include "client.h"
32	–	#include "fdlist.h"
33		#include "hash.h"
34	+	#include "id.h"
35		#include "irc_string.h"
35	–	#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"
44	–	#include "supported.h"
45	–	#include "whowas.h"
45		#include "memory.h"
46		#include "packet.h"
47		#include "rng_mt.h"
48		#include "userhost.h"
49	<	#include "hook.h"
51	<	#include "s_misc.h"
49	>	#include "misc.h"
50		#include "parse.h"
51		#include "watch.h"
52	<
53	<
56	<	struct Callback *entering_umode_cb = NULL;
57	<	struct Callback *umode_cb = NULL;
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 *);
63	<	static int check_xline(struct Client *);
64	<	static void introduce_client(struct Client *);
65	<	static const char *uid_get(void);
66	<
67	<	/* Used for building up the isupport string,
68	<	* used with init_isupport, add_isupport, delete_isupport
69	<	*/
70	<
71	<	struct Isupport
57	>	const struct user_modes *umode_map[256];
58	>	const struct user_modes  umode_tab[] =
59		{
60	<	dlink_node node;
61	<	char *name;
62	<	char *options;
63	<	int number;
64	<	};
65	<
66	<	static dlink_list support_list = { NULL, NULL, 0 };
67	<	MessageFile *isupportFile;
68	<
69	<	/* memory is cheap. map 0-255 to equivalent mode */
70	<	unsigned int user_modes[256] =
71	<	{
72	<	/* 0x00 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x0F */
73	<	/* 0x10 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x1F */
74	<	/* 0x20 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x2F */
75	<	/* 0x30 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x3F */
76	<	0,                  /* @ */
77	<	0,                  /* A */
78	<	0,                  /* B */
79	<	UMODE_CCONN_FULL,   /* C */
80	<	UMODE_DEAF,         /* D */
81	<	0,                  /* E */
82	<	UMODE_FARCONNECT,   /* F */
83	<	UMODE_SOFTCALLERID, /* G */
84	<	UMODE_HIDDEN,       /* H */
85	<	0,                  /* I */
86	<	0,                  /* J */
87	<	0,                  /* K */
88	<	0,                  /* L */
102	<	0,                  /* M */
103	<	0,                  /* N */
104	<	0,                  /* O */
105	<	0,                  /* P */
106	<	0,                  /* Q */
107	<	UMODE_REGONLY,      /* R */
108	<	0,                  /* S */
109	<	0,                  /* T */
110	<	0,                  /* U */
111	<	0,                  /* V */
112	<	0,                  /* W */
113	<	0,                  /* X */
114	<	0,                  /* Y */
115	<	0,                  /* Z 0x5A */
116	<	0, 0, 0, 0, 0,      /* 0x5F   */
117	<	0,                  /* 0x60   */
118	<	UMODE_ADMIN,        /* a */
119	<	UMODE_BOTS,         /* b */
120	<	UMODE_CCONN,        /* c */
121	<	UMODE_DEBUG,        /* d */
122	<	UMODE_EXTERNAL,     /* e */
123	<	UMODE_FULL,         /* f */
124	<	UMODE_CALLERID,     /* g */
125	<	0,                  /* h */
126	<	UMODE_INVISIBLE,    /* i */
127	<	UMODE_REJ,          /* j */
128	<	UMODE_SKILL,        /* k */
129	<	UMODE_LOCOPS,       /* l */
130	<	0,                  /* m */
131	<	UMODE_NCHANGE,      /* n */
132	<	UMODE_OPER,         /* o */
133	<	0,                  /* p */
134	<	0,                  /* q */
135	<	UMODE_REGISTERED,   /* r */
136	<	UMODE_SERVNOTICE,   /* s */
137	<	0,                  /* t */
138	<	UMODE_UNAUTH,       /* u */
139	<	0,                  /* v */
140	<	UMODE_WALLOP,       /* w */
141	<	0,                  /* x */
142	<	UMODE_SPY,          /* y */
143	<	UMODE_OPERWALL,     /* z      0x7A */
144	<	0,0,0,0,0,          /* 0x7B - 0x7F */
145	<
146	<	/* 0x80 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x8F */
147	<	/* 0x90 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x9F */
148	<	/* 0xA0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xAF */
149	<	/* 0xB0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xBF */
150	<	/* 0xC0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xCF */
151	<	/* 0xD0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xDF */
152	<	/* 0xE0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xEF */
153	<	/* 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		{
159	–	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 173 | Line 109 | assemble_umode_buffer(void)
109		* side effects - display to client user counts etc.
110		*/
111		void
112	<	show_lusers(struct Client *source_p)
112	>	show_lusers(struct Client *source_p)
113		{
114	<	const char *from, *to;
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_server_list));
117	>	else
118	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
119	>	Count.invisi, 1);
120	>
121	>	if (Count.oper)
122	>	sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper);
123	>
124	>	if (dlink_list_length(&unknown_list))
125	>	sendto_one_numeric(source_p, &me, RPL_LUSERUNKNOWN, dlink_list_length(&unknown_list));
126
127	<	if (!MyConnect(source_p) && IsCapable(source_p->from, CAP_TS6) && HasID(source_p))
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		{
132	<	from = me.id;
133	<	to = source_p->id;
132	>	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.local, Count.myserver);
133	>	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.local, Count.max_loc);
134		}
135		else
136		{
137	<	from = me.name;
138	<	to = source_p->name;
137	>	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.total, 0);
138	>	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.total, Count.max_tot);
139		}
140
141	+	sendto_one_numeric(source_p, &me, RPL_GLOBALUSERS, Count.total, Count.max_tot);
142	+
143		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
144	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT),
145	<	from, to, (Count.total-Count.invisi),
194	<	Count.invisi, dlink_list_length(&global_serv_list));
195	<	else
196	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT), from, to,
197	<	(Count.total-Count.invisi), Count.invisi, 1);
144	>	sendto_one_numeric(source_p, &me, RPL_STATSCONN, Count.max_loc_con,
145	>	Count.max_loc_cli, Count.totalrestartcount);
146
147	<	if (Count.oper > 0)
148	<	sendto_one(source_p, form_str(RPL_LUSEROP),
201	<	from, to, Count.oper);
202	<
203	<	if (dlink_list_length(&unknown_list) > 0)
204	<	sendto_one(source_p, form_str(RPL_LUSERUNKNOWN),
205	<	from, to, dlink_list_length(&unknown_list));
206	<
207	<	if (dlink_list_length(&global_channel_list) > 0)
208	<	sendto_one(source_p, form_str(RPL_LUSERCHANNELS),
209	<	from, to, dlink_list_length(&global_channel_list));
147	>	if (Count.local > Count.max_loc_cli)
148	>	Count.max_loc_cli = Count.local;
149
150	<	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
150	>	if ((Count.local + Count.myserver) > Count.max_loc_con)
151	>	Count.max_loc_con = Count.local + Count.myserver;
152	>	}
153	>
154	>	/* report_and_set_user_flags()
155	>	*
156	>	* inputs       - pointer to source_p
157	>	*              - pointer to conf for this user
158	>	* output       - NONE
159	>	* side effects - Report to user any special flags
160	>	*                they are getting, and set them.
161	>	*/
162	>	static void
163	>	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
164	>	{
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	<	sendto_one(source_p, form_str(RPL_LUSERME),
192	<	from, to, Count.local, Count.myserver);
215	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
216	<	from, to, Count.local, Count.max_loc);
191	>	AddFlag(source_p, FLAGS_NOLIMIT);
192	>	sendto_one_notice(source_p, &me, ":*** You are exempt from user limits");
193		}
194	+
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	+	/* 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	+	if (MyConnect(source_p))
217	+	send_umode(source_p, source_p, 0, ubuf);
218		else
219	+	send_umode(NULL, source_p, 0, ubuf);
220	+
221	+	watch_check_hash(source_p, RPL_LOGON);
222	+
223	+	if (ubuf[0] == '\0')
224		{
225	<	sendto_one(source_p, form_str(RPL_LUSERME),
226	<	from, to, Count.total, 0);
222	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
223	<	from, to, Count.total, Count.max_tot);
225	>	ubuf[0] = '+';
226	>	ubuf[1] = '\0';
227		}
228
229	<	sendto_one(source_p, form_str(RPL_GLOBALUSERS),
230	<	from, to, Count.total, Count.max_tot);
229	>	DLINK_FOREACH(node, local_server_list.head)
230	>	{
231	>	struct Client *server = node->data;
232
233	<	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
234	<	sendto_one(source_p, form_str(RPL_STATSCONN), from, to,
231	<	Count.max_loc_con, Count.max_loc_cli, Count.totalrestartcount);
233	>	if (server == source_p->from)
234	>	continue;
235
236	<	if (Count.local > Count.max_loc_cli)
237	<	Count.max_loc_cli = Count.local;
236	>	sendto_one(server, ":%s UID %s %u %ju %s %s %s %s %s %s :%s",
237	>	source_p->servptr->id,
238	>	source_p->name, source_p->hopcount+1,
239	>	source_p->tsinfo,
240	>	ubuf, source_p->username, source_p->host,
241	>	source_p->sockhost, source_p->id,
242	>	source_p->account,
243	>	source_p->info);
244
245	<	if ((Count.local + Count.myserver) > Count.max_loc_con)
246	<	Count.max_loc_con = Count.local + Count.myserver;
245	>	if (!EmptyString(source_p->certfp))
246	>	sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
247	>	}
248		}
249
250	<	/* show_isupport()
250	>	/* user_welcome()
251		*
252	<	* inputs       - pointer to client
252	>	* inputs       - client pointer to client to welcome
253		* output       - NONE
254	<	* side effects - display to client what we support (for them)
254	>	* side effects -
255		*/
256	<	void
257	<	show_isupport(struct Client *source_p)
256	>	static void
257	>	user_welcome(struct Client *source_p)
258		{
259	<	send_message_file(source_p, isupportFile);
259	>	static const char built_date[] = __DATE__ " at " __TIME__;
260	>
261	>	if (HasFlag(source_p, FLAGS_SSL))
262	>	{
263	>	AddUMode(source_p, UMODE_SSL);
264	>	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
265	>	tls_get_cipher(&source_p->connection->fd.ssl));
266	>	}
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	<	/*
281	<	** register_local_user
282	<	**      This function is called when both NICK and USER messages
283	<	**      have been accepted for the client, in whatever order. Only
284	<	**      after this, is the USER message propagated.
285	<	**
286	<	**      NICK's must be propagated at once when received, although
287	<	**      it would be better to delay them too until full info is
288	<	**      available. Doing it is not so simple though, would have
289	<	**      to implement the following:
290	<	**
291	<	**      (actually it has been implemented already for a while) -orabidoo
292	<	**
293	<	**      1) user telnets in and gives only "NICK foobar" and waits
294	<	**      2) another user far away logs in normally with the nick
295	<	**         "foobar" (quite legal, as this server didn't propagate
296	<	**         it).
297	<	**      3) now this server gets nick "foobar" from outside, but
298	<	**         has alread the same defined locally. Current server
299	<	**         would just issue "KILL foobar" to clean out dups. But,
300	<	**         this is not fair. It should actually request another
301	<	**         nick from local user or kill him/her...
302	<	*/
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	>	const struct GecosItem *gecos = NULL;
290	>
291	>	if (HasFlag(source_p, FLAGS_EXEMPTXLINE))
292	>	return 0;
293	>
294	>	if ((gecos = gecos_find(source_p->info, match)))
295	>	{
296	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
297	>	"X-line Rejecting [%s] [%s], user %s [%s]",
298	>	source_p->info, gecos->reason,
299	>	get_client_name(source_p, HIDE_IP),
300	>	source_p->sockhost);
301	>
302	>	++ServerStats.is_ref;
303	>	exit_client(source_p, "Bad user info");
304	>	return 1;
305	>	}
306	>
307	>	return 0;
308	>	}
309	>
310	>	/*! \brief This function is called when both NICK and USER messages
311	>	*      have been accepted for the client, in whatever order. Only
312	>	*      after this, is the UID message propagated.
313	>	* \param source_p Pointer to given client to introduce
314	>	*/
315		void
316		register_local_user(struct Client *source_p)
317		{
278	–	const char *id = NULL;
318		const struct MaskItem *conf = NULL;
319
281	–	assert(source_p != NULL);
320		assert(source_p == source_p->from);
321		assert(MyConnect(source_p));
322	<	assert(!source_p->localClient->registration);
323	<
286	<	ClearCap(source_p, CAP_TS6);
322	>	assert(IsUnknown(source_p));
323	>	assert(!source_p->connection->registration);
324
325	<	if (ConfigFileEntry.ping_cookie)
325	>	if (ConfigGeneral.ping_cookie)
326		{
327	<	if (!IsPingSent(source_p) && source_p->localClient->random_ping == 0)
327	>	if (!HasFlag(source_p, FLAGS_PINGSENT) && !source_p->connection->random_ping)
328		{
329		do
330	<	source_p->localClient->random_ping = genrand_int32();
331	<	while (!source_p->localClient->random_ping);
330	>	source_p->connection->random_ping = genrand_int32();
331	>	while (!source_p->connection->random_ping);
332
333	<	sendto_one(source_p, "PING :%u",
334	<	source_p->localClient->random_ping);
298	<	SetPingSent(source_p);
333	>	sendto_one(source_p, "PING :%u", source_p->connection->random_ping);
334	>	AddFlag(source_p, FLAGS_PINGSENT);
335		return;
336		}
337
338	<	if (!HasPingCookie(source_p))
338	>	if (!HasFlag(source_p, FLAGS_PING_COOKIE))
339		return;
340		}
341
342	<	source_p->localClient->last_privmsg = CurrentTime;
342	>	source_p->connection->last_privmsg = CurrentTime;
343		/* Straight up the maximum rate of flooding... */
344	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
344	>	source_p->connection->allow_read = MAX_FLOOD_BURST;
345
346		if (!check_client(source_p))
347		return;
348
349	<	if (valid_hostname(source_p->host) == 0)
349	>	if (!valid_hostname(source_p->host))
350		{
351	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You have an illegal "
352	<	"character in your hostname", me.name, source_p->name);
353	<	strlcpy(source_p->host, source_p->sockhost,
318	<	sizeof(source_p->host));
351	>	sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
352	>	"character in your hostname");
353	>	strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
354		}
355
356	<	conf = source_p->localClient->confs.head->data;
356	>	conf = source_p->connection->confs.head->data;
357
358	<	if (!IsGotId(source_p))
358	>	if (!HasFlag(source_p, FLAGS_GOTID))
359		{
360	<	char username[USERLEN + 1];
326	<	const char *p = username;
360	>	char username[USERLEN + 1] = "";
361		unsigned int i = 0;
362
363		if (IsNeedIdentd(conf))
364		{
365		++ServerStats.is_ref;
366	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You need to install "
367	<	"identd to use this server", me.name, source_p->name);
368	<	exit_client(source_p, &me, "Install identd");
366	>	sendto_one_notice(source_p, &me, ":*** Notice -- You need to install "
367	>	"identd to use this server");
368	>	exit_client(source_p, "Install identd");
369		return;
370		}
371
#	Line 340 | Line 374 | register_local_user(struct Client *sourc
374		if (!IsNoTilde(conf))
375		source_p->username[i++] = '~';
376
377	<	for (; *p && i < USERLEN; ++p)
378	<	if (*p != '[')
345	<	source_p->username[i++] = *p;
377	>	for (const char *p = username; *p && i < USERLEN; ++p)
378	>	source_p->username[i++] = *p;
379
380		source_p->username[i] = '\0';
381		}
382
383	<	/* password check */
383	>	/* Password check */
384		if (!EmptyString(conf->passwd))
385		{
386	<	const char *pass = source_p->localClient->passwd;
354	<
355	<	if (!match_conf_password(pass, conf))
386	>	if (!match_conf_password(source_p->connection->password, conf))
387		{
388		++ServerStats.is_ref;
389	<	sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
390	<	me.name, source_p->name);
391	<	exit_client(source_p, &me, "Bad Password");
389	>
390	>	sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
391	>	exit_client(source_p, "Bad Password");
392		return;
393		}
394		}
395
396	<	/* don't free source_p->localClient->passwd here - it can be required
397	<	* by masked /stats I if there are auth{} blocks with need_password = no;
396	>	/*
397	>	* Don't free source_p->connection->password here - it can be required
398	>	* by masked /stats I if there are auth {} blocks with need_password = no;
399		* --adx
400		*/
401
402	<	/* report if user has &^>= etc. and set flags as needed in source_p */
402	>	/*
403	>	* Report if user has &^>= etc. and set flags as needed in source_p
404	>	*/
405		report_and_set_user_flags(source_p, conf);
406
407		if (IsDead(source_p))
408		return;
409
410	<	/* Limit clients -
410	>	/*
411	>	* Limit clients -
412		* We want to be able to have servers and F-line clients
413		* connect, so save room for "buffer" connections.
414		* Smaller servers may want to decrease this, and it should
415		* probably be just a percentage of the MAXCLIENTS...
416		*   -Taner
417		*/
418	<	/* Except "F:" clients */
419	<	if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
385	<	(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
418	>	if ((Count.local >= GlobalSetOptions.maxclients + MAX_BUFFER) ||
419	>	(Count.local >= GlobalSetOptions.maxclients && !HasFlag(source_p, FLAGS_NOLIMIT)))
420		{
421		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
422		"Too many clients, rejecting %s[%s].",
423		source_p->name, source_p->host);
424		++ServerStats.is_ref;
425	<	exit_client(source_p, &me, "Sorry, server is full - try later");
425	>	exit_client(source_p, "Sorry, server is full - try later");
426		return;
427		}
428
429	<	/* valid user name check */
396	<	if (valid_username(source_p->username) == 0)
429	>	if (!valid_username(source_p->username, 1))
430		{
431	<	char tmpstr2[IRCD_BUFSIZE];
431	>	char buf[IRCD_BUFSIZE] = "";
432
433		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
434		"Invalid username: %s (%s@%s)",
435		source_p->name, source_p->username, source_p->host);
436		++ServerStats.is_ref;
437	<	snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
438	<	source_p->username);
406	<	exit_client(source_p, &me, tmpstr2);
437	>	snprintf(buf, sizeof(buf), "Invalid username [%s]", source_p->username);
438	>	exit_client(source_p, buf);
439		return;
440		}
441
442		if (check_xline(source_p))
443		return;
444
445	<	while (hash_find_id((id = uid_get())) != NULL)
445	>	const char *id;
446	>	while (hash_find_id((id = uid_get())))
447		;
448
449		strlcpy(source_p->id, id, sizeof(source_p->id));
#	Line 419 | Line 452 | register_local_user(struct Client *sourc
452		sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
453		"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
454		source_p->name, source_p->username, source_p->host,
455	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
456	<	"255.255.255.255" : source_p->sockhost,
424	<	get_client_class(&source_p->localClient->confs),
455	>	source_p->sockhost,
456	>	get_client_class(&source_p->connection->confs),
457		source_p->info, source_p->id);
458
459	<	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL, SEND_NOTICE,
428	<	"CLICONN %s %s %s %s %s %s %s 0 %s",
429	<	source_p->name, source_p->username, source_p->host,
430	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
431	<	"255.255.255.255" : source_p->sockhost,
432	<	get_client_class(&source_p->localClient->confs),
433	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
434	<	"<hidden>" : source_p->localClient->client_host,
435	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
436	<	"<hidden>" : source_p->localClient->client_server,
437	<	source_p->info);
438	<
439	<
440	<	if (ConfigFileEntry.invisible_on_connect)
459	>	if (ConfigGeneral.invisible_on_connect)
460		{
461		AddUMode(source_p, UMODE_INVISIBLE);
462		++Count.invisi;
463		}
464
465	<	if ((++Count.local) > Count.max_loc)
465	>	if (++Count.local > Count.max_loc)
466		{
467		Count.max_loc = Count.local;
468
469		if (!(Count.max_loc % 10))
470	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
471	<	"New Max Local Clients: %d",
470	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
471	>	"New maximum local client connections: %u",
472		Count.max_loc);
473		}
474
456	–	/* Increment our total user count here */
475		if (++Count.total > Count.max_tot)
476		Count.max_tot = Count.total;
477		++Count.totalrestartcount;
#	Line 461 | Line 479 | register_local_user(struct Client *sourc
479		assert(source_p->servptr == &me);
480		SetClient(source_p);
481		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
482	<
465	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
482	>	dlinkAdd(source_p, &source_p->node, &global_client_list);
483
484		assert(dlinkFind(&unknown_list, source_p));
485
486	<	dlink_move_node(&source_p->localClient->lclient_node,
486	>	dlink_move_node(&source_p->connection->lclient_node,
487		&unknown_list, &local_client_list);
488
489		user_welcome(source_p);
490	<	add_user_host(source_p->username, source_p->host, 0);
491	<	SetUserHost(source_p);
490	>	userhost_add(source_p->username, source_p->host, 0);
491	>	AddFlag(source_p, FLAGS_USERHOST);
492
493		introduce_client(source_p);
494		}
#	Line 482 | Line 499 | register_local_user(struct Client *sourc
499		*              - username to register as
500		*              - host name to register as
501		*              - server name
485	–	*              - realname (gecos)
502		* output       - NONE
503		* side effects - This function is called when a remote client
504		*                is introduced by a server.
505		*/
506		void
507	<	register_remote_user(struct Client *source_p,
492	<	const char *username, const char *host, const char *server,
493	<	const char *realname)
507	>	register_remote_user(struct Client *source_p)
508		{
509	<	struct Client *target_p = NULL;
496	<
497	<	assert(source_p != NULL);
498	<	assert(source_p->username != username);
499	<
500	<	strlcpy(source_p->host, host, sizeof(source_p->host));
501	<	strlcpy(source_p->username, username, sizeof(source_p->username));
502	<
503	<	/*
504	<	* coming from another server, take the servers word for it
505	<	*/
506	<	source_p->servptr = hash_find_server(server);
507	<
508	<	/*
509	<	* Super GhostDetect:
510	<	* If we can't find the server the user is supposed to be on,
511	<	* then simply blow the user away.        -Taner
512	<	*/
513	<	if (source_p->servptr == NULL)
514	<	{
515	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
516	<	"No server %s for user %s[%s@%s] from %s",
517	<	server, source_p->name, source_p->username,
518	<	source_p->host, source_p->from->name);
519	<	kill_client(source_p->from, source_p, "%s (Server doesn't exist)", me.name);
520	<
521	<	AddFlag(source_p, FLAGS_KILLED);
522	<	exit_client(source_p, &me, "Ghosted Client");
523	<	return;
524	<	}
509	>	const struct Client *target_p = NULL;
510
511		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
512		{
#	Line 530 | Line 515 | register_remote_user(struct Client *sour
515		source_p->from->name, source_p->name, source_p->username,
516		source_p->host, source_p->servptr->name,
517		target_p->name, target_p->from->name);
518	<	kill_client(source_p->from, source_p,
519	<	"%s (NICK from wrong direction (%s != %s))",
520	<	me.name, source_p->servptr->name, target_p->from->name);
518	>	sendto_one(source_p->from,
519	>	":%s KILL %s :%s (UID from wrong direction (%s != %s))",
520	>	me.id, source_p->id, me.name, source_p->servptr->name,
521	>	target_p->from->name);
522	>
523		AddFlag(source_p, FLAGS_KILLED);
524	<	exit_client(source_p, &me, "USER server wrong direction");
524	>	exit_client(source_p, "UID server wrong direction");
525		return;
526		}
527
#	Line 545 | Line 532 | register_remote_user(struct Client *sour
532		if (HasFlag(source_p->servptr, FLAGS_SERVICE))
533		AddFlag(source_p, FLAGS_SERVICE);
534
548	–	/* Increment our total user count here */
535		if (++Count.total > Count.max_tot)
536		Count.max_tot = Count.total;
537
538		SetClient(source_p);
539		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
540	<	add_user_host(source_p->username, source_p->host, 1);
541	<	SetUserHost(source_p);
540	>	dlinkAdd(source_p, &source_p->node, &global_client_list);
541	>	userhost_add(source_p->username, source_p->host, 1);
542	>	AddFlag(source_p, FLAGS_USERHOST);
543
544		if (HasFlag(source_p->servptr, FLAGS_EOB))
545		sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
546	<	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
546	>	"Client connecting at %s: %s (%s@%s) [%s] [%s] <%s>",
547		source_p->servptr->name,
548		source_p->name, source_p->username, source_p->host,
549	<	source_p->info, source_p->id);
549	>	source_p->sockhost, source_p->info, source_p->id);
550
551		introduce_client(source_p);
552		}
553
567	–	/* introduce_client()
568	–	*
569	–	* inputs       - source_p
570	–	* output       - NONE
571	–	* side effects - This common function introduces a client to the rest
572	–	*                of the net, either from a local client connect or
573	–	*                from a remote connect.
574	–	*/
575	–	static void
576	–	introduce_client(struct Client *source_p)
577	–	{
578	–	dlink_node *server_node = NULL;
579	–	static char ubuf[12];
580	–
581	–	if (MyClient(source_p))
582	–	send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
583	–	else
584	–	send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
585	–
586	–	watch_check_hash(source_p, RPL_LOGON);
587	–
588	–	if (*ubuf == '\0')
589	–	{
590	–	ubuf[0] = '+';
591	–	ubuf[1] = '\0';
592	–	}
593	–
594	–	DLINK_FOREACH(server_node, serv_list.head)
595	–	{
596	–	struct Client *server = server_node->data;
597	–
598	–	if (server == source_p->from)
599	–	continue;
600	–
601	–	if (IsCapable(server, CAP_SVS))
602	–	{
603	–	if (IsCapable(server, CAP_TS6) && HasID(source_p))
604	–	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
605	–	source_p->servptr->id,
606	–	source_p->name, source_p->hopcount+1,
607	–	(unsigned long)source_p->tsinfo,
608	–	ubuf, source_p->username, source_p->host,
609	–	(MyClient(source_p) && IsIPSpoof(source_p)) ?
610	–	"0" : source_p->sockhost, source_p->id,
611	–	source_p->svid,
612	–	source_p->info);
613	–	else
614	–	sendto_one(server, "NICK %s %d %lu %s %s %s %s %s :%s",
615	–	source_p->name, source_p->hopcount+1,
616	–	(unsigned long)source_p->tsinfo,
617	–	ubuf, source_p->username, source_p->host,
618	–	source_p->servptr->name, source_p->svid,
619	–	source_p->info);
620	–
621	–	}
622	–	else
623	–	{
624	–	if (IsCapable(server, CAP_TS6) && HasID(source_p))
625	–	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
626	–	source_p->servptr->id,
627	–	source_p->name, source_p->hopcount+1,
628	–	(unsigned long)source_p->tsinfo,
629	–	ubuf, source_p->username, source_p->host,
630	–	(MyClient(source_p) && IsIPSpoof(source_p)) ?
631	–	"0" : source_p->sockhost, source_p->id, source_p->info);
632	–	else
633	–	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
634	–	source_p->name, source_p->hopcount+1,
635	–	(unsigned long)source_p->tsinfo,
636	–	ubuf, source_p->username, source_p->host,
637	–	source_p->servptr->name, source_p->info);
638	–	}
639	–	}
640	–	}
641	–
554		/* valid_hostname()
555		*
556		* Inputs       - pointer to hostname
#	Line 653 | Line 565 | valid_hostname(const char *hostname)
565		{
566		const char *p = hostname;
567
568	<	assert(p != NULL);
568	>	assert(p);
569
570	<	if (*p == '.' || *p == ':')
570	>	if (EmptyString(p) || *p == '.' || *p == ':')
571		return 0;
572
573		for (; *p; ++p)
#	Line 677 | Line 589 | valid_hostname(const char *hostname)
589		* style of username
590		*/
591		int
592	<	valid_username(const char *username)
592	>	valid_username(const char *username, const int local)
593		{
682	–	int dots      = 0;
594		const char *p = username;
595
596	<	assert(p != NULL);
596	>	assert(p);
597
598		if (*p == '~')
599		++p;
600
601	<	/* reject usernames that don't start with an alphanum
601	>	/*
602	>	* Reject usernames that don't start with an alphanum
603		* i.e. reject jokers who have '-@somehost' or '.@somehost'
604		* or "-hi-@somehost", "h-----@somehost" would still be accepted.
605		*/
606		if (!IsAlNum(*p))
607		return 0;
608
609	<	while (*++p)
609	>	if (local)
610		{
611	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
611	>	unsigned int dots = 0;
612	>
613	>	while (*++p)
614		{
615	<	if (++dots > ConfigFileEntry.dots_in_ident)
616	<	return 0;
617	<	if (!IsUserChar(*(p + 1)))
615	>	if (*p == '.' && ConfigGeneral.dots_in_ident)
616	>	{
617	>	if (++dots > ConfigGeneral.dots_in_ident)
618	>	return 0;
619	>	if (!IsUserChar(*(p + 1)))
620	>	return 0;
621	>	}
622	>	else if (!IsUserChar(*p))
623		return 0;
624		}
625	<	else if (!IsUserChar(*p))
626	<	return 0;
625	>	}
626	>	else
627	>	{
628	>	while (*++p)
629	>	if (!IsUserChar(*p))
630	>	return 0;
631		}
632
633	<	return 1;
633	>	return p - username <= USERLEN;
634		}
635
636		/* clean_nick_name()
#	Line 721 | Line 644 | int
644		valid_nickname(const char *nickname, const int local)
645		{
646		const char *p = nickname;
724	–	assert(nickname && *nickname);
647
648	<	/* nicks can't start with a digit or - or be 0 length */
649	<	/* This closer duplicates behaviour of hybrid-6 */
650	<	if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
648	>	assert(p);
649	>
650	>	/*
651	>	* Nicks can't start with a digit or - or be 0 length.
652	>	*/
653	>	if (EmptyString(p) || *p == '-' || (IsDigit(*p) && local))
654		return 0;
655
656		for (; *p; ++p)
#	Line 735 | Line 660 | valid_nickname(const char *nickname, con
660		return p - nickname <= NICKLEN;
661		}
662
738	–	/* report_and_set_user_flags()
739	–	*
740	–	* inputs       - pointer to source_p
741	–	*              - pointer to conf for this user
742	–	* output       - NONE
743	–	* side effects - Report to user any special flags
744	–	*                they are getting, and set them.
745	–	*/
746	–	static void
747	–	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
748	–	{
749	–	/* If this user is being spoofed, tell them so */
750	–	if (IsConfDoSpoofIp(conf))
751	–	{
752	–	sendto_one(source_p,
753	–	":%s NOTICE %s :*** Spoofing your IP. congrats.",
754	–	me.name, source_p->name);
755	–	}
756	–
757	–	/* If this user is in the exception class, Set it "E lined" */
758	–	if (IsConfExemptKline(conf))
759	–	{
760	–	SetExemptKline(source_p);
761	–	sendto_one(source_p,
762	–	":%s NOTICE %s :*** You are exempt from K/D/G lines. congrats.",
763	–	me.name, source_p->name);
764	–	}
765	–
766	–	/* The else here is to make sure that G line exempt users
767	–	* do not get noticed twice.
768	–	*/
769	–	else if (IsConfExemptGline(conf))
770	–	{
771	–	SetExemptGline(source_p);
772	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines.",
773	–	me.name, source_p->name);
774	–	}
775	–
776	–	if (IsConfExemptResv(conf))
777	–	{
778	–	SetExemptResv(source_p);
779	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs.",
780	–	me.name, source_p->name);
781	–	}
782	–
783	–	/* If this user is exempt from user limits set it "F lined" */
784	–	if (IsConfExemptLimits(conf))
785	–	{
786	–	SetExemptLimits(source_p);
787	–	sendto_one(source_p,
788	–	":%s NOTICE %s :*** You are exempt from user limits. congrats.",
789	–	me.name,source_p->name);
790	–	}
791	–
792	–	if (IsConfCanFlood(conf))
793	–	{
794	–	SetCanFlood(source_p);
795	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
796	–	"protection, aren't you fearsome.",
797	–	me.name, source_p->name);
798	–	}
799	–	}
800	–
801	–	/* change_simple_umode()
802	–	*
803	–	* this callback can be hooked to allow special handling of
804	–	* certain usermodes
805	–	*/
806	–	static void *
807	–	change_simple_umode(va_list args)
808	–	{
809	–	struct Client *client_p;
810	–	struct Client *source_p;
811	–	int what;
812	–	unsigned int flag;
813	–
814	–	client_p = va_arg(args, struct Client *);
815	–	source_p = va_arg(args, struct Client *);
816	–	what = va_arg(args, int);
817	–	flag = va_arg(args, unsigned int);
818	–
819	–	if (what == MODE_ADD)
820	–	AddUMode(source_p, flag);
821	–	else
822	–	DelUMode(source_p, flag);
823	–
824	–	return NULL;
825	–	}
826	–
827	–	/* set_user_mode()
828	–	*
829	–	* added 15/10/91 By Darren Reed.
830	–	* parv[0] - sender
831	–	* parv[1] - username to change mode for
832	–	* parv[2] - modes to change
833	–	*/
834	–	void
835	–	set_user_mode(struct Client *client_p, struct Client *source_p,
836	–	const int parc, char *parv[])
837	–	{
838	–	unsigned int flag, setflags;
839	–	char **p, *m, buf[IRCD_BUFSIZE];
840	–	struct Client *target_p;
841	–	int what = MODE_ADD, badflag = 0, i;
842	–
843	–	assert(!(parc < 2));
844	–
845	–	if ((target_p = find_person(client_p, parv[1])) == NULL)
846	–	{
847	–	if (MyConnect(source_p))
848	–	sendto_one(source_p, form_str(ERR_NOSUCHCHANNEL),
849	–	me.name, source_p->name, parv[1]);
850	–	return;
851	–	}
852	–
853	–	if (source_p != target_p)
854	–	{
855	–	sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
856	–	me.name, source_p->name);
857	–	return;
858	–	}
859	–
860	–	if (parc < 3)
861	–	{
862	–	m = buf;
863	–	*m++ = '+';
864	–
865	–	for (i = 0; i < 128; i++)
866	–	if (HasUMode(source_p, user_modes[i]))
867	–	*m++ = (char)i;
868	–	*m = '\0';
869	–
870	–	sendto_one(source_p, form_str(RPL_UMODEIS),
871	–	me.name, source_p->name, buf);
872	–	return;
873	–	}
874	–
875	–	execute_callback(entering_umode_cb, client_p, source_p);
876	–
877	–	/* find flags already set for user */
878	–	setflags = source_p->umodes;
879	–
880	–	/* parse mode change string(s) */
881	–	for (p = &parv[2]; p && *p; p++)
882	–	{
883	–	for (m = *p; *m; m++)
884	–	{
885	–	switch (*m)
886	–	{
887	–	case '+':
888	–	what = MODE_ADD;
889	–	break;
890	–	case '-':
891	–	what = MODE_DEL;
892	–	break;
893	–	case 'o':
894	–	if (what == MODE_ADD)
895	–	{
896	–	if (IsServer(client_p) && !HasUMode(source_p, UMODE_OPER))
897	–	{
898	–	++Count.oper;
899	–	SetOper(source_p);
900	–	}
901	–	}
902	–	else
903	–	{
904	–	/* Only decrement the oper counts if an oper to begin with
905	–	* found by Pat Szuta, Perly , perly@xnet.com
906	–	*/
907	–	if (!HasUMode(source_p, UMODE_OPER))
908	–	break;
909	–
910	–	ClearOper(source_p);
911	–	Count.oper--;
912	–
913	–	if (MyConnect(source_p))
914	–	{
915	–	dlink_node *dm;
916	–
917	–	detach_conf(source_p, CONF_OPER);
918	–	ClrOFlag(source_p);
919	–	DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
920	–
921	–	if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
922	–	free_dlink_node(dm);
923	–	}
924	–	}
925	–
926	–	break;
927	–
928	–	/* we may not get these,
929	–	* but they shouldnt be in default
930	–	*/
931	–	case 'r':
932	–	case ' ' :
933	–	case '\n':
934	–	case '\r':
935	–	case '\t':
936	–	break;
937	–
938	–	default:
939	–	if ((flag = user_modes[(unsigned char)*m]))
940	–	{
941	–	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
942	–	(ConfigFileEntry.oper_only_umodes & flag))
943	–	{
944	–	badflag = 1;
945	–	}
946	–	else
947	–	execute_callback(umode_cb, client_p, source_p, what, flag);
948	–	}
949	–	else
950	–	{
951	–	if (MyConnect(source_p))
952	–	badflag = 1;
953	–	}
954	–
955	–	break;
956	–	}
957	–	}
958	–	}
959	–
960	–	if (badflag)
961	–	sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
962	–	me.name, source_p->name);
963	–
964	–	if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
965	–	!HasOFlag(source_p, OPER_FLAG_ADMIN))
966	–	{
967	–	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
968	–	me.name, source_p->name);
969	–	DelUMode(source_p, UMODE_ADMIN);
970	–	}
971	–
972	–	if (!(setflags & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
973	–	++Count.invisi;
974	–	if ((setflags & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
975	–	--Count.invisi;
976	–
977	–	/*
978	–	* compare new flags with old flags and send string which
979	–	* will cause servers to update correctly.
980	–	*/
981	–	send_umode_out(client_p, source_p, setflags);
982	–	}
983	–
663		/* send_umode()
664		* send the MODE string for user (user) to connection client_p
665		* -avalon
#	Line 988 | Line 667 | set_user_mode(struct Client *client_p, s
667		* inputs       - client_p
668		*              - source_p
669		*              - int old
991	–	*              - sendmask mask of modes to send
670		*              - suplied umode_buf
671		* output       - NONE
672		*/
673		void
674		send_umode(struct Client *client_p, struct Client *source_p,
675	<	unsigned int old, unsigned int sendmask, char *umode_buf)
675	>	unsigned int old, char *umode_buf)
676		{
677		char *m = umode_buf;
678		int what = 0;
1001	–	unsigned int i;
1002	–	unsigned int flag;
679
680		/*
681	<	* build a string in umode_buf to represent the change in the user's
681	>	* Build a string in umode_buf to represent the change in the user's
682		* mode between the new (source_p->umodes) and 'old'.
683		*/
684	<	for (i = 0; i < 128; i++)
684	>	for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
685		{
686	<	flag = user_modes[i];
1011	<	if (!flag)
1012	<	continue;
1013	<
1014	<	if (MyClient(source_p) && !(flag & sendmask))
1015	<	continue;
1016	<
1017	<	if ((flag & old) && !HasUMode(source_p, flag))
686	>	if ((tab->flag & old) && !HasUMode(source_p, tab->flag))
687		{
688		if (what == MODE_DEL)
689	<	*m++ = (char)i;
689	>	*m++ = tab->c;
690		else
691		{
692		what = MODE_DEL;
693		*m++ = '-';
694	<	*m++ = (char)i;
694	>	*m++ = tab->c;
695		}
696		}
697	<	else if (!(flag & old) && HasUMode(source_p, flag))
697	>	else if (!(tab->flag & old) && HasUMode(source_p, tab->flag))
698		{
699		if (what == MODE_ADD)
700	<	*m++ = (char)i;
700	>	*m++ = tab->c;
701		else
702		{
703		what = MODE_ADD;
704		*m++ = '+';
705	<	*m++ = (char)i;
705	>	*m++ = tab->c;
706		}
707		}
708		}
#	Line 1042 | Line 711 | send_umode(struct Client *client_p, stru
711
712		if (*umode_buf && client_p)
713		sendto_one(client_p, ":%s!%s@%s MODE %s :%s",
714	<	source_p->name, source_p->username,
715	<	source_p->host, source_p->name, umode_buf);
714	>	client_p->name, client_p->username,
715	>	client_p->host, client_p->name, umode_buf);
716		}
717
718		/* send_umode_out()
#	Line 1053 | Line 722 | send_umode(struct Client *client_p, stru
722		* side effects - Only send ubuf out to servers that know about this client
723		*/
724		void
725	<	send_umode_out(struct Client *client_p, struct Client *source_p,
1057	<	unsigned int old)
725	>	send_umode_out(struct Client *source_p, unsigned int old)
726		{
727	<	char buf[IRCD_BUFSIZE] = { '\0' };
1060	<	dlink_node *ptr = NULL;
727	>	char buf[IRCD_BUFSIZE] = "";
728
729	<	send_umode(NULL, source_p, old, SEND_UMODES, buf);
729	>	send_umode(MyClient(source_p) ? source_p : NULL, source_p, old, buf);
730
731		if (buf[0])
732	<	{
733	<	DLINK_FOREACH(ptr, serv_list.head)
1067	<	{
1068	<	struct Client *target_p = ptr->data;
1069	<
1070	<	if ((target_p != client_p) && (target_p != source_p))
1071	<	sendto_one(target_p, ":%s MODE %s :%s",
1072	<	ID_or_name(source_p, target_p),
1073	<	ID_or_name(source_p, target_p), buf);
1074	<	}
1075	<	}
1076	<
1077	<	if (client_p && MyClient(client_p))
1078	<	send_umode(client_p, source_p, old, 0xffffffff, buf);
732	>	sendto_server(source_p, 0, 0, ":%s MODE %s :%s",
733	>	source_p->id, source_p->id, buf);
734		}
735
736		void
737	<	user_set_hostmask(struct Client *target_p, const char *hostname)
1083	<	{
1084	<	if (!valid_hostname(hostname))
1085	<	return;
1086	<
1087	<	if (IsUserHostIp(target_p))
1088	<	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1089	<
1090	<	strlcpy(target_p->host, hostname, sizeof(target_p->host));
1091	<	SetIPSpoof(target_p);
1092	<
1093	<	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1094	<	SetUserHost(target_p);
1095	<
1096	<	if (MyClient(target_p))
1097	<	clear_ban_cache_client(target_p);
1098	<	}
1099	<
1100	<	/* user_welcome()
1101	<	*
1102	<	* inputs       - client pointer to client to welcome
1103	<	* output       - NONE
1104	<	* side effects -
1105	<	*/
1106	<	static void
1107	<	user_welcome(struct Client *source_p)
737	>	user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
738		{
739	<	#if defined(__TIME__) && defined(__DATE__)
1110	<	static const char built_date[] = __DATE__ " at " __TIME__;
1111	<	#else
1112	<	static const char built_date[] = "unknown";
1113	<	#endif
1114	<
1115	<	#ifdef HAVE_LIBCRYPTO
1116	<	if (source_p->localClient->fd.ssl != NULL)
1117	<	sendto_one(source_p, ":%s NOTICE %s :*** Connected securely via %s",
1118	<	me.name, source_p->name,
1119	<	ssl_get_cipher(source_p->localClient->fd.ssl));
1120	<	#endif
1121	<
1122	<	sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
1123	<	ServerInfo.network_name, source_p->name,
1124	<	source_p->username, source_p->host);
1125	<	sendto_one(source_p, form_str(RPL_YOURHOST), me.name, source_p->name,
1126	<	get_listener_name(source_p->localClient->listener), ircd_version);
1127	<	sendto_one(source_p, form_str(RPL_CREATED),
1128	<	me.name, source_p->name, built_date);
1129	<	sendto_one(source_p, form_str(RPL_MYINFO),
1130	<	me.name, source_p->name, me.name, ircd_version, umode_buffer);
1131	<	show_isupport(source_p);
1132	<
1133	<	if (source_p->id[0] != '\0')
1134	<	sendto_one(source_p, form_str(RPL_YOURID), me.name,
1135	<	source_p->name, source_p->id);
1136	<
1137	<	show_lusers(source_p);
1138	<
1139	<	if (ConfigFileEntry.short_motd)
1140	<	{
1141	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- motd was last changed at %s",
1142	<	me.name, source_p->name, ConfigFileEntry.motd.lastChangedDate);
1143	<	sendto_one(source_p,
1144	<	":%s NOTICE %s :*** Notice -- Please read the motd if you haven't "
1145	<	"read it", me.name, source_p->name);
1146	<	sendto_one(source_p, form_str(RPL_MOTDSTART),
1147	<	me.name, source_p->name, me.name);
1148	<	sendto_one(source_p, form_str(RPL_MOTD),
1149	<	me.name, source_p->name,
1150	<	"*** This is the short motd ***");
1151	<	sendto_one(source_p, form_str(RPL_ENDOFMOTD),
1152	<	me.name, source_p->name);
1153	<	}
1154	<	else
1155	<	send_message_file(source_p, &ConfigFileEntry.motd);
1156	<	}
739	>	dlink_node *node = NULL;
740
741	<	/* check_xline()
742	<	*
1160	<	* inputs       - pointer to client to test
1161	<	* outupt       - 1 if exiting 0 if ok
1162	<	* side effects -
1163	<	*/
1164	<	static int
1165	<	check_xline(struct Client *source_p)
1166	<	{
1167	<	struct MaskItem *conf = NULL;
1168	<	const char *reason = NULL;
741	>	if (!strcmp(target_p->host, hostname))
742	>	return;
743
744	<	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
744	>	switch (what)
745		{
746	<	++conf->count;
747	<
748	<	if (conf->reason != NULL)
749	<	reason = conf->reason;
750	<	else
751	<	reason = "No Reason";
752	<
1179	<	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
1180	<	"X-line Rejecting [%s] [%s], user %s [%s]",
1181	<	source_p->info, reason,
1182	<	get_client_name(source_p, HIDE_IP),
1183	<	source_p->sockhost);
1184	<
1185	<	++ServerStats.is_ref;
1186	<	exit_client(source_p, &me, "Bad user info");
1187	<	return 1;
746	>	case MODE_ADD:
747	>	AddUMode(target_p, UMODE_HIDDENHOST);
748	>	break;
749	>	case MODE_DEL:
750	>	DelUMode(target_p, UMODE_HIDDENHOST);
751	>	break;
752	>	default: return;
753		}
754
755	<	return 0;
756	<	}
757	<
1193	<	/* oper_up()
1194	<	*
1195	<	* inputs       - pointer to given client to oper
1196	<	* output       - NONE
1197	<	* side effects - Blindly opers up given source_p, using conf info
1198	<	*                all checks on passwords have already been done.
1199	<	*                This could also be used by rsa oper routines.
1200	<	*/
1201	<	void
1202	<	oper_up(struct Client *source_p)
1203	<	{
1204	<	const unsigned int old = source_p->umodes;
1205	<	const struct MaskItem *conf = source_p->localClient->confs.head->data;
1206	<
1207	<	assert(source_p->localClient->confs.head);
1208	<
1209	<	++Count.oper;
1210	<	SetOper(source_p);
1211	<
1212	<	if (conf->modes)
1213	<	AddUMode(source_p, conf->modes);
1214	<	else if (ConfigFileEntry.oper_umodes)
1215	<	AddUMode(source_p, ConfigFileEntry.oper_umodes);
1216	<
1217	<	if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
1218	<	++Count.invisi;
1219	<	if ((old & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
1220	<	--Count.invisi;
1221	<
1222	<	assert(dlinkFind(&oper_list, source_p) == NULL);
1223	<	dlinkAdd(source_p, make_dlink_node(), &oper_list);
1224	<
1225	<	AddOFlag(source_p, conf->port);
755	>	if (ConfigGeneral.cycle_on_host_change)
756	>	sendto_common_channels_local(target_p, 0, 0, CAP_CHGHOST, ":%s!%s@%s QUIT :Changing hostname",
757	>	target_p->name, target_p->username, target_p->host);
758
759	<	if (HasOFlag(source_p, OPER_FLAG_ADMIN))
760	<	AddUMode(source_p, UMODE_ADMIN);
761	<
1230	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1231	<	get_oper_name(source_p));
1232	<	send_umode_out(source_p, source_p, old);
1233	<	sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
1234	<	}
1235	<
1236	<	static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
1237	<
1238	<	int
1239	<	valid_sid(const char *sid)
1240	<	{
1241	<	if (strlen(sid) == IRC_MAXSID)
1242	<	if (IsDigit(*sid))
1243	<	if (IsAlNum(*(sid + 1)) && IsAlNum(*(sid + 2)))
1244	<	return 1;
759	>	sendto_common_channels_local(target_p, 0, CAP_CHGHOST, 0, ":%s!%s@%s CHGHOST %s %s",
760	>	target_p->name, target_p->username,
761	>	target_p->host, target_p->username, hostname);
762
763	<	return 0;
764	<	}
763	>	if (HasFlag(target_p, FLAGS_USERHOST))
764	>	userhost_del(target_p->username, target_p->host, !MyConnect(target_p));
765
766	<	/*
1250	<	* init_uid()
1251	<	*
1252	<	* inputs       - NONE
1253	<	* output       - NONE
1254	<	* side effects - new_uid is filled in with server id portion (sid)
1255	<	*                (first 3 bytes) or defaulted to 'A'.
1256	<	*                Rest is filled in with 'A'
1257	<	*/
1258	<	void
1259	<	init_uid(void)
1260	<	{
1261	<	unsigned int i;
1262	<
1263	<	memset(new_uid, 0, sizeof(new_uid));
1264	<
1265	<	if (!EmptyString(ServerInfo.sid))
1266	<	strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1267	<
1268	<	for (i = 0; i < IRC_MAXSID; ++i)
1269	<	if (new_uid[i] == '\0')
1270	<	new_uid[i] = 'A';
1271	<
1272	<	/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1273	<	/* Yes nenolod, I have known it was off by one ever since I wrote it
1274	<	* But *JUST* for you, though, it really doesn't look as *pretty*
1275	<	* -Dianora
1276	<	*/
1277	<	memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
766	>	strlcpy(target_p->host, hostname, sizeof(target_p->host));
767
768	<	entering_umode_cb = register_callback("entering_umode", NULL);
769	<	umode_cb = register_callback("changing_umode", change_simple_umode);
1281	<	}
768	>	userhost_add(target_p->username, target_p->host, !MyConnect(target_p));
769	>	AddFlag(target_p, FLAGS_USERHOST);
770
771	<	/*
1284	<	* add_one_to_uid
1285	<	*
1286	<	* inputs       - index number into new_uid
1287	<	* output       - NONE
1288	<	* side effects - new_uid is incremented by one
1289	<	*                note this is a recursive function
1290	<	*/
1291	<	static void
1292	<	add_one_to_uid(int i)
1293	<	{
1294	<	if (i != IRC_MAXSID)    /* Not reached server SID portion yet? */
771	>	if (MyConnect(target_p))
772		{
773	<	if (new_uid[i] == 'Z')
774	<	new_uid[i] = '0';
1298	<	else if (new_uid[i] == '9')
1299	<	{
1300	<	new_uid[i] = 'A';
1301	<	add_one_to_uid(i-1);
1302	<	}
1303	<	else
1304	<	++new_uid[i];
1305	<	}
1306	<	else
1307	<	{
1308	<	/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1309	<	if (new_uid[i] == 'Z')
1310	<	memcpy(new_uid + IRC_MAXSID, "AAAAAA", IRC_MAXUID);
1311	<	else
1312	<	++new_uid[i];
773	>	sendto_one_numeric(target_p, &me, RPL_VISIBLEHOST, target_p->host);
774	>	clear_ban_cache_client(target_p);
775		}
1314	–	}
1315	–
1316	–	/*
1317	–	* uid_get
1318	–	*
1319	–	* inputs       - struct Client *
1320	–	* output       - new UID is returned to caller
1321	–	* side effects - new_uid is incremented by one.
1322	–	*/
1323	–	static const char *
1324	–	uid_get(void)
1325	–	{
1326	–	add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
1327	–	return new_uid;
1328	–	}
776
777	<	/*
778	<	* init_isupport()
1332	<	*
1333	<	* input        - NONE
1334	<	* output       - NONE
1335	<	* side effects - Must be called before isupport is enabled
1336	<	*/
1337	<	void
1338	<	init_isupport(void)
1339	<	{
1340	<	isupportFile = init_MessageLine();
1341	<
1342	<	add_isupport("CALLERID", NULL, -1);
1343	<	add_isupport("CASEMAPPING", CASEMAP, -1);
1344	<	add_isupport("DEAF", "D", -1);
1345	<	add_isupport("KICKLEN", NULL, KICKLEN);
1346	<	add_isupport("MODES", NULL, MAXMODEPARAMS);
1347	<	#ifdef HALFOPS
1348	<	add_isupport("PREFIX", "(ohv)@%+", -1);
1349	<	add_isupport("STATUSMSG", "@%+", -1);
1350	<	#else
1351	<	add_isupport("PREFIX", "(ov)@+", -1);
1352	<	add_isupport("STATUSMSG", "@+", -1);
1353	<	#endif
1354	<	}
1355	<
1356	<	/*
1357	<	* add_isupport()
1358	<	*
1359	<	* input        - name of supported function
1360	<	*              - options if any
1361	<	*              - number if any
1362	<	* output       - NONE
1363	<	* side effects - Each supported item must call this when activated
1364	<	*/
1365	<	void
1366	<	add_isupport(const char *name, const char *options, int n)
1367	<	{
1368	<	dlink_node *ptr;
1369	<	struct Isupport *support;
1370	<
1371	<	DLINK_FOREACH(ptr, support_list.head)
1372	<	{
1373	<	support = ptr->data;
1374	<	if (irccmp(support->name, name) == 0)
1375	<	{
1376	<	MyFree(support->name);
1377	<	MyFree(support->options);
1378	<	break;
1379	<	}
1380	<	}
777	>	if (!ConfigGeneral.cycle_on_host_change)
778	>	return;
779
780	<	if (ptr == NULL)
780	>	DLINK_FOREACH(node, target_p->channel.head)
781		{
782	<	support = MyMalloc(sizeof(*support));
783	<	dlinkAddTail(support, &support->node, &support_list);
784	<	}
785	<
786	<	support->name = xstrdup(name);
1389	<	if (options != NULL)
1390	<	support->options = xstrdup(options);
1391	<	support->number = n;
1392	<
1393	<	rebuild_isupport_message_line();
1394	<	}
1395	<
1396	<	/*
1397	<	* delete_isupport()
1398	<	*
1399	<	* input        - name of supported function
1400	<	* output       - NONE
1401	<	* side effects - Each supported item must call this when deactivated
1402	<	*/
1403	<	void
1404	<	delete_isupport(const char *name)
1405	<	{
1406	<	dlink_node *ptr;
1407	<	struct Isupport *support;
782	>	char modebuf[CMEMBER_STATUS_FLAGS_LEN + 1];
783	>	char nickbuf[CMEMBER_STATUS_FLAGS_LEN * NICKLEN + CMEMBER_STATUS_FLAGS_LEN] = "";
784	>	char *p = modebuf;
785	>	int len = 0;
786	>	const struct Membership *member = node->data;
787
788	<	DLINK_FOREACH(ptr, support_list.head)
1410	<	{
1411	<	support = ptr->data;
1412	<	if (irccmp(support->name, name) == 0)
788	>	if (has_member_flags(member, CHFL_CHANOP))
789		{
790	<	dlinkDelete(ptr, &support_list);
791	<	MyFree(support->name);
1416	<	MyFree(support->options);
1417	<	MyFree(support);
1418	<	break;
790	>	*p++ = 'o';
791	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
792		}
1420	–	}
1421	–
1422	–	rebuild_isupport_message_line();
1423	–	}
793
794	<	/*
1426	<	* rebuild_isupport_message_line
1427	<	*
1428	<	* input        - NONE
1429	<	* output       - NONE
1430	<	* side effects - Destroy the isupport MessageFile lines, and rebuild.
1431	<	*/
1432	<	void
1433	<	rebuild_isupport_message_line(void)
1434	<	{
1435	<	char isupportbuffer[IRCD_BUFSIZE];
1436	<	char *p = isupportbuffer;
1437	<	dlink_node *ptr = NULL;
1438	<	int n = 0;
1439	<	int tokens = 0;
1440	<	size_t len = 0;
1441	<	size_t reserve = strlen(me.name) + HOSTLEN + strlen(form_str(RPL_ISUPPORT));
1442	<
1443	<	destroy_MessageLine(isupportFile);
1444	<
1445	<	DLINK_FOREACH(ptr, support_list.head)
1446	<	{
1447	<	struct Isupport *support = ptr->data;
1448	<
1449	<	p += (n = sprintf(p, "%s", support->name));
1450	<	len += n;
1451	<
1452	<	if (support->options != NULL)
794	>	if (has_member_flags(member, CHFL_HALFOP))
795		{
796	<	p += (n = sprintf(p, "=%s", support->options));
797	<	len += n;
796	>	*p++ = 'h';
797	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
798		}
799
800	<	if (support->number > 0)
800	>	if (has_member_flags(member, CHFL_VOICE))
801		{
802	<	p += (n = sprintf(p, "=%d", support->number));
803	<	len += n;
802	>	*p++ = 'v';
803	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
804		}
805
1464	–	*p++ = ' ';
1465	–	len++;
806		*p = '\0';
807
808	<	if (++tokens == (MAXPARA-2) || len >= (sizeof(isupportbuffer)-reserve))
809	<	{ /* arbritrary for now */
810	<	if (*--p == ' ')
811	<	*p = '\0';
812	<
813	<	addto_MessageLine(isupportFile, isupportbuffer);
814	<	p = isupportbuffer;
815	<	len = 0;
816	<	n = tokens = 0;
817	<	}
818	<	}
819	<
820	<	if (len != 0)
821	<	{
822	<	if (*--p == ' ')
823	<	*p = '\0';
824	<	addto_MessageLine(isupportFile, isupportbuffer);
825	<	}
808	>	sendto_channel_local(target_p, member->chptr, 0, CAP_EXTENDED_JOIN, CAP_CHGHOST, ":%s!%s@%s JOIN %s %s :%s",
809	>	target_p->name, target_p->username,
810	>	target_p->host, member->chptr->name,
811	>	target_p->account, target_p->info);
812	>	sendto_channel_local(target_p, member->chptr, 0, 0, CAP_EXTENDED_JOIN | CAP_CHGHOST, ":%s!%s@%s JOIN :%s",
813	>	target_p->name, target_p->username,
814	>	target_p->host, member->chptr->name);
815	>
816	>	if (nickbuf[0])
817	>	sendto_channel_local(target_p, member->chptr, 0, 0, CAP_CHGHOST, ":%s MODE %s +%s %s",
818	>	target_p->servptr->name, member->chptr->name,
819	>	modebuf, nickbuf);
820	>	}
821	>
822	>	if (target_p->away[0])
823	>	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY, CAP_CHGHOST,
824	>	":%s!%s@%s AWAY :%s",
825	>	target_p->name, target_p->username,
826	>	target_p->host, target_p->away);
827		}

Diff Legend

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