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.19 by root, Mon Jan 8 19:25:53 2007 UTC vs.
Revision 1.56 by root, Sun Jun 24 04:09:29 2007 UTC

1#! perl 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 8
8my $PLAYERDIR = sprintf "%s/%s", cf::localdir, cf::playerdir; 9our %EXT_SETUP;
9 10
10# paranoia function to overwrite a string-in-place 11# paranoia function to overwrite a string-in-place
11sub nuke_str { 12sub nuke_str {
12 substr $_[0], 0, (length $_[0]), "x" x length $_[0] 13 substr $_[0], 0, (length $_[0]), "x" x length $_[0]
13} 14}
14 15
15sub query { 16sub query {
16 my ($ns, $flags, $text) = @_; 17 my ($ns, $flags, $text) = @_;
17 18
18 my $current = $Coro::current; 19 my $current = $Coro::current;
19 $ns->query ($flags, $text, sub { $current->ready; $current = $_[0]; }); 20 $ns->query ($flags, $text, sub { $current->ready; $current = $_[0] });
20 Coro::schedule while ref $current; 21 Coro::schedule while ref $current;
21 22
22 $current 23 $current
23} 24}
24 25
… …
52 ); 53 );
53 54
54 1 55 1
55} 56}
56 57
57sub check_clean_save { 58sub enter_map {
58 my ($pl) = @_; 59 my ($pl) = @_;
59 60
60 unless (delete $pl->{clean_save}) { 61 my ($map, $x, $y)
61 #d#TODO 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
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
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 (
86 "You didn't use a bed to reality to leave this realm. This is very dangerous, "
87 . "as lots of things could happen when you leave by other means, such as cave-ins, "
88 . "or monsters suddenly snapping your body. Better use a savebed next time.",
89 cf::NDI_RED
90 );
91 }
92 }
62 } 93 }
94
95 $pl->ob->goto ($map, $x, $y);
63} 96}
64 97
65# delete a player directory, be non-blocking AND synchronous... 98# delete a player directory, be non-blocking AND synchronous...
66# (thats hard, so we crap out and fork). 99# (thats hard, so we crap out and fork).
67sub nuke_playerdir { 100sub nuke_playerdir {
… …
71 system "cd \Q$PLAYERDIR\E " 104 system "cd \Q$PLAYERDIR\E "
72 . "&& 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 "
73 . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)"; 106 . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)";
74} 107}
75 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 );
118}
119
120sub setup {
121 my ($ns, $args) = @_;
122
123 # run through the cmds of setup
124 # syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
125 #
126 # we send the status of the cmd back, or a FALSE is the cmd is the server unknown
127 # The client then must sort this out
128
129 my %setup = split / +/, $args;
130 while (my ($k, $v) = each %setup) {
131 if ($k eq "sound") {
132 $ns->sound ($v);
133
134 } elsif ($k eq "exp64") {
135 $setup{$k} = 1;
136
137 } elsif ($k eq "spellmon") {
138 $ns->monitor_spells ($v);
139
140 } elsif ($k eq "darkness") {
141 $ns->darkness ($v);
142
143 } elsif ($k eq "map1cmd") {
144 $ns->mapmode (cf::Map1Cmd) if $v > 0;
145
146 } elsif ($k eq "map1acmd") {
147 $ns->mapmode (cf::Map1aCmd) if $v > 0;
148
149 } elsif ($k eq "map2cmd") {
150 # gcfclient bug, map1acmd is sent too late
151 $ns->mapmode (cf::Map1aCmd);
152 $setup{$k} = "FALSE";
153
154 } elsif ($k eq "newmapcmd") {
155 $ns->newmapcmd ($v);
156
157 } elsif ($k eq "mapinfocmd") {
158 $ns->mapinfocmd ($v);
159
160 } elsif ($k eq "extcmd") {
161 $ns->extcmd ($v > 0);
162 send_capabilities $ns;
163
164 } elsif ($k eq "extmap") {
165 $ns->extmap ($v);
166
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
174 $ns->facecache ($v);
175
176 } elsif ($k eq "faceset") {
177 $ns->faceset (0);
178 $setup{$k} = 0;
179 # $ns->image2 (1)
180
181 } elsif ($k eq "tileset") {
182 $setup{$k} = $ns->faceset ($v & 1);
183
184 } elsif ($k eq "itemcmd") {
185 # Version of the item protocol command to use. Currently,
186 # only supported versions are 1 and 2. Using a numeric
187 # value will make it very easy to extend this in the future.
188 $ns->itemcmd ($v) if $v >= 1 && $v <= 2;
189
190 $setup{$k} = $ns->itemcmd;
191
192 } elsif ($k eq "mapsize") {
193 my ($x, $y) = split /x/, $v;
194
195 $ns->mapx ($x = max 9, min cf::MAP_CLIENT_X, ($x - 1) | 1);
196 $ns->mapy ($y = max 9, min cf::MAP_CLIENT_Y, ($y - 1) | 1);
197
198 $setup{$k} = "${x}x${y}";
199
200 } elsif ($k eq "extendedMapInfos") {
201 $ns->ext_mapinfos ($v);
202
203 } elsif ($k eq "extendedTextInfos") {
204 $ns->has_readable_type ($v);
205
206 } elsif ($k eq "smoothing") { # cfplus-style smoothing
207 $ns->smoothing ($v);
208
209 } elsif ($k eq "fxix") {
210 $ns->fxix ($v);
211
212 } elsif ($k eq "msg") {
213 $ns->can_msg ($v >= 2);
214 $setup{$k} = $ns->can_msg;
215
216 } elsif ($k eq "excmd") {
217 # we support it
218
219 } else {
220 # other commands:
221 # sexp: no idea, probably for oudated servers
222 # tick: more stupidity, server should send a tick per tick
223
224 $setup{$k} = "FALSE";
225 }
226 }
227
228 $ns->send_packet (join " ", setup => %setup);
229
230 cf::datalog setup =>
231 request => $args,
232 reply => \%setup,
233 client => $ns->version,
234 ;
235}
236
76sub addme { 237sub addme {
77 my ($ns) = @_; 238 my ($ns) = @_;
78 239
79 $ns->destroy if $ns->pl; 240 if (!$ns->facecache)
241 {
242 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
243
244
245***
246*** WARNING:
247*** Your client does not support face/image caching,
248*** or it has been disabled. Face caching is mandatory
249*** so please enable it or use a newer client.
250***
251*** Look at your client preferences:
252***
253*** CFPlus: all known versions automatically enable the facecache.
254*** cfclient: use the -cache commandline option.
255*** cfclient: map will not redraw automatically (bug).
256*** gcfclient: use -cache commandline option, or enable
257*** gcfclient: Client=>Configure=>Map & Image=>Cache Images.
258*** jcrossclient: your client is broken, use CFPlus or gcfclient.
259***
260***
261EOF
262 if ($ns->version =~ /jcrossclient/) {
263 # let them, for now
264 } else {
265 $ns->flush;
266 return $ns->destroy;
267 }
268
269 # $ns->facecache = true;
270 }
271
272 if ($ns->mapmode < cf::Map1aCmd) {
273 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
274
275
276***
277*** WARNING:
278*** Your client is too old. Please upgrade to a newer version.
279EOF
280
281 $ns->flush;
282 return $ns->destroy;
283 }
284
285 $ns->pl and return $ns->destroy;
80 286
81 $ns->async (sub { 287 $ns->async (sub {
82 my ($user, $pass); 288 my ($user, $pass);
83 289
84 $ns->send_packet ("addme_success"); 290 $ns->send_packet ("addme_success");
… …
99 $ns->send_drawinfo ( 305 $ns->send_drawinfo (
100 "That username is currently used in another login session. " 306 "That username is currently used in another login session. "
101 . "Chose another, or wait till the other session has ended.", 307 . "Chose another, or wait till the other session has ended.",
102 cf::NDI_RED 308 cf::NDI_RED
103 ); 309 );
104 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,17}$/) { 310 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,17}\z/) {
105 last; 311 last;
106 } else { 312 } else {
107 $ns->send_drawinfo ( 313 $ns->send_drawinfo (
108 "Your username contains illegal characters " 314 "Your username contains illegal characters "
109 . "(only a-z, A-Z and 0-9 are allowed), " 315 . "(only a-z, A-Z and 0-9 are allowed), "
… …
155 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) { 361 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) {
156 nuke_str $pass; 362 nuke_str $pass;
157 # password matches, wonderful 363 # password matches, wonderful
158 my $pl = cf::player::find $user or next; 364 my $pl = cf::player::find $user or next;
159 $pl->connect ($ns); 365 $pl->connect ($ns);
160 check_clean_save $pl; 366 enter_map $pl;
161 $pl->{clean_save} = 1;
162 last; 367 last;
163 } elsif (can_cleanup $pl, $mtime) { 368 } elsif (can_cleanup $pl, $mtime) {
164 Coro::Timer::sleep 1; 369 Coro::Timer::sleep 1;
165 370
166 $ns->send_drawinfo ( 371 $ns->send_drawinfo (
… …
187 Coro::Timer::sleep 1; 392 Coro::Timer::sleep 1;
188 393
189 $ns->send_drawinfo ( 394 $ns->send_drawinfo (
190 "Wrong username or password. Please try again " 395 "Wrong username or password. Please try again "
191 . "(check for Numlock and other semi-obvious error sources).", 396 . "(check for Numlock and other semi-obvious error sources).",
397 cf::NDI_RED
398 );
399 next;
400 }
401 } else {
402 # unable to load the playerfile:
403 # check wether the player dir exists, which means the file is corrupted or
404 # something very similar.
405 if (!aio_stat cf::player::playerdir $user) {
406 $ns->send_drawinfo (
407 "Unable to retrieve this player. It might be a locked or broken account. "
408 . "If this is your account, ask a dungeon master for assistance. "
409 . "Otherwise choose a different login name.",
192 cf::NDI_RED 410 cf::NDI_RED
193 ); 411 );
194 next; 412 next;
195 } 413 }
196 } 414 }
… …
216 434
217 my $pl = cf::player::new $user; 435 my $pl = cf::player::new $user;
218 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]); 436 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]);
219 nuke_str $pass; 437 nuke_str $pass;
220 $pl->connect ($ns); 438 $pl->connect ($ns);
221
222 my $ob = $pl->ob; 439 my $ob = $pl->ob;
440
441 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
223 442
224 while () { 443 while () {
225 $ob->update_stats; 444 $ob->update_stats;
226 $pl->save_stats; 445 $pl->save_stats;
227 446
… …
242 } 461 }
243 462
244 $ob->set_animation (2); 463 $ob->set_animation (2);
245 $ob->add_statbonus; 464 $ob->add_statbonus;
246 465
247 $ns->send_drawinfo ($ob->msg, cf::NDI_BLUE); 466 while () {
248 $ns->send_packet (sprintf "query %d %s", cf::CS_QUERY_SINGLECHAR, 467 $ns->send_msg (-1, "chargen-race-title", ucfirst $pl->title);
468 my $msg = $ob->msg;
469 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
470 $ns->send_msg (cf::NDI_BLUE, "chargen-race-description", $msg);
471
472 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
249 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n"); 473 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
250 474
251 $ns->state (cf::ST_CHANGE_CLASS); 475 last if $res =~ /[dD]/;
476
477 $pl->chargen_race_next;
478 }
479
480 $pl->chargen_race_done;
481
482 while () {
483 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
484 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
485
486 if ($res =~ /^[fF]/) {
487 $pl->gender (1);
488 last;
489 } elsif ($res =~ /^[mM]/) {
490 $pl->gender (0);
491 last;
492 }
493 }
494
495 $ob->reply (undef, "Welcome to Crossfire!");
496
252 delete $pl->{deny_save};#d# too early 497 delete $pl->{deny_save};
253 498
254 last; 499 last;
255 } 500 }
256 }); 501 });
257} 502}
… …
278 } else { 523 } else {
279 $ob->reply (undef, 524 $ob->reply (undef,
280 "Ok, quitting, hope to see you again.", 525 "Ok, quitting, hope to see you again.",
281 cf::NDI_UNIQUE | cf::NDI_RED); 526 cf::NDI_UNIQUE | cf::NDI_RED);
282 $pl->ns->flush; 527 $pl->ns->flush;
283 $pl->quit_character; 528 cf::async { $pl->quit_character };
284 } 529 }
285 }); 530 });
286}; 531};
287 532
288cf::object->attach ( 533cf::object->attach (
… …
294 539
295 my $pl = $ob->contr; 540 my $pl = $ob->contr;
296 541
297 # update respawn position 542 # update respawn position
298 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 543 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
544 cf::async { $pl->save };
299 545
300 $pl->killer ("left"); 546 $pl->killer ("left");
301 $ob->check_score; 547 $ob->check_score;
302 548
303 $ob->reply (undef, "In the future, you will wake up here when you die."); 549 $ob->reply (undef, "In the future, you will wake up here when you die.");
… …
327 573
328 if ($cleanly) { 574 if ($cleanly) {
329 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 575 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
330 } else { 576 } else {
331 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 577 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
332 delete $pl->{clean_save}; 578 $pl->{unclean_save} = $cf::RUNTIME;
333 } 579 }
334 }, 580 },
335); 581);
336 582
337cf::client->attach ( 583cf::client->attach (
338 on_addme => \&addme, 584 on_addme => \&addme,
585 on_setup => \&setup,
339); 586);
340 587
341############################################################################# 588#############################################################################
342 589
343our $SCHEDULE_INTERVAL = 10; # time the player scheduler sleeps between runs 590our $SCHEDULE_INTERVAL = 10; # time the player scheduler sleeps between runs
344our $SAVE_TIMEOUT = 200; # save players every n seconds 591our $SAVE_TIMEOUT = 20; # save players every n seconds
345our $SAVE_INTERVAL = 0.1; # save at max. one player every $SAVE_INTERVAL
346 592
347our $SCHEDULER = cf::async_ext { 593our $SCHEDULER = cf::async_ext {
594 my $schedule_interval = Coro::Event->timer (after => 1, interval => $SCHEDULE_INTERVAL);
348 while () { 595 while () {
349 Coro::Timer::sleep $SCHEDULE_INTERVAL; 596 $schedule_interval->next;
350 597
351 # this weird form of iteration over values is used because 598 # this weird form of iteration over values is used because
352 # the hash changes underneath us frequently, and for 599 # the hash changes underneath us frequently, and for
353 # keeps a direct reference to the value without (in 5.8 perls) 600 # keeps a direct reference to the value without (in 5.8 perls)
354 # keeping a reference, so this is prone to crashes or worse. 601 # keeping a reference, so this is prone to crashes or worse.
… …
358 or next; 605 or next;
359 $pl->valid or next; 606 $pl->valid or next;
360 607
361 eval { 608 eval {
362 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) { 609 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
610 cf::wait_for_tick_begin;
363 $pl->save; 611 $pl->save;
364 Coro::Timer::sleep $SAVE_INTERVAL;
365 }
366 612
367 unless ($pl->active) { 613 unless ($pl->active || $pl->ns) {
368 # check refcounts, this is tricky and needs to be adjusted to fit server internals 614 # check refcounts, this is tricky and needs to be adjusted to fit server internals
369 my $ob = $pl->ob; 615 my $ob = $pl->ob;
370 Scalar::Util::weaken $pl; 616
371 Scalar::Util::weaken $ob;
372 my $a_ = $pl->refcnt;
373 my $b_ = $ob->refcnt;
374 my $pl_ref = $pl->refcnt_cnt; 617 my $pl_ref = $pl->refcnt_cnt;
375 my $ob_ref = $ob->refcnt_cnt; 618 my $ob_ref = $ob->refcnt_cnt;
376 619
620 ## pl_ref == $pl + ob->contr + %cf::PLAYER
621 ## ob_ref == $ob + pl->observe + simply being an object
377 if ($pl_ref == 2 && $ob_ref == 1) { 622 if ($pl_ref == 3 && $ob_ref == 3) {
378 warn "player-scheduler destroy ", $ob->name;#d# 623 warn "player-scheduler destroy ", $ob->name;#d#
624
625 # remove from sight and get fresh "copies"
379 delete $cf::PLAYER{$ob->name}; 626 $pl = delete $cf::PLAYER{$ob->name};
380 # pl_ref == one from object + one from cf::PLAYER
381 # ob_ref == one from simply being an object
382 $ob->destroy; 627 $ob = $pl->ob;
628
383 $pl->destroy; 629 $pl->destroy; # destroys $ob
384 } else { 630 } else {
631 my $a_ = $pl->refcnt;#d#
632 my $b_ = $ob->refcnt;#d#
633
385 warn "player-scheduler refcnt ", $ob->name, " $pl_ref,$a_ $ob_ref,$b_\n";#d# 634 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref ob $ob_ref (C pl $a_ ob $b_)\n";#d#
635 }
386 } 636 }
387 } 637 }
388 }; 638 };
389 warn $@ if $@; 639 warn $@ if $@;
390 Coro::cede; 640 Coro::cede;

Diff Legend

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