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.59 by root, Tue Jul 3 01:04:43 2007 UTC vs.
Revision 1.76 by root, Fri Dec 28 19:40:22 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}
… …
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
68 if (my $time = delete $pl->{unclean_save}) { 75 if (my $time = delete $pl->{unclean_save}) {
69 if (my $m = cf::map::find $map) { 76 if (my $m = cf::map::find $map) {
70 if ($time < $m->{instantiate_time}) { 77 if ($time < $m->{instantiate_time}) {
71 # the map was reset in the meantime 78 # the map was reset in the meantime
72 my $age = $cf::RUNTIME - $time; 79 my $age = $cf::RUNTIME - $time;
80
73 warn $pl->ob->name, " map reset after logout, logout age $age\n";#d# 81 warn $ob->name, " map reset after logout, logout age $age (>= $MAX_DISCONNECT_TIME)\n";#d#
74 82
75 # for now, just go back to savebed
76 ($map, $x, $y) = $pl->savebed; 83 ($map, $x, $y) = $pl->savebed;
77 84
78 $pl->ns->send_drawinfo ( 85 if (safe_spot $m, $x, $y) {
86 # do nothing, this is simply ok without a special scary message
87 } elsif ($age >= $MAX_DISCONNECT_TIME) {
88 $ob->message (
79 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. " 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. "
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.>",
105 cf::NDI_RED
106 );
107 }
108 } elsif (safe_spot $m, $x, $y) {
109 # do nothing, this is simply ok without a special scary message
110 } else {
111 $ob->message (
112 "You didn't use a bed to reality to leave this realm. This is very dangerous, "
113 . "as lots of things could happen when you leave by other means, such as cave-ins, "
114 . "or monsters suddenly snapping your body. Better use a savebed next time. "
115 . "H<Always apply a bed of reality to disconnect from the server.>",
82 cf::NDI_RED 116 cf::NDI_RED
83 ); 117 );
84 } else {
85 $pl->ns->send_drawinfo (
86 "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, "
88 . "or monsters suddenly snapping your body. Better use a savebed next time.",
89 cf::NDI_RED
90 );
91 } 118 }
92 } 119 }
93 } 120 }
94 121
95 $pl->ob->goto ($map, $x, $y); 122 $ob->goto ($map, $x, $y);
96} 123}
97 124
98# delete a player directory, be non-blocking AND synchronous... 125# delete a player directory, be non-blocking AND synchronous...
99# (thats hard, so we crap out and fork). 126# (thats hard, so we crap out and fork).
100sub nuke_playerdir { 127sub nuke_playerdir {
101 my ($user) = @_; 128 my ($user) = @_;
102 129
103 aio_stat "$PLAYERDIR/$user"; 130 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 131
109sub send_capabilities { 132 cf::fork_call {
133 rename "$PLAYERDIR/$user", $temp;
134 system "rm", "-rf", $temp;
135 };
136}
137
138cf::client->attach (on_addme => sub {
110 my ($ns) = @_; 139 my ($ns) = @_;
111 140
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 $v = 2 if $v > 2;
211 $ns->fxix ($v);
212 $setup{$k} = $v;
213
214 } elsif ($k eq "msg") {
215 $v = 2 if $v > 2;
216 $ns->can_msg ($v >= 2);
217 $setup{$k} = $v;
218
219 } elsif ($k eq "xwidget") {
220 # eXperimental server-side widgets
221 $ns->{can_widget} = 1;
222
223 } elsif ($k eq "excmd") {
224 # we support it
225
226 } else {
227 # other commands:
228 # sexp: no idea, probably for oudated servers
229 # tick: more stupidity, server should send a tick per tick
230
231 $setup{$k} = "FALSE";
232 }
233 }
234
235 $ns->send_packet (join " ", setup => %setup);
236
237 cf::datalog setup =>
238 request => $args,
239 reply => \%setup,
240 client => $ns->version,
241 ;
242}
243
244sub addme {
245 my ($ns) = @_;
246
247 if (!$ns->facecache) 141 if (!$ns->facecache)
248 { 142 {
249 $ns->send_drawinfo (<<EOF, cf::NDI_RED); 143 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
250 144
251 145
252*** 146***
253*** WARNING: 147*** WARNING:
254*** Your client does not support face/image caching, 148*** Your client does not support face/image caching,
… …
259*** 153***
260*** CFPlus: all known versions automatically enable the facecache. 154*** CFPlus: all known versions automatically enable the facecache.
261*** cfclient: use the -cache commandline option. 155*** cfclient: use the -cache commandline option.
262*** cfclient: map will not redraw automatically (bug). 156*** cfclient: map will not redraw automatically (bug).
263*** gcfclient: use -cache commandline option, or enable 157*** gcfclient: use -cache commandline option, or enable
264*** gcfclient: Client=>Configure=>Map & Image=>Cache Images. 158*** gcfclient: Client => Configure => Map & Image => Cache Images.
265*** jcrossclient: your client is broken, use CFPlus or gcfclient. 159*** jcrossclient: your client is broken, use CFPlus or gcfclient.
266*** 160***
267*** 161***
268EOF 162EOF
269 if ($ns->version =~ /jcrossclient/) { 163 if ($ns->version =~ /jcrossclient/) {
… …
290 } 184 }
291 185
292 $ns->pl and return $ns->destroy; 186 $ns->pl and return $ns->destroy;
293 187
294 $ns->async (sub { 188 $ns->async (sub {
189 $Coro::current->{desc} = "addme init";
190
295 my ($user, $pass); 191 my ($user, $pass);
296 192
297 $ns->send_packet ("addme_success"); 193 $ns->send_packet ("addme_success");
298 194
299 for (;;) { 195 for (;;) {
… …
322 . "(only a-z, A-Z and 0-9 are allowed), " 218 . "(only a-z, A-Z and 0-9 are allowed), "
323 . "or is not between 3 and 18 characters in length.", 219 . "or is not between 3 and 18 characters in length.",
324 cf::NDI_RED 220 cf::NDI_RED
325 ); 221 );
326 } 222 }
223 Coro::Timer::sleep 0.4;
327 } 224 }
328 225
329 check_playing $ns, $user and next; 226 check_playing $ns, $user and next;
227
228 $Coro::current->{desc} = "addme($user) pass";
330 229
331 $ns->send_drawinfo ( 230 $ns->send_drawinfo (
332 "Welcome $user, please enter your password now. " 231 "Welcome $user, please enter your password now. "
333 . "New users should now choose a password. " 232 . "New users should now choose a password. "
334 . "Anything your client lets you enter is fine.", 233 . "Anything your client lets you enter is fine.",
… …
342 $ns->send_drawinfo ( 241 $ns->send_drawinfo (
343 "Try to use at least three characters as your password please, " 242 "Try to use at least three characters as your password please, "
344 . "that cannot be too much to ask for :)", 243 . "that cannot be too much to ask for :)",
345 cf::NDI_RED 244 cf::NDI_RED
346 ); 245 );
246 Coro::Timer::sleep 0.4;
347 } 247 }
348 248
349 # lock this username for the remainder of this login session 249 # lock this username for the remainder of this login session
350 if ($cf::LOGIN_LOCK{$user}) { 250 if ($cf::LOGIN_LOCK{$user}) {
351 $ns->send_drawinfo ( 251 $ns->send_drawinfo (
… …
356 next; 256 next;
357 } 257 }
358 local $cf::LOGIN_LOCK{$user} = 1; 258 local $cf::LOGIN_LOCK{$user} = 1;
359 259
360 check_playing $ns, $user and next; 260 check_playing $ns, $user and next;
261
262 $Coro::current->{desc} = "addme($user) check";
361 263
362 # try to read the user file and check the password 264 # try to read the user file and check the password
363 if (my $pl = cf::player::find $user) { 265 if (my $pl = cf::player::find $user) {
364 aio_stat $pl->path and next; 266 aio_stat $pl->path and next;
365 my $mtime = (stat _)[9]; 267 my $mtime = (stat _)[9];
… …
419 next; 321 next;
420 } 322 }
421 } 323 }
422 324
423 # the rest of this function is character creation 325 # the rest of this function is character creation
326 $Coro::current->{desc} = "addme($user) chargen";
424 327
425 # just to make sure nothing is left over 328 # just to make sure nothing is left over
426 nuke_playerdir $user; 329 nuke_playerdir $user;
427 330
428 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again."; 331 my $pass2 = query $ns, cf::CS_QUERY_HIDEINPUT, "Please type your password again.";
… …
432 nuke_str $pass2; 335 nuke_str $pass2;
433 $ns->send_drawinfo ( 336 $ns->send_drawinfo (
434 "The passwords do not match, please try again.", 337 "The passwords do not match, please try again.",
435 cf::NDI_RED 338 cf::NDI_RED
436 ); 339 );
340 Coro::Timer::sleep 0.5;
437 next; 341 next;
438 } 342 }
439 343
440 nuke_str $pass2; 344 nuke_str $pass2;
441 345
… …
463 $ob->swap_stats ($res - 1, $swap - 1); 367 $ob->swap_stats ($res - 1, $swap - 1);
464 } 368 }
465 } else { 369 } else {
466 $ob->roll_stats; 370 $ob->roll_stats;
467 } 371 }
372
373 Coro::Timer::sleep 0.2;
468 } 374 }
469 375
470 $ob->set_animation (2); 376 $ob->set_animation (2);
471 $ob->add_statbonus; 377 $ob->add_statbonus;
472 378
473 while () { 379 while () {
474 $ns->send_msg (-1, "chargen-race-title", ucfirst $pl->title); 380 $ns->send_msg ("chargen-race-title", ucfirst $pl->title, -1);
475 my $msg = $ob->msg; 381 my $msg = $ob->msg;
476 $msg =~ s/(?<=\S)\n(?=\S)/ /g; 382 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
477 $ns->send_msg (cf::NDI_BLUE, "chargen-race-description", $msg); 383 $ns->send_msg ("chargen-race-description", $msg, cf::NDI_BLUE);
478 384
479 my $res = query $ns, cf::CS_QUERY_SINGLECHAR, 385 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
480 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n"; 386 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
481 387
482 last if $res =~ /[dD]/; 388 last if $res =~ /[dD]/;
483 389
484 $pl->chargen_race_next; 390 $pl->chargen_race_next;
391 Coro::Timer::sleep 0.2;
485 } 392 }
486 393
487 $pl->chargen_race_done; 394 $pl->chargen_race_done;
488 395
489 while () { 396 while () {
… …
495 last; 402 last;
496 } elsif ($res =~ /^[mM]/) { 403 } elsif ($res =~ /^[mM]/) {
497 $pl->gender (0); 404 $pl->gender (0);
498 last; 405 last;
499 } 406 }
407 Coro::Timer::sleep 0.2;
500 } 408 }
501 409
502 $ob->reply (undef, "Welcome to Crossfire!"); 410 $ob->reply (undef, "Welcome to Deliantra!");
503 411
504 delete $pl->{deny_save}; 412 delete $pl->{deny_save};
505 413
506 last; 414 last;
507 } 415 }
508 }); 416 });
509} 417});
510 418
511cf::register_command quit => sub { 419cf::register_command quit => sub {
512 my ($ob, $arg) = @_; 420 my ($ob, $arg) = @_;
513 421
514 $ob->reply (undef, 422 $ob->reply (undef,
… …
585 $pl->{unclean_save} = $cf::RUNTIME; 493 $pl->{unclean_save} = $cf::RUNTIME;
586 } 494 }
587 }, 495 },
588); 496);
589 497
590cf::client->attach (
591 on_addme => \&addme,
592 on_setup => \&setup,
593);
594
595############################################################################# 498#############################################################################
596 499
597our $SCHEDULE_INTERVAL = 10; # time the player scheduler sleeps between runs 500our $SCHEDULE_INTERVAL = $cf::CFG{player_schedule_interval} || 10; # time the player scheduler sleeps between runs
598our $SAVE_TIMEOUT = 20; # save players every n seconds 501our $SAVE_TIMEOUT = $cf::CFG{player_save_interval} || 20; # save players every n seconds
599 502
600our $SCHEDULER = cf::async_ext { 503our $SCHEDULER = cf::async_ext {
601 my $schedule_interval = Coro::Event->timer (after => 1, interval => $SCHEDULE_INTERVAL); 504 $Coro::current->{desc} = "player scheduler";
505
602 while () { 506 while () {
603 $schedule_interval->next; 507 Coro::EV::timer_once $SCHEDULE_INTERVAL;
604 508
605 # this weird form of iteration over values is used because 509 # this weird form of iteration over values is used because
606 # the hash changes underneath us frequently, and for 510 # the hash changes underneath us frequently, and for
607 # keeps a direct reference to the value without (in 5.8 perls) 511 # keeps a direct reference to the value without (in 5.8 perls)
608 # keeping a reference, so this is prone to crashes or worse. 512 # keeping a reference, so this is prone to crashes or worse.
… …
612 or next; 516 or next;
613 $pl->valid or next; 517 $pl->valid or next;
614 518
615 eval { 519 eval {
616 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) { 520 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
617 cf::wait_for_tick_begin;
618 $pl->save; 521 $pl->save;
619 522
620 unless ($pl->active || $pl->ns) { 523 unless ($pl->active || $pl->ns) {
621 # check refcounts, this is tricky and needs to be adjusted to fit server internals 524 # check refcounts, this is tricky and needs to be adjusted to fit server internals
622 my $ob = $pl->ob; 525 my $ob = $pl->ob;

Diff Legend

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