ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/ext/login.ext
(Generate patch)

Comparing deliantra/server/ext/login.ext (file contents):
Revision 1.69 by root, Mon Jul 23 17:53:55 2007 UTC vs.
Revision 1.109 by root, Tue May 4 21:45:42 2010 UTC

1#! perl # mandatory 1#! perl # mandatory depends=highscore
2 2
3# login handling 3# login handling
4 4
5use Fcntl; 5use Fcntl;
6use Coro::AIO; 6use Coro::AIO;
13} 13}
14 14
15sub query { 15sub query {
16 my ($ns, $flags, $text) = @_; 16 my ($ns, $flags, $text) = @_;
17 17
18 my $current = $Coro::current; 18 $ns->query ($flags, $text, Coro::rouse_cb);
19 $ns->query ($flags, $text, sub { $current->ready; $current = $_[0] }); 19 Coro::rouse_wait
20 Coro::schedule while ref $current;
21
22 $current
23} 20}
24 21
25sub can_cleanup { 22sub can_cleanup {
26 my ($pl, $mtime) = @_; 23 my ($pl, $mtime) = @_;
27 24
52 ); 49 );
53 50
54 1 51 1
55} 52}
56 53
54sub safe_spot($) {
55 my ($pl) = @_;
56
57 my $ob = $pl->ob;
58
59 my $m = $ob->map
60 or return;
61 my $x = $ob->x;
62 my $y = $ob->y;
63
64# return 0;#d#
65# warn join ":", $m->at ($x, $y);#d#
66# warn "FOO$m { ".scalar ($m->at ($x, $y))." }\n";
67# return 0;
68
69 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y)
70}
71
57sub enter_map { 72sub enter_map {
58 my ($pl) = @_; 73 my ($pl) = @_;
59 74
60 my $ob = $pl->ob; 75 my $ob = $pl->ob;
61 76
64 ? @{delete $ob->{_link_pos}} 79 ? @{delete $ob->{_link_pos}}
65 : ($pl->maplevel, $ob->x, $ob->y); 80 : ($pl->maplevel, $ob->x, $ob->y);
66 81
67 $ob->enter_link; 82 $ob->enter_link;
68 83
84 my $m = cf::map::find $map;
69 if (my $time = delete $pl->{unclean_save}) { 85 my $time = delete $pl->{unclean_save};
70 if (my $m = cf::map::find $map) { 86
87 if ($time && $m) {
71 if ($time < $m->{instantiate_time}) { 88 if ($time < $m->{instantiate_time}) {
72 # the map was reset in the meantime 89 # the map was reset in the meantime
73 my $age = $cf::RUNTIME - $time; 90 my $age = $cf::RUNTIME - $time;
74 91
75 warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d# 92 cf::info $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
76 93
77 # for now, just go back to savebed
78 ($map, $x, $y) = $pl->savebed;
79
80 if ($age >= $MAX_DISCONNECT_TIME) { 94 if ($age >= $MAX_DISCONNECT_TIME) {
81 $ob->message (
82 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
83 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
84 . "Maybe you can find comfort in the thought that your body was quite satisfying in taste... "
85 . "H<You disconnected too long without having used a savebed.>",
86 cf::NDI_RED
87 );
88 # kill them.
89 # reminds me of the famous badness 10000 syndrome...
90 $ob->stats->hp (-10000); #] if they survive this they deserved to live
91 $pl->killer ("a cave-in");
92 } else {
93 $ob->message (
94 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
95 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
96 . "Better use a savebed next time, much worse things could have happened... "
97 . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>",
98 cf::NDI_RED
99 );
100 }
101 } else {
102 $ob->message ( 95 $ob->message (
103 "You didn't use a bed to reality to leave this realm. This is very dangerous, " 96 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
104 . "as lots of things could happen when you leave by other means, such as cave-ins, " 97 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
105 . "or monsters suddenly snapping your body. Better use a savebed next time. " 98 . "Maybe you can find comfort in the thought that your body was quite satisfying in taste... "
106 . "H<Always apply a bed of reality to disconnect from the server.>", 99 . "H<You disconnected too long without having used a savebed.>",
107 cf::NDI_RED 100 cf::NDI_RED
108 ); 101 );
102 # kill them.
103 # reminds me of the famous badness 10000 syndrome...
104 $ob->stats->hp (-10000); #] if they survive this they deserved to live
105 my $killer = cf::arch::get "killer_login"; $pl->killer ($killer); $killer->destroy;
106 } else {
107 ($map, $x, $y) = $pl->savebed;
108
109 $ob->message (
110 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
111 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
112 . "Better use a savebed next time, much worse things could have happened... "
113 . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>",
114 cf::NDI_RED
115 );
116 }
117 } else {
118 $ob->message (
119 "You didn't use a bed to reality to leave this realm. This is very dangerous, "
120 . "as lots of things could happen when you leave by other means, such as cave-ins, "
121 . "or monsters suddenly snapping your body. Better use a savebed next time. "
122 . "H<Always apply a bed of reality to disconnect from the server.>",
123 cf::NDI_RED
109 } 124 );
110 } 125 }
111 } 126 }
112 127
113 $ob->goto ($map, $x, $y); 128 $ob->goto ($map, $x, $y);
114} 129}
115 130
131sub encode_password {
132 crypt $_[0],
133 join '',
134 ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64), (cf::rndm 64)]
135}
136
116# delete a player directory, be non-blocking AND synchronous... 137# delete a player directory, be non-blocking AND synchronous...
117# (thats hard, so we crap out and fork). 138# (that's hard, so we crap out and fork).
118sub nuke_playerdir { 139sub nuke_playerdir {
119 my ($user) = @_; 140 my ($user) = @_;
120 141
121 aio_stat "$PLAYERDIR/$user"; 142 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
122 system "cd \Q$PLAYERDIR\E " 143
123 . "&& mv \Q$user\E ~\Q$Coro::current\E~deleting~ 2>/dev/null " 144 cf::fork_call {
124 . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)"; 145 rename "$PLAYERDIR/$user", $temp;
146 system "rm", "-rf", $temp;
147 };
125} 148}
126 149
127cf::client->attach (on_addme => sub { 150cf::client->attach (on_addme => sub {
128 my ($ns) = @_; 151 my ($ns) = @_;
129 152
130 if (!$ns->facecache)
131 {
132 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
133
134
135***
136*** WARNING:
137*** Your client does not support face/image caching,
138*** or it has been disabled. Face caching is mandatory
139*** so please enable it or use a newer client.
140***
141*** Look at your client preferences:
142***
143*** CFPlus: all known versions automatically enable the facecache.
144*** cfclient: use the -cache commandline option.
145*** cfclient: map will not redraw automatically (bug).
146*** gcfclient: use -cache commandline option, or enable
147*** gcfclient: Client=>Configure=>Map & Image=>Cache Images.
148*** jcrossclient: your client is broken, use CFPlus or gcfclient.
149***
150***
151EOF
152 if ($ns->version =~ /jcrossclient/) {
153 # let them, for now
154 } else {
155 $ns->flush;
156 return $ns->destroy;
157 }
158
159 # $ns->facecache = true;
160 }
161
162 if ($ns->mapmode < cf::Map1aCmd) {
163 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
164
165
166***
167*** WARNING:
168*** Your client is too old. Please upgrade to a newer version.
169EOF
170
171 $ns->flush;
172 return $ns->destroy;
173 }
174
175 $ns->pl and return $ns->destroy; 153 $ns->pl and return $ns->destroy;
176 154
177 $ns->async (sub { 155 $ns->async (sub {
156 $Coro::current->{desc} = "addme init";
157
178 my ($user, $pass); 158 my ($user, $pass);
179 159
180 $ns->send_packet ("addme_success"); 160 $ns->send_packet ("addme_success");
181 161
182 for (;;) { 162 for (;;) {
187 cf::NDI_BLUE 167 cf::NDI_BLUE
188 ); 168 );
189 169
190 # read username 170 # read username
191 while () { 171 while () {
192 $user = query $ns, 0, "What is your name?\n:"; 172 $user = query $ns, 0, "What is your name? (login names are case-sensitive)\n:";
193 173
194 if ($cf::LOGIN_LOCK{$user}) { 174 if ($cf::LOGIN_LOCK{$user}) {
195 $ns->send_drawinfo ( 175 $ns->send_drawinfo (
196 "That username is currently used in another login session. " 176 "That username is currently used in another login session. "
197 . "Chose another, or wait till the other session has ended.", 177 . "Chose another, or wait till the other session has ended.",
198 cf::NDI_RED 178 cf::NDI_RED
199 ); 179 );
200 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,17}\z/) { 180 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z/) {
201 last; 181 last;
202 } else { 182 } else {
203 $ns->send_drawinfo ( 183 $ns->send_drawinfo (
204 "Your username contains illegal characters " 184 "Your username contains illegal characters "
205 . "(only a-z, A-Z and 0-9 are allowed), " 185 . "(only a-z, A-Z and 0-9 are allowed), "
206 . "or is not between 3 and 18 characters in length.", 186 . "or is not between 3 and 20 characters in length.",
207 cf::NDI_RED 187 cf::NDI_RED
208 ); 188 );
209 } 189 }
210 Coro::Timer::sleep 0.4; 190 Coro::Timer::sleep 0.4;
211 } 191 }
212 192
213 check_playing $ns, $user and next; 193 check_playing $ns, $user and next;
194
195 $Coro::current->{desc} = "addme($user) pass";
214 196
215 $ns->send_drawinfo ( 197 $ns->send_drawinfo (
216 "Welcome $user, please enter your password now. " 198 "Welcome $user, please enter your password now. "
217 . "New users should now choose a password. " 199 . "New users should now choose a password. "
218 . "Anything your client lets you enter is fine.", 200 . "Anything your client lets you enter is fine.",
241 next; 223 next;
242 } 224 }
243 local $cf::LOGIN_LOCK{$user} = 1; 225 local $cf::LOGIN_LOCK{$user} = 1;
244 226
245 check_playing $ns, $user and next; 227 check_playing $ns, $user and next;
228
229 $Coro::current->{desc} = "addme($user) check";
246 230
247 # try to read the user file and check the password 231 # try to read the user file and check the password
248 if (my $pl = cf::player::find $user) { 232 if (my $pl = cf::player::find $user) {
249 aio_stat $pl->path and next; 233 aio_stat $pl->path and next;
250 my $mtime = (stat _)[9]; 234 my $mtime = (stat _)[9];
304 next; 288 next;
305 } 289 }
306 } 290 }
307 291
308 # the rest of this function is character creation 292 # the rest of this function is character creation
293 $Coro::current->{desc} = "addme($user) chargen";
309 294
310 # just to make sure nothing is left over 295 # just to make sure nothing is left over
311 nuke_playerdir $user; 296 nuke_playerdir $user;
312 297
313 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again."; 298 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
324 } 309 }
325 310
326 nuke_str $pass2; 311 nuke_str $pass2;
327 312
328 my $pl = cf::player::new $user; 313 my $pl = cf::player::new $user;
329 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]); 314 $pl->password (encode_password $pass);
330 nuke_str $pass; 315 nuke_str $pass;
331 $pl->connect ($ns); 316 $pl->connect ($ns);
332 my $ob = $pl->ob; 317 my $ob = $pl->ob;
333 318
334 $ob->goto ($pl->maplevel, $ob->x, $ob->y); 319 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
350 } 335 }
351 } else { 336 } else {
352 $ob->roll_stats; 337 $ob->roll_stats;
353 } 338 }
354 339
355 Coro::Timer::sleep 0.2; 340 Coro::Timer::sleep 0.05;
356 } 341 }
357 342
358 $ob->set_animation (2); 343 $ob->set_animation (2);
359 $ob->add_statbonus; 344 $ob->add_statbonus;
360 345
368 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n"; 353 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
369 354
370 last if $res =~ /[dD]/; 355 last if $res =~ /[dD]/;
371 356
372 $pl->chargen_race_next; 357 $pl->chargen_race_next;
373 Coro::Timer::sleep 0.2; 358 Coro::Timer::sleep 0.05;
374 } 359 }
375 360
361 # create the playerdir, if necessary, as chargen_race_done did it before
362 # presumably because of unique maps
363 aio_mkdir playerdir $pl, 0770;
376 $pl->chargen_race_done; 364 $pl->chargen_race_done;
377 365
378 while () { 366 while () {
379 my $res = query $ns, cf::CS_QUERY_SINGLECHAR, 367 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
380 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n"; 368 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
384 last; 372 last;
385 } elsif ($res =~ /^[mM]/) { 373 } elsif ($res =~ /^[mM]/) {
386 $pl->gender (0); 374 $pl->gender (0);
387 last; 375 last;
388 } 376 }
389 Coro::Timer::sleep 0.2; 377 Coro::Timer::sleep 0.05;
390 } 378 }
391 379
392 $ob->reply (undef, "Welcome to Crossfire!"); 380 $ob->reply (undef, "Welcome to Deliantra!");
381
382 # XXX: Workaround for delayed client ext protocol handshake
383 $pl->esrv_new_player;
393 384
394 delete $pl->{deny_save}; 385 delete $pl->{deny_save};
395 386
396 last; 387 last;
388 }
389
390 if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) {
391 $ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR);
397 } 392 }
398 }); 393 });
399}); 394});
400 395
396cf::register_command password => sub {
397 my ($pl, $arg) = @_;
398
399 my (@args) = split /\s+/, $arg;
400
401 my ($new_pw, $player);
402
403 if ($pl->flag (cf::FLAG_WIZ)) {
404 ($player, $new_pw) = @args;
405 } else {
406 $new_pw = $args[0];
407 }
408
409 if ($pl->flag (cf::FLAG_WIZ) && $player eq '') {
410 $pl->message (
411 "Usage: password <player> [<new password>]",
412 cf::NDI_UNIQUE | cf::NDI_REPLY);
413 return;
414 } elsif (!$pl->flag (cf::FLAG_WIZ) && $new_pw eq '') {
415 $pl->message (
416 "Usage: password <new password>",
417 cf::NDI_UNIQUE | cf::NDI_REPLY);
418 return;
419 }
420
421 if ($player ne '' && $pl->flag (cf::FLAG_WIZ)) {
422 unless ($new_pw ne '') {
423 $new_pw =
424 join '',
425 map { ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64)] }
426 1..9;
427 }
428
429 cf::async {
430 my $plc = cf::player::find $player;
431 if ($plc) {
432 $plc->password (encode_password $new_pw);
433 $pl->message (
434 "Ok, changed password of '$player' to '$new_pw'!",
435 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
436 } else {
437 $pl->message (
438 "Fail! Couldn't set password for '$player', "
439 . "he doesn't seem to exist!",
440 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
441 }
442 };
443 } else {
444 my $change = delete $pl->{password_change};
445
446 if ($change && (time - $change->[0]) < 60) {
447 $pl->message (
448 "Ok, changed your password!",
449 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
450 $pl->contr->password (encode_password $new_pw);
451
452 } else {
453 $pl->message (
454 "Ok, please confirm your new password by sending "
455 . "the command again within one minute!",
456 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
457 $pl->{password_change} = [time, $new_pw];
458 }
459 }
460};
461
401cf::register_command quit => sub { 462cf::register_command quit => sub {
402 my ($ob, $arg) = @_; 463 my ($ob, $arg) = @_;
403 464
404 $ob->reply (undef, 465 $ob->send_msg (undef,
405 "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. " 466 "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. "
406 . "If you are sure you want to do this, then use the quit_character command instead of quit.", 467 . "If you are sure you want to do this, then use the quit_character command instead of quit.",
407 cf::NDI_UNIQUE | cf::NDI_RED); 468 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
408}; 469};
409 470
410cf::register_command quit_character => sub { 471cf::register_command quit_character => sub {
411 my ($ob, $arg) = @_; 472 my ($ob, $arg) = @_;
412 473
413 my $pl = $ob->contr; 474 my $pl = $ob->contr;
414 475
415 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub { 476 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub {
416 if ($_[0] !~ /^[yY]/) { 477 if ($_[0] !~ /^[yY]/) {
417 $ob->reply (undef, 478 $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
418 "Ok, not not quitting then.",
419 cf::NDI_UNIQUE | cf::NDI_RED);
420 } else { 479 } else {
421 $ob->reply (undef, 480 $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
422 "Ok, quitting, hope to see you again.",
423 cf::NDI_UNIQUE | cf::NDI_RED);
424 $pl->ns->flush; 481 $pl->ns->flush;
482 cf::async {
483 ext::highscore::check $pl->ob;
425 cf::async { $pl->quit_character }; 484 $pl->quit_character;
485 };
426 } 486 }
427 }); 487 });
428}; 488};
429 489
430cf::object->attach ( 490cf::object->attach (
438 498
439 # update respawn position 499 # update respawn position
440 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 500 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
441 cf::async { $pl->save }; 501 cf::async { $pl->save };
442 502
443 $pl->killer ("left"); 503 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
444 $ob->check_score; 504 ext::highscore::check $ob;
445 505
446 $ob->reply (undef, "In the future, you will wake up here when you die."); 506 $ob->send_msg ($cf::SAY_CHANNEL => "In the future, you will wake up here when you die.", cf::NDI_DEF | cf::NDI_REPLY);
447 507
448 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub { 508 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
449 if ($_[0] !~ /^[yY]/) { 509 if ($_[0] !~ /^[yY]/) {
450 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1); 510 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1);
451 $pl->deactivate; 511 $pl->deactivate;
470 530
471 if ($cleanly) { 531 if ($cleanly) {
472 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 532 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
473 } else { 533 } else {
474 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 534 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
475 $pl->{unclean_save} = $cf::RUNTIME; 535 $pl->{unclean_save} = $cf::RUNTIME
536 unless safe_spot $pl;
476 } 537 }
477 }, 538 },
478); 539);
479 540
480#############################################################################
481
482our $SCHEDULE_INTERVAL = $cf::CFG{player_schedule_interval} || 10; # time the player scheduler sleeps between runs
483our $SAVE_TIMEOUT = $cf::CFG{player_save_interval} || 20; # save players every n seconds
484
485our $SCHEDULER = cf::async_ext {
486 my $schedule_interval = Coro::Event->timer (after => 1);
487 while () {
488 $schedule_interval->interval ($SCHEDULE_INTERVAL);
489 $schedule_interval->next;
490
491 # this weird form of iteration over values is used because
492 # the hash changes underneath us frequently, and for
493 # keeps a direct reference to the value without (in 5.8 perls)
494 # keeping a reference, so this is prone to crashes or worse.
495 my @players = keys %cf::PLAYER;
496 for (@players) {
497 my $pl = $cf::PLAYER{$_}
498 or next;
499 $pl->valid or next;
500
501 eval {
502 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
503 $pl->save;
504
505 unless ($pl->active || $pl->ns) {
506 # check refcounts, this is tricky and needs to be adjusted to fit server internals
507 my $ob = $pl->ob;
508
509 my $pl_ref = $pl->refcnt_cnt;
510 my $ob_ref = $ob->refcnt_cnt;
511
512 ## pl_ref == $pl + ob->contr + %cf::PLAYER
513 ## ob_ref == $ob + pl->observe + simply being an object
514 if ($pl_ref == 3 && $ob_ref == 3) {
515 warn "player-scheduler destroy ", $ob->name;#d#
516
517 # remove from sight and get fresh "copies"
518 $pl = delete $cf::PLAYER{$ob->name};
519 $ob = $pl->ob;
520
521 $pl->destroy; # destroys $ob
522 } else {
523 my $a_ = $pl->refcnt;#d#
524 my $b_ = $ob->refcnt;#d#
525
526 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref ob $ob_ref (C pl $a_ ob $b_)\n";#d#
527 }
528 }
529 }
530 };
531 warn $@ if $@;
532 Coro::cede;
533 };
534 }
535};
536
537$SCHEDULER->prio (1);
538

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines