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.61 by root, Tue Jul 10 06:12:13 2007 UTC vs.
Revision 1.80 by root, Sun Jan 13 12:27:12 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
73 ($map, $x, $y) = $pl->savebed; 97 ($map, $x, $y) = $pl->savebed;
74 98
75 $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 (
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 (;;) {
189 Coro::Timer::sleep 0.4; 232 Coro::Timer::sleep 0.4;
190 } 233 }
191 234
192 check_playing $ns, $user and next; 235 check_playing $ns, $user and next;
193 236
237 $Coro::current->{desc} = "addme($user) pass";
238
194 $ns->send_drawinfo ( 239 $ns->send_drawinfo (
195 "Welcome $user, please enter your password now. " 240 "Welcome $user, please enter your password now. "
196 . "New users should now choose a password. " 241 . "New users should now choose a password. "
197 . "Anything your client lets you enter is fine.", 242 . "Anything your client lets you enter is fine.",
198 cf::NDI_BLUE 243 cf::NDI_BLUE
220 next; 265 next;
221 } 266 }
222 local $cf::LOGIN_LOCK{$user} = 1; 267 local $cf::LOGIN_LOCK{$user} = 1;
223 268
224 check_playing $ns, $user and next; 269 check_playing $ns, $user and next;
270
271 $Coro::current->{desc} = "addme($user) check";
225 272
226 # try to read the user file and check the password 273 # try to read the user file and check the password
227 if (my $pl = cf::player::find $user) { 274 if (my $pl = cf::player::find $user) {
228 aio_stat $pl->path and next; 275 aio_stat $pl->path and next;
229 my $mtime = (stat _)[9]; 276 my $mtime = (stat _)[9];
283 next; 330 next;
284 } 331 }
285 } 332 }
286 333
287 # the rest of this function is character creation 334 # the rest of this function is character creation
335 $Coro::current->{desc} = "addme($user) chargen";
288 336
289 # just to make sure nothing is left over 337 # just to make sure nothing is left over
290 nuke_playerdir $user; 338 nuke_playerdir $user;
291 339
292 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.";
336 384
337 $ob->set_animation (2); 385 $ob->set_animation (2);
338 $ob->add_statbonus; 386 $ob->add_statbonus;
339 387
340 while () { 388 while () {
341 $ns->send_msg (-1, "chargen-race-title", ucfirst $pl->title); 389 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
342 my $msg = $ob->msg; 390 my $msg = $ob->msg;
343 $msg =~ s/(?<=\S)\n(?=\S)/ /g; 391 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
344 $ns->send_msg (cf::NDI_BLUE, "chargen-race-description", $msg); 392 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
345 393
346 my $res = query $ns, cf::CS_QUERY_SINGLECHAR, 394 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
347 "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";
348 396
349 last if $res =~ /[dD]/; 397 last if $res =~ /[dD]/;
366 last; 414 last;
367 } 415 }
368 Coro::Timer::sleep 0.2; 416 Coro::Timer::sleep 0.2;
369 } 417 }
370 418
371 $ob->reply (undef, "Welcome to Crossfire!"); 419 $ob->reply (undef, "Welcome to Deliantra!");
372 420
373 delete $pl->{deny_save}; 421 delete $pl->{deny_save};
374 422
375 last; 423 last;
376 } 424 }
449 497
450 if ($cleanly) { 498 if ($cleanly) {
451 $_->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;
452 } else { 500 } else {
453 $_->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;
454 $pl->{unclean_save} = $cf::RUNTIME; 502 $pl->{unclean_save} = $cf::RUNTIME
503 unless safe_spot $pl;
455 } 504 }
456 }, 505 },
457); 506);
458 507
459############################################################################# 508#############################################################################
460 509
461our $SCHEDULE_INTERVAL = 10; # time the player scheduler sleeps between runs 510our $SCHEDULE_INTERVAL = $cf::CFG{player_schedule_interval} || 10; # time the player scheduler sleeps between runs
462our $SAVE_TIMEOUT = 20; # save players every n seconds 511our $SAVE_TIMEOUT = $cf::CFG{player_save_interval} || 20; # save players every n seconds
463 512
464our $SCHEDULER = cf::async_ext { 513our $SCHEDULER = cf::async_ext {
465 my $schedule_interval = Coro::Event->timer (after => 1, interval => $SCHEDULE_INTERVAL); 514 $Coro::current->{desc} = "player scheduler";
515
466 while () { 516 while () {
467 $schedule_interval->next; 517 Coro::EV::timer_once $SCHEDULE_INTERVAL;
468 518
469 # this weird form of iteration over values is used because 519 # this weird form of iteration over values is used because
470 # the hash changes underneath us frequently, and for 520 # the hash changes underneath us frequently, and for
471 # keeps a direct reference to the value without (in 5.8 perls) 521 # keeps a direct reference to the value without (in 5.8 perls)
472 # keeping a reference, so this is prone to crashes or worse. 522 # keeping a reference, so this is prone to crashes or worse.
476 or next; 526 or next;
477 $pl->valid or next; 527 $pl->valid or next;
478 528
479 eval { 529 eval {
480 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) { 530 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
481 cf::wait_for_tick_begin;
482 $pl->save; 531 $pl->save;
483 532
484 unless ($pl->active || $pl->ns) { 533 unless ($pl->active || $pl->ns) {
485 # check refcounts, this is tricky and needs to be adjusted to fit server internals 534 # check refcounts, this is tricky and needs to be adjusted to fit server internals
486 my $ob = $pl->ob; 535 my $ob = $pl->ob;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines