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.89 by root, Sat Aug 30 05:19:03 2008 UTC vs.
Revision 1.112 by elmex, Mon May 10 15:54:40 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
… …
73} 70}
74 71
75sub enter_map { 72sub enter_map {
76 my ($pl) = @_; 73 my ($pl) = @_;
77 74
78 warn $pl->ob->name, ": enter map 1\n";#d#
79 my $ob = $pl->ob; 75 my $ob = $pl->ob;
80 76
81 my ($map, $x, $y) 77 my ($map, $x, $y)
82 = $ob->{_link_pos} 78 = $ob->{_link_pos}
83 ? @{delete $ob->{_link_pos}} 79 ? @{delete $ob->{_link_pos}}
84 : ($pl->maplevel, $ob->x, $ob->y); 80 : ($pl->maplevel, $ob->x, $ob->y);
85 81
86 warn $pl->ob->name, ": enter map 2\n";#d#
87 $ob->enter_link; 82 $ob->enter_link;
88 warn $pl->ob->name, ": enter map 3\n";#d#
89 83
90 my $m = cf::map::find $map; 84 my $m = cf::map::find $map;
91 my $time = delete $pl->{unclean_save}; 85 my $time = delete $pl->{unclean_save};
92 warn $pl->ob->name, ": enter map 4\n";#d#
93 86
94 if ($time && $m) { 87 if ($time && $m) {
95 if ($time < $m->{instantiate_time}) { 88 if ($time < $m->{instantiate_time}) {
96 # the map was reset in the meantime 89 # the map was reset in the meantime
97 my $age = $cf::RUNTIME - $time; 90 my $age = $cf::RUNTIME - $time;
98 91
99 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#
100 93
101 if ($age >= $MAX_DISCONNECT_TIME) { 94 if ($age >= $MAX_DISCONNECT_TIME) {
102 $ob->message ( 95 $ob->message (
103 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. " 96 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
104 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. " 97 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
… …
130 cf::NDI_RED 123 cf::NDI_RED
131 ); 124 );
132 } 125 }
133 } 126 }
134 127
135 warn $pl->ob->name, ": enter map 5\n";#d#
136 #$ob->goto ($map, $x, $y); 128 $ob->goto ($map, $x, $y);
137 $ob->goto ($map, $x, $y, sub { 129}
138 warn $pl->ob->name, ": enter map check\n";#d# 130
139 $_[0] 131sub encode_password($) {
140 }, sub { 132# crypt $_[0],
141 warn $pl->ob->name, ": enter map done\n";#d# 133# join '',
134# ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64), (cf::rndm 64)]
135 "!" . unpack "H*", $_[0]
136}
137
138sub compare_password($$) {
139 my ($pass, $token) = @_;
140
141 if ($token =~ /\!(.*)/) {
142 return $pass eq pack "H*", $1;
143 } else {
144 return $token eq crypt $pass, $token;
142 }); 145 }
143 warn $pl->ob->name, ": enter map 6\n";#d#
144
145} 146}
146 147
147# delete a player directory, be non-blocking AND synchronous... 148# delete a player directory
148# (thats hard, so we crap out and fork).
149sub nuke_playerdir { 149sub nuke_playerdir {
150 my ($user) = @_; 150 my ($user) = @_;
151 151
152 my $lock = cf::lock_acquire "ext::login::nuke_playerdir";
153
152 my $temp = "$PLAYERDIR/~$Coro::current~deleting~"; 154 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
153
154 cf::fork_call {
155 rename "$PLAYERDIR/$user", $temp; 155 aio_rename "$PLAYERDIR/$user", $temp;
156 system "rm", "-rf", $temp; 156 IO::AIO::aio_rmtree $temp;
157 };
158} 157}
159 158
160cf::client->attach (on_addme => sub { 159cf::client->attach (on_addme => sub {
161 my ($ns) = @_; 160 my ($ns) = @_;
162
163 if (!$ns->facecache)
164 {
165 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
166
167
168***
169*** WARNING:
170*** Your client does not support face/image caching,
171*** or it has been disabled. Face caching is mandatory
172*** so please enable it or use a newer client.
173***
174*** Look at your client preferences:
175***
176*** deliantra: all known versions automatically enable the facecache.
177*** cfclient: use the -cache commandline option.
178*** cfclient: map will not redraw automatically (bug).
179*** gcfclient: use -cache commandline option, or enable
180*** gcfclient: Client => Configure => Map & Image => Cache Images.
181*** jcrossclient: your client is broken, use deliantra or gcfclient.
182***
183***
184EOF
185 if ($ns->version =~ /jcrossclient/) {
186 # let them, for now
187 } else {
188 $ns->flush;
189 return $ns->destroy;
190 }
191
192 # $ns->facecache = true;
193 }
194
195 if ($ns->mapmode < cf::Map1aCmd) {
196 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
197
198
199***
200*** WARNING:
201*** Your client is too old. Please upgrade to a newer version.
202EOF
203
204 $ns->flush;
205 return $ns->destroy;
206 }
207 161
208 $ns->pl and return $ns->destroy; 162 $ns->pl and return $ns->destroy;
209 163
210 $ns->async (sub { 164 $ns->async (sub {
211 $Coro::current->{desc} = "addme init"; 165 $Coro::current->{desc} = "addme init";
… …
230 $ns->send_drawinfo ( 184 $ns->send_drawinfo (
231 "That username is currently used in another login session. " 185 "That username is currently used in another login session. "
232 . "Chose another, or wait till the other session has ended.", 186 . "Chose another, or wait till the other session has ended.",
233 cf::NDI_RED 187 cf::NDI_RED
234 ); 188 );
235 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,17}\z/) { 189 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z/) {
236 last; 190 last;
237 } else { 191 } else {
238 $ns->send_drawinfo ( 192 $ns->send_drawinfo (
239 "Your username contains illegal characters " 193 "Your username contains illegal characters "
240 . "(only a-z, A-Z and 0-9 are allowed), " 194 . "(only a-z, A-Z and 0-9 are allowed), "
241 . "or is not between 3 and 18 characters in length.", 195 . "or is not between 3 and 20 characters in length.",
242 cf::NDI_RED 196 cf::NDI_RED
243 ); 197 );
244 } 198 }
245 Coro::Timer::sleep 0.4; 199 Coro::Timer::sleep 0.4;
246 } 200 }
… …
285 239
286 # try to read the user file and check the password 240 # try to read the user file and check the password
287 if (my $pl = cf::player::find $user) { 241 if (my $pl = cf::player::find $user) {
288 aio_stat $pl->path and next; 242 aio_stat $pl->path and next;
289 my $mtime = (stat _)[9]; 243 my $mtime = (stat _)[9];
290 my $hash = $pl->password; 244 my $token = $pl->password;
291 245
292 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) { 246 if ($cf::CFG{ext_login_nocheck} or compare_password $pass, $token) {
247 $pl->password (encode_password $pass); # make sure we store the new encoding #d#
293 nuke_str $pass; 248 nuke_str $pass;
294 # password matches, wonderful 249 # password matches, wonderful
295 my $pl = cf::player::find $user or next; 250 my $pl = cf::player::find $user or next;
296 $pl->connect ($ns); 251 $pl->connect ($ns);
297 enter_map $pl; 252 enter_map $pl;
… …
346 301
347 # the rest of this function is character creation 302 # the rest of this function is character creation
348 $Coro::current->{desc} = "addme($user) chargen"; 303 $Coro::current->{desc} = "addme($user) chargen";
349 304
350 # just to make sure nothing is left over 305 # just to make sure nothing is left over
306 # normally, nothing is there.
351 nuke_playerdir $user; 307 nuke_playerdir $user;
352 308
353 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again."; 309 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
354 310
355 if ($pass2 ne $pass) { 311 if ($pass2 ne $pass) {
… …
364 } 320 }
365 321
366 nuke_str $pass2; 322 nuke_str $pass2;
367 323
368 my $pl = cf::player::new $user; 324 my $pl = cf::player::new $user;
369 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]); 325 $pl->password (encode_password $pass);
370 nuke_str $pass; 326 nuke_str $pass;
371 $pl->connect ($ns); 327 $pl->connect ($ns);
372 my $ob = $pl->ob; 328 my $ob = $pl->ob;
373 329
374 $ob->goto ($pl->maplevel, $ob->x, $ob->y); 330 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
… …
408 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n"; 364 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
409 365
410 last if $res =~ /[dD]/; 366 last if $res =~ /[dD]/;
411 367
412 $pl->chargen_race_next; 368 $pl->chargen_race_next;
413 Coro::Timer::sleep 0.2; 369 Coro::Timer::sleep 0.05;
414 } 370 }
415 371
416 # create the playerdir, if necessary, as chargen_race_done did it before 372 # create the playerdir, if necessary, as chargen_race_done did it before
417 # presumably because of unique maps 373 # presumably because of unique maps
418 aio_mkdir playerdir $pl, 0770; 374 aio_mkdir playerdir $pl, 0770;
… …
427 last; 383 last;
428 } elsif ($res =~ /^[mM]/) { 384 } elsif ($res =~ /^[mM]/) {
429 $pl->gender (0); 385 $pl->gender (0);
430 last; 386 last;
431 } 387 }
432 Coro::Timer::sleep 0.2; 388 Coro::Timer::sleep 0.05;
433 } 389 }
434 390
435 $ob->reply (undef, "Welcome to Deliantra!"); 391 $ob->reply (undef, "Welcome to Deliantra!");
436 392
393 # XXX: Workaround for delayed client ext protocol handshake
394 $pl->esrv_new_player;
395
437 delete $pl->{deny_save}; 396 delete $pl->{deny_save};
438 397
439 last; 398 last;
399 }
400
401 if (0 < Coro::AIO::aio_load "$cf::CONFDIR/motd", my $motd) {
402 $ns->send_msg ("c/motd" => $motd, cf::NDI_CLEAR);
440 } 403 }
441 }); 404 });
442}); 405});
443 406
407cf::register_command password => sub {
408 my ($pl, $arg) = @_;
409
410 unless ($pl->flag (cf::FLAG_WIZ)) {
411 $pl->message (
412 "The password can currently only changed by a DM.",
413 cf::NDI_UNIQUE | cf::NDI_REPLY);
414 return;
415 }
416
417 my (@args) = split /\s+/, $arg;
418 my ($player, $new_pw) = @args;
419
420 if ($pl->flag (cf::FLAG_WIZ) && $player eq '') {
421 $pl->message (
422 "Usage: password <player> [<new password>]",
423 cf::NDI_UNIQUE | cf::NDI_REPLY);
424 return;
425 }
426
427 if ($new_pw eq '') {
428 $new_pw =
429 join '',
430 map { ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[(cf::rndm 64)] }
431 1..9;
432 }
433
434 cf::async {
435 my $plc = cf::player::find $player;
436 if ($plc) {
437 $plc->password (encode_password $new_pw);
438 $pl->message (
439 "Ok, changed password of '$player' to '$new_pw'!",
440 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
441 } else {
442 $pl->message (
443 "Fail! Couldn't set password for '$player', "
444 . "he doesn't seem to exist!",
445 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
446 }
447 };
448};
449
444cf::register_command quit => sub { 450cf::register_command quit => sub {
445 my ($ob, $arg) = @_; 451 my ($ob, $arg) = @_;
446 452
447 $ob->reply (undef, 453 $ob->send_msg (undef,
448 "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. " 454 "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. "
449 . "If you are sure you want to do this, then use the quit_character command instead of quit.", 455 . "If you are sure you want to do this, then use the quit_character command instead of quit.",
450 cf::NDI_UNIQUE | cf::NDI_RED); 456 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
451}; 457};
452 458
453cf::register_command quit_character => sub { 459cf::register_command quit_character => sub {
454 my ($ob, $arg) = @_; 460 my ($ob, $arg) = @_;
455 461
456 my $pl = $ob->contr; 462 my $pl = $ob->contr;
457 463
458 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub { 464 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub {
459 if ($_[0] !~ /^[yY]/) { 465 if ($_[0] !~ /^[yY]/) {
460 $ob->reply (undef, 466 $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
461 "Ok, not not quitting then.",
462 cf::NDI_UNIQUE | cf::NDI_RED);
463 } else { 467 } else {
464 $ob->reply (undef, 468 $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
465 "Ok, quitting, hope to see you again.", 469 cf::async {
466 cf::NDI_UNIQUE | cf::NDI_RED);
467 $pl->ns->flush;
468 cf::async { $pl->quit_character }; 470 $pl->quit_character;
471 };
469 } 472 }
470 }); 473 });
471}; 474};
472 475
473cf::object->attach ( 476cf::object->attach (
… …
479 482
480 my $pl = $ob->contr; 483 my $pl = $ob->contr;
481 484
482 # update respawn position 485 # update respawn position
483 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 486 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
484 cf::async { $pl->save };
485 487
488 cf::async {
486 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy; 489 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
487 $ob->check_score; 490 ext::highscore::check $ob;
488 491
489 $ob->reply (undef, "In the future, you will wake up here when you die."); 492 $pl->save;
490 493
494 $ob->send_msg ($cf::SAY_CHANNEL => "In the future, you will wake up here when you die.", cf::NDI_DEF | cf::NDI_REPLY);
495
491 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub { 496 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
492 if ($_[0] !~ /^[yY]/) { 497 if ($_[0] !~ /^[yY]/) {
493 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1); 498 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1);
494 $pl->deactivate; 499 $pl->deactivate;
495 $pl->ns->destroy; 500 $pl->ns->destroy;
496 } else { 501 }
497 cf::async { $pl->save };
498 } 502 });
499 }); 503 };
500 }, 504 },
501); 505);
502 506
503cf::player->attach ( 507cf::player->attach (
504 on_login => sub { 508 on_login => sub {
… …
519 unless safe_spot $pl; 523 unless safe_spot $pl;
520 } 524 }
521 }, 525 },
522); 526);
523 527
524#############################################################################
525
526our $SCHEDULE_INTERVAL = $cf::CFG{player_schedule_interval} || 10; # time the player scheduler sleeps between runs
527our $SAVE_TIMEOUT = $cf::CFG{player_save_interval} || 20; # save players every n seconds
528
529our $SCHEDULER = cf::async_ext {
530 $Coro::current->{desc} = "player scheduler";
531
532 while () {
533 Coro::EV::timer_once $SCHEDULE_INTERVAL;
534
535 # this weird form of iteration over values is used because
536 # the hash changes underneath us frequently, and for
537 # keeps a direct reference to the value without (in 5.8 perls)
538 # keeping a reference, so this is prone to crashes or worse.
539 my @players = keys %cf::PLAYER;
540 for (@players) {
541 my $pl = $cf::PLAYER{$_}
542 or next;
543 $pl->valid or next;
544
545 eval {
546 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
547 $pl->save;
548
549 unless ($pl->active || $pl->ns) {
550 # check refcounts, this is tricky and needs to be adjusted to fit server internals
551 my $ob = $pl->ob;
552
553 my $pl_ref = $pl->refcnt_cnt;
554 my $ob_ref = $ob->refcnt_cnt;
555
556 ## pl_ref == $pl + ob->contr + %cf::PLAYER
557 ## ob_ref == $ob + pl->observe + simply being an object
558 if ($pl_ref == 3 && $ob_ref == 3) {
559 warn "player-scheduler destroy ", $ob->name;#d#
560
561 # remove from sight and get fresh "copies"
562 $pl = delete $cf::PLAYER{$ob->name};
563 $ob = $pl->ob;
564
565 $pl->destroy; # destroys $ob
566 } else {
567 my $a_ = $pl->refcnt;#d#
568 my $b_ = $ob->refcnt;#d#
569
570 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref/3 ob $ob_ref/3 (C pl $a_/1 ob $b_/2)\n";#d#
571 }
572 }
573 }
574 };
575 warn $@ if $@;
576 cf::cede_to_tick;
577 };
578 }
579};
580
581$SCHEDULER->prio (1);
582

Diff Legend

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