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.45 by root, Tue Apr 24 00:42:02 2007 UTC vs.
Revision 1.78 by root, Mon Jan 7 01:55:19 2008 UTC

1#! perl # MANDATORY 1#! perl # mandatory
2 2
3# login handling 3# login handling
4 4
5use Fcntl; 5use Fcntl;
6use Coro::AIO; 6use Coro::AIO;
7use List::Util qw(min max); 7
8our $MAX_DISCONNECT_TIME = $cf::CFG{max_disconnect_time} || 3600;
8 9
9# paranoia function to overwrite a string-in-place 10# paranoia function to overwrite a string-in-place
10sub nuke_str { 11sub nuke_str {
11 substr $_[0], 0, (length $_[0]), "x" x length $_[0] 12 substr $_[0], 0, (length $_[0]), "x" x length $_[0]
12} 13}
… …
39 return unless cf::player::find_active $user; 40 return unless cf::player::find_active $user;
40 41
41 $ns->send_drawinfo ( 42 $ns->send_drawinfo (
42 "That player is already logged in on this server. " 43 "That player is already logged in on this server. "
43 . "If you want to create a new player, choose another name. " 44 . "If you want to create a new player, choose another name. "
44 . "If you are already a registered player, make sure nobody " 45 . "If you have already a registered, make sure nobody "
45 . "else is using your account at this time. If you lost your conenction " 46 . "else is using your account at this time. If you lost your connection "
46 . "then the server will likely timeout within a minute. If you still " 47 . "then the server will likely timeout within a minute. If you still "
47 . "cannot log-in after a minute, you are still logged in. Make sure " 48 . "cannot log-in after a minute, you are still logged in. Make sure "
48 . "you do not have another client running. If you use windows, reboot, " 49 . "you do not have another client running. If you use windows, reboot, "
49 . "this will fix anything.", 50 . "this will fix anything.",
50 cf::NDI_RED 51 cf::NDI_RED
51 ); 52 );
52 53
53 1 54 1
54} 55}
55 56
56sub check_clean_save { 57sub safe_spot($$$) {
58 my ($m, $x, $y) = @_;
59
60 return 0;
61 warn join ":", $m->at ($x, $y);#d#
62 warn "FOO$m { ".scalar ($m->at ($x, $y))." }\n";
63 return 0;
64
65 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y)
66}
67
68sub enter_map {
57 my ($pl) = @_; 69 my ($pl) = @_;
58 70
71 my $ob = $pl->ob;
72
73 my ($map, $x, $y)
74 = $ob->{_link_pos}
75 ? @{delete $ob->{_link_pos}}
76 : ($pl->maplevel, $ob->x, $ob->y);
77
78 $ob->enter_link;
79
80 my $m = cf::map::find $map;
59 if (my $time = delete $pl->{unclean_save}) { 81 my $time = delete $pl->{unclean_save};
60 $pl->ns->send_drawinfo ( 82
83 if ($time && $m && !safe_spot $m, $x, $y) {
84 if ($time < $m->{instantiate_time}) {
85 # the map was reset in the meantime
86 my $age = $cf::RUNTIME - $time;
87
88 warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
89
90 ($map, $x, $y) = $pl->savebed;
91
92 if ($age >= $MAX_DISCONNECT_TIME) {
93 $ob->message (
94 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
95 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
96 . "Maybe you can find comfort in the thought that your body was quite satisfying in taste... "
97 . "H<You disconnected too long without having used a savebed.>",
98 cf::NDI_RED
99 );
100 # kill them.
101 # reminds me of the famous badness 10000 syndrome...
102 $ob->stats->hp (-10000); #] if they survive this they deserved to live
103 $pl->killer ("a cave-in");
104 } else {
105 $ob->message (
106 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
107 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
108 . "Better use a savebed next time, much worse things could have happened... "
109 . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>",
110 cf::NDI_RED
111 );
112 }
113 } else {
114 $ob->message (
61 "You didn't use a savebed to leave this realm. This is very dangerous, " 115 "You didn't use a bed to reality to leave this realm. This is very dangerous, "
62 . "as lots of things could happen when you leave by other means, such as cave-ins, " 116 . "as lots of things could happen when you leave by other means, such as cave-ins, "
63 . "or monsters suddenly snapping your body. Better use a savebed next time.", 117 . "or monsters suddenly snapping your body. Better use a savebed next time. "
118 . "H<Always apply a bed of reality to disconnect from the server.>",
64 cf::NDI_RED 119 cf::NDI_RED
65 ); 120 );
66 #d#TODO 121 }
67 } 122 }
123
124 $ob->goto ($map, $x, $y);
68} 125}
69 126
70# delete a player directory, be non-blocking AND synchronous... 127# delete a player directory, be non-blocking AND synchronous...
71# (thats hard, so we crap out and fork). 128# (thats hard, so we crap out and fork).
72sub nuke_playerdir { 129sub nuke_playerdir {
73 my ($user) = @_; 130 my ($user) = @_;
74 131
75 aio_stat "$PLAYERDIR/$user"; 132 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
76 system "cd \Q$PLAYERDIR\E "
77 . "&& mv \Q$user\E ~\Q$Coro::current\E~deleting~ 2>/dev/null "
78 . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)";
79}
80 133
81sub send_capabilities { 134 cf::fork_call {
135 rename "$PLAYERDIR/$user", $temp;
136 system "rm", "-rf", $temp;
137 };
138}
139
140cf::client->attach (on_addme => sub {
82 my ($ns) = @_; 141 my ($ns) = @_;
83 142
84 return unless $ns->extcmd;
85
86 $ns->ext_event (capabilities =>
87 # id, name, flags (1 == 2d), edge length
88 tileset => [[1, "default 64x64 faceset", 1, 64], [0, "default 32x32 faceset", 1, 32]],
89 );
90}
91
92sub setup {
93 my ($ns, $args) = @_;
94
95 # run through the cmds of setup
96 # syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
97 #
98 # we send the status of the cmd back, or a FALSE is the cmd is the server unknown
99 # The client then must sort this out
100
101 my %setup = split / +/, $args;
102 while (my ($k, $v) = each %setup) {
103 if ($k eq "sound") {
104 $ns->sound ($v);
105
106 } elsif ($k eq "exp64") {
107 $setup{$k} = 1;
108
109 } elsif ($k eq "spellmon") {
110 $ns->monitor_spells ($v);
111
112 } elsif ($k eq "darkness") {
113 $ns->darkness ($v);
114
115 } elsif ($k eq "map1cmd") {
116 $ns->mapmode (cf::Map1Cmd) if $v > 0;
117
118 } elsif ($k eq "map1acmd") {
119 $ns->mapmode (cf::Map1aCmd) if $v > 0;
120
121 } elsif ($k eq "map2cmd") {
122 # gcfclient bug, map1acmd is sent too late
123 $ns->mapmode (cf::Map1aCmd);
124 $setup{$k} = "FALSE";
125
126 } elsif ($k eq "newmapcmd") {
127 $ns->newmapcmd ($v);
128
129 } elsif ($k eq "mapinfocmd") {
130 $ns->mapinfocmd ($v);
131
132 } elsif ($k eq "extcmd") {
133 $ns->extcmd ($v > 0);
134 send_capabilities $ns;
135
136 } elsif ($k eq "extmap") {
137 $ns->extmap ($v);
138
139 } elsif ($k eq "facecache") {
140 if (!$v) {
141 $v = 1;
142 $setup{$k} = $v;
143 $ns->send_drawinfo ("(trying to forcefully enable facecaching)", cf::NDI_RED);
144 }
145
146 $ns->facecache ($v);
147
148 } elsif ($k eq "faceset") {
149 $ns->faceset (0);
150 $setup{$k} = 0;
151 # $ns->image2 (1)
152
153 } elsif ($k eq "tileset") {
154 $setup{$k} = $ns->faceset ($v & 1);
155
156 } elsif ($k eq "itemcmd") {
157 # Version of the item protocol command to use. Currently,
158 # only supported versions are 1 and 2. Using a numeric
159 # value will make it very easy to extend this in the future.
160 $ns->itemcmd ($v) if $v >= 1 && $v <= 2;
161
162 $setup{$k} = $ns->itemcmd;
163
164 } elsif ($k eq "mapsize") {
165 my ($x, $y) = split /x/, $v;
166
167 $ns->mapx ($x = max 9, min cf::MAP_CLIENT_X, ($x - 1) | 1);
168 $ns->mapy ($y = max 9, min cf::MAP_CLIENT_Y, ($y - 1) | 1);
169
170 $setup{$k} = "${x}x${y}";
171
172 } elsif ($k eq "extendedMapInfos") {
173 $ns->ext_mapinfos ($v);
174
175 } elsif ($k eq "extendedTextInfos") {
176 $ns->has_readable_type ($v);
177
178 } elsif ($k eq "smoothing") { # cfplus-style smoothing
179 $ns->smoothing ($v);
180
181 } elsif ($k eq "fxix") {
182 $ns->fxix ($v);
183
184 } elsif ($k eq "msg") {
185 $ns->can_msg ($v);
186
187 } elsif ($k eq "excmd") {
188 # we support it
189
190 } else {
191 # other commands:
192 # sexp: no idea, probably for oudated servers
193 # tick: more stupidity, server should send a tick per tick
194
195 $setup{$k} = "FALSE";
196 }
197 }
198
199 $ns->send_packet (join " ", setup => %setup);
200
201 cf::datalog setup =>
202 request => $args,
203 reply => \%setup,
204 client => $ns->version,
205 ;
206}
207
208sub addme {
209 my ($ns) = @_;
210
211 if (!$ns->facecache) 143 if (!$ns->facecache)
212 { 144 {
213 $ns->send_drawinfo (<<EOF, cf::NDI_RED); 145 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
214 146
215 147
216*** 148***
217*** WARNING: 149*** WARNING:
218*** Your client does not support face/image caching, 150*** Your client does not support face/image caching,
… …
223*** 155***
224*** CFPlus: all known versions automatically enable the facecache. 156*** CFPlus: all known versions automatically enable the facecache.
225*** cfclient: use the -cache commandline option. 157*** cfclient: use the -cache commandline option.
226*** cfclient: map will not redraw automatically (bug). 158*** cfclient: map will not redraw automatically (bug).
227*** gcfclient: use -cache commandline option, or enable 159*** gcfclient: use -cache commandline option, or enable
228*** gcfclient: Client=>Configure=>Map & Image=>Cache Images. 160*** gcfclient: Client => Configure => Map & Image => Cache Images.
229*** jcrossclient: your client is broken, use CFPlus or gcfclient. 161*** jcrossclient: your client is broken, use CFPlus or gcfclient.
230*** 162***
231*** 163***
232EOF 164EOF
233 if ($ns->version =~ /jcrossclient/) { 165 if ($ns->version =~ /jcrossclient/) {
… …
254 } 186 }
255 187
256 $ns->pl and return $ns->destroy; 188 $ns->pl and return $ns->destroy;
257 189
258 $ns->async (sub { 190 $ns->async (sub {
191 $Coro::current->{desc} = "addme init";
192
259 my ($user, $pass); 193 my ($user, $pass);
260 194
261 $ns->send_packet ("addme_success"); 195 $ns->send_packet ("addme_success");
262 196
263 for (;;) { 197 for (;;) {
… …
286 . "(only a-z, A-Z and 0-9 are allowed), " 220 . "(only a-z, A-Z and 0-9 are allowed), "
287 . "or is not between 3 and 18 characters in length.", 221 . "or is not between 3 and 18 characters in length.",
288 cf::NDI_RED 222 cf::NDI_RED
289 ); 223 );
290 } 224 }
225 Coro::Timer::sleep 0.4;
291 } 226 }
292 227
293 check_playing $ns, $user and next; 228 check_playing $ns, $user and next;
229
230 $Coro::current->{desc} = "addme($user) pass";
294 231
295 $ns->send_drawinfo ( 232 $ns->send_drawinfo (
296 "Welcome $user, please enter your password now. " 233 "Welcome $user, please enter your password now. "
297 . "New users should now choose a password. " 234 . "New users should now choose a password. "
298 . "Anything your client lets you enter is fine.", 235 . "Anything your client lets you enter is fine.",
… …
306 $ns->send_drawinfo ( 243 $ns->send_drawinfo (
307 "Try to use at least three characters as your password please, " 244 "Try to use at least three characters as your password please, "
308 . "that cannot be too much to ask for :)", 245 . "that cannot be too much to ask for :)",
309 cf::NDI_RED 246 cf::NDI_RED
310 ); 247 );
248 Coro::Timer::sleep 0.4;
311 } 249 }
312 250
313 # lock this username for the remainder of this login session 251 # lock this username for the remainder of this login session
314 if ($cf::LOGIN_LOCK{$user}) { 252 if ($cf::LOGIN_LOCK{$user}) {
315 $ns->send_drawinfo ( 253 $ns->send_drawinfo (
… …
321 } 259 }
322 local $cf::LOGIN_LOCK{$user} = 1; 260 local $cf::LOGIN_LOCK{$user} = 1;
323 261
324 check_playing $ns, $user and next; 262 check_playing $ns, $user and next;
325 263
264 $Coro::current->{desc} = "addme($user) check";
265
326 # try to read the user file and check the password 266 # try to read the user file and check the password
327 if (my $pl = cf::player::find $user) { 267 if (my $pl = cf::player::find $user) {
328 aio_stat $pl->path and next; 268 aio_stat $pl->path and next;
329 my $mtime = (stat _)[9]; 269 my $mtime = (stat _)[9];
330 my $hash = $pl->password; 270 my $hash = $pl->password;
… …
332 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) { 272 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) {
333 nuke_str $pass; 273 nuke_str $pass;
334 # password matches, wonderful 274 # password matches, wonderful
335 my $pl = cf::player::find $user or next; 275 my $pl = cf::player::find $user or next;
336 $pl->connect ($ns); 276 $pl->connect ($ns);
337 check_clean_save $pl; 277 enter_map $pl;
338 last; 278 last;
339 } elsif (can_cleanup $pl, $mtime) { 279 } elsif (can_cleanup $pl, $mtime) {
340 Coro::Timer::sleep 1; 280 Coro::Timer::sleep 1;
341 281
342 $ns->send_drawinfo ( 282 $ns->send_drawinfo (
… …
383 next; 323 next;
384 } 324 }
385 } 325 }
386 326
387 # the rest of this function is character creation 327 # the rest of this function is character creation
328 $Coro::current->{desc} = "addme($user) chargen";
388 329
389 # just to make sure nothing is left over 330 # just to make sure nothing is left over
390 nuke_playerdir $user; 331 nuke_playerdir $user;
391 332
392 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again."; 333 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
… …
396 nuke_str $pass2; 337 nuke_str $pass2;
397 $ns->send_drawinfo ( 338 $ns->send_drawinfo (
398 "The passwords do not match, please try again.", 339 "The passwords do not match, please try again.",
399 cf::NDI_RED 340 cf::NDI_RED
400 ); 341 );
342 Coro::Timer::sleep 0.5;
401 next; 343 next;
402 } 344 }
403 345
404 nuke_str $pass2; 346 nuke_str $pass2;
405 347
406 my $pl = cf::player::new $user; 348 my $pl = cf::player::new $user;
407 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]); 349 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]);
408 nuke_str $pass; 350 nuke_str $pass;
409 $pl->connect ($ns); 351 $pl->connect ($ns);
410
411 my $ob = $pl->ob; 352 my $ob = $pl->ob;
353
354 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
412 355
413 while () { 356 while () {
414 $ob->update_stats; 357 $ob->update_stats;
415 $pl->save_stats; 358 $pl->save_stats;
416 359
… …
426 $ob->swap_stats ($res - 1, $swap - 1); 369 $ob->swap_stats ($res - 1, $swap - 1);
427 } 370 }
428 } else { 371 } else {
429 $ob->roll_stats; 372 $ob->roll_stats;
430 } 373 }
374
375 Coro::Timer::sleep 0.2;
431 } 376 }
432 377
433 $ob->set_animation (2); 378 $ob->set_animation (2);
434 $ob->add_statbonus; 379 $ob->add_statbonus;
435 380
436 while () { 381 while () {
437 $ns->send_msg (-1, "chargen-race-title", ucfirst $pl->title); 382 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
438 my $msg = $ob->msg; 383 my $msg = $ob->msg;
439 $msg =~ s/\b\n\b/ /g; 384 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
440 $ns->send_msg (cf::NDI_BLUE, "chargen-race-description", $msg); 385 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
441 386
442 my $res = query $ns, cf::CS_QUERY_SINGLECHAR, 387 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
443 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n"; 388 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
444 389
445 last if $res =~ /[dD]/; 390 last if $res =~ /[dD]/;
446 391
447 $pl->chargen_race_next; 392 $pl->chargen_race_next;
393 Coro::Timer::sleep 0.2;
448 } 394 }
449 395
450 $pl->chargen_race_done; 396 $pl->chargen_race_done;
397
398 while () {
399 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
400 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
401
402 if ($res =~ /^[fF]/) {
403 $pl->gender (1);
404 last;
405 } elsif ($res =~ /^[mM]/) {
406 $pl->gender (0);
407 last;
408 }
409 Coro::Timer::sleep 0.2;
410 }
411
412 $ob->reply (undef, "Welcome to Deliantra!");
451 413
452 delete $pl->{deny_save}; 414 delete $pl->{deny_save};
453 415
454 last; 416 last;
455 } 417 }
456 }); 418 });
457} 419});
458 420
459cf::register_command quit => sub { 421cf::register_command quit => sub {
460 my ($ob, $arg) = @_; 422 my ($ob, $arg) = @_;
461 423
462 $ob->reply (undef, 424 $ob->reply (undef,
… …
533 $pl->{unclean_save} = $cf::RUNTIME; 495 $pl->{unclean_save} = $cf::RUNTIME;
534 } 496 }
535 }, 497 },
536); 498);
537 499
538cf::client->attach (
539 on_addme => \&addme,
540 on_setup => \&setup,
541);
542
543############################################################################# 500#############################################################################
544 501
545our $SCHEDULE_INTERVAL = 10; # time the player scheduler sleeps between runs 502our $SCHEDULE_INTERVAL = $cf::CFG{player_schedule_interval} || 10; # time the player scheduler sleeps between runs
546our $SAVE_TIMEOUT = 20; # save players every n seconds 503our $SAVE_TIMEOUT = $cf::CFG{player_save_interval} || 20; # save players every n seconds
547 504
548our $SCHEDULER = cf::async_ext { 505our $SCHEDULER = cf::async_ext {
549 my $schedule_interval = Coro::Event->timer (after => 1, interval => $SCHEDULE_INTERVAL); 506 $Coro::current->{desc} = "player scheduler";
507
550 while () { 508 while () {
551 $schedule_interval->next; 509 Coro::EV::timer_once $SCHEDULE_INTERVAL;
552 510
553 # this weird form of iteration over values is used because 511 # this weird form of iteration over values is used because
554 # the hash changes underneath us frequently, and for 512 # the hash changes underneath us frequently, and for
555 # keeps a direct reference to the value without (in 5.8 perls) 513 # keeps a direct reference to the value without (in 5.8 perls)
556 # keeping a reference, so this is prone to crashes or worse. 514 # keeping a reference, so this is prone to crashes or worse.
… …
560 or next; 518 or next;
561 $pl->valid or next; 519 $pl->valid or next;
562 520
563 eval { 521 eval {
564 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) { 522 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
565 cf::wait_for_tick_begin;
566 $pl->save; 523 $pl->save;
567 524
568 unless ($pl->active) { 525 unless ($pl->active || $pl->ns) {
569 # check refcounts, this is tricky and needs to be adjusted to fit server internals 526 # check refcounts, this is tricky and needs to be adjusted to fit server internals
570 my $ob = $pl->ob; 527 my $ob = $pl->ob;
571 Scalar::Util::weaken $pl; 528
572 Scalar::Util::weaken $ob;
573 my $a_ = $pl->refcnt;#d#
574 my $b_ = $ob->refcnt;#d#
575 my $pl_ref = $pl->refcnt_cnt; 529 my $pl_ref = $pl->refcnt_cnt;
576 my $ob_ref = $ob->refcnt_cnt; 530 my $ob_ref = $ob->refcnt_cnt;
577 531
578 ## pl_ref == one from object + one from cf::PLAYER 532 ## pl_ref == $pl + ob->contr + %cf::PLAYER
579 ## ob_ref == one from simply being an object 533 ## ob_ref == $ob + pl->observe + simply being an object
580 if ($pl_ref == 2 && $ob_ref == 1) { 534 if ($pl_ref == 3 && $ob_ref == 3) {
581 warn "player-scheduler destroy ", $ob->name;#d# 535 warn "player-scheduler destroy ", $ob->name;#d#
582 536
583 # remove from sight and get fresh "copies" 537 # remove from sight and get fresh "copies"
584 $pl = delete $cf::PLAYER{$ob->name}; 538 $pl = delete $cf::PLAYER{$ob->name};
585 $ob = $pl->ob; 539 $ob = $pl->ob;
586 540
587 $ob->destroy;
588 $pl->destroy; 541 $pl->destroy; # destroys $ob
589 } else { 542 } else {
543 my $a_ = $pl->refcnt;#d#
544 my $b_ = $ob->refcnt;#d#
545
590 warn "player-scheduler refcnt ", $ob->name, " $pl_ref,$a_ $ob_ref,$b_\n";#d# 546 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref ob $ob_ref (C pl $a_ ob $b_)\n";#d#
591 } 547 }
592 } 548 }
593 } 549 }
594 }; 550 };
595 warn $@ if $@; 551 warn $@ if $@;

Diff Legend

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