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 1818 by michael, Fri Apr 12 11:02:33 2013 UTC vs.
ircd-hybrid/trunk/src/user.c (file contents), Revision 5784 by michael, Sun Apr 5 15:17:11 2015 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-2015 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 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 "irc_string.h"
35	–	#include "s_bsd.h"
35		#include "ircd.h"
36		#include "listener.h"
37		#include "motd.h"
38		#include "numeric.h"
39		#include "conf.h"
40		#include "log.h"
41	<	#include "s_serv.h"
41	>	#include "server.h"
42		#include "send.h"
44	–	#include "supported.h"
45	–	#include "whowas.h"
43		#include "memory.h"
44		#include "packet.h"
45		#include "rng_mt.h"
46		#include "userhost.h"
47	<	#include "hook.h"
51	<	#include "s_misc.h"
47	>	#include "misc.h"
48		#include "parse.h"
49		#include "watch.h"
50
55	–
56	–	struct Callback *entering_umode_cb = NULL;
57	–	struct Callback *umode_cb = NULL;
58	–
51		static char umode_buffer[IRCD_BUFSIZE];
60	–
61	–	static void user_welcome(struct Client *);
62	–	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 *);
52		static const char *uid_get(void);
53
54		/* Used for building up the isupport string,
55		* used with init_isupport, add_isupport, delete_isupport
56		*/
57	<
71	<	struct Isupport
57	>	struct Isupport
58		{
59		dlink_node node;
60		char *name;
#	Line 76 | Line 62 | struct Isupport
62		int number;
63		};
64
65	<	static dlink_list support_list = { NULL, NULL, 0 };
66	<	MessageFile *isupportFile;
65	>	static dlink_list support_list;
66	>	static dlink_list support_list_lines;
67
68	<	/* memory is cheap. map 0-255 to equivalent mode */
69	<	unsigned int user_modes[256] =
68	>	const struct user_modes *umode_map[256];
69	>	const struct user_modes  umode_tab[] =
70		{
71	<	/* 0x00 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x0F */
72	<	/* 0x10 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x1F */
73	<	/* 0x20 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x2F */
74	<	/* 0x30 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x3F */
75	<	0,                  /* @ */
76	<	0,                  /* A */
77	<	0,                  /* B */
78	<	UMODE_CCONN_FULL,   /* C */
79	<	UMODE_DEAF,         /* D */
80	<	0,                  /* E */
81	<	0,                  /* F */
82	<	UMODE_SOFTCALLERID, /* G */
83	<	UMODE_HIDDEN,       /* H */
84	<	0,                  /* I */
85	<	0,                  /* J */
86	<	0,                  /* K */
87	<	0,                  /* L */
88	<	0,                  /* M */
89	<	0,                  /* N */
90	<	0,                  /* O */
91	<	0,                  /* P */
92	<	0,                  /* Q */
93	<	UMODE_REGONLY,      /* R */
94	<	0,                  /* S */
95	<	0,                  /* T */
96	<	0,                  /* U */
97	<	0,                  /* V */
98	<	0,                  /* W */
99	<	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 */
71	>	{ 'D', UMODE_DEAF         },
72	>	{ 'F', UMODE_FARCONNECT   },
73	>	{ 'G', UMODE_SOFTCALLERID },
74	>	{ 'H', UMODE_HIDDEN       },
75	>	{ 'R', UMODE_REGONLY      },
76	>	{ 'S', UMODE_SSL          },
77	>	{ 'W', UMODE_WEBIRC       },
78	>	{ 'a', UMODE_ADMIN        },
79	>	{ 'b', UMODE_BOTS         },
80	>	{ 'c', UMODE_CCONN        },
81	>	{ 'd', UMODE_DEBUG        },
82	>	{ 'e', UMODE_EXTERNAL     },
83	>	{ 'f', UMODE_FULL         },
84	>	{ 'g', UMODE_CALLERID     },
85	>	{ 'i', UMODE_INVISIBLE    },
86	>	{ 'j', UMODE_REJ          },
87	>	{ 'k', UMODE_SKILL        },
88	>	{ 'l', UMODE_LOCOPS       },
89	>	{ 'n', UMODE_NCHANGE      },
90	>	{ 'o', UMODE_OPER         },
91	>	{ 'p', UMODE_HIDECHANS    },
92	>	{ 'q', UMODE_HIDEIDLE     },
93	>	{ 'r', UMODE_REGISTERED   },
94	>	{ 's', UMODE_SERVNOTICE   },
95	>	{ 'u', UMODE_UNAUTH       },
96	>	{ 'w', UMODE_WALLOP       },
97	>	{ 'x', UMODE_HIDDENHOST   },
98	>	{ 'y', UMODE_SPY          },
99	>	{ '\0', 0 }
100		};
101
102		void
103	<	assemble_umode_buffer(void)
103	>	user_usermodes_init(void)
104		{
159	–	unsigned int idx = 0;
105		char *umode_buffer_ptr = umode_buffer;
106
107	<	for (; idx < (sizeof(user_modes) / sizeof(user_modes[0])); ++idx)
108	<	if (user_modes[idx])
109	<	*umode_buffer_ptr++ = idx;
107	>	for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
108	>	{
109	>	umode_map[tab->c] = tab;
110	>	*umode_buffer_ptr++ = tab->c;
111	>	}
112
113		*umode_buffer_ptr = '\0';
114		}
#	Line 173 | Line 120 | assemble_umode_buffer(void)
120		* side effects - display to client user counts etc.
121		*/
122		void
123	<	show_lusers(struct Client *source_p)
123	>	show_lusers(struct Client *source_p)
124		{
178	–	const char *from, *to;
179	–
180	–	if (!MyConnect(source_p) && IsCapable(source_p->from, CAP_TS6) && HasID(source_p))
181	–	{
182	–	from = me.id;
183	–	to = source_p->id;
184	–	}
185	–	else
186	–	{
187	–	from = me.name;
188	–	to = source_p->name;
189	–	}
190	–
125		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
126	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT),
127	<	from, to, (Count.total-Count.invisi),
194	<	Count.invisi, dlink_list_length(&global_serv_list));
126	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
127	>	Count.invisi, dlink_list_length(&global_server_list));
128		else
129	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT), from, to,
130	<	(Count.total-Count.invisi), Count.invisi, 1);
129	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
130	>	Count.invisi, 1);
131	>
132	>	if (Count.oper)
133	>	sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper);
134
135	<	if (Count.oper > 0)
136	<	sendto_one(source_p, form_str(RPL_LUSEROP),
137	<	from, to, Count.oper);
138	<
139	<	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));
135	>	if (dlink_list_length(&unknown_list))
136	>	sendto_one_numeric(source_p, &me, RPL_LUSERUNKNOWN, dlink_list_length(&unknown_list));
137	>
138	>	if (dlink_list_length(&channel_list))
139	>	sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&channel_list));
140
141		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
142		{
143	<	sendto_one(source_p, form_str(RPL_LUSERME),
144	<	from, to, Count.local, Count.myserver);
215	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
216	<	from, to, Count.local, Count.max_loc,
217	<	Count.local, Count.max_loc);
143	>	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.local, Count.myserver);
144	>	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.local, Count.max_loc);
145		}
146		else
147		{
148	<	sendto_one(source_p, form_str(RPL_LUSERME),
149	<	from, to, Count.total, 0);
223	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
224	<	from, to, Count.total, Count.max_tot,
225	<	Count.total, Count.max_tot);
148	>	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.total, 0);
149	>	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.total, Count.max_tot);
150		}
151
152	<	sendto_one(source_p, form_str(RPL_GLOBALUSERS),
229	<	from, to, Count.total, Count.max_tot,
230	<	Count.total, Count.max_tot);
152	>	sendto_one_numeric(source_p, &me, RPL_GLOBALUSERS, Count.total, Count.max_tot);
153
154		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
155	<	sendto_one(source_p, form_str(RPL_STATSCONN), from, to,
156	<	Count.max_loc_con, Count.max_loc_cli, Count.totalrestartcount);
155	>	sendto_one_numeric(source_p, &me, RPL_STATSCONN, Count.max_loc_con,
156	>	Count.max_loc_cli, Count.totalrestartcount);
157
158		if (Count.local > Count.max_loc_cli)
159		Count.max_loc_cli = Count.local;
160
161		if ((Count.local + Count.myserver) > Count.max_loc_con)
162	<	Count.max_loc_con = Count.local + Count.myserver;
162	>	Count.max_loc_con = Count.local + Count.myserver;
163		}
164
165		/* show_isupport()
#	Line 247 | Line 169 | show_lusers(struct Client *source_p)
169		* side effects - display to client what we support (for them)
170		*/
171		void
172	<	show_isupport(struct Client *source_p)
172	>	show_isupport(struct Client *source_p)
173		{
174	<	send_message_file(source_p, isupportFile);
174	>	const dlink_node *node = NULL;
175	>
176	>	DLINK_FOREACH(node, support_list_lines.head)
177	>	sendto_one_numeric(source_p, &me, RPL_ISUPPORT, node->data);
178		}
179
180	<	/*
181	<	** register_local_user
182	<	**      This function is called when both NICK and USER messages
183	<	**      have been accepted for the client, in whatever order. Only
184	<	**      after this, is the USER message propagated.
185	<	**
186	<	**      NICK's must be propagated at once when received, although
187	<	**      it would be better to delay them too until full info is
188	<	**      available. Doing it is not so simple though, would have
189	<	**      to implement the following:
190	<	**
191	<	**      (actually it has been implemented already for a while) -orabidoo
192	<	**
193	<	**      1) user telnets in and gives only "NICK foobar" and waits
194	<	**      2) another user far away logs in normally with the nick
195	<	**         "foobar" (quite legal, as this server didn't propagate
196	<	**         it).
197	<	**      3) now this server gets nick "foobar" from outside, but
198	<	**         has alread the same defined locally. Current server
199	<	**         would just issue "KILL foobar" to clean out dups. But,
200	<	**         this is not fair. It should actually request another
201	<	**         nick from local user or kill him/her...
202	<	*/
180	>
181	>	/* report_and_set_user_flags()
182	>	*
183	>	* inputs       - pointer to source_p
184	>	*              - pointer to conf for this user
185	>	* output       - NONE
186	>	* side effects - Report to user any special flags
187	>	*                they are getting, and set them.
188	>	*/
189	>	static void
190	>	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
191	>	{
192	>	/* If this user is being spoofed, tell them so */
193	>	if (IsConfDoSpoofIp(conf))
194	>	sendto_one_notice(source_p, &me, ":*** Spoofing your IP. Congrats.");
195	>
196	>	/* If this user is in the exception class, set it "E lined" */
197	>	if (IsConfExemptKline(conf))
198	>	{
199	>	SetExemptKline(source_p);
200	>	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D/G lines. Congrats.");
201	>	}
202	>
203	>	/*
204	>	* The else here is to make sure that G line exempt users
205	>	* do not get noticed twice.
206	>	*/
207	>	else if (IsConfExemptGline(conf))
208	>	{
209	>	SetExemptGline(source_p);
210	>	sendto_one_notice(source_p, &me, ":*** You are exempt from G lines. Congrats.");
211	>	}
212	>
213	>	if (IsConfExemptResv(conf))
214	>	{
215	>	SetExemptResv(source_p);
216	>	sendto_one_notice(source_p, &me, ":*** You are exempt from resvs. Congrats.");
217	>	}
218	>
219	>	/* If this user is exempt from user limits set it "F lined" */
220	>	if (IsConfExemptLimits(conf))
221	>	{
222	>	SetExemptLimits(source_p);
223	>	sendto_one_notice(source_p, &me, ":*** You are exempt from user limits. Congrats.");
224	>	}
225	>
226	>	if (IsConfCanFlood(conf))
227	>	{
228	>	SetCanFlood(source_p);
229	>	sendto_one_notice(source_p, &me, ":*** You are exempt from flood "
230	>	"protection, aren't you fearsome.");
231	>	}
232	>	}
233	>
234	>	/* introduce_client()
235	>	*
236	>	* inputs       - source_p
237	>	* output       - NONE
238	>	* side effects - This common function introduces a client to the rest
239	>	*                of the net, either from a local client connect or
240	>	*                from a remote connect.
241	>	*/
242	>	static void
243	>	introduce_client(struct Client *source_p)
244	>	{
245	>	dlink_node *node = NULL;
246	>	char ubuf[IRCD_BUFSIZE] = "";
247	>
248	>	if (MyClient(source_p))
249	>	send_umode(source_p, source_p, 0, ubuf);
250	>	else
251	>	send_umode(NULL, source_p, 0, ubuf);
252	>
253	>	watch_check_hash(source_p, RPL_LOGON);
254	>
255	>	if (ubuf[0] == '\0')
256	>	{
257	>	ubuf[0] = '+';
258	>	ubuf[1] = '\0';
259	>	}
260	>
261	>	DLINK_FOREACH(node, local_server_list.head)
262	>	{
263	>	struct Client *server = node->data;
264	>
265	>	if (server == source_p->from)
266	>	continue;
267	>
268	>	if (IsCapable(server, CAP_SVS))
269	>	sendto_one(server, ":%s UID %s %u %lu %s %s %s %s %s %s :%s",
270	>	source_p->servptr->id,
271	>	source_p->name, source_p->hopcount+1,
272	>	(unsigned long)source_p->tsinfo,
273	>	ubuf, source_p->username, source_p->host,
274	>	source_p->sockhost, source_p->id,
275	>	source_p->account,
276	>	source_p->info);
277	>	else
278	>	sendto_one(server, ":%s UID %s %u %lu %s %s %s %s %s :%s",
279	>	source_p->servptr->id,
280	>	source_p->name, source_p->hopcount+1,
281	>	(unsigned long)source_p->tsinfo,
282	>	ubuf, source_p->username, source_p->host,
283	>	source_p->sockhost, source_p->id, source_p->info);
284	>
285	>	if (!EmptyString(source_p->certfp))
286	>	sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
287	>	}
288	>	}
289	>
290	>	/* user_welcome()
291	>	*
292	>	* inputs       - client pointer to client to welcome
293	>	* output       - NONE
294	>	* side effects -
295	>	*/
296	>	static void
297	>	user_welcome(struct Client *source_p)
298	>	{
299	>	#if defined(__TIME__) && defined(__DATE__)
300	>	static const char built_date[] = __DATE__ " at " __TIME__;
301	>	#else
302	>	static const char built_date[] = "unknown";
303	>	#endif
304	>
305	>	#ifdef HAVE_LIBCRYPTO
306	>	if (HasFlag(source_p, FLAGS_SSL))
307	>	{
308	>	AddUMode(source_p, UMODE_SSL);
309	>	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
310	>	ssl_get_cipher(source_p->connection->fd.ssl));
311	>	}
312	>	#endif
313	>
314	>	sendto_one_numeric(source_p, &me, RPL_WELCOME, ConfigServerInfo.network_name,
315	>	source_p->name);
316	>	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
317	>	get_listener_name(source_p->connection->listener), ircd_version);
318	>	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
319	>	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
320	>	show_isupport(source_p);
321	>	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
322	>
323	>	show_lusers(source_p);
324	>	motd_signon(source_p);
325	>	}
326	>
327	>	/* check_xline()
328	>	*
329	>	* inputs       - pointer to client to test
330	>	* outupt       - 1 if exiting 0 if ok
331	>	* side effects -
332	>	*/
333	>	static int
334	>	check_xline(struct Client *source_p)
335	>	{
336	>	struct MaskItem *conf = NULL;
337	>
338	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
339	>	{
340	>	++conf->count;
341	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
342	>	"X-line Rejecting [%s] [%s], user %s [%s]",
343	>	source_p->info, conf->reason,
344	>	get_client_name(source_p, HIDE_IP),
345	>	source_p->sockhost);
346	>
347	>	++ServerStats.is_ref;
348	>	exit_client(source_p, "Bad user info");
349	>	return 1;
350	>	}
351	>
352	>	return 0;
353	>	}
354	>
355	>	/*! \brief This function is called when both NICK and USER messages
356	>	*      have been accepted for the client, in whatever order. Only
357	>	*      after this, is the UID message propagated.
358	>	* \param source_p Pointer to given client to introduce
359	>	*/
360		void
361		register_local_user(struct Client *source_p)
362		{
363		const char *id = NULL;
364		const struct MaskItem *conf = NULL;
365
284	–	assert(source_p != NULL);
366		assert(source_p == source_p->from);
367		assert(MyConnect(source_p));
368	<	assert(!source_p->localClient->registration);
368	>	assert(IsUnknown(source_p));
369	>	assert(!source_p->connection->registration);
370
371	<	ClearCap(source_p, CAP_TS6);
290	<
291	<	if (ConfigFileEntry.ping_cookie)
371	>	if (ConfigGeneral.ping_cookie)
372		{
373	<	if (!IsPingSent(source_p) && source_p->localClient->random_ping == 0)
373	>	if (!IsPingSent(source_p) && !source_p->connection->random_ping)
374		{
375		do
376	<	source_p->localClient->random_ping = genrand_int32();
377	<	while (!source_p->localClient->random_ping);
376	>	source_p->connection->random_ping = genrand_int32();
377	>	while (!source_p->connection->random_ping);
378
379	<	sendto_one(source_p, "PING :%u",
300	<	source_p->localClient->random_ping);
379	>	sendto_one(source_p, "PING :%u", source_p->connection->random_ping);
380		SetPingSent(source_p);
381		return;
382		}
#	Line 306 | Line 385 | register_local_user(struct Client *sourc
385		return;
386		}
387
388	<	source_p->localClient->last_privmsg = CurrentTime;
388	>	source_p->connection->last_privmsg = CurrentTime;
389		/* Straight up the maximum rate of flooding... */
390	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
390	>	source_p->connection->allow_read = MAX_FLOOD_BURST;
391
392		if (!check_client(source_p))
393		return;
394
395	<	if (valid_hostname(source_p->host) == 0)
395	>	if (!valid_hostname(source_p->host))
396		{
397	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You have an illegal "
398	<	"character in your hostname", me.name, source_p->name);
399	<	strlcpy(source_p->host, source_p->sockhost,
321	<	sizeof(source_p->host));
397	>	sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
398	>	"character in your hostname");
399	>	strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
400		}
401
402	<	conf = source_p->localClient->confs.head->data;
402	>	conf = source_p->connection->confs.head->data;
403
404		if (!IsGotId(source_p))
405		{
406	<	char username[USERLEN + 1];
406	>	char username[USERLEN + 1] = "";
407		const char *p = username;
408		unsigned int i = 0;
409
410		if (IsNeedIdentd(conf))
411		{
412		++ServerStats.is_ref;
413	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You need to install "
414	<	"identd to use this server", me.name, source_p->name);
415	<	exit_client(source_p, &me, "Install identd");
413	>	sendto_one_notice(source_p, &me, ":*** Notice -- You need to install "
414	>	"identd to use this server");
415	>	exit_client(source_p, "Install identd");
416		return;
417		}
418
#	Line 344 | Line 422 | register_local_user(struct Client *sourc
422		source_p->username[i++] = '~';
423
424		for (; *p && i < USERLEN; ++p)
425	<	if (*p != '[')
348	<	source_p->username[i++] = *p;
425	>	source_p->username[i++] = *p;
426
427		source_p->username[i] = '\0';
428		}
429
430	<	/* password check */
430	>	/* Password check */
431		if (!EmptyString(conf->passwd))
432		{
433	<	const char *pass = source_p->localClient->passwd;
357	<
358	<	if (!match_conf_password(pass, conf))
433	>	if (!match_conf_password(source_p->connection->password, conf))
434		{
435		++ServerStats.is_ref;
436	<	sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
437	<	me.name, source_p->name);
438	<	exit_client(source_p, &me, "Bad Password");
436	>
437	>	sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
438	>	exit_client(source_p, "Bad Password");
439		return;
440		}
441		}
442
443	<	/* don't free source_p->localClient->passwd here - it can be required
444	<	* by masked /stats I if there are auth{} blocks with need_password = no;
443	>	/*
444	>	* Don't free source_p->connection->password here - it can be required
445	>	* by masked /stats I if there are auth {} blocks with need_password = no;
446		* --adx
447		*/
448
449	<	/* report if user has &^>= etc. and set flags as needed in source_p */
449	>	/*
450	>	* Report if user has &^>= etc. and set flags as needed in source_p
451	>	*/
452		report_and_set_user_flags(source_p, conf);
453
454		if (IsDead(source_p))
455		return;
456
457	<	/* Limit clients -
457	>	/*
458	>	* Limit clients -
459		* We want to be able to have servers and F-line clients
460		* connect, so save room for "buffer" connections.
461		* Smaller servers may want to decrease this, and it should
462		* probably be just a percentage of the MAXCLIENTS...
463		*   -Taner
464		*/
465	<	/* Except "F:" clients */
466	<	if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
388	<	(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
465	>	if ((Count.local >= GlobalSetOptions.maxclients + MAX_BUFFER) ||
466	>	(Count.local >= GlobalSetOptions.maxclients && !IsExemptLimits(source_p)))
467		{
468		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
469		"Too many clients, rejecting %s[%s].",
470		source_p->name, source_p->host);
471		++ServerStats.is_ref;
472	<	exit_client(source_p, &me, "Sorry, server is full - try later");
472	>	exit_client(source_p, "Sorry, server is full - try later");
473		return;
474		}
475
476	<	/* valid user name check */
399	<	if (valid_username(source_p->username) == 0)
476	>	if (!valid_username(source_p->username, 1))
477		{
478	<	char tmpstr2[IRCD_BUFSIZE];
478	>	char buf[IRCD_BUFSIZE] = "";
479
480		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
481		"Invalid username: %s (%s@%s)",
482		source_p->name, source_p->username, source_p->host);
483		++ServerStats.is_ref;
484	<	snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
485	<	source_p->username);
409	<	exit_client(source_p, &me, tmpstr2);
484	>	snprintf(buf, sizeof(buf), "Invalid username [%s]", source_p->username);
485	>	exit_client(source_p, buf);
486		return;
487		}
488
489		if (check_xline(source_p))
490		return;
491
492	<	while (hash_find_id((id = uid_get())) != NULL)
492	>	while (hash_find_id((id = uid_get())))
493		;
494
495		strlcpy(source_p->id, id, sizeof(source_p->id));
#	Line 422 | Line 498 | register_local_user(struct Client *sourc
498		sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
499		"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
500		source_p->name, source_p->username, source_p->host,
501	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
502	<	"255.255.255.255" : source_p->sockhost,
427	<	get_client_class(&source_p->localClient->confs),
501	>	source_p->sockhost,
502	>	get_client_class(&source_p->connection->confs),
503		source_p->info, source_p->id);
504
505	<	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL, SEND_NOTICE,
431	<	"CLICONN %s %s %s %s %s %s %s 0 %s",
432	<	source_p->name, source_p->username, source_p->host,
433	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
434	<	"255.255.255.255" : source_p->sockhost,
435	<	get_client_class(&source_p->localClient->confs),
436	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
437	<	"<hidden>" : source_p->localClient->client_host,
438	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
439	<	"<hidden>" : source_p->localClient->client_server,
440	<	source_p->info);
441	<
442	<
443	<	if (ConfigFileEntry.invisible_on_connect)
505	>	if (ConfigGeneral.invisible_on_connect)
506		{
507		AddUMode(source_p, UMODE_INVISIBLE);
508		++Count.invisi;
509		}
510
511	<	if ((++Count.local) > Count.max_loc)
511	>	if (++Count.local > Count.max_loc)
512		{
513		Count.max_loc = Count.local;
514
515		if (!(Count.max_loc % 10))
516		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
517	<	"New Max Local Clients: %d",
517	>	"New maximum local client connections: %u",
518		Count.max_loc);
519		}
520
459	–	/* Increment our total user count here */
521		if (++Count.total > Count.max_tot)
522		Count.max_tot = Count.total;
523		++Count.totalrestartcount;
#	Line 464 | Line 525 | register_local_user(struct Client *sourc
525		assert(source_p->servptr == &me);
526		SetClient(source_p);
527		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
528	<
468	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
528	>	dlinkAdd(source_p, &source_p->node, &global_client_list);
529
530		assert(dlinkFind(&unknown_list, source_p));
531
532	<	dlink_move_node(&source_p->localClient->lclient_node,
532	>	dlink_move_node(&source_p->connection->lclient_node,
533		&unknown_list, &local_client_list);
534
535		user_welcome(source_p);
#	Line 485 | Line 545 | register_local_user(struct Client *sourc
545		*              - username to register as
546		*              - host name to register as
547		*              - server name
488	–	*              - realname (gecos)
548		* output       - NONE
549		* side effects - This function is called when a remote client
550		*                is introduced by a server.
551		*/
552		void
553	<	register_remote_user(struct Client *source_p,
495	<	const char *username, const char *host, const char *server,
496	<	const char *realname)
553	>	register_remote_user(struct Client *source_p)
554		{
555	<	struct Client *target_p = NULL;
499	<
500	<	assert(source_p != NULL);
501	<	assert(source_p->username != username);
502	<
503	<	strlcpy(source_p->host, host, sizeof(source_p->host));
504	<	strlcpy(source_p->username, username, sizeof(source_p->username));
505	<
506	<	/*
507	<	* coming from another server, take the servers word for it
508	<	*/
509	<	source_p->servptr = hash_find_server(server);
510	<
511	<	/*
512	<	* Super GhostDetect:
513	<	* If we can't find the server the user is supposed to be on,
514	<	* then simply blow the user away.        -Taner
515	<	*/
516	<	if (source_p->servptr == NULL)
517	<	{
518	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
519	<	"No server %s for user %s[%s@%s] from %s",
520	<	server, source_p->name, source_p->username,
521	<	source_p->host, source_p->from->name);
522	<	kill_client(source_p->from, source_p, "%s (Server doesn't exist)", me.name);
523	<
524	<	AddFlag(source_p, FLAGS_KILLED);
525	<	exit_client(source_p, &me, "Ghosted Client");
526	<	return;
527	<	}
555	>	const struct Client *target_p = NULL;
556
557		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
558		{
#	Line 533 | Line 561 | register_remote_user(struct Client *sour
561		source_p->from->name, source_p->name, source_p->username,
562		source_p->host, source_p->servptr->name,
563		target_p->name, target_p->from->name);
564	<	kill_client(source_p->from, source_p,
565	<	"%s (NICK from wrong direction (%s != %s))",
566	<	me.name, source_p->servptr->name, target_p->from->name);
564	>	sendto_one(source_p->from,
565	>	":%s KILL %s :%s (UID from wrong direction (%s != %s))",
566	>	me.id, source_p->id, me.name, source_p->servptr->name,
567	>	target_p->from->name);
568	>
569		AddFlag(source_p, FLAGS_KILLED);
570	<	exit_client(source_p, &me, "USER server wrong direction");
570	>	exit_client(source_p, "UID server wrong direction");
571		return;
572		}
573
#	Line 548 | Line 578 | register_remote_user(struct Client *sour
578		if (HasFlag(source_p->servptr, FLAGS_SERVICE))
579		AddFlag(source_p, FLAGS_SERVICE);
580
551	–	/* Increment our total user count here */
581		if (++Count.total > Count.max_tot)
582		Count.max_tot = Count.total;
583
584		SetClient(source_p);
585		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
586	+	dlinkAdd(source_p, &source_p->node, &global_client_list);
587		add_user_host(source_p->username, source_p->host, 1);
588		SetUserHost(source_p);
589
590	<	introduce_client(source_p);
591	<	}
590	>	if (HasFlag(source_p->servptr, FLAGS_EOB))
591	>	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
592	>	"Client connecting at %s: %s (%s@%s) [%s] [%s] <%s>",
593	>	source_p->servptr->name,
594	>	source_p->name, source_p->username, source_p->host,
595	>	source_p->sockhost, source_p->info, source_p->id);
596
597	<	/* introduce_client()
564	<	*
565	<	* inputs       - source_p
566	<	* output       - NONE
567	<	* side effects - This common function introduces a client to the rest
568	<	*                of the net, either from a local client connect or
569	<	*                from a remote connect.
570	<	*/
571	<	static void
572	<	introduce_client(struct Client *source_p)
573	<	{
574	<	dlink_node *server_node = NULL;
575	<	static char ubuf[12];
576	<
577	<	if (MyClient(source_p))
578	<	send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
579	<	else
580	<	send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
581	<
582	<	watch_check_hash(source_p, RPL_LOGON);
583	<
584	<	if (*ubuf == '\0')
585	<	{
586	<	ubuf[0] = '+';
587	<	ubuf[1] = '\0';
588	<	}
589	<
590	<	DLINK_FOREACH(server_node, serv_list.head)
591	<	{
592	<	struct Client *server = server_node->data;
593	<
594	<	if (server == source_p->from)
595	<	continue;
596	<
597	<	if (IsCapable(server, CAP_SVS))
598	<	{
599	<	if (IsCapable(server, CAP_TS6) && HasID(source_p))
600	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
601	<	source_p->servptr->id,
602	<	source_p->name, source_p->hopcount+1,
603	<	(unsigned long)source_p->tsinfo,
604	<	ubuf, source_p->username, source_p->host,
605	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
606	<	"0" : source_p->sockhost, source_p->id,
607	<	source_p->svid,
608	<	source_p->info);
609	<	else
610	<	sendto_one(server, "NICK %s %d %lu %s %s %s %s %s :%s",
611	<	source_p->name, source_p->hopcount+1,
612	<	(unsigned long)source_p->tsinfo,
613	<	ubuf, source_p->username, source_p->host,
614	<	source_p->servptr->name, source_p->svid,
615	<	source_p->info);
616	<
617	<	}
618	<	else
619	<	{
620	<	if (IsCapable(server, CAP_TS6) && HasID(source_p))
621	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
622	<	source_p->servptr->id,
623	<	source_p->name, source_p->hopcount+1,
624	<	(unsigned long)source_p->tsinfo,
625	<	ubuf, source_p->username, source_p->host,
626	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
627	<	"0" : source_p->sockhost, source_p->id, source_p->info);
628	<	else
629	<	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
630	<	source_p->name, source_p->hopcount+1,
631	<	(unsigned long)source_p->tsinfo,
632	<	ubuf, source_p->username, source_p->host,
633	<	source_p->servptr->name, source_p->info);
634	<	}
635	<	}
597	>	introduce_client(source_p);
598		}
599
600		/* valid_hostname()
#	Line 649 | Line 611 | valid_hostname(const char *hostname)
611		{
612		const char *p = hostname;
613
614	<	assert(p != NULL);
614	>	assert(p);
615
616	<	if (*p == '.' || *p == ':')
616	>	if (EmptyString(p) || *p == '.' || *p == ':')
617		return 0;
618
619		for (; *p; ++p)
#	Line 673 | Line 635 | valid_hostname(const char *hostname)
635		* style of username
636		*/
637		int
638	<	valid_username(const char *username)
638	>	valid_username(const char *username, const int local)
639		{
640	<	int dots      = 0;
640	>	unsigned int dots = 0;
641		const char *p = username;
642
643	<	assert(p != NULL);
643	>	assert(p);
644
645		if (*p == '~')
646		++p;
647
648	<	/* reject usernames that don't start with an alphanum
648	>	/*
649	>	* Reject usernames that don't start with an alphanum
650		* i.e. reject jokers who have '-@somehost' or '.@somehost'
651		* or "-hi-@somehost", "h-----@somehost" would still be accepted.
652		*/
653		if (!IsAlNum(*p))
654		return 0;
655
656	<	while (*++p)
656	>	if (local)
657		{
658	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
658	>	while (*++p)
659		{
660	<	if (++dots > ConfigFileEntry.dots_in_ident)
661	<	return 0;
662	<	if (!IsUserChar(*(p + 1)))
660	>	if (*p == '.' && ConfigGeneral.dots_in_ident)
661	>	{
662	>	if (++dots > ConfigGeneral.dots_in_ident)
663	>	return 0;
664	>	if (!IsUserChar(*(p + 1)))
665	>	return 0;
666	>	}
667	>	else if (!IsUserChar(*p))
668		return 0;
669		}
670	<	else if (!IsUserChar(*p))
671	<	return 0;
670	>	}
671	>	else
672	>	{
673	>	while (*++p)
674	>	if (!IsUserChar(*p))
675	>	return 0;
676		}
677
678	<	return 1;
678	>	return p - username <= USERLEN;
679		}
680
681		/* clean_nick_name()
#	Line 717 | Line 689 | int
689		valid_nickname(const char *nickname, const int local)
690		{
691		const char *p = nickname;
720	–	assert(nickname && *nickname);
692
693	<	/* nicks can't start with a digit or - or be 0 length */
694	<	/* This closer duplicates behaviour of hybrid-6 */
695	<	if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
693	>	assert(p);
694	>
695	>	/*
696	>	* Nicks can't start with a digit or - or be 0 length.
697	>	*/
698	>	if (EmptyString(p) || *p == '-' || (IsDigit(*p) && local))
699		return 0;
700
701		for (; *p; ++p)
#	Line 731 | Line 705 | valid_nickname(const char *nickname, con
705		return p - nickname <= NICKLEN;
706		}
707
734	–	/* report_and_set_user_flags()
735	–	*
736	–	* inputs       - pointer to source_p
737	–	*              - pointer to conf for this user
738	–	* output       - NONE
739	–	* side effects - Report to user any special flags
740	–	*                they are getting, and set them.
741	–	*/
742	–	static void
743	–	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
744	–	{
745	–	/* If this user is being spoofed, tell them so */
746	–	if (IsConfDoSpoofIp(conf))
747	–	{
748	–	sendto_one(source_p,
749	–	":%s NOTICE %s :*** Spoofing your IP. congrats.",
750	–	me.name, source_p->name);
751	–	}
752	–
753	–	/* If this user is in the exception class, Set it "E lined" */
754	–	if (IsConfExemptKline(conf))
755	–	{
756	–	SetExemptKline(source_p);
757	–	sendto_one(source_p,
758	–	":%s NOTICE %s :*** You are exempt from K/D/G lines. congrats.",
759	–	me.name, source_p->name);
760	–	}
761	–
762	–	/* The else here is to make sure that G line exempt users
763	–	* do not get noticed twice.
764	–	*/
765	–	else if (IsConfExemptGline(conf))
766	–	{
767	–	SetExemptGline(source_p);
768	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines.",
769	–	me.name, source_p->name);
770	–	}
771	–
772	–	if (IsConfExemptResv(conf))
773	–	{
774	–	SetExemptResv(source_p);
775	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs.",
776	–	me.name, source_p->name);
777	–	}
778	–
779	–	/* If this user is exempt from user limits set it "F lined" */
780	–	if (IsConfExemptLimits(conf))
781	–	{
782	–	SetExemptLimits(source_p);
783	–	sendto_one(source_p,
784	–	":%s NOTICE %s :*** You are exempt from user limits. congrats.",
785	–	me.name,source_p->name);
786	–	}
787	–
788	–	if (IsConfCanFlood(conf))
789	–	{
790	–	SetCanFlood(source_p);
791	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
792	–	"protection, aren't you fearsome.",
793	–	me.name, source_p->name);
794	–	}
795	–	}
796	–
797	–	/* change_simple_umode()
798	–	*
799	–	* this callback can be hooked to allow special handling of
800	–	* certain usermodes
801	–	*/
802	–	static void *
803	–	change_simple_umode(va_list args)
804	–	{
805	–	struct Client *client_p;
806	–	struct Client *source_p;
807	–	int what;
808	–	unsigned int flag;
809	–
810	–	client_p = va_arg(args, struct Client *);
811	–	source_p = va_arg(args, struct Client *);
812	–	what = va_arg(args, int);
813	–	flag = va_arg(args, unsigned int);
814	–
815	–	if (what == MODE_ADD)
816	–	AddUMode(source_p, flag);
817	–	else
818	–	DelUMode(source_p, flag);
819	–
820	–	return NULL;
821	–	}
822	–
823	–	/* set_user_mode()
824	–	*
825	–	* added 15/10/91 By Darren Reed.
826	–	* parv[0] - sender
827	–	* parv[1] - username to change mode for
828	–	* parv[2] - modes to change
829	–	*/
830	–	void
831	–	set_user_mode(struct Client *client_p, struct Client *source_p,
832	–	int parc, char *parv[])
833	–	{
834	–	unsigned int flag, setflags;
835	–	char **p, *m, buf[IRCD_BUFSIZE];
836	–	struct Client *target_p;
837	–	int what = MODE_ADD, badflag = 0, i;
838	–
839	–	assert(!(parc < 2));
840	–
841	–	if ((target_p = find_person(client_p, parv[1])) == NULL)
842	–	{
843	–	if (MyConnect(source_p))
844	–	sendto_one(source_p, form_str(ERR_NOSUCHCHANNEL),
845	–	me.name, source_p->name, parv[1]);
846	–	return;
847	–	}
848	–
849	–	if (source_p != target_p)
850	–	{
851	–	sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
852	–	me.name, source_p->name);
853	–	return;
854	–	}
855	–
856	–	if (parc < 3)
857	–	{
858	–	m = buf;
859	–	*m++ = '+';
860	–
861	–	for (i = 0; i < 128; i++)
862	–	if (HasUMode(source_p, user_modes[i]))
863	–	*m++ = (char)i;
864	–	*m = '\0';
865	–
866	–	sendto_one(source_p, form_str(RPL_UMODEIS),
867	–	me.name, source_p->name, buf);
868	–	return;
869	–	}
870	–
871	–	execute_callback(entering_umode_cb, client_p, source_p);
872	–
873	–	/* find flags already set for user */
874	–	setflags = source_p->umodes;
875	–
876	–	/* parse mode change string(s) */
877	–	for (p = &parv[2]; p && *p; p++)
878	–	{
879	–	for (m = *p; *m; m++)
880	–	{
881	–	switch (*m)
882	–	{
883	–	case '+':
884	–	what = MODE_ADD;
885	–	break;
886	–	case '-':
887	–	what = MODE_DEL;
888	–	break;
889	–	case 'o':
890	–	if (what == MODE_ADD)
891	–	{
892	–	if (IsServer(client_p) && !HasUMode(source_p, UMODE_OPER))
893	–	{
894	–	++Count.oper;
895	–	SetOper(source_p);
896	–	}
897	–	}
898	–	else
899	–	{
900	–	/* Only decrement the oper counts if an oper to begin with
901	–	* found by Pat Szuta, Perly , perly@xnet.com
902	–	*/
903	–	if (!HasUMode(source_p, UMODE_OPER))
904	–	break;
905	–
906	–	ClearOper(source_p);
907	–	Count.oper--;
908	–
909	–	if (MyConnect(source_p))
910	–	{
911	–	dlink_node *dm;
912	–
913	–	detach_conf(source_p, CONF_OPER);
914	–	ClrOFlag(source_p);
915	–	DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
916	–
917	–	if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
918	–	free_dlink_node(dm);
919	–	}
920	–	}
921	–
922	–	break;
923	–
924	–	/* we may not get these,
925	–	* but they shouldnt be in default
926	–	*/
927	–	case 'r':
928	–	case ' ' :
929	–	case '\n':
930	–	case '\r':
931	–	case '\t':
932	–	break;
933	–
934	–	default:
935	–	if ((flag = user_modes[(unsigned char)*m]))
936	–	{
937	–	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
938	–	(ConfigFileEntry.oper_only_umodes & flag))
939	–	{
940	–	badflag = 1;
941	–	}
942	–	else
943	–	execute_callback(umode_cb, client_p, source_p, what, flag);
944	–	}
945	–	else
946	–	{
947	–	if (MyConnect(source_p))
948	–	badflag = 1;
949	–	}
950	–
951	–	break;
952	–	}
953	–	}
954	–	}
955	–
956	–	if (badflag)
957	–	sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
958	–	me.name, source_p->name);
959	–
960	–	if (HasUMode(source_p, UMODE_NCHANGE) && !HasOFlag(source_p, OPER_FLAG_N))
961	–	{
962	–	sendto_one(source_p, ":%s NOTICE %s :*** You have no nchange flag;",
963	–	me.name, source_p->name);
964	–	DelUMode(source_p, UMODE_NCHANGE);
965	–	}
966	–
967	–	if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
968	–	!HasOFlag(source_p, OPER_FLAG_ADMIN))
969	–	{
970	–	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
971	–	me.name, source_p->name);
972	–	DelUMode(source_p, UMODE_ADMIN);
973	–	}
974	–
975	–	if (!(setflags & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
976	–	++Count.invisi;
977	–	if ((setflags & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
978	–	--Count.invisi;
979	–
980	–	/*
981	–	* compare new flags with old flags and send string which
982	–	* will cause servers to update correctly.
983	–	*/
984	–	send_umode_out(client_p, source_p, setflags);
985	–	}
986	–
708		/* send_umode()
709		* send the MODE string for user (user) to connection client_p
710		* -avalon
#	Line 997 | Line 718 | set_user_mode(struct Client *client_p, s
718		*/
719		void
720		send_umode(struct Client *client_p, struct Client *source_p,
721	<	unsigned int old, unsigned int sendmask, char *umode_buf)
721	>	unsigned int old, char *umode_buf)
722		{
723		char *m = umode_buf;
724		int what = 0;
1004	–	unsigned int i;
1005	–	unsigned int flag;
725
726		/*
727	<	* build a string in umode_buf to represent the change in the user's
727	>	* Build a string in umode_buf to represent the change in the user's
728		* mode between the new (source_p->umodes) and 'old'.
729		*/
730	<	for (i = 0; i < 128; i++)
730	>	for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
731		{
732	<	flag = user_modes[i];
1014	<	if (!flag)
1015	<	continue;
1016	<
1017	<	if (MyClient(source_p) && !(flag & sendmask))
1018	<	continue;
1019	<
1020	<	if ((flag & old) && !HasUMode(source_p, flag))
732	>	if ((tab->flag & old) && !HasUMode(source_p, tab->flag))
733		{
734		if (what == MODE_DEL)
735	<	*m++ = (char)i;
735	>	*m++ = tab->c;
736		else
737		{
738		what = MODE_DEL;
739		*m++ = '-';
740	<	*m++ = (char)i;
740	>	*m++ = tab->c;
741		}
742		}
743	<	else if (!(flag & old) && HasUMode(source_p, flag))
743	>	else if (!(tab->flag & old) && HasUMode(source_p, tab->flag))
744		{
745		if (what == MODE_ADD)
746	<	*m++ = (char)i;
746	>	*m++ = tab->c;
747		else
748		{
749		what = MODE_ADD;
750		*m++ = '+';
751	<	*m++ = (char)i;
751	>	*m++ = tab->c;
752		}
753		}
754		}
#	Line 1045 | Line 757 | send_umode(struct Client *client_p, stru
757
758		if (*umode_buf && client_p)
759		sendto_one(client_p, ":%s!%s@%s MODE %s :%s",
760	<	source_p->name, source_p->username,
761	<	source_p->host, source_p->name, umode_buf);
760	>	client_p->name, client_p->username,
761	>	client_p->host, client_p->name, umode_buf);
762		}
763
764		/* send_umode_out()
#	Line 1056 | Line 768 | send_umode(struct Client *client_p, stru
768		* side effects - Only send ubuf out to servers that know about this client
769		*/
770		void
771	<	send_umode_out(struct Client *client_p, struct Client *source_p,
1060	<	unsigned int old)
771	>	send_umode_out(struct Client *source_p, unsigned int old)
772		{
773	<	char buf[IRCD_BUFSIZE] = { '\0' };
1063	<	dlink_node *ptr = NULL;
773	>	char buf[IRCD_BUFSIZE] = "";
774
775	<	send_umode(NULL, source_p, old, SEND_UMODES, buf);
775	>	send_umode(MyClient(source_p) ? source_p : NULL, source_p, old, buf);
776
777		if (buf[0])
778	<	{
779	<	DLINK_FOREACH(ptr, serv_list.head)
1070	<	{
1071	<	struct Client *target_p = ptr->data;
1072	<
1073	<	if ((target_p != client_p) && (target_p != source_p))
1074	<	sendto_one(target_p, ":%s MODE %s :%s",
1075	<	ID_or_name(source_p, target_p),
1076	<	ID_or_name(source_p, target_p), buf);
1077	<	}
1078	<	}
1079	<
1080	<	if (client_p && MyClient(client_p))
1081	<	send_umode(client_p, source_p, old, 0xffffffff, buf);
778	>	sendto_server(source_p, 0, 0, ":%s MODE %s :%s",
779	>	source_p->id, source_p->id, buf);
780		}
781
782	<	/* user_welcome()
783	<	*
1086	<	* inputs       - client pointer to client to welcome
1087	<	* output       - NONE
1088	<	* side effects -
1089	<	*/
1090	<	static void
1091	<	user_welcome(struct Client *source_p)
782	>	void
783	>	user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
784		{
785	<	#if defined(__TIME__) && defined(__DATE__)
1094	<	static const char built_date[] = __DATE__ " at " __TIME__;
1095	<	#else
1096	<	static const char built_date[] = "unknown";
1097	<	#endif
785	>	dlink_node *node = NULL;
786
787	<	#ifdef HAVE_LIBCRYPTO
788	<	if (source_p->localClient->fd.ssl != NULL)
1101	<	sendto_one(source_p, ":%s NOTICE %s :*** Connected securely via %s",
1102	<	me.name, source_p->name,
1103	<	ssl_get_cipher(source_p->localClient->fd.ssl));
1104	<	#endif
787	>	if (!strcmp(target_p->host, hostname))
788	>	return;
789
790	<	sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
791	<	ServerInfo.network_name, source_p->name);
792	<	sendto_one(source_p, form_str(RPL_YOURHOST), me.name, source_p->name,
793	<	get_listener_name(source_p->localClient->listener), ircd_version);
794	<	sendto_one(source_p, form_str(RPL_CREATED),
795	<	me.name, source_p->name, built_date);
796	<	sendto_one(source_p, form_str(RPL_MYINFO),
797	<	me.name, source_p->name, me.name, ircd_version, umode_buffer);
798	<	show_isupport(source_p);
790	>	switch (what)
791	>	{
792	>	case MODE_ADD:
793	>	AddUMode(target_p, UMODE_HIDDENHOST);
794	>	break;
795	>	case MODE_DEL:
796	>	DelUMode(target_p, UMODE_HIDDENHOST);
797	>	break;
798	>	default: return;
799	>	}
800
801	<	if (source_p->id[0] != '\0')
802	<	sendto_one(source_p, form_str(RPL_YOURID), me.name,
803	<	source_p->name, source_p->id);
801	>	if (ConfigGeneral.cycle_on_host_change)
802	>	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
803	>	target_p->name, target_p->username, target_p->host);
804
805	<	show_lusers(source_p);
805	>	if (IsUserHostIp(target_p))
806	>	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
807
808	<	if (ConfigFileEntry.short_motd)
808	>	strlcpy(target_p->host, hostname, sizeof(target_p->host));
809	>
810	>	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
811	>	SetUserHost(target_p);
812	>
813	>	if (MyClient(target_p))
814		{
815	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- motd was last changed at %s",
816	<	me.name, source_p->name, ConfigFileEntry.motd.lastChangedDate);
1126	<	sendto_one(source_p,
1127	<	":%s NOTICE %s :*** Notice -- Please read the motd if you haven't "
1128	<	"read it", me.name, source_p->name);
1129	<	sendto_one(source_p, form_str(RPL_MOTDSTART),
1130	<	me.name, source_p->name, me.name);
1131	<	sendto_one(source_p, form_str(RPL_MOTD),
1132	<	me.name, source_p->name,
1133	<	"*** This is the short motd ***");
1134	<	sendto_one(source_p, form_str(RPL_ENDOFMOTD),
1135	<	me.name, source_p->name);
815	>	sendto_one_numeric(target_p, &me, RPL_VISIBLEHOST, target_p->host);
816	>	clear_ban_cache_client(target_p);
817		}
1137	–	else
1138	–	send_message_file(source_p, &ConfigFileEntry.motd);
1139	–	}
818
819	<	/* check_xline()
820	<	*
1143	<	* inputs       - pointer to client to test
1144	<	* outupt       - 1 if exiting 0 if ok
1145	<	* side effects -
1146	<	*/
1147	<	static int
1148	<	check_xline(struct Client *source_p)
1149	<	{
1150	<	struct MaskItem *conf = NULL;
1151	<	const char *reason = NULL;
819	>	if (!ConfigGeneral.cycle_on_host_change)
820	>	return;
821
822	<	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)) ||
1154	<	(conf = find_matching_name_conf(CONF_RXLINE, source_p->info, NULL, NULL, 0)))
822	>	DLINK_FOREACH(node, target_p->channel.head)
823		{
824	<	++conf->count;
824	>	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
825	>	char *p = modebuf;
826	>	int len = 0;
827	>	const struct Membership *member = node->data;
828
829	<	if (conf->reason != NULL)
830	<	reason = conf->reason;
831	<	else
832	<	reason = "No Reason";
829	>	if (has_member_flags(member, CHFL_CHANOP))
830	>	{
831	>	*p++ = 'o';
832	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
833	>	}
834
835	<	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
836	<	"X-line Rejecting [%s] [%s], user %s [%s]",
837	<	source_p->info, reason,
838	<	get_client_name(source_p, HIDE_IP),
839	<	source_p->sockhost);
835	>	if (has_member_flags(member, CHFL_HALFOP))
836	>	{
837	>	*p++ = 'h';
838	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
839	>	}
840
841	<	++ServerStats.is_ref;
842	<	exit_client(source_p, &me, "Bad user info");
843	<	return 1;
844	<	}
841	>	if (has_member_flags(member, CHFL_VOICE))
842	>	{
843	>	*p++ = 'v';
844	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
845	>	}
846
847	<	return 0;
1175	<	}
847	>	*p = '\0';
848
849	<	/* oper_up()
850	<	*
851	<	* inputs       - pointer to given client to oper
852	<	* output       - NONE
853	<	* side effects - Blindly opers up given source_p, using conf info
854	<	*                all checks on passwords have already been done.
855	<	*                This could also be used by rsa oper routines.
849	>
850	>	sendto_channel_local_butone(target_p, CAP_EXTENDED_JOIN, 0, member->chptr, ":%s!%s@%s JOIN %s %s :%s",
851	>	target_p->name, target_p->username,
852	>	target_p->host, member->chptr->name,
853	>	(!IsDigit(target_p->account[0]) && target_p->account[0] != '*') ? target_p->account : "*",
854	>	target_p->info);
855	>	sendto_channel_local_butone(target_p, 0, CAP_EXTENDED_JOIN, member->chptr, ":%s!%s@%s JOIN :%s",
856	>	target_p->name, target_p->username,
857	>	target_p->host, member->chptr->name);
858	>
859	>	if (nickbuf[0])
860	>	sendto_channel_local_butone(target_p, 0, 0, member->chptr, ":%s MODE %s +%s %s",
861	>	target_p->servptr->name, member->chptr->name,
862	>	modebuf, nickbuf);
863	>
864	>	}
865	>
866	>	if (target_p->away[0])
867	>	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
868	>	":%s!%s@%s AWAY :%s",
869	>	target_p->name, target_p->username,
870	>	target_p->host, target_p->away);
871	>	}
872	>
873	>	/*! \brief Blindly opers up given source_p, using conf info.
874	>	*         All checks on passwords have already been done.
875	>	* \param source_p Pointer to given client to oper
876		*/
877		void
878		oper_up(struct Client *source_p)
879		{
880		const unsigned int old = source_p->umodes;
881	<	const struct MaskItem *conf = source_p->localClient->confs.head->data;
881	>	const struct MaskItem *const conf = source_p->connection->confs.head->data;
882
883	<	assert(source_p->localClient->confs.head);
883	>	assert(source_p->connection->confs.head);
884
885		++Count.oper;
886		SetOper(source_p);
887
888		if (conf->modes)
889		AddUMode(source_p, conf->modes);
890	<	else if (ConfigFileEntry.oper_umodes)
891	<	AddUMode(source_p, ConfigFileEntry.oper_umodes);
890	>	else if (ConfigGeneral.oper_umodes)
891	>	AddUMode(source_p, ConfigGeneral.oper_umodes);
892
893		if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
894		++Count.invisi;
#	Line 1210 | Line 902 | oper_up(struct Client *source_p)
902
903		if (HasOFlag(source_p, OPER_FLAG_ADMIN))
904		AddUMode(source_p, UMODE_ADMIN);
905	<	if (!HasOFlag(source_p, OPER_FLAG_N))
906	<	DelUMode(source_p, UMODE_NCHANGE);
905	>
906	>	if (!EmptyString(conf->whois))
907	>	{
908	>	client_attach_svstag(source_p, RPL_WHOISOPERATOR, "+", conf->whois);
909	>	sendto_server(source_p, 0, 0, ":%s SVSTAG %s %lu %u + :%s",
910	>	me.id, source_p->id, (unsigned long)source_p->tsinfo,
911	>	RPL_WHOISOPERATOR, conf->whois);
912	>	}
913
914		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
915		get_oper_name(source_p));
916	<	send_umode_out(source_p, source_p, old);
917	<	sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
916	>	sendto_server(NULL, 0, 0, ":%s GLOBOPS :%s is now an operator",
917	>	me.id, get_oper_name(source_p));
918	>	send_umode_out(source_p, old);
919	>	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
920		}
921
922	<	static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
922	>	static char new_uid[TOTALSIDUID + 1];  /* Allow for \0 */
923
924		int
925		valid_sid(const char *sid)
#	Line 1234 | Line 934 | valid_sid(const char *sid)
934
935		/*
936		* init_uid()
937	<	*
937	>	*
938		* inputs       - NONE
939		* output       - NONE
940		* side effects - new_uid is filled in with server id portion (sid)
941	<	*                (first 3 bytes) or defaulted to 'A'.
942	<	*                Rest is filled in with 'A'
941	>	*                (first 3 bytes). Rest is filled in with '9'.
942	>	*
943	>	* NOTE: this function assumes that 'ConfigServerInfo.sid' has been set to a proper value
944		*/
945		void
946		init_uid(void)
947		{
948	<	int i;
1248	<
1249	<	memset(new_uid, 0, sizeof(new_uid));
1250	<
1251	<	if (!EmptyString(ServerInfo.sid))
1252	<	strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1253	<
1254	<	for (i = 0; i < IRC_MAXSID; ++i)
1255	<	if (new_uid[i] == '\0')
1256	<	new_uid[i] = 'A';
1257	<
1258	<	/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1259	<	/* Yes nenolod, I have known it was off by one ever since I wrote it
1260	<	* But *JUST* for you, though, it really doesn't look as *pretty*
1261	<	* -Dianora
1262	<	*/
1263	<	memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1264	<
1265	<	entering_umode_cb = register_callback("entering_umode", NULL);
1266	<	umode_cb = register_callback("changing_umode", change_simple_umode);
948	>	snprintf(new_uid, sizeof(new_uid), "%s999999", ConfigServerInfo.sid);
949		}
950
951		/*
#	Line 1275 | Line 957 | init_uid(void)
957		*                note this is a recursive function
958		*/
959		static void
960	<	add_one_to_uid(int i)
960	>	add_one_to_uid(unsigned int i)
961		{
962	<	if (i != IRC_MAXSID)    /* Not reached server SID portion yet? */
962	>	if (i < IRC_MAXSID)
963	>	return;
964	>
965	>	if (new_uid[i] == 'Z')
966	>	new_uid[i] = '0';
967	>	else if (new_uid[i] == '9')
968		{
969	<	if (new_uid[i] == 'Z')
970	<	new_uid[i] = '0';
1284	<	else if (new_uid[i] == '9')
1285	<	{
1286	<	new_uid[i] = 'A';
1287	<	add_one_to_uid(i-1);
1288	<	}
1289	<	else
1290	<	++new_uid[i];
969	>	new_uid[i] = 'A';
970	>	add_one_to_uid(i - 1);
971		}
972		else
973	<	{
1294	<	/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1295	<	if (new_uid[i] == 'Z')
1296	<	memcpy(new_uid + IRC_MAXSID, "AAAAAA", IRC_MAXUID);
1297	<	else
1298	<	++new_uid[i];
1299	<	}
973	>	++new_uid[i];
974		}
975
976		/*
#	Line 1309 | Line 983 | add_one_to_uid(int i)
983		static const char *
984		uid_get(void)
985		{
986	<	add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
986	>	add_one_to_uid(TOTALSIDUID - 1);  /* Index from 0 */
987		return new_uid;
988		}
989
#	Line 1323 | Line 997 | uid_get(void)
997		void
998		init_isupport(void)
999		{
1326	–	isupportFile = init_MessageLine();
1327	–
1000		add_isupport("CALLERID", NULL, -1);
1001	<	add_isupport("CASEMAPPING", CASEMAP, -1);
1001	>	add_isupport("CASEMAPPING", "rfc1459", -1);
1002		add_isupport("DEAF", "D", -1);
1003		add_isupport("KICKLEN", NULL, KICKLEN);
1004		add_isupport("MODES", NULL, MAXMODEPARAMS);
1333	–	#ifdef HALFOPS
1005		add_isupport("PREFIX", "(ohv)@%+", -1);
1006		add_isupport("STATUSMSG", "@%+", -1);
1007	<	#else
1008	<	add_isupport("PREFIX", "(ov)@+", -1);
1338	<	add_isupport("STATUSMSG", "@+", -1);
1339	<	#endif
1007	>	add_isupport("EXCEPTS", NULL, -1);
1008	>	add_isupport("INVEX", NULL, -1);
1009		}
1010
1011		/*
#	Line 1351 | Line 1020 | init_isupport(void)
1020		void
1021		add_isupport(const char *name, const char *options, int n)
1022		{
1023	<	dlink_node *ptr;
1024	<	struct Isupport *support;
1023	>	dlink_node *node = NULL;
1024	>	struct Isupport *support = NULL;
1025
1026	<	DLINK_FOREACH(ptr, support_list.head)
1026	>	DLINK_FOREACH(node, support_list.head)
1027		{
1028	<	support = ptr->data;
1028	>	support = node->data;
1029		if (irccmp(support->name, name) == 0)
1030		{
1031		MyFree(support->name);
#	Line 1365 | Line 1034 | add_isupport(const char *name, const cha
1034		}
1035		}
1036
1037	<	if (ptr == NULL)
1037	>	if (node == NULL)
1038		{
1039	<	support = MyMalloc(sizeof(*support));
1039	>	support = MyCalloc(sizeof(*support));
1040		dlinkAddTail(support, &support->node, &support_list);
1041		}
1042
1043		support->name = xstrdup(name);
1044	<	if (options != NULL)
1044	>	if (options)
1045		support->options = xstrdup(options);
1046		support->number = n;
1047
#	Line 1389 | Line 1058 | add_isupport(const char *name, const cha
1058		void
1059		delete_isupport(const char *name)
1060		{
1061	<	dlink_node *ptr;
1393	<	struct Isupport *support;
1061	>	dlink_node *node = NULL;
1062
1063	<	DLINK_FOREACH(ptr, support_list.head)
1063	>	DLINK_FOREACH(node, support_list.head)
1064		{
1065	<	support = ptr->data;
1065	>	struct Isupport *support = node->data;
1066	>
1067		if (irccmp(support->name, name) == 0)
1068		{
1069	<	dlinkDelete(ptr, &support_list);
1069	>	dlinkDelete(node, &support_list);
1070		MyFree(support->name);
1071		MyFree(support->options);
1072		MyFree(support);
#	Line 1420 | Line 1089 | rebuild_isupport_message_line(void)
1089		{
1090		char isupportbuffer[IRCD_BUFSIZE];
1091		char *p = isupportbuffer;
1092	<	dlink_node *ptr = NULL;
1092	>	dlink_node *node = NULL, *node_next = NULL;
1093		int n = 0;
1094		int tokens = 0;
1095		size_t len = 0;
1096	<	size_t reserve = strlen(me.name) + HOSTLEN + strlen(form_str(RPL_ISUPPORT));
1096	>	size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1097
1098	<	destroy_MessageLine(isupportFile);
1098	>	DLINK_FOREACH_SAFE(node, node_next, support_list_lines.head)
1099	>	{
1100	>	dlinkDelete(node, &support_list_lines);
1101	>	MyFree(node->data);
1102	>	free_dlink_node(node);
1103	>	}
1104
1105	<	DLINK_FOREACH(ptr, support_list.head)
1105	>	DLINK_FOREACH(node, support_list.head)
1106		{
1107	<	struct Isupport *support = ptr->data;
1107	>	struct Isupport *support = node->data;
1108
1109		p += (n = sprintf(p, "%s", support->name));
1110		len += n;
1111
1112	<	if (support->options != NULL)
1112	>	if (support->options)
1113		{
1114		p += (n = sprintf(p, "=%s", support->options));
1115		len += n;
#	Line 1456 | Line 1130 | rebuild_isupport_message_line(void)
1130		if (*--p == ' ')
1131		*p = '\0';
1132
1133	<	addto_MessageLine(isupportFile, isupportbuffer);
1133	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1134		p = isupportbuffer;
1135		len = 0;
1136		n = tokens = 0;
1137		}
1138		}
1139
1140	<	if (len != 0)
1140	>	if (len)
1141		{
1142		if (*--p == ' ')
1143		*p = '\0';
1144	<	addto_MessageLine(isupportFile, isupportbuffer);
1144	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1145		}
1146		}

Diff Legend

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