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.43 by root, Mon Apr 23 18:09:57 2007 UTC vs.
Revision 1.81 by root, Fri Jan 18 03:34:55 2008 UTC

1#! perl # MANDATORY 1#! perl # mandatory
2 2
3# login handling 3# login handling
4 4
5use Fcntl; 5use Fcntl;
6use Coro::AIO; 6use Coro::AIO;
7use List::Util qw(min max); 7
8our $MAX_DISCONNECT_TIME = $cf::CFG{max_disconnect_time} || 3600;
8 9
9# paranoia function to overwrite a string-in-place 10# paranoia function to overwrite a string-in-place
10sub nuke_str { 11sub nuke_str {
11 substr $_[0], 0, (length $_[0]), "x" x length $_[0] 12 substr $_[0], 0, (length $_[0]), "x" x length $_[0]
12} 13}
… …
39 return unless cf::player::find_active $user; 40 return unless cf::player::find_active $user;
40 41
41 $ns->send_drawinfo ( 42 $ns->send_drawinfo (
42 "That player is already logged in on this server. " 43 "That player is already logged in on this server. "
43 . "If you want to create a new player, choose another name. " 44 . "If you want to create a new player, choose another name. "
44 . "If you are already a registered player, make sure nobody " 45 . "If you have already a registered, make sure nobody "
45 . "else is using your account at this time. If you lost your conenction " 46 . "else is using your account at this time. If you lost your connection "
46 . "then the server will likely timeout within a minute. If you still " 47 . "then the server will likely timeout within a minute. If you still "
47 . "cannot log-in after a minute, you are still logged in. Make sure " 48 . "cannot log-in after a minute, you are still logged in. Make sure "
48 . "you do not have another client running. If you use windows, reboot, " 49 . "you do not have another client running. If you use windows, reboot, "
49 . "this will fix anything.", 50 . "this will fix anything.",
50 cf::NDI_RED 51 cf::NDI_RED
51 ); 52 );
52 53
53 1 54 1
54} 55}
55 56
56sub check_clean_save { 57sub safe_spot($) {
57 my ($pl) = @_; 58 my ($pl) = @_;
59
60 my $ob = $pl->ob;
58 61
62 my $m = $ob->map
63 or return;
64 my $x = $ob->x;
65 my $y = $ob->y;
66
67# return 0;#d#
68# warn join ":", $m->at ($x, $y);#d#
69# warn "FOO$m { ".scalar ($m->at ($x, $y))." }\n";
70# return 0;
71
72 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y)
73}
74
75sub enter_map {
76 my ($pl) = @_;
77
78 my $ob = $pl->ob;
79
80 my ($map, $x, $y)
81 = $ob->{_link_pos}
82 ? @{delete $ob->{_link_pos}}
83 : ($pl->maplevel, $ob->x, $ob->y);
84
85 $ob->enter_link;
86
87 my $m = cf::map::find $map;
59 if (my $time = delete $pl->{unclean_save}) { 88 my $time = delete $pl->{unclean_save};
60 $pl->ns->send_drawinfo ( 89
90 if ($time && $m) {
91 if ($time < $m->{instantiate_time}) {
92 # the map was reset in the meantime
93 my $age = $cf::RUNTIME - $time;
94
95 warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
96
97 if ($age >= $MAX_DISCONNECT_TIME) {
98 $ob->message (
99 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
100 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
101 . "Maybe you can find comfort in the thought that your body was quite satisfying in taste... "
102 . "H<You disconnected too long without having used a savebed.>",
103 cf::NDI_RED
104 );
105 # kill them.
106 # reminds me of the famous badness 10000 syndrome...
107 $ob->stats->hp (-10000); #] if they survive this they deserved to live
108 $pl->killer ("a cave-in");
109 } else {
110 ($map, $x, $y) = $pl->savebed;
111
112 $ob->message (
113 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
114 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
115 . "Better use a savebed next time, much worse things could have happened... "
116 . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>",
117 cf::NDI_RED
118 );
119 }
120 } else {
121 $ob->message (
61 "You didn't use a savebed to leave this realm. This is very dangerous, " 122 "You didn't use a bed to reality to leave this realm. This is very dangerous, "
62 . "as lots of things could happen when you leave by other means, such as cave-ins, " 123 . "as lots of things could happen when you leave by other means, such as cave-ins, "
63 . "or monsters suddenly snapping your body. Better use a savebed next time.", 124 . "or monsters suddenly snapping your body. Better use a savebed next time. "
125 . "H<Always apply a bed of reality to disconnect from the server.>",
64 cf::NDI_RED 126 cf::NDI_RED
65 ); 127 );
66 #d#TODO 128 }
67 } 129 }
130
131 $ob->goto ($map, $x, $y);
68} 132}
69 133
70# delete a player directory, be non-blocking AND synchronous... 134# delete a player directory, be non-blocking AND synchronous...
71# (thats hard, so we crap out and fork). 135# (thats hard, so we crap out and fork).
72sub nuke_playerdir { 136sub nuke_playerdir {
73 my ($user) = @_; 137 my ($user) = @_;
74 138
75 aio_stat "$PLAYERDIR/$user"; 139 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
76 system "cd \Q$PLAYERDIR\E "
77 . "&& mv \Q$user\E ~\Q$Coro::current\E~deleting~ 2>/dev/null "
78 . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)";
79}
80 140
81sub send_capabilities { 141 cf::fork_call {
142 rename "$PLAYERDIR/$user", $temp;
143 system "rm", "-rf", $temp;
144 };
145}
146
147cf::client->attach (on_addme => sub {
82 my ($ns) = @_; 148 my ($ns) = @_;
83 149
84 return unless $ns->extcmd;
85
86 $ns->ext_event (capabilities =>
87 # id, name, flags (1 == 2d), edge length
88 tileset => [[1, "default 64x64 faceset", 1, 64], [0, "default 32x32 faceset", 1, 32]],
89 );
90}
91
92sub setup {
93 my ($ns, $args) = @_;
94
95 # run through the cmds of setup
96 # syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
97 #
98 # we send the status of the cmd back, or a FALSE is the cmd is the server unknown
99 # The client then must sort this out
100
101 my %setup = split / +/, $args;
102 while (my ($k, $v) = each %setup) {
103 if ($k eq "sound") {
104 $ns->sound ($v);
105
106 } elsif ($k eq "exp64") {
107 $setup{$k} = 1;
108
109 } elsif ($k eq "spellmon") {
110 $ns->monitor_spells ($v);
111
112 } elsif ($k eq "darkness") {
113 $ns->darkness ($v);
114
115 } elsif ($k eq "map1cmd") {
116 $ns->mapmode (cf::Map1Cmd) if $v > 0;
117
118 } elsif ($k eq "map1acmd") {
119 $ns->mapmode (cf::Map1aCmd) if $v > 0;
120
121 } elsif ($k eq "map2cmd") {
122 # gcfclient bug, map1acmd is sent too late
123 $ns->mapmode (cf::Map1aCmd);
124 $setup{$k} = "FALSE";
125
126 } elsif ($k eq "newmapcmd") {
127 $ns->newmapcmd ($v);
128
129 } elsif ($k eq "mapinfocmd") {
130 $ns->mapinfocmd ($v);
131
132 } elsif ($k eq "extcmd") {
133 $ns->extcmd ($v > 0);
134 send_capabilities $ns;
135
136 } elsif ($k eq "extmap") {
137 $ns->extmap ($v);
138
139 } elsif ($k eq "facecache") {
140 if (!$v) {
141 $v = 1;
142 $setup{$k} = $v;
143 $ns->send_drawinfo ("(trying to forcefully enable facecaching)", cf::NDI_RED);
144 }
145
146 $ns->facecache ($v);
147
148 } elsif ($k eq "faceset") {
149 $ns->faceset (0);
150 $setup{$k} = 0;
151 # $ns->image2 (1)
152
153 } elsif ($k eq "tileset") {
154 $setup{$k} = $ns->faceset ($v & 1);
155
156 } elsif ($k eq "itemcmd") {
157 # Version of the item protocol command to use. Currently,
158 # only supported versions are 1 and 2. Using a numeric
159 # value will make it very easy to extend this in the future.
160 $ns->itemcmd ($v) if $v >= 1 && $v <= 2;
161
162 $setup{$k} = $ns->itemcmd;
163
164 } elsif ($k eq "mapsize") {
165 my ($x, $y) = split /x/, $v;
166
167 $ns->mapx ($x = max 9, min cf::MAP_CLIENT_X, ($x - 1) | 1);
168 $ns->mapy ($y = max 9, min cf::MAP_CLIENT_Y, ($y - 1) | 1);
169
170 $setup{$k} = "${x}x${y}";
171
172 } elsif ($k eq "extendedMapInfos") {
173 $ns->ext_mapinfos ($v);
174
175 } elsif ($k eq "extendedTextInfos") {
176 $ns->has_readable_type ($v);
177
178 } elsif ($k eq "smoothing") { # cfplus-style smoothing
179 $ns->smoothing ($v);
180
181 } elsif ($k eq "fxix") {
182 $ns->fxix ($v);
183
184 } elsif ($k eq "msg") {
185 $ns->{setup}{msg} = $v;
186
187 } else {
188 # other commands:
189 # sexp: no idea, probably for oudated servers
190 # tick: more stupidity, server should sned a tick per tick
191
192 $setup{$k} = "FALSE";
193 }
194 }
195
196 $ns->send_packet (join " ", setup => %setup);
197
198 cf::datalog setup =>
199 request => $args,
200 reply => \%setup,
201 client => $ns->version,
202 ;
203}
204
205sub addme {
206 my ($ns) = @_;
207
208 if (!$ns->facecache) 150 if (!$ns->facecache)
209 { 151 {
210 $ns->send_drawinfo (<<EOF, cf::NDI_RED); 152 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
211 153
212 154
213*** 155***
214*** WARNING: 156*** WARNING:
215*** Your client does not support face/image caching, 157*** Your client does not support face/image caching,
216*** or it has been disabled. Face caching is mandatory 158*** or it has been disabled. Face caching is mandatory
217*** so please enable it or use a newer client. 159*** so please enable it or use a newer client.
218*** 160***
219*** Look at your client preferences: 161*** Look at your client preferences:
220*** 162***
221*** CFPlus: all known versions automatically enable the facecache. 163*** deliantra: all known versions automatically enable the facecache.
222*** cfclient: use the -cache commandline option. 164*** cfclient: use the -cache commandline option.
223*** cfclient: map will not redraw automatically (bug). 165*** cfclient: map will not redraw automatically (bug).
224*** gcfclient: use -cache commandline option, or enable 166*** gcfclient: use -cache commandline option, or enable
225*** gcfclient: Client=>Configure=>Map & Image=>Cache Images. 167*** gcfclient: Client => Configure => Map & Image => Cache Images.
226*** jcrossclient: your client is broken, use CFPlus or gcfclient. 168*** jcrossclient: your client is broken, use deliantra or gcfclient.
227*** 169***
228*** 170***
229EOF 171EOF
230 if ($ns->version =~ /jcrossclient/) { 172 if ($ns->version =~ /jcrossclient/) {
231 # let them, for now 173 # let them, for now
… …
251 } 193 }
252 194
253 $ns->pl and return $ns->destroy; 195 $ns->pl and return $ns->destroy;
254 196
255 $ns->async (sub { 197 $ns->async (sub {
198 $Coro::current->{desc} = "addme init";
199
256 my ($user, $pass); 200 my ($user, $pass);
257 201
258 $ns->send_packet ("addme_success"); 202 $ns->send_packet ("addme_success");
259 203
260 for (;;) { 204 for (;;) {
… …
283 . "(only a-z, A-Z and 0-9 are allowed), " 227 . "(only a-z, A-Z and 0-9 are allowed), "
284 . "or is not between 3 and 18 characters in length.", 228 . "or is not between 3 and 18 characters in length.",
285 cf::NDI_RED 229 cf::NDI_RED
286 ); 230 );
287 } 231 }
232 Coro::Timer::sleep 0.4;
288 } 233 }
289 234
290 check_playing $ns, $user and next; 235 check_playing $ns, $user and next;
236
237 $Coro::current->{desc} = "addme($user) pass";
291 238
292 $ns->send_drawinfo ( 239 $ns->send_drawinfo (
293 "Welcome $user, please enter your password now. " 240 "Welcome $user, please enter your password now. "
294 . "New users should now choose a password. " 241 . "New users should now choose a password. "
295 . "Anything your client lets you enter is fine.", 242 . "Anything your client lets you enter is fine.",
… …
303 $ns->send_drawinfo ( 250 $ns->send_drawinfo (
304 "Try to use at least three characters as your password please, " 251 "Try to use at least three characters as your password please, "
305 . "that cannot be too much to ask for :)", 252 . "that cannot be too much to ask for :)",
306 cf::NDI_RED 253 cf::NDI_RED
307 ); 254 );
255 Coro::Timer::sleep 0.4;
308 } 256 }
309 257
310 # lock this username for the remainder of this login session 258 # lock this username for the remainder of this login session
311 if ($cf::LOGIN_LOCK{$user}) { 259 if ($cf::LOGIN_LOCK{$user}) {
312 $ns->send_drawinfo ( 260 $ns->send_drawinfo (
… …
318 } 266 }
319 local $cf::LOGIN_LOCK{$user} = 1; 267 local $cf::LOGIN_LOCK{$user} = 1;
320 268
321 check_playing $ns, $user and next; 269 check_playing $ns, $user and next;
322 270
271 $Coro::current->{desc} = "addme($user) check";
272
323 # try to read the user file and check the password 273 # try to read the user file and check the password
324 if (my $pl = cf::player::find $user) { 274 if (my $pl = cf::player::find $user) {
325 aio_stat $pl->path and next; 275 aio_stat $pl->path and next;
326 my $mtime = (stat _)[9]; 276 my $mtime = (stat _)[9];
327 my $hash = $pl->password; 277 my $hash = $pl->password;
… …
329 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) { 279 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) {
330 nuke_str $pass; 280 nuke_str $pass;
331 # password matches, wonderful 281 # password matches, wonderful
332 my $pl = cf::player::find $user or next; 282 my $pl = cf::player::find $user or next;
333 $pl->connect ($ns); 283 $pl->connect ($ns);
334 check_clean_save $pl; 284 enter_map $pl;
335 last; 285 last;
336 } elsif (can_cleanup $pl, $mtime) { 286 } elsif (can_cleanup $pl, $mtime) {
337 Coro::Timer::sleep 1; 287 Coro::Timer::sleep 1;
338 288
339 $ns->send_drawinfo ( 289 $ns->send_drawinfo (
… …
380 next; 330 next;
381 } 331 }
382 } 332 }
383 333
384 # the rest of this function is character creation 334 # the rest of this function is character creation
335 $Coro::current->{desc} = "addme($user) chargen";
385 336
386 # just to make sure nothing is left over 337 # just to make sure nothing is left over
387 nuke_playerdir $user; 338 nuke_playerdir $user;
388 339
389 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again."; 340 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
… …
393 nuke_str $pass2; 344 nuke_str $pass2;
394 $ns->send_drawinfo ( 345 $ns->send_drawinfo (
395 "The passwords do not match, please try again.", 346 "The passwords do not match, please try again.",
396 cf::NDI_RED 347 cf::NDI_RED
397 ); 348 );
349 Coro::Timer::sleep 0.5;
398 next; 350 next;
399 } 351 }
400 352
401 nuke_str $pass2; 353 nuke_str $pass2;
402 354
403 my $pl = cf::player::new $user; 355 my $pl = cf::player::new $user;
404 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]); 356 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]);
405 nuke_str $pass; 357 nuke_str $pass;
406 $pl->connect ($ns); 358 $pl->connect ($ns);
407
408 my $ob = $pl->ob; 359 my $ob = $pl->ob;
360
361 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
409 362
410 while () { 363 while () {
411 $ob->update_stats; 364 $ob->update_stats;
412 $pl->save_stats; 365 $pl->save_stats;
413 366
… …
423 $ob->swap_stats ($res - 1, $swap - 1); 376 $ob->swap_stats ($res - 1, $swap - 1);
424 } 377 }
425 } else { 378 } else {
426 $ob->roll_stats; 379 $ob->roll_stats;
427 } 380 }
381
382 Coro::Timer::sleep 0.2;
428 } 383 }
429 384
430 $ob->set_animation (2); 385 $ob->set_animation (2);
431 $ob->add_statbonus; 386 $ob->add_statbonus;
432 387
433 $ns->send_drawinfo ($ob->msg, cf::NDI_BLUE); 388 while () {
434 $ns->send_packet (sprintf "query %d %s", cf::CS_QUERY_SINGLECHAR, 389 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
390 my $msg = $ob->msg;
391 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
392 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
393
394 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
435 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n"); 395 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
436 396
437 $ns->state (cf::ST_CHANGE_CLASS); 397 last if $res =~ /[dD]/;
398
399 $pl->chargen_race_next;
400 Coro::Timer::sleep 0.2;
401 }
402
403 $pl->chargen_race_done;
404
405 while () {
406 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
407 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
408
409 if ($res =~ /^[fF]/) {
410 $pl->gender (1);
411 last;
412 } elsif ($res =~ /^[mM]/) {
413 $pl->gender (0);
414 last;
415 }
416 Coro::Timer::sleep 0.2;
417 }
418
419 $ob->reply (undef, "Welcome to Deliantra!");
420
438 delete $pl->{deny_save};#d# too early 421 delete $pl->{deny_save};
439 422
440 last; 423 last;
441 } 424 }
442 }); 425 });
443} 426});
444 427
445cf::register_command quit => sub { 428cf::register_command quit => sub {
446 my ($ob, $arg) = @_; 429 my ($ob, $arg) = @_;
447 430
448 $ob->reply (undef, 431 $ob->reply (undef,
… …
514 497
515 if ($cleanly) { 498 if ($cleanly) {
516 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 499 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
517 } else { 500 } else {
518 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 501 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
519 $pl->{unclean_save} = $cf::RUNTIME; 502 $pl->{unclean_save} = $cf::RUNTIME
503 unless safe_spot $pl;
520 } 504 }
521 }, 505 },
522); 506);
523 507
524cf::client->attach (
525 on_addme => \&addme,
526 on_setup => \&setup,
527);
528
529############################################################################# 508#############################################################################
530 509
531our $SCHEDULE_INTERVAL = 10; # time the player scheduler sleeps between runs 510our $SCHEDULE_INTERVAL = $cf::CFG{player_schedule_interval} || 10; # time the player scheduler sleeps between runs
532our $SAVE_TIMEOUT = 20; # save players every n seconds 511our $SAVE_TIMEOUT = $cf::CFG{player_save_interval} || 20; # save players every n seconds
533 512
534our $SCHEDULER = cf::async_ext { 513our $SCHEDULER = cf::async_ext {
535 my $schedule_interval = Coro::Event->timer (after => 1, interval => $SCHEDULE_INTERVAL); 514 $Coro::current->{desc} = "player scheduler";
515
536 while () { 516 while () {
537 $schedule_interval->next; 517 Coro::EV::timer_once $SCHEDULE_INTERVAL;
538 518
539 # this weird form of iteration over values is used because 519 # this weird form of iteration over values is used because
540 # the hash changes underneath us frequently, and for 520 # the hash changes underneath us frequently, and for
541 # keeps a direct reference to the value without (in 5.8 perls) 521 # keeps a direct reference to the value without (in 5.8 perls)
542 # keeping a reference, so this is prone to crashes or worse. 522 # keeping a reference, so this is prone to crashes or worse.
… …
546 or next; 526 or next;
547 $pl->valid or next; 527 $pl->valid or next;
548 528
549 eval { 529 eval {
550 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) { 530 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
551 cf::wait_for_tick_begin;
552 $pl->save; 531 $pl->save;
553 532
554 unless ($pl->active) { 533 unless ($pl->active || $pl->ns) {
555 # check refcounts, this is tricky and needs to be adjusted to fit server internals 534 # check refcounts, this is tricky and needs to be adjusted to fit server internals
556 my $ob = $pl->ob; 535 my $ob = $pl->ob;
557 Scalar::Util::weaken $pl; 536
558 Scalar::Util::weaken $ob;
559 my $a_ = $pl->refcnt;#d#
560 my $b_ = $ob->refcnt;#d#
561 my $pl_ref = $pl->refcnt_cnt; 537 my $pl_ref = $pl->refcnt_cnt;
562 my $ob_ref = $ob->refcnt_cnt; 538 my $ob_ref = $ob->refcnt_cnt;
563 539
564 ## pl_ref == one from object + one from cf::PLAYER 540 ## pl_ref == $pl + ob->contr + %cf::PLAYER
565 ## ob_ref == one from simply being an object 541 ## ob_ref == $ob + pl->observe + simply being an object
566 if ($pl_ref == 2 && $ob_ref == 1) { 542 if ($pl_ref == 3 && $ob_ref == 3) {
567 warn "player-scheduler destroy ", $ob->name;#d# 543 warn "player-scheduler destroy ", $ob->name;#d#
568 544
569 # remove from sight and get fresh "copies" 545 # remove from sight and get fresh "copies"
570 $pl = delete $cf::PLAYER{$ob->name}; 546 $pl = delete $cf::PLAYER{$ob->name};
571 $ob = $pl->ob; 547 $ob = $pl->ob;
572 548
573 $ob->destroy;
574 $pl->destroy; 549 $pl->destroy; # destroys $ob
575 } else { 550 } else {
551 my $a_ = $pl->refcnt;#d#
552 my $b_ = $ob->refcnt;#d#
553
576 warn "player-scheduler refcnt ", $ob->name, " $pl_ref,$a_ $ob_ref,$b_\n";#d# 554 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref ob $ob_ref (C pl $a_ ob $b_)\n";#d#
577 } 555 }
578 } 556 }
579 } 557 }
580 }; 558 };
581 warn $@ if $@; 559 warn $@ if $@;

Diff Legend

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