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.43 by root, Mon Apr 23 18:09:57 2007 UTC vs.
Revision 1.77 by root, Fri Dec 28 19:44:34 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 safe_spot($$$) {
58 my ($m, $x, $y) = @_;
59
60 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y)
61}
62
63sub enter_map {
57 my ($pl) = @_; 64 my ($pl) = @_;
58 65
66 my $ob = $pl->ob;
67
68 my ($map, $x, $y)
69 = $ob->{_link_pos}
70 ? @{delete $ob->{_link_pos}}
71 : ($pl->maplevel, $ob->x, $ob->y);
72
73 $ob->enter_link;
74
75 my $m = cf::map::find $map;
59 if (my $time = delete $pl->{unclean_save}) { 76 my $time = delete $pl->{unclean_save};
60 $pl->ns->send_drawinfo ( 77
78 if ($time && $m && !safe_spot $m, $x, $y) {
79 if ($time < $m->{instantiate_time}) {
80 # the map was reset in the meantime
81 my $age = $cf::RUNTIME - $time;
82
83 warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
84
85 ($map, $x, $y) = $pl->savebed;
86
87 if ($age >= $MAX_DISCONNECT_TIME) {
88 $ob->message (
89 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
90 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
91 . "Maybe you can find comfort in the thought that your body was quite satisfying in taste... "
92 . "H<You disconnected too long without having used a savebed.>",
93 cf::NDI_RED
94 );
95 # kill them.
96 # reminds me of the famous badness 10000 syndrome...
97 $ob->stats->hp (-10000); #] if they survive this they deserved to live
98 $pl->killer ("a cave-in");
99 } else {
100 $ob->message (
101 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
102 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
103 . "Better use a savebed next time, much worse things could have happened... "
104 . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>",
105 cf::NDI_RED
106 );
107 }
108 } else {
109 $ob->message (
61 "You didn't use a savebed to leave this realm. This is very dangerous, " 110 "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, " 111 . "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.", 112 . "or monsters suddenly snapping your body. Better use a savebed next time. "
113 . "H<Always apply a bed of reality to disconnect from the server.>",
64 cf::NDI_RED 114 cf::NDI_RED
65 ); 115 );
66 #d#TODO 116 }
67 } 117 }
118
119 $ob->goto ($map, $x, $y);
68} 120}
69 121
70# delete a player directory, be non-blocking AND synchronous... 122# delete a player directory, be non-blocking AND synchronous...
71# (thats hard, so we crap out and fork). 123# (thats hard, so we crap out and fork).
72sub nuke_playerdir { 124sub nuke_playerdir {
73 my ($user) = @_; 125 my ($user) = @_;
74 126
75 aio_stat "$PLAYERDIR/$user"; 127 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
76 system "cd \Q$PLAYERDIR\E "
77 . "&& mv \Q$user\E ~\Q$Coro::current\E~deleting~ 2>/dev/null "
78 . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)";
79}
80 128
81sub send_capabilities { 129 cf::fork_call {
130 rename "$PLAYERDIR/$user", $temp;
131 system "rm", "-rf", $temp;
132 };
133}
134
135cf::client->attach (on_addme => sub {
82 my ($ns) = @_; 136 my ($ns) = @_;
83 137
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 } elsif ($k eq "msg") {
185 $ns->{setup}{msg} = $v;
186
187 } else {
188 # other commands:
189 # sexp: no idea, probably for oudated servers
190 # tick: more stupidity, server should sned a tick per tick
191
192 $setup{$k} = "FALSE";
193 }
194 }
195
196 $ns->send_packet (join " ", setup => %setup);
197
198 cf::datalog setup =>
199 request => $args,
200 reply => \%setup,
201 client => $ns->version,
202 ;
203}
204
205sub addme {
206 my ($ns) = @_;
207
208 if (!$ns->facecache) 138 if (!$ns->facecache)
209 { 139 {
210 $ns->send_drawinfo (<<EOF, cf::NDI_RED); 140 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
211 141
212 142
213*** 143***
214*** WARNING: 144*** WARNING:
215*** Your client does not support face/image caching, 145*** Your client does not support face/image caching,
… …
220*** 150***
221*** CFPlus: all known versions automatically enable the facecache. 151*** CFPlus: all known versions automatically enable the facecache.
222*** cfclient: use the -cache commandline option. 152*** cfclient: use the -cache commandline option.
223*** cfclient: map will not redraw automatically (bug). 153*** cfclient: map will not redraw automatically (bug).
224*** gcfclient: use -cache commandline option, or enable 154*** gcfclient: use -cache commandline option, or enable
225*** gcfclient: Client=>Configure=>Map & Image=>Cache Images. 155*** gcfclient: Client => Configure => Map & Image => Cache Images.
226*** jcrossclient: your client is broken, use CFPlus or gcfclient. 156*** jcrossclient: your client is broken, use CFPlus or gcfclient.
227*** 157***
228*** 158***
229EOF 159EOF
230 if ($ns->version =~ /jcrossclient/) { 160 if ($ns->version =~ /jcrossclient/) {
… …
251 } 181 }
252 182
253 $ns->pl and return $ns->destroy; 183 $ns->pl and return $ns->destroy;
254 184
255 $ns->async (sub { 185 $ns->async (sub {
186 $Coro::current->{desc} = "addme init";
187
256 my ($user, $pass); 188 my ($user, $pass);
257 189
258 $ns->send_packet ("addme_success"); 190 $ns->send_packet ("addme_success");
259 191
260 for (;;) { 192 for (;;) {
… …
283 . "(only a-z, A-Z and 0-9 are allowed), " 215 . "(only a-z, A-Z and 0-9 are allowed), "
284 . "or is not between 3 and 18 characters in length.", 216 . "or is not between 3 and 18 characters in length.",
285 cf::NDI_RED 217 cf::NDI_RED
286 ); 218 );
287 } 219 }
220 Coro::Timer::sleep 0.4;
288 } 221 }
289 222
290 check_playing $ns, $user and next; 223 check_playing $ns, $user and next;
224
225 $Coro::current->{desc} = "addme($user) pass";
291 226
292 $ns->send_drawinfo ( 227 $ns->send_drawinfo (
293 "Welcome $user, please enter your password now. " 228 "Welcome $user, please enter your password now. "
294 . "New users should now choose a password. " 229 . "New users should now choose a password. "
295 . "Anything your client lets you enter is fine.", 230 . "Anything your client lets you enter is fine.",
… …
303 $ns->send_drawinfo ( 238 $ns->send_drawinfo (
304 "Try to use at least three characters as your password please, " 239 "Try to use at least three characters as your password please, "
305 . "that cannot be too much to ask for :)", 240 . "that cannot be too much to ask for :)",
306 cf::NDI_RED 241 cf::NDI_RED
307 ); 242 );
243 Coro::Timer::sleep 0.4;
308 } 244 }
309 245
310 # lock this username for the remainder of this login session 246 # lock this username for the remainder of this login session
311 if ($cf::LOGIN_LOCK{$user}) { 247 if ($cf::LOGIN_LOCK{$user}) {
312 $ns->send_drawinfo ( 248 $ns->send_drawinfo (
… …
318 } 254 }
319 local $cf::LOGIN_LOCK{$user} = 1; 255 local $cf::LOGIN_LOCK{$user} = 1;
320 256
321 check_playing $ns, $user and next; 257 check_playing $ns, $user and next;
322 258
259 $Coro::current->{desc} = "addme($user) check";
260
323 # try to read the user file and check the password 261 # try to read the user file and check the password
324 if (my $pl = cf::player::find $user) { 262 if (my $pl = cf::player::find $user) {
325 aio_stat $pl->path and next; 263 aio_stat $pl->path and next;
326 my $mtime = (stat _)[9]; 264 my $mtime = (stat _)[9];
327 my $hash = $pl->password; 265 my $hash = $pl->password;
… …
329 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) { 267 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) {
330 nuke_str $pass; 268 nuke_str $pass;
331 # password matches, wonderful 269 # password matches, wonderful
332 my $pl = cf::player::find $user or next; 270 my $pl = cf::player::find $user or next;
333 $pl->connect ($ns); 271 $pl->connect ($ns);
334 check_clean_save $pl; 272 enter_map $pl;
335 last; 273 last;
336 } elsif (can_cleanup $pl, $mtime) { 274 } elsif (can_cleanup $pl, $mtime) {
337 Coro::Timer::sleep 1; 275 Coro::Timer::sleep 1;
338 276
339 $ns->send_drawinfo ( 277 $ns->send_drawinfo (
… …
380 next; 318 next;
381 } 319 }
382 } 320 }
383 321
384 # the rest of this function is character creation 322 # the rest of this function is character creation
323 $Coro::current->{desc} = "addme($user) chargen";
385 324
386 # just to make sure nothing is left over 325 # just to make sure nothing is left over
387 nuke_playerdir $user; 326 nuke_playerdir $user;
388 327
389 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again."; 328 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
… …
393 nuke_str $pass2; 332 nuke_str $pass2;
394 $ns->send_drawinfo ( 333 $ns->send_drawinfo (
395 "The passwords do not match, please try again.", 334 "The passwords do not match, please try again.",
396 cf::NDI_RED 335 cf::NDI_RED
397 ); 336 );
337 Coro::Timer::sleep 0.5;
398 next; 338 next;
399 } 339 }
400 340
401 nuke_str $pass2; 341 nuke_str $pass2;
402 342
403 my $pl = cf::player::new $user; 343 my $pl = cf::player::new $user;
404 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]); 344 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]);
405 nuke_str $pass; 345 nuke_str $pass;
406 $pl->connect ($ns); 346 $pl->connect ($ns);
407
408 my $ob = $pl->ob; 347 my $ob = $pl->ob;
348
349 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
409 350
410 while () { 351 while () {
411 $ob->update_stats; 352 $ob->update_stats;
412 $pl->save_stats; 353 $pl->save_stats;
413 354
… …
423 $ob->swap_stats ($res - 1, $swap - 1); 364 $ob->swap_stats ($res - 1, $swap - 1);
424 } 365 }
425 } else { 366 } else {
426 $ob->roll_stats; 367 $ob->roll_stats;
427 } 368 }
369
370 Coro::Timer::sleep 0.2;
428 } 371 }
429 372
430 $ob->set_animation (2); 373 $ob->set_animation (2);
431 $ob->add_statbonus; 374 $ob->add_statbonus;
432 375
433 $ns->send_drawinfo ($ob->msg, cf::NDI_BLUE); 376 while () {
434 $ns->send_packet (sprintf "query %d %s", cf::CS_QUERY_SINGLECHAR, 377 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
378 my $msg = $ob->msg;
379 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
380 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
381
382 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
435 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n"); 383 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
436 384
437 $ns->state (cf::ST_CHANGE_CLASS); 385 last if $res =~ /[dD]/;
386
387 $pl->chargen_race_next;
388 Coro::Timer::sleep 0.2;
389 }
390
391 $pl->chargen_race_done;
392
393 while () {
394 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
395 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
396
397 if ($res =~ /^[fF]/) {
398 $pl->gender (1);
399 last;
400 } elsif ($res =~ /^[mM]/) {
401 $pl->gender (0);
402 last;
403 }
404 Coro::Timer::sleep 0.2;
405 }
406
407 $ob->reply (undef, "Welcome to Deliantra!");
408
438 delete $pl->{deny_save};#d# too early 409 delete $pl->{deny_save};
439 410
440 last; 411 last;
441 } 412 }
442 }); 413 });
443} 414});
444 415
445cf::register_command quit => sub { 416cf::register_command quit => sub {
446 my ($ob, $arg) = @_; 417 my ($ob, $arg) = @_;
447 418
448 $ob->reply (undef, 419 $ob->reply (undef,
… …
519 $pl->{unclean_save} = $cf::RUNTIME; 490 $pl->{unclean_save} = $cf::RUNTIME;
520 } 491 }
521 }, 492 },
522); 493);
523 494
524cf::client->attach (
525 on_addme => \&addme,
526 on_setup => \&setup,
527);
528
529############################################################################# 495#############################################################################
530 496
531our $SCHEDULE_INTERVAL = 10; # time the player scheduler sleeps between runs 497our $SCHEDULE_INTERVAL = $cf::CFG{player_schedule_interval} || 10; # time the player scheduler sleeps between runs
532our $SAVE_TIMEOUT = 20; # save players every n seconds 498our $SAVE_TIMEOUT = $cf::CFG{player_save_interval} || 20; # save players every n seconds
533 499
534our $SCHEDULER = cf::async_ext { 500our $SCHEDULER = cf::async_ext {
535 my $schedule_interval = Coro::Event->timer (after => 1, interval => $SCHEDULE_INTERVAL); 501 $Coro::current->{desc} = "player scheduler";
502
536 while () { 503 while () {
537 $schedule_interval->next; 504 Coro::EV::timer_once $SCHEDULE_INTERVAL;
538 505
539 # this weird form of iteration over values is used because 506 # this weird form of iteration over values is used because
540 # the hash changes underneath us frequently, and for 507 # the hash changes underneath us frequently, and for
541 # keeps a direct reference to the value without (in 5.8 perls) 508 # keeps a direct reference to the value without (in 5.8 perls)
542 # keeping a reference, so this is prone to crashes or worse. 509 # keeping a reference, so this is prone to crashes or worse.
… …
546 or next; 513 or next;
547 $pl->valid or next; 514 $pl->valid or next;
548 515
549 eval { 516 eval {
550 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) { 517 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
551 cf::wait_for_tick_begin;
552 $pl->save; 518 $pl->save;
553 519
554 unless ($pl->active) { 520 unless ($pl->active || $pl->ns) {
555 # check refcounts, this is tricky and needs to be adjusted to fit server internals 521 # check refcounts, this is tricky and needs to be adjusted to fit server internals
556 my $ob = $pl->ob; 522 my $ob = $pl->ob;
557 Scalar::Util::weaken $pl; 523
558 Scalar::Util::weaken $ob;
559 my $a_ = $pl->refcnt;#d#
560 my $b_ = $ob->refcnt;#d#
561 my $pl_ref = $pl->refcnt_cnt; 524 my $pl_ref = $pl->refcnt_cnt;
562 my $ob_ref = $ob->refcnt_cnt; 525 my $ob_ref = $ob->refcnt_cnt;
563 526
564 ## pl_ref == one from object + one from cf::PLAYER 527 ## pl_ref == $pl + ob->contr + %cf::PLAYER
565 ## ob_ref == one from simply being an object 528 ## ob_ref == $ob + pl->observe + simply being an object
566 if ($pl_ref == 2 && $ob_ref == 1) { 529 if ($pl_ref == 3 && $ob_ref == 3) {
567 warn "player-scheduler destroy ", $ob->name;#d# 530 warn "player-scheduler destroy ", $ob->name;#d#
568 531
569 # remove from sight and get fresh "copies" 532 # remove from sight and get fresh "copies"
570 $pl = delete $cf::PLAYER{$ob->name}; 533 $pl = delete $cf::PLAYER{$ob->name};
571 $ob = $pl->ob; 534 $ob = $pl->ob;
572 535
573 $ob->destroy;
574 $pl->destroy; 536 $pl->destroy; # destroys $ob
575 } else { 537 } else {
538 my $a_ = $pl->refcnt;#d#
539 my $b_ = $ob->refcnt;#d#
540
576 warn "player-scheduler refcnt ", $ob->name, " $pl_ref,$a_ $ob_ref,$b_\n";#d# 541 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref ob $ob_ref (C pl $a_ ob $b_)\n";#d#
577 } 542 }
578 } 543 }
579 } 544 }
580 }; 545 };
581 warn $@ if $@; 546 warn $@ if $@;

Diff Legend

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