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.34 by root, Tue Apr 3 00:21:37 2007 UTC vs.
Revision 1.53 by root, Mon Jun 11 21:38:13 2007 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); 7use List::Util qw(min max);
8 8
9my $PLAYERDIR = sprintf "%s/%s", cf::localdir, cf::playerdir; 9our %EXT_SETUP;
10 10
11# paranoia function to overwrite a string-in-place 11# paranoia function to overwrite a string-in-place
12sub nuke_str { 12sub nuke_str {
13 substr $_[0], 0, (length $_[0]), "x" x length $_[0] 13 substr $_[0], 0, (length $_[0]), "x" x length $_[0]
14} 14}
15 15
16sub query { 16sub query {
17 my ($ns, $flags, $text) = @_; 17 my ($ns, $flags, $text) = @_;
18 18
19 my $current = $Coro::current; 19 my $current = $Coro::current;
20 $ns->query ($flags, $text, sub { $current->ready; $current = $_[0]; }); 20 $ns->query ($flags, $text, sub { $current->ready; $current = $_[0] });
21 Coro::schedule while ref $current; 21 Coro::schedule while ref $current;
22 22
23 $current 23 $current
24} 24}
25 25
53 ); 53 );
54 54
55 1 55 1
56} 56}
57 57
58sub check_clean_save { 58sub enter_map {
59 my ($pl) = @_; 59 my ($pl) = @_;
60 60
61 my ($map, $x, $y)
62 = $pl->ob->{_link_pos}
63 ? @{delete $pl->ob->{_link_pos}}
64 : ($pl->maplevel, $pl->ob->x, $pl->ob->y);
65
66 $pl->ob->enter_link;
67
61 if (my $time = delete $pl->{unclean_save}) { 68 if (my $time = delete $pl->{unclean_save}) {
69 if (my $m = cf::map::find $map) {
70 if ($time < $m->{instantiate_time}) {
71 # the map was reset in the meantime
72 my $age = $cf::RUNTIME - $time;
73 warn $pl->ob->name, " map reset after logout, logout age $age\n";#d#
74
75 # for now, just go back to savebed
76 ($map, $x, $y) = $pl->savebed;
77
62 $pl->ns->send_drawinfo ( 78 $pl->ns->send_drawinfo (
79 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
80 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
81 . "Better use a savebed next time, much worse things could have happened...",
82 cf::NDI_RED
83 );
84 } else {
85 $pl->ns->send_drawinfo (
63 "You didn't use a savebed to leave this realm. This is very dangerous, " 86 "You didn't use a bed to reality to leave this realm. This is very dangerous, "
64 . "as lots of things could happen when you leave by other means, such as cave-ins, " 87 . "as lots of things could happen when you leave by other means, such as cave-ins, "
65 . "or monsters suddenly snapping your body. Better use a savebed next time.", 88 . "or monsters suddenly snapping your body. Better use a savebed next time.",
66 cf::NDI_RED 89 cf::NDI_RED
90 );
91 }
67 ); 92 }
68 #d#TODO
69 } 93 }
94
95 $pl->ob->goto ($map, $x, $y);
70} 96}
71 97
72# delete a player directory, be non-blocking AND synchronous... 98# delete a player directory, be non-blocking AND synchronous...
73# (thats hard, so we crap out and fork). 99# (thats hard, so we crap out and fork).
74sub nuke_playerdir { 100sub nuke_playerdir {
76 102
77 aio_stat "$PLAYERDIR/$user"; 103 aio_stat "$PLAYERDIR/$user";
78 system "cd \Q$PLAYERDIR\E " 104 system "cd \Q$PLAYERDIR\E "
79 . "&& mv \Q$user\E ~\Q$Coro::current\E~deleting~ 2>/dev/null " 105 . "&& mv \Q$user\E ~\Q$Coro::current\E~deleting~ 2>/dev/null "
80 . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)"; 106 . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)";
107}
108
109sub send_capabilities {
110 my ($ns) = @_;
111
112 return unless $ns->extcmd;
113
114 $ns->ext_event (capabilities =>
115 # id, name, flags (1 == 2d), edge length
116 tileset => [[1, "default 64x64 faceset", 1, 64], [0, "default 32x32 faceset", 1, 32]],
117 );
81} 118}
82 119
83sub setup { 120sub setup {
84 my ($ns, $args) = @_; 121 my ($ns, $args) = @_;
85 122
89 # we send the status of the cmd back, or a FALSE is the cmd is the server unknown 126 # we send the status of the cmd back, or a FALSE is the cmd is the server unknown
90 # The client then must sort this out 127 # The client then must sort this out
91 128
92 my %setup = split / +/, $args; 129 my %setup = split / +/, $args;
93 while (my ($k, $v) = each %setup) { 130 while (my ($k, $v) = each %setup) {
94
95 if ($k eq "sound") { 131 if ($k eq "sound") {
96 $ns->sound ($v); 132 $ns->sound ($v);
97 133
98 } elsif ($k eq "exp64") { 134 } elsif ($k eq "exp64") {
99 $setup{$k} = 1; 135 $setup{$k} = 1;
100 136
101 } elsif ($k eq "spellmon") { 137 } elsif ($k eq "spellmon") {
102 $ns->monitor_spells ($v); 138 $ns->monitor_spells ($v);
103 139
104 } elsif ($k eq "darkness") { 140 } elsif ($k eq "darkness") {
105 $ns->darkness ($v); 141 $ns->darkness ($v);
106 142
107 } elsif ($k eq "map1cmd") { 143 } elsif ($k eq "map1cmd") {
108 $ns->mapmode (cf::Map1Cmd) if $v > 0; 144 $ns->mapmode (cf::Map1Cmd) if $v > 0;
109 145
110 } elsif ($k eq "map1acmd") { 146 } elsif ($k eq "map1acmd") {
111 $ns->mapmode (cf::Map1aCmd) if $v > 0; 147 $ns->mapmode (cf::Map1aCmd) if $v > 0;
112 148
113 } elsif ($k eq "map2cmd") { 149 } elsif ($k eq "map2cmd") {
114 # gcfclient bug, map1acmd is sent too late 150 # gcfclient bug, map1acmd is sent too late
115 $ns->mapmode (cf::Map1aCmd); 151 $ns->mapmode (cf::Map1aCmd);
116 $setup{$k} = "FALSE"; 152 $setup{$k} = "FALSE";
117 153
118 } elsif ($k eq "newmapcmd") { 154 } elsif ($k eq "newmapcmd") {
119 $ns->newmapcmd ($v); 155 $ns->newmapcmd ($v);
120 156
121 } elsif ($k eq "mapinfocmd") { 157 } elsif ($k eq "mapinfocmd") {
122 $ns->mapinfocmd ($v); 158 $ns->mapinfocmd ($v);
123 159
124 } elsif ($k eq "extcmd") { 160 } elsif ($k eq "extcmd") {
125 $ns->extcmd ($v > 0); 161 $ns->extcmd ($v > 0);
162 send_capabilities $ns;
126 163
127 } elsif ($k eq "extmap") { 164 } elsif ($k eq "extmap") {
128 $ns->extmap ($v); 165 $ns->extmap ($v);
129 166
130 } elsif ($k eq "facecache") { 167 } elsif ($k eq "facecache") {
168 if (!$v) {
169 $v = 1;
170 $setup{$k} = $v;
171 $ns->send_drawinfo ("(trying to forcefully enable facecaching)", cf::NDI_RED);
172 }
173
131 $ns->facecache ($v); 174 $ns->facecache ($v);
132 175
133 } elsif ($k eq "faceset") { 176 } elsif ($k eq "faceset") {
134 $ns->faceset (0); 177 $ns->faceset (0);
135 $setup{$k} = 0; 178 $setup{$k} = 0;
136 # $ns->image2 (1) 179 # $ns->image2 (1)
180
181 } elsif ($k eq "tileset") {
182 $setup{$k} = $ns->faceset ($v & 1);
137 183
138 } elsif ($k eq "itemcmd") { 184 } elsif ($k eq "itemcmd") {
139 # Version of the item protocol command to use. Currently, 185 # Version of the item protocol command to use. Currently,
140 # only supported versions are 1 and 2. Using a numeric 186 # only supported versions are 1 and 2. Using a numeric
141 # value will make it very easy to extend this in the future. 187 # value will make it very easy to extend this in the future.
142 $ns->itemcmd ($v) if $v >= 1 && $v <= 2; 188 $ns->itemcmd ($v) if $v >= 1 && $v <= 2;
143 189
144 $setup{$k} = $ns->itemcmd; 190 $setup{$k} = $ns->itemcmd;
145 191
146 } elsif ($k eq "mapsize") { 192 } elsif ($k eq "mapsize") {
147 my ($x, $y) = split /x/, $v; 193 my ($x, $y) = split /x/, $v;
148 194
149 $ns->mapx ($x = max 9, min cf::MAP_CLIENT_X, $x); 195 $ns->mapx ($x = max 9, min cf::MAP_CLIENT_X, ($x - 1) | 1);
150 $ns->mapy ($y = max 9, min cf::MAP_CLIENT_Y, $y); 196 $ns->mapy ($y = max 9, min cf::MAP_CLIENT_Y, ($y - 1) | 1);
151 197
152 $setup{$k} = "${x}x${y}"; 198 $setup{$k} = "${x}x${y}";
153 199
154 } elsif ($k eq "extendedMapInfos") { 200 } elsif ($k eq "extendedMapInfos") {
155 $ns->ext_mapinfos ($v); 201 $ns->ext_mapinfos ($v);
156 202
157 } elsif ($k eq "extendedTextInfos") { 203 } elsif ($k eq "extendedTextInfos") {
158 $ns->has_readable_type ($v); 204 $ns->has_readable_type ($v);
205
206 } elsif ($k eq "smoothing") { # cfplus-style smoothing
207 $ns->smoothing ($v);
159 208
160 } elsif ($k eq "fxix") { 209 } elsif ($k eq "fxix") {
161 $ns->fxix ($v); 210 $ns->fxix ($v);
211
212 } elsif ($k eq "msg") {
213 $ns->can_msg ($v);
214
215 } elsif ($k eq "excmd") {
216 # we support it
162 217
163 } else { 218 } else {
164 # other commands: 219 # other commands:
165 # sexp: no idea, probably for oudated servers 220 # sexp: no idea, probably for oudated servers
166 # tick: more stupidity, server should sned a tick per tick 221 # tick: more stupidity, server should send a tick per tick
167 222
168 $setup{$k} = "FALSE"; 223 $setup{$k} = "FALSE";
169 } 224 }
170 } 225 }
171 226
172 $ns->send_packet (join " ", setup => %setup); 227 $ns->send_packet (join " ", setup => %setup);
173 228
305 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) { 360 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) {
306 nuke_str $pass; 361 nuke_str $pass;
307 # password matches, wonderful 362 # password matches, wonderful
308 my $pl = cf::player::find $user or next; 363 my $pl = cf::player::find $user or next;
309 $pl->connect ($ns); 364 $pl->connect ($ns);
310 check_clean_save $pl; 365 enter_map $pl;
311 last; 366 last;
312 } elsif (can_cleanup $pl, $mtime) { 367 } elsif (can_cleanup $pl, $mtime) {
313 Coro::Timer::sleep 1; 368 Coro::Timer::sleep 1;
314 369
315 $ns->send_drawinfo ( 370 $ns->send_drawinfo (
336 Coro::Timer::sleep 1; 391 Coro::Timer::sleep 1;
337 392
338 $ns->send_drawinfo ( 393 $ns->send_drawinfo (
339 "Wrong username or password. Please try again " 394 "Wrong username or password. Please try again "
340 . "(check for Numlock and other semi-obvious error sources).", 395 . "(check for Numlock and other semi-obvious error sources).",
396 cf::NDI_RED
397 );
398 next;
399 }
400 } else {
401 # unable to load the playerfile:
402 # check wether the player dir exists, which means the file is corrupted or
403 # something very similar.
404 if (!aio_stat cf::player::playerdir $user) {
405 $ns->send_drawinfo (
406 "Unable to retrieve this player. It might be a locked or broken account. "
407 . "If this is your account, ask a dungeon master for assistance. "
408 . "Otherwise choose a different login name.",
341 cf::NDI_RED 409 cf::NDI_RED
342 ); 410 );
343 next; 411 next;
344 } 412 }
345 } 413 }
365 433
366 my $pl = cf::player::new $user; 434 my $pl = cf::player::new $user;
367 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]); 435 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]);
368 nuke_str $pass; 436 nuke_str $pass;
369 $pl->connect ($ns); 437 $pl->connect ($ns);
370
371 my $ob = $pl->ob; 438 my $ob = $pl->ob;
439
440 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
372 441
373 while () { 442 while () {
374 $ob->update_stats; 443 $ob->update_stats;
375 $pl->save_stats; 444 $pl->save_stats;
376 445
391 } 460 }
392 461
393 $ob->set_animation (2); 462 $ob->set_animation (2);
394 $ob->add_statbonus; 463 $ob->add_statbonus;
395 464
396 $ns->send_drawinfo ($ob->msg, cf::NDI_BLUE); 465 while () {
397 $ns->send_packet (sprintf "query %d %s", cf::CS_QUERY_SINGLECHAR, 466 $ns->send_msg (-1, "chargen-race-title", ucfirst $pl->title);
467 my $msg = $ob->msg;
468 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
469 $ns->send_msg (cf::NDI_BLUE, "chargen-race-description", $msg);
470
471 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
398 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n"); 472 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
399 473
400 $ns->state (cf::ST_CHANGE_CLASS); 474 last if $res =~ /[dD]/;
475
476 $pl->chargen_race_next;
477 }
478
479 $pl->chargen_race_done;
480
401 delete $pl->{deny_save};#d# too early 481 delete $pl->{deny_save};
402 482
403 last; 483 last;
404 } 484 }
405 }); 485 });
406} 486}
509 or next; 589 or next;
510 $pl->valid or next; 590 $pl->valid or next;
511 591
512 eval { 592 eval {
513 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) { 593 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
514 $cf::WAIT_FOR_TICK_ONE->wait; 594 cf::wait_for_tick_begin;
515 $pl->save; 595 $pl->save;
516 596
517 unless ($pl->active) { 597 unless ($pl->active || $pl->ns) {
518 # check refcounts, this is tricky and needs to be adjusted to fit server internals 598 # check refcounts, this is tricky and needs to be adjusted to fit server internals
519 my $ob = $pl->ob; 599 my $ob = $pl->ob;
520 Scalar::Util::weaken $pl; 600
521 Scalar::Util::weaken $ob;
522 my $a_ = $pl->refcnt;#d#
523 my $b_ = $ob->refcnt;#d#
524 my $pl_ref = $pl->refcnt_cnt; 601 my $pl_ref = $pl->refcnt_cnt;
525 my $ob_ref = $ob->refcnt_cnt; 602 my $ob_ref = $ob->refcnt_cnt;
526 603
527 ## pl_ref == one from object + one from cf::PLAYER 604 ## pl_ref == $pl + ob->contr + %cf::PLAYER
528 ## ob_ref == one from simply being an object 605 ## ob_ref == $ob + pl->observe + simply being an object
529 if ($pl_ref == 2 && $ob_ref == 1) { 606 if ($pl_ref == 3 && $ob_ref == 3) {
530 warn "player-scheduler destroy ", $ob->name;#d# 607 warn "player-scheduler destroy ", $ob->name;#d#
531 608
532 # remove from sight and get fresh "copies" 609 # remove from sight and get fresh "copies"
533 $pl = delete $cf::PLAYER{$ob->name}; 610 $pl = delete $cf::PLAYER{$ob->name};
534 $ob = $pl->ob; 611 $ob = $pl->ob;
535 612
536 $ob->destroy; 613 $ob->destroy;
537 $pl->destroy; 614 $pl->destroy;
538 } else { 615 } else {
616 my $a_ = $pl->refcnt;#d#
617 my $b_ = $ob->refcnt;#d#
618
539 warn "player-scheduler refcnt ", $ob->name, " $pl_ref,$a_ $ob_ref,$b_\n";#d# 619 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref ob $ob_ref (C pl $a_ ob $b_)\n";#d#
540 } 620 }
541 } 621 }
542 } 622 }
543 }; 623 };
544 warn $@ if $@; 624 warn $@ if $@;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines