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

Diff Legend

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