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.53 by root, Mon Jun 11 21:38:13 2007 UTC vs.
Revision 1.77 by root, Fri Dec 28 19:44:34 2007 UTC

… …
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 7
9our %EXT_SETUP; 8our $MAX_DISCONNECT_TIME = $cf::CFG{max_disconnect_time} || 3600;
10 9
11# paranoia function to overwrite a string-in-place 10# paranoia function to overwrite a string-in-place
12sub nuke_str { 11sub nuke_str {
13 substr $_[0], 0, (length $_[0]), "x" x length $_[0] 12 substr $_[0], 0, (length $_[0]), "x" x length $_[0]
14} 13}
… …
41 return unless cf::player::find_active $user; 40 return unless cf::player::find_active $user;
42 41
43 $ns->send_drawinfo ( 42 $ns->send_drawinfo (
44 "That player is already logged in on this server. " 43 "That player is already logged in on this server. "
45 . "If you want to create a new player, choose another name. " 44 . "If you want to create a new player, choose another name. "
46 . "If you are already a registered player, make sure nobody " 45 . "If you have already a registered, make sure nobody "
47 . "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 "
48 . "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 "
49 . "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 "
50 . "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, "
51 . "this will fix anything.", 50 . "this will fix anything.",
52 cf::NDI_RED 51 cf::NDI_RED
53 ); 52 );
54 53
55 1 54 1
56} 55}
57 56
57sub safe_spot($$$) {
58 my ($m, $x, $y) = @_;
59
60 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y)
61}
62
58sub enter_map { 63sub enter_map {
59 my ($pl) = @_; 64 my ($pl) = @_;
60 65
66 my $ob = $pl->ob;
67
61 my ($map, $x, $y) 68 my ($map, $x, $y)
62 = $pl->ob->{_link_pos} 69 = $ob->{_link_pos}
63 ? @{delete $pl->ob->{_link_pos}} 70 ? @{delete $ob->{_link_pos}}
64 : ($pl->maplevel, $pl->ob->x, $pl->ob->y); 71 : ($pl->maplevel, $ob->x, $ob->y);
65 72
66 $pl->ob->enter_link; 73 $ob->enter_link;
67 74
75 my $m = cf::map::find $map;
68 if (my $time = delete $pl->{unclean_save}) { 76 my $time = delete $pl->{unclean_save};
69 if (my $m = cf::map::find $map) { 77
78 if ($time && $m && !safe_spot $m, $x, $y) {
70 if ($time < $m->{instantiate_time}) { 79 if ($time < $m->{instantiate_time}) {
71 # the map was reset in the meantime 80 # the map was reset in the meantime
72 my $age = $cf::RUNTIME - $time; 81 my $age = $cf::RUNTIME - $time;
82
73 warn $pl->ob->name, " map reset after logout, logout age $age\n";#d# 83 warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
74 84
75 # for now, just go back to savebed
76 ($map, $x, $y) = $pl->savebed; 85 ($map, $x, $y) = $pl->savebed;
77 86
78 $pl->ns->send_drawinfo ( 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 (
79 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. " 101 "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. " 102 . "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...", 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.>",
82 cf::NDI_RED 105 cf::NDI_RED
83 ); 106 );
107 }
84 } else { 108 } else {
85 $pl->ns->send_drawinfo ( 109 $ob->message (
86 "You didn't use a bed to reality 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, "
87 . "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, "
88 . "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.>",
89 cf::NDI_RED 114 cf::NDI_RED
90 ); 115 );
91 }
92 } 116 }
93 } 117 }
94 118
95 $pl->ob->goto ($map, $x, $y); 119 $ob->goto ($map, $x, $y);
96} 120}
97 121
98# delete a player directory, be non-blocking AND synchronous... 122# delete a player directory, be non-blocking AND synchronous...
99# (thats hard, so we crap out and fork). 123# (thats hard, so we crap out and fork).
100sub nuke_playerdir { 124sub nuke_playerdir {
101 my ($user) = @_; 125 my ($user) = @_;
102 126
103 aio_stat "$PLAYERDIR/$user"; 127 my $temp = "$PLAYERDIR/~$Coro::current~deleting~";
104 system "cd \Q$PLAYERDIR\E "
105 . "&& mv \Q$user\E ~\Q$Coro::current\E~deleting~ 2>/dev/null "
106 . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)";
107}
108 128
109sub 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 {
110 my ($ns) = @_; 136 my ($ns) = @_;
111 137
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
236sub addme {
237 my ($ns) = @_;
238
239 if (!$ns->facecache) 138 if (!$ns->facecache)
240 { 139 {
241 $ns->send_drawinfo (<<EOF, cf::NDI_RED); 140 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
242 141
243 142
244*** 143***
245*** WARNING: 144*** WARNING:
246*** Your client does not support face/image caching, 145*** Your client does not support face/image caching,
… …
251*** 150***
252*** CFPlus: all known versions automatically enable the facecache. 151*** CFPlus: all known versions automatically enable the facecache.
253*** cfclient: use the -cache commandline option. 152*** cfclient: use the -cache commandline option.
254*** cfclient: map will not redraw automatically (bug). 153*** cfclient: map will not redraw automatically (bug).
255*** gcfclient: use -cache commandline option, or enable 154*** gcfclient: use -cache commandline option, or enable
256*** gcfclient: Client=>Configure=>Map & Image=>Cache Images. 155*** gcfclient: Client => Configure => Map & Image => Cache Images.
257*** jcrossclient: your client is broken, use CFPlus or gcfclient. 156*** jcrossclient: your client is broken, use CFPlus or gcfclient.
258*** 157***
259*** 158***
260EOF 159EOF
261 if ($ns->version =~ /jcrossclient/) { 160 if ($ns->version =~ /jcrossclient/) {
… …
282 } 181 }
283 182
284 $ns->pl and return $ns->destroy; 183 $ns->pl and return $ns->destroy;
285 184
286 $ns->async (sub { 185 $ns->async (sub {
186 $Coro::current->{desc} = "addme init";
187
287 my ($user, $pass); 188 my ($user, $pass);
288 189
289 $ns->send_packet ("addme_success"); 190 $ns->send_packet ("addme_success");
290 191
291 for (;;) { 192 for (;;) {
… …
314 . "(only a-z, A-Z and 0-9 are allowed), " 215 . "(only a-z, A-Z and 0-9 are allowed), "
315 . "or is not between 3 and 18 characters in length.", 216 . "or is not between 3 and 18 characters in length.",
316 cf::NDI_RED 217 cf::NDI_RED
317 ); 218 );
318 } 219 }
220 Coro::Timer::sleep 0.4;
319 } 221 }
320 222
321 check_playing $ns, $user and next; 223 check_playing $ns, $user and next;
224
225 $Coro::current->{desc} = "addme($user) pass";
322 226
323 $ns->send_drawinfo ( 227 $ns->send_drawinfo (
324 "Welcome $user, please enter your password now. " 228 "Welcome $user, please enter your password now. "
325 . "New users should now choose a password. " 229 . "New users should now choose a password. "
326 . "Anything your client lets you enter is fine.", 230 . "Anything your client lets you enter is fine.",
… …
334 $ns->send_drawinfo ( 238 $ns->send_drawinfo (
335 "Try to use at least three characters as your password please, " 239 "Try to use at least three characters as your password please, "
336 . "that cannot be too much to ask for :)", 240 . "that cannot be too much to ask for :)",
337 cf::NDI_RED 241 cf::NDI_RED
338 ); 242 );
243 Coro::Timer::sleep 0.4;
339 } 244 }
340 245
341 # lock this username for the remainder of this login session 246 # lock this username for the remainder of this login session
342 if ($cf::LOGIN_LOCK{$user}) { 247 if ($cf::LOGIN_LOCK{$user}) {
343 $ns->send_drawinfo ( 248 $ns->send_drawinfo (
… …
348 next; 253 next;
349 } 254 }
350 local $cf::LOGIN_LOCK{$user} = 1; 255 local $cf::LOGIN_LOCK{$user} = 1;
351 256
352 check_playing $ns, $user and next; 257 check_playing $ns, $user and next;
258
259 $Coro::current->{desc} = "addme($user) check";
353 260
354 # try to read the user file and check the password 261 # try to read the user file and check the password
355 if (my $pl = cf::player::find $user) { 262 if (my $pl = cf::player::find $user) {
356 aio_stat $pl->path and next; 263 aio_stat $pl->path and next;
357 my $mtime = (stat _)[9]; 264 my $mtime = (stat _)[9];
… …
411 next; 318 next;
412 } 319 }
413 } 320 }
414 321
415 # the rest of this function is character creation 322 # the rest of this function is character creation
323 $Coro::current->{desc} = "addme($user) chargen";
416 324
417 # just to make sure nothing is left over 325 # just to make sure nothing is left over
418 nuke_playerdir $user; 326 nuke_playerdir $user;
419 327
420 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.";
… …
424 nuke_str $pass2; 332 nuke_str $pass2;
425 $ns->send_drawinfo ( 333 $ns->send_drawinfo (
426 "The passwords do not match, please try again.", 334 "The passwords do not match, please try again.",
427 cf::NDI_RED 335 cf::NDI_RED
428 ); 336 );
337 Coro::Timer::sleep 0.5;
429 next; 338 next;
430 } 339 }
431 340
432 nuke_str $pass2; 341 nuke_str $pass2;
433 342
… …
455 $ob->swap_stats ($res - 1, $swap - 1); 364 $ob->swap_stats ($res - 1, $swap - 1);
456 } 365 }
457 } else { 366 } else {
458 $ob->roll_stats; 367 $ob->roll_stats;
459 } 368 }
369
370 Coro::Timer::sleep 0.2;
460 } 371 }
461 372
462 $ob->set_animation (2); 373 $ob->set_animation (2);
463 $ob->add_statbonus; 374 $ob->add_statbonus;
464 375
465 while () { 376 while () {
466 $ns->send_msg (-1, "chargen-race-title", ucfirst $pl->title); 377 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
467 my $msg = $ob->msg; 378 my $msg = $ob->msg;
468 $msg =~ s/(?<=\S)\n(?=\S)/ /g; 379 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
469 $ns->send_msg (cf::NDI_BLUE, "chargen-race-description", $msg); 380 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
470 381
471 my $res = query $ns, cf::CS_QUERY_SINGLECHAR, 382 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
472 "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";
473 384
474 last if $res =~ /[dD]/; 385 last if $res =~ /[dD]/;
475 386
476 $pl->chargen_race_next; 387 $pl->chargen_race_next;
388 Coro::Timer::sleep 0.2;
477 } 389 }
478 390
479 $pl->chargen_race_done; 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!");
480 408
481 delete $pl->{deny_save}; 409 delete $pl->{deny_save};
482 410
483 last; 411 last;
484 } 412 }
485 }); 413 });
486} 414});
487 415
488cf::register_command quit => sub { 416cf::register_command quit => sub {
489 my ($ob, $arg) = @_; 417 my ($ob, $arg) = @_;
490 418
491 $ob->reply (undef, 419 $ob->reply (undef,
… …
562 $pl->{unclean_save} = $cf::RUNTIME; 490 $pl->{unclean_save} = $cf::RUNTIME;
563 } 491 }
564 }, 492 },
565); 493);
566 494
567cf::client->attach (
568 on_addme => \&addme,
569 on_setup => \&setup,
570);
571
572############################################################################# 495#############################################################################
573 496
574our $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
575our $SAVE_TIMEOUT = 20; # save players every n seconds 498our $SAVE_TIMEOUT = $cf::CFG{player_save_interval} || 20; # save players every n seconds
576 499
577our $SCHEDULER = cf::async_ext { 500our $SCHEDULER = cf::async_ext {
578 my $schedule_interval = Coro::Event->timer (after => 1, interval => $SCHEDULE_INTERVAL); 501 $Coro::current->{desc} = "player scheduler";
502
579 while () { 503 while () {
580 $schedule_interval->next; 504 Coro::EV::timer_once $SCHEDULE_INTERVAL;
581 505
582 # this weird form of iteration over values is used because 506 # this weird form of iteration over values is used because
583 # the hash changes underneath us frequently, and for 507 # the hash changes underneath us frequently, and for
584 # 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)
585 # keeping a reference, so this is prone to crashes or worse. 509 # keeping a reference, so this is prone to crashes or worse.
… …
589 or next; 513 or next;
590 $pl->valid or next; 514 $pl->valid or next;
591 515
592 eval { 516 eval {
593 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) { 517 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
594 cf::wait_for_tick_begin;
595 $pl->save; 518 $pl->save;
596 519
597 unless ($pl->active || $pl->ns) { 520 unless ($pl->active || $pl->ns) {
598 # 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
599 my $ob = $pl->ob; 522 my $ob = $pl->ob;
… …
608 531
609 # remove from sight and get fresh "copies" 532 # remove from sight and get fresh "copies"
610 $pl = delete $cf::PLAYER{$ob->name}; 533 $pl = delete $cf::PLAYER{$ob->name};
611 $ob = $pl->ob; 534 $ob = $pl->ob;
612 535
613 $ob->destroy;
614 $pl->destroy; 536 $pl->destroy; # destroys $ob
615 } else { 537 } else {
616 my $a_ = $pl->refcnt;#d# 538 my $a_ = $pl->refcnt;#d#
617 my $b_ = $ob->refcnt;#d# 539 my $b_ = $ob->refcnt;#d#
618 540
619 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref ob $ob_ref (C pl $a_ ob $b_)\n";#d# 541 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref ob $ob_ref (C pl $a_ ob $b_)\n";#d#

Diff Legend

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