ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/include/client.h
(Generate patch)

Comparing deliantra/server/include/client.h (file contents):
Revision 1.2 by root, Fri Dec 15 20:07:02 2006 UTC vs.
Revision 1.86 by root, Wed Sep 2 16:54:20 2009 UTC

1
2/* 1/*
3 CrossFire, A Multiplayer game for the X Window System 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
4 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 7 *
8 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 (at your option) any later version. 11 * (at your option) any later version.
12 12 *
13 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 GNU General Public License for more details. 16 * GNU General Public License for more details.
17 17 *
18 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
21 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 The author can be reached via e-mail to crossfire.de
23*/ 22 */
24
25/*
26 newserver.h defines various structures and values that are use for the
27 new client server communication method. Values defined here are only
28 used on the server side code. For shared client/server values, see
29 newclient.h
30*/
31 23
32#ifndef CLIENT_H 24#ifndef CLIENT_H
33#define CLIENT_H 25#define CLIENT_H
34 26
35/* Reduce this from 50 to 5 - as it is now, there will never be more 27#include <deque>
36 * than 3 anyways. 28#include <bitset>
37 */ 29#include <tr1/unordered_set>
38 30
39#define NUM_LOOK_OBJECTS 50 31#if HAVE_TCP_INFO
32# include <netinet/tcp.h>
33#else
34 struct tcp_info {
35 // dummy
36 int tcpi_state;
37 int tcpi_ca_state;
38 int tcpi_retransmits;
39 int tcpi_probes;
40 int tcpi_backoff;
41 int tcpi_options;
42 int tcpi_snd_wscale;
43 int tcpi_rcv_wscale;
44 int tcpi_rto;
45 int tcpi_ato;
46 int tcpi_snd_mss;
47 int tcpi_rcv_mss;
48 int tcpi_unacked;
49 int tcpi_sacked;
50 int tcpi_lost;
51 int tcpi_retrans;
52 int tcpi_fackets;
53 int tcpi_last_data_sent;
54 int tcpi_last_ack_sent;
55 int tcpi_last_data_recv;
56 int tcpi_last_ack_recv;
57 int tcpi_pmtu;
58 int tcpi_rcv_ssthresh;
59 int tcpi_rtt;
60 int tcpi_rttvar;
61 int tcpi_snd_ssthresh;
62 int tcpi_snd_cwnd;
63 int tcpi_advmss;
64 int tcpi_reordering;
65 };
66#endif
67
68// (possibly) max. number of objects "per page" in the ground container
69#define FLOORBOX_PAGESIZE 50
40 70
41struct MapCell 71struct MapCell
42{ 72{
43 UUID player; // this is, unfortunately, very wasteful of memory space, but pretty bandwidth-efficient 73 tag_t player; // this is, unfortunately, very wasteful of memory space, but pretty bandwidth-efficient
44 int count; /* This is really darkness in the map1 command */ 74 int count; /* This is really darkness in the map1 command */
45 uint16 faces[MAP_LAYERS]; 75 faceidx faces[MAP_LAYERS];
46 uint16 smooth[MAP_LAYERS];
47 unsigned char stat_hp; // health of something in this space, or 0 76 unsigned char stat_hp; // health of something in this space, or 0
48 unsigned char flags; 77 unsigned char flags;
78 uint8_t smooth[MAP_LAYERS];
49}; 79};
50 80
51/* This basically defines the largest size an
52 * archetype may be - it is used for allocation of
53 * some structures, as well as determining how far
54 * we should look for the heads of big images.
55 */
56#define MAX_HEAD_OFFSET 8
57
58#define MAX_CLIENT_X (MAP_CLIENT_X + MAX_HEAD_OFFSET) 81#define MAX_CLIENT_X MAP_CLIENT_X
59#define MAX_CLIENT_Y (MAP_CLIENT_Y + MAX_HEAD_OFFSET) 82#define MAX_CLIENT_Y MAP_CLIENT_Y
60 83
61struct Map 84struct Map
62{ 85{
63 struct MapCell cells[MAX_CLIENT_X][MAX_CLIENT_Y]; 86 struct MapCell cells[MAX_CLIENT_X][MAX_CLIENT_Y];
64}; 87};
65 88
66/* True max is 16383 given current map compaction method */ 89/* True max is 16383 given current map compaction method */
67# define MAXANIMNUM 2000 90#define MAXANIMNUM 10000
68 91
69struct statsinfo 92struct statsinfo
70{ 93{
71 char *range, *title; 94 char *range, *title;
72}; 95};
… …
75 * current state. we set up our on buffers for sending/receiving, so we can 98 * current state. we set up our on buffers for sending/receiving, so we can
76 * handle some higher level functions. fd is the actual file descriptor we 99 * handle some higher level functions. fd is the actual file descriptor we
77 * are using. 100 * are using.
78 */ 101 */
79 102
80enum Sock_Status { Ns_Add, Ns_Dead };
81
82/* Only one map mode can actually be used, so lets make it a switch 103/* Only one map mode can actually be used, so lets make it a switch
83 * instead of having a bunch of different fields that needed to 104 * instead of having a bunch of different fields that needed to
84 * get toggled. 105 * get toggled.
85 */ 106 */
86enum MapMode { Map0Cmd = 0, Map1Cmd = 1, Map1aCmd = 2 }; 107enum { Map0Cmd = 0, Map1Cmd = 1, Map1aCmd = 2 };
87 108
88/* The following is the setup for a ring buffer for storing outbut 109// states the socket can be in
89 * data that the OS can't handle right away. 110enum {
90 */ 111 ST_DEAD, // socket is dead
112 ST_SETUP, // initial handshake / setup / login
113 ST_PLAYING, // logged in an playing
114 ST_CUSTOM, // waiting for custom reply
91 115
92struct Buffer 116 ST_GET_PARTY_PASSWORD,
117};
118
119// a handler for a specific type of packet
120enum {
121 PF_PLAYER = 0x01, // must have valid player / will by synchronised
122 PF_PLAYING = 0x02, // must be in playing state
123 PF_COMMAND0 = 0x04, // command starts at offset 0
124 PF_COMMAND6 = 0x08, // command starts at offset 6
125};
126
127// face type.s bit 0 means "has meta info prepended"
128enum {
129 FT_FACE = 0 * 2 + 0, // faces (images)
130 FT_MUSIC = 1 * 2 + 1, // background music
131 FT_SOUND = 2 * 2 + 1, // effects
132 FT_RSRC = 3 * 2 + 0, // generic data files
133 FT_NUM,
134};
135
136struct packet_type
93{ 137{
94 char data[SOCKETBUFSIZE]; 138 const char *name;
95 int start; 139 void *cb;
140 int flags;
141};
142
143struct command
144{
145 tstamp stamp;
146 const packet_type *handler;
147 char *data;
96 int len; 148 int datalen;
97}; 149};
98 150
99/* how many times we are allowed to give the wrong password before being kicked. */ 151/* how many times we are allowed to give the wrong password before being kicked. */
100#define MAX_PASSWORD_FAILURES 5 152#define MAX_PASSWORD_FAILURES 5
101 153
102ACC_CLASS (client) // should become player when newsocket is a baseclass of player 154INTERFACE_CLASS (client) // should become player when newsocket is a baseclass of player
103struct client : zero_initialised, attachable_base 155struct client : zero_initialised, attachable
104{ 156{
105 enum Sock_Status status;
106 int ACC (RW, fd); 157 int ACC (RW, fd);
107 unsigned int inbuf_len; // number of bytes valid in inbuf 158 unsigned int inbuf_len; // number of bytes valid in inbuf
108 struct Map lastmap;
109 size_t faces_sent_len; /* This is the number of elements allocated in faces_sent[] */
110 uint8 *faces_sent; /* This is a bitmap on sent face status */
111 uint8 anims_sent[MAXANIMNUM];
112 struct statsinfo stats; 159 statsinfo stats;
160 object_vector_index ACC (RO, active);
161 player_ptr ACC (RO, pl);
113 162
114 char *ACC (RW, host); /* Which host it is connected from (ip address) */ 163 char *ACC (RW, host); /* Which host it is connected from (ip address) */
115 uint8 ACC (RW, password_fails); /* how many times the player has failed to give the right password */ 164 uint8 ACC (RW, state); /* Input state of the player (name, password, etc */
116 Buffer outputbuffer; /* For undeliverable data */
117 165
118 bool ACC (RW, facecache); /* If true, client is caching images */ 166 sint8 ACC (RW, last_level); /* Last level we sent to client */
167 uint16 ACC (RW, last_flags); /* fire/run on flags for last tick */
168 float ACC (RW, last_weapon_sp); /* if diff than weapon_sp, update client */
169 sint32 ACC (RW, last_weight); /* Last weight as sent to client; -1 means do not send weight */
170 sint32 ACC (RW, last_weight_limit); /* Last weight limit transmitted to client */
171 uint32 ACC (RW, last_path_attuned); /* Last spell attunment sent to client */
172 uint32 ACC (RW, last_path_repelled); /* Last spell repelled sent to client */
173 uint32 ACC (RW, last_path_denied); /* Last spell denied sent to client */
174 living ACC (RO, last_stats); /* Last stats as sent to client */
175 float ACC (RW, last_speed); /* Last speed as sent to client */
176 sint16 ACC (RW, last_resist[NROFATTACKS]);/* last resist values sent to client */
177 sint64 ACC (RW, last_skill_exp[NUM_SKILLS]);/* shadow register. if != exp. obj update client */
178
179 bool ACC (RW, afk); /* player is afk */
119 bool ACC (RW, sent_scroll); 180 bool ACC (RW, sent_scroll);
120 bool ACC (RW, sound); /* does the client want sound */ 181 bool ACC (RW, sound); /* does the client want sound */
121 bool ACC (RW, exp64); /* Client wants 64 bit exp data, as well as skill data */
122 bool ACC (RW, newmapcmd); /* Send newmap command when entering new map SMACFIGGEN */ 182 bool ACC (RW, newmapcmd); /* Send newmap command when entering new map SMACFIGGEN */
123 bool ACC (RW, plugincmd); /* CF+ extend the protocol through a plug-in */ 183 bool ACC (RW, plugincmd); // extend the protocol through a plug-in */
124 bool ACC (RW, mapinfocmd); /* CF+ return map info and send map change info */ 184 bool ACC (RW, mapinfocmd); // return map info and send map change info
125 bool ACC (RW, extcmd); /* CF+ call into extensions/plugins */ 185 uint8_t ACC (RW, extcmd); // call into extensions/plugins
126 bool ACC (RW, extmap); /* CF+ extend map comamnd with extra data */
127 bool ACC (RW, buggy_mapscroll); /* CF+ client crashes on large mapscrolls */
128 bool ACC (RW, darkness); /* True if client wants darkness information */
129 bool ACC (RW, image2); /* Client wants image2/face2 commands */
130 bool ACC (RW, update_look); /* If true, we need to send the look window */ 186 bool ACC (RW, update_look); /* If true, we need to send the look window */
131 bool ACC (RW, has_readable_type); /* If true client accept additional text information */ 187 bool ACC (RW, has_readable_type); /* If true client accept additional text information */
132 /* used to arrange text in books, scrolls, or scripted dialogs */ 188 /* used to arrange text in books, scrolls, or scripted dialogs */
133 bool ACC (RW, monitor_spells); /* Client wishes to be informed when their spell list changes */ 189 bool ACC (RW, monitor_spells); /* Client wishes to be informed when their spell list changes */
134 bool ACC (RW, ext_mapinfos); /* If true client accept additionnal info on maps */ 190 bool ACC (RW, smoothing); // deliantra-style smoothing
135 /* Below are flags for extedend infos to pass to client
136 * with S->C mapextended command */
137 bool ACC (RW, EMI_smooth); /* Send smooth in extendmapinfos */
138 191
192 bool ACC (RW, force_newmap); // force a newmap before next map update
139 uint32 ACC (RW, supported_readables); /* each bit is a readable supported by client */ 193 uint32 ACC (RW, supported_readables); /* each bit is a readable supported by client */
140 uint32 ACC (RW, cs_version), ACC (RW, sc_version); /* versions of the client */ 194 uint32 ACC (RW, cs_version), ACC (RW, sc_version); /* versions of the client */
141 enum MapMode mapmode; /* Type of map commands the client wants. */
142 uint16 ACC (RW, look_position); /* start of drawing of look window */ 195 uint16 ACC (RW, look_position); /* start of drawing of look window */
196 uint16 ACC (RW, mss); // likely tcp maximum segment size
197 uint8 ACC (RW, mapmode); /* Type of map commands the client wants. */
143 uint8 ACC (RW, mapx), ACC (RW, mapy); /* How large a map the client wants */ 198 uint8 ACC (RW, mapx), ACC (RW, mapy); /* How large a map the client wants */
144 uint8 ACC (RW, itemcmd); /* What version of the 'item' protocol command to use */ 199 uint8 ACC (RW, itemcmd); /* What version of the 'item' protocol command to use */
145 uint8 ACC (RW, faceset); /* Set the client is using, default 0 */
146 200
147 maptile *ACC (RW, current_map); // CF+ last/current player map 201 maptile_ptr ACC (RW, current_map); // CF+ last/current player map
202 region_ptr ACC (RW, current_region); // CF+ last/current player region
148 int ACC (RW, current_x), ACC (RW, current_y); // CF+ last/current map position 203 int ACC (RW, current_x), ACC (RW, current_y); // CF+ last/current map position
149 char ACC (RW, version)[64]; // CF+ client name/version 204 shstr ACC (RW, version); // CF+ client name/version
205 uint8 ACC (RW, faceset); // CF+ selected faceset
150 206
207 tstamp ACC (RW, last_send); // last data send on socket.
208
209 float ACC (RW, socket_timeout); /* after how many seconds of no ack do we declare dead */
210 int ACC (RW, rate_avail); // current rate balance
211 int ACC (RW, max_rate); // max. # of bytes to send per tick
212 faceidx ACC (RW, scrub_idx); // which face to send next
213 int ACC (RW, bg_scrub); // how many ticks till the next background face send
214
215 struct tcp_info tcpi;
216 tstamp next_rate_adjust;
217
218 unordered_vector<char *> mapinfo_queue;
219 void mapinfo_queue_clear ();
220 void mapinfo_queue_run ();
221 bool mapinfo_try (char *buf);
222
223 struct ixsend {
224 int16_t pri; // unused
225 faceidx idx;
226 uint32_t ofs; // if != 0, need to send remaining bytes of partial_face
227 };
228 std::vector<ixsend, slice_allocator<ixsend> > ixface; // which faces to send to the client using ix
229
230 std::vector<faceidx, slice_allocator<faceidx> > fxface; // which faces to send using fx
231 MTH void flush_fx (); // send fx if required
232
233 void do_destroy ();
234 void gather_callbacks (AV *&callbacks, event_type event) const;
235
236 iow socket_ev; void socket_cb (iow &w, int revents);
237
238 std::deque< command, slice_allocator<command> > cmd_queue;
239
240 // large structures at the end please
241 struct Map lastmap;
242 std::bitset<MAXANIMNUM> anims_sent;
243 std::bitset<MAX_FACES> faces_sent;
244 std::bitset<FT_NUM> fx_want;
245
151 /* If we get an incomplete packet, this is used to hold the data. */ 246 // if we get an incomplete packet, this is used to hold the data.
247 // we add 2 byte for the header, one for the trailing 0 byte
152 uint8 inbuf[MAXSOCKBUF]; 248 uint8 inbuf[MAXSOCKBUF + 2 + 1];
153 player *ACC (RO, pl);//TODO should not be here, preferably
154 249
155 int ACC (RW, rtt), ACC (RW, rttvar); /* round-trip time and -variance, if known */ 250 enum { MSG_BUF_SIZE = 80, MSG_BUF_COUNT = 10 };
251 struct msg_buf
252 {
253 tick_t expire;
254 int len;
255 int count;
256 char msg[MSG_BUF_SIZE];
257 } msgbuf[MSG_BUF_COUNT];
156 258
157 iow socket_ev; void socket_cb (iow &w, int got); 259 MTH bool msg_suppressed (const char *msg);
158 260
261 /* The following is the setup for a ring buffer for storing output
262 * data that the OS can't handle right away.
263 * TODO: this member is enourmously large - optimise?
264 */
265 struct
266 {
267 char data[SOCKETBUFSIZE];
268 int start;
269 int len;
270 } outputbuffer;
271
272 bool may_execute (const packet_type *pkt) const;
273 void execute (const packet_type *pkt, char *data, int datalen);
274
275 void queue_command (packet_type *handler, char *data, int datalen);
276 MTH bool handle_command ();
277 // resets movement state
278 MTH void reset_state ();
279 // resets variable data used to send stat diffs
280 MTH void reset_stats ();
281
282 MTH bool handle_packet ();
283 int next_packet (); // returns length of packet or 0
284 void skip_packet (int len); // we have processed the packet, skip it
285
286 MTH void flush ();
287 MTH void write_outputbuffer ();
288 MTH int outputbuffer_len () const { return outputbuffer.len; }
289 void send (void *buf_, int len);
290
291 void send_packet (const char *buf);
292 void send_packet (const char *buf, int len);
293 void send_packet_printf (const char *format, ...);
294 void send_packet (packet &sl);
295
296 void send_drawinfo (const char *msg, int flags = NDI_BLACK);
297
298 MTH void send_face (faceidx facenum, int pri = 0);
299 MTH void send_faces (object *ob);
300 MTH void send_animation (short anim_num);
301 void send_msg (int color, const char *type, const char *msg);
302
303 MTH void play_sound (faceidx sound, int dx = 0, int dy = 0);
304 // called when something under the player changes
305 MTH void floorbox_update () { update_look = 1; }
306 // called when the player has been moved
307 MTH void floorbox_reset () { look_position = 0; floorbox_update (); }
308
309 MTH void tick (); // called every server tick to do housekeeping etc.
310
311 MTH static client *create (int fd, const char *peername);
312 MTH static void clock ();
313 MTH static void flush_sockets ();
314
315protected:
159 client (int fd, const char *from_ip); 316 client (int fd, const char *from_ip);
160 ~client (); 317 ~client ();
161
162 int read_packet (); // returns length of packet or 0
163 void skip_packet (int len); // we have processed the packet, skip it
164
165 void flush ();
166 void write_outputbuffer ();
167 void send (void *buf_, int len);
168
169 void send_packet (const char *buf);
170 void send_packet (const char *buf, int len);
171 void send_packet (packet &sl);
172}; 318};
319
320#if FOR_PERL
321 ACC (RW, tcpi.tcpi_state);
322 ACC (RW, tcpi.tcpi_ca_state);
323 ACC (RW, tcpi.tcpi_retransmits);
324 ACC (RW, tcpi.tcpi_probes);
325 ACC (RW, tcpi.tcpi_backoff);
326 ACC (RW, tcpi.tcpi_options);
327 ACC (RO, tcpi.tcpi_snd_wscale);
328 ACC (RO, tcpi.tcpi_rcv_wscale);
329 ACC (RW, tcpi.tcpi_rto);
330 ACC (RW, tcpi.tcpi_ato);
331 ACC (RW, tcpi.tcpi_snd_mss);
332 ACC (RW, tcpi.tcpi_rcv_mss);
333 ACC (RW, tcpi.tcpi_unacked);
334 ACC (RW, tcpi.tcpi_sacked);
335 ACC (RW, tcpi.tcpi_lost);
336 ACC (RW, tcpi.tcpi_retrans);
337 ACC (RW, tcpi.tcpi_fackets);
338 ACC (RW, tcpi.tcpi_last_data_sent);
339 ACC (RW, tcpi.tcpi_last_ack_sent);
340 ACC (RW, tcpi.tcpi_last_data_recv);
341 ACC (RW, tcpi.tcpi_last_ack_recv);
342 ACC (RW, tcpi.tcpi_pmtu);
343 ACC (RW, tcpi.tcpi_rcv_ssthresh);
344 ACC (RW, tcpi.tcpi_rtt);
345 ACC (RW, tcpi.tcpi_rttvar);
346 ACC (RW, tcpi.tcpi_snd_ssthresh);
347 ACC (RW, tcpi.tcpi_snd_cwnd);
348 ACC (RW, tcpi.tcpi_advmss);
349 ACC (RW, tcpi.tcpi_reordering);
350#endif
173 351
174#define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\ 352#define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\
175 ( ((__type)>0) &&\ 353 ( ((__type)>0) &&\
176 ((__sockPtr)->has_readable_type) && \ 354 ((__sockPtr)->has_readable_type) && \
177 ((__sockPtr)->supported_readables & (1<<(__type))) ) 355 ((__sockPtr)->supported_readables & (1<<(__type))) )
178 356
179/* Bitmask for the faces_sent[] array - what
180 * portion of the face have we sent?
181 */
182#define NS_FACESENT_FACE 0x1
183#define NS_FACESENT_SMOOTH 0x2
184
185/* Constants in the form EMI_ is for extended map infos.
186 * Even if the client select the additionnal infos it wants
187 * on the map, there may exist cases where this whole info
188 * is not given in one buch but in separate bunches. This
189 * is done performance reasons (imagine some info related to
190 * a visible object and another info related to a 4 square
191 * width and height area). At the begin of an extended info packet
192 * is a bit field. A bit is activated for each extended info
193 * present in the data
194 */
195
196/* Meanings:
197 * EMI_NOREDRAW Take extended infos into account but don't redraw,
198 * some additionnal datas will follow in a new packet
199 * EMI_SMOOTH Datas about smoothing
200 */
201#define EMI_NOREDRAW 0x01
202#define EMI_SMOOTH 0x02
203
204/* this last one says the bitfield continue un next byte
205 * There may be several on contiguous bytes. So there is 7
206 * actual bits used per byte, and the number of bytes
207 * is not fixed in protocol
208 */
209#define EMI_HASMOREBITS 0x80
210
211#define FACE_TYPES 1 357#define FACE_TYPES 1
212#define PNG_FACE_INDEX 0 358#define PNG_FACE_INDEX 0
213 359
214#define VERSION_CS 1023 /* version >= 1023 understand setup cmd */ 360#define VERSION_CS 1023 /* version >= 1023 understand setup cmd */
215#define VERSION_SC 1027 361#define VERSION_SC 1026
362//#define VERSION_SC 1027 // requestinfo image_info and image_sums, makes extending faces on the fly impossible
216#define VERSION_INFO "Crossfire+ Server" 363#define VERSION_INFO "Deliantra Server"
217 364
218typedef unordered_vector<client *> sockvec; 365typedef object_vector<client, &client::active> sockvec;
219 366
220extern sockvec clients; 367extern sockvec clients;
221extern int nrofpixmaps; //TODO: hrmpf, should go 368
369#define for_all_clients(var) \
370 for (int _i = 0; _i < clients.size (); ++_i) \
371 statementvar (client *, var, clients [_i])
372
373// returns true when the message needs special (read: perl) treatment
374static inline bool
375msg_is_special (const char *msg, bool nl_special = true)
376{
377 return msg [strcspn (msg, nl_special ? "<&\n" : "<&")];
378}
222 379
223#endif 380#endif
224 381

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines