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.63 by root, Sat Jul 14 14:54:05 2007 UTC vs.
Revision 1.79 by root, Sun Jan 13 09:19:56 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}) { 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
75 ($map, $x, $y) = $pl->savebed; 97 ($map, $x, $y) = $pl->savebed;
76 98
77 $pl->ns->send_drawinfo ( 99 if ($age >= $MAX_DISCONNECT_TIME) {
100 $ob->message (
101 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
102 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
103 . "Maybe you can find comfort in the thought that your body was quite satisfying in taste... "
104 . "H<You disconnected too long without having used a savebed.>",
105 cf::NDI_RED
106 );
107 # kill them.
108 # reminds me of the famous badness 10000 syndrome...
109 $ob->stats->hp (-10000); #] if they survive this they deserved to live
110 $pl->killer ("a cave-in");
111 } else {
112 $ob->message (
78 "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. "
79 . "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. "
80 . "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.>",
81 cf::NDI_RED 117 cf::NDI_RED
82 ); 118 );
119 }
83 } else { 120 } else {
84 $pl->ns->send_drawinfo ( 121 $ob->message (
85 "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, "
86 . "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, "
87 . "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.>",
88 cf::NDI_RED 126 cf::NDI_RED
89 ); 127 );
90 }
91 } 128 }
92 } 129 }
93 130
94 $ob->goto ($map, $x, $y); 131 $ob->goto ($map, $x, $y);
95} 132}
97# delete a player directory, be non-blocking AND synchronous... 134# delete a player directory, be non-blocking AND synchronous...
98# (thats hard, so we crap out and fork). 135# (thats hard, so we crap out and fork).
99sub nuke_playerdir { 136sub nuke_playerdir {
100 my ($user) = @_; 137 my ($user) = @_;
101 138
102 aio_stat "$PLAYERDIR/$user"; 139 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
103 system "cd \Q$PLAYERDIR\E " 140
104 . "&& mv \Q$user\E ~\Q$Coro::current\E~deleting~ 2>/dev/null " 141 cf::fork_call {
105 . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)"; 142 rename "$PLAYERDIR/$user", $temp;
143 system "rm", "-rf", $temp;
144 };
106} 145}
107 146
108cf::client->attach (on_addme => sub { 147cf::client->attach (on_addme => sub {
109 my ($ns) = @_; 148 my ($ns) = @_;
110 149
119*** or it has been disabled. Face caching is mandatory 158*** or it has been disabled. Face caching is mandatory
120*** so please enable it or use a newer client. 159*** so please enable it or use a newer client.
121*** 160***
122*** Look at your client preferences: 161*** Look at your client preferences:
123*** 162***
124*** CFPlus: all known versions automatically enable the facecache. 163*** deliantra: all known versions automatically enable the facecache.
125*** cfclient: use the -cache commandline option. 164*** cfclient: use the -cache commandline option.
126*** cfclient: map will not redraw automatically (bug). 165*** cfclient: map will not redraw automatically (bug).
127*** gcfclient: use -cache commandline option, or enable 166*** gcfclient: use -cache commandline option, or enable
128*** gcfclient: Client=>Configure=>Map & Image=>Cache Images. 167*** gcfclient: Client => Configure => Map & Image => Cache Images.
129*** jcrossclient: your client is broken, use CFPlus or gcfclient. 168*** jcrossclient: your client is broken, use deliantra or gcfclient.
130*** 169***
131*** 170***
132EOF 171EOF
133 if ($ns->version =~ /jcrossclient/) { 172 if ($ns->version =~ /jcrossclient/) {
134 # let them, for now 173 # let them, for now
154 } 193 }
155 194
156 $ns->pl and return $ns->destroy; 195 $ns->pl and return $ns->destroy;
157 196
158 $ns->async (sub { 197 $ns->async (sub {
198 $Coro::current->{desc} = "addme init";
199
159 my ($user, $pass); 200 my ($user, $pass);
160 201
161 $ns->send_packet ("addme_success"); 202 $ns->send_packet ("addme_success");
162 203
163 for (;;) { 204 for (;;) {
191 Coro::Timer::sleep 0.4; 232 Coro::Timer::sleep 0.4;
192 } 233 }
193 234
194 check_playing $ns, $user and next; 235 check_playing $ns, $user and next;
195 236
237 $Coro::current->{desc} = "addme($user) pass";
238
196 $ns->send_drawinfo ( 239 $ns->send_drawinfo (
197 "Welcome $user, please enter your password now. " 240 "Welcome $user, please enter your password now. "
198 . "New users should now choose a password. " 241 . "New users should now choose a password. "
199 . "Anything your client lets you enter is fine.", 242 . "Anything your client lets you enter is fine.",
200 cf::NDI_BLUE 243 cf::NDI_BLUE
222 next; 265 next;
223 } 266 }
224 local $cf::LOGIN_LOCK{$user} = 1; 267 local $cf::LOGIN_LOCK{$user} = 1;
225 268
226 check_playing $ns, $user and next; 269 check_playing $ns, $user and next;
270
271 $Coro::current->{desc} = "addme($user) check";
227 272
228 # try to read the user file and check the password 273 # try to read the user file and check the password
229 if (my $pl = cf::player::find $user) { 274 if (my $pl = cf::player::find $user) {
230 aio_stat $pl->path and next; 275 aio_stat $pl->path and next;
231 my $mtime = (stat _)[9]; 276 my $mtime = (stat _)[9];
285 next; 330 next;
286 } 331 }
287 } 332 }
288 333
289 # the rest of this function is character creation 334 # the rest of this function is character creation
335 $Coro::current->{desc} = "addme($user) chargen";
290 336
291 # just to make sure nothing is left over 337 # just to make sure nothing is left over
292 nuke_playerdir $user; 338 nuke_playerdir $user;
293 339
294 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.";
338 384
339 $ob->set_animation (2); 385 $ob->set_animation (2);
340 $ob->add_statbonus; 386 $ob->add_statbonus;
341 387
342 while () { 388 while () {
343 $ns->send_msg (-1, "chargen-race-title", ucfirst $pl->title); 389 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
344 my $msg = $ob->msg; 390 my $msg = $ob->msg;
345 $msg =~ s/(?<=\S)\n(?=\S)/ /g; 391 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
346 $ns->send_msg (cf::NDI_BLUE, "chargen-race-description", $msg); 392 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
347 393
348 my $res = query $ns, cf::CS_QUERY_SINGLECHAR, 394 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"; 395 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
350 396
351 last if $res =~ /[dD]/; 397 last if $res =~ /[dD]/;
368 last; 414 last;
369 } 415 }
370 Coro::Timer::sleep 0.2; 416 Coro::Timer::sleep 0.2;
371 } 417 }
372 418
373 $ob->reply (undef, "Welcome to Crossfire!"); 419 $ob->reply (undef, "Welcome to Deliantra!");
374 420
375 delete $pl->{deny_save}; 421 delete $pl->{deny_save};
376 422
377 last; 423 last;
378 } 424 }
451 497
452 if ($cleanly) { 498 if ($cleanly) {
453 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 499 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
454 } else { 500 } else {
455 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 501 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
502 warn "unclean\n" unless safe_spot $pl;#d#
456 $pl->{unclean_save} = $cf::RUNTIME; 503 $pl->{unclean_save} = $cf::RUNTIME
504 unless safe_spot $pl;
457 } 505 }
458 }, 506 },
459); 507);
460 508
461############################################################################# 509#############################################################################
462 510
463our $SCHEDULE_INTERVAL = 10; # time the player scheduler sleeps between runs 511our $SCHEDULE_INTERVAL = $cf::CFG{player_schedule_interval} || 10; # time the player scheduler sleeps between runs
464our $SAVE_TIMEOUT = 20; # save players every n seconds 512our $SAVE_TIMEOUT = $cf::CFG{player_save_interval} || 20; # save players every n seconds
465 513
466our $SCHEDULER = cf::async_ext { 514our $SCHEDULER = cf::async_ext {
467 my $schedule_interval = Coro::Event->timer (after => 1, interval => $SCHEDULE_INTERVAL); 515 $Coro::current->{desc} = "player scheduler";
516
468 while () { 517 while () {
469 $schedule_interval->next; 518 Coro::EV::timer_once $SCHEDULE_INTERVAL;
470 519
471 # this weird form of iteration over values is used because 520 # this weird form of iteration over values is used because
472 # the hash changes underneath us frequently, and for 521 # the hash changes underneath us frequently, and for
473 # keeps a direct reference to the value without (in 5.8 perls) 522 # keeps a direct reference to the value without (in 5.8 perls)
474 # keeping a reference, so this is prone to crashes or worse. 523 # keeping a reference, so this is prone to crashes or worse.
478 or next; 527 or next;
479 $pl->valid or next; 528 $pl->valid or next;
480 529
481 eval { 530 eval {
482 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) { 531 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
483 cf::wait_for_tick_begin;
484 $pl->save; 532 $pl->save;
485 533
486 unless ($pl->active || $pl->ns) { 534 unless ($pl->active || $pl->ns) {
487 # check refcounts, this is tricky and needs to be adjusted to fit server internals 535 # check refcounts, this is tricky and needs to be adjusted to fit server internals
488 my $ob = $pl->ob; 536 my $ob = $pl->ob;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines