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.62 by root, Sat Jul 14 14:33:29 2007 UTC vs.
Revision 1.97 by root, Sat Dec 27 01:25:00 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#
58 my $ob = $pl->ob; 76 my $ob = $pl->ob;
59 77
60 my ($map, $x, $y) 78 my ($map, $x, $y)
61 = $ob->{_link_pos} 79 = $ob->{_link_pos}
62 ? @{delete $ob->{_link_pos}} 80 ? @{delete $ob->{_link_pos}}
63 : ($pl->maplevel, $ob->x, $ob->y); 81 : ($pl->maplevel, $ob->x, $ob->y);
64 82
83 warn $pl->ob->name, ": enter map 2\n";#d#
65 $ob->enter_link; 84 $ob->enter_link;
85 warn $pl->ob->name, ": enter map 3\n";#d#
66 86
87 my $m = cf::map::find $map;
67 if (my $time = delete $pl->{unclean_save}) { 88 my $time = delete $pl->{unclean_save};
68 if (my $m = cf::map::find $map) { 89 warn $pl->ob->name, ": enter map 4\n";#d#
90
91 if ($time && $m) {
69 if ($time < $m->{instantiate_time} || 1) {#d# 92 if ($time < $m->{instantiate_time}) {
70 # the map was reset in the meantime 93 # the map was reset in the meantime
71 my $age = $cf::RUNTIME - $time; 94 my $age = $cf::RUNTIME - $time;
95
72 warn $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#
73 97
74 # 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 {
75 ($map, $x, $y) = $pl->savebed; 111 ($map, $x, $y) = $pl->savebed;
76 112
77 $pl->ns->send_drawinfo ( 113 $ob->message (
78 "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. "
79 . "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. "
80 . "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.>",
81 cf::NDI_RED 118 cf::NDI_RED
82 ); 119 );
120 }
83 } else { 121 } else {
84 $pl->ns->send_drawinfo ( 122 $ob->message (
85 "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, "
86 . "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, "
87 . "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.>",
88 cf::NDI_RED 127 cf::NDI_RED
89 ); 128 );
90 }
91 } 129 }
92 } 130 }
93 131
132 warn $pl->ob->name, ": enter map 5\n";#d#
94 $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
95} 142}
96 143
97# delete a player directory, be non-blocking AND synchronous... 144# delete a player directory, be non-blocking AND synchronous...
98# (thats hard, so we crap out and fork). 145# (that's hard, so we crap out and fork).
99sub nuke_playerdir { 146sub nuke_playerdir {
100 my ($user) = @_; 147 my ($user) = @_;
101 148
102 aio_stat "$PLAYERDIR/$user"; 149 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
103 system "cd \Q$PLAYERDIR\E " 150
104 . "&& mv \Q$user\E ~\Q$Coro::current\E~deleting~ 2>/dev/null " 151 cf::fork_call {
105 . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)"; 152 rename "$PLAYERDIR/$user", $temp;
153 system "rm", "-rf", $temp;
154 };
106} 155}
107 156
108cf::client->attach (on_addme => sub { 157cf::client->attach (on_addme => sub {
109 my ($ns) = @_; 158 my ($ns) = @_;
110 159
111 if (!$ns->facecache)
112 {
113 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
114
115
116***
117*** WARNING:
118*** Your client does not support face/image caching,
119*** or it has been disabled. Face caching is mandatory
120*** so please enable it or use a newer client.
121***
122*** Look at your client preferences:
123***
124*** CFPlus: all known versions automatically enable the facecache.
125*** cfclient: use the -cache commandline option.
126*** cfclient: map will not redraw automatically (bug).
127*** gcfclient: use -cache commandline option, or enable
128*** gcfclient: Client=>Configure=>Map & Image=>Cache Images.
129*** jcrossclient: your client is broken, use CFPlus or gcfclient.
130***
131***
132EOF
133 if ($ns->version =~ /jcrossclient/) {
134 # let them, for now
135 } else {
136 $ns->flush;
137 return $ns->destroy;
138 }
139
140 # $ns->facecache = true;
141 }
142
143 if ($ns->mapmode < cf::Map1aCmd) {
144 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
145
146
147***
148*** WARNING:
149*** Your client is too old. Please upgrade to a newer version.
150EOF
151
152 $ns->flush;
153 return $ns->destroy;
154 }
155
156 $ns->pl and return $ns->destroy; 160 $ns->pl and return $ns->destroy;
157 161
158 $ns->async (sub { 162 $ns->async (sub {
163 $Coro::current->{desc} = "addme init";
164
159 my ($user, $pass); 165 my ($user, $pass);
160 166
161 $ns->send_packet ("addme_success"); 167 $ns->send_packet ("addme_success");
162 168
163 for (;;) { 169 for (;;) {
… …
168 cf::NDI_BLUE 174 cf::NDI_BLUE
169 ); 175 );
170 176
171 # read username 177 # read username
172 while () { 178 while () {
173 $user = query $ns, 0, "What is your name?\n:"; 179 $user = query $ns, 0, "What is your name? (login names are case-sensitive)\n:";
174 180
175 if ($cf::LOGIN_LOCK{$user}) { 181 if ($cf::LOGIN_LOCK{$user}) {
176 $ns->send_drawinfo ( 182 $ns->send_drawinfo (
177 "That username is currently used in another login session. " 183 "That username is currently used in another login session. "
178 . "Chose another, or wait till the other session has ended.", 184 . "Chose another, or wait till the other session has ended.",
179 cf::NDI_RED 185 cf::NDI_RED
180 ); 186 );
181 } 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/) {
182 last; 188 last;
183 } else { 189 } else {
184 $ns->send_drawinfo ( 190 $ns->send_drawinfo (
185 "Your username contains illegal characters " 191 "Your username contains illegal characters "
186 . "(only a-z, A-Z and 0-9 are allowed), " 192 . "(only a-z, A-Z and 0-9 are allowed), "
187 . "or is not between 3 and 18 characters in length.", 193 . "or is not between 3 and 20 characters in length.",
188 cf::NDI_RED 194 cf::NDI_RED
189 ); 195 );
190 } 196 }
191 Coro::Timer::sleep 0.4; 197 Coro::Timer::sleep 0.4;
192 } 198 }
193 199
194 check_playing $ns, $user and next; 200 check_playing $ns, $user and next;
201
202 $Coro::current->{desc} = "addme($user) pass";
195 203
196 $ns->send_drawinfo ( 204 $ns->send_drawinfo (
197 "Welcome $user, please enter your password now. " 205 "Welcome $user, please enter your password now. "
198 . "New users should now choose a password. " 206 . "New users should now choose a password. "
199 . "Anything your client lets you enter is fine.", 207 . "Anything your client lets you enter is fine.",
… …
223 } 231 }
224 local $cf::LOGIN_LOCK{$user} = 1; 232 local $cf::LOGIN_LOCK{$user} = 1;
225 233
226 check_playing $ns, $user and next; 234 check_playing $ns, $user and next;
227 235
236 $Coro::current->{desc} = "addme($user) check";
237
228 # try to read the user file and check the password 238 # try to read the user file and check the password
229 if (my $pl = cf::player::find $user) { 239 if (my $pl = cf::player::find $user) {
230 aio_stat $pl->path and next; 240 aio_stat $pl->path and next;
231 my $mtime = (stat _)[9]; 241 my $mtime = (stat _)[9];
232 my $hash = $pl->password; 242 my $hash = $pl->password;
… …
234 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) {
235 nuke_str $pass; 245 nuke_str $pass;
236 # password matches, wonderful 246 # password matches, wonderful
237 my $pl = cf::player::find $user or next; 247 my $pl = cf::player::find $user or next;
238 $pl->connect ($ns); 248 $pl->connect ($ns);
249 $pl->ob->flag (cf::FLAG_DEBUG, 1);#d# temp
239 enter_map $pl; 250 enter_map $pl;
240 last; 251 last;
241 } elsif (can_cleanup $pl, $mtime) { 252 } elsif (can_cleanup $pl, $mtime) {
242 Coro::Timer::sleep 1; 253 Coro::Timer::sleep 1;
243 254
… …
285 next; 296 next;
286 } 297 }
287 } 298 }
288 299
289 # the rest of this function is character creation 300 # the rest of this function is character creation
301 $Coro::current->{desc} = "addme($user) chargen";
290 302
291 # just to make sure nothing is left over 303 # just to make sure nothing is left over
292 nuke_playerdir $user; 304 nuke_playerdir $user;
293 305
294 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again."; 306 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
… …
331 } 343 }
332 } else { 344 } else {
333 $ob->roll_stats; 345 $ob->roll_stats;
334 } 346 }
335 347
336 Coro::Timer::sleep 0.2; 348 Coro::Timer::sleep 0.05;
337 } 349 }
338 350
339 $ob->set_animation (2); 351 $ob->set_animation (2);
340 $ob->add_statbonus; 352 $ob->add_statbonus;
341 353
342 while () { 354 while () {
343 $ns->send_msg (-1, "chargen-race-title", ucfirst $pl->title); 355 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
344 my $msg = $ob->msg; 356 my $msg = $ob->msg;
345 $msg =~ s/(?<=\S)\n(?=\S)/ /g; 357 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
346 $ns->send_msg (cf::NDI_BLUE, "chargen-race-description", $msg); 358 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
347 359
348 my $res = query $ns, cf::CS_QUERY_SINGLECHAR, 360 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
349 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n"; 361 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
350 362
351 last if $res =~ /[dD]/; 363 last if $res =~ /[dD]/;
352 364
353 $pl->chargen_race_next; 365 $pl->chargen_race_next;
354 Coro::Timer::sleep 0.2; 366 Coro::Timer::sleep 0.2;
355 } 367 }
356 368
369 # create the playerdir, if necessary, as chargen_race_done did it before
370 # presumably because of unique maps
371 aio_mkdir playerdir $pl, 0770;
357 $pl->chargen_race_done; 372 $pl->chargen_race_done;
358 373
359 while () { 374 while () {
360 my $res = query $ns, cf::CS_QUERY_SINGLECHAR, 375 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
361 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n"; 376 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
… …
368 last; 383 last;
369 } 384 }
370 Coro::Timer::sleep 0.2; 385 Coro::Timer::sleep 0.2;
371 } 386 }
372 387
373 $ob->reply (undef, "Welcome to Crossfire!"); 388 $ob->reply (undef, "Welcome to Deliantra!");
389
390 # XXX: Workaround for delayed client ext protocol handshake
391 $pl->esrv_new_player;
374 392
375 delete $pl->{deny_save}; 393 delete $pl->{deny_save};
376 394
377 last; 395 last;
378 } 396 }
… …
380}); 398});
381 399
382cf::register_command quit => sub { 400cf::register_command quit => sub {
383 my ($ob, $arg) = @_; 401 my ($ob, $arg) = @_;
384 402
385 $ob->reply (undef, 403 $ob->send_msg (undef,
386 "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. " 404 "Quitting will delete your character PERMANENTLY: It will be gone forever and any progress will be lost. "
387 . "If you are sure you want to do this, then use the quit_character command instead of quit.", 405 . "If you are sure you want to do this, then use the quit_character command instead of quit.",
388 cf::NDI_UNIQUE | cf::NDI_RED); 406 cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
389}; 407};
390 408
391cf::register_command quit_character => sub { 409cf::register_command quit_character => sub {
392 my ($ob, $arg) = @_; 410 my ($ob, $arg) = @_;
393 411
394 my $pl = $ob->contr; 412 my $pl = $ob->contr;
395 413
396 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub { 414 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to PERMANENTLY delete your character and all associated data (y/n)?", sub {
397 if ($_[0] !~ /^[yY]/) { 415 if ($_[0] !~ /^[yY]/) {
398 $ob->reply (undef, 416 $ob->send_msg (undef, "Ok, not not quitting then.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
399 "Ok, not not quitting then.",
400 cf::NDI_UNIQUE | cf::NDI_RED);
401 } else { 417 } else {
402 $ob->reply (undef, 418 $ob->send_msg (undef, "Ok, quitting, hope to see you again.", cf::NDI_UNIQUE | cf::NDI_RED | cf::NDI_REPLY);
403 "Ok, quitting, hope to see you again.",
404 cf::NDI_UNIQUE | cf::NDI_RED);
405 $pl->ns->flush; 419 $pl->ns->flush;
406 cf::async { $pl->quit_character }; 420 cf::async { $pl->quit_character };
407 } 421 }
408 }); 422 });
409}; 423};
… …
419 433
420 # update respawn position 434 # update respawn position
421 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 435 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
422 cf::async { $pl->save }; 436 cf::async { $pl->save };
423 437
424 $pl->killer ("left"); 438 my $killer = cf::arch::get "killer_logout"; $pl->killer ($killer); $killer->destroy;
425 $ob->check_score; 439 $ob->check_score;
426 440
427 $ob->reply (undef, "In the future, you will wake up here when you die."); 441 $ob->send_msg ($cf::SAY_CHANNEL => "In the future, you will wake up here when you die.", cf::NDI_DEF | cf::NDI_REPLY);
428 442
429 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub { 443 $pl->ns->query (cf::CS_QUERY_SINGLECHAR, "Do you want to continue playing (y/n)?", sub {
430 if ($_[0] !~ /^[yY]/) { 444 if ($_[0] !~ /^[yY]/) {
431 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1); 445 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1);
432 $pl->deactivate; 446 $pl->deactivate;
… …
451 465
452 if ($cleanly) { 466 if ($cleanly) {
453 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 467 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
454 } else { 468 } else {
455 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 469 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
456 $pl->{unclean_save} = $cf::RUNTIME; 470 $pl->{unclean_save} = $cf::RUNTIME
471 unless safe_spot $pl;
457 } 472 }
458 }, 473 },
459); 474);
460 475
461#############################################################################
462 476
463our $SCHEDULE_INTERVAL = 10; # time the player scheduler sleeps between runs
464our $SAVE_TIMEOUT = 20; # save players every n seconds
465
466our $SCHEDULER = cf::async_ext {
467 my $schedule_interval = Coro::Event->timer (after => 1, interval => $SCHEDULE_INTERVAL);
468 while () {
469 $schedule_interval->next;
470
471 # this weird form of iteration over values is used because
472 # the hash changes underneath us frequently, and for
473 # keeps a direct reference to the value without (in 5.8 perls)
474 # keeping a reference, so this is prone to crashes or worse.
475 my @players = keys %cf::PLAYER;
476 for (@players) {
477 my $pl = $cf::PLAYER{$_}
478 or next;
479 $pl->valid or next;
480
481 eval {
482 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
483 cf::wait_for_tick_begin;
484 $pl->save;
485
486 unless ($pl->active || $pl->ns) {
487 # check refcounts, this is tricky and needs to be adjusted to fit server internals
488 my $ob = $pl->ob;
489
490 my $pl_ref = $pl->refcnt_cnt;
491 my $ob_ref = $ob->refcnt_cnt;
492
493 ## pl_ref == $pl + ob->contr + %cf::PLAYER
494 ## ob_ref == $ob + pl->observe + simply being an object
495 if ($pl_ref == 3 && $ob_ref == 3) {
496 warn "player-scheduler destroy ", $ob->name;#d#
497
498 # remove from sight and get fresh "copies"
499 $pl = delete $cf::PLAYER{$ob->name};
500 $ob = $pl->ob;
501
502 $pl->destroy; # destroys $ob
503 } else {
504 my $a_ = $pl->refcnt;#d#
505 my $b_ = $ob->refcnt;#d#
506
507 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref ob $ob_ref (C pl $a_ ob $b_)\n";#d#
508 }
509 }
510 }
511 };
512 warn $@ if $@;
513 Coro::cede;
514 };
515 }
516};
517
518$SCHEDULER->prio (1);
519

Diff Legend

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