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.92 by root, Mon Sep 22 01:33:09 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 warn $pl->ob->name, ": enter map 1\n";#d#
79 my $ob = $pl->ob;
80
58 my ($map, $x, $y) 81 my ($map, $x, $y)
59 = $pl->ob->{_link_pos} 82 = $ob->{_link_pos}
60 ? @{delete $pl->ob->{_link_pos}} 83 ? @{delete $ob->{_link_pos}}
61 : ($pl->maplevel, $pl->ob->x, $pl->ob->y); 84 : ($pl->maplevel, $ob->x, $ob->y);
62 85
86 warn $pl->ob->name, ": enter map 2\n";#d#
63 $pl->ob->enter_link; 87 $ob->enter_link;
88 warn $pl->ob->name, ": enter map 3\n";#d#
64 89
90 my $m = cf::map::find $map;
65 if (my $time = delete $pl->{unclean_save}) { 91 my $time = delete $pl->{unclean_save};
66 if (my $m = cf::map::find $map) { 92 warn $pl->ob->name, ": enter map 4\n";#d#
93
94 if ($time && $m) {
67 if ($time < $m->{instantiate_time}) { 95 if ($time < $m->{instantiate_time}) {
68 # the map was reset in the meantime 96 # the map was reset in the meantime
69 my $age = $cf::RUNTIME - $time; 97 my $age = $cf::RUNTIME - $time;
98
70 warn $pl->ob->name, " map reset after logout, logout age $age\n";#d# 99 warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
71 100
72 # for now, just go back to savebed 101 if ($age >= $MAX_DISCONNECT_TIME) {
102 $ob->message (
103 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
104 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
105 . "Maybe you can find comfort in the thought that your body was quite satisfying in taste... "
106 . "H<You disconnected too long without having used a savebed.>",
107 cf::NDI_RED
108 );
109 # kill them.
110 # reminds me of the famous badness 10000 syndrome...
111 $ob->stats->hp (-10000); #] if they survive this they deserved to live
112 my $killer = cf::arch::get "killer_login"; $pl->killer ($killer); $killer->destroy;
113 } else {
73 ($map, $x, $y) = $pl->savebed; 114 ($map, $x, $y) = $pl->savebed;
74 115
75 $pl->ns->send_drawinfo ( 116 $ob->message (
76 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. " 117 "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. " 118 . "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...", 119 . "Better use a savebed next time, much worse things could have happened... "
120 . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>",
79 cf::NDI_RED 121 cf::NDI_RED
80 ); 122 );
123 }
81 } else { 124 } else {
82 $pl->ns->send_drawinfo ( 125 $ob->message (
83 "You didn't use a bed to reality to leave this realm. This is very dangerous, " 126 "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, " 127 . "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.", 128 . "or monsters suddenly snapping your body. Better use a savebed next time. "
129 . "H<Always apply a bed of reality to disconnect from the server.>",
86 cf::NDI_RED 130 cf::NDI_RED
87 ); 131 );
88 }
89 } 132 }
90 } 133 }
91 134
135 warn $pl->ob->name, ": enter map 5\n";#d#
92 $pl->ob->goto ($map, $x, $y); 136 #$ob->goto ($map, $x, $y);
137 $ob->goto ($map, $x, $y, sub {
138 warn $pl->ob->name, ": enter map check\n";#d#
139 $_[0]
140 }, sub {
141 warn $pl->ob->name, ": enter map done\n";#d#
142 });
143 warn $pl->ob->name, ": enter map 6\n";#d#
144
93} 145}
94 146
95# delete a player directory, be non-blocking AND synchronous... 147# delete a player directory, be non-blocking AND synchronous...
96# (thats hard, so we crap out and fork). 148# (thats hard, so we crap out and fork).
97sub nuke_playerdir { 149sub nuke_playerdir {
98 my ($user) = @_; 150 my ($user) = @_;
99 151
100 aio_stat "$PLAYERDIR/$user"; 152 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
101 system "cd \Q$PLAYERDIR\E " 153
102 . "&& mv \Q$user\E ~\Q$Coro::current\E~deleting~ 2>/dev/null " 154 cf::fork_call {
103 . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)"; 155 rename "$PLAYERDIR/$user", $temp;
156 system "rm", "-rf", $temp;
157 };
104} 158}
105 159
106cf::client->attach (on_addme => sub { 160cf::client->attach (on_addme => sub {
107 my ($ns) = @_; 161 my ($ns) = @_;
108 162
… …
117*** or it has been disabled. Face caching is mandatory 171*** or it has been disabled. Face caching is mandatory
118*** so please enable it or use a newer client. 172*** so please enable it or use a newer client.
119*** 173***
120*** Look at your client preferences: 174*** Look at your client preferences:
121*** 175***
122*** CFPlus: all known versions automatically enable the facecache. 176*** deliantra: all known versions automatically enable the facecache.
123*** cfclient: use the -cache commandline option. 177*** cfclient: use the -cache commandline option.
124*** cfclient: map will not redraw automatically (bug). 178*** cfclient: map will not redraw automatically (bug).
125*** gcfclient: use -cache commandline option, or enable 179*** gcfclient: use -cache commandline option, or enable
126*** gcfclient: Client=>Configure=>Map & Image=>Cache Images. 180*** gcfclient: Client => Configure => Map & Image => Cache Images.
127*** jcrossclient: your client is broken, use CFPlus or gcfclient. 181*** jcrossclient: your client is broken, use deliantra or gcfclient.
128*** 182***
129*** 183***
130EOF 184EOF
131 if ($ns->version =~ /jcrossclient/) { 185 if ($ns->version =~ /jcrossclient/) {
132 # let them, for now 186 # let them, for now
… …
152 } 206 }
153 207
154 $ns->pl and return $ns->destroy; 208 $ns->pl and return $ns->destroy;
155 209
156 $ns->async (sub { 210 $ns->async (sub {
211 $Coro::current->{desc} = "addme init";
212
157 my ($user, $pass); 213 my ($user, $pass);
158 214
159 $ns->send_packet ("addme_success"); 215 $ns->send_packet ("addme_success");
160 216
161 for (;;) { 217 for (;;) {
… …
166 cf::NDI_BLUE 222 cf::NDI_BLUE
167 ); 223 );
168 224
169 # read username 225 # read username
170 while () { 226 while () {
171 $user = query $ns, 0, "What is your name?\n:"; 227 $user = query $ns, 0, "What is your name? (login names are case-sensitive)\n:";
172 228
173 if ($cf::LOGIN_LOCK{$user}) { 229 if ($cf::LOGIN_LOCK{$user}) {
174 $ns->send_drawinfo ( 230 $ns->send_drawinfo (
175 "That username is currently used in another login session. " 231 "That username is currently used in another login session. "
176 . "Chose another, or wait till the other session has ended.", 232 . "Chose another, or wait till the other session has ended.",
177 cf::NDI_RED 233 cf::NDI_RED
178 ); 234 );
179 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,17}\z/) { 235 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z/) {
180 last; 236 last;
181 } else { 237 } else {
182 $ns->send_drawinfo ( 238 $ns->send_drawinfo (
183 "Your username contains illegal characters " 239 "Your username contains illegal characters "
184 . "(only a-z, A-Z and 0-9 are allowed), " 240 . "(only a-z, A-Z and 0-9 are allowed), "
185 . "or is not between 3 and 18 characters in length.", 241 . "or is not between 3 and 20 characters in length.",
186 cf::NDI_RED 242 cf::NDI_RED
187 ); 243 );
188 } 244 }
245 Coro::Timer::sleep 0.4;
189 } 246 }
190 247
191 check_playing $ns, $user and next; 248 check_playing $ns, $user and next;
249
250 $Coro::current->{desc} = "addme($user) pass";
192 251
193 $ns->send_drawinfo ( 252 $ns->send_drawinfo (
194 "Welcome $user, please enter your password now. " 253 "Welcome $user, please enter your password now. "
195 . "New users should now choose a password. " 254 . "New users should now choose a password. "
196 . "Anything your client lets you enter is fine.", 255 . "Anything your client lets you enter is fine.",
… …
204 $ns->send_drawinfo ( 263 $ns->send_drawinfo (
205 "Try to use at least three characters as your password please, " 264 "Try to use at least three characters as your password please, "
206 . "that cannot be too much to ask for :)", 265 . "that cannot be too much to ask for :)",
207 cf::NDI_RED 266 cf::NDI_RED
208 ); 267 );
268 Coro::Timer::sleep 0.4;
209 } 269 }
210 270
211 # lock this username for the remainder of this login session 271 # lock this username for the remainder of this login session
212 if ($cf::LOGIN_LOCK{$user}) { 272 if ($cf::LOGIN_LOCK{$user}) {
213 $ns->send_drawinfo ( 273 $ns->send_drawinfo (
… …
219 } 279 }
220 local $cf::LOGIN_LOCK{$user} = 1; 280 local $cf::LOGIN_LOCK{$user} = 1;
221 281
222 check_playing $ns, $user and next; 282 check_playing $ns, $user and next;
223 283
284 $Coro::current->{desc} = "addme($user) check";
285
224 # try to read the user file and check the password 286 # try to read the user file and check the password
225 if (my $pl = cf::player::find $user) { 287 if (my $pl = cf::player::find $user) {
226 aio_stat $pl->path and next; 288 aio_stat $pl->path and next;
227 my $mtime = (stat _)[9]; 289 my $mtime = (stat _)[9];
228 my $hash = $pl->password; 290 my $hash = $pl->password;
… …
230 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) { 292 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) {
231 nuke_str $pass; 293 nuke_str $pass;
232 # password matches, wonderful 294 # password matches, wonderful
233 my $pl = cf::player::find $user or next; 295 my $pl = cf::player::find $user or next;
234 $pl->connect ($ns); 296 $pl->connect ($ns);
297 $pl->ob->flag (cf::FLAG_DEBUG, 1);#d# temp
235 enter_map $pl; 298 enter_map $pl;
236 last; 299 last;
237 } elsif (can_cleanup $pl, $mtime) { 300 } elsif (can_cleanup $pl, $mtime) {
238 Coro::Timer::sleep 1; 301 Coro::Timer::sleep 1;
239 302
… …
281 next; 344 next;
282 } 345 }
283 } 346 }
284 347
285 # the rest of this function is character creation 348 # the rest of this function is character creation
349 $Coro::current->{desc} = "addme($user) chargen";
286 350
287 # just to make sure nothing is left over 351 # just to make sure nothing is left over
288 nuke_playerdir $user; 352 nuke_playerdir $user;
289 353
290 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again."; 354 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
… …
294 nuke_str $pass2; 358 nuke_str $pass2;
295 $ns->send_drawinfo ( 359 $ns->send_drawinfo (
296 "The passwords do not match, please try again.", 360 "The passwords do not match, please try again.",
297 cf::NDI_RED 361 cf::NDI_RED
298 ); 362 );
363 Coro::Timer::sleep 0.5;
299 next; 364 next;
300 } 365 }
301 366
302 nuke_str $pass2; 367 nuke_str $pass2;
303 368
… …
325 $ob->swap_stats ($res - 1, $swap - 1); 390 $ob->swap_stats ($res - 1, $swap - 1);
326 } 391 }
327 } else { 392 } else {
328 $ob->roll_stats; 393 $ob->roll_stats;
329 } 394 }
395
396 Coro::Timer::sleep 0.05;
330 } 397 }
331 398
332 $ob->set_animation (2); 399 $ob->set_animation (2);
333 $ob->add_statbonus; 400 $ob->add_statbonus;
334 401
335 while () { 402 while () {
336 $ns->send_msg (-1, "chargen-race-title", ucfirst $pl->title); 403 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
337 my $msg = $ob->msg; 404 my $msg = $ob->msg;
338 $msg =~ s/(?<=\S)\n(?=\S)/ /g; 405 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
339 $ns->send_msg (cf::NDI_BLUE, "chargen-race-description", $msg); 406 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
340 407
341 my $res = query $ns, cf::CS_QUERY_SINGLECHAR, 408 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"; 409 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
343 410
344 last if $res =~ /[dD]/; 411 last if $res =~ /[dD]/;
345 412
346 $pl->chargen_race_next; 413 $pl->chargen_race_next;
414 Coro::Timer::sleep 0.2;
347 } 415 }
348 416
417 # create the playerdir, if necessary, as chargen_race_done did it before
418 # presumably because of unique maps
419 aio_mkdir playerdir $pl, 0770;
349 $pl->chargen_race_done; 420 $pl->chargen_race_done;
350 421
351 while () { 422 while () {
352 my $res = query $ns, cf::CS_QUERY_SINGLECHAR, 423 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
353 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n"; 424 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
… …
357 last; 428 last;
358 } elsif ($res =~ /^[mM]/) { 429 } elsif ($res =~ /^[mM]/) {
359 $pl->gender (0); 430 $pl->gender (0);
360 last; 431 last;
361 } 432 }
433 Coro::Timer::sleep 0.2;
362 } 434 }
363 435
364 $ob->reply (undef, "Welcome to Crossfire!"); 436 $ob->reply (undef, "Welcome to Deliantra!");
365 437
366 delete $pl->{deny_save}; 438 delete $pl->{deny_save};
367 439
368 last; 440 last;
369 } 441 }
… …
410 482
411 # update respawn position 483 # update respawn position
412 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 484 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
413 cf::async { $pl->save }; 485 cf::async { $pl->save };
414 486
415 $pl->killer ("left"); 487 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
416 $ob->check_score; 488 $ob->check_score;
417 489
418 $ob->reply (undef, "In the future, you will wake up here when you die."); 490 $ob->reply (undef, "In the future, you will wake up here when you die.");
419 491
420 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub { 492 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
… …
442 514
443 if ($cleanly) { 515 if ($cleanly) {
444 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 516 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
445 } else { 517 } else {
446 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 518 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
447 $pl->{unclean_save} = $cf::RUNTIME; 519 $pl->{unclean_save} = $cf::RUNTIME
520 unless safe_spot $pl;
448 } 521 }
449 }, 522 },
450); 523);
451 524
452#############################################################################
453 525
454our $SCHEDULE_INTERVAL = 10; # time the player scheduler sleeps between runs
455our $SAVE_TIMEOUT = 20; # save players every n seconds
456
457our $SCHEDULER = cf::async_ext {
458 my $schedule_interval = Coro::Event->timer (after => 1, interval => $SCHEDULE_INTERVAL);
459 while () {
460 $schedule_interval->next;
461
462 # this weird form of iteration over values is used because
463 # the hash changes underneath us frequently, and for
464 # keeps a direct reference to the value without (in 5.8 perls)
465 # keeping a reference, so this is prone to crashes or worse.
466 my @players = keys %cf::PLAYER;
467 for (@players) {
468 my $pl = $cf::PLAYER{$_}
469 or next;
470 $pl->valid or next;
471
472 eval {
473 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
474 cf::wait_for_tick_begin;
475 $pl->save;
476
477 unless ($pl->active || $pl->ns) {
478 # check refcounts, this is tricky and needs to be adjusted to fit server internals
479 my $ob = $pl->ob;
480
481 my $pl_ref = $pl->refcnt_cnt;
482 my $ob_ref = $ob->refcnt_cnt;
483
484 ## pl_ref == $pl + ob->contr + %cf::PLAYER
485 ## ob_ref == $ob + pl->observe + simply being an object
486 if ($pl_ref == 3 && $ob_ref == 3) {
487 warn "player-scheduler destroy ", $ob->name;#d#
488
489 # remove from sight and get fresh "copies"
490 $pl = delete $cf::PLAYER{$ob->name};
491 $ob = $pl->ob;
492
493 $pl->destroy; # destroys $ob
494 } else {
495 my $a_ = $pl->refcnt;#d#
496 my $b_ = $ob->refcnt;#d#
497
498 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref ob $ob_ref (C pl $a_ ob $b_)\n";#d#
499 }
500 }
501 }
502 };
503 warn $@ if $@;
504 Coro::cede;
505 };
506 }
507};
508
509$SCHEDULER->prio (1);
510

Diff Legend

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