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.71 by root, Sun Sep 2 12:45:44 2007 UTC vs.
Revision 1.94 by root, Sat Dec 13 21:46:12 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# (thats hard, so we crap out and fork).
118sub nuke_playerdir { 146sub nuke_playerdir {
… …
140*** or it has been disabled. Face caching is mandatory 168*** or it has been disabled. Face caching is mandatory
141*** so please enable it or use a newer client. 169*** so please enable it or use a newer client.
142*** 170***
143*** Look at your client preferences: 171*** Look at your client preferences:
144*** 172***
145*** CFPlus: all known versions automatically enable the facecache. 173*** deliantra: all known versions automatically enable the facecache.
146*** cfclient: use the -cache commandline option. 174*** cfclient: use the -cache commandline option.
147*** cfclient: map will not redraw automatically (bug). 175*** cfclient: map will not redraw automatically (bug).
148*** gcfclient: use -cache commandline option, or enable 176*** gcfclient: use -cache commandline option, or enable
149*** gcfclient: Client => Configure => Map & Image => Cache Images. 177*** gcfclient: Client => Configure => Map & Image => Cache Images.
150*** jcrossclient: your client is broken, use CFPlus or gcfclient. 178*** jcrossclient: your client is broken, use deliantra or gcfclient.
151*** 179***
152*** 180***
153EOF 181EOF
154 if ($ns->version =~ /jcrossclient/) { 182 if ($ns->version =~ /jcrossclient/) {
155 # let them, for now 183 # let them, for now
… …
175 } 203 }
176 204
177 $ns->pl and return $ns->destroy; 205 $ns->pl and return $ns->destroy;
178 206
179 $ns->async (sub { 207 $ns->async (sub {
208 $Coro::current->{desc} = "addme init";
209
180 my ($user, $pass); 210 my ($user, $pass);
181 211
182 $ns->send_packet ("addme_success"); 212 $ns->send_packet ("addme_success");
183 213
184 for (;;) { 214 for (;;) {
… …
189 cf::NDI_BLUE 219 cf::NDI_BLUE
190 ); 220 );
191 221
192 # read username 222 # read username
193 while () { 223 while () {
194 $user = query $ns, 0, "What is your name?\n:"; 224 $user = query $ns, 0, "What is your name? (login names are case-sensitive)\n:";
195 225
196 if ($cf::LOGIN_LOCK{$user}) { 226 if ($cf::LOGIN_LOCK{$user}) {
197 $ns->send_drawinfo ( 227 $ns->send_drawinfo (
198 "That username is currently used in another login session. " 228 "That username is currently used in another login session. "
199 . "Chose another, or wait till the other session has ended.", 229 . "Chose another, or wait till the other session has ended.",
200 cf::NDI_RED 230 cf::NDI_RED
201 ); 231 );
202 } 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/) {
203 last; 233 last;
204 } else { 234 } else {
205 $ns->send_drawinfo ( 235 $ns->send_drawinfo (
206 "Your username contains illegal characters " 236 "Your username contains illegal characters "
207 . "(only a-z, A-Z and 0-9 are allowed), " 237 . "(only a-z, A-Z and 0-9 are allowed), "
208 . "or is not between 3 and 18 characters in length.", 238 . "or is not between 3 and 20 characters in length.",
209 cf::NDI_RED 239 cf::NDI_RED
210 ); 240 );
211 } 241 }
212 Coro::Timer::sleep 0.4; 242 Coro::Timer::sleep 0.4;
213 } 243 }
214 244
215 check_playing $ns, $user and next; 245 check_playing $ns, $user and next;
246
247 $Coro::current->{desc} = "addme($user) pass";
216 248
217 $ns->send_drawinfo ( 249 $ns->send_drawinfo (
218 "Welcome $user, please enter your password now. " 250 "Welcome $user, please enter your password now. "
219 . "New users should now choose a password. " 251 . "New users should now choose a password. "
220 . "Anything your client lets you enter is fine.", 252 . "Anything your client lets you enter is fine.",
… …
244 } 276 }
245 local $cf::LOGIN_LOCK{$user} = 1; 277 local $cf::LOGIN_LOCK{$user} = 1;
246 278
247 check_playing $ns, $user and next; 279 check_playing $ns, $user and next;
248 280
281 $Coro::current->{desc} = "addme($user) check";
282
249 # try to read the user file and check the password 283 # try to read the user file and check the password
250 if (my $pl = cf::player::find $user) { 284 if (my $pl = cf::player::find $user) {
251 aio_stat $pl->path and next; 285 aio_stat $pl->path and next;
252 my $mtime = (stat _)[9]; 286 my $mtime = (stat _)[9];
253 my $hash = $pl->password; 287 my $hash = $pl->password;
… …
255 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) {
256 nuke_str $pass; 290 nuke_str $pass;
257 # password matches, wonderful 291 # password matches, wonderful
258 my $pl = cf::player::find $user or next; 292 my $pl = cf::player::find $user or next;
259 $pl->connect ($ns); 293 $pl->connect ($ns);
294 $pl->ob->flag (cf::FLAG_DEBUG, 1);#d# temp
260 enter_map $pl; 295 enter_map $pl;
261 last; 296 last;
262 } elsif (can_cleanup $pl, $mtime) { 297 } elsif (can_cleanup $pl, $mtime) {
263 Coro::Timer::sleep 1; 298 Coro::Timer::sleep 1;
264 299
… …
306 next; 341 next;
307 } 342 }
308 } 343 }
309 344
310 # the rest of this function is character creation 345 # the rest of this function is character creation
346 $Coro::current->{desc} = "addme($user) chargen";
311 347
312 # just to make sure nothing is left over 348 # just to make sure nothing is left over
313 nuke_playerdir $user; 349 nuke_playerdir $user;
314 350
315 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.";
… …
352 } 388 }
353 } else { 389 } else {
354 $ob->roll_stats; 390 $ob->roll_stats;
355 } 391 }
356 392
357 Coro::Timer::sleep 0.2; 393 Coro::Timer::sleep 0.05;
358 } 394 }
359 395
360 $ob->set_animation (2); 396 $ob->set_animation (2);
361 $ob->add_statbonus; 397 $ob->add_statbonus;
362 398
… …
373 409
374 $pl->chargen_race_next; 410 $pl->chargen_race_next;
375 Coro::Timer::sleep 0.2; 411 Coro::Timer::sleep 0.2;
376 } 412 }
377 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;
378 $pl->chargen_race_done; 417 $pl->chargen_race_done;
379 418
380 while () { 419 while () {
381 my $res = query $ns, cf::CS_QUERY_SINGLECHAR, 420 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
382 "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";
… …
389 last; 428 last;
390 } 429 }
391 Coro::Timer::sleep 0.2; 430 Coro::Timer::sleep 0.2;
392 } 431 }
393 432
394 $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;
395 437
396 delete $pl->{deny_save}; 438 delete $pl->{deny_save};
397 439
398 last; 440 last;
399 } 441 }
… …
440 482
441 # update respawn position 483 # update respawn position
442 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 484 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
443 cf::async { $pl->save }; 485 cf::async { $pl->save };
444 486
445 $pl->killer ("left"); 487 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
446 $ob->check_score; 488 $ob->check_score;
447 489
448 $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.");
449 491
450 $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 {
… …
472 514
473 if ($cleanly) { 515 if ($cleanly) {
474 $_->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;
475 } else { 517 } else {
476 $_->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;
477 $pl->{unclean_save} = $cf::RUNTIME; 519 $pl->{unclean_save} = $cf::RUNTIME
520 unless safe_spot $pl;
478 } 521 }
479 }, 522 },
480); 523);
481 524
482#############################################################################
483 525
484our $SCHEDULE_INTERVAL = $cf::CFG{player_schedule_interval} || 10; # time the player scheduler sleeps between runs
485our $SAVE_TIMEOUT = $cf::CFG{player_save_interval} || 20; # save players every n seconds
486
487our $SCHEDULER = cf::async_ext {
488 my $schedule_interval = Coro::Event->timer (after => 1);
489 while () {
490 $schedule_interval->interval ($SCHEDULE_INTERVAL);
491 $schedule_interval->next;
492
493 # this weird form of iteration over values is used because
494 # the hash changes underneath us frequently, and for
495 # keeps a direct reference to the value without (in 5.8 perls)
496 # keeping a reference, so this is prone to crashes or worse.
497 my @players = keys %cf::PLAYER;
498 for (@players) {
499 my $pl = $cf::PLAYER{$_}
500 or next;
501 $pl->valid or next;
502
503 eval {
504 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
505 $pl->save;
506
507 unless ($pl->active || $pl->ns) {
508 # check refcounts, this is tricky and needs to be adjusted to fit server internals
509 my $ob = $pl->ob;
510
511 my $pl_ref = $pl->refcnt_cnt;
512 my $ob_ref = $ob->refcnt_cnt;
513
514 ## pl_ref == $pl + ob->contr + %cf::PLAYER
515 ## ob_ref == $ob + pl->observe + simply being an object
516 if ($pl_ref == 3 && $ob_ref == 3) {
517 warn "player-scheduler destroy ", $ob->name;#d#
518
519 # remove from sight and get fresh "copies"
520 $pl = delete $cf::PLAYER{$ob->name};
521 $ob = $pl->ob;
522
523 $pl->destroy; # destroys $ob
524 } else {
525 my $a_ = $pl->refcnt;#d#
526 my $b_ = $ob->refcnt;#d#
527
528 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref ob $ob_ref (C pl $a_ ob $b_)\n";#d#
529 }
530 }
531 }
532 };
533 warn $@ if $@;
534 Coro::cede;
535 };
536 }
537};
538
539$SCHEDULER->prio (1);
540

Diff Legend

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