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

Diff Legend

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