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.62 by root, Sat Jul 14 14:33:29 2007 UTC vs.
Revision 1.84 by root, Wed Apr 30 06:40:28 2008 UTC

2 2
3# login handling 3# login handling
4 4
5use Fcntl; 5use Fcntl;
6use Coro::AIO; 6use Coro::AIO;
7
8our $MAX_DISCONNECT_TIME = $cf::CFG{max_disconnect_time} || 3600;
7 9
8# paranoia function to overwrite a string-in-place 10# paranoia function to overwrite a string-in-place
9sub nuke_str { 11sub nuke_str {
10 substr $_[0], 0, (length $_[0]), "x" x length $_[0] 12 substr $_[0], 0, (length $_[0]), "x" x length $_[0]
11} 13}
50 ); 52 );
51 53
52 1 54 1
53} 55}
54 56
57sub safe_spot($) {
58 my ($pl) = @_;
59
60 my $ob = $pl->ob;
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
55sub enter_map { 75sub enter_map {
56 my ($pl) = @_; 76 my ($pl) = @_;
57 77
58 my $ob = $pl->ob; 78 my $ob = $pl->ob;
59 79
62 ? @{delete $ob->{_link_pos}} 82 ? @{delete $ob->{_link_pos}}
63 : ($pl->maplevel, $ob->x, $ob->y); 83 : ($pl->maplevel, $ob->x, $ob->y);
64 84
65 $ob->enter_link; 85 $ob->enter_link;
66 86
87 my $m = cf::map::find $map;
67 if (my $time = delete $pl->{unclean_save}) { 88 my $time = delete $pl->{unclean_save};
68 if (my $m = cf::map::find $map) { 89
90 if ($time && $m) {
69 if ($time < $m->{instantiate_time} || 1) {#d# 91 if ($time < $m->{instantiate_time}) {
70 # the map was reset in the meantime 92 # the map was reset in the meantime
71 my $age = $cf::RUNTIME - $time; 93 my $age = $cf::RUNTIME - $time;
94
72 warn $ob->name, " map reset after logout, logout age $age\n";#d# 95 warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
73 96
74 # for now, just go back to savebed 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 my $killer = cf::arch::get "killer_login";
109 $pl->killer ($killer);
110 $killer->destroy;
111 } else {
75 ($map, $x, $y) = $pl->savebed; 112 ($map, $x, $y) = $pl->savebed;
76 113
77 $pl->ns->send_drawinfo ( 114 $ob->message (
78 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. " 115 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
79 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. " 116 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
80 . "Better use a savebed next time, much worse things could have happened...", 117 . "Better use a savebed next time, much worse things could have happened... "
118 . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>",
81 cf::NDI_RED 119 cf::NDI_RED
82 ); 120 );
121 }
83 } else { 122 } else {
84 $pl->ns->send_drawinfo ( 123 $ob->message (
85 "You didn't use a bed to reality to leave this realm. This is very dangerous, " 124 "You didn't use a bed to reality to leave this realm. This is very dangerous, "
86 . "as lots of things could happen when you leave by other means, such as cave-ins, " 125 . "as lots of things could happen when you leave by other means, such as cave-ins, "
87 . "or monsters suddenly snapping your body. Better use a savebed next time.", 126 . "or monsters suddenly snapping your body. Better use a savebed next time. "
127 . "H<Always apply a bed of reality to disconnect from the server.>",
88 cf::NDI_RED 128 cf::NDI_RED
89 ); 129 );
90 }
91 } 130 }
92 } 131 }
93 132
94 $ob->goto ($map, $x, $y); 133 $ob->goto ($map, $x, $y);
95} 134}
97# delete a player directory, be non-blocking AND synchronous... 136# delete a player directory, be non-blocking AND synchronous...
98# (thats hard, so we crap out and fork). 137# (thats hard, so we crap out and fork).
99sub nuke_playerdir { 138sub nuke_playerdir {
100 my ($user) = @_; 139 my ($user) = @_;
101 140
102 aio_stat "$PLAYERDIR/$user"; 141 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
103 system "cd \Q$PLAYERDIR\E " 142
104 . "&& mv \Q$user\E ~\Q$Coro::current\E~deleting~ 2>/dev/null " 143 cf::fork_call {
105 . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)"; 144 rename "$PLAYERDIR/$user", $temp;
145 system "rm", "-rf", $temp;
146 };
106} 147}
107 148
108cf::client->attach (on_addme => sub { 149cf::client->attach (on_addme => sub {
109 my ($ns) = @_; 150 my ($ns) = @_;
110 151
119*** or it has been disabled. Face caching is mandatory 160*** or it has been disabled. Face caching is mandatory
120*** so please enable it or use a newer client. 161*** so please enable it or use a newer client.
121*** 162***
122*** Look at your client preferences: 163*** Look at your client preferences:
123*** 164***
124*** CFPlus: all known versions automatically enable the facecache. 165*** deliantra: all known versions automatically enable the facecache.
125*** cfclient: use the -cache commandline option. 166*** cfclient: use the -cache commandline option.
126*** cfclient: map will not redraw automatically (bug). 167*** cfclient: map will not redraw automatically (bug).
127*** gcfclient: use -cache commandline option, or enable 168*** gcfclient: use -cache commandline option, or enable
128*** gcfclient: Client=>Configure=>Map & Image=>Cache Images. 169*** gcfclient: Client => Configure => Map & Image => Cache Images.
129*** jcrossclient: your client is broken, use CFPlus or gcfclient. 170*** jcrossclient: your client is broken, use deliantra or gcfclient.
130*** 171***
131*** 172***
132EOF 173EOF
133 if ($ns->version =~ /jcrossclient/) { 174 if ($ns->version =~ /jcrossclient/) {
134 # let them, for now 175 # let them, for now
154 } 195 }
155 196
156 $ns->pl and return $ns->destroy; 197 $ns->pl and return $ns->destroy;
157 198
158 $ns->async (sub { 199 $ns->async (sub {
200 $Coro::current->{desc} = "addme init";
201
159 my ($user, $pass); 202 my ($user, $pass);
160 203
161 $ns->send_packet ("addme_success"); 204 $ns->send_packet ("addme_success");
162 205
163 for (;;) { 206 for (;;) {
191 Coro::Timer::sleep 0.4; 234 Coro::Timer::sleep 0.4;
192 } 235 }
193 236
194 check_playing $ns, $user and next; 237 check_playing $ns, $user and next;
195 238
239 $Coro::current->{desc} = "addme($user) pass";
240
196 $ns->send_drawinfo ( 241 $ns->send_drawinfo (
197 "Welcome $user, please enter your password now. " 242 "Welcome $user, please enter your password now. "
198 . "New users should now choose a password. " 243 . "New users should now choose a password. "
199 . "Anything your client lets you enter is fine.", 244 . "Anything your client lets you enter is fine.",
200 cf::NDI_BLUE 245 cf::NDI_BLUE
222 next; 267 next;
223 } 268 }
224 local $cf::LOGIN_LOCK{$user} = 1; 269 local $cf::LOGIN_LOCK{$user} = 1;
225 270
226 check_playing $ns, $user and next; 271 check_playing $ns, $user and next;
272
273 $Coro::current->{desc} = "addme($user) check";
227 274
228 # try to read the user file and check the password 275 # try to read the user file and check the password
229 if (my $pl = cf::player::find $user) { 276 if (my $pl = cf::player::find $user) {
230 aio_stat $pl->path and next; 277 aio_stat $pl->path and next;
231 my $mtime = (stat _)[9]; 278 my $mtime = (stat _)[9];
285 next; 332 next;
286 } 333 }
287 } 334 }
288 335
289 # the rest of this function is character creation 336 # the rest of this function is character creation
337 $Coro::current->{desc} = "addme($user) chargen";
290 338
291 # just to make sure nothing is left over 339 # just to make sure nothing is left over
292 nuke_playerdir $user; 340 nuke_playerdir $user;
293 341
294 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again."; 342 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
338 386
339 $ob->set_animation (2); 387 $ob->set_animation (2);
340 $ob->add_statbonus; 388 $ob->add_statbonus;
341 389
342 while () { 390 while () {
343 $ns->send_msg (-1, "chargen-race-title", ucfirst $pl->title); 391 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
344 my $msg = $ob->msg; 392 my $msg = $ob->msg;
345 $msg =~ s/(?<=\S)\n(?=\S)/ /g; 393 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
346 $ns->send_msg (cf::NDI_BLUE, "chargen-race-description", $msg); 394 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
347 395
348 my $res = query $ns, cf::CS_QUERY_SINGLECHAR, 396 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
349 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n"; 397 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
350 398
351 last if $res =~ /[dD]/; 399 last if $res =~ /[dD]/;
368 last; 416 last;
369 } 417 }
370 Coro::Timer::sleep 0.2; 418 Coro::Timer::sleep 0.2;
371 } 419 }
372 420
373 $ob->reply (undef, "Welcome to Crossfire!"); 421 $ob->reply (undef, "Welcome to Deliantra!");
374 422
375 delete $pl->{deny_save}; 423 delete $pl->{deny_save};
376 424
377 last; 425 last;
378 } 426 }
419 467
420 # update respawn position 468 # update respawn position
421 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 469 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
422 cf::async { $pl->save }; 470 cf::async { $pl->save };
423 471
472 my $killer = cf::arch::get "killer_logout";
424 $pl->killer ("left"); 473 $pl->killer ($killer);
474 $killer->destroy;
425 $ob->check_score; 475 $ob->check_score;
426 476
427 $ob->reply (undef, "In the future, you will wake up here when you die."); 477 $ob->reply (undef, "In the future, you will wake up here when you die.");
428 478
429 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub { 479 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
451 501
452 if ($cleanly) { 502 if ($cleanly) {
453 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 503 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
454 } else { 504 } else {
455 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 505 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
456 $pl->{unclean_save} = $cf::RUNTIME; 506 $pl->{unclean_save} = $cf::RUNTIME
507 unless safe_spot $pl;
457 } 508 }
458 }, 509 },
459); 510);
460 511
461############################################################################# 512#############################################################################
462 513
463our $SCHEDULE_INTERVAL = 10; # time the player scheduler sleeps between runs 514our $SCHEDULE_INTERVAL = $cf::CFG{player_schedule_interval} || 10; # time the player scheduler sleeps between runs
464our $SAVE_TIMEOUT = 20; # save players every n seconds 515our $SAVE_TIMEOUT = $cf::CFG{player_save_interval} || 20; # save players every n seconds
465 516
466our $SCHEDULER = cf::async_ext { 517our $SCHEDULER = cf::async_ext {
467 my $schedule_interval = Coro::Event->timer (after => 1, interval => $SCHEDULE_INTERVAL); 518 $Coro::current->{desc} = "player scheduler";
519
468 while () { 520 while () {
469 $schedule_interval->next; 521 Coro::EV::timer_once $SCHEDULE_INTERVAL;
470 522
471 # this weird form of iteration over values is used because 523 # this weird form of iteration over values is used because
472 # the hash changes underneath us frequently, and for 524 # the hash changes underneath us frequently, and for
473 # keeps a direct reference to the value without (in 5.8 perls) 525 # keeps a direct reference to the value without (in 5.8 perls)
474 # keeping a reference, so this is prone to crashes or worse. 526 # keeping a reference, so this is prone to crashes or worse.
478 or next; 530 or next;
479 $pl->valid or next; 531 $pl->valid or next;
480 532
481 eval { 533 eval {
482 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) { 534 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
483 cf::wait_for_tick_begin;
484 $pl->save; 535 $pl->save;
485 536
486 unless ($pl->active || $pl->ns) { 537 unless ($pl->active || $pl->ns) {
487 # check refcounts, this is tricky and needs to be adjusted to fit server internals 538 # check refcounts, this is tricky and needs to be adjusted to fit server internals
488 my $ob = $pl->ob; 539 my $ob = $pl->ob;
502 $pl->destroy; # destroys $ob 553 $pl->destroy; # destroys $ob
503 } else { 554 } else {
504 my $a_ = $pl->refcnt;#d# 555 my $a_ = $pl->refcnt;#d#
505 my $b_ = $ob->refcnt;#d# 556 my $b_ = $ob->refcnt;#d#
506 557
507 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref ob $ob_ref (C pl $a_ ob $b_)\n";#d# 558 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref/3 ob $ob_ref/3 (C pl $a_/1 ob $b_/2)\n";#d#
508 } 559 }
509 } 560 }
510 } 561 }
511 }; 562 };
512 warn $@ if $@; 563 warn $@ if $@;
513 Coro::cede; 564 cf::cede_to_tick;
514 }; 565 };
515 } 566 }
516}; 567};
517 568
518$SCHEDULER->prio (1); 569$SCHEDULER->prio (1);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines