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.88 by root, Sun Aug 17 22:46:26 2008 UTC vs.
Revision 1.98 by root, Sun Jun 28 16:46:50 2009 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
… …
143 warn $pl->ob->name, ": enter map 6\n";#d# 140 warn $pl->ob->name, ": enter map 6\n";#d#
144 141
145} 142}
146 143
147# delete a player directory, be non-blocking AND synchronous... 144# delete a player directory, be non-blocking AND synchronous...
148# (thats hard, so we crap out and fork). 145# (that's hard, so we crap out and fork).
149sub nuke_playerdir { 146sub nuke_playerdir {
150 my ($user) = @_; 147 my ($user) = @_;
151 148
152 my $temp = "$PLAYERDIR/~$Coro::current~deleting~"; 149 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
153 150
… …
157 }; 154 };
158} 155}
159 156
160cf::client->attach (on_addme => sub { 157cf::client->attach (on_addme => sub {
161 my ($ns) = @_; 158 my ($ns) = @_;
162
163 if (!$ns->facecache)
164 {
165 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
166
167
168***
169*** WARNING:
170*** Your client does not support face/image caching,
171*** or it has been disabled. Face caching is mandatory
172*** so please enable it or use a newer client.
173***
174*** Look at your client preferences:
175***
176*** deliantra: all known versions automatically enable the facecache.
177*** cfclient: use the -cache commandline option.
178*** cfclient: map will not redraw automatically (bug).
179*** gcfclient: use -cache commandline option, or enable
180*** gcfclient: Client => Configure => Map & Image => Cache Images.
181*** jcrossclient: your client is broken, use deliantra or gcfclient.
182***
183***
184EOF
185 if ($ns->version =~ /jcrossclient/) {
186 # let them, for now
187 } else {
188 $ns->flush;
189 return $ns->destroy;
190 }
191
192 # $ns->facecache = true;
193 }
194
195 if ($ns->mapmode < cf::Map1aCmd) {
196 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
197
198
199***
200*** WARNING:
201*** Your client is too old. Please upgrade to a newer version.
202EOF
203
204 $ns->flush;
205 return $ns->destroy;
206 }
207 159
208 $ns->pl and return $ns->destroy; 160 $ns->pl and return $ns->destroy;
209 161
210 $ns->async (sub { 162 $ns->async (sub {
211 $Coro::current->{desc} = "addme init"; 163 $Coro::current->{desc} = "addme init";
… …
222 cf::NDI_BLUE 174 cf::NDI_BLUE
223 ); 175 );
224 176
225 # read username 177 # read username
226 while () { 178 while () {
227 $user = query $ns, 0, "What is your name?\n:"; 179 $user = query $ns, 0, "What is your name? (login names are case-sensitive)\n:";
228 180
229 if ($cf::LOGIN_LOCK{$user}) { 181 if ($cf::LOGIN_LOCK{$user}) {
230 $ns->send_drawinfo ( 182 $ns->send_drawinfo (
231 "That username is currently used in another login session. " 183 "That username is currently used in another login session. "
232 . "Chose another, or wait till the other session has ended.", 184 . "Chose another, or wait till the other session has ended.",
233 cf::NDI_RED 185 cf::NDI_RED
234 ); 186 );
235 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,17}\z/) { 187 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,19}\z/) {
236 last; 188 last;
237 } else { 189 } else {
238 $ns->send_drawinfo ( 190 $ns->send_drawinfo (
239 "Your username contains illegal characters " 191 "Your username contains illegal characters "
240 . "(only a-z, A-Z and 0-9 are allowed), " 192 . "(only a-z, A-Z and 0-9 are allowed), "
241 . "or is not between 3 and 18 characters in length.", 193 . "or is not between 3 and 20 characters in length.",
242 cf::NDI_RED 194 cf::NDI_RED
243 ); 195 );
244 } 196 }
245 Coro::Timer::sleep 0.4; 197 Coro::Timer::sleep 0.4;
246 } 198 }
… …
292 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) { 244 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) {
293 nuke_str $pass; 245 nuke_str $pass;
294 # password matches, wonderful 246 # password matches, wonderful
295 my $pl = cf::player::find $user or next; 247 my $pl = cf::player::find $user or next;
296 $pl->connect ($ns); 248 $pl->connect ($ns);
249 $pl->ob->flag (cf::FLAG_DEBUG, 1);#d# temp
250 #d# Coro::Timer::sleep 60;#d# log out here to trigger DEBUG bug
297 enter_map $pl; 251 enter_map $pl;
298 last; 252 last;
299 } elsif (can_cleanup $pl, $mtime) { 253 } elsif (can_cleanup $pl, $mtime) {
300 Coro::Timer::sleep 1; 254 Coro::Timer::sleep 1;
301 255
… …
432 Coro::Timer::sleep 0.2; 386 Coro::Timer::sleep 0.2;
433 } 387 }
434 388
435 $ob->reply (undef, "Welcome to Deliantra!"); 389 $ob->reply (undef, "Welcome to Deliantra!");
436 390
391 # XXX: Workaround for delayed client ext protocol handshake
392 $pl->esrv_new_player;
393
437 delete $pl->{deny_save}; 394 delete $pl->{deny_save};
438 395
439 last; 396 last;
440 } 397 }
441 }); 398 });
442}); 399});
443 400
444cf::register_command quit => sub { 401cf::register_command quit => sub {
445 my ($ob, $arg) = @_; 402 my ($ob, $arg) = @_;
446 403
447 $ob->reply (undef, 404 $ob->send_msg (undef,
448 "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. " 405 "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. "
449 . "If you are sure you want to do this, then use the quit_character command instead of quit.", 406 . "If you are sure you want to do this, then use the quit_character command instead of quit.",
450 cf::NDI_UNIQUE | cf::NDI_RED); 407 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
451}; 408};
452 409
453cf::register_command quit_character => sub { 410cf::register_command quit_character => sub {
454 my ($ob, $arg) = @_; 411 my ($ob, $arg) = @_;
455 412
456 my $pl = $ob->contr; 413 my $pl = $ob->contr;
457 414
458 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub { 415 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub {
459 if ($_[0] !~ /^[yY]/) { 416 if ($_[0] !~ /^[yY]/) {
460 $ob->reply (undef, 417 $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
461 "Ok, not not quitting then.",
462 cf::NDI_UNIQUE | cf::NDI_RED);
463 } else { 418 } else {
464 $ob->reply (undef, 419 $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
465 "Ok, quitting, hope to see you again.",
466 cf::NDI_UNIQUE | cf::NDI_RED);
467 $pl->ns->flush; 420 $pl->ns->flush;
468 cf::async { $pl->quit_character }; 421 cf::async { $pl->quit_character };
469 } 422 }
470 }); 423 });
471}; 424};
… …
484 cf::async { $pl->save }; 437 cf::async { $pl->save };
485 438
486 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy; 439 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
487 $ob->check_score; 440 $ob->check_score;
488 441
489 $ob->reply (undef, "In the future, you will wake up here when you die."); 442 $ob->send_msg ($cf::SAY_CHANNEL => "In the future, you will wake up here when you die.", cf::NDI_DEF | cf::NDI_REPLY);
490 443
491 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub { 444 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
492 if ($_[0] !~ /^[yY]/) { 445 if ($_[0] !~ /^[yY]/) {
493 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1); 446 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1);
494 $pl->deactivate; 447 $pl->deactivate;
… …
519 unless safe_spot $pl; 472 unless safe_spot $pl;
520 } 473 }
521 }, 474 },
522); 475);
523 476
524#############################################################################
525 477
526our $SCHEDULE_INTERVAL = $cf::CFG{player_schedule_interval} || 10; # time the player scheduler sleeps between runs
527our $SAVE_TIMEOUT = $cf::CFG{player_save_interval} || 20; # save players every n seconds
528
529our $SCHEDULER = cf::async_ext {
530 $Coro::current->{desc} = "player scheduler";
531
532 while () {
533 Coro::EV::timer_once $SCHEDULE_INTERVAL;
534
535 # this weird form of iteration over values is used because
536 # the hash changes underneath us frequently, and for
537 # keeps a direct reference to the value without (in 5.8 perls)
538 # keeping a reference, so this is prone to crashes or worse.
539 my @players = keys %cf::PLAYER;
540 for (@players) {
541 my $pl = $cf::PLAYER{$_}
542 or next;
543 $pl->valid or next;
544
545 eval {
546 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
547 $pl->save;
548
549 unless ($pl->active || $pl->ns) {
550 # check refcounts, this is tricky and needs to be adjusted to fit server internals
551 my $ob = $pl->ob;
552
553 my $pl_ref = $pl->refcnt_cnt;
554 my $ob_ref = $ob->refcnt_cnt;
555
556 ## pl_ref == $pl + ob->contr + %cf::PLAYER
557 ## ob_ref == $ob + pl->observe + simply being an object
558 if ($pl_ref == 3 && $ob_ref == 3) {
559 warn "player-scheduler destroy ", $ob->name;#d#
560
561 # remove from sight and get fresh "copies"
562 $pl = delete $cf::PLAYER{$ob->name};
563 $ob = $pl->ob;
564
565 $pl->destroy; # destroys $ob
566 } else {
567 my $a_ = $pl->refcnt;#d#
568 my $b_ = $ob->refcnt;#d#
569
570 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref/3 ob $ob_ref/3 (C pl $a_/1 ob $b_/2)\n";#d#
571 }
572 }
573 }
574 };
575 warn $@ if $@;
576 cf::cede_to_tick;
577 };
578 }
579};
580
581$SCHEDULER->prio (1);
582

Diff Legend

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