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 3176 by michael, Tue Mar 18 20:00:16 2014 UTC vs.
ircd-hybrid/trunk/src/user.c (file contents), Revision 7997 by michael, Tue Mar 14 13:17:52 2017 UTC

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

Comparing:
ircd-hybrid/trunk/src/s_user.c (property svn:keywords), Revision 3176 by michael, Tue Mar 18 20:00:16 2014 UTC vs.
ircd-hybrid/trunk/src/user.c (property svn:keywords), Revision 7997 by michael, Tue Mar 14 13:17:52 2017 UTC

#	Line 1 | Line 1
1	<	Id Revision
1	>	Id

Diff Legend

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