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.60 by root, Thu Jul 5 20:52:22 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
78 my $ob = $pl->ob;
79
58 my ($map, $x, $y) 80 my ($map, $x, $y)
59 = $pl->ob->{_link_pos} 81 = $ob->{_link_pos}
60 ? @{delete $pl->ob->{_link_pos}} 82 ? @{delete $ob->{_link_pos}}
61 : ($pl->maplevel, $pl->ob->x, $pl->ob->y); 83 : ($pl->maplevel, $ob->x, $ob->y);
62 84
63 $pl->ob->enter_link; 85 $ob->enter_link;
64 86
87 my $m = cf::map::find $map;
65 if (my $time = delete $pl->{unclean_save}) { 88 my $time = delete $pl->{unclean_save};
66 if (my $m = cf::map::find $map) { 89
90 if ($time && $m) {
67 if ($time < $m->{instantiate_time}) { 91 if ($time < $m->{instantiate_time}) {
68 # the map was reset in the meantime 92 # the map was reset in the meantime
69 my $age = $cf::RUNTIME - $time; 93 my $age = $cf::RUNTIME - $time;
94
70 warn $pl->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#
71 96
72 # 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 {
73 ($map, $x, $y) = $pl->savebed; 112 ($map, $x, $y) = $pl->savebed;
74 113
75 $pl->ns->send_drawinfo ( 114 $ob->message (
76 "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. "
77 . "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. "
78 . "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.>",
79 cf::NDI_RED 119 cf::NDI_RED
80 ); 120 );
121 }
81 } else { 122 } else {
82 $pl->ns->send_drawinfo ( 123 $ob->message (
83 "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, "
84 . "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, "
85 . "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.>",
86 cf::NDI_RED 128 cf::NDI_RED
87 ); 129 );
88 }
89 } 130 }
90 } 131 }
91 132
92 $pl->ob->goto ($map, $x, $y); 133 $ob->goto ($map, $x, $y);
93} 134}
94 135
95# delete a player directory, be non-blocking AND synchronous... 136# delete a player directory, be non-blocking AND synchronous...
96# (thats hard, so we crap out and fork). 137# (thats hard, so we crap out and fork).
97sub nuke_playerdir { 138sub nuke_playerdir {
98 my ($user) = @_; 139 my ($user) = @_;
99 140
100 aio_stat "$PLAYERDIR/$user"; 141 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
101 system "cd \Q$PLAYERDIR\E " 142
102 . "&& mv \Q$user\E ~\Q$Coro::current\E~deleting~ 2>/dev/null " 143 cf::fork_call {
103 . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)"; 144 rename "$PLAYERDIR/$user", $temp;
145 system "rm", "-rf", $temp;
146 };
104} 147}
105 148
106cf::client->attach (on_addme => sub { 149cf::client->attach (on_addme => sub {
107 my ($ns) = @_; 150 my ($ns) = @_;
108 151
… …
117*** or it has been disabled. Face caching is mandatory 160*** or it has been disabled. Face caching is mandatory
118*** so please enable it or use a newer client. 161*** so please enable it or use a newer client.
119*** 162***
120*** Look at your client preferences: 163*** Look at your client preferences:
121*** 164***
122*** CFPlus: all known versions automatically enable the facecache. 165*** deliantra: all known versions automatically enable the facecache.
123*** cfclient: use the -cache commandline option. 166*** cfclient: use the -cache commandline option.
124*** cfclient: map will not redraw automatically (bug). 167*** cfclient: map will not redraw automatically (bug).
125*** gcfclient: use -cache commandline option, or enable 168*** gcfclient: use -cache commandline option, or enable
126*** gcfclient: Client=>Configure=>Map & Image=>Cache Images. 169*** gcfclient: Client => Configure => Map & Image => Cache Images.
127*** jcrossclient: your client is broken, use CFPlus or gcfclient. 170*** jcrossclient: your client is broken, use deliantra or gcfclient.
128*** 171***
129*** 172***
130EOF 173EOF
131 if ($ns->version =~ /jcrossclient/) { 174 if ($ns->version =~ /jcrossclient/) {
132 # let them, for now 175 # let them, for now
… …
152 } 195 }
153 196
154 $ns->pl and return $ns->destroy; 197 $ns->pl and return $ns->destroy;
155 198
156 $ns->async (sub { 199 $ns->async (sub {
200 $Coro::current->{desc} = "addme init";
201
157 my ($user, $pass); 202 my ($user, $pass);
158 203
159 $ns->send_packet ("addme_success"); 204 $ns->send_packet ("addme_success");
160 205
161 for (;;) { 206 for (;;) {
… …
184 . "(only a-z, A-Z and 0-9 are allowed), " 229 . "(only a-z, A-Z and 0-9 are allowed), "
185 . "or is not between 3 and 18 characters in length.", 230 . "or is not between 3 and 18 characters in length.",
186 cf::NDI_RED 231 cf::NDI_RED
187 ); 232 );
188 } 233 }
234 Coro::Timer::sleep 0.4;
189 } 235 }
190 236
191 check_playing $ns, $user and next; 237 check_playing $ns, $user and next;
238
239 $Coro::current->{desc} = "addme($user) pass";
192 240
193 $ns->send_drawinfo ( 241 $ns->send_drawinfo (
194 "Welcome $user, please enter your password now. " 242 "Welcome $user, please enter your password now. "
195 . "New users should now choose a password. " 243 . "New users should now choose a password. "
196 . "Anything your client lets you enter is fine.", 244 . "Anything your client lets you enter is fine.",
… …
204 $ns->send_drawinfo ( 252 $ns->send_drawinfo (
205 "Try to use at least three characters as your password please, " 253 "Try to use at least three characters as your password please, "
206 . "that cannot be too much to ask for :)", 254 . "that cannot be too much to ask for :)",
207 cf::NDI_RED 255 cf::NDI_RED
208 ); 256 );
257 Coro::Timer::sleep 0.4;
209 } 258 }
210 259
211 # lock this username for the remainder of this login session 260 # lock this username for the remainder of this login session
212 if ($cf::LOGIN_LOCK{$user}) { 261 if ($cf::LOGIN_LOCK{$user}) {
213 $ns->send_drawinfo ( 262 $ns->send_drawinfo (
… …
218 next; 267 next;
219 } 268 }
220 local $cf::LOGIN_LOCK{$user} = 1; 269 local $cf::LOGIN_LOCK{$user} = 1;
221 270
222 check_playing $ns, $user and next; 271 check_playing $ns, $user and next;
272
273 $Coro::current->{desc} = "addme($user) check";
223 274
224 # try to read the user file and check the password 275 # try to read the user file and check the password
225 if (my $pl = cf::player::find $user) { 276 if (my $pl = cf::player::find $user) {
226 aio_stat $pl->path and next; 277 aio_stat $pl->path and next;
227 my $mtime = (stat _)[9]; 278 my $mtime = (stat _)[9];
… …
281 next; 332 next;
282 } 333 }
283 } 334 }
284 335
285 # the rest of this function is character creation 336 # the rest of this function is character creation
337 $Coro::current->{desc} = "addme($user) chargen";
286 338
287 # just to make sure nothing is left over 339 # just to make sure nothing is left over
288 nuke_playerdir $user; 340 nuke_playerdir $user;
289 341
290 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.";
… …
294 nuke_str $pass2; 346 nuke_str $pass2;
295 $ns->send_drawinfo ( 347 $ns->send_drawinfo (
296 "The passwords do not match, please try again.", 348 "The passwords do not match, please try again.",
297 cf::NDI_RED 349 cf::NDI_RED
298 ); 350 );
351 Coro::Timer::sleep 0.5;
299 next; 352 next;
300 } 353 }
301 354
302 nuke_str $pass2; 355 nuke_str $pass2;
303 356
… …
325 $ob->swap_stats ($res - 1, $swap - 1); 378 $ob->swap_stats ($res - 1, $swap - 1);
326 } 379 }
327 } else { 380 } else {
328 $ob->roll_stats; 381 $ob->roll_stats;
329 } 382 }
383
384 Coro::Timer::sleep 0.2;
330 } 385 }
331 386
332 $ob->set_animation (2); 387 $ob->set_animation (2);
333 $ob->add_statbonus; 388 $ob->add_statbonus;
334 389
335 while () { 390 while () {
336 $ns->send_msg (-1, "chargen-race-title", ucfirst $pl->title); 391 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
337 my $msg = $ob->msg; 392 my $msg = $ob->msg;
338 $msg =~ s/(?<=\S)\n(?=\S)/ /g; 393 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
339 $ns->send_msg (cf::NDI_BLUE, "chargen-race-description", $msg); 394 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
340 395
341 my $res = query $ns, cf::CS_QUERY_SINGLECHAR, 396 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
342 "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";
343 398
344 last if $res =~ /[dD]/; 399 last if $res =~ /[dD]/;
345 400
346 $pl->chargen_race_next; 401 $pl->chargen_race_next;
402 Coro::Timer::sleep 0.2;
347 } 403 }
348 404
349 $pl->chargen_race_done; 405 $pl->chargen_race_done;
350 406
351 while () { 407 while () {
… …
357 last; 413 last;
358 } elsif ($res =~ /^[mM]/) { 414 } elsif ($res =~ /^[mM]/) {
359 $pl->gender (0); 415 $pl->gender (0);
360 last; 416 last;
361 } 417 }
418 Coro::Timer::sleep 0.2;
362 } 419 }
363 420
364 $ob->reply (undef, "Welcome to Crossfire!"); 421 $ob->reply (undef, "Welcome to Deliantra!");
365 422
366 delete $pl->{deny_save}; 423 delete $pl->{deny_save};
367 424
368 last; 425 last;
369 } 426 }
… …
410 467
411 # update respawn position 468 # update respawn position
412 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 469 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
413 cf::async { $pl->save }; 470 cf::async { $pl->save };
414 471
472 my $killer = cf::arch::get "killer_logout";
415 $pl->killer ("left"); 473 $pl->killer ($killer);
474 $killer->destroy;
416 $ob->check_score; 475 $ob->check_score;
417 476
418 $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.");
419 478
420 $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 {
… …
442 501
443 if ($cleanly) { 502 if ($cleanly) {
444 $_->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;
445 } else { 504 } else {
446 $_->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;
447 $pl->{unclean_save} = $cf::RUNTIME; 506 $pl->{unclean_save} = $cf::RUNTIME
507 unless safe_spot $pl;
448 } 508 }
449 }, 509 },
450); 510);
451 511
452############################################################################# 512#############################################################################
453 513
454our $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
455our $SAVE_TIMEOUT = 20; # save players every n seconds 515our $SAVE_TIMEOUT = $cf::CFG{player_save_interval} || 20; # save players every n seconds
456 516
457our $SCHEDULER = cf::async_ext { 517our $SCHEDULER = cf::async_ext {
458 my $schedule_interval = Coro::Event->timer (after => 1, interval => $SCHEDULE_INTERVAL); 518 $Coro::current->{desc} = "player scheduler";
519
459 while () { 520 while () {
460 $schedule_interval->next; 521 Coro::EV::timer_once $SCHEDULE_INTERVAL;
461 522
462 # this weird form of iteration over values is used because 523 # this weird form of iteration over values is used because
463 # the hash changes underneath us frequently, and for 524 # the hash changes underneath us frequently, and for
464 # 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)
465 # keeping a reference, so this is prone to crashes or worse. 526 # keeping a reference, so this is prone to crashes or worse.
… …
469 or next; 530 or next;
470 $pl->valid or next; 531 $pl->valid or next;
471 532
472 eval { 533 eval {
473 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) { 534 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
474 cf::wait_for_tick_begin;
475 $pl->save; 535 $pl->save;
476 536
477 unless ($pl->active || $pl->ns) { 537 unless ($pl->active || $pl->ns) {
478 # 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
479 my $ob = $pl->ob; 539 my $ob = $pl->ob;
… …
493 $pl->destroy; # destroys $ob 553 $pl->destroy; # destroys $ob
494 } else { 554 } else {
495 my $a_ = $pl->refcnt;#d# 555 my $a_ = $pl->refcnt;#d#
496 my $b_ = $ob->refcnt;#d# 556 my $b_ = $ob->refcnt;#d#
497 557
498 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#
499 } 559 }
500 } 560 }
501 } 561 }
502 }; 562 };
503 warn $@ if $@; 563 warn $@ if $@;
504 Coro::cede; 564 cf::cede_to_tick;
505 }; 565 };
506 } 566 }
507}; 567};
508 568
509$SCHEDULER->prio (1); 569$SCHEDULER->prio (1);

Diff Legend

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