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.20 by root, Mon Jan 8 22:32:10 2007 UTC vs.
Revision 1.58 by root, Sun Jul 1 03:16:56 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 $v = 2 if $v > 2;
211 $ns->fxix ($v);
212 $setup{$k} = $v;
213
214 } elsif ($k eq "msg") {
215 $v = 2 if $v > 2;
216 $ns->can_msg ($v >= 2);
217 $setup{$k} = $v;
218
219 } elsif ($k eq "xwidget") {
220 # eXperimental server-side widgets
221 $ns->{can_widget} = 1;
222
223 } elsif ($k eq "excmd") {
224 # we support it
225
226 } else {
227 # other commands:
228 # sexp: no idea, probably for oudated servers
229 # tick: more stupidity, server should send a tick per tick
230
231 $setup{$k} = "FALSE";
232 }
233 }
234
235 $ns->send_packet (join " ", setup => %setup);
236
237 cf::datalog setup =>
238 request => $args,
239 reply => \%setup,
240 client => $ns->version,
241 ;
242}
243
76sub addme { 244sub addme {
77 my ($ns) = @_; 245 my ($ns) = @_;
78 246
79 $ns->destroy if $ns->pl; 247 if (!$ns->facecache)
248 {
249 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
250
251
252***
253*** WARNING:
254*** Your client does not support face/image caching,
255*** or it has been disabled. Face caching is mandatory
256*** so please enable it or use a newer client.
257***
258*** Look at your client preferences:
259***
260*** CFPlus: all known versions automatically enable the facecache.
261*** cfclient: use the -cache commandline option.
262*** cfclient: map will not redraw automatically (bug).
263*** gcfclient: use -cache commandline option, or enable
264*** gcfclient: Client=>Configure=>Map & Image=>Cache Images.
265*** jcrossclient: your client is broken, use CFPlus or gcfclient.
266***
267***
268EOF
269 if ($ns->version =~ /jcrossclient/) {
270 # let them, for now
271 } else {
272 $ns->flush;
273 return $ns->destroy;
274 }
275
276 # $ns->facecache = true;
277 }
278
279 if ($ns->mapmode < cf::Map1aCmd) {
280 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
281
282
283***
284*** WARNING:
285*** Your client is too old. Please upgrade to a newer version.
286EOF
287
288 $ns->flush;
289 return $ns->destroy;
290 }
291
292 $ns->pl and return $ns->destroy;
80 293
81 $ns->async (sub { 294 $ns->async (sub {
82 my ($user, $pass); 295 my ($user, $pass);
83 296
84 $ns->send_packet ("addme_success"); 297 $ns->send_packet ("addme_success");
… …
99 $ns->send_drawinfo ( 312 $ns->send_drawinfo (
100 "That username is currently used in another login session. " 313 "That username is currently used in another login session. "
101 . "Chose another, or wait till the other session has ended.", 314 . "Chose another, or wait till the other session has ended.",
102 cf::NDI_RED 315 cf::NDI_RED
103 ); 316 );
104 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,17}$/) { 317 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,17}\z/) {
105 last; 318 last;
106 } else { 319 } else {
107 $ns->send_drawinfo ( 320 $ns->send_drawinfo (
108 "Your username contains illegal characters " 321 "Your username contains illegal characters "
109 . "(only a-z, A-Z and 0-9 are allowed), " 322 . "(only a-z, A-Z and 0-9 are allowed), "
… …
155 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) { 368 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) {
156 nuke_str $pass; 369 nuke_str $pass;
157 # password matches, wonderful 370 # password matches, wonderful
158 my $pl = cf::player::find $user or next; 371 my $pl = cf::player::find $user or next;
159 $pl->connect ($ns); 372 $pl->connect ($ns);
160 check_clean_save $pl; 373 enter_map $pl;
161 $pl->{clean_save} = 1;
162 last; 374 last;
163 } elsif (can_cleanup $pl, $mtime) { 375 } elsif (can_cleanup $pl, $mtime) {
164 Coro::Timer::sleep 1; 376 Coro::Timer::sleep 1;
165 377
166 $ns->send_drawinfo ( 378 $ns->send_drawinfo (
… …
187 Coro::Timer::sleep 1; 399 Coro::Timer::sleep 1;
188 400
189 $ns->send_drawinfo ( 401 $ns->send_drawinfo (
190 "Wrong username or password. Please try again " 402 "Wrong username or password. Please try again "
191 . "(check for Numlock and other semi-obvious error sources).", 403 . "(check for Numlock and other semi-obvious error sources).",
404 cf::NDI_RED
405 );
406 next;
407 }
408 } else {
409 # unable to load the playerfile:
410 # check wether the player dir exists, which means the file is corrupted or
411 # something very similar.
412 if (!aio_stat cf::player::playerdir $user) {
413 $ns->send_drawinfo (
414 "Unable to retrieve this player. It might be a locked or broken account. "
415 . "If this is your account, ask a dungeon master for assistance. "
416 . "Otherwise choose a different login name.",
192 cf::NDI_RED 417 cf::NDI_RED
193 ); 418 );
194 next; 419 next;
195 } 420 }
196 } 421 }
… …
216 441
217 my $pl = cf::player::new $user; 442 my $pl = cf::player::new $user;
218 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]); 443 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]);
219 nuke_str $pass; 444 nuke_str $pass;
220 $pl->connect ($ns); 445 $pl->connect ($ns);
221
222 my $ob = $pl->ob; 446 my $ob = $pl->ob;
447
448 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
223 449
224 while () { 450 while () {
225 $ob->update_stats; 451 $ob->update_stats;
226 $pl->save_stats; 452 $pl->save_stats;
227 453
… …
242 } 468 }
243 469
244 $ob->set_animation (2); 470 $ob->set_animation (2);
245 $ob->add_statbonus; 471 $ob->add_statbonus;
246 472
247 $ns->send_drawinfo ($ob->msg, cf::NDI_BLUE); 473 while () {
248 $ns->send_packet (sprintf "query %d %s", cf::CS_QUERY_SINGLECHAR, 474 $ns->send_msg (-1, "chargen-race-title", ucfirst $pl->title);
475 my $msg = $ob->msg;
476 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
477 $ns->send_msg (cf::NDI_BLUE, "chargen-race-description", $msg);
478
479 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"); 480 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
250 481
251 $ns->state (cf::ST_CHANGE_CLASS); 482 last if $res =~ /[dD]/;
483
484 $pl->chargen_race_next;
485 }
486
487 $pl->chargen_race_done;
488
489 while () {
490 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
491 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
492
493 if ($res =~ /^[fF]/) {
494 $pl->gender (1);
495 last;
496 } elsif ($res =~ /^[mM]/) {
497 $pl->gender (0);
498 last;
499 }
500 }
501
502 $ob->reply (undef, "Welcome to Crossfire!");
503
252 delete $pl->{deny_save};#d# too early 504 delete $pl->{deny_save};
253 505
254 last; 506 last;
255 } 507 }
256 }); 508 });
257} 509}
… …
278 } else { 530 } else {
279 $ob->reply (undef, 531 $ob->reply (undef,
280 "Ok, quitting, hope to see you again.", 532 "Ok, quitting, hope to see you again.",
281 cf::NDI_UNIQUE | cf::NDI_RED); 533 cf::NDI_UNIQUE | cf::NDI_RED);
282 $pl->ns->flush; 534 $pl->ns->flush;
283 $pl->quit_character; 535 cf::async { $pl->quit_character };
284 } 536 }
285 }); 537 });
286}; 538};
287 539
288cf::object->attach ( 540cf::object->attach (
… …
294 546
295 my $pl = $ob->contr; 547 my $pl = $ob->contr;
296 548
297 # update respawn position 549 # update respawn position
298 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 550 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
551 cf::async { $pl->save };
299 552
300 $pl->killer ("left"); 553 $pl->killer ("left");
301 $ob->check_score; 554 $ob->check_score;
302 555
303 $ob->reply (undef, "In the future, you will wake up here when you die."); 556 $ob->reply (undef, "In the future, you will wake up here when you die.");
… …
327 580
328 if ($cleanly) { 581 if ($cleanly) {
329 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 582 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
330 } else { 583 } else {
331 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 584 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
332 delete $pl->{clean_save}; 585 $pl->{unclean_save} = $cf::RUNTIME;
333 } 586 }
334 }, 587 },
335); 588);
336 589
337cf::client->attach ( 590cf::client->attach (
338 on_addme => \&addme, 591 on_addme => \&addme,
592 on_setup => \&setup,
339); 593);
340 594
341############################################################################# 595#############################################################################
342 596
343our $SCHEDULE_INTERVAL = 10; # time the player scheduler sleeps between runs 597our $SCHEDULE_INTERVAL = 10; # time the player scheduler sleeps between runs
344our $SAVE_TIMEOUT = 200; # save players every n seconds 598our $SAVE_TIMEOUT = 20; # save players every n seconds
345our $SAVE_INTERVAL = 1.1; # save at max. one player every $SAVE_INTERVAL
346 599
347our $SCHEDULER = cf::async_ext { 600our $SCHEDULER = cf::async_ext {
601 my $schedule_interval = Coro::Event->timer (after => 1, interval => $SCHEDULE_INTERVAL);
348 while () { 602 while () {
349 Coro::Timer::sleep $SCHEDULE_INTERVAL; 603 $schedule_interval->next;
350 604
351 # this weird form of iteration over values is used because 605 # this weird form of iteration over values is used because
352 # the hash changes underneath us frequently, and for 606 # the hash changes underneath us frequently, and for
353 # keeps a direct reference to the value without (in 5.8 perls) 607 # keeps a direct reference to the value without (in 5.8 perls)
354 # keeping a reference, so this is prone to crashes or worse. 608 # keeping a reference, so this is prone to crashes or worse.
… …
358 or next; 612 or next;
359 $pl->valid or next; 613 $pl->valid or next;
360 614
361 eval { 615 eval {
362 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) { 616 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
617 cf::wait_for_tick_begin;
363 $pl->save; 618 $pl->save;
364 Coro::Timer::sleep $SAVE_INTERVAL;
365 }
366 619
367 unless ($pl->active) { 620 unless ($pl->active || $pl->ns) {
368 # check refcounts, this is tricky and needs to be adjusted to fit server internals 621 # check refcounts, this is tricky and needs to be adjusted to fit server internals
369 my $ob = $pl->ob; 622 my $ob = $pl->ob;
370 Scalar::Util::weaken $pl; 623
371 Scalar::Util::weaken $ob;
372 my $a_ = $pl->refcnt;
373 my $b_ = $ob->refcnt;
374 my $pl_ref = $pl->refcnt_cnt; 624 my $pl_ref = $pl->refcnt_cnt;
375 my $ob_ref = $ob->refcnt_cnt; 625 my $ob_ref = $ob->refcnt_cnt;
376 626
627 ## pl_ref == $pl + ob->contr + %cf::PLAYER
628 ## ob_ref == $ob + pl->observe + simply being an object
377 if ($pl_ref == 2 && $ob_ref == 1) { 629 if ($pl_ref == 3 && $ob_ref == 3) {
378 warn "player-scheduler destroy ", $ob->name;#d# 630 warn "player-scheduler destroy ", $ob->name;#d#
631
632 # remove from sight and get fresh "copies"
379 #delete $cf::PLAYER{$ob->name}; 633 $pl = delete $cf::PLAYER{$ob->name};
380 ## pl_ref == one from object + one from cf::PLAYER 634 $ob = $pl->ob;
381 ## ob_ref == one from simply being an object 635
382 #$ob->destroy;
383 #$pl->destroy; 636 $pl->destroy; # destroys $ob
384 } else { 637 } else {
638 my $a_ = $pl->refcnt;#d#
639 my $b_ = $ob->refcnt;#d#
640
385 warn "player-scheduler refcnt ", $ob->name, " $pl_ref,$a_ $ob_ref,$b_\n";#d# 641 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref ob $ob_ref (C pl $a_ ob $b_)\n";#d#
642 }
386 } 643 }
387 } 644 }
388 }; 645 };
389 warn $@ if $@; 646 warn $@ if $@;
390 Coro::cede; 647 Coro::cede;

Diff Legend

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