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.54 by root, Sat Jun 16 00:12:20 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);
214
215 } elsif ($k eq "excmd") {
216 # we support it
217
218 } else {
219 # other commands:
220 # sexp: no idea, probably for oudated servers
221 # tick: more stupidity, server should send a tick per tick
222
223 $setup{$k} = "FALSE";
224 }
225 }
226
227 $ns->send_packet (join " ", setup => %setup);
228
229 cf::datalog setup =>
230 request => $args,
231 reply => \%setup,
232 client => $ns->version,
233 ;
234}
235
76sub addme { 236sub addme {
77 my ($ns) = @_; 237 my ($ns) = @_;
78 238
79 $ns->destroy if $ns->pl; 239 if (!$ns->facecache)
240 {
241 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
242
243
244***
245*** WARNING:
246*** Your client does not support face/image caching,
247*** or it has been disabled. Face caching is mandatory
248*** so please enable it or use a newer client.
249***
250*** Look at your client preferences:
251***
252*** CFPlus: all known versions automatically enable the facecache.
253*** cfclient: use the -cache commandline option.
254*** cfclient: map will not redraw automatically (bug).
255*** gcfclient: use -cache commandline option, or enable
256*** gcfclient: Client=>Configure=>Map & Image=>Cache Images.
257*** jcrossclient: your client is broken, use CFPlus or gcfclient.
258***
259***
260EOF
261 if ($ns->version =~ /jcrossclient/) {
262 # let them, for now
263 } else {
264 $ns->flush;
265 return $ns->destroy;
266 }
267
268 # $ns->facecache = true;
269 }
270
271 if ($ns->mapmode < cf::Map1aCmd) {
272 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
273
274
275***
276*** WARNING:
277*** Your client is too old. Please upgrade to a newer version.
278EOF
279
280 $ns->flush;
281 return $ns->destroy;
282 }
283
284 $ns->pl and return $ns->destroy;
80 285
81 $ns->async (sub { 286 $ns->async (sub {
82 my ($user, $pass); 287 my ($user, $pass);
83 288
84 $ns->send_packet ("addme_success"); 289 $ns->send_packet ("addme_success");
… …
99 $ns->send_drawinfo ( 304 $ns->send_drawinfo (
100 "That username is currently used in another login session. " 305 "That username is currently used in another login session. "
101 . "Chose another, or wait till the other session has ended.", 306 . "Chose another, or wait till the other session has ended.",
102 cf::NDI_RED 307 cf::NDI_RED
103 ); 308 );
104 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,17}$/) { 309 } elsif ($user =~ /^[a-zA-Z0-9][a-zA-Z0-9\-_]{2,17}\z/) {
105 last; 310 last;
106 } else { 311 } else {
107 $ns->send_drawinfo ( 312 $ns->send_drawinfo (
108 "Your username contains illegal characters " 313 "Your username contains illegal characters "
109 . "(only a-z, A-Z and 0-9 are allowed), " 314 . "(only a-z, A-Z and 0-9 are allowed), "
… …
155 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) {
156 nuke_str $pass; 361 nuke_str $pass;
157 # password matches, wonderful 362 # password matches, wonderful
158 my $pl = cf::player::find $user or next; 363 my $pl = cf::player::find $user or next;
159 $pl->connect ($ns); 364 $pl->connect ($ns);
160 check_clean_save $pl; 365 enter_map $pl;
161 $pl->{clean_save} = 1;
162 last; 366 last;
163 } elsif (can_cleanup $pl, $mtime) { 367 } elsif (can_cleanup $pl, $mtime) {
164 Coro::Timer::sleep 1; 368 Coro::Timer::sleep 1;
165 369
166 $ns->send_drawinfo ( 370 $ns->send_drawinfo (
… …
187 Coro::Timer::sleep 1; 391 Coro::Timer::sleep 1;
188 392
189 $ns->send_drawinfo ( 393 $ns->send_drawinfo (
190 "Wrong username or password. Please try again " 394 "Wrong username or password. Please try again "
191 . "(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.",
192 cf::NDI_RED 409 cf::NDI_RED
193 ); 410 );
194 next; 411 next;
195 } 412 }
196 } 413 }
… …
216 433
217 my $pl = cf::player::new $user; 434 my $pl = cf::player::new $user;
218 $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]);
219 nuke_str $pass; 436 nuke_str $pass;
220 $pl->connect ($ns); 437 $pl->connect ($ns);
221
222 my $ob = $pl->ob; 438 my $ob = $pl->ob;
439
440 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
223 441
224 while () { 442 while () {
225 $ob->update_stats; 443 $ob->update_stats;
226 $pl->save_stats; 444 $pl->save_stats;
227 445
… …
242 } 460 }
243 461
244 $ob->set_animation (2); 462 $ob->set_animation (2);
245 $ob->add_statbonus; 463 $ob->add_statbonus;
246 464
247 $ns->send_drawinfo ($ob->msg, cf::NDI_BLUE); 465 while () {
248 $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,
249 "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";
250 473
251 $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
252 delete $pl->{deny_save};#d# too early 481 delete $pl->{deny_save};
253 482
254 last; 483 last;
255 } 484 }
256 }); 485 });
257} 486}
… …
278 } else { 507 } else {
279 $ob->reply (undef, 508 $ob->reply (undef,
280 "Ok, quitting, hope to see you again.", 509 "Ok, quitting, hope to see you again.",
281 cf::NDI_UNIQUE | cf::NDI_RED); 510 cf::NDI_UNIQUE | cf::NDI_RED);
282 $pl->ns->flush; 511 $pl->ns->flush;
283 $pl->quit_character; 512 cf::async { $pl->quit_character };
284 } 513 }
285 }); 514 });
286}; 515};
287 516
288cf::object->attach ( 517cf::object->attach (
… …
294 523
295 my $pl = $ob->contr; 524 my $pl = $ob->contr;
296 525
297 # update respawn position 526 # update respawn position
298 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 527 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
528 cf::async { $pl->save };
299 529
300 $pl->killer ("left"); 530 $pl->killer ("left");
301 $ob->check_score; 531 $ob->check_score;
302 532
303 $ob->reply (undef, "In the future, you will wake up here when you die."); 533 $ob->reply (undef, "In the future, you will wake up here when you die.");
… …
327 557
328 if ($cleanly) { 558 if ($cleanly) {
329 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 559 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
330 } else { 560 } else {
331 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 561 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
332 delete $pl->{clean_save}; 562 $pl->{unclean_save} = $cf::RUNTIME;
333 } 563 }
334 }, 564 },
335); 565);
336 566
337cf::client->attach ( 567cf::client->attach (
338 on_addme => \&addme, 568 on_addme => \&addme,
569 on_setup => \&setup,
339); 570);
340 571
341############################################################################# 572#############################################################################
342 573
343our $SCHEDULE_INTERVAL = 10; # time the player scheduler sleeps between runs 574our $SCHEDULE_INTERVAL = 10; # time the player scheduler sleeps between runs
344our $SAVE_TIMEOUT = 200; # save players every n seconds 575our $SAVE_TIMEOUT = 20; # save players every n seconds
345our $SAVE_INTERVAL = 0.1; # save at max. one player every $SAVE_INTERVAL
346 576
347our $SCHEDULER = cf::async_ext { 577our $SCHEDULER = cf::async_ext {
578 my $schedule_interval = Coro::Event->timer (after => 1, interval => $SCHEDULE_INTERVAL);
348 while () { 579 while () {
349 Coro::Timer::sleep $SCHEDULE_INTERVAL; 580 $schedule_interval->next;
350 581
351 # this weird form of iteration over values is used because 582 # this weird form of iteration over values is used because
352 # the hash changes underneath us frequently, and for 583 # the hash changes underneath us frequently, and for
353 # keeps a direct reference to the value without (in 5.8 perls) 584 # keeps a direct reference to the value without (in 5.8 perls)
354 # keeping a reference, so this is prone to crashes or worse. 585 # keeping a reference, so this is prone to crashes or worse.
… …
358 or next; 589 or next;
359 $pl->valid or next; 590 $pl->valid or next;
360 591
361 eval { 592 eval {
362 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) { 593 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
594 cf::wait_for_tick_begin;
363 $pl->save; 595 $pl->save;
364 Coro::Timer::sleep $SAVE_INTERVAL;
365 }
366 596
367 unless ($pl->active) { 597 unless ($pl->active || $pl->ns) {
368 # 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
369 my $ob = $pl->ob; 599 my $ob = $pl->ob;
370 Scalar::Util::weaken $pl; 600
371 Scalar::Util::weaken $ob;
372 my $a_ = $pl->refcnt;
373 my $b_ = $ob->refcnt;
374 my $pl_ref = $pl->refcnt_cnt; 601 my $pl_ref = $pl->refcnt_cnt;
375 my $ob_ref = $ob->refcnt_cnt; 602 my $ob_ref = $ob->refcnt_cnt;
376 603
604 ## pl_ref == $pl + ob->contr + %cf::PLAYER
605 ## ob_ref == $ob + pl->observe + simply being an object
377 if ($pl_ref == 2 && $ob_ref == 1) { 606 if ($pl_ref == 3 && $ob_ref == 3) {
378 warn "player-scheduler destroy ", $ob->name;#d# 607 warn "player-scheduler destroy ", $ob->name;#d#
608
609 # remove from sight and get fresh "copies"
379 delete $cf::PLAYER{$ob->name}; 610 $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; 611 $ob = $pl->ob;
612
383 $pl->destroy; 613 $pl->destroy; # destroys $ob
384 } else { 614 } else {
615 my $a_ = $pl->refcnt;#d#
616 my $b_ = $ob->refcnt;#d#
617
385 warn "player-scheduler refcnt ", $ob->name, " $pl_ref,$a_ $ob_ref,$b_\n";#d# 618 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref ob $ob_ref (C pl $a_ ob $b_)\n";#d#
619 }
386 } 620 }
387 } 621 }
388 }; 622 };
389 warn $@ if $@; 623 warn $@ if $@;
390 Coro::cede; 624 Coro::cede;

Diff Legend

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