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.64 by root, Sat Jul 14 19:27:59 2007 UTC vs.
Revision 1.96 by pippijn, Tue Dec 23 18:52:57 2008 UTC

… …
13} 13}
14 14
15sub query { 15sub query {
16 my ($ns, $flags, $text) = @_; 16 my ($ns, $flags, $text) = @_;
17 17
18 my $current = $Coro::current; 18 $ns->query ($flags, $text, Coro::rouse_cb);
19 $ns->query ($flags, $text, sub { $current->ready; $current = $_[0] }); 19 Coro::rouse_wait
20 Coro::schedule while ref $current;
21
22 $current
23} 20}
24 21
25sub can_cleanup { 22sub can_cleanup {
26 my ($pl, $mtime) = @_; 23 my ($pl, $mtime) = @_;
27 24
… …
52 ); 49 );
53 50
54 1 51 1
55} 52}
56 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
57sub enter_map { 72sub enter_map {
58 my ($pl) = @_; 73 my ($pl) = @_;
59 74
75 warn $pl->ob->name, ": enter map 1\n";#d#
60 my $ob = $pl->ob; 76 my $ob = $pl->ob;
61 77
62 my ($map, $x, $y) 78 my ($map, $x, $y)
63 = $ob->{_link_pos} 79 = $ob->{_link_pos}
64 ? @{delete $ob->{_link_pos}} 80 ? @{delete $ob->{_link_pos}}
65 : ($pl->maplevel, $ob->x, $ob->y); 81 : ($pl->maplevel, $ob->x, $ob->y);
66 82
83 warn $pl->ob->name, ": enter map 2\n";#d#
67 $ob->enter_link; 84 $ob->enter_link;
85 warn $pl->ob->name, ": enter map 3\n";#d#
68 86
87 my $m = cf::map::find $map;
69 if (my $time = delete $pl->{unclean_save}) { 88 my $time = delete $pl->{unclean_save};
70 if (my $m = cf::map::find $map) { 89 warn $pl->ob->name, ": enter map 4\n";#d#
90
91 if ($time && $m) {
71 if ($time < $m->{instantiate_time}) { 92 if ($time < $m->{instantiate_time}) {
72 # the map was reset in the meantime 93 # the map was reset in the meantime
73 my $age = $cf::RUNTIME - $time; 94 my $age = $cf::RUNTIME - $time;
74 95
75 warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d# 96 warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
76 97
77 # for now, just go back to savebed
78 ($map, $x, $y) = $pl->savebed;
79
80 if ($age >= $MAX_DISCONNECT_TIME) { 98 if ($age >= $MAX_DISCONNECT_TIME) {
81 $ob->message (
82 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
83 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
84 . "Maybe you can find comfort in the thought that your body was quite satisfying in taste... "
85 . "H<You disconnected too long without having used a savebed.>",
86 cf::NDI_RED
87 );
88 # kill them.
89 # reminds me of the famous badness 10000 syndrome...
90 $ob->stats->hp (-10000); #] if they survive this they deserved to live
91 } else {
92 $ob->message (
93 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
94 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
95 . "Better use a savebed next time, much worse things could have happened... "
96 . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>",
97 cf::NDI_RED
98 );
99 }
100 } else {
101 $ob->message ( 99 $ob->message (
102 "You didn't use a bed to reality to leave this realm. This is very dangerous, " 100 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
103 . "as lots of things could happen when you leave by other means, such as cave-ins, " 101 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
104 . "or monsters suddenly snapping your body. Better use a savebed next time. " 102 . "Maybe you can find comfort in the thought that your body was quite satisfying in taste... "
105 . "H<Always apply a bed of reality to disconnect from the server.>", 103 . "H<You disconnected too long without having used a savebed.>",
106 cf::NDI_RED 104 cf::NDI_RED
107 ); 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 {
111 ($map, $x, $y) = $pl->savebed;
112
113 $ob->message (
114 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
115 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
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.>",
118 cf::NDI_RED
119 );
120 }
121 } else {
122 $ob->message (
123 "You didn't use a bed to reality to leave this realm. This is very dangerous, "
124 . "as lots of things could happen when you leave by other means, such as cave-ins, "
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.>",
127 cf::NDI_RED
108 } 128 );
109 } 129 }
110 } 130 }
111 131
132 warn $pl->ob->name, ": enter map 5\n";#d#
112 $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
113} 142}
114 143
115# delete a player directory, be non-blocking AND synchronous... 144# delete a player directory, be non-blocking AND synchronous...
116# (thats hard, so we crap out and fork). 145# (that's hard, so we crap out and fork).
117sub nuke_playerdir { 146sub nuke_playerdir {
118 my ($user) = @_; 147 my ($user) = @_;
119 148
120 aio_stat "$PLAYERDIR/$user"; 149 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
121 system "cd \Q$PLAYERDIR\E " 150
122 . "&& mv \Q$user\E ~\Q$Coro::current\E~deleting~ 2>/dev/null " 151 cf::fork_call {
123 . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)"; 152 rename "$PLAYERDIR/$user", $temp;
153 system "rm", "-rf", $temp;
154 };
124} 155}
125 156
126cf::client->attach (on_addme => sub { 157cf::client->attach (on_addme => sub {
127 my ($ns) = @_; 158 my ($ns) = @_;
128 159
… …
137*** or it has been disabled. Face caching is mandatory 168*** or it has been disabled. Face caching is mandatory
138*** so please enable it or use a newer client. 169*** so please enable it or use a newer client.
139*** 170***
140*** Look at your client preferences: 171*** Look at your client preferences:
141*** 172***
142*** CFPlus: all known versions automatically enable the facecache. 173*** deliantra: all known versions automatically enable the facecache.
143*** cfclient: use the -cache commandline option. 174*** cfclient: use the -cache commandline option.
144*** cfclient: map will not redraw automatically (bug). 175*** cfclient: map will not redraw automatically (bug).
145*** gcfclient: use -cache commandline option, or enable 176*** gcfclient: use -cache commandline option, or enable
146*** gcfclient: Client=>Configure=>Map & Image=>Cache Images. 177*** gcfclient: Client => Configure => Map & Image => Cache Images.
147*** jcrossclient: your client is broken, use CFPlus or gcfclient. 178*** jcrossclient: your client is broken, use deliantra or gcfclient.
148*** 179***
149*** 180***
150EOF 181EOF
151 if ($ns->version =~ /jcrossclient/) { 182 if ($ns->version =~ /jcrossclient/) {
152 # let them, for now 183 # let them, for now
… …
172 } 203 }
173 204
174 $ns->pl and return $ns->destroy; 205 $ns->pl and return $ns->destroy;
175 206
176 $ns->async (sub { 207 $ns->async (sub {
208 $Coro::current->{desc} = "addme init";
209
177 my ($user, $pass); 210 my ($user, $pass);
178 211
179 $ns->send_packet ("addme_success"); 212 $ns->send_packet ("addme_success");
180 213
181 for (;;) { 214 for (;;) {
… …
186 cf::NDI_BLUE 219 cf::NDI_BLUE
187 ); 220 );
188 221
189 # read username 222 # read username
190 while () { 223 while () {
191 $user = query $ns, 0, "What is your name?\n:"; 224 $user = query $ns, 0, "What is your name? (login names are case-sensitive)\n:";
192 225
193 if ($cf::LOGIN_LOCK{$user}) { 226 if ($cf::LOGIN_LOCK{$user}) {
194 $ns->send_drawinfo ( 227 $ns->send_drawinfo (
195 "That username is currently used in another login session. " 228 "That username is currently used in another login session. "
196 . "Chose another, or wait till the other session has ended.", 229 . "Chose another, or wait till the other session has ended.",
197 cf::NDI_RED 230 cf::NDI_RED
198 ); 231 );
199 } 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/) {
200 last; 233 last;
201 } else { 234 } else {
202 $ns->send_drawinfo ( 235 $ns->send_drawinfo (
203 "Your username contains illegal characters " 236 "Your username contains illegal characters "
204 . "(only a-z, A-Z and 0-9 are allowed), " 237 . "(only a-z, A-Z and 0-9 are allowed), "
205 . "or is not between 3 and 18 characters in length.", 238 . "or is not between 3 and 20 characters in length.",
206 cf::NDI_RED 239 cf::NDI_RED
207 ); 240 );
208 } 241 }
209 Coro::Timer::sleep 0.4; 242 Coro::Timer::sleep 0.4;
210 } 243 }
211 244
212 check_playing $ns, $user and next; 245 check_playing $ns, $user and next;
246
247 $Coro::current->{desc} = "addme($user) pass";
213 248
214 $ns->send_drawinfo ( 249 $ns->send_drawinfo (
215 "Welcome $user, please enter your password now. " 250 "Welcome $user, please enter your password now. "
216 . "New users should now choose a password. " 251 . "New users should now choose a password. "
217 . "Anything your client lets you enter is fine.", 252 . "Anything your client lets you enter is fine.",
… …
241 } 276 }
242 local $cf::LOGIN_LOCK{$user} = 1; 277 local $cf::LOGIN_LOCK{$user} = 1;
243 278
244 check_playing $ns, $user and next; 279 check_playing $ns, $user and next;
245 280
281 $Coro::current->{desc} = "addme($user) check";
282
246 # try to read the user file and check the password 283 # try to read the user file and check the password
247 if (my $pl = cf::player::find $user) { 284 if (my $pl = cf::player::find $user) {
248 aio_stat $pl->path and next; 285 aio_stat $pl->path and next;
249 my $mtime = (stat _)[9]; 286 my $mtime = (stat _)[9];
250 my $hash = $pl->password; 287 my $hash = $pl->password;
… …
252 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) {
253 nuke_str $pass; 290 nuke_str $pass;
254 # password matches, wonderful 291 # password matches, wonderful
255 my $pl = cf::player::find $user or next; 292 my $pl = cf::player::find $user or next;
256 $pl->connect ($ns); 293 $pl->connect ($ns);
294 $pl->ob->flag (cf::FLAG_DEBUG, 1);#d# temp
257 enter_map $pl; 295 enter_map $pl;
258 last; 296 last;
259 } elsif (can_cleanup $pl, $mtime) { 297 } elsif (can_cleanup $pl, $mtime) {
260 Coro::Timer::sleep 1; 298 Coro::Timer::sleep 1;
261 299
… …
303 next; 341 next;
304 } 342 }
305 } 343 }
306 344
307 # the rest of this function is character creation 345 # the rest of this function is character creation
346 $Coro::current->{desc} = "addme($user) chargen";
308 347
309 # just to make sure nothing is left over 348 # just to make sure nothing is left over
310 nuke_playerdir $user; 349 nuke_playerdir $user;
311 350
312 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.";
… …
349 } 388 }
350 } else { 389 } else {
351 $ob->roll_stats; 390 $ob->roll_stats;
352 } 391 }
353 392
354 Coro::Timer::sleep 0.2; 393 Coro::Timer::sleep 0.05;
355 } 394 }
356 395
357 $ob->set_animation (2); 396 $ob->set_animation (2);
358 $ob->add_statbonus; 397 $ob->add_statbonus;
359 398
360 while () { 399 while () {
361 $ns->send_msg (-1, "chargen-race-title", ucfirst $pl->title); 400 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
362 my $msg = $ob->msg; 401 my $msg = $ob->msg;
363 $msg =~ s/(?<=\S)\n(?=\S)/ /g; 402 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
364 $ns->send_msg (cf::NDI_BLUE, "chargen-race-description", $msg); 403 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
365 404
366 my $res = query $ns, cf::CS_QUERY_SINGLECHAR, 405 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
367 "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";
368 407
369 last if $res =~ /[dD]/; 408 last if $res =~ /[dD]/;
370 409
371 $pl->chargen_race_next; 410 $pl->chargen_race_next;
372 Coro::Timer::sleep 0.2; 411 Coro::Timer::sleep 0.2;
373 } 412 }
374 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;
375 $pl->chargen_race_done; 417 $pl->chargen_race_done;
376 418
377 while () { 419 while () {
378 my $res = query $ns, cf::CS_QUERY_SINGLECHAR, 420 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
379 "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";
… …
386 last; 428 last;
387 } 429 }
388 Coro::Timer::sleep 0.2; 430 Coro::Timer::sleep 0.2;
389 } 431 }
390 432
391 $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;
392 437
393 delete $pl->{deny_save}; 438 delete $pl->{deny_save};
394 439
395 last; 440 last;
396 } 441 }
… …
398}); 443});
399 444
400cf::register_command quit => sub { 445cf::register_command quit => sub {
401 my ($ob, $arg) = @_; 446 my ($ob, $arg) = @_;
402 447
403 $ob->reply (undef, 448 $ob->send_msg (undef,
404 "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. " 449 "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. "
405 . "If you are sure you want to do this, then use the quit_character command instead of quit.", 450 . "If you are sure you want to do this, then use the quit_character command instead of quit.",
406 cf::NDI_UNIQUE | cf::NDI_RED); 451 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
407}; 452};
408 453
409cf::register_command quit_character => sub { 454cf::register_command quit_character => sub {
410 my ($ob, $arg) = @_; 455 my ($ob, $arg) = @_;
411 456
412 my $pl = $ob->contr; 457 my $pl = $ob->contr;
413 458
414 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub { 459 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub {
415 if ($_[0] !~ /^[yY]/) { 460 if ($_[0] !~ /^[yY]/) {
416 $ob->reply (undef, 461 $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
417 "Ok, not not quitting then.",
418 cf::NDI_UNIQUE | cf::NDI_RED);
419 } else { 462 } else {
420 $ob->reply (undef, 463 $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
421 "Ok, quitting, hope to see you again.",
422 cf::NDI_UNIQUE | cf::NDI_RED);
423 $pl->ns->flush; 464 $pl->ns->flush;
424 cf::async { $pl->quit_character }; 465 cf::async { $pl->quit_character };
425 } 466 }
426 }); 467 });
427}; 468};
… …
437 478
438 # update respawn position 479 # update respawn position
439 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 480 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
440 cf::async { $pl->save }; 481 cf::async { $pl->save };
441 482
442 $pl->killer ("left"); 483 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
443 $ob->check_score; 484 $ob->check_score;
444 485
445 $ob->reply (undef, "In the future, you will wake up here when you die."); 486 $ob->send_msg ($cf::SAY_CHANNEL => "In the future, you will wake up here when you die.", cf::NDI_DEF | cf::NDI_REPLY);
446 487
447 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub { 488 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
448 if ($_[0] !~ /^[yY]/) { 489 if ($_[0] !~ /^[yY]/) {
449 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1); 490 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1);
450 $pl->deactivate; 491 $pl->deactivate;
… …
469 510
470 if ($cleanly) { 511 if ($cleanly) {
471 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 512 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
472 } else { 513 } else {
473 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 514 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
474 $pl->{unclean_save} = $cf::RUNTIME; 515 $pl->{unclean_save} = $cf::RUNTIME
516 unless safe_spot $pl;
475 } 517 }
476 }, 518 },
477); 519);
478 520
479#############################################################################
480 521
481our $SCHEDULE_INTERVAL = 10; # time the player scheduler sleeps between runs
482our $SAVE_TIMEOUT = 20; # save players every n seconds
483
484our $SCHEDULER = cf::async_ext {
485 my $schedule_interval = Coro::Event->timer (after => 1, interval => $SCHEDULE_INTERVAL);
486 while () {
487 $schedule_interval->next;
488
489 # this weird form of iteration over values is used because
490 # the hash changes underneath us frequently, and for
491 # keeps a direct reference to the value without (in 5.8 perls)
492 # keeping a reference, so this is prone to crashes or worse.
493 my @players = keys %cf::PLAYER;
494 for (@players) {
495 my $pl = $cf::PLAYER{$_}
496 or next;
497 $pl->valid or next;
498
499 eval {
500 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
501 cf::wait_for_tick_begin;
502 $pl->save;
503
504 unless ($pl->active || $pl->ns) {
505 # check refcounts, this is tricky and needs to be adjusted to fit server internals
506 my $ob = $pl->ob;
507
508 my $pl_ref = $pl->refcnt_cnt;
509 my $ob_ref = $ob->refcnt_cnt;
510
511 ## pl_ref == $pl + ob->contr + %cf::PLAYER
512 ## ob_ref == $ob + pl->observe + simply being an object
513 if ($pl_ref == 3 && $ob_ref == 3) {
514 warn "player-scheduler destroy ", $ob->name;#d#
515
516 # remove from sight and get fresh "copies"
517 $pl = delete $cf::PLAYER{$ob->name};
518 $ob = $pl->ob;
519
520 $pl->destroy; # destroys $ob
521 } else {
522 my $a_ = $pl->refcnt;#d#
523 my $b_ = $ob->refcnt;#d#
524
525 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref ob $ob_ref (C pl $a_ ob $b_)\n";#d#
526 }
527 }
528 }
529 };
530 warn $@ if $@;
531 Coro::cede;
532 };
533 }
534};
535
536$SCHEDULER->prio (1);
537

Diff Legend

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