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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines