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

Diff Legend

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