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/user.c (file contents):
Revision 6161 by michael, Thu Jun 18 10:55:29 2015 UTC vs.
Revision 8214 by michael, Sun Apr 16 11:44:44 2017 UTC

#	Line 1 | Line 1
1		/*
2		*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (c) 1997-2015 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 38 | Line 38
38		#include "motd.h"
39		#include "numeric.h"
40		#include "conf.h"
41	+	#include "conf_gecos.h"
42		#include "log.h"
43		#include "server.h"
44	+	#include "server_capab.h" /* TBR: RHOST compatibility mode */
45		#include "send.h"
46		#include "memory.h"
47		#include "packet.h"
#	Line 48 | Line 50
50		#include "misc.h"
51		#include "parse.h"
52		#include "watch.h"
53	+	#include "isupport.h"
54	+	#include "tls.h"
55
56	<	static char umode_buffer[IRCD_BUFSIZE];
53	<
54	<	/* Used for building up the isupport string,
55	<	* used with init_isupport, add_isupport, delete_isupport
56	<	*/
57	<	struct Isupport
58	<	{
59	<	dlink_node node;
60	<	char *name;
61	<	char *options;
62	<	int number;
63	<	};
64	<
65	<	static dlink_list support_list;
66	<	static dlink_list support_list_lines;
56	>	static char umode_buffer[UMODE_MAX_STR];
57
58		const struct user_modes *umode_map[256];
59		const struct user_modes  umode_tab[] =
#	Line 94 | Line 84 | const struct user_modes  umode_tab[] =
84		{ 's', UMODE_SERVNOTICE   },
85		{ 'u', UMODE_UNAUTH       },
86		{ 'w', UMODE_WALLOP       },
97	–	{ 'x', UMODE_HIDDENHOST   },
87		{ 'y', UMODE_SPY          },
88		{ '\0', 0 }
89		};
90
91		void
92	<	user_usermodes_init(void)
92	>	user_modes_init(void)
93		{
94		char *umode_buffer_ptr = umode_buffer;
95
#	Line 120 | Line 109 | user_usermodes_init(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),
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, (Count.total - Count.invisi),
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)
122	<	sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper);
122	>	sendto_one_numeric(client_p, &me, RPL_LUSEROP, Count.oper);
123
124		if (dlink_list_length(&unknown_list))
125	<	sendto_one_numeric(source_p, &me, RPL_LUSERUNKNOWN, dlink_list_length(&unknown_list));
125	>	sendto_one_numeric(client_p, &me, RPL_LUSERUNKNOWN, dlink_list_length(&unknown_list));
126
127		if (dlink_list_length(&channel_list))
128	<	sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, 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	>	sendto_one_numeric(client_p, &me, RPL_GLOBALUSERS, dlink_list_length(&global_client_list), Count.max_tot);
135	>	sendto_one_numeric(client_p, &me, RPL_STATSCONN, Count.max_loc_con, Count.max_loc, Count.totalrestartcount);
136		}
137		else
138		{
139	<	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.total, 0);
140	<	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.total, Count.max_tot);
139	>	sendto_one_numeric(client_p, &me, RPL_LUSERME, dlink_list_length(&global_client_list), 0);
140	>	sendto_one_numeric(client_p, &me, RPL_LOCALUSERS, dlink_list_length(&global_client_list), Count.max_tot);
141	>	sendto_one_numeric(client_p, &me, RPL_GLOBALUSERS, dlink_list_length(&global_client_list), Count.max_tot);
142		}
151	–
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_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;
143		}
144
165	–	/* show_isupport()
166	–	*
167	–	* inputs       - pointer to client
168	–	* output       - NONE
169	–	* side effects - display to client what we support (for them)
170	–	*/
171	–	void
172	–	show_isupport(struct Client *source_p)
173	–	{
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	–
145		/* report_and_set_user_flags()
146		*
147	<	* inputs       - pointer to source_p
147	>	* inputs       - pointer to client_p
148		*              - pointer to conf for this user
149		* output       - NONE
150		* side effects - Report to user any special flags
151		*                they are getting, and set them.
152		*/
153		static void
154	<	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
154	>	report_and_set_user_flags(struct Client *client_p, const struct MaskItem *conf)
155		{
156		/* If this user is being spoofed, tell them so */
157		if (IsConfDoSpoofIp(conf))
158	<	sendto_one_notice(source_p, &me, ":*** Spoofing your IP. Congrats.");
158	>	sendto_one_notice(client_p, &me, ":*** Spoofing your IP");
159
160		/* If this user is in the exception class, set it "E lined" */
161		if (IsConfExemptKline(conf))
162		{
163	<	SetExemptKline(source_p);
164	<	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D lines. Congrats.");
163	>	AddFlag(client_p, FLAGS_EXEMPTKLINE);
164	>	sendto_one_notice(client_p, &me, ":*** You are exempt from K/D lines");
165		}
166
167		if (IsConfExemptXline(conf))
168		{
169	<	SetExemptXline(source_p);
170	<	sendto_one_notice(source_p, &me, ":*** You are exempt from X lines. Congrats.");
169	>	AddFlag(client_p, FLAGS_EXEMPTXLINE);
170	>	sendto_one_notice(client_p, &me, ":*** You are exempt from X lines");
171		}
172
173		if (IsConfExemptResv(conf))
174		{
175	<	SetExemptResv(source_p);
176	<	sendto_one_notice(source_p, &me, ":*** You are exempt from resvs. Congrats.");
175	>	AddFlag(client_p, FLAGS_EXEMPTRESV);
176	>	sendto_one_notice(client_p, &me, ":*** You are exempt from resvs");
177		}
178
179		/* If this user is exempt from user limits set it "F lined" */
180		if (IsConfExemptLimits(conf))
181		{
182	<	SetExemptLimits(source_p);
183	<	sendto_one_notice(source_p, &me, ":*** You are exempt from user limits. Congrats.");
182	>	AddFlag(client_p, FLAGS_NOLIMIT);
183	>	sendto_one_notice(client_p, &me, ":*** You are exempt from user limits");
184		}
185
186		if (IsConfCanFlood(conf))
187		{
188	<	SetCanFlood(source_p);
189	<	sendto_one_notice(source_p, &me, ":*** You are exempt from flood "
226	<	"protection, aren't you fearsome.");
188	>	AddFlag(client_p, FLAGS_CANFLOOD);
189	>	sendto_one_notice(client_p, &me, ":*** You are exempt from flood protection");
190		}
191		}
192
193		/* introduce_client()
194		*
195	<	* inputs       - source_p
195	>	* inputs       - client_p
196		* output       - NONE
197		* side effects - This common function introduces a client to the rest
198		*                of the net, either from a local client connect or
199		*                from a remote connect.
200		*/
201		static void
202	<	introduce_client(struct Client *source_p)
202	>	introduce_client(struct Client *client_p)
203		{
204	<	dlink_node *node = NULL;
205	<	char ubuf[IRCD_BUFSIZE] = "";
243	<
244	<	if (MyClient(source_p))
245	<	send_umode(source_p, source_p, 0, ubuf);
246	<	else
247	<	send_umode(NULL, source_p, 0, ubuf);
204	>	dlink_node *node;
205	>	char buf[UMODE_MAX_STR] = "";
206
207	<	watch_check_hash(source_p, RPL_LOGON);
207	>	send_umode(client_p, MyConnect(client_p), 0, buf);
208	>	watch_check_hash(client_p, RPL_LOGON);
209
210	<	if (ubuf[0] == '\0')
210	>	if (buf[0] == '\0')
211		{
212	<	ubuf[0] = '+';
213	<	ubuf[1] = '\0';
212	>	buf[0] = '+';
213	>	buf[1] = '\0';
214		}
215
216		DLINK_FOREACH(node, local_server_list.head)
217		{
218	<	struct Client *server = node->data;
218	>	struct Client *server_p = node->data;
219
220	<	if (server == source_p->from)
220	>	if (server_p == client_p->from)
221		continue;
222
223	<	if (IsCapable(server, CAP_SVS))
224	<	sendto_one(server, ":%s UID %s %u %lu %s %s %s %s %s %s :%s",
225	<	source_p->servptr->id,
226	<	source_p->name, source_p->hopcount+1,
227	<	(unsigned long)source_p->tsinfo,
228	<	ubuf, source_p->username, source_p->host,
229	<	source_p->sockhost, source_p->id,
230	<	source_p->account,
231	<	source_p->info);
223	>	/* TBR: compatibility mode */
224	>	if (IsCapable(server_p, CAPAB_RHOST))
225	>	sendto_one(server_p, ":%s UID %s %u %ju %s %s %s %s %s %s %s :%s",
226	>	client_p->servptr->id,
227	>	client_p->name, client_p->hopcount+1,
228	>	client_p->tsinfo,
229	>	buf, client_p->username, client_p->host, client_p->realhost,
230	>	client_p->sockhost, client_p->id,
231	>	client_p->account,
232	>	client_p->info);
233		else
234	<	sendto_one(server, ":%s UID %s %u %lu %s %s %s %s %s :%s",
235	<	source_p->servptr->id,
236	<	source_p->name, source_p->hopcount+1,
237	<	(unsigned long)source_p->tsinfo,
238	<	ubuf, source_p->username, source_p->host,
239	<	source_p->sockhost, source_p->id, source_p->info);
234	>	sendto_one(server_p, ":%s UID %s %u %ju %s %s %s %s %s %s :%s",
235	>	client_p->servptr->id,
236	>	client_p->name, client_p->hopcount+1,
237	>	client_p->tsinfo,
238	>	buf, client_p->username, client_p->host,
239	>	client_p->sockhost, client_p->id,
240	>	client_p->account,
241	>	client_p->info);
242
243	<	if (!EmptyString(source_p->certfp))
244	<	sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
243	>	if (!EmptyString(client_p->certfp))
244	>	sendto_one(server_p, ":%s CERTFP %s", client_p->id, client_p->certfp);
245		}
246		}
247
#	Line 290 | Line 252 | introduce_client(struct Client *source_p
252		* side effects -
253		*/
254		static void
255	<	user_welcome(struct Client *source_p)
255	>	user_welcome(struct Client *client_p)
256		{
295	–	#if defined(__TIME__) && defined(__DATE__)
257		static const char built_date[] = __DATE__ " at " __TIME__;
297	–	#else
298	–	static const char built_date[] = "unknown";
299	–	#endif
300	–
301	–	#ifdef HAVE_LIBCRYPTO
302	–	if (HasFlag(source_p, FLAGS_SSL))
303	–	{
304	–	AddUMode(source_p, UMODE_SSL);
305	–	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
306	–	ssl_get_cipher(source_p->connection->fd.ssl));
307	–	}
308	–	#endif
309	–
310	–	sendto_one_numeric(source_p, &me, RPL_WELCOME, ConfigServerInfo.network_name,
311	–	source_p->name);
312	–	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
313	–	get_listener_name(source_p->connection->listener), ircd_version);
314	–	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
315	–	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
316	–	show_isupport(source_p);
317	–	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
258
259	<	show_lusers(source_p);
260	<	motd_signon(source_p);
259	>	if (HasFlag(client_p, FLAGS_SSL))
260	>	{
261	>	AddUMode(client_p, UMODE_SSL);
262	>	sendto_one_notice(client_p, &me, ":*** Connected securely via %s",
263	>	tls_get_cipher(&client_p->connection->fd.ssl));
264	>	}
265	>
266	>	sendto_one_numeric(client_p, &me, RPL_WELCOME, ConfigServerInfo.network_name,
267	>	client_p->name);
268	>	sendto_one_numeric(client_p, &me, RPL_YOURHOST,
269	>	listener_get_name(client_p->connection->listener), ircd_version);
270	>	sendto_one_numeric(client_p, &me, RPL_CREATED, built_date);
271	>	sendto_one_numeric(client_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
272	>
273	>	isupport_show(client_p);
274	>	show_lusers(client_p);
275	>	motd_signon(client_p);
276		}
277
278		/* check_xline()
#	Line 327 | Line 282 | user_welcome(struct Client *source_p)
282		* side effects -
283		*/
284		static int
285	<	check_xline(struct Client *source_p)
285	>	check_xline(struct Client *client_p)
286		{
287	<	struct MaskItem *conf = NULL;
287	>	const struct GecosItem *gecos = NULL;
288
289	<	if (IsExemptXline(source_p))
289	>	if (HasFlag(client_p, FLAGS_EXEMPTXLINE))
290		return 0;
291
292	<	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
292	>	if ((gecos = gecos_find(client_p->info, match)))
293		{
339	–	++conf->count;
294		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
295		"X-line Rejecting [%s] [%s], user %s [%s]",
296	<	source_p->info, conf->reason,
297	<	get_client_name(source_p, HIDE_IP),
298	<	source_p->sockhost);
296	>	client_p->info, gecos->reason,
297	>	client_get_name(client_p, HIDE_IP),
298	>	client_p->sockhost);
299
300		++ServerStats.is_ref;
301	<	exit_client(source_p, "Bad user info");
301	>	exit_client(client_p, "Bad user info");
302		return 1;
303		}
304
#	Line 354 | Line 308 | check_xline(struct Client *source_p)
308		/*! \brief This function is called when both NICK and USER messages
309		*      have been accepted for the client, in whatever order. Only
310		*      after this, is the UID message propagated.
311	<	* \param source_p Pointer to given client to introduce
311	>	* \param client_p Pointer to given client to introduce
312		*/
313		void
314	<	register_local_user(struct Client *source_p)
314	>	register_local_user(struct Client *client_p)
315		{
362	–	const char *id = NULL;
316		const struct MaskItem *conf = NULL;
317
318	<	assert(source_p == source_p->from);
319	<	assert(MyConnect(source_p));
320	<	assert(IsUnknown(source_p));
321	<	assert(!source_p->connection->registration);
318	>	assert(client_p == client_p->from);
319	>	assert(MyConnect(client_p));
320	>	assert(IsUnknown(client_p));
321	>	assert(!client_p->connection->registration);
322
323		if (ConfigGeneral.ping_cookie)
324		{
325	<	if (!IsPingSent(source_p) && !source_p->connection->random_ping)
325	>	if (!HasFlag(client_p, FLAGS_PINGSENT) && !client_p->connection->random_ping)
326		{
327		do
328	<	source_p->connection->random_ping = genrand_int32();
329	<	while (!source_p->connection->random_ping);
328	>	client_p->connection->random_ping = genrand_int32();
329	>	while (!client_p->connection->random_ping);
330
331	<	sendto_one(source_p, "PING :%u", source_p->connection->random_ping);
332	<	SetPingSent(source_p);
331	>	sendto_one(client_p, "PING :%u", client_p->connection->random_ping);
332	>	AddFlag(client_p, FLAGS_PINGSENT);
333		return;
334		}
335
336	<	if (!HasPingCookie(source_p))
336	>	if (!HasFlag(client_p, FLAGS_PING_COOKIE))
337		return;
338		}
339
340	<	source_p->connection->last_privmsg = CurrentTime;
340	>	client_p->connection->last_privmsg = CurrentTime;
341		/* Straight up the maximum rate of flooding... */
342	<	source_p->connection->allow_read = MAX_FLOOD_BURST;
342	>	client_p->connection->allow_read = MAX_FLOOD_BURST;
343
344	<	if (!check_client(source_p))
344	>	if (!check_client(client_p))
345		return;
346
347	<	if (!valid_hostname(source_p->host))
347	>	if (!valid_hostname(client_p->host))
348		{
349	<	sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
349	>	sendto_one_notice(client_p, &me, ":*** Notice -- You have an illegal "
350		"character in your hostname");
351	<	strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
351	>	strlcpy(client_p->host, client_p->sockhost, sizeof(client_p->host));
352		}
353
354	<	conf = source_p->connection->confs.head->data;
354	>	conf = client_p->connection->confs.head->data;
355
356	<	if (!IsGotId(source_p))
356	>	if (!HasFlag(client_p, FLAGS_GOTID))
357		{
358		char username[USERLEN + 1] = "";
406	–	const char *p = username;
359		unsigned int i = 0;
360
361		if (IsNeedIdentd(conf))
362		{
363		++ServerStats.is_ref;
364	<	sendto_one_notice(source_p, &me, ":*** Notice -- You need to install "
364	>	sendto_one_notice(client_p, &me, ":*** Notice -- You need to install "
365		"identd to use this server");
366	<	exit_client(source_p, "Install identd");
366	>	exit_client(client_p, "Install identd");
367		return;
368		}
369
370	<	strlcpy(username, source_p->username, sizeof(username));
370	>	strlcpy(username, client_p->username, sizeof(username));
371
372		if (!IsNoTilde(conf))
373	<	source_p->username[i++] = '~';
373	>	client_p->username[i++] = '~';
374
375	<	for (; *p && i < USERLEN; ++p)
376	<	source_p->username[i++] = *p;
375	>	for (const char *p = username; *p && i < USERLEN; ++p)
376	>	client_p->username[i++] = *p;
377
378	<	source_p->username[i] = '\0';
378	>	client_p->username[i] = '\0';
379		}
380
381		/* Password check */
382		if (!EmptyString(conf->passwd))
383		{
384	<	if (!match_conf_password(source_p->connection->password, conf))
384	>	if (!match_conf_password(client_p->connection->password, conf))
385		{
386		++ServerStats.is_ref;
387
388	<	sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
389	<	exit_client(source_p, "Bad Password");
388	>	sendto_one_numeric(client_p, &me, ERR_PASSWDMISMATCH);
389	>	exit_client(client_p, "Bad Password");
390		return;
391		}
392		}
393
394		/*
395	<	* Don't free source_p->connection->password here - it can be required
395	>	* Don't free client_p->connection->password here - it can be required
396		* by masked /stats I if there are auth {} blocks with need_password = no;
397		* --adx
398		*/
399
400		/*
401	<	* Report if user has &^>= etc. and set flags as needed in source_p
401	>	* Report if user has &^>= etc. and set flags as needed in client_p
402		*/
403	<	report_and_set_user_flags(source_p, conf);
403	>	report_and_set_user_flags(client_p, conf);
404
405	<	if (IsDead(source_p))
405	>	if (IsDead(client_p))
406		return;
407
408		/*
#	Line 461 | Line 413 | register_local_user(struct Client *sourc
413		* probably be just a percentage of the MAXCLIENTS...
414		*   -Taner
415		*/
416	<	if ((Count.local >= GlobalSetOptions.maxclients + MAX_BUFFER) ||
417	<	(Count.local >= GlobalSetOptions.maxclients && !IsExemptLimits(source_p)))
416	>	if ((dlink_list_length(&local_client_list) >= GlobalSetOptions.maxclients + MAX_BUFFER) ||
417	>	(dlink_list_length(&local_client_list) >= GlobalSetOptions.maxclients && !HasFlag(client_p, FLAGS_NOLIMIT)))
418		{
419		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
420		"Too many clients, rejecting %s[%s].",
421	<	source_p->name, source_p->host);
421	>	client_p->name, client_p->host);
422		++ServerStats.is_ref;
423	<	exit_client(source_p, "Sorry, server is full - try later");
423	>	exit_client(client_p, "Sorry, server is full - try later");
424		return;
425		}
426
427	<	if (!valid_username(source_p->username, 1))
427	>	if (!valid_username(client_p->username, 1))
428		{
429		char buf[IRCD_BUFSIZE] = "";
430
431		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
432		"Invalid username: %s (%s@%s)",
433	<	source_p->name, source_p->username, source_p->host);
433	>	client_p->name, client_p->username, client_p->host);
434		++ServerStats.is_ref;
435	<	snprintf(buf, sizeof(buf), "Invalid username [%s]", source_p->username);
436	<	exit_client(source_p, buf);
435	>	snprintf(buf, sizeof(buf), "Invalid username [%s]", client_p->username);
436	>	exit_client(client_p, buf);
437		return;
438		}
439
440	<	if (check_xline(source_p))
440	>	if (check_xline(client_p))
441		return;
442
443	+	const char *id;
444		while (hash_find_id((id = uid_get())))
445		;
446
447	<	strlcpy(source_p->id, id, sizeof(source_p->id));
448	<	hash_add_id(source_p);
447	>	strlcpy(client_p->id, id, sizeof(client_p->id));
448	>	hash_add_id(client_p);
449
450		sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
451		"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
452	<	source_p->name, source_p->username, source_p->host,
453	<	source_p->sockhost,
454	<	get_client_class(&source_p->connection->confs),
455	<	source_p->info, source_p->id);
452	>	client_p->name, client_p->username, client_p->host,
453	>	client_p->sockhost,
454	>	get_client_class(&client_p->connection->confs),
455	>	client_p->info, client_p->id);
456
457		if (ConfigGeneral.invisible_on_connect)
458		{
459	<	AddUMode(source_p, UMODE_INVISIBLE);
459	>	AddUMode(client_p, UMODE_INVISIBLE);
460		++Count.invisi;
461		}
462
463	<	if (++Count.local > Count.max_loc)
463	>	assert(client_p->servptr == &me);
464	>	SetClient(client_p);
465	>	dlinkAdd(client_p, &client_p->lnode, &client_p->servptr->serv->client_list);
466	>	dlinkAdd(client_p, &client_p->node, &global_client_list);
467	>
468	>	assert(dlinkFind(&unknown_list, client_p));
469	>
470	>	dlink_move_node(&client_p->connection->lclient_node,
471	>	&unknown_list, &local_client_list);
472	>
473	>	if (dlink_list_length(&local_client_list) > Count.max_loc)
474		{
475	<	Count.max_loc = Count.local;
475	>	Count.max_loc = dlink_list_length(&local_client_list);
476
477		if (!(Count.max_loc % 10))
478	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
478	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
479		"New maximum local client connections: %u",
480		Count.max_loc);
481		}
482
483	<	if (++Count.total > Count.max_tot)
484	<	Count.max_tot = Count.total;
485	<	++Count.totalrestartcount;
486	<
524	<	assert(source_p->servptr == &me);
525	<	SetClient(source_p);
526	<	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
527	<	dlinkAdd(source_p, &source_p->node, &global_client_list);
528	<
529	<	assert(dlinkFind(&unknown_list, source_p));
483	>	if ((dlink_list_length(&local_client_list) +
484	>	dlink_list_length(&local_server_list)) > Count.max_loc_con)
485	>	Count.max_loc_con = dlink_list_length(&local_client_list) +
486	>	dlink_list_length(&local_server_list);
487
488	<	dlink_move_node(&source_p->connection->lclient_node,
489	<	&unknown_list, &local_client_list);
488	>	if (dlink_list_length(&global_client_list) > Count.max_tot)
489	>	Count.max_tot = dlink_list_length(&global_client_list);
490	>	++Count.totalrestartcount;
491
492	<	user_welcome(source_p);
493	<	add_user_host(source_p->username, source_p->host, 0);
494	<	SetUserHost(source_p);
492	>	user_welcome(client_p);
493	>	userhost_add(client_p->sockhost, 0);
494	>	AddFlag(client_p, FLAGS_USERHOST);
495
496	<	introduce_client(source_p);
496	>	introduce_client(client_p);
497		}
498
499		/* register_remote_user()
500		*
501	<	* inputs       - source_p remote or directly connected client
501	>	* inputs       - client_p remote or directly connected client
502		*              - username to register as
503		*              - host name to register as
504		*              - server name
#	Line 549 | Line 507 | register_local_user(struct Client *sourc
507		*                is introduced by a server.
508		*/
509		void
510	<	register_remote_user(struct Client *source_p)
510	>	register_remote_user(struct Client *client_p)
511		{
512	<	const struct Client *target_p = NULL;
555	<
556	<	if ((target_p = source_p->servptr) && target_p->from != source_p->from)
557	<	{
558	<	sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
559	<	"Bad User [%s] :%s USER %s@%s %s, != %s[%s]",
560	<	source_p->from->name, source_p->name, source_p->username,
561	<	source_p->host, source_p->servptr->name,
562	<	target_p->name, target_p->from->name);
563	<	sendto_one(source_p->from,
564	<	":%s KILL %s :%s (UID from wrong direction (%s != %s))",
565	<	me.id, source_p->id, me.name, source_p->servptr->name,
566	<	target_p->from->name);
567	<
568	<	AddFlag(source_p, FLAGS_KILLED);
569	<	exit_client(source_p, "UID server wrong direction");
570	<	return;
571	<	}
512	>	assert(client_p->servptr->from == client_p->from);
513
514		/*
515		* If the nick has been introduced by a services server,
516		* make it a service as well.
517		*/
518	<	if (HasFlag(source_p->servptr, FLAGS_SERVICE))
519	<	AddFlag(source_p, FLAGS_SERVICE);
518	>	if (HasFlag(client_p->servptr, FLAGS_SERVICE))
519	>	AddFlag(client_p, FLAGS_SERVICE);
520
521	<	if (++Count.total > Count.max_tot)
522	<	Count.max_tot = Count.total;
521	>	SetClient(client_p);
522	>	dlinkAdd(client_p, &client_p->lnode, &client_p->servptr->serv->client_list);
523	>	dlinkAdd(client_p, &client_p->node, &global_client_list);
524
525	<	SetClient(source_p);
526	<	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
585	<	dlinkAdd(source_p, &source_p->node, &global_client_list);
586	<	add_user_host(source_p->username, source_p->host, 1);
587	<	SetUserHost(source_p);
525	>	if (dlink_list_length(&global_client_list) > Count.max_tot)
526	>	Count.max_tot = dlink_list_length(&global_client_list);
527
528	<	if (HasFlag(source_p->servptr, FLAGS_EOB))
528	>	userhost_add(client_p->sockhost, 1);
529	>	AddFlag(client_p, FLAGS_USERHOST);
530	>
531	>	if (HasFlag(client_p->servptr, FLAGS_EOB))
532		sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
533		"Client connecting at %s: %s (%s@%s) [%s] [%s] <%s>",
534	<	source_p->servptr->name,
535	<	source_p->name, source_p->username, source_p->host,
536	<	source_p->sockhost, source_p->info, source_p->id);
534	>	client_p->servptr->name,
535	>	client_p->name, client_p->username, client_p->host,
536	>	client_p->sockhost, client_p->info, client_p->id);
537
538	<	introduce_client(source_p);
538	>	introduce_client(client_p);
539		}
540
541		/* valid_hostname()
#	Line 636 | Line 578 | valid_hostname(const char *hostname)
578		int
579		valid_username(const char *username, const int local)
580		{
639	–	unsigned int dots = 0;
581		const char *p = username;
582
583		assert(p);
#	Line 654 | Line 595 | valid_username(const char *username, con
595
596		if (local)
597		{
598	+	unsigned int dots = 0;
599	+
600		while (*++p)
601		{
602		if (*p == '.' && ConfigGeneral.dots_in_ident)
#	Line 704 | Line 647 | valid_nickname(const char *nickname, con
647		return p - nickname <= NICKLEN;
648		}
649
650	<	/* send_umode()
651	<	* send the MODE string for user (user) to connection client_p
652	<	* -avalon
653	<	*
654	<	* inputs       - client_p
712	<	*              - source_p
713	<	*              - int old
714	<	*              - sendmask mask of modes to send
715	<	*              - suplied umode_buf
716	<	* output       - NONE
650	>	/*! \brief Builds a mode change string to buffer pointed by \a buf
651	>	* \param client_p  Pointer to client
652	>	* \param dispatch  Whether to send a MODE message to client_p
653	>	* \param old       Old user mode to compare against when building new mode buffer
654	>	* \param buf       Pointer to buffer to build string in
655		*/
656		void
657	<	send_umode(struct Client *client_p, struct Client *source_p,
658	<	unsigned int old, char *umode_buf)
657	>	send_umode(struct Client *client_p, unsigned int dispatch,
658	>	unsigned int old, char *buf)
659		{
660	<	char *m = umode_buf;
660	>	char *m = buf;
661		int what = 0;
662
663		/*
664		* Build a string in umode_buf to represent the change in the user's
665	<	* mode between the new (source_p->umodes) and 'old'.
665	>	* mode between the new (client_p->umodes) and 'old'.
666		*/
667		for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
668		{
669	<	if ((tab->flag & old) && !HasUMode(source_p, tab->flag))
669	>	if ((tab->flag & old) && !HasUMode(client_p, tab->flag))
670		{
671		if (what == MODE_DEL)
672		*m++ = tab->c;
#	Line 739 | Line 677 | send_umode(struct Client *client_p, stru
677		*m++ = tab->c;
678		}
679		}
680	<	else if (!(tab->flag & old) && HasUMode(source_p, tab->flag))
680	>	else if (!(tab->flag & old) && HasUMode(client_p, tab->flag))
681		{
682		if (what == MODE_ADD)
683		*m++ = tab->c;
#	Line 754 | Line 692 | send_umode(struct Client *client_p, stru
692
693		*m = '\0';
694
695	<	if (*umode_buf && client_p)
695	>	if (dispatch && *buf)
696		sendto_one(client_p, ":%s!%s@%s MODE %s :%s",
697		client_p->name, client_p->username,
698	<	client_p->host, client_p->name, umode_buf);
698	>	client_p->host, client_p->name, buf);
699		}
700
701		/* send_umode_out()
#	Line 767 | Line 705 | send_umode(struct Client *client_p, stru
705		* side effects - Only send ubuf out to servers that know about this client
706		*/
707		void
708	<	send_umode_out(struct Client *source_p, unsigned int old)
708	>	send_umode_out(struct Client *client_p, unsigned int old)
709		{
710	<	char buf[IRCD_BUFSIZE] = "";
710	>	char buf[UMODE_MAX_STR] = "";
711
712	<	send_umode(MyClient(source_p) ? source_p : NULL, source_p, old, buf);
712	>	send_umode(client_p, MyConnect(client_p), old, buf);
713
714		if (buf[0])
715	<	sendto_server(source_p, 0, 0, ":%s MODE %s :%s",
716	<	source_p->id, source_p->id, buf);
715	>	sendto_server(client_p, 0, 0, ":%s MODE %s :%s",
716	>	client_p->id, client_p->id, buf);
717		}
718
719		void
720	<	user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
720	>	user_set_hostmask(struct Client *client_p, const char *hostname)
721		{
722	<	dlink_node *node = NULL;
722	>	dlink_node *node;
723
724	<	if (!strcmp(target_p->host, hostname))
724	>	if (!strcmp(client_p->host, hostname))
725		return;
726
789	–	switch (what)
790	–	{
791	–	case MODE_ADD:
792	–	AddUMode(target_p, UMODE_HIDDENHOST);
793	–	break;
794	–	case MODE_DEL:
795	–	DelUMode(target_p, UMODE_HIDDENHOST);
796	–	break;
797	–	default: return;
798	–	}
799	–
727		if (ConfigGeneral.cycle_on_host_change)
728	<	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
729	<	target_p->name, target_p->username, target_p->host);
803	<
804	<	if (IsUserHostIp(target_p))
805	<	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
728	>	sendto_common_channels_local(client_p, 0, 0, CAP_CHGHOST, ":%s!%s@%s QUIT :Changing hostname",
729	>	client_p->name, client_p->username, client_p->host);
730
731	<	strlcpy(target_p->host, hostname, sizeof(target_p->host));
731	>	sendto_common_channels_local(client_p, 0, CAP_CHGHOST, 0, ":%s!%s@%s CHGHOST %s %s",
732	>	client_p->name, client_p->username,
733	>	client_p->host, client_p->username, hostname);
734
735	<	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
810	<	SetUserHost(target_p);
735	>	strlcpy(client_p->host, hostname, sizeof(client_p->host));
736
737	<	if (MyClient(target_p))
737	>	if (MyConnect(client_p))
738		{
739	<	sendto_one_numeric(target_p, &me, RPL_VISIBLEHOST, target_p->host);
740	<	clear_ban_cache_client(target_p);
739	>	sendto_one_numeric(client_p, &me, RPL_VISIBLEHOST, client_p->host);
740	>	clear_ban_cache_list(&client_p->channel);
741		}
742
743		if (!ConfigGeneral.cycle_on_host_change)
744		return;
745
746	<	DLINK_FOREACH(node, target_p->channel.head)
746	>	DLINK_FOREACH(node, client_p->channel.head)
747		{
748	<	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
748	>	char modebuf[CMEMBER_STATUS_FLAGS_LEN + 1];
749	>	char nickbuf[CMEMBER_STATUS_FLAGS_LEN * NICKLEN + CMEMBER_STATUS_FLAGS_LEN] = "";
750		char *p = modebuf;
751		int len = 0;
752		const struct Membership *member = node->data;
#	Line 828 | Line 754 | user_set_hostmask(struct Client *target_
754		if (has_member_flags(member, CHFL_CHANOP))
755		{
756		*p++ = 'o';
757	<	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
757	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", client_p->name);
758		}
759
760		if (has_member_flags(member, CHFL_HALFOP))
761		{
762		*p++ = 'h';
763	<	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
763	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", client_p->name);
764		}
765
766		if (has_member_flags(member, CHFL_VOICE))
767		{
768		*p++ = 'v';
769	<	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
769	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", client_p->name);
770		}
771
772		*p = '\0';
773
774	<
775	<	sendto_channel_local_butone(target_p, CAP_EXTENDED_JOIN, 0, member->chptr, ":%s!%s@%s JOIN %s %s :%s",
776	<	target_p->name, target_p->username,
777	<	target_p->host, member->chptr->name,
778	<	(!IsDigit(target_p->account[0]) && target_p->account[0] != '*') ? target_p->account : "*",
779	<	target_p->info);
780	<	sendto_channel_local_butone(target_p, 0, CAP_EXTENDED_JOIN, member->chptr, ":%s!%s@%s JOIN :%s",
855	<	target_p->name, target_p->username,
856	<	target_p->host, member->chptr->name);
774	>	sendto_channel_local(client_p, member->chptr, 0, CAP_EXTENDED_JOIN, CAP_CHGHOST, ":%s!%s@%s JOIN %s %s :%s",
775	>	client_p->name, client_p->username,
776	>	client_p->host, member->chptr->name,
777	>	client_p->account, client_p->info);
778	>	sendto_channel_local(client_p, member->chptr, 0, 0, CAP_EXTENDED_JOIN | CAP_CHGHOST, ":%s!%s@%s JOIN :%s",
779	>	client_p->name, client_p->username,
780	>	client_p->host, member->chptr->name);
781
782		if (nickbuf[0])
783	<	sendto_channel_local_butone(target_p, 0, 0, member->chptr, ":%s MODE %s +%s %s",
784	<	target_p->servptr->name, member->chptr->name,
785	<	modebuf, nickbuf);
862	<
783	>	sendto_channel_local(client_p, member->chptr, 0, 0, CAP_CHGHOST, ":%s MODE %s +%s %s",
784	>	client_p->servptr->name, member->chptr->name,
785	>	modebuf, nickbuf);
786		}
787
788	<	if (target_p->away[0])
789	<	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
788	>	if (client_p->away[0])
789	>	sendto_common_channels_local(client_p, 0, CAP_AWAY_NOTIFY, CAP_CHGHOST,
790		":%s!%s@%s AWAY :%s",
791	<	target_p->name, target_p->username,
792	<	target_p->host, target_p->away);
870	<	}
871	<
872	<	/*! \brief Blindly opers up given source_p, using conf info.
873	<	*         All checks on passwords have already been done.
874	<	* \param source_p Pointer to given client to oper
875	<	*/
876	<	void
877	<	oper_up(struct Client *source_p)
878	<	{
879	<	const unsigned int old = source_p->umodes;
880	<	const struct MaskItem *const conf = source_p->connection->confs.head->data;
881	<
882	<	assert(source_p->connection->confs.head);
883	<
884	<	++Count.oper;
885	<	SetOper(source_p);
886	<
887	<	if (conf->modes)
888	<	AddUMode(source_p, conf->modes);
889	<	else if (ConfigGeneral.oper_umodes)
890	<	AddUMode(source_p, ConfigGeneral.oper_umodes);
891	<
892	<	if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
893	<	++Count.invisi;
894	<	if ((old & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
895	<	--Count.invisi;
896	<
897	<	assert(dlinkFind(&oper_list, source_p) == NULL);
898	<	dlinkAdd(source_p, make_dlink_node(), &oper_list);
899	<
900	<	AddOFlag(source_p, conf->port);
901	<
902	<	if (HasOFlag(source_p, OPER_FLAG_ADMIN))
903	<	AddUMode(source_p, UMODE_ADMIN);
904	<
905	<	if (!EmptyString(conf->whois))
906	<	{
907	<	client_attach_svstag(source_p, RPL_WHOISOPERATOR, "+", conf->whois);
908	<	sendto_server(source_p, 0, 0, ":%s SVSTAG %s %lu %u + :%s",
909	<	me.id, source_p->id, (unsigned long)source_p->tsinfo,
910	<	RPL_WHOISOPERATOR, conf->whois);
911	<	}
912	<
913	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
914	<	get_oper_name(source_p));
915	<	sendto_server(NULL, 0, 0, ":%s GLOBOPS :%s is now an operator",
916	<	me.id, get_oper_name(source_p));
917	<	send_umode_out(source_p, old);
918	<	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
919	<	}
920	<
921	<	/*
922	<	* init_isupport()
923	<	*
924	<	* input        - NONE
925	<	* output       - NONE
926	<	* side effects - Must be called before isupport is enabled
927	<	*/
928	<	void
929	<	init_isupport(void)
930	<	{
931	<	add_isupport("CALLERID", NULL, -1);
932	<	add_isupport("CASEMAPPING", "rfc1459", -1);
933	<	add_isupport("DEAF", "D", -1);
934	<	add_isupport("KICKLEN", NULL, KICKLEN);
935	<	add_isupport("MODES", NULL, MAXMODEPARAMS);
936	<	add_isupport("PREFIX", "(ohv)@%+", -1);
937	<	add_isupport("STATUSMSG", "@%+", -1);
938	<	add_isupport("EXCEPTS", NULL, -1);
939	<	add_isupport("INVEX", NULL, -1);
940	<	}
941	<
942	<	/*
943	<	* add_isupport()
944	<	*
945	<	* input        - name of supported function
946	<	*              - options if any
947	<	*              - number if any
948	<	* output       - NONE
949	<	* side effects - Each supported item must call this when activated
950	<	*/
951	<	void
952	<	add_isupport(const char *name, const char *options, int n)
953	<	{
954	<	dlink_node *node = NULL;
955	<	struct Isupport *support = NULL;
956	<
957	<	DLINK_FOREACH(node, support_list.head)
958	<	{
959	<	support = node->data;
960	<	if (irccmp(support->name, name) == 0)
961	<	{
962	<	MyFree(support->name);
963	<	MyFree(support->options);
964	<	break;
965	<	}
966	<	}
967	<
968	<	if (node == NULL)
969	<	{
970	<	support = MyCalloc(sizeof(*support));
971	<	dlinkAddTail(support, &support->node, &support_list);
972	<	}
973	<
974	<	support->name = xstrdup(name);
975	<	if (options)
976	<	support->options = xstrdup(options);
977	<	support->number = n;
978	<
979	<	rebuild_isupport_message_line();
980	<	}
981	<
982	<	/*
983	<	* delete_isupport()
984	<	*
985	<	* input        - name of supported function
986	<	* output       - NONE
987	<	* side effects - Each supported item must call this when deactivated
988	<	*/
989	<	void
990	<	delete_isupport(const char *name)
991	<	{
992	<	dlink_node *node = NULL;
993	<
994	<	DLINK_FOREACH(node, support_list.head)
995	<	{
996	<	struct Isupport *support = node->data;
997	<
998	<	if (irccmp(support->name, name) == 0)
999	<	{
1000	<	dlinkDelete(node, &support_list);
1001	<	MyFree(support->name);
1002	<	MyFree(support->options);
1003	<	MyFree(support);
1004	<	break;
1005	<	}
1006	<	}
1007	<
1008	<	rebuild_isupport_message_line();
1009	<	}
1010	<
1011	<	/*
1012	<	* rebuild_isupport_message_line
1013	<	*
1014	<	* input        - NONE
1015	<	* output       - NONE
1016	<	* side effects - Destroy the isupport MessageFile lines, and rebuild.
1017	<	*/
1018	<	void
1019	<	rebuild_isupport_message_line(void)
1020	<	{
1021	<	char isupportbuffer[IRCD_BUFSIZE];
1022	<	char *p = isupportbuffer;
1023	<	dlink_node *node = NULL, *node_next = NULL;
1024	<	int n = 0;
1025	<	int tokens = 0;
1026	<	size_t len = 0;
1027	<	size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1028	<
1029	<	DLINK_FOREACH_SAFE(node, node_next, support_list_lines.head)
1030	<	{
1031	<	dlinkDelete(node, &support_list_lines);
1032	<	MyFree(node->data);
1033	<	free_dlink_node(node);
1034	<	}
1035	<
1036	<	DLINK_FOREACH(node, support_list.head)
1037	<	{
1038	<	struct Isupport *support = node->data;
1039	<
1040	<	p += (n = sprintf(p, "%s", support->name));
1041	<	len += n;
1042	<
1043	<	if (support->options)
1044	<	{
1045	<	p += (n = sprintf(p, "=%s", support->options));
1046	<	len += n;
1047	<	}
1048	<
1049	<	if (support->number > 0)
1050	<	{
1051	<	p += (n = sprintf(p, "=%d", support->number));
1052	<	len += n;
1053	<	}
1054	<
1055	<	*p++ = ' ';
1056	<	len++;
1057	<	*p = '\0';
1058	<
1059	<	if (++tokens == (MAXPARA-2) || len >= (sizeof(isupportbuffer)-reserve))
1060	<	{ /* arbritrary for now */
1061	<	if (*--p == ' ')
1062	<	*p = '\0';
1063	<
1064	<	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1065	<	p = isupportbuffer;
1066	<	len = 0;
1067	<	n = tokens = 0;
1068	<	}
1069	<	}
1070	<
1071	<	if (len)
1072	<	{
1073	<	if (*--p == ' ')
1074	<	*p = '\0';
1075	<	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1076	<	}
791	>	client_p->name, client_p->username,
792	>	client_p->host, client_p->away);
793		}

Comparing ircd-hybrid/trunk/src/user.c (property svn:keywords):
Revision 6161 by michael, Thu Jun 18 10:55:29 2015 UTC vs.
Revision 8214 by michael, Sun Apr 16 11:44:44 2017 UTC

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

Diff Legend

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