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.42 by root, Wed Apr 18 17:32:06 2007 UTC vs.
Revision 1.72 by root, Wed Sep 19 21:56:30 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); 7
8our $MAX_DISCONNECT_TIME = $cf::CFG{max_disconnect_time} || 3600;
8 9
9# paranoia function to overwrite a string-in-place 10# paranoia function to overwrite a string-in-place
10sub nuke_str { 11sub nuke_str {
11 substr $_[0], 0, (length $_[0]), "x" x length $_[0] 12 substr $_[0], 0, (length $_[0]), "x" x length $_[0]
12} 13}
… …
39 return unless cf::player::find_active $user; 40 return unless cf::player::find_active $user;
40 41
41 $ns->send_drawinfo ( 42 $ns->send_drawinfo (
42 "That player is already logged in on this server. " 43 "That player is already logged in on this server. "
43 . "If you want to create a new player, choose another name. " 44 . "If you want to create a new player, choose another name. "
44 . "If you are already a registered player, make sure nobody " 45 . "If you have already a registered, make sure nobody "
45 . "else is using your account at this time. If you lost your conenction " 46 . "else is using your account at this time. If you lost your connection "
46 . "then the server will likely timeout within a minute. If you still " 47 . "then the server will likely timeout within a minute. If you still "
47 . "cannot log-in after a minute, you are still logged in. Make sure " 48 . "cannot log-in after a minute, you are still logged in. Make sure "
48 . "you do not have another client running. If you use windows, reboot, " 49 . "you do not have another client running. If you use windows, reboot, "
49 . "this will fix anything.", 50 . "this will fix anything.",
50 cf::NDI_RED 51 cf::NDI_RED
51 ); 52 );
52 53
53 1 54 1
54} 55}
55 56
56sub check_clean_save { 57sub enter_map {
57 my ($pl) = @_; 58 my ($pl) = @_;
58 59
60 my $ob = $pl->ob;
61
62 my ($map, $x, $y)
63 = $ob->{_link_pos}
64 ? @{delete $ob->{_link_pos}}
65 : ($pl->maplevel, $ob->x, $ob->y);
66
67 $ob->enter_link;
68
59 if (my $time = delete $pl->{unclean_save}) { 69 if (my $time = delete $pl->{unclean_save}) {
60 $pl->ns->send_drawinfo ( 70 if (my $m = cf::map::find $map) {
71 if ($time < $m->{instantiate_time}) {
72 # the map was reset in the meantime
73 my $age = $cf::RUNTIME - $time;
74
75 warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
76
77 # for now, just go back to savebed
78 ($map, $x, $y) = $pl->savebed;
79
80 if ($age >= $MAX_DISCONNECT_TIME) {
81 $ob->message (
82 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
83 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
84 . "Maybe you can find comfort in the thought that your body was quite satisfying in taste... "
85 . "H<You disconnected too long without having used a savebed.>",
86 cf::NDI_RED
87 );
88 # kill them.
89 # reminds me of the famous badness 10000 syndrome...
90 $ob->stats->hp (-10000); #] if they survive this they deserved to live
91 $pl->killer ("a cave-in");
92 } else {
93 $ob->message (
94 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
95 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
96 . "Better use a savebed next time, much worse things could have happened... "
97 . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>",
98 cf::NDI_RED
99 );
100 }
101 } else {
102 $ob->message (
61 "You didn't use a savebed to leave this realm. This is very dangerous, " 103 "You didn't use a bed to reality to leave this realm. This is very dangerous, "
62 . "as lots of things could happen when you leave by other means, such as cave-ins, " 104 . "as lots of things could happen when you leave by other means, such as cave-ins, "
63 . "or monsters suddenly snapping your body. Better use a savebed next time.", 105 . "or monsters suddenly snapping your body. Better use a savebed next time. "
106 . "H<Always apply a bed of reality to disconnect from the server.>",
64 cf::NDI_RED 107 cf::NDI_RED
108 );
109 }
65 ); 110 }
66 #d#TODO
67 } 111 }
112
113 $ob->goto ($map, $x, $y);
68} 114}
69 115
70# delete a player directory, be non-blocking AND synchronous... 116# delete a player directory, be non-blocking AND synchronous...
71# (thats hard, so we crap out and fork). 117# (thats hard, so we crap out and fork).
72sub nuke_playerdir { 118sub nuke_playerdir {
73 my ($user) = @_; 119 my ($user) = @_;
74 120
75 aio_stat "$PLAYERDIR/$user"; 121 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
76 system "cd \Q$PLAYERDIR\E " 122
77 . "&& mv \Q$user\E ~\Q$Coro::current\E~deleting~ 2>/dev/null " 123 cf::fork_call {
78 . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)"; 124 rename "$PLAYERDIR/$user", $temp;
125 system "rm", "-rf", $temp;
126 };
79} 127}
80 128
81sub send_capabilities { 129cf::client->attach (on_addme => sub {
82 my ($ns) = @_; 130 my ($ns) = @_;
83 131
84 return unless $ns->extcmd;
85
86 $ns->ext_event (capabilities =>
87 # id, name, flags (1 == 2d), edge length
88 tileset => [[1, "default 64x64 faceset", 1, 64], [0, "default 32x32 faceset", 1, 32]],
89 );
90}
91
92sub setup {
93 my ($ns, $args) = @_;
94
95 # run through the cmds of setup
96 # syntax is setup <cmdname1> <parameter> <cmdname2> <parameter> ...
97 #
98 # we send the status of the cmd back, or a FALSE is the cmd is the server unknown
99 # The client then must sort this out
100
101 my %setup = split / +/, $args;
102 while (my ($k, $v) = each %setup) {
103 if ($k eq "sound") {
104 $ns->sound ($v);
105
106 } elsif ($k eq "exp64") {
107 $setup{$k} = 1;
108
109 } elsif ($k eq "spellmon") {
110 $ns->monitor_spells ($v);
111
112 } elsif ($k eq "darkness") {
113 $ns->darkness ($v);
114
115 } elsif ($k eq "map1cmd") {
116 $ns->mapmode (cf::Map1Cmd) if $v > 0;
117
118 } elsif ($k eq "map1acmd") {
119 $ns->mapmode (cf::Map1aCmd) if $v > 0;
120
121 } elsif ($k eq "map2cmd") {
122 # gcfclient bug, map1acmd is sent too late
123 $ns->mapmode (cf::Map1aCmd);
124 $setup{$k} = "FALSE";
125
126 } elsif ($k eq "newmapcmd") {
127 $ns->newmapcmd ($v);
128
129 } elsif ($k eq "mapinfocmd") {
130 $ns->mapinfocmd ($v);
131
132 } elsif ($k eq "extcmd") {
133 $ns->extcmd ($v > 0);
134 send_capabilities $ns;
135
136 } elsif ($k eq "extmap") {
137 $ns->extmap ($v);
138
139 } elsif ($k eq "facecache") {
140 if (!$v) {
141 $v = 1;
142 $setup{$k} = $v;
143 $ns->send_drawinfo ("(trying to forcefully enable facecaching)", cf::NDI_RED);
144 }
145
146 $ns->facecache ($v);
147
148 } elsif ($k eq "faceset") {
149 $ns->faceset (0);
150 $setup{$k} = 0;
151 # $ns->image2 (1)
152
153 } elsif ($k eq "tileset") {
154 $setup{$k} = $ns->faceset ($v & 1);
155
156 } elsif ($k eq "itemcmd") {
157 # Version of the item protocol command to use. Currently,
158 # only supported versions are 1 and 2. Using a numeric
159 # value will make it very easy to extend this in the future.
160 $ns->itemcmd ($v) if $v >= 1 && $v <= 2;
161
162 $setup{$k} = $ns->itemcmd;
163
164 } elsif ($k eq "mapsize") {
165 my ($x, $y) = split /x/, $v;
166
167 $ns->mapx ($x = max 9, min cf::MAP_CLIENT_X, ($x - 1) | 1);
168 $ns->mapy ($y = max 9, min cf::MAP_CLIENT_Y, ($y - 1) | 1);
169
170 $setup{$k} = "${x}x${y}";
171
172 } elsif ($k eq "extendedMapInfos") {
173 $ns->ext_mapinfos ($v);
174
175 } elsif ($k eq "extendedTextInfos") {
176 $ns->has_readable_type ($v);
177
178 } elsif ($k eq "smoothing") { # cfplus-style smoothing
179 $ns->smoothing ($v);
180
181 } elsif ($k eq "fxix") {
182 $ns->fxix ($v);
183
184 } else {
185 # other commands:
186 # sexp: no idea, probably for oudated servers
187 # tick: more stupidity, server should sned a tick per tick
188
189 $setup{$k} = "FALSE";
190 }
191 }
192
193 $ns->send_packet (join " ", setup => %setup);
194
195 cf::datalog setup =>
196 request => $args,
197 reply => \%setup,
198 client => $ns->version,
199 ;
200}
201
202sub addme {
203 my ($ns) = @_;
204
205 if (!$ns->facecache) 132 if (!$ns->facecache)
206 { 133 {
207 $ns->send_drawinfo (<<EOF, cf::NDI_RED); 134 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
208 135
209 136
210*** 137***
211*** WARNING: 138*** WARNING:
212*** Your client does not support face/image caching, 139*** Your client does not support face/image caching,
… …
217*** 144***
218*** CFPlus: all known versions automatically enable the facecache. 145*** CFPlus: all known versions automatically enable the facecache.
219*** cfclient: use the -cache commandline option. 146*** cfclient: use the -cache commandline option.
220*** cfclient: map will not redraw automatically (bug). 147*** cfclient: map will not redraw automatically (bug).
221*** gcfclient: use -cache commandline option, or enable 148*** gcfclient: use -cache commandline option, or enable
222*** gcfclient: Client=>Configure=>Map & Image=>Cache Images. 149*** gcfclient: Client => Configure => Map & Image => Cache Images.
223*** jcrossclient: your client is broken, use CFPlus or gcfclient. 150*** jcrossclient: your client is broken, use CFPlus or gcfclient.
224*** 151***
225*** 152***
226EOF 153EOF
227 if ($ns->version =~ /jcrossclient/) { 154 if ($ns->version =~ /jcrossclient/) {
… …
248 } 175 }
249 176
250 $ns->pl and return $ns->destroy; 177 $ns->pl and return $ns->destroy;
251 178
252 $ns->async (sub { 179 $ns->async (sub {
180 $Coro::current->{desc} = "addme init";
181
253 my ($user, $pass); 182 my ($user, $pass);
254 183
255 $ns->send_packet ("addme_success"); 184 $ns->send_packet ("addme_success");
256 185
257 for (;;) { 186 for (;;) {
… …
280 . "(only a-z, A-Z and 0-9 are allowed), " 209 . "(only a-z, A-Z and 0-9 are allowed), "
281 . "or is not between 3 and 18 characters in length.", 210 . "or is not between 3 and 18 characters in length.",
282 cf::NDI_RED 211 cf::NDI_RED
283 ); 212 );
284 } 213 }
214 Coro::Timer::sleep 0.4;
285 } 215 }
286 216
287 check_playing $ns, $user and next; 217 check_playing $ns, $user and next;
218
219 $Coro::current->{desc} = "addme($user) pass";
288 220
289 $ns->send_drawinfo ( 221 $ns->send_drawinfo (
290 "Welcome $user, please enter your password now. " 222 "Welcome $user, please enter your password now. "
291 . "New users should now choose a password. " 223 . "New users should now choose a password. "
292 . "Anything your client lets you enter is fine.", 224 . "Anything your client lets you enter is fine.",
… …
300 $ns->send_drawinfo ( 232 $ns->send_drawinfo (
301 "Try to use at least three characters as your password please, " 233 "Try to use at least three characters as your password please, "
302 . "that cannot be too much to ask for :)", 234 . "that cannot be too much to ask for :)",
303 cf::NDI_RED 235 cf::NDI_RED
304 ); 236 );
237 Coro::Timer::sleep 0.4;
305 } 238 }
306 239
307 # lock this username for the remainder of this login session 240 # lock this username for the remainder of this login session
308 if ($cf::LOGIN_LOCK{$user}) { 241 if ($cf::LOGIN_LOCK{$user}) {
309 $ns->send_drawinfo ( 242 $ns->send_drawinfo (
… …
315 } 248 }
316 local $cf::LOGIN_LOCK{$user} = 1; 249 local $cf::LOGIN_LOCK{$user} = 1;
317 250
318 check_playing $ns, $user and next; 251 check_playing $ns, $user and next;
319 252
253 $Coro::current->{desc} = "addme($user) check";
254
320 # try to read the user file and check the password 255 # try to read the user file and check the password
321 if (my $pl = cf::player::find $user) { 256 if (my $pl = cf::player::find $user) {
322 aio_stat $pl->path and next; 257 aio_stat $pl->path and next;
323 my $mtime = (stat _)[9]; 258 my $mtime = (stat _)[9];
324 my $hash = $pl->password; 259 my $hash = $pl->password;
… …
326 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) { 261 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) {
327 nuke_str $pass; 262 nuke_str $pass;
328 # password matches, wonderful 263 # password matches, wonderful
329 my $pl = cf::player::find $user or next; 264 my $pl = cf::player::find $user or next;
330 $pl->connect ($ns); 265 $pl->connect ($ns);
331 check_clean_save $pl; 266 enter_map $pl;
332 last; 267 last;
333 } elsif (can_cleanup $pl, $mtime) { 268 } elsif (can_cleanup $pl, $mtime) {
334 Coro::Timer::sleep 1; 269 Coro::Timer::sleep 1;
335 270
336 $ns->send_drawinfo ( 271 $ns->send_drawinfo (
… …
377 next; 312 next;
378 } 313 }
379 } 314 }
380 315
381 # the rest of this function is character creation 316 # the rest of this function is character creation
317 $Coro::current->{desc} = "addme($user) chargen";
382 318
383 # just to make sure nothing is left over 319 # just to make sure nothing is left over
384 nuke_playerdir $user; 320 nuke_playerdir $user;
385 321
386 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again."; 322 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
… …
390 nuke_str $pass2; 326 nuke_str $pass2;
391 $ns->send_drawinfo ( 327 $ns->send_drawinfo (
392 "The passwords do not match, please try again.", 328 "The passwords do not match, please try again.",
393 cf::NDI_RED 329 cf::NDI_RED
394 ); 330 );
331 Coro::Timer::sleep 0.5;
395 next; 332 next;
396 } 333 }
397 334
398 nuke_str $pass2; 335 nuke_str $pass2;
399 336
400 my $pl = cf::player::new $user; 337 my $pl = cf::player::new $user;
401 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]); 338 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]);
402 nuke_str $pass; 339 nuke_str $pass;
403 $pl->connect ($ns); 340 $pl->connect ($ns);
404
405 my $ob = $pl->ob; 341 my $ob = $pl->ob;
342
343 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
406 344
407 while () { 345 while () {
408 $ob->update_stats; 346 $ob->update_stats;
409 $pl->save_stats; 347 $pl->save_stats;
410 348
… …
420 $ob->swap_stats ($res - 1, $swap - 1); 358 $ob->swap_stats ($res - 1, $swap - 1);
421 } 359 }
422 } else { 360 } else {
423 $ob->roll_stats; 361 $ob->roll_stats;
424 } 362 }
363
364 Coro::Timer::sleep 0.2;
425 } 365 }
426 366
427 $ob->set_animation (2); 367 $ob->set_animation (2);
428 $ob->add_statbonus; 368 $ob->add_statbonus;
429 369
430 $ns->send_drawinfo ($ob->msg, cf::NDI_BLUE); 370 while () {
431 $ns->send_packet (sprintf "query %d %s", cf::CS_QUERY_SINGLECHAR, 371 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
372 my $msg = $ob->msg;
373 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
374 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
375
376 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
432 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n"); 377 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
433 378
434 $ns->state (cf::ST_CHANGE_CLASS); 379 last if $res =~ /[dD]/;
380
381 $pl->chargen_race_next;
382 Coro::Timer::sleep 0.2;
383 }
384
385 $pl->chargen_race_done;
386
387 while () {
388 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
389 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
390
391 if ($res =~ /^[fF]/) {
392 $pl->gender (1);
393 last;
394 } elsif ($res =~ /^[mM]/) {
395 $pl->gender (0);
396 last;
397 }
398 Coro::Timer::sleep 0.2;
399 }
400
401 $ob->reply (undef, "Welcome to Crossfire!");
402
435 delete $pl->{deny_save};#d# too early 403 delete $pl->{deny_save};
436 404
437 last; 405 last;
438 } 406 }
439 }); 407 });
440} 408});
441 409
442cf::register_command quit => sub { 410cf::register_command quit => sub {
443 my ($ob, $arg) = @_; 411 my ($ob, $arg) = @_;
444 412
445 $ob->reply (undef, 413 $ob->reply (undef,
… …
516 $pl->{unclean_save} = $cf::RUNTIME; 484 $pl->{unclean_save} = $cf::RUNTIME;
517 } 485 }
518 }, 486 },
519); 487);
520 488
521cf::client->attach (
522 on_addme => \&addme,
523 on_setup => \&setup,
524);
525
526############################################################################# 489#############################################################################
527 490
528our $SCHEDULE_INTERVAL = 10; # time the player scheduler sleeps between runs 491our $SCHEDULE_INTERVAL = $cf::CFG{player_schedule_interval} || 10; # time the player scheduler sleeps between runs
529our $SAVE_TIMEOUT = 20; # save players every n seconds 492our $SAVE_TIMEOUT = $cf::CFG{player_save_interval} || 20; # save players every n seconds
530 493
531our $SCHEDULER = cf::async_ext { 494our $SCHEDULER = cf::async_ext {
495 $Coro::current->{desc} = "player scheduler";
496
532 my $schedule_interval = Coro::Event->timer (after => 1, interval => $SCHEDULE_INTERVAL); 497 my $schedule_interval = Coro::Event->timer (after => 1);
533 while () { 498 while () {
499 $schedule_interval->interval ($SCHEDULE_INTERVAL);
534 $schedule_interval->next; 500 $schedule_interval->next;
535 501
536 # this weird form of iteration over values is used because 502 # this weird form of iteration over values is used because
537 # the hash changes underneath us frequently, and for 503 # the hash changes underneath us frequently, and for
538 # keeps a direct reference to the value without (in 5.8 perls) 504 # keeps a direct reference to the value without (in 5.8 perls)
… …
543 or next; 509 or next;
544 $pl->valid or next; 510 $pl->valid or next;
545 511
546 eval { 512 eval {
547 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) { 513 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
548 cf::wait_for_tick_begin;
549 $pl->save; 514 $pl->save;
550 515
551 unless ($pl->active) { 516 unless ($pl->active || $pl->ns) {
552 # check refcounts, this is tricky and needs to be adjusted to fit server internals 517 # check refcounts, this is tricky and needs to be adjusted to fit server internals
553 my $ob = $pl->ob; 518 my $ob = $pl->ob;
554 Scalar::Util::weaken $pl; 519
555 Scalar::Util::weaken $ob;
556 my $a_ = $pl->refcnt;#d#
557 my $b_ = $ob->refcnt;#d#
558 my $pl_ref = $pl->refcnt_cnt; 520 my $pl_ref = $pl->refcnt_cnt;
559 my $ob_ref = $ob->refcnt_cnt; 521 my $ob_ref = $ob->refcnt_cnt;
560 522
561 ## pl_ref == one from object + one from cf::PLAYER 523 ## pl_ref == $pl + ob->contr + %cf::PLAYER
562 ## ob_ref == one from simply being an object 524 ## ob_ref == $ob + pl->observe + simply being an object
563 if ($pl_ref == 2 && $ob_ref == 1) { 525 if ($pl_ref == 3 && $ob_ref == 3) {
564 warn "player-scheduler destroy ", $ob->name;#d# 526 warn "player-scheduler destroy ", $ob->name;#d#
565 527
566 # remove from sight and get fresh "copies" 528 # remove from sight and get fresh "copies"
567 $pl = delete $cf::PLAYER{$ob->name}; 529 $pl = delete $cf::PLAYER{$ob->name};
568 $ob = $pl->ob; 530 $ob = $pl->ob;
569 531
570 $ob->destroy;
571 $pl->destroy; 532 $pl->destroy; # destroys $ob
572 } else { 533 } else {
534 my $a_ = $pl->refcnt;#d#
535 my $b_ = $ob->refcnt;#d#
536
573 warn "player-scheduler refcnt ", $ob->name, " $pl_ref,$a_ $ob_ref,$b_\n";#d# 537 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref ob $ob_ref (C pl $a_ ob $b_)\n";#d#
574 } 538 }
575 } 539 }
576 } 540 }
577 }; 541 };
578 warn $@ if $@; 542 warn $@ if $@;

Diff Legend

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