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.55 by root, Sun Jun 24 01:09:28 2007 UTC vs.
Revision 1.78 by root, Mon Jan 7 01:55:19 2008 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 return 0;
61 warn join ":", $m->at ($x, $y);#d#
62 warn "FOO$m { ".scalar ($m->at ($x, $y))." }\n";
63 return 0;
64
65 scalar grep $_->type == cf::SAVEBED, $m->at ($x, $y)
66}
67
58sub enter_map { 68sub enter_map {
59 my ($pl) = @_; 69 my ($pl) = @_;
60 70
71 my $ob = $pl->ob;
72
61 my ($map, $x, $y) 73 my ($map, $x, $y)
62 = $pl->ob->{_link_pos} 74 = $ob->{_link_pos}
63 ? @{delete $pl->ob->{_link_pos}} 75 ? @{delete $ob->{_link_pos}}
64 : ($pl->maplevel, $pl->ob->x, $pl->ob->y); 76 : ($pl->maplevel, $ob->x, $ob->y);
65 77
66 $pl->ob->enter_link; 78 $ob->enter_link;
67 79
80 my $m = cf::map::find $map;
68 if (my $time = delete $pl->{unclean_save}) { 81 my $time = delete $pl->{unclean_save};
69 if (my $m = cf::map::find $map) { 82
83 if ($time && $m && !safe_spot $m, $x, $y) {
70 if ($time < $m->{instantiate_time}) { 84 if ($time < $m->{instantiate_time}) {
71 # the map was reset in the meantime 85 # the map was reset in the meantime
72 my $age = $cf::RUNTIME - $time; 86 my $age = $cf::RUNTIME - $time;
87
73 warn $pl->ob->name, " map reset after logout, logout age $age\n";#d# 88 warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
74 89
75 # for now, just go back to savebed
76 ($map, $x, $y) = $pl->savebed; 90 ($map, $x, $y) = $pl->savebed;
77 91
78 $pl->ns->send_drawinfo ( 92 if ($age >= $MAX_DISCONNECT_TIME) {
93 $ob->message (
94 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
95 . "Unfortunately, nobody was near to help you when the monsters arrived to eat you. "
96 . "Maybe you can find comfort in the thought that your body was quite satisfying in taste... "
97 . "H<You disconnected too long without having used a savebed.>",
98 cf::NDI_RED
99 );
100 # kill them.
101 # reminds me of the famous badness 10000 syndrome...
102 $ob->stats->hp (-10000); #] if they survive this they deserved to live
103 $pl->killer ("a cave-in");
104 } else {
105 $ob->message (
79 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. " 106 "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. " 107 . "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...", 108 . "Better use a savebed next time, much worse things could have happened... "
109 . "H<You disconnected without having used a savebed. When you do that for too long, you might die.>",
82 cf::NDI_RED 110 cf::NDI_RED
83 ); 111 );
112 }
84 } else { 113 } else {
85 $pl->ns->send_drawinfo ( 114 $ob->message (
86 "You didn't use a bed to reality to leave this realm. This is very dangerous, " 115 "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, " 116 . "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.", 117 . "or monsters suddenly snapping your body. Better use a savebed next time. "
118 . "H<Always apply a bed of reality to disconnect from the server.>",
89 cf::NDI_RED 119 cf::NDI_RED
90 ); 120 );
91 }
92 } 121 }
93 } 122 }
94 123
95 $pl->ob->goto ($map, $x, $y); 124 $ob->goto ($map, $x, $y);
96} 125}
97 126
98# delete a player directory, be non-blocking AND synchronous... 127# delete a player directory, be non-blocking AND synchronous...
99# (thats hard, so we crap out and fork). 128# (thats hard, so we crap out and fork).
100sub nuke_playerdir { 129sub nuke_playerdir {
101 my ($user) = @_; 130 my ($user) = @_;
102 131
103 aio_stat "$PLAYERDIR/$user"; 132 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 133
109sub send_capabilities { 134 cf::fork_call {
135 rename "$PLAYERDIR/$user", $temp;
136 system "rm", "-rf", $temp;
137 };
138}
139
140cf::client->attach (on_addme => sub {
110 my ($ns) = @_; 141 my ($ns) = @_;
111 142
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) 143 if (!$ns->facecache)
240 { 144 {
241 $ns->send_drawinfo (<<EOF, cf::NDI_RED); 145 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
242 146
243 147
244*** 148***
245*** WARNING: 149*** WARNING:
246*** Your client does not support face/image caching, 150*** Your client does not support face/image caching,
… …
251*** 155***
252*** CFPlus: all known versions automatically enable the facecache. 156*** CFPlus: all known versions automatically enable the facecache.
253*** cfclient: use the -cache commandline option. 157*** cfclient: use the -cache commandline option.
254*** cfclient: map will not redraw automatically (bug). 158*** cfclient: map will not redraw automatically (bug).
255*** gcfclient: use -cache commandline option, or enable 159*** gcfclient: use -cache commandline option, or enable
256*** gcfclient: Client=>Configure=>Map & Image=>Cache Images. 160*** gcfclient: Client => Configure => Map & Image => Cache Images.
257*** jcrossclient: your client is broken, use CFPlus or gcfclient. 161*** jcrossclient: your client is broken, use CFPlus or gcfclient.
258*** 162***
259*** 163***
260EOF 164EOF
261 if ($ns->version =~ /jcrossclient/) { 165 if ($ns->version =~ /jcrossclient/) {
… …
282 } 186 }
283 187
284 $ns->pl and return $ns->destroy; 188 $ns->pl and return $ns->destroy;
285 189
286 $ns->async (sub { 190 $ns->async (sub {
191 $Coro::current->{desc} = "addme init";
192
287 my ($user, $pass); 193 my ($user, $pass);
288 194
289 $ns->send_packet ("addme_success"); 195 $ns->send_packet ("addme_success");
290 196
291 for (;;) { 197 for (;;) {
… …
314 . "(only a-z, A-Z and 0-9 are allowed), " 220 . "(only a-z, A-Z and 0-9 are allowed), "
315 . "or is not between 3 and 18 characters in length.", 221 . "or is not between 3 and 18 characters in length.",
316 cf::NDI_RED 222 cf::NDI_RED
317 ); 223 );
318 } 224 }
225 Coro::Timer::sleep 0.4;
319 } 226 }
320 227
321 check_playing $ns, $user and next; 228 check_playing $ns, $user and next;
229
230 $Coro::current->{desc} = "addme($user) pass";
322 231
323 $ns->send_drawinfo ( 232 $ns->send_drawinfo (
324 "Welcome $user, please enter your password now. " 233 "Welcome $user, please enter your password now. "
325 . "New users should now choose a password. " 234 . "New users should now choose a password. "
326 . "Anything your client lets you enter is fine.", 235 . "Anything your client lets you enter is fine.",
… …
334 $ns->send_drawinfo ( 243 $ns->send_drawinfo (
335 "Try to use at least three characters as your password please, " 244 "Try to use at least three characters as your password please, "
336 . "that cannot be too much to ask for :)", 245 . "that cannot be too much to ask for :)",
337 cf::NDI_RED 246 cf::NDI_RED
338 ); 247 );
248 Coro::Timer::sleep 0.4;
339 } 249 }
340 250
341 # lock this username for the remainder of this login session 251 # lock this username for the remainder of this login session
342 if ($cf::LOGIN_LOCK{$user}) { 252 if ($cf::LOGIN_LOCK{$user}) {
343 $ns->send_drawinfo ( 253 $ns->send_drawinfo (
… …
348 next; 258 next;
349 } 259 }
350 local $cf::LOGIN_LOCK{$user} = 1; 260 local $cf::LOGIN_LOCK{$user} = 1;
351 261
352 check_playing $ns, $user and next; 262 check_playing $ns, $user and next;
263
264 $Coro::current->{desc} = "addme($user) check";
353 265
354 # try to read the user file and check the password 266 # try to read the user file and check the password
355 if (my $pl = cf::player::find $user) { 267 if (my $pl = cf::player::find $user) {
356 aio_stat $pl->path and next; 268 aio_stat $pl->path and next;
357 my $mtime = (stat _)[9]; 269 my $mtime = (stat _)[9];
… …
411 next; 323 next;
412 } 324 }
413 } 325 }
414 326
415 # the rest of this function is character creation 327 # the rest of this function is character creation
328 $Coro::current->{desc} = "addme($user) chargen";
416 329
417 # just to make sure nothing is left over 330 # just to make sure nothing is left over
418 nuke_playerdir $user; 331 nuke_playerdir $user;
419 332
420 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again."; 333 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
… …
424 nuke_str $pass2; 337 nuke_str $pass2;
425 $ns->send_drawinfo ( 338 $ns->send_drawinfo (
426 "The passwords do not match, please try again.", 339 "The passwords do not match, please try again.",
427 cf::NDI_RED 340 cf::NDI_RED
428 ); 341 );
342 Coro::Timer::sleep 0.5;
429 next; 343 next;
430 } 344 }
431 345
432 nuke_str $pass2; 346 nuke_str $pass2;
433 347
… …
455 $ob->swap_stats ($res - 1, $swap - 1); 369 $ob->swap_stats ($res - 1, $swap - 1);
456 } 370 }
457 } else { 371 } else {
458 $ob->roll_stats; 372 $ob->roll_stats;
459 } 373 }
374
375 Coro::Timer::sleep 0.2;
460 } 376 }
461 377
462 $ob->set_animation (2); 378 $ob->set_animation (2);
463 $ob->add_statbonus; 379 $ob->add_statbonus;
464 380
465 while () { 381 while () {
466 $ns->send_msg (-1, "chargen-race-title", ucfirst $pl->title); 382 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
467 my $msg = $ob->msg; 383 my $msg = $ob->msg;
468 $msg =~ s/(?<=\S)\n(?=\S)/ /g; 384 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
469 $ns->send_msg (cf::NDI_BLUE, "chargen-race-description", $msg); 385 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
470 386
471 my $res = query $ns, cf::CS_QUERY_SINGLECHAR, 387 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"; 388 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
473 389
474 last if $res =~ /[dD]/; 390 last if $res =~ /[dD]/;
475 391
476 $pl->chargen_race_next; 392 $pl->chargen_race_next;
393 Coro::Timer::sleep 0.2;
477 } 394 }
478 395
479 $pl->chargen_race_done; 396 $pl->chargen_race_done;
480 397
481 while () { 398 while () {
… …
487 last; 404 last;
488 } elsif ($res =~ /^[mM]/) { 405 } elsif ($res =~ /^[mM]/) {
489 $pl->gender (0); 406 $pl->gender (0);
490 last; 407 last;
491 } 408 }
409 Coro::Timer::sleep 0.2;
492 } 410 }
493 411
494 $ob->reply (undef, "Welcome to Crossfire!"); 412 $ob->reply (undef, "Welcome to Deliantra!");
495 413
496 delete $pl->{deny_save}; 414 delete $pl->{deny_save};
497 415
498 last; 416 last;
499 } 417 }
500 }); 418 });
501} 419});
502 420
503cf::register_command quit => sub { 421cf::register_command quit => sub {
504 my ($ob, $arg) = @_; 422 my ($ob, $arg) = @_;
505 423
506 $ob->reply (undef, 424 $ob->reply (undef,
… …
577 $pl->{unclean_save} = $cf::RUNTIME; 495 $pl->{unclean_save} = $cf::RUNTIME;
578 } 496 }
579 }, 497 },
580); 498);
581 499
582cf::client->attach (
583 on_addme => \&addme,
584 on_setup => \&setup,
585);
586
587############################################################################# 500#############################################################################
588 501
589our $SCHEDULE_INTERVAL = 10; # time the player scheduler sleeps between runs 502our $SCHEDULE_INTERVAL = $cf::CFG{player_schedule_interval} || 10; # time the player scheduler sleeps between runs
590our $SAVE_TIMEOUT = 20; # save players every n seconds 503our $SAVE_TIMEOUT = $cf::CFG{player_save_interval} || 20; # save players every n seconds
591 504
592our $SCHEDULER = cf::async_ext { 505our $SCHEDULER = cf::async_ext {
593 my $schedule_interval = Coro::Event->timer (after => 1, interval => $SCHEDULE_INTERVAL); 506 $Coro::current->{desc} = "player scheduler";
507
594 while () { 508 while () {
595 $schedule_interval->next; 509 Coro::EV::timer_once $SCHEDULE_INTERVAL;
596 510
597 # this weird form of iteration over values is used because 511 # this weird form of iteration over values is used because
598 # the hash changes underneath us frequently, and for 512 # the hash changes underneath us frequently, and for
599 # keeps a direct reference to the value without (in 5.8 perls) 513 # keeps a direct reference to the value without (in 5.8 perls)
600 # keeping a reference, so this is prone to crashes or worse. 514 # keeping a reference, so this is prone to crashes or worse.
… …
604 or next; 518 or next;
605 $pl->valid or next; 519 $pl->valid or next;
606 520
607 eval { 521 eval {
608 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) { 522 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
609 cf::wait_for_tick_begin;
610 $pl->save; 523 $pl->save;
611 524
612 unless ($pl->active || $pl->ns) { 525 unless ($pl->active || $pl->ns) {
613 # check refcounts, this is tricky and needs to be adjusted to fit server internals 526 # check refcounts, this is tricky and needs to be adjusted to fit server internals
614 my $ob = $pl->ob; 527 my $ob = $pl->ob;

Diff Legend

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