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.61 by root, Tue Jul 10 06:12: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);
8
9my $PLAYERDIR = sprintf "%s/%s", cf::localdir, cf::playerdir;
10 7
11# paranoia function to overwrite a string-in-place 8# paranoia function to overwrite a string-in-place
12sub nuke_str { 9sub nuke_str {
13 substr $_[0], 0, (length $_[0]), "x" x length $_[0] 10 substr $_[0], 0, (length $_[0]), "x" x length $_[0]
14} 11}
15 12
16sub query { 13sub query {
17 my ($ns, $flags, $text) = @_; 14 my ($ns, $flags, $text) = @_;
18 15
19 my $current = $Coro::current; 16 my $current = $Coro::current;
20 $ns->query ($flags, $text, sub { $current->ready; $current = $_[0]; }); 17 $ns->query ($flags, $text, sub { $current->ready; $current = $_[0] });
21 Coro::schedule while ref $current; 18 Coro::schedule while ref $current;
22 19
23 $current 20 $current
24} 21}
25 22
… …
41 return unless cf::player::find_active $user; 38 return unless cf::player::find_active $user;
42 39
43 $ns->send_drawinfo ( 40 $ns->send_drawinfo (
44 "That player is already logged in on this server. " 41 "That player is already logged in on this server. "
45 . "If you want to create a new player, choose another name. " 42 . "If you want to create a new player, choose another name. "
46 . "If you are already a registered player, make sure nobody " 43 . "If you have already a registered, make sure nobody "
47 . "else is using your account at this time. If you lost your conenction " 44 . "else is using your account at this time. If you lost your connection "
48 . "then the server will likely timeout within a minute. If you still " 45 . "then the server will likely timeout within a minute. If you still "
49 . "cannot log-in after a minute, you are still logged in. Make sure " 46 . "cannot log-in after a minute, you are still logged in. Make sure "
50 . "you do not have another client running. If you use windows, reboot, " 47 . "you do not have another client running. If you use windows, reboot, "
51 . "this will fix anything.", 48 . "this will fix anything.",
52 cf::NDI_RED 49 cf::NDI_RED
53 ); 50 );
54 51
55 1 52 1
56} 53}
57 54
58sub check_clean_save { 55sub enter_map {
59 my ($pl) = @_; 56 my ($pl) = @_;
60 57
58 my ($map, $x, $y)
59 = $pl->ob->{_link_pos}
60 ? @{delete $pl->ob->{_link_pos}}
61 : ($pl->maplevel, $pl->ob->x, $pl->ob->y);
62
63 $pl->ob->enter_link;
64
61 if (my $time = delete $pl->{unclean_save}) { 65 if (my $time = delete $pl->{unclean_save}) {
66 if (my $m = cf::map::find $map) {
67 if ($time < $m->{instantiate_time}) {
68 # the map was reset in the meantime
69 my $age = $cf::RUNTIME - $time;
70 warn $pl->ob->name, " map reset after logout, logout age $age\n";#d#
71
72 # for now, just go back to savebed
73 ($map, $x, $y) = $pl->savebed;
74
62 $pl->ns->send_drawinfo ( 75 $pl->ns->send_drawinfo (
76 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
77 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
78 . "Better use a savebed next time, much worse things could have happened...",
79 cf::NDI_RED
80 );
81 } else {
82 $pl->ns->send_drawinfo (
63 "You didn't use a savebed to leave this realm. This is very dangerous, " 83 "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, " 84 . "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.", 85 . "or monsters suddenly snapping your body. Better use a savebed next time.",
66 cf::NDI_RED 86 cf::NDI_RED
87 );
88 }
67 ); 89 }
68 #d#TODO
69 } 90 }
91
92 $pl->ob->goto ($map, $x, $y);
70} 93}
71 94
72# delete a player directory, be non-blocking AND synchronous... 95# delete a player directory, be non-blocking AND synchronous...
73# (thats hard, so we crap out and fork). 96# (thats hard, so we crap out and fork).
74sub nuke_playerdir { 97sub nuke_playerdir {
… …
78 system "cd \Q$PLAYERDIR\E " 101 system "cd \Q$PLAYERDIR\E "
79 . "&& mv \Q$user\E ~\Q$Coro::current\E~deleting~ 2>/dev/null " 102 . "&& mv \Q$user\E ~\Q$Coro::current\E~deleting~ 2>/dev/null "
80 . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)"; 103 . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)";
81} 104}
82 105
83sub setup { 106cf::client->attach (on_addme => sub {
84 my ($ns, $args) = @_;
85
86 # run through the cmds of setup
87 # syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
88 #
89 # 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
91
92 my %setup = split / +/, $args;
93 while (my ($k, $v) = each %setup) {
94
95 if ($k eq "sound") {
96 $ns->sound ($v);
97
98 } elsif ($k eq "exp64") {
99 $setup{$k} = 1;
100
101 } elsif ($k eq "spellmon") {
102 $ns->monitor_spells ($v);
103
104 } elsif ($k eq "darkness") {
105 $ns->darkness ($v);
106
107 } elsif ($k eq "map1cmd") {
108 $ns->mapmode (cf::Map1Cmd) if $v > 0;
109
110 } elsif ($k eq "map1acmd") {
111 $ns->mapmode (cf::Map1aCmd) if $v > 0;
112
113 } elsif ($k eq "map2cmd") {
114 # gcfclient bug, map1acmd is sent too late
115 $ns->mapmode (cf::Map1aCmd);
116 $setup{$k} = "FALSE";
117
118 } elsif ($k eq "newmapcmd") {
119 $ns->newmapcmd ($v);
120
121 } elsif ($k eq "mapinfocmd") {
122 $ns->mapinfocmd ($v);
123
124 } elsif ($k eq "extcmd") {
125 $ns->extcmd ($v > 0);
126
127 } elsif ($k eq "extmap") {
128 $ns->extmap ($v);
129
130 } elsif ($k eq "facecache") {
131 $ns->facecache ($v);
132
133 } elsif ($k eq "faceset") {
134 $ns->faceset (0);
135 $setup{$k} = 0;
136 # $ns->image2 (1)
137
138 } elsif ($k eq "itemcmd") {
139 # Version of the item protocol command to use. Currently,
140 # only supported versions are 1 and 2. Using a numeric
141 # value will make it very easy to extend this in the future.
142 $ns->itemcmd ($v) if $v >= 1 && $v <= 2;
143
144 $setup{$k} = $ns->itemcmd;
145
146 } elsif ($k eq "mapsize") {
147 my ($x, $y) = split /x/, $v;
148
149 $ns->mapx ($x = max 9, min cf::MAP_CLIENT_X, $x);
150 $ns->mapy ($y = max 9, min cf::MAP_CLIENT_Y, $y);
151
152 $setup{$k} = "${x}x${y}";
153
154 } elsif ($k eq "extendedMapInfos") {
155 $ns->ext_mapinfos ($v);
156
157 } elsif ($k eq "extendedTextInfos") {
158 $ns->has_readable_type ($v);
159
160 } elsif ($k eq "fxix") {
161 $ns->fxix ($v);
162
163 } else {
164 # other commands:
165 # sexp: no idea, probably for oudated servers
166 # tick: more stupidity, server should sned a tick per tick
167
168 $setup{$k} = "FALSE";
169 }
170 }
171
172 $ns->send_packet (join " ", setup => %setup);
173
174 cf::datalog setup =>
175 request => $args,
176 reply => \%setup,
177 client => $ns->version,
178 ;
179}
180
181sub addme {
182 my ($ns) = @_; 107 my ($ns) = @_;
183 108
184 if (!$ns->facecache) 109 if (!$ns->facecache)
185 { 110 {
186 $ns->send_drawinfo (<<EOF, cf::NDI_RED); 111 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
187 112
188 113
189*** 114***
190*** WARNING: 115*** WARNING:
191*** Your client does not support face/image caching, 116*** Your client does not support face/image caching,
… …
259 . "(only a-z, A-Z and 0-9 are allowed), " 184 . "(only a-z, A-Z and 0-9 are allowed), "
260 . "or is not between 3 and 18 characters in length.", 185 . "or is not between 3 and 18 characters in length.",
261 cf::NDI_RED 186 cf::NDI_RED
262 ); 187 );
263 } 188 }
189 Coro::Timer::sleep 0.4;
264 } 190 }
265 191
266 check_playing $ns, $user and next; 192 check_playing $ns, $user and next;
267 193
268 $ns->send_drawinfo ( 194 $ns->send_drawinfo (
… …
279 $ns->send_drawinfo ( 205 $ns->send_drawinfo (
280 "Try to use at least three characters as your password please, " 206 "Try to use at least three characters as your password please, "
281 . "that cannot be too much to ask for :)", 207 . "that cannot be too much to ask for :)",
282 cf::NDI_RED 208 cf::NDI_RED
283 ); 209 );
210 Coro::Timer::sleep 0.4;
284 } 211 }
285 212
286 # lock this username for the remainder of this login session 213 # lock this username for the remainder of this login session
287 if ($cf::LOGIN_LOCK{$user}) { 214 if ($cf::LOGIN_LOCK{$user}) {
288 $ns->send_drawinfo ( 215 $ns->send_drawinfo (
… …
305 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) { 232 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) {
306 nuke_str $pass; 233 nuke_str $pass;
307 # password matches, wonderful 234 # password matches, wonderful
308 my $pl = cf::player::find $user or next; 235 my $pl = cf::player::find $user or next;
309 $pl->connect ($ns); 236 $pl->connect ($ns);
310 check_clean_save $pl; 237 enter_map $pl;
311 last; 238 last;
312 } elsif (can_cleanup $pl, $mtime) { 239 } elsif (can_cleanup $pl, $mtime) {
313 Coro::Timer::sleep 1; 240 Coro::Timer::sleep 1;
314 241
315 $ns->send_drawinfo ( 242 $ns->send_drawinfo (
… …
340 . "(check for Numlock and other semi-obvious error sources).", 267 . "(check for Numlock and other semi-obvious error sources).",
341 cf::NDI_RED 268 cf::NDI_RED
342 ); 269 );
343 next; 270 next;
344 } 271 }
272 } else {
273 # unable to load the playerfile:
274 # check wether the player dir exists, which means the file is corrupted or
275 # something very similar.
276 if (!aio_stat cf::player::playerdir $user) {
277 $ns->send_drawinfo (
278 "Unable to retrieve this player. It might be a locked or broken account. "
279 . "If this is your account, ask a dungeon master for assistance. "
280 . "Otherwise choose a different login name.",
281 cf::NDI_RED
282 );
283 next;
284 }
345 } 285 }
346 286
347 # the rest of this function is character creation 287 # the rest of this function is character creation
348 288
349 # just to make sure nothing is left over 289 # just to make sure nothing is left over
… …
356 nuke_str $pass2; 296 nuke_str $pass2;
357 $ns->send_drawinfo ( 297 $ns->send_drawinfo (
358 "The passwords do not match, please try again.", 298 "The passwords do not match, please try again.",
359 cf::NDI_RED 299 cf::NDI_RED
360 ); 300 );
301 Coro::Timer::sleep 0.5;
361 next; 302 next;
362 } 303 }
363 304
364 nuke_str $pass2; 305 nuke_str $pass2;
365 306
366 my $pl = cf::player::new $user; 307 my $pl = cf::player::new $user;
367 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]); 308 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]);
368 nuke_str $pass; 309 nuke_str $pass;
369 $pl->connect ($ns); 310 $pl->connect ($ns);
370
371 my $ob = $pl->ob; 311 my $ob = $pl->ob;
312
313 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
372 314
373 while () { 315 while () {
374 $ob->update_stats; 316 $ob->update_stats;
375 $pl->save_stats; 317 $pl->save_stats;
376 318
… …
386 $ob->swap_stats ($res - 1, $swap - 1); 328 $ob->swap_stats ($res - 1, $swap - 1);
387 } 329 }
388 } else { 330 } else {
389 $ob->roll_stats; 331 $ob->roll_stats;
390 } 332 }
333
334 Coro::Timer::sleep 0.2;
391 } 335 }
392 336
393 $ob->set_animation (2); 337 $ob->set_animation (2);
394 $ob->add_statbonus; 338 $ob->add_statbonus;
395 339
396 $ns->send_drawinfo ($ob->msg, cf::NDI_BLUE); 340 while () {
397 $ns->send_packet (sprintf "query %d %s", cf::CS_QUERY_SINGLECHAR, 341 $ns->send_msg (-1, "chargen-race-title", ucfirst $pl->title);
342 my $msg = $ob->msg;
343 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
344 $ns->send_msg (cf::NDI_BLUE, "chargen-race-description", $msg);
345
346 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"); 347 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
399 348
400 $ns->state (cf::ST_CHANGE_CLASS); 349 last if $res =~ /[dD]/;
350
351 $pl->chargen_race_next;
352 Coro::Timer::sleep 0.2;
353 }
354
355 $pl->chargen_race_done;
356
357 while () {
358 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
359 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
360
361 if ($res =~ /^[fF]/) {
362 $pl->gender (1);
363 last;
364 } elsif ($res =~ /^[mM]/) {
365 $pl->gender (0);
366 last;
367 }
368 Coro::Timer::sleep 0.2;
369 }
370
371 $ob->reply (undef, "Welcome to Crossfire!");
372
401 delete $pl->{deny_save};#d# too early 373 delete $pl->{deny_save};
402 374
403 last; 375 last;
404 } 376 }
405 }); 377 });
406} 378});
407 379
408cf::register_command quit => sub { 380cf::register_command quit => sub {
409 my ($ob, $arg) = @_; 381 my ($ob, $arg) = @_;
410 382
411 $ob->reply (undef, 383 $ob->reply (undef,
… …
482 $pl->{unclean_save} = $cf::RUNTIME; 454 $pl->{unclean_save} = $cf::RUNTIME;
483 } 455 }
484 }, 456 },
485); 457);
486 458
487cf::client->attach (
488 on_addme => \&addme,
489 on_setup => \&setup,
490);
491
492############################################################################# 459#############################################################################
493 460
494our $SCHEDULE_INTERVAL = 10; # time the player scheduler sleeps between runs 461our $SCHEDULE_INTERVAL = 10; # time the player scheduler sleeps between runs
495our $SAVE_TIMEOUT = 20; # save players every n seconds 462our $SAVE_TIMEOUT = 20; # save players every n seconds
496 463
… …
509 or next; 476 or next;
510 $pl->valid or next; 477 $pl->valid or next;
511 478
512 eval { 479 eval {
513 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) { 480 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
514 $cf::WAIT_FOR_TICK_ONE->wait; 481 cf::wait_for_tick_begin;
515 $pl->save; 482 $pl->save;
516 483
517 unless ($pl->active) { 484 unless ($pl->active || $pl->ns) {
518 # check refcounts, this is tricky and needs to be adjusted to fit server internals 485 # check refcounts, this is tricky and needs to be adjusted to fit server internals
519 my $ob = $pl->ob; 486 my $ob = $pl->ob;
520 Scalar::Util::weaken $pl; 487
521 Scalar::Util::weaken $ob;
522 my $a_ = $pl->refcnt;#d#
523 my $b_ = $ob->refcnt;#d#
524 my $pl_ref = $pl->refcnt_cnt; 488 my $pl_ref = $pl->refcnt_cnt;
525 my $ob_ref = $ob->refcnt_cnt; 489 my $ob_ref = $ob->refcnt_cnt;
526 490
527 ## pl_ref == one from object + one from cf::PLAYER 491 ## pl_ref == $pl + ob->contr + %cf::PLAYER
528 ## ob_ref == one from simply being an object 492 ## ob_ref == $ob + pl->observe + simply being an object
529 if ($pl_ref == 2 && $ob_ref == 1) { 493 if ($pl_ref == 3 && $ob_ref == 3) {
530 warn "player-scheduler destroy ", $ob->name;#d# 494 warn "player-scheduler destroy ", $ob->name;#d#
531 495
532 # remove from sight and get fresh "copies" 496 # remove from sight and get fresh "copies"
533 $pl = delete $cf::PLAYER{$ob->name}; 497 $pl = delete $cf::PLAYER{$ob->name};
534 $ob = $pl->ob; 498 $ob = $pl->ob;
535 499
536 $ob->destroy;
537 $pl->destroy; 500 $pl->destroy; # destroys $ob
538 } else { 501 } else {
502 my $a_ = $pl->refcnt;#d#
503 my $b_ = $ob->refcnt;#d#
504
539 warn "player-scheduler refcnt ", $ob->name, " $pl_ref,$a_ $ob_ref,$b_\n";#d# 505 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref ob $ob_ref (C pl $a_ ob $b_)\n";#d#
540 } 506 }
541 } 507 }
542 } 508 }
543 }; 509 };
544 warn $@ if $@; 510 warn $@ if $@;

Diff Legend

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