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

Diff Legend

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