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.85 by root, Mon May 5 16:02:20 2008 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
… …
62 my $m = $ob->map 59 my $m = $ob->map
63 or return; 60 or return;
64 my $x = $ob->x; 61 my $x = $ob->x;
65 my $y = $ob->y; 62 my $y = $ob->y;
66 63
64 # never happens normally, but helps when shell users make mistakes
65 $m->in_memory == cf::MAP_ACTIVE
66 or return 1;
67
67# return 0;#d# 68# return 0;#d#
68# warn join ":", $m->at ($x, $y);#d# 69# warn join ":", $m->at ($x, $y);#d#
69# warn "FOO$m { ".scalar ($m->at ($x, $y))." }\n"; 70# warn "FOO$m { ".scalar ($m->at ($x, $y))." }\n";
70# return 0; 71# return 0;
71 72
… …
90 if ($time && $m) { 91 if ($time && $m) {
91 if ($time < $m->{instantiate_time}) { 92 if ($time < $m->{instantiate_time}) {
92 # the map was reset in the meantime 93 # the map was reset in the meantime
93 my $age = $cf::RUNTIME - $time; 94 my $age = $cf::RUNTIME - $time;
94 95
95 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#
96 97
97 if ($age >= $MAX_DISCONNECT_TIME) { 98 if ($age >= $MAX_DISCONNECT_TIME) {
98 $ob->message ( 99 $ob->message (
99 "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. "
100 . "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. "
… …
103 cf::NDI_RED 104 cf::NDI_RED
104 ); 105 );
105 # kill them. 106 # kill them.
106 # reminds me of the famous badness 10000 syndrome... 107 # reminds me of the famous badness 10000 syndrome...
107 $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
108 my $killer = cf::arch::get "killer_login"; 109 my $killer = cf::arch::get "killer_login"; $pl->killer ($killer); $killer->destroy;
109 $pl->killer ($killer);
110 $killer->destroy;
111 } else { 110 } else {
112 ($map, $x, $y) = $pl->savebed; 111 ($map, $x, $y) = $pl->savebed;
113 112
114 $ob->message ( 113 $ob->message (
115 "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. "
… …
131 } 130 }
132 131
133 $ob->goto ($map, $x, $y); 132 $ob->goto ($map, $x, $y);
134} 133}
135 134
136# delete a player directory, be non-blocking AND synchronous... 135sub encode_password($) {
137# (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
138sub nuke_playerdir { 153sub nuke_playerdir {
139 my ($user) = @_; 154 my ($user) = @_;
140 155
156 my $lock = cf::lock_acquire "ext::login::nuke_playerdir";
157
141 my $temp = "$PLAYERDIR/~$Coro::current~deleting~"; 158 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
142
143 cf::fork_call {
144 rename "$PLAYERDIR/$user", $temp; 159 aio_rename "$PLAYERDIR/$user", $temp;
145 system "rm", "-rf", $temp; 160 IO::AIO::aio_rmtree $temp;
146 };
147} 161}
148 162
149cf::client->attach (on_addme => sub { 163cf::client->attach (on_addme => sub {
150 my ($ns) = @_; 164 my ($ns) = @_;
151
152 if (!$ns->facecache)
153 {
154 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
155
156
157***
158*** WARNING:
159*** Your client does not support face/image caching,
160*** or it has been disabled. Face caching is mandatory
161*** so please enable it or use a newer client.
162***
163*** Look at your client preferences:
164***
165*** deliantra: all known versions automatically enable the facecache.
166*** cfclient: use the -cache commandline option.
167*** cfclient: map will not redraw automatically (bug).
168*** gcfclient: use -cache commandline option, or enable
169*** gcfclient: Client => Configure => Map & Image => Cache Images.
170*** jcrossclient: your client is broken, use deliantra or gcfclient.
171***
172***
173EOF
174 if ($ns->version =~ /jcrossclient/) {
175 # let them, for now
176 } else {
177 $ns->flush;
178 return $ns->destroy;
179 }
180
181 # $ns->facecache = true;
182 }
183
184 if ($ns->mapmode < cf::Map1aCmd) {
185 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
186
187
188***
189*** WARNING:
190*** Your client is too old. Please upgrade to a newer version.
191EOF
192
193 $ns->flush;
194 return $ns->destroy;
195 }
196 165
197 $ns->pl and return $ns->destroy; 166 $ns->pl and return $ns->destroy;
198 167
199 $ns->async (sub { 168 $ns->async (sub {
200 $Coro::current->{desc} = "addme init"; 169 $Coro::current->{desc} = "addme init";
… …
211 cf::NDI_BLUE 180 cf::NDI_BLUE
212 ); 181 );
213 182
214 # read username 183 # read username
215 while () { 184 while () {
216 $user = query $ns, 0, "What is your name?\n:"; 185 $user = query $ns, 0, "What is your name? (login names are case-sensitive)\n:";
217 186
218 if ($cf::LOGIN_LOCK{$user}) { 187 if ($cf::LOGIN_LOCK{$user}) {
219 $ns->send_drawinfo ( 188 $ns->send_drawinfo (
220 "That username is currently used in another login session. " 189 "That username is currently used in another login session. "
221 . "Chose another, or wait till the other session has ended.", 190 . "Chose another, or wait till the other session has ended.",
222 cf::NDI_RED 191 cf::NDI_RED
223 ); 192 );
224 } 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/) {
225 last; 194 last;
226 } else { 195 } else {
227 $ns->send_drawinfo ( 196 $ns->send_drawinfo (
228 "Your username contains illegal characters " 197 "Your username contains illegal characters "
229 . "(only a-z, A-Z and 0-9 are allowed), " 198 . "(only a-z, A-Z and 0-9 are allowed), "
230 . "or is not between 3 and 18 characters in length.", 199 . "or is not between 3 and 20 characters in length.",
231 cf::NDI_RED 200 cf::NDI_RED
232 ); 201 );
233 } 202 }
234 Coro::Timer::sleep 0.4; 203 Coro::Timer::sleep 0.4;
235 } 204 }
… …
274 243
275 # try to read the user file and check the password 244 # try to read the user file and check the password
276 if (my $pl = cf::player::find $user) { 245 if (my $pl = cf::player::find $user) {
277 aio_stat $pl->path and next; 246 aio_stat $pl->path and next;
278 my $mtime = (stat _)[9]; 247 my $mtime = (stat _)[9];
279 my $hash = $pl->password; 248 my $token = $pl->password;
280 249
281 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#
282 nuke_str $pass; 252 nuke_str $pass;
283 # password matches, wonderful 253 # password matches, wonderful
284 my $pl = cf::player::find $user or next; 254 my $pl = cf::player::find $user or next;
285 $pl->connect ($ns); 255 $pl->connect ($ns);
286 enter_map $pl; 256 enter_map $pl;
… …
335 305
336 # the rest of this function is character creation 306 # the rest of this function is character creation
337 $Coro::current->{desc} = "addme($user) chargen"; 307 $Coro::current->{desc} = "addme($user) chargen";
338 308
339 # just to make sure nothing is left over 309 # just to make sure nothing is left over
310 # normally, nothing is there.
340 nuke_playerdir $user; 311 nuke_playerdir $user;
341 312
342 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.";
343 314
344 if ($pass2 ne $pass) { 315 if ($pass2 ne $pass) {
… …
353 } 324 }
354 325
355 nuke_str $pass2; 326 nuke_str $pass2;
356 327
357 my $pl = cf::player::new $user; 328 my $pl = cf::player::new $user;
358 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]); 329 $pl->password (encode_password $pass);
359 nuke_str $pass; 330 nuke_str $pass;
360 $pl->connect ($ns); 331 $pl->connect ($ns);
361 my $ob = $pl->ob; 332 my $ob = $pl->ob;
362 333
363 $ob->goto ($pl->maplevel, $ob->x, $ob->y); 334 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
… …
379 } 350 }
380 } else { 351 } else {
381 $ob->roll_stats; 352 $ob->roll_stats;
382 } 353 }
383 354
384 Coro::Timer::sleep 0.2; 355 Coro::Timer::sleep 0.05;
385 } 356 }
386 357
387 $ob->set_animation (2); 358 $ob->set_animation (2);
388 $ob->add_statbonus; 359 $ob->add_statbonus;
389 360
… …
397 "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";
398 369
399 last if $res =~ /[dD]/; 370 last if $res =~ /[dD]/;
400 371
401 $pl->chargen_race_next; 372 $pl->chargen_race_next;
402 Coro::Timer::sleep 0.2; 373 Coro::Timer::sleep 0.05;
403 } 374 }
404 375
405 # create the playerdir, if necessary, as chargen_race_done did it before 376 # create the playerdir, if necessary, as chargen_race_done did it before
406 # presumably because of unique maps 377 # presumably because of unique maps
407 aio_mkdir playerdir $pl, 0770; 378 aio_mkdir playerdir $pl, 0770;
… …
416 last; 387 last;
417 } elsif ($res =~ /^[mM]/) { 388 } elsif ($res =~ /^[mM]/) {
418 $pl->gender (0); 389 $pl->gender (0);
419 last; 390 last;
420 } 391 }
421 Coro::Timer::sleep 0.2; 392 Coro::Timer::sleep 0.05;
422 } 393 }
423 394
424 $ob->reply (undef, "Welcome to Deliantra!"); 395 $ob->reply (undef, "Welcome to Deliantra!");
425 396
397 # XXX: Workaround for delayed client ext protocol handshake
398 $pl->esrv_new_player;
399
426 delete $pl->{deny_save}; 400 delete $pl->{deny_save};
427 401
428 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);
429 } 407 }
430 }); 408 });
431}); 409});
432 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
433cf::register_command quit => sub { 454cf::register_command quit => sub {
434 my ($ob, $arg) = @_; 455 my ($ob, $arg) = @_;
435 456
436 $ob->reply (undef, 457 $ob->send_msg (undef,
437 "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. "
438 . "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.",
439 cf::NDI_UNIQUE | cf::NDI_RED); 460 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
440}; 461};
441 462
442cf::register_command quit_character => sub { 463cf::register_command quit_character => sub {
443 my ($ob, $arg) = @_; 464 my ($ob, $arg) = @_;
444 465
445 my $pl = $ob->contr; 466 my $pl = $ob->contr;
446 467
447 $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 {
448 if ($_[0] !~ /^[yY]/) { 469 if ($_[0] !~ /^[yY]/) {
449 $ob->reply (undef, 470 $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
450 "Ok, not not quitting then.",
451 cf::NDI_UNIQUE | cf::NDI_RED);
452 } else { 471 } else {
453 $ob->reply (undef, 472 $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
454 "Ok, quitting, hope to see you again.", 473 cf::async {
455 cf::NDI_UNIQUE | cf::NDI_RED);
456 $pl->ns->flush;
457 cf::async { $pl->quit_character }; 474 $pl->quit_character;
475 };
458 } 476 }
459 }); 477 });
460}; 478};
461 479
462cf::object->attach ( 480cf::object->attach (
… …
468 486
469 my $pl = $ob->contr; 487 my $pl = $ob->contr;
470 488
471 # update respawn position 489 # update respawn position
472 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 490 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
473 cf::async { $pl->save };
474 491
475 my $killer = cf::arch::get "killer_logout"; 492 cf::async {
476 $pl->killer ($killer); 493 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
477 $killer->destroy; 494 ext::highscore::check $ob;
478 $ob->check_score;
479 495
480 $ob->reply (undef, "In the future, you will wake up here when you die."); 496 $pl->save;
481 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
482 $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 {
483 if ($_[0] !~ /^[yY]/) { 501 if ($_[0] !~ /^[yY]/) {
484 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1); 502 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1);
485 $pl->deactivate; 503 $pl->deactivate;
486 $pl->ns->destroy; 504 $pl->ns->destroy;
487 } else { 505 }
488 cf::async { $pl->save };
489 } 506 });
490 }); 507 };
491 }, 508 },
492); 509);
493 510
494cf::player->attach ( 511cf::player->attach (
495 on_login => sub { 512 on_login => sub {
… …
510 unless safe_spot $pl; 527 unless safe_spot $pl;
511 } 528 }
512 }, 529 },
513); 530);
514 531
515#############################################################################
516
517our $SCHEDULE_INTERVAL = $cf::CFG{player_schedule_interval} || 10; # time the player scheduler sleeps between runs
518our $SAVE_TIMEOUT = $cf::CFG{player_save_interval} || 20; # save players every n seconds
519
520our $SCHEDULER = cf::async_ext {
521 $Coro::current->{desc} = "player scheduler";
522
523 while () {
524 Coro::EV::timer_once $SCHEDULE_INTERVAL;
525
526 # this weird form of iteration over values is used because
527 # the hash changes underneath us frequently, and for
528 # keeps a direct reference to the value without (in 5.8 perls)
529 # keeping a reference, so this is prone to crashes or worse.
530 my @players = keys %cf::PLAYER;
531 for (@players) {
532 my $pl = $cf::PLAYER{$_}
533 or next;
534 $pl->valid or next;
535
536 eval {
537 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
538 $pl->save;
539
540 unless ($pl->active || $pl->ns) {
541 # check refcounts, this is tricky and needs to be adjusted to fit server internals
542 my $ob = $pl->ob;
543
544 my $pl_ref = $pl->refcnt_cnt;
545 my $ob_ref = $ob->refcnt_cnt;
546
547 ## pl_ref == $pl + ob->contr + %cf::PLAYER
548 ## ob_ref == $ob + pl->observe + simply being an object
549 if ($pl_ref == 3 && $ob_ref == 3) {
550 warn "player-scheduler destroy ", $ob->name;#d#
551
552 # remove from sight and get fresh "copies"
553 $pl = delete $cf::PLAYER{$ob->name};
554 $ob = $pl->ob;
555
556 $pl->destroy; # destroys $ob
557 } else {
558 my $a_ = $pl->refcnt;#d#
559 my $b_ = $ob->refcnt;#d#
560
561 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref/3 ob $ob_ref/3 (C pl $a_/1 ob $b_/2)\n";#d#
562 }
563 }
564 }
565 };
566 warn $@ if $@;
567 cf::cede_to_tick;
568 };
569 }
570};
571
572$SCHEDULER->prio (1);
573

Diff Legend

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