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.70 by root, Sun Sep 2 12:37:10 2007 UTC vs.
Revision 1.108 by elmex, Thu Apr 29 10:08:26 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_rename "$PLAYERDIR/$user", "$PLAYERDIR/~$Coro::current~deleting~";
122 system "rm -rf \Q$PLAYERDIR/~$Coro::current~deleting~\E &"; 142 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
143
144 cf::fork_call {
145 rename "$PLAYERDIR/$user", $temp;
146 system "rm", "-rf", $temp;
147 };
123} 148}
124 149
125cf::client->attach (on_addme => sub { 150cf::client->attach (on_addme => sub {
126 my ($ns) = @_; 151 my ($ns) = @_;
127 152
128 if (!$ns->facecache)
129 {
130 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
131
132
133***
134*** WARNING:
135*** Your client does not support face/image caching,
136*** or it has been disabled. Face caching is mandatory
137*** so please enable it or use a newer client.
138***
139*** Look at your client preferences:
140***
141*** CFPlus: all known versions automatically enable the facecache.
142*** cfclient: use the -cache commandline option.
143*** cfclient: map will not redraw automatically (bug).
144*** gcfclient: use -cache commandline option, or enable
145*** gcfclient: Client => Configure => Map & Image => Cache Images.
146*** jcrossclient: your client is broken, use CFPlus or gcfclient.
147***
148***
149EOF
150 if ($ns->version =~ /jcrossclient/) {
151 # let them, for now
152 } else {
153 $ns->flush;
154 return $ns->destroy;
155 }
156
157 # $ns->facecache = true;
158 }
159
160 if ($ns->mapmode < cf::Map1aCmd) {
161 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
162
163
164***
165*** WARNING:
166*** Your client is too old. Please upgrade to a newer version.
167EOF
168
169 $ns->flush;
170 return $ns->destroy;
171 }
172
173 $ns->pl and return $ns->destroy; 153 $ns->pl and return $ns->destroy;
174 154
175 $ns->async (sub { 155 $ns->async (sub {
156 $Coro::current->{desc} = "addme init";
157
176 my ($user, $pass); 158 my ($user, $pass);
177 159
178 $ns->send_packet ("addme_success"); 160 $ns->send_packet ("addme_success");
179 161
180 for (;;) { 162 for (;;) {
… …
185 cf::NDI_BLUE 167 cf::NDI_BLUE
186 ); 168 );
187 169
188 # read username 170 # read username
189 while () { 171 while () {
190 $user = query $ns, 0, "What is your name?\n:"; 172 $user = query $ns, 0, "What is your name? (login names are case-sensitive)\n:";
191 173
192 if ($cf::LOGIN_LOCK{$user}) { 174 if ($cf::LOGIN_LOCK{$user}) {
193 $ns->send_drawinfo ( 175 $ns->send_drawinfo (
194 "That username is currently used in another login session. " 176 "That username is currently used in another login session. "
195 . "Chose another, or wait till the other session has ended.", 177 . "Chose another, or wait till the other session has ended.",
196 cf::NDI_RED 178 cf::NDI_RED
197 ); 179 );
198 } 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/) {
199 last; 181 last;
200 } else { 182 } else {
201 $ns->send_drawinfo ( 183 $ns->send_drawinfo (
202 "Your username contains illegal characters " 184 "Your username contains illegal characters "
203 . "(only a-z, A-Z and 0-9 are allowed), " 185 . "(only a-z, A-Z and 0-9 are allowed), "
204 . "or is not between 3 and 18 characters in length.", 186 . "or is not between 3 and 20 characters in length.",
205 cf::NDI_RED 187 cf::NDI_RED
206 ); 188 );
207 } 189 }
208 Coro::Timer::sleep 0.4; 190 Coro::Timer::sleep 0.4;
209 } 191 }
210 192
211 check_playing $ns, $user and next; 193 check_playing $ns, $user and next;
194
195 $Coro::current->{desc} = "addme($user) pass";
212 196
213 $ns->send_drawinfo ( 197 $ns->send_drawinfo (
214 "Welcome $user, please enter your password now. " 198 "Welcome $user, please enter your password now. "
215 . "New users should now choose a password. " 199 . "New users should now choose a password. "
216 . "Anything your client lets you enter is fine.", 200 . "Anything your client lets you enter is fine.",
… …
239 next; 223 next;
240 } 224 }
241 local $cf::LOGIN_LOCK{$user} = 1; 225 local $cf::LOGIN_LOCK{$user} = 1;
242 226
243 check_playing $ns, $user and next; 227 check_playing $ns, $user and next;
228
229 $Coro::current->{desc} = "addme($user) check";
244 230
245 # try to read the user file and check the password 231 # try to read the user file and check the password
246 if (my $pl = cf::player::find $user) { 232 if (my $pl = cf::player::find $user) {
247 aio_stat $pl->path and next; 233 aio_stat $pl->path and next;
248 my $mtime = (stat _)[9]; 234 my $mtime = (stat _)[9];
… …
302 next; 288 next;
303 } 289 }
304 } 290 }
305 291
306 # the rest of this function is character creation 292 # the rest of this function is character creation
293 $Coro::current->{desc} = "addme($user) chargen";
307 294
308 # just to make sure nothing is left over 295 # just to make sure nothing is left over
309 nuke_playerdir $user; 296 nuke_playerdir $user;
310 297
311 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.";
… …
322 } 309 }
323 310
324 nuke_str $pass2; 311 nuke_str $pass2;
325 312
326 my $pl = cf::player::new $user; 313 my $pl = cf::player::new $user;
327 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]); 314 $pl->password (encode_password $pass);
328 nuke_str $pass; 315 nuke_str $pass;
329 $pl->connect ($ns); 316 $pl->connect ($ns);
330 my $ob = $pl->ob; 317 my $ob = $pl->ob;
331 318
332 $ob->goto ($pl->maplevel, $ob->x, $ob->y); 319 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
… …
348 } 335 }
349 } else { 336 } else {
350 $ob->roll_stats; 337 $ob->roll_stats;
351 } 338 }
352 339
353 Coro::Timer::sleep 0.2; 340 Coro::Timer::sleep 0.05;
354 } 341 }
355 342
356 $ob->set_animation (2); 343 $ob->set_animation (2);
357 $ob->add_statbonus; 344 $ob->add_statbonus;
358 345
… …
366 "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";
367 354
368 last if $res =~ /[dD]/; 355 last if $res =~ /[dD]/;
369 356
370 $pl->chargen_race_next; 357 $pl->chargen_race_next;
371 Coro::Timer::sleep 0.2; 358 Coro::Timer::sleep 0.05;
372 } 359 }
373 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;
374 $pl->chargen_race_done; 364 $pl->chargen_race_done;
375 365
376 while () { 366 while () {
377 my $res = query $ns, cf::CS_QUERY_SINGLECHAR, 367 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
378 "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";
… …
382 last; 372 last;
383 } elsif ($res =~ /^[mM]/) { 373 } elsif ($res =~ /^[mM]/) {
384 $pl->gender (0); 374 $pl->gender (0);
385 last; 375 last;
386 } 376 }
387 Coro::Timer::sleep 0.2; 377 Coro::Timer::sleep 0.05;
388 } 378 }
389 379
390 $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;
391 384
392 delete $pl->{deny_save}; 385 delete $pl->{deny_save};
393 386
394 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);
395 } 392 }
396 }); 393 });
397}); 394});
398 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
399cf::register_command quit => sub { 462cf::register_command quit => sub {
400 my ($ob, $arg) = @_; 463 my ($ob, $arg) = @_;
401 464
402 $ob->reply (undef, 465 $ob->send_msg (undef,
403 "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. "
404 . "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.",
405 cf::NDI_UNIQUE | cf::NDI_RED); 468 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
406}; 469};
407 470
408cf::register_command quit_character => sub { 471cf::register_command quit_character => sub {
409 my ($ob, $arg) = @_; 472 my ($ob, $arg) = @_;
410 473
411 my $pl = $ob->contr; 474 my $pl = $ob->contr;
412 475
413 $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 {
414 if ($_[0] !~ /^[yY]/) { 477 if ($_[0] !~ /^[yY]/) {
415 $ob->reply (undef, 478 $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
416 "Ok, not not quitting then.",
417 cf::NDI_UNIQUE | cf::NDI_RED);
418 } else { 479 } else {
419 $ob->reply (undef, 480 $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
420 "Ok, quitting, hope to see you again.",
421 cf::NDI_UNIQUE | cf::NDI_RED);
422 $pl->ns->flush; 481 $pl->ns->flush;
482 cf::async {
483 ext::highscore::check $pl->ob;
423 cf::async { $pl->quit_character }; 484 $pl->quit_character;
485 };
424 } 486 }
425 }); 487 });
426}; 488};
427 489
428cf::object->attach ( 490cf::object->attach (
… …
436 498
437 # update respawn position 499 # update respawn position
438 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 500 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
439 cf::async { $pl->save }; 501 cf::async { $pl->save };
440 502
441 $pl->killer ("left"); 503 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
442 $ob->check_score; 504 ext::highscore::check $ob;
443 505
444 $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);
445 507
446 $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 {
447 if ($_[0] !~ /^[yY]/) { 509 if ($_[0] !~ /^[yY]/) {
448 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1); 510 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1);
449 $pl->deactivate; 511 $pl->deactivate;
… …
468 530
469 if ($cleanly) { 531 if ($cleanly) {
470 $_->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;
471 } else { 533 } else {
472 $_->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;
473 $pl->{unclean_save} = $cf::RUNTIME; 535 $pl->{unclean_save} = $cf::RUNTIME
536 unless safe_spot $pl;
474 } 537 }
475 }, 538 },
476); 539);
477 540
478#############################################################################
479 541
480our $SCHEDULE_INTERVAL = $cf::CFG{player_schedule_interval} || 10; # time the player scheduler sleeps between runs
481our $SAVE_TIMEOUT = $cf::CFG{player_save_interval} || 20; # save players every n seconds
482
483our $SCHEDULER = cf::async_ext {
484 my $schedule_interval = Coro::Event->timer (after => 1);
485 while () {
486 $schedule_interval->interval ($SCHEDULE_INTERVAL);
487 $schedule_interval->next;
488
489 # this weird form of iteration over values is used because
490 # the hash changes underneath us frequently, and for
491 # keeps a direct reference to the value without (in 5.8 perls)
492 # keeping a reference, so this is prone to crashes or worse.
493 my @players = keys %cf::PLAYER;
494 for (@players) {
495 my $pl = $cf::PLAYER{$_}
496 or next;
497 $pl->valid or next;
498
499 eval {
500 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
501 $pl->save;
502
503 unless ($pl->active || $pl->ns) {
504 # check refcounts, this is tricky and needs to be adjusted to fit server internals
505 my $ob = $pl->ob;
506
507 my $pl_ref = $pl->refcnt_cnt;
508 my $ob_ref = $ob->refcnt_cnt;
509
510 ## pl_ref == $pl + ob->contr + %cf::PLAYER
511 ## ob_ref == $ob + pl->observe + simply being an object
512 if ($pl_ref == 3 && $ob_ref == 3) {
513 warn "player-scheduler destroy ", $ob->name;#d#
514
515 # remove from sight and get fresh "copies"
516 $pl = delete $cf::PLAYER{$ob->name};
517 $ob = $pl->ob;
518
519 $pl->destroy; # destroys $ob
520 } else {
521 my $a_ = $pl->refcnt;#d#
522 my $b_ = $ob->refcnt;#d#
523
524 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref ob $ob_ref (C pl $a_ ob $b_)\n";#d#
525 }
526 }
527 }
528 };
529 warn $@ if $@;
530 Coro::cede;
531 };
532 }
533};
534
535$SCHEDULER->prio (1);
536

Diff Legend

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