ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/svn/ircd-hybrid/trunk/include/client.h

Comparing:
ircd-hybrid-8/include/client.h (file contents), Revision 1219 by michael, Sun Sep 18 09:02:38 2011 UTC vs.
ircd-hybrid/trunk/include/client.h (file contents), Revision 6621 by michael, Sat Oct 24 12:22:13 2015 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  client.h: The ircd client header.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2002 by the past and present ircd coders, and others.
4	>	*  Copyright (c) 1997-2015 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 16 | Line 15
15		*
16		*  You should have received a copy of the GNU General Public License
17		*  along with this program; if not, write to the Free Software
18	<	*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
18	>	*  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
19		*  USA
21	–	*
22	–	*  $Id$
20		*/
21
22	+	/*! \file client.h
23	+	* \brief Header including structures, macros and prototypes for client handling
24	+	* \version $Id$
25	+	*/
26	+
27	+
28		#ifndef INCLUDED_client_h
29		#define INCLUDED_client_h
30
#	Line 29 | Line 32
32		#include "fdlist.h"
33		#include "config.h"
34		#include "ircd_defs.h"
32	–	#include "ircd_handler.h"
35		#include "dbuf.h"
36		#include "channel.h"
37	<	#include "irc_res.h"
37	>	#include "auth.h"
38
39	<	#define HOSTIPLEN       53 /* sizeof("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255.ipv6") */
38	<	#define PASSWDLEN       20
39	<	#define CIPHERKEYLEN    64 /* 512bit */
40	<	#define IDLEN           12 /* this is the maximum length, not the actual
41	<	generated length; DO NOT CHANGE! */
39	>	struct MaskItem;
40
41		/*
42	<	* pre declare structs
42	>	* status macros.
43		*/
44	<	struct AccessItem;
47	<	struct Whowas;
48	<	struct Listener;
49	<	struct Client;
50	<	struct LocalUser;
51	<
52	<
53	<	struct Server
54	<	{
55	<	struct ConfItem *sconf; /* ConfItem connect{} pointer for this server */
56	<	dlink_list server_list; /* Servers on this server            */
57	<	dlink_list client_list; /* Clients on this server            */
58	<	char by[NICKLEN];       /* who activated this connection     */
59	<	};
60	<
61	<	struct SlinkRpl
44	>	enum
45		{
46	<	int command;
47	<	int datalen;
48	<	int gotdatalen;
49	<	int readdata;
50	<	unsigned char *data;
51	<	};
69	<
70	<	struct ZipStats
71	<	{
72	<	uint64_t in;
73	<	uint64_t in_wire;
74	<	uint64_t out;
75	<	uint64_t out_wire;
76	<	double in_ratio;
77	<	double out_ratio;
78	<	};
79	<
80	<	struct ListTask
81	<	{
82	<	unsigned int hash_index; /* the bucket we are currently in */
83	<	dlink_list show_mask; /* show these channels..          */
84	<	dlink_list hide_mask; /* ..and hide these ones          */
85	<	unsigned int users_min, users_max;
86	<	unsigned int created_min, created_max;
87	<	unsigned int topicts_min, topicts_max;
88	<	};
89	<
90	<	struct Client
91	<	{
92	<	dlink_node node;
93	<	dlink_node lnode;             /* Used for Server->servers/users */
94	<
95	<	struct LocalUser *localClient;
96	<	struct Client    *hnext;              /* For client hash table lookups by name */
97	<	struct Client    *idhnext;    /* For SID hash table lookups by sid */
98	<	struct Server    *serv;       /* ...defined, if this is a server */
99	<	struct Client    *servptr;    /* Points to server this Client is on */
100	<	struct Client    *from;       /* == self, if Local Client, *NEVER* NULL! */
101	<	struct Whowas    *whowas;     /* Pointers to whowas structs */
102	<	char             *away;
103	<
104	<	time_t            lasttime;   /* ...should be only LOCAL clients? --msa */
105	<	time_t            firsttime;  /* time client was created */
106	<	time_t            since;      /* last time we parsed something */
107	<	time_t            tsinfo;     /* TS on the nick, SVINFO on server */
108	<	time_t            servicestamp;
109	<	uint64_t          flags;      /* client flags */
110	<
111	<	unsigned int      umodes;     /* opers, normal users subset */
112	<	unsigned int      hopcount;   /* number of servers to this 0 = local */
113	<	unsigned int      status;     /* Client type */
114	<	unsigned int      handler;    /* Handler index */
115	<
116	<	dlink_list        channel;   /* chain of channel pointer blocks */
117	<
118	<	/*
119	<	* client->name is the unique name for a client nick or host
120	<	*/
121	<	char name[HOSTLEN + 1];
122	<	char id[IDLEN + 1];       /* client ID, unique ID per client */
123	<
124	<	/*
125	<	* client->username is the username from ident or the USER message,
126	<	* If the client is idented the USER message is ignored, otherwise
127	<	* the username part of the USER message is put here prefixed with a
128	<	* tilde depending on the I:line, Once a client has registered, this
129	<	* field should be considered read-only.
130	<	*/
131	<	char              username[USERLEN + 1]; /* client's username */
132	<
133	<	/*
134	<	* client->host contains the resolved name or ip address
135	<	* as a string for the user, it may be fiddled with for oper spoofing etc.
136	<	* once it's changed the *real* address goes away. This should be
137	<	* considered a read-only field after the client has registered.
138	<	*/
139	<	char              host[HOSTLEN + 1];     /* client's hostname */
140	<
141	<	/*
142	<	* client->info for unix clients will normally contain the info from the
143	<	* gcos field in /etc/passwd but anything can go here.
144	<	*/
145	<	char              info[REALLEN + 1]; /* Free form additional client info */
146	<
147	<	/*
148	<	* client->sockhost contains the ip address gotten from the socket as a
149	<	* string, this field should be considered read-only once the connection
150	<	* has been made. (set in s_bsd.c only)
151	<	*/
152	<	char              sockhost[HOSTIPLEN + 1]; /* This is the host name from the
153	<	socket ip address as string */
46	>	STAT_CONNECTING = 0x00000001U,
47	>	STAT_HANDSHAKE  = 0x00000002U,
48	>	STAT_ME         = 0x00000004U,
49	>	STAT_UNKNOWN    = 0x00000008U,
50	>	STAT_SERVER     = 0x00000010U,
51	>	STAT_CLIENT     = 0x00000020U
52		};
53
54	<	struct LocalUser
54	>	enum
55		{
56	<	/*
57	<	* The following fields are allocated only for local clients
58	<	* (directly connected to *this* server with a socket.
59	<	*/
162	<	dlink_node   lclient_node;
163	<
164	<	char         client_host[HOSTLEN + 1];
165	<	char         client_server[HOSTLEN + 1];
166	<
167	<	unsigned int registration;
168	<	unsigned int cap_client;    /* Client capabilities (from us) */
169	<	unsigned int cap_active;    /* Active capabilities (to us) */
170	<
171	<	unsigned int operflags;     /* oper priv flags */
172	<	unsigned int random_ping;
173	<
174	<	unsigned int serial;     /* used to enforce 1 send per nick */
175	<
176	<	/* Anti flooding part, all because of lamers... */
177	<	time_t       last_knock;    /* time of last knock */
178	<	time_t       last_away; /* Away since... */
179	<	time_t       last_join_time;   /* when this client last
180	<	joined a channel */
181	<	time_t       last_leave_time;  /* when this client last
182	<	* left a channel */
183	<	int          join_leave_count; /* count of JOIN/LEAVE in less than
184	<	MIN_JOIN_LEAVE_TIME seconds */
185	<	int          oper_warn_count_down; /* warn opers of this possible
186	<	spambot every time this gets to 0 */
187	<	time_t       reject_delay;
188	<	time_t       last_caller_id_time;
189	<	time_t       first_received_message_time;
190	<	time_t       last_nick_change;
191	<	time_t       last_privmsg; /* Last time we got a PRIVMSG */
192	<
193	<	int          received_number_of_privmsgs;
194	<	unsigned int number_of_nick_changes;
195	<
196	<	struct ListTask  *list_task;
197	<	/* Send and receive dbufs .. */
198	<	struct dbuf_queue buf_sendq;
199	<	struct dbuf_queue buf_recvq;
200	<
201	<	struct {
202	<	unsigned int messages;      /* Statistics: protocol messages sent/received */
203	<	uint64_t bytes;             /* Statistics: total bytes sent/received */
204	<	} recv, send;
205	<
206	<	struct AuthRequest *auth;
207	<	struct Listener *listener;   /* listener accepted from */
208	<	dlink_list        acceptlist; /* clients I'll allow to talk to me */
209	<	dlink_list        watches;   /* chain of Watch pointer blocks */
210	<	dlink_list        confs;     /* Configuration record associated */
211	<	dlink_list        invited;   /* chain of invite pointer blocks */
212	<	struct irc_ssaddr ip;
213	<	int               aftype;     /* Makes life easier for DNS res in IPV6 */
214	<
215	<	char              *passwd;
216	<	unsigned int       caps;       /* capabilities bit-field */
217	<	unsigned int       enc_caps;   /* cipher capabilities bit-field */
218	<
219	<	#ifdef HAVE_LIBCRYPTO
220	<	struct EncCapability *in_cipher;
221	<	struct EncCapability *out_cipher;
222	<
223	<	char              in_key[CIPHERKEYLEN];
224	<	char              out_key[CIPHERKEYLEN];
225	<	#endif
226	<
227	<	fde_t             fd;
228	<	fde_t             ctrlfd;     /* For servers: control fd used for sending commands
229	<	to servlink */
230	<
231	<	struct SlinkRpl  slinkrpl;    /* slink reply being parsed */
232	<	char    *slinkq;              /* sendq for control data */
233	<	int              slinkq_ofs;  /* ofset into slinkq */
234	<	int              slinkq_len;  /* length remaining after slinkq_ofs */
235	<
236	<	struct ZipStats  zipstats;
237	<
238	<	/* Anti-flood stuff. We track how many messages were parsed and how
239	<	* many we were allowed in the current second, and apply a simple
240	<	* decay to avoid flooding.
241	<	*   -- adrian
242	<	*/
243	<	int allow_read;       /* how many we're allowed to read in this second */
244	<	int sent_parsed;      /* how many messages we've parsed in this second */
245	<
246	<	char*          response;  /* expected response from client */
247	<	char*          auth_oper; /* Operator to become if they supply the response.*/
56	>	REG_NEED_USER = 0x00000001U,  /**< User must send USER command */
57	>	REG_NEED_NICK = 0x00000002U,  /**< User must send NICK command */
58	>	REG_NEED_CAP  = 0x00000004U,  /**< In middle of CAP negotiations */
59	>	REG_INIT      = REG_NEED_USER | REG_NEED_NICK
60		};
61
62	<	/*
251	<	* status macros.
252	<	*/
253	<	#define STAT_CONNECTING         0x01
254	<	#define STAT_HANDSHAKE          0x02
255	<	#define STAT_ME                 0x04
256	<	#define STAT_UNKNOWN            0x08
257	<	#define STAT_SERVER             0x10
258	<	#define STAT_CLIENT             0x20
259	<
260	<	#define REG_NEED_USER 0x1
261	<	#define REG_NEED_NICK 0x2
262	<	#define REG_NEED_CAP  0x4
263	<	#define REG_INIT (REG_NEED_USER|REG_NEED_NICK)
264	<
265	<	#define HasID(x)                ((x)->id[0] != '\0')
266	<	#define ID(x)                   (HasID(x) ? (x)->id : (x)->name)
267	<	#define ID_or_name(x,client_p)  ((IsCapable(client_p, CAP_TS6) && HasID(x)) ? (x)->id : (x)->name)
62	>	#define ID_or_name(x,client_p)  ((IsServer(client_p->from) && (x)->id[0]) ? (x)->id : (x)->name)
63
269	–	#define IsRegistered(x)         ((x)->status  > STAT_UNKNOWN)
64		#define IsConnecting(x)         ((x)->status == STAT_CONNECTING)
65		#define IsHandshake(x)          ((x)->status == STAT_HANDSHAKE)
66		#define IsMe(x)                 ((x)->status == STAT_ME)
#	Line 275 | Line 69 | struct LocalUser
69		#define IsClient(x)             ((x)->status == STAT_CLIENT)
70
71		#define SetConnecting(x)        {(x)->status = STAT_CONNECTING; \
72	<	(x)->handler = UNREGISTERED_HANDLER; }
72	>	(x)->handler = UNREGISTERED_HANDLER; }
73
74		#define SetHandshake(x)         {(x)->status = STAT_HANDSHAKE; \
75	<	(x)->handler = UNREGISTERED_HANDLER; }
75	>	(x)->handler = UNREGISTERED_HANDLER; }
76
77		#define SetMe(x)                {(x)->status = STAT_ME; \
78	<	(x)->handler = UNREGISTERED_HANDLER; }
78	>	(x)->handler = UNREGISTERED_HANDLER; }
79
80		#define SetUnknown(x)           {(x)->status = STAT_UNKNOWN; \
81	<	(x)->handler = UNREGISTERED_HANDLER; }
81	>	(x)->handler = UNREGISTERED_HANDLER; }
82
83		#define SetServer(x)            {(x)->status = STAT_SERVER; \
84	<	(x)->handler = SERVER_HANDLER; }
84	>	(x)->handler = SERVER_HANDLER; }
85
86		#define SetClient(x)            {(x)->status = STAT_CLIENT; \
87	<	(x)->handler = HasUMode(x, UMODE_OPER) ? \
294	<	OPER_HANDLER : CLIENT_HANDLER; }
87	>	(x)->handler = CLIENT_HANDLER; }
88
89	<	#define MyConnect(x)            ((x)->localClient != NULL)
89	>	#define MyConnect(x)            ((x)->connection != NULL)
90		#define MyClient(x)             (MyConnect(x) && IsClient(x))
91
92		/*
93		* ts stuff
94		*/
95	<	#define TS_CURRENT      6       /* current TS protocol version */
96	<	#define TS_MIN          5       /* minimum supported TS protocol version */
97	<	#define TS_DOESTS       0x20000000
98	<	#define DoesTS(x)       ((x)->tsinfo == TS_DOESTS)
99	<
95	>	enum
96	>	{
97	>	TS_CURRENT = 6,  /**< Current TS protocol version */
98	>	TS_MIN     = 6   /**< Minimum supported TS protocol version */
99	>	};
100
101	+	enum
102	+	{
103	+	CAP_MULTI_PREFIX   = 0x00000001U,
104	+	CAP_AWAY_NOTIFY    = 0x00000002U,
105	+	CAP_UHNAMES        = 0x00000004U,
106	+	CAP_EXTENDED_JOIN  = 0x00000008U,
107	+	CAP_ACCOUNT_NOTIFY = 0x00000010U
108	+	};
109
110	<	#define CAP_MULTI_PREFIX  0x00000001
110	>	#define HasCap(x, y) ((x)->connection->cap_active & (y))
111
311	–	#define HasCap(x, y) ((x)->localClient->cap_active & (y))
112
113		/* housekeeping flags */
114	<	#define FLAGS_PINGSENT      0x0000000000000001 /* Unreplied ping sent                      */
115	<	#define FLAGS_DEADSOCKET    0x0000000000000002 /* Local socket is dead--Exiting soon       */
116	<	#define FLAGS_KILLED        0x0000000000000004 /* Prevents "QUIT" from being sent for this */
117	<	#define FLAGS_CLOSING       0x0000000000000008 /* set when closing to suppress errors      */
118	<	#define FLAGS_GOTID         0x0000000000000010 /* successful ident lookup achieved         */
119	<	#define FLAGS_NEEDID        0x0000000000000020 /* I-lines say must use ident return        */
120	<	#define FLAGS_SENDQEX       0x0000000000000040 /* Sendq exceeded                           */
121	<	#define FLAGS_IPHASH        0x0000000000000080 /* iphashed this client                     */
122	<	#define FLAGS_CRYPTIN       0x0000000000000100 /* incoming data must be decrypted          */
123	<	#define FLAGS_CRYPTOUT      0x0000000000000200 /* outgoing data must be encrypted          */
124	<	#define FLAGS_WAITAUTH      0x0000000000000400 /* waiting for CRYPTLINK AUTH command       */
125	<	#define FLAGS_SERVLINK      0x0000000000000800 /* servlink has servlink process            */
126	<	#define FLAGS_MARK          0x0000000000001000 /* marked client                            */
127	<	#define FLAGS_CANFLOOD      0x0000000000002000 /* client has the ability to flood          */
128	<	#define FLAGS_EXEMPTGLINE   0x0000000000004000 /* client can't be G-lined                  */
129	<	#define FLAGS_EXEMPTKLINE   0x0000000000008000 /* client is exempt from kline              */
130	<	#define FLAGS_NOLIMIT       0x0000000000010000 /* client is exempt from limits             */
131	<	#define FLAGS_UNUSED___     0x0000000000020000 /* Unused                                   */
132	<	#define FLAGS_PING_COOKIE   0x0000000000040000 /* PING Cookie                              */
133	<	#define FLAGS_UNUSED____    0x0000000000080000 /* Unused                                   */
134	<	#define FLAGS_IP_SPOOFING   0x0000000000100000 /* client IP is spoofed                     */
135	<	#define FLAGS_FLOODDONE     0x0000000000200000 /* Flood grace period has been ended.       */
136	<	#define FLAGS_EOB           0x0000000000400000 /* server has received EOB                  */
137	<	#define FLAGS_HIDDEN        0x0000000000800000 /* a hidden server. not shown in /links     */
138	<	#define FLAGS_BLOCKED       0x0000000001000000 /* must wait for COMM_SELECT_WRITE          */
139	<	#define FLAGS_SBLOCKED      0x0000000002000000 /* slinkq is blocked                        */
140	<	#define FLAGS_USERHOST      0x0000000004000000 /* client is in userhost hash               */
141	<	#define FLAGS_BURSTED       0x0000000008000000 /* user was already bursted                 */
142	<	#define FLAGS_EXEMPTRESV    0x0000000010000000 /* client is exempt from RESV               */
343	<	#define FLAGS_GOTUSER       0x0000000020000000 /* if we received a USER command            */
344	<	#define FLAGS_PINGWARNING   0x0000000040000000 /* unreplied ping warning already sent      */
345	<	#define FLAGS_FINISHED_AUTH 0x0000000080000000 /* Client has been released from auth       */
346	<	#define FLAGS_FLOOD_NOTICED 0x0000000100000000
347	<	#define FLAGS_SERVICE       0x0000000200000000 /* Client/server is a network service       */
114	>	enum
115	>	{
116	>	FLAGS_PINGSENT      = 0x00000001U,  /**< Unreplied ping sent */
117	>	FLAGS_DEADSOCKET    = 0x00000002U,  /**< Local socket is dead--Exiting soon */
118	>	FLAGS_KILLED        = 0x00000004U,  /**< Prevents "QUIT" from being sent for this */
119	>	FLAGS_CLOSING       = 0x00000008U,  /**< Set when closing to suppress errors */
120	>	FLAGS_GOTID         = 0x00000010U,  /**< Successful ident lookup achieved */
121	>	FLAGS_SENDQEX       = 0x00000020U,  /**< Sendq exceeded */
122	>	FLAGS_IPHASH        = 0x00000040U,  /**< Iphashed this client */
123	>	FLAGS_MARK          = 0x00000080U,  /**< Marked client */
124	>	FLAGS_CANFLOOD      = 0x00000100U,  /**< Client has the ability to flood */
125	>	FLAGS_EXEMPTKLINE   = 0x00000200U,  /**< Client is exempt from k-lines */
126	>	FLAGS_NOLIMIT       = 0x00000400U,  /**< Client is exempt from limits */
127	>	FLAGS_PING_COOKIE   = 0x00000800U,  /**< PING Cookie */
128	>	FLAGS_FLOODDONE     = 0x00001000U,  /**< Flood grace period has been ended. */
129	>	FLAGS_EOB           = 0x00002000U,  /**< Server has sent us an EOB */
130	>	FLAGS_HIDDEN        = 0x00004000U,  /**< A hidden server. Not shown in /links */
131	>	FLAGS_BLOCKED       = 0x00008000U,  /**< Must wait for COMM_SELECT_WRITE */
132	>	FLAGS_USERHOST      = 0x00010000U,  /**< Client is in userhost hash */
133	>	FLAGS_BURSTED       = 0x00020000U,  /**< User was already bursted */
134	>	FLAGS_EXEMPTRESV    = 0x00040000U,  /**< Client is exempt from RESV */
135	>	FLAGS_GOTUSER       = 0x00080000U,  /**< If we received a USER command */
136	>	FLAGS_FINISHED_AUTH = 0x00100000U,  /**< Client has been released from auth */
137	>	FLAGS_FLOOD_NOTICED = 0x00200000U,  /**< Notice to opers about this flooder has been sent */
138	>	FLAGS_SERVICE       = 0x00400000U,  /**< Client/server is a network service */
139	>	FLAGS_SSL           = 0x00800000U,  /**< User is connected via TLS/SSL */
140	>	FLAGS_SQUIT         = 0x01000000U,
141	>	FLAGS_EXEMPTXLINE   = 0x02000000U   /**< Client is exempt from x-lines */
142	>	};
143
144		#define HasFlag(x, y) ((x)->flags &   (y))
145		#define AddFlag(x, y) ((x)->flags |=  (y))
146		#define DelFlag(x, y) ((x)->flags &= ~(y))
147
148
354	–
149		/* umodes, settable flags */
150	<	#define UMODE_SERVNOTICE   0x00000001 /* server notices such as kill */
151	<	#define UMODE_CCONN        0x00000002 /* Client Connections */
152	<	#define UMODE_REJ          0x00000004 /* Bot Rejections */
153	<	#define UMODE_SKILL        0x00000008 /* Server Killed */
154	<	#define UMODE_FULL         0x00000010 /* Full messages */
155	<	#define UMODE_SPY          0x00000020 /* see STATS / LINKS */
156	<	#define UMODE_DEBUG        0x00000040 /* 'debugging' info */
157	<	#define UMODE_NCHANGE      0x00000080 /* Nick change notice */
158	<	#define UMODE_WALLOP       0x00000100 /* send wallops to them */
159	<	#define UMODE_OPERWALL     0x00000200 /* Operwalls */
160	<	#define UMODE_INVISIBLE    0x00000400 /* makes user invisible */
161	<	#define UMODE_BOTS         0x00000800 /* shows bots */
162	<	#define UMODE_EXTERNAL     0x00001000 /* show servers introduced and splitting */
163	<	#define UMODE_CALLERID     0x00002000 /* block unless caller id's */
164	<	#define UMODE_SOFTCALLERID 0x00004000 /* block unless on common channel */
165	<	#define UMODE_UNAUTH       0x00008000 /* show unauth connects here */
166	<	#define UMODE_LOCOPS       0x00010000 /* show locops */
167	<	#define UMODE_DEAF         0x00020000 /* don't receive channel messages */
168	<	#define UMODE_CCONN_FULL   0x00040000 /* add unused fields to connection monitoring */
169	<	#define UMODE_REGISTERED   0x00080000 /* User has identified for that nick. */
170	<	#define UMODE_REGONLY      0x00100000 /* Only registered nicks may PM */
171	<	#define UMODE_OPER         0x40000000 /* Operator */
172	<	#define UMODE_ADMIN        0x80000000 /* Admin on server */
173	<
174	<	#define UMODE_ALL          UMODE_SERVNOTICE
150	>	enum
151	>	{
152	>	UMODE_SERVNOTICE   = 0x00000001U,  /**< Server notices such as kill */
153	>	UMODE_CCONN        = 0x00000002U,  /**< Can see client connection notices */
154	>	UMODE_REJ          = 0x00000004U,  /**< Bot Rejections */
155	>	UMODE_SKILL        = 0x00000008U,  /**< Server Killed */
156	>	UMODE_FULL         = 0x00000010U,  /**< Full messages */
157	>	UMODE_SPY          = 0x00000020U,  /**< See STATS / LINKS */
158	>	UMODE_DEBUG        = 0x00000040U,  /**< 'debugging' info */
159	>	UMODE_NCHANGE      = 0x00000080U,  /**< Nick change notice */
160	>	UMODE_WALLOP       = 0x00000100U,  /**< Send wallops to them */
161	>	UMODE_INVISIBLE    = 0x00000200U,  /**< Makes user invisible */
162	>	UMODE_BOTS         = 0x00000400U,  /**< Shows bots */
163	>	UMODE_EXTERNAL     = 0x00000800U,  /**< Show servers introduced and splitting */
164	>	UMODE_CALLERID     = 0x00001000U,  /**< Block unless caller id's */
165	>	UMODE_SOFTCALLERID = 0x00002000U,  /**< Block unless on common channel */
166	>	UMODE_UNAUTH       = 0x00004000U,  /**< Show unauth connects here */
167	>	UMODE_LOCOPS       = 0x00008000U,  /**< Can see LOCOPS messages */
168	>	UMODE_DEAF         = 0x00010000U,  /**< Don't receive channel messages */
169	>	UMODE_REGISTERED   = 0x00020000U,  /**< User has identified for that nick. */
170	>	UMODE_REGONLY      = 0x00040000U,  /**< Only registered nicks may PM */
171	>	UMODE_HIDDEN       = 0x00080000U,  /**< IRC operator status is hidden */
172	>	UMODE_OPER         = 0x00100000U,  /**< IRC operator */
173	>	UMODE_ADMIN        = 0x00200000U,  /**< Admin on server */
174	>	UMODE_FARCONNECT   = 0x00400000U,  /**< Can see remote client connects/exits */
175	>	UMODE_HIDDENHOST   = 0x00800000U,  /**< User's host is hidden */
176	>	UMODE_SSL          = 0x01000000U,  /**< User is connected via TLS/SSL */
177	>	UMODE_WEBIRC       = 0x02000000U,  /**< User connected via a webirc gateway */
178	>	UMODE_HIDEIDLE     = 0x04000000U,  /**< Hides idle and signon time in WHOIS */
179	>	UMODE_HIDECHANS    = 0x08000000U   /**< Hides channel list in WHOIS */
180	>	};
181
182		#define HasUMode(x, y) ((x)->umodes &   (y))
183		#define AddUMode(x, y) ((x)->umodes |=  (y))
184		#define DelUMode(x, y) ((x)->umodes &= ~(y))
185
386	–	#define SEND_UMODES  (UMODE_INVISIBLE | UMODE_OPER | UMODE_WALLOP | \
387	–	UMODE_REGISTERED | UMODE_ADMIN)
388	–
389	–
186
187		/* oper priv flags */
188	<	#define OPER_FLAG_GLOBAL_KILL  0x00000001 /* oper can global kill        */
189	<	#define OPER_FLAG_REMOTE       0x00000002 /* oper can do squits/connects */
190	<	#define OPER_FLAG_UNKLINE      0x00000004 /* oper can use unkline        */
191	<	#define OPER_FLAG_GLINE        0x00000008 /* oper can use gline          */
192	<	#define OPER_FLAG_N            0x00000010 /* oper can umode n            */
193	<	#define OPER_FLAG_K            0x00000020 /* oper can kill/kline         */
194	<	#define OPER_FLAG_X            0x00000040 /* oper can xline              */
195	<	#define OPER_FLAG_DIE          0x00000080 /* oper can die                */
196	<	#define OPER_FLAG_REHASH       0x00000100 /* oper can rehash             */
197	<	#define OPER_FLAG_ADMIN        0x00000200 /* oper can set umode +a       */
198	<	#define OPER_FLAG_HIDDEN_ADMIN 0x00000400 /* admin is hidden             */
199	<	#define OPER_FLAG_OPERWALL     0x00000800 /* */
200	<	#define OPER_FLAG_OPER_SPY     0x00001000 /* */
201	<	#define OPER_FLAG_REMOTEBAN    0x00002000 /* */
202	<	#define OPER_FLAG_HIDDEN_OPER  0x00004000 /* */
203	<	#define OPER_FLAG_GLOBOPS      0x00008000
204	<
205	<	#define HasOFlag(x, y) (MyConnect(x) ? (x)->localClient->operflags & (y) : 0)
206	<	#define AddOFlag(x, y) ((x)->localClient->operflags |=  (y))
207	<	#define DelOFlag(x, y) ((x)->localClient->operflags &= ~(y))
208	<	#define ClrOFlag(x)    ((x)->localClient->operflags = 0)
188	>	enum
189	>	{
190	>	OPER_FLAG_KILL_REMOTE    = 0x00000001U,  /**< Oper can KILL remote users */
191	>	OPER_FLAG_KILL           = 0x00000002U,  /**< Oper can KILL local users */
192	>	OPER_FLAG_UNKLINE        = 0x00000004U,  /**< Oper can use UNKLINE command */
193	>	OPER_FLAG_KLINE          = 0x00000008U,  /**< Oper can use KLINE command */
194	>	OPER_FLAG_XLINE          = 0x00000010U,  /**< Oper can use XLINE command */
195	>	OPER_FLAG_DIE            = 0x00000020U,  /**< Oper can use DIE command */
196	>	OPER_FLAG_REHASH         = 0x00000040U,  /**< Oper can use REHASH command */
197	>	OPER_FLAG_ADMIN          = 0x00000080U,  /**< Oper can set user mode +a */
198	>	OPER_FLAG_REMOTEBAN      = 0x00000100U,  /**< Oper can set remote bans */
199	>	OPER_FLAG_GLOBOPS        = 0x00000200U,  /**< Oper can use GLOBOPS command */
200	>	OPER_FLAG_MODULE         = 0x00000400U,  /**< Oper can use MODULE command */
201	>	OPER_FLAG_RESTART        = 0x00000800U,  /**< Oper can use RESTART command */
202	>	OPER_FLAG_DLINE          = 0x00001000U,  /**< Oper can use DLINE command */
203	>	OPER_FLAG_UNDLINE        = 0x00002000U,  /**< Oper can use UNDLINE command */
204	>	OPER_FLAG_SET            = 0x00004000U,  /**< Oper can use SET command */
205	>	OPER_FLAG_SQUIT          = 0x00008000U,  /**< Oper can do local SQUIT */
206	>	OPER_FLAG_SQUIT_REMOTE   = 0x00010000U,  /**< Oper can do remote SQUIT */
207	>	OPER_FLAG_CONNECT        = 0x00020000U,  /**< Oper can do local CONNECT */
208	>	OPER_FLAG_CONNECT_REMOTE = 0x00040000U,  /**< Oper can do remote CONNECT */
209	>	OPER_FLAG_WALLOPS        = 0x00080000U,  /**< Oper can use WALLOPS command */
210	>	OPER_FLAG_LOCOPS         = 0x00100000U,  /**< Oper can use LOCOPS command */
211	>	OPER_FLAG_UNXLINE        = 0x00200000U,  /**< Oper can use UNXLINE command */
212	>	OPER_FLAG_OPME           = 0x00400000U,  /**< Oper can use OPME command */
213	>	OPER_FLAG_JOIN_RESV      = 0x00800000U,  /**< Oper can use JOIN on resv {} channels */
214	>	OPER_FLAG_NICK_RESV      = 0x01000000U,  /**< Oper can use NICK on resv {} nicks */
215	>	OPER_FLAG_RESV           = 0x02000000U,  /**< Oper can use RESV command */
216	>	OPER_FLAG_UNRESV         = 0x04000000U,  /**< Oper can use UNRESV command */
217	>	OPER_FLAG_CLOSE          = 0x08000000U   /**< Oper can use CLOSE command */
218	>	};
219	>
220	>	#define HasOFlag(x, y) ((x)->connection->operflags &   (y))
221	>	#define AddOFlag(x, y) ((x)->connection->operflags |=  (y))
222	>	#define DelOFlag(x, y) ((x)->connection->operflags &= ~(y))
223	>	#define ClrOFlag(x)    ((x)->connection->operflags = 0)
224
225
226
227		/* flags macros. */
417	–	#define IsAuthFinished(x)       ((x)->flags & FLAGS_FINISHED_AUTH)
228		#define IsDead(x)               ((x)->flags & FLAGS_DEADSOCKET)
229		#define SetDead(x)              ((x)->flags |= FLAGS_DEADSOCKET)
230	<	#define IsClosing(x)            ((x)->flags & FLAGS_CLOSING)
421	<	#define SetClosing(x)           ((x)->flags |= FLAGS_CLOSING)
422	<	#define IsCryptIn(x)            ((x)->flags &  FLAGS_CRYPTIN)
423	<	#define SetCryptIn(x)           ((x)->flags |= FLAGS_CRYPTIN)
424	<	#define IsCryptOut(x)           ((x)->flags &  FLAGS_CRYPTOUT)
425	<	#define SetCryptOut(x)          ((x)->flags |= FLAGS_CRYPTOUT)
426	<	#define IsWaitAuth(x)           ((x)->flags &  FLAGS_WAITAUTH)
427	<	#define SetWaitAuth(x)          ((x)->flags |= FLAGS_WAITAUTH)
428	<	#define ClearWaitAuth(x)        ((x)->flags &= ~FLAGS_WAITAUTH)
429	<	#define HasServlink(x)          ((x)->flags &  FLAGS_SERVLINK)
430	<	#define SetServlink(x)          ((x)->flags |= FLAGS_SERVLINK)
431	<	#define SetCanFlood(x)          ((x)->flags |= FLAGS_CANFLOOD)
432	<	#define IsCanFlood(x)           ((x)->flags & FLAGS_CANFLOOD)
433	<	#define IsDefunct(x)            ((x)->flags & (FLAGS_DEADSOCKET|FLAGS_CLOSING| \
434	<	FLAGS_KILLED))
230	>	#define IsDefunct(x)            ((x)->flags & (FLAGS_DEADSOCKET|FLAGS_CLOSING|FLAGS_KILLED))
231
232		/* oper flags */
437	–	#define MyOper(x)               (MyConnect(x) && HasUMode(x, UMODE_OPER))
438	–
233		#define SetOper(x)              {(x)->umodes |= UMODE_OPER; \
234	<	if (!IsServer((x))) (x)->handler = OPER_HANDLER;}
234	>	if (MyClient((x))) (x)->handler = OPER_HANDLER;}
235
236		#define ClearOper(x)            {(x)->umodes &= ~(UMODE_OPER|UMODE_ADMIN); \
237	<	if (!HasUMode(x, UMODE_OPER) && !IsServer((x))) \
238	<	(x)->handler = CLIENT_HANDLER; }
445	<
446	<	#define SetSendQExceeded(x)     ((x)->flags |= FLAGS_SENDQEX)
447	<	#define IsSendQExceeded(x)      ((x)->flags &  FLAGS_SENDQEX)
448	<
449	<	#define SetIpHash(x)            ((x)->flags |= FLAGS_IPHASH)
450	<	#define ClearIpHash(x)          ((x)->flags &= ~FLAGS_IPHASH)
451	<	#define IsIpHash(x)             ((x)->flags & FLAGS_IPHASH)
452	<
453	<	#define SetUserHost(x)          ((x)->flags |= FLAGS_USERHOST)
454	<	#define ClearUserHost(x)        ((x)->flags &= ~FLAGS_USERHOST)
455	<	#define IsUserHostIp(x)         ((x)->flags & FLAGS_USERHOST)
456	<
457	<	#define SetPingSent(x)          ((x)->flags |= FLAGS_PINGSENT)
458	<	#define IsPingSent(x)           ((x)->flags & FLAGS_PINGSENT)
459	<	#define ClearPingSent(x)        ((x)->flags &= ~FLAGS_PINGSENT)
460	<
461	<	#define SetPingWarning(x)       ((x)->flags |= FLAGS_PINGWARNING)
462	<	#define IsPingWarning(x)        ((x)->flags & FLAGS_PINGWARNING)
463	<	#define ClearPingWarning(x)     ((x)->flags &= ~FLAGS_PINGWARNING)
464	<
465	<	#define SetNeedId(x)            ((x)->flags |= FLAGS_NEEDID)
466	<	#define IsNeedId(x)             ((x)->flags & FLAGS_NEEDID)
467	<
468	<	#define SetGotId(x)             ((x)->flags |= FLAGS_GOTID)
469	<	#define IsGotId(x)              ((x)->flags & FLAGS_GOTID)
470	<
471	<	#define IsExemptKline(x)        ((x)->flags & FLAGS_EXEMPTKLINE)
472	<	#define SetExemptKline(x)       ((x)->flags |= FLAGS_EXEMPTKLINE)
473	<	#define IsExemptLimits(x)       ((x)->flags & FLAGS_NOLIMIT)
474	<	#define SetExemptLimits(x)      ((x)->flags |= FLAGS_NOLIMIT)
475	<	#define IsExemptGline(x)        ((x)->flags & FLAGS_EXEMPTGLINE)
476	<	#define SetExemptGline(x)       ((x)->flags |= FLAGS_EXEMPTGLINE)
477	<	#define IsExemptResv(x)         ((x)->flags & FLAGS_EXEMPTRESV)
478	<	#define SetExemptResv(x)        ((x)->flags |= FLAGS_EXEMPTRESV)
479	<	#define SetIPSpoof(x)           ((x)->flags |= FLAGS_IP_SPOOFING)
480	<	#define IsIPSpoof(x)            ((x)->flags & FLAGS_IP_SPOOFING)
237	>	if (MyClient((x))) \
238	>	(x)->handler = CLIENT_HANDLER; }
239
240		#define IsFloodDone(x)          ((x)->flags &  FLAGS_FLOODDONE)
483	–	#define SetFloodDone(x)         ((x)->flags |= FLAGS_FLOODDONE)
484	–	#define HasPingCookie(x)        ((x)->flags & FLAGS_PING_COOKIE)
485	–	#define SetPingCookie(x)        ((x)->flags |= FLAGS_PING_COOKIE)
241		#define IsHidden(x)             ((x)->flags &  FLAGS_HIDDEN)
487	–	#define SetHidden(x)            ((x)->flags |= FLAGS_HIDDEN)
242
489	–	#define IsSendqBlocked(x)       ((x)->flags &  FLAGS_BLOCKED)
490	–	#define SetSendqBlocked(x)      ((x)->flags |= FLAGS_BLOCKED)
491	–	#define ClearSendqBlocked(x)    ((x)->flags &= ~FLAGS_BLOCKED)
492	–	#define IsSlinkqBlocked(x)      ((x)->flags &  FLAGS_SBLOCKED)
493	–	#define SetSlinkqBlocked(x)     ((x)->flags |= FLAGS_SBLOCKED)
494	–	#define ClearSlinkqBlocked(x)   ((x)->flags &= ~FLAGS_SBLOCKED)
495	–
496	–	#define IsCaptured(x)           ((x)->handler == DUMMY_HANDLER)
497	–	#define SetCaptured(x)          ((x)->handler = DUMMY_HANDLER)
498	–	#define ClearCaptured(x)        ((x)->handler = CLIENT_HANDLER)
243
244	+	/*! \brief addr_mask_type enumeration */
245	+	enum addr_mask_type
246	+	{
247	+	HIDE_IP, /**< IP is hidden. Resolved hostname is shown instead */
248	+	SHOW_IP, /**< IP is shown. No parts of it are hidden or masked */
249	+	MASK_IP  /**< IP is masked. 255.255.255.255 is shown instead */
250	+	};
251
252	<	/*
253	<	* definitions for get_client_name
254	<	* TBD - make this an enum
252	>	struct ServicesTag
253	>	{
254	>	dlink_node node;
255	>	char *tag;
256	>	unsigned int numeric;
257	>	unsigned int umodes;
258	>	};
259	>
260	>	/*! \brief Server structure */
261	>	struct Server
262	>	{
263	>	dlink_list server_list; /**< Servers on this server */
264	>	dlink_list client_list; /**< Clients on this server */
265	>	char by[NICKLEN + 1];   /**< Who activated this connection */
266	>	};
267	>
268	>	/*! \brief ListTask structure */
269	>	struct ListTask
270	>	{
271	>	dlink_node node;  /**< Embedded list node used to link into listing_client_list */
272	>	dlink_list show_mask; /**< Channels to show */
273	>	dlink_list hide_mask; /**< Channels to hide */
274	>
275	>	unsigned int hash_index; /**< The hash bucket we are currently in */
276	>	unsigned int users_min;
277	>	unsigned int users_max;
278	>	unsigned int created_min;
279	>	unsigned int created_max;
280	>	unsigned int topicts_min;
281	>	unsigned int topicts_max;
282	>	char topic[TOPICLEN + 1];
283	>	};
284	>
285	>	/*! \brief Connection structure
286	>	*
287	>	* Allocated only for local clients, that are directly connected
288	>	* to \b this server with a socket.
289		*/
290	<	#define HIDE_IP 0
291	<	#define SHOW_IP 1
292	<	#define MASK_IP 2
290	>	struct Connection
291	>	{
292	>	dlink_node   lclient_node;
293	>
294	>	unsigned int registration;
295	>	unsigned int cap_client;  /**< Client capabilities (from us) */
296	>	unsigned int cap_active;  /**< Active capabilities (to us) */
297	>	unsigned int       caps;  /**< Capabilities bit-field */
298	>
299	>	unsigned int operflags;     /**< IRC Operator privilege flags */
300	>	unsigned int random_ping; /**< Holding a 32bit value used for PING cookies */
301	>
302	>	uint64_t serial;     /**< Used to enforce 1 send per nick */
303	>
304	>	time_t       lasttime;   /**< ...should be only LOCAL clients? --msa */
305	>	time_t       firsttime;  /**< Time client was created */
306	>	time_t       since;      /**< Last time we parsed something */
307	>	time_t       last_join_time;   /**< When this client last joined a channel */
308	>	time_t       last_leave_time;  /**< When this client last left a channel */
309	>	int          join_leave_count; /**< Count of JOIN/LEAVE in less than
310	>	MIN_JOIN_LEAVE_TIME seconds */
311	>	int          oper_warn_count_down; /**< Warn opers of this possible
312	>	spambot every time this gets to 0 */
313	>	time_t       last_caller_id_time;
314	>	time_t       first_received_message_time;
315	>	time_t       last_privmsg;  /**< Last time we got a PRIVMSG */
316	>
317	>	int          received_number_of_privmsgs;
318	>
319	>	struct ListTask  *list_task;
320	>
321	>	struct dbuf_queue buf_sendq;
322	>	struct dbuf_queue buf_recvq;
323	>
324	>	struct
325	>	{
326	>	unsigned int messages;      /**< Statistics: protocol messages sent/received */
327	>	uint64_t bytes;             /**< Statistics: total bytes sent/received */
328	>	} recv, send;
329	>
330	>	struct
331	>	{
332	>	unsigned int count;  /**< How many AWAY/INVITE/KNOCK/NICK requests client has sent */
333	>	time_t last_attempt;  /**< Last time the AWAY/INVITE/KNOCK/NICK request was issued */
334	>	} away, invite, knock, nick;
335	>
336	>	struct AuthRequest auth;
337	>	struct Listener *listener;   /**< Listener accepted from */
338	>	dlink_list        acceptlist; /**< Clients I'll allow to talk to me */
339	>	dlink_list        watches;   /**< Chain of Watch pointer blocks */
340	>	dlink_list        confs;     /**< Configuration record associated */
341	>	dlink_list        invited;   /**< Chain of invite pointer blocks */
342	>	struct irc_ssaddr ip;
343	>	int               aftype;    /**< Makes life easier for DNS res in IPV6 */
344	>	int               country_id; /**< ID corresponding to a ISO 3166 country code */
345	>
346	>	fde_t             fd;
347	>
348	>	/* Anti-flood stuff. We track how many messages were parsed and how
349	>	* many we were allowed in the current second, and apply a simple
350	>	* decay to avoid flooding.
351	>	*   -- adrian
352	>	*/
353	>	int allow_read;       /**< How many we're allowed to read in this second */
354	>	int sent_parsed;      /**< How many messages we've parsed in this second */
355	>
356	>	char *password;  /**< Password supplied by the client/server */
357	>	};
358	>
359	>	/*! \brief Client structure */
360	>	struct Client
361	>	{
362	>	dlink_node node;
363	>	dlink_node lnode;             /**< Used for Server->servers/users */
364	>
365	>	struct Connection *connection;  /**< Connection structure associated with this client */
366	>	struct Client    *hnext;      /**< For client hash table lookups by name */
367	>	struct Client    *idhnext;    /**< For SID hash table lookups by sid */
368	>	struct Server    *serv;       /**< ...defined, if this is a server */
369	>	struct Client    *servptr;    /**< Points to server this Client is on */
370	>	struct Client    *from;       /**< == self, if Local Client, *NEVER* NULL! */
371	>
372	>	time_t            tsinfo;     /**< TS on the nick, SVINFO on server */
373	>
374	>	unsigned int      flags;      /**< Client flags */
375	>	unsigned int      umodes;     /**< Opers, normal users subset */
376	>	unsigned int      hopcount;   /**< Number of servers to this 0 = local */
377	>	unsigned int      status;     /**< Client type */
378	>	unsigned int      handler;    /**< Handler index */
379	>
380	>	dlink_list        whowas;
381	>	dlink_list        channel;   /**< Chain of channel pointer blocks */
382	>	dlink_list        svstags;   /**< List of ServicesTag items */
383	>
384	>	char away[AWAYLEN + 1]; /**< Client's AWAY message. Can be set/unset via AWAY command */
385	>	char name[HOSTLEN + 1]; /**< Unique name for a client nick or host */
386	>	char id[IDLEN + 1];       /**< Client ID, unique ID per client */
387	>	char account[ACCOUNTLEN + 1]; /**< Services account */
388	>
389	>	/*
390	>	* client->username is the username from ident or the USER message,
391	>	* If the client is idented the USER message is ignored, otherwise
392	>	* the username part of the USER message is put here prefixed with a
393	>	* tilde depending on the auth{} block. Once a client has registered,
394	>	* this field should be considered read-only.
395	>	*/
396	>	char              username[USERLEN + 1]; /* client's username */
397	>
398	>	/*
399	>	* client->host contains the resolved name or ip address
400	>	* as a string for the user, it may be fiddled with for oper spoofing etc.
401	>	* once it's changed the *real* address goes away. This should be
402	>	* considered a read-only field after the client has registered.
403	>	*/
404	>	char              host[HOSTLEN + 1];     /* client's hostname */
405	>
406	>	/*
407	>	* client->info for unix clients will normally contain the info from the
408	>	* gcos field in /etc/passwd but anything can go here.
409	>	*/
410	>	char              info[REALLEN + 1]; /* Free form additional client info */
411	>
412	>	/*
413	>	* client->sockhost contains the ip address gotten from the socket as a
414	>	* string, this field should be considered read-only once the connection
415	>	* has been made. (set in s_bsd.c only)
416	>	*/
417	>	char              sockhost[HOSTIPLEN + 1]; /* This is the host name from the
418	>	socket ip address as string */
419	>	char             *certfp;
420	>	};
421	>
422
423		extern struct Client me;
424		extern dlink_list listing_client_list;
425		extern dlink_list global_client_list;
426	+	extern dlink_list global_server_list;   /* global servers on the network              */
427	+	extern dlink_list local_client_list;  /* local clients only ON this server          */
428	+	extern dlink_list local_server_list;  /* local servers to this server ONLY          */
429	+	extern dlink_list unknown_list;       /* unknown clients ON this server only        */
430	+	extern dlink_list oper_list;          /* our opers, duplicated in local_client_list */
431
432		extern int accept_message(struct Client *, struct Client *);
433	+	extern unsigned int client_get_idle_time(const struct Client *, const struct Client *);
434		extern struct split_nuh_item *find_accept(const char *, const char *,
435	<	const char *, struct Client *, int);
435	>	const char *, struct Client *,
436	>	int (*)(const char *, const char *));
437	>	extern void client_attach_svstag(struct Client *, unsigned int, const char *, const char *const);
438	>	extern void client_clear_svstags(struct Client *);
439		extern void del_accept(struct split_nuh_item *, struct Client *);
440		extern void del_all_accepts(struct Client *);
441	<	extern void exit_client(struct Client *, struct Client *, const char *);
441	>	extern void exit_client(struct Client *, const char *);
442	>	extern void conf_try_ban(struct Client *, struct MaskItem *);
443		extern void check_conf_klines(void);
444	<	extern void init_client(void);
444	>	extern void client_init(void);
445		extern void dead_link_on_write(struct Client *, int);
446		extern void dead_link_on_read(struct Client *, int);
447		extern void exit_aborted_clients(void);
448		extern void free_exited_clients(void);
449		extern struct Client *make_client(struct Client *);
450	<	extern struct Client *find_chasing(struct Client *, struct Client *, const char *, int *);
450	>	extern struct Client *find_chasing(struct Client *, const char *);
451		extern struct Client *find_person(const struct Client *const, const char *);
452	<	extern const char *get_client_name(const struct Client *, int);
452	>	extern const char *get_client_name(const struct Client *, enum addr_mask_type);
453
454		#endif /* INCLUDED_client_h */

Diff Legend

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