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 3504 by michael, Sat May 10 19:51:29 2014 UTC vs.
Revision 6727 by michael, Wed Nov 4 15:27:25 2015 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-2015 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 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		*/
#	Line 31 | Line 31
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"
#	Line 40 | Line 41
41		#include "log.h"
42		#include "server.h"
43		#include "send.h"
43	–	#include "supported.h"
44		#include "memory.h"
45		#include "packet.h"
46		#include "rng_mt.h"
#	Line 48 | Line 48
48		#include "misc.h"
49		#include "parse.h"
50		#include "watch.h"
51	+	#include "isupport.h"
52
53		static char umode_buffer[IRCD_BUFSIZE];
53	–	static const char *uid_get(void);
54
55	<	/* Used for building up the isupport string,
56	<	* used with init_isupport, add_isupport, delete_isupport
57	<	*/
58	<	struct Isupport
59	<	{
60	<	dlink_node node;
61	<	char *name;
62	<	char *options;
63	<	int number;
64	<	};
65	<
66	<	static dlink_list support_list;
67	<	static dlink_list support_list_lines;
68	<
69	<	/* memory is cheap. map 0-255 to equivalent mode */
70	<	const unsigned int user_modes[256] =
55	>	const struct user_modes *umode_map[256];
56	>	const struct user_modes  umode_tab[] =
57		{
58	<	/* 0x00 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x0F */
59	<	/* 0x10 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x1F */
60	<	/* 0x20 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x2F */
61	<	/* 0x30 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x3F */
62	<	0,                  /* @ */
63	<	0,                  /* A */
64	<	0,                  /* B */
65	<	0,                  /* C */
66	<	UMODE_DEAF,         /* D */
67	<	0,                  /* E */
68	<	UMODE_FARCONNECT,   /* F */
69	<	UMODE_SOFTCALLERID, /* G */
70	<	UMODE_HIDDEN,       /* H */
71	<	0,                  /* I */
72	<	0,                  /* J */
73	<	0,                  /* K */
74	<	0,                  /* L */
75	<	0,                  /* M */
76	<	0,                  /* N */
77	<	0,                  /* O */
78	<	0,                  /* P */
79	<	0,                  /* Q */
80	<	UMODE_REGONLY,      /* R */
81	<	UMODE_SSL,          /* S */
82	<	0,                  /* T */
83	<	0,                  /* U */
84	<	0,                  /* V */
85	<	UMODE_WEBIRC,       /* W */
86	<	0,                  /* X */
101	<	0,                  /* Y */
102	<	0,                  /* Z 0x5A */
103	<	0, 0, 0, 0, 0,      /* 0x5F   */
104	<	0,                  /* 0x60   */
105	<	UMODE_ADMIN,        /* a */
106	<	UMODE_BOTS,         /* b */
107	<	UMODE_CCONN,        /* c */
108	<	UMODE_DEBUG,        /* d */
109	<	UMODE_EXTERNAL,     /* e */
110	<	UMODE_FULL,         /* f */
111	<	UMODE_CALLERID,     /* g */
112	<	0,                  /* h */
113	<	UMODE_INVISIBLE,    /* i */
114	<	UMODE_REJ,          /* j */
115	<	UMODE_SKILL,        /* k */
116	<	UMODE_LOCOPS,       /* l */
117	<	0,                  /* m */
118	<	UMODE_NCHANGE,      /* n */
119	<	UMODE_OPER,         /* o */
120	<	0,                  /* p */
121	<	0,                  /* q */
122	<	UMODE_REGISTERED,   /* r */
123	<	UMODE_SERVNOTICE,   /* s */
124	<	0,                  /* t */
125	<	UMODE_UNAUTH,       /* u */
126	<	0,                  /* v */
127	<	UMODE_WALLOP,       /* w */
128	<	UMODE_HIDDENHOST,   /* x */
129	<	UMODE_SPY,          /* y */
130	<	UMODE_OPERWALL,     /* z      0x7A */
131	<	0,0,0,0,0,          /* 0x7B - 0x7F */
132	<
133	<	/* 0x80 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x8F */
134	<	/* 0x90 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x9F */
135	<	/* 0xA0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xAF */
136	<	/* 0xB0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xBF */
137	<	/* 0xC0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xCF */
138	<	/* 0xD0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xDF */
139	<	/* 0xE0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xEF */
140	<	/* 0xF0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0  /* 0xFF */
58	>	{ 'D', UMODE_DEAF         },
59	>	{ 'F', UMODE_FARCONNECT   },
60	>	{ 'G', UMODE_SOFTCALLERID },
61	>	{ 'H', UMODE_HIDDEN       },
62	>	{ 'R', UMODE_REGONLY      },
63	>	{ 'S', UMODE_SSL          },
64	>	{ 'W', UMODE_WEBIRC       },
65	>	{ 'a', UMODE_ADMIN        },
66	>	{ 'b', UMODE_BOTS         },
67	>	{ 'c', UMODE_CCONN        },
68	>	{ 'd', UMODE_DEBUG        },
69	>	{ 'e', UMODE_EXTERNAL     },
70	>	{ 'f', UMODE_FULL         },
71	>	{ 'g', UMODE_CALLERID     },
72	>	{ 'i', UMODE_INVISIBLE    },
73	>	{ 'j', UMODE_REJ          },
74	>	{ 'k', UMODE_SKILL        },
75	>	{ 'l', UMODE_LOCOPS       },
76	>	{ 'n', UMODE_NCHANGE      },
77	>	{ 'o', UMODE_OPER         },
78	>	{ 'p', UMODE_HIDECHANS    },
79	>	{ 'q', UMODE_HIDEIDLE     },
80	>	{ 'r', UMODE_REGISTERED   },
81	>	{ 's', UMODE_SERVNOTICE   },
82	>	{ 'u', UMODE_UNAUTH       },
83	>	{ 'w', UMODE_WALLOP       },
84	>	{ 'x', UMODE_HIDDENHOST   },
85	>	{ 'y', UMODE_SPY          },
86	>	{ '\0', 0 }
87		};
88
89		void
90	<	assemble_umode_buffer(void)
90	>	user_modes_init(void)
91		{
146	–	unsigned int idx = 0;
92		char *umode_buffer_ptr = umode_buffer;
93
94	<	for (; idx < (sizeof(user_modes) / sizeof(user_modes[0])); ++idx)
95	<	if (user_modes[idx])
96	<	*umode_buffer_ptr++ = idx;
94	>	for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
95	>	{
96	>	umode_map[tab->c] = tab;
97	>	*umode_buffer_ptr++ = tab->c;
98	>	}
99
100		*umode_buffer_ptr = '\0';
101		}
#	Line 163 | Line 110 | void
110		show_lusers(struct Client *source_p)
111		{
112		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
113	<	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total-Count.invisi),
114	<	Count.invisi, dlink_list_length(&global_serv_list));
113	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
114	>	Count.invisi, dlink_list_length(&global_server_list));
115		else
116	<	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT,
117	<	(Count.total - Count.invisi), Count.invisi, 1);
116	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
117	>	Count.invisi, 1);
118
119		if (Count.oper)
120		sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper);
#	Line 175 | Line 122 | show_lusers(struct Client *source_p)
122		if (dlink_list_length(&unknown_list))
123		sendto_one_numeric(source_p, &me, RPL_LUSERUNKNOWN, dlink_list_length(&unknown_list));
124
125	<	if (dlink_list_length(&global_channel_list))
126	<	sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&global_channel_list));
125	>	if (dlink_list_length(&channel_list))
126	>	sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&channel_list));
127
128		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
129		{
#	Line 202 | Line 149 | show_lusers(struct Client *source_p)
149		Count.max_loc_con = Count.local + Count.myserver;
150		}
151
205	–	/* show_isupport()
206	–	*
207	–	* inputs       - pointer to client
208	–	* output       - NONE
209	–	* side effects - display to client what we support (for them)
210	–	*/
211	–	void
212	–	show_isupport(struct Client *source_p)
213	–	{
214	–	const dlink_node *ptr = NULL;
215	–
216	–	DLINK_FOREACH(ptr, support_list_lines.head)
217	–	sendto_one_numeric(source_p, &me, RPL_ISUPPORT, ptr->data);
218	–	}
219	–
220	–
152		/* report_and_set_user_flags()
153		*
154		* inputs       - pointer to source_p
#	Line 233 | Line 164 | report_and_set_user_flags(struct Client
164		if (IsConfDoSpoofIp(conf))
165		sendto_one_notice(source_p, &me, ":*** Spoofing your IP. Congrats.");
166
167	<	/* If this user is in the exception class, Set it "E lined" */
167	>	/* If this user is in the exception class, set it "E lined" */
168		if (IsConfExemptKline(conf))
169		{
170	<	SetExemptKline(source_p);
171	<	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D/G lines. Congrats.");
170	>	AddFlag(source_p, FLAGS_EXEMPTKLINE);
171	>	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D lines. Congrats.");
172		}
173
174	<	/*
244	<	* The else here is to make sure that G line exempt users
245	<	* do not get noticed twice.
246	<	*/
247	<	else if (IsConfExemptGline(conf))
174	>	if (IsConfExemptXline(conf))
175		{
176	<	SetExemptGline(source_p);
177	<	sendto_one_notice(source_p, &me, ":*** You are exempt from G lines. Congrats.");
176	>	AddFlag(source_p, FLAGS_EXEMPTXLINE);
177	>	sendto_one_notice(source_p, &me, ":*** You are exempt from X lines. Congrats.");
178		}
179
180		if (IsConfExemptResv(conf))
181		{
182	<	SetExemptResv(source_p);
182	>	AddFlag(source_p, FLAGS_EXEMPTRESV);
183		sendto_one_notice(source_p, &me, ":*** You are exempt from resvs. Congrats.");
184		}
185
186		/* If this user is exempt from user limits set it "F lined" */
187		if (IsConfExemptLimits(conf))
188		{
189	<	SetExemptLimits(source_p);
189	>	AddFlag(source_p, FLAGS_NOLIMIT);
190		sendto_one_notice(source_p, &me, ":*** You are exempt from user limits. Congrats.");
191		}
192
193		if (IsConfCanFlood(conf))
194		{
195	<	SetCanFlood(source_p);
195	>	AddFlag(source_p, FLAGS_CANFLOOD);
196		sendto_one_notice(source_p, &me, ":*** You are exempt from flood "
197		"protection, aren't you fearsome.");
198		}
#	Line 282 | Line 209 | report_and_set_user_flags(struct Client
209		static void
210		introduce_client(struct Client *source_p)
211		{
212	<	dlink_node *ptr = NULL;
212	>	dlink_node *node = NULL;
213		char ubuf[IRCD_BUFSIZE] = "";
214
215		if (MyClient(source_p))
216	<	send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
216	>	send_umode(source_p, source_p, 0, ubuf);
217		else
218	<	send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
218	>	send_umode(NULL, source_p, 0, ubuf);
219
220		watch_check_hash(source_p, RPL_LOGON);
221
#	Line 298 | Line 225 | introduce_client(struct Client *source_p
225		ubuf[1] = '\0';
226		}
227
228	<	DLINK_FOREACH(ptr, serv_list.head)
228	>	DLINK_FOREACH(node, local_server_list.head)
229		{
230	<	struct Client *server = ptr->data;
230	>	struct Client *server = node->data;
231
232		if (server == source_p->from)
233		continue;
234
235	<	if (IsCapable(server, CAP_SVS))
236	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
235	>	if (IsCapable(server, CAPAB_SVS))
236	>	sendto_one(server, ":%s UID %s %u %lu %s %s %s %s %s %s :%s",
237		source_p->servptr->id,
238		source_p->name, source_p->hopcount+1,
239		(unsigned long)source_p->tsinfo,
240		ubuf, source_p->username, source_p->host,
241	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
242	<	"0" : source_p->sockhost, source_p->id,
316	<	source_p->svid,
241	>	source_p->sockhost, source_p->id,
242	>	source_p->account,
243		source_p->info);
244		else
245	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
245	>	sendto_one(server, ":%s UID %s %u %lu %s %s %s %s %s :%s",
246		source_p->servptr->id,
247		source_p->name, source_p->hopcount+1,
248		(unsigned long)source_p->tsinfo,
249		ubuf, source_p->username, source_p->host,
250	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
325	<	"0" : source_p->sockhost, source_p->id, source_p->info);
250	>	source_p->sockhost, source_p->id, source_p->info);
251
252		if (!EmptyString(source_p->certfp))
253		sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
#	Line 338 | Line 263 | introduce_client(struct Client *source_p
263		static void
264		user_welcome(struct Client *source_p)
265		{
341	–	#if defined(__TIME__) && defined(__DATE__)
266		static const char built_date[] = __DATE__ " at " __TIME__;
343	–	#else
344	–	static const char built_date[] = "unknown";
345	–	#endif
267
268		#ifdef HAVE_LIBCRYPTO
269		if (HasFlag(source_p, FLAGS_SSL))
270		{
271		AddUMode(source_p, UMODE_SSL);
272		sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
273	<	ssl_get_cipher(source_p->localClient->fd.ssl));
273	>	ssl_get_cipher(source_p->connection->fd.ssl));
274		}
275		#endif
276
277	<	sendto_one_numeric(source_p, &me, RPL_WELCOME, ServerInfo.network_name,
277	>	sendto_one_numeric(source_p, &me, RPL_WELCOME, ConfigServerInfo.network_name,
278		source_p->name);
279		sendto_one_numeric(source_p, &me, RPL_YOURHOST,
280	<	get_listener_name(source_p->localClient->listener), ircd_version);
280	>	listener_get_name(source_p->connection->listener), ircd_version);
281		sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
282		sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
362	–	show_isupport(source_p);
363	–
364	–	if (source_p->id[0])
365	–	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
283
284	+	isupport_show(source_p);
285		show_lusers(source_p);
286		motd_signon(source_p);
287		}
#	Line 378 | Line 296 | static int
296		check_xline(struct Client *source_p)
297		{
298		struct MaskItem *conf = NULL;
299	<	const char *reason = NULL;
299	>
300	>	if (HasFlag(source_p, FLAGS_EXEMPTXLINE))
301	>	return 0;
302
303		if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
304		{
305		++conf->count;
386	–
387	–	if (conf->reason)
388	–	reason = conf->reason;
389	–	else
390	–	reason = CONF_NOREASON;
391	–
306		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
307		"X-line Rejecting [%s] [%s], user %s [%s]",
308	<	source_p->info, reason,
308	>	source_p->info, conf->reason,
309		get_client_name(source_p, HIDE_IP),
310		source_p->sockhost);
311
#	Line 416 | Line 330 | register_local_user(struct Client *sourc
330
331		assert(source_p == source_p->from);
332		assert(MyConnect(source_p));
333	<	assert(!source_p->localClient->registration);
333	>	assert(IsUnknown(source_p));
334	>	assert(!source_p->connection->registration);
335
336	<	ClearCap(source_p, CAP_TS6);
422	<
423	<	if (ConfigFileEntry.ping_cookie)
336	>	if (ConfigGeneral.ping_cookie)
337		{
338	<	if (!IsPingSent(source_p) && !source_p->localClient->random_ping)
338	>	if (!HasFlag(source_p, FLAGS_PINGSENT) && !source_p->connection->random_ping)
339		{
340		do
341	<	source_p->localClient->random_ping = genrand_int32();
342	<	while (!source_p->localClient->random_ping);
341	>	source_p->connection->random_ping = genrand_int32();
342	>	while (!source_p->connection->random_ping);
343
344	<	sendto_one(source_p, "PING :%u",
345	<	source_p->localClient->random_ping);
433	<	SetPingSent(source_p);
344	>	sendto_one(source_p, "PING :%u", source_p->connection->random_ping);
345	>	AddFlag(source_p, FLAGS_PINGSENT);
346		return;
347		}
348
349	<	if (!HasPingCookie(source_p))
349	>	if (!HasFlag(source_p, FLAGS_PING_COOKIE))
350		return;
351		}
352
353	<	source_p->localClient->last_privmsg = CurrentTime;
353	>	source_p->connection->last_privmsg = CurrentTime;
354		/* Straight up the maximum rate of flooding... */
355	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
355	>	source_p->connection->allow_read = MAX_FLOOD_BURST;
356
357		if (!check_client(source_p))
358		return;
#	Line 449 | Line 361 | register_local_user(struct Client *sourc
361		{
362		sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
363		"character in your hostname");
364	<	strlcpy(source_p->host, source_p->sockhost,
453	<	sizeof(source_p->host));
364	>	strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
365		}
366
367	<	conf = source_p->localClient->confs.head->data;
367	>	conf = source_p->connection->confs.head->data;
368
369	<	if (!IsGotId(source_p))
369	>	if (!HasFlag(source_p, FLAGS_GOTID))
370		{
371		char username[USERLEN + 1] = "";
461	–	const char *p = username;
372		unsigned int i = 0;
373
374		if (IsNeedIdentd(conf))
#	Line 475 | Line 385 | register_local_user(struct Client *sourc
385		if (!IsNoTilde(conf))
386		source_p->username[i++] = '~';
387
388	<	for (; *p && i < USERLEN; ++p)
389	<	if (*p != '[')
480	<	source_p->username[i++] = *p;
388	>	for (const char *p = username; *p && i < USERLEN; ++p)
389	>	source_p->username[i++] = *p;
390
391		source_p->username[i] = '\0';
392		}
#	Line 485 | Line 394 | register_local_user(struct Client *sourc
394		/* Password check */
395		if (!EmptyString(conf->passwd))
396		{
397	<	const char *pass = source_p->localClient->passwd;
489	<
490	<	if (!match_conf_password(pass, conf))
397	>	if (!match_conf_password(source_p->connection->password, conf))
398		{
399		++ServerStats.is_ref;
400
#	Line 498 | Line 405 | register_local_user(struct Client *sourc
405		}
406
407		/*
408	<	* Don't free source_p->localClient->passwd here - it can be required
409	<	* by masked /stats I if there are auth{} blocks with need_password = no;
408	>	* Don't free source_p->connection->password here - it can be required
409	>	* by masked /stats I if there are auth {} blocks with need_password = no;
410		* --adx
411		*/
412
#	Line 519 | Line 426 | register_local_user(struct Client *sourc
426		* probably be just a percentage of the MAXCLIENTS...
427		*   -Taner
428		*/
429	<	if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
430	<	(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
429	>	if ((Count.local >= GlobalSetOptions.maxclients + MAX_BUFFER) ||
430	>	(Count.local >= GlobalSetOptions.maxclients && !HasFlag(source_p, FLAGS_NOLIMIT)))
431		{
432		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
433		"Too many clients, rejecting %s[%s].",
#	Line 555 | Line 462 | register_local_user(struct Client *sourc
462		sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
463		"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
464		source_p->name, source_p->username, source_p->host,
465	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
466	<	"255.255.255.255" : source_p->sockhost,
560	<	get_client_class(&source_p->localClient->confs),
465	>	source_p->sockhost,
466	>	get_client_class(&source_p->connection->confs),
467		source_p->info, source_p->id);
468
469	<	if (ConfigFileEntry.invisible_on_connect)
469	>	if (ConfigGeneral.invisible_on_connect)
470		{
471		AddUMode(source_p, UMODE_INVISIBLE);
472		++Count.invisi;
#	Line 571 | Line 477 | register_local_user(struct Client *sourc
477		Count.max_loc = Count.local;
478
479		if (!(Count.max_loc % 10))
480	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
481	<	"New Max Local Clients: %d",
480	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
481	>	"New maximum local client connections: %u",
482		Count.max_loc);
483		}
484
#	Line 583 | Line 489 | register_local_user(struct Client *sourc
489		assert(source_p->servptr == &me);
490		SetClient(source_p);
491		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
492	<
587	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
492	>	dlinkAdd(source_p, &source_p->node, &global_client_list);
493
494		assert(dlinkFind(&unknown_list, source_p));
495
496	<	dlink_move_node(&source_p->localClient->lclient_node,
496	>	dlink_move_node(&source_p->connection->lclient_node,
497		&unknown_list, &local_client_list);
498
499		user_welcome(source_p);
500	<	add_user_host(source_p->username, source_p->host, 0);
501	<	SetUserHost(source_p);
500	>	userhost_add(source_p->username, source_p->host, 0);
501	>	AddFlag(source_p, FLAGS_USERHOST);
502
503		introduce_client(source_p);
504		}
#	Line 609 | Line 514 | register_local_user(struct Client *sourc
514		*                is introduced by a server.
515		*/
516		void
517	<	register_remote_user(struct Client *source_p, const char *username,
613	<	const char *host, const char *server)
517	>	register_remote_user(struct Client *source_p)
518		{
519	<	struct Client *target_p = NULL;
616	<
617	<	assert(source_p->username != username);
618	<
619	<	strlcpy(source_p->host, host, sizeof(source_p->host));
620	<	strlcpy(source_p->username, username, sizeof(source_p->username));
621	<
622	<	/*
623	<	* Coming from another server, take the servers word for it
624	<	*/
625	<	source_p->servptr = hash_find_server(server);
626	<
627	<	/*
628	<	* Super GhostDetect:
629	<	* If we can't find the server the user is supposed to be on,
630	<	* then simply blow the user away.        -Taner
631	<	*/
632	<	if (source_p->servptr == NULL)
633	<	{
634	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
635	<	"No server %s for user %s[%s@%s] from %s",
636	<	server, source_p->name, source_p->username,
637	<	source_p->host, source_p->from->name);
638	<	sendto_one(source_p->from,
639	<	":%s KILL %s :%s (Ghosted, server %s doesn't exist)",
640	<	me.id, source_p->id, me.name, server);
641	<
642	<	AddFlag(source_p, FLAGS_KILLED);
643	<	exit_client(source_p, "Ghosted Client");
644	<	return;
645	<	}
519	>	const struct Client *target_p = NULL;
520
521		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
522		{
#	Line 652 | Line 526 | register_remote_user(struct Client *sour
526		source_p->host, source_p->servptr->name,
527		target_p->name, target_p->from->name);
528		sendto_one(source_p->from,
529	<	":%s KILL %s :%s (NICK from wrong direction (%s != %s))",
529	>	":%s KILL %s :%s (UID from wrong direction (%s != %s))",
530		me.id, source_p->id, me.name, source_p->servptr->name,
531		target_p->from->name);
532
533		AddFlag(source_p, FLAGS_KILLED);
534	<	exit_client(source_p, "USER server wrong direction");
534	>	exit_client(source_p, "UID server wrong direction");
535		return;
536		}
537
#	Line 673 | Line 547 | register_remote_user(struct Client *sour
547
548		SetClient(source_p);
549		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
550	<	add_user_host(source_p->username, source_p->host, 1);
551	<	SetUserHost(source_p);
550	>	dlinkAdd(source_p, &source_p->node, &global_client_list);
551	>	userhost_add(source_p->username, source_p->host, 1);
552	>	AddFlag(source_p, FLAGS_USERHOST);
553
554		if (HasFlag(source_p->servptr, FLAGS_EOB))
555		sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
556	<	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
556	>	"Client connecting at %s: %s (%s@%s) [%s] [%s] <%s>",
557		source_p->servptr->name,
558		source_p->name, source_p->username, source_p->host,
559	<	source_p->info, source_p->id);
559	>	source_p->sockhost, source_p->info, source_p->id);
560
561		introduce_client(source_p);
562		}
#	Line 726 | Line 601 | valid_hostname(const char *hostname)
601		int
602		valid_username(const char *username, const int local)
603		{
604	<	int dots      = 0;
604	>	unsigned int dots = 0;
605		const char *p = username;
606
607		assert(p);
#	Line 746 | Line 621 | valid_username(const char *username, con
621		{
622		while (*++p)
623		{
624	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
624	>	if (*p == '.' && ConfigGeneral.dots_in_ident)
625		{
626	<	if (++dots > ConfigFileEntry.dots_in_ident)
626	>	if (++dots > ConfigGeneral.dots_in_ident)
627		return 0;
628		if (!IsUserChar(*(p + 1)))
629		return 0;
#	Line 764 | Line 639 | valid_username(const char *username, con
639		return 0;
640		}
641
642	<	return  p - username <= USERLEN;;
642	>	return p - username <= USERLEN;
643		}
644
645		/* clean_nick_name()
#	Line 779 | Line 654 | valid_nickname(const char *nickname, con
654		{
655		const char *p = nickname;
656
657	<	assert(nickname && *nickname);
657	>	assert(p);
658
659		/*
660		* Nicks can't start with a digit or - or be 0 length.
661		*/
662	<	if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
662	>	if (EmptyString(p) || *p == '-' || (IsDigit(*p) && local))
663		return 0;
664
665		for (; *p; ++p)
#	Line 801 | Line 676 | valid_nickname(const char *nickname, con
676		* inputs       - client_p
677		*              - source_p
678		*              - int old
804	–	*              - sendmask mask of modes to send
679		*              - suplied umode_buf
680		* output       - NONE
681		*/
682		void
683		send_umode(struct Client *client_p, struct Client *source_p,
684	<	unsigned int old, unsigned int sendmask, char *umode_buf)
684	>	unsigned int old, char *umode_buf)
685		{
686		char *m = umode_buf;
687		int what = 0;
#	Line 816 | Line 690 | send_umode(struct Client *client_p, stru
690		* Build a string in umode_buf to represent the change in the user's
691		* mode between the new (source_p->umodes) and 'old'.
692		*/
693	<	for (unsigned int i = 0; i < 128; ++i)
693	>	for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
694		{
695	<	unsigned int flag = user_modes[i];
822	<
823	<	if (!flag)
824	<	continue;
825	<
826	<	if (MyClient(source_p) && !(flag & sendmask))
827	<	continue;
828	<
829	<	if ((flag & old) && !HasUMode(source_p, flag))
695	>	if ((tab->flag & old) && !HasUMode(source_p, tab->flag))
696		{
697		if (what == MODE_DEL)
698	<	*m++ = (char)i;
698	>	*m++ = tab->c;
699		else
700		{
701		what = MODE_DEL;
702		*m++ = '-';
703	<	*m++ = (char)i;
703	>	*m++ = tab->c;
704		}
705		}
706	<	else if (!(flag & old) && HasUMode(source_p, flag))
706	>	else if (!(tab->flag & old) && HasUMode(source_p, tab->flag))
707		{
708		if (what == MODE_ADD)
709	<	*m++ = (char)i;
709	>	*m++ = tab->c;
710		else
711		{
712		what = MODE_ADD;
713		*m++ = '+';
714	<	*m++ = (char)i;
714	>	*m++ = tab->c;
715		}
716		}
717		}
#	Line 854 | Line 720 | send_umode(struct Client *client_p, stru
720
721		if (*umode_buf && client_p)
722		sendto_one(client_p, ":%s!%s@%s MODE %s :%s",
723	<	source_p->name, source_p->username,
724	<	source_p->host, source_p->name, umode_buf);
723	>	client_p->name, client_p->username,
724	>	client_p->host, client_p->name, umode_buf);
725		}
726
727		/* send_umode_out()
#	Line 865 | Line 731 | send_umode(struct Client *client_p, stru
731		* side effects - Only send ubuf out to servers that know about this client
732		*/
733		void
734	<	send_umode_out(struct Client *client_p, struct Client *source_p,
869	<	unsigned int old)
734	>	send_umode_out(struct Client *source_p, unsigned int old)
735		{
736		char buf[IRCD_BUFSIZE] = "";
737
738	<	send_umode(NULL, source_p, old, SEND_UMODES, buf);
738	>	send_umode(MyClient(source_p) ? source_p : NULL, source_p, old, buf);
739
740		if (buf[0])
741	<	sendto_server(source_p, NOCAPS, NOCAPS, ":%s MODE %s :%s",
741	>	sendto_server(source_p, 0, 0, ":%s MODE %s :%s",
742		source_p->id, source_p->id, buf);
878	–
879	–	if (client_p && MyClient(client_p))
880	–	send_umode(client_p, source_p, old, 0xffffffff, buf);
743		}
744
745		void
746		user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
747		{
748	<	dlink_node *ptr = NULL;
748	>	dlink_node *node = NULL;
749
750		if (!strcmp(target_p->host, hostname))
751		return;
#	Line 892 | Line 754 | user_set_hostmask(struct Client *target_
754		{
755		case MODE_ADD:
756		AddUMode(target_p, UMODE_HIDDENHOST);
895	–	AddFlag(target_p, FLAGS_IP_SPOOFING);
757		break;
758		case MODE_DEL:
759		DelUMode(target_p, UMODE_HIDDENHOST);
899	–
900	–	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
901	–	DelFlag(target_p, FLAGS_IP_SPOOFING);
760		break;
761		default: return;
762		}
763
764	<	if (ConfigFileEntry.cycle_on_host_change)
764	>	if (ConfigGeneral.cycle_on_host_change)
765		sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
766		target_p->name, target_p->username, target_p->host);
767
768	<	if (IsUserHostIp(target_p))
769	<	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
768	>	if (HasFlag(target_p, FLAGS_USERHOST))
769	>	userhost_del(target_p->username, target_p->host, !MyConnect(target_p));
770
771		strlcpy(target_p->host, hostname, sizeof(target_p->host));
772
773	<	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
774	<	SetUserHost(target_p);
773	>	userhost_add(target_p->username, target_p->host, !MyConnect(target_p));
774	>	AddFlag(target_p, FLAGS_USERHOST);
775
776		if (MyClient(target_p))
777		{
778	<	sendto_one_numeric(target_p, &me, RPL_NEWHOSTIS, target_p->host);
778	>	sendto_one_numeric(target_p, &me, RPL_VISIBLEHOST, target_p->host);
779		clear_ban_cache_client(target_p);
780		}
781
782	<	if (!ConfigFileEntry.cycle_on_host_change)
782	>	if (!ConfigGeneral.cycle_on_host_change)
783		return;
784
785	<	DLINK_FOREACH(ptr, target_p->channel.head)
785	>	DLINK_FOREACH(node, target_p->channel.head)
786		{
787		char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
788		char *p = modebuf;
789		int len = 0;
790	<	const struct Membership *ms = ptr->data;
790	>	const struct Membership *member = node->data;
791
792	<	if (has_member_flags(ms, CHFL_CHANOP))
792	>	if (has_member_flags(member, CHFL_CHANOP))
793		{
794		*p++ = 'o';
795		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
796		}
797
798	<	if (has_member_flags(ms, CHFL_HALFOP))
798	>	if (has_member_flags(member, CHFL_HALFOP))
799		{
800		*p++ = 'h';
801		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
802		}
803
804	<	if (has_member_flags(ms, CHFL_VOICE))
804	>	if (has_member_flags(member, CHFL_VOICE))
805		{
806		*p++ = 'v';
807		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
#	Line 951 | Line 809 | user_set_hostmask(struct Client *target_
809
810		*p = '\0';
811
812	<	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
813	<	target_p->name, target_p->username, target_p->host,
814	<	ms->chptr->chname);
812	>
813	>	sendto_channel_local_butone(target_p, CAP_EXTENDED_JOIN, 0, member->chptr, ":%s!%s@%s JOIN %s %s :%s",
814	>	target_p->name, target_p->username,
815	>	target_p->host, member->chptr->name,
816	>	(!IsDigit(target_p->account[0]) && target_p->account[0] != '*') ? target_p->account : "*",
817	>	target_p->info);
818	>	sendto_channel_local_butone(target_p, 0, CAP_EXTENDED_JOIN, member->chptr, ":%s!%s@%s JOIN :%s",
819	>	target_p->name, target_p->username,
820	>	target_p->host, member->chptr->name);
821	>
822		if (nickbuf[0])
823	<	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
824	<	target_p->servptr->name, ms->chptr->chname,
823	>	sendto_channel_local_butone(target_p, 0, 0, member->chptr, ":%s MODE %s +%s %s",
824	>	target_p->servptr->name, member->chptr->name,
825		modebuf, nickbuf);
826
827		}
#	Line 967 | Line 832 | user_set_hostmask(struct Client *target_
832		target_p->name, target_p->username,
833		target_p->host, target_p->away);
834		}
970	–
971	–	/*! \brief Blindly opers up given source_p, using conf info.
972	–	*         All checks on passwords have already been done.
973	–	* \param source_p Pointer to given client to oper
974	–	*/
975	–	void
976	–	oper_up(struct Client *source_p)
977	–	{
978	–	const unsigned int old = source_p->umodes;
979	–	const struct MaskItem *conf = source_p->localClient->confs.head->data;
980	–
981	–	assert(source_p->localClient->confs.head);
982	–
983	–	++Count.oper;
984	–	SetOper(source_p);
985	–
986	–	if (conf->modes)
987	–	AddUMode(source_p, conf->modes);
988	–	else if (ConfigFileEntry.oper_umodes)
989	–	AddUMode(source_p, ConfigFileEntry.oper_umodes);
990	–
991	–	if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
992	–	++Count.invisi;
993	–	if ((old & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
994	–	--Count.invisi;
995	–
996	–	assert(dlinkFind(&oper_list, source_p) == NULL);
997	–	dlinkAdd(source_p, make_dlink_node(), &oper_list);
998	–
999	–	AddOFlag(source_p, conf->port);
1000	–
1001	–	if (HasOFlag(source_p, OPER_FLAG_ADMIN))
1002	–	AddUMode(source_p, UMODE_ADMIN);
1003	–
1004	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1005	–	get_oper_name(source_p));
1006	–	send_umode_out(source_p, source_p, old);
1007	–	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
1008	–	}
1009	–
1010	–	static char new_uid[TOTALSIDUID + 1];  /* Allow for \0 */
1011	–
1012	–	int
1013	–	valid_sid(const char *sid)
1014	–	{
1015	–	if (strlen(sid) == IRC_MAXSID)
1016	–	if (IsDigit(*sid))
1017	–	if (IsAlNum(*(sid + 1)) && IsAlNum(*(sid + 2)))
1018	–	return 1;
1019	–
1020	–	return 0;
1021	–	}
1022	–
1023	–	/*
1024	–	* init_uid()
1025	–	*
1026	–	* inputs       - NONE
1027	–	* output       - NONE
1028	–	* side effects - new_uid is filled in with server id portion (sid)
1029	–	*                (first 3 bytes) or defaulted to 'A'.
1030	–	*                Rest is filled in with 'A'
1031	–	*/
1032	–	void
1033	–	init_uid(void)
1034	–	{
1035	–	memset(new_uid, 0, sizeof(new_uid));
1036	–
1037	–	if (!EmptyString(ServerInfo.sid))
1038	–	strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1039	–
1040	–	for (unsigned int i = 0; i < IRC_MAXSID; ++i)
1041	–	if (new_uid[i] == '\0')
1042	–	new_uid[i] = 'A';
1043	–
1044	–	/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1045	–	memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1046	–	}
1047	–
1048	–	/*
1049	–	* add_one_to_uid
1050	–	*
1051	–	* inputs       - index number into new_uid
1052	–	* output       - NONE
1053	–	* side effects - new_uid is incremented by one
1054	–	*                note this is a recursive function
1055	–	*/
1056	–	static void
1057	–	add_one_to_uid(int i)
1058	–	{
1059	–	if (i != IRC_MAXSID)  /* Not reached server SID portion yet? */
1060	–	{
1061	–	if (new_uid[i] == 'Z')
1062	–	new_uid[i] = '0';
1063	–	else if (new_uid[i] == '9')
1064	–	{
1065	–	new_uid[i] = 'A';
1066	–	add_one_to_uid(i-1);
1067	–	}
1068	–	else
1069	–	++new_uid[i];
1070	–	}
1071	–	else
1072	–	{
1073	–	/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1074	–	if (new_uid[i] == 'Z')
1075	–	memcpy(new_uid + IRC_MAXSID, "AAAAAA", IRC_MAXUID);
1076	–	else
1077	–	++new_uid[i];
1078	–	}
1079	–	}
1080	–
1081	–	/*
1082	–	* uid_get
1083	–	*
1084	–	* inputs       - struct Client *
1085	–	* output       - new UID is returned to caller
1086	–	* side effects - new_uid is incremented by one.
1087	–	*/
1088	–	static const char *
1089	–	uid_get(void)
1090	–	{
1091	–	add_one_to_uid(TOTALSIDUID - 1);  /* Index from 0 */
1092	–	return new_uid;
1093	–	}
1094	–
1095	–	/*
1096	–	* init_isupport()
1097	–	*
1098	–	* input        - NONE
1099	–	* output       - NONE
1100	–	* side effects - Must be called before isupport is enabled
1101	–	*/
1102	–	void
1103	–	init_isupport(void)
1104	–	{
1105	–	add_isupport("CALLERID", NULL, -1);
1106	–	add_isupport("CASEMAPPING", CASEMAP, -1);
1107	–	add_isupport("DEAF", "D", -1);
1108	–	add_isupport("KICKLEN", NULL, KICKLEN);
1109	–	add_isupport("MODES", NULL, MAXMODEPARAMS);
1110	–	#ifdef HALFOPS
1111	–	add_isupport("PREFIX", "(ohv)@%+", -1);
1112	–	add_isupport("STATUSMSG", "@%+", -1);
1113	–	#else
1114	–	add_isupport("PREFIX", "(ov)@+", -1);
1115	–	add_isupport("STATUSMSG", "@+", -1);
1116	–	#endif
1117	–	add_isupport("EXCEPTS", "e", -1);
1118	–	add_isupport("INVEX", "I", -1);
1119	–	}
1120	–
1121	–	/*
1122	–	* add_isupport()
1123	–	*
1124	–	* input        - name of supported function
1125	–	*              - options if any
1126	–	*              - number if any
1127	–	* output       - NONE
1128	–	* side effects - Each supported item must call this when activated
1129	–	*/
1130	–	void
1131	–	add_isupport(const char *name, const char *options, int n)
1132	–	{
1133	–	dlink_node *ptr;
1134	–	struct Isupport *support;
1135	–
1136	–	DLINK_FOREACH(ptr, support_list.head)
1137	–	{
1138	–	support = ptr->data;
1139	–	if (irccmp(support->name, name) == 0)
1140	–	{
1141	–	MyFree(support->name);
1142	–	MyFree(support->options);
1143	–	break;
1144	–	}
1145	–	}
1146	–
1147	–	if (ptr == NULL)
1148	–	{
1149	–	support = MyCalloc(sizeof(*support));
1150	–	dlinkAddTail(support, &support->node, &support_list);
1151	–	}
1152	–
1153	–	support->name = xstrdup(name);
1154	–	if (options)
1155	–	support->options = xstrdup(options);
1156	–	support->number = n;
1157	–
1158	–	rebuild_isupport_message_line();
1159	–	}
1160	–
1161	–	/*
1162	–	* delete_isupport()
1163	–	*
1164	–	* input        - name of supported function
1165	–	* output       - NONE
1166	–	* side effects - Each supported item must call this when deactivated
1167	–	*/
1168	–	void
1169	–	delete_isupport(const char *name)
1170	–	{
1171	–	dlink_node *ptr;
1172	–	struct Isupport *support;
1173	–
1174	–	DLINK_FOREACH(ptr, support_list.head)
1175	–	{
1176	–	support = ptr->data;
1177	–	if (irccmp(support->name, name) == 0)
1178	–	{
1179	–	dlinkDelete(ptr, &support_list);
1180	–	MyFree(support->name);
1181	–	MyFree(support->options);
1182	–	MyFree(support);
1183	–	break;
1184	–	}
1185	–	}
1186	–
1187	–	rebuild_isupport_message_line();
1188	–	}
1189	–
1190	–	/*
1191	–	* rebuild_isupport_message_line
1192	–	*
1193	–	* input        - NONE
1194	–	* output       - NONE
1195	–	* side effects - Destroy the isupport MessageFile lines, and rebuild.
1196	–	*/
1197	–	void
1198	–	rebuild_isupport_message_line(void)
1199	–	{
1200	–	char isupportbuffer[IRCD_BUFSIZE];
1201	–	char *p = isupportbuffer;
1202	–	dlink_node *ptr = NULL, *ptr_next = NULL;
1203	–	int n = 0;
1204	–	int tokens = 0;
1205	–	size_t len = 0;
1206	–	size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1207	–
1208	–	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1209	–	{
1210	–	dlinkDelete(ptr, &support_list_lines);
1211	–	MyFree(ptr->data);
1212	–	free_dlink_node(ptr);
1213	–	}
1214	–
1215	–	DLINK_FOREACH(ptr, support_list.head)
1216	–	{
1217	–	struct Isupport *support = ptr->data;
1218	–
1219	–	p += (n = sprintf(p, "%s", support->name));
1220	–	len += n;
1221	–
1222	–	if (support->options)
1223	–	{
1224	–	p += (n = sprintf(p, "=%s", support->options));
1225	–	len += n;
1226	–	}
1227	–
1228	–	if (support->number > 0)
1229	–	{
1230	–	p += (n = sprintf(p, "=%d", support->number));
1231	–	len += n;
1232	–	}
1233	–
1234	–	*p++ = ' ';
1235	–	len++;
1236	–	*p = '\0';
1237	–
1238	–	if (++tokens == (MAXPARA-2) || len >= (sizeof(isupportbuffer)-reserve))
1239	–	{ /* arbritrary for now */
1240	–	if (*--p == ' ')
1241	–	*p = '\0';
1242	–
1243	–	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1244	–	p = isupportbuffer;
1245	–	len = 0;
1246	–	n = tokens = 0;
1247	–	}
1248	–	}
1249	–
1250	–	if (len)
1251	–	{
1252	–	if (*--p == ' ')
1253	–	*p = '\0';
1254	–	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1255	–	}
1256	–	}

Diff Legend

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