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.45 by root, Tue Apr 24 00:42:02 2007 UTC vs.
Revision 1.63 by root, Sat Jul 14 14:54:05 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);
8 7
9# paranoia function to overwrite a string-in-place 8# paranoia function to overwrite a string-in-place
10sub nuke_str { 9sub nuke_str {
11 substr $_[0], 0, (length $_[0]), "x" x length $_[0] 10 substr $_[0], 0, (length $_[0]), "x" x length $_[0]
12} 11}
… …
39 return unless cf::player::find_active $user; 38 return unless cf::player::find_active $user;
40 39
41 $ns->send_drawinfo ( 40 $ns->send_drawinfo (
42 "That player is already logged in on this server. " 41 "That player is already logged in on this server. "
43 . "If you want to create a new player, choose another name. " 42 . "If you want to create a new player, choose another name. "
44 . "If you are already a registered player, make sure nobody " 43 . "If you have already a registered, make sure nobody "
45 . "else is using your account at this time. If you lost your conenction " 44 . "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 " 45 . "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 " 46 . "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, " 47 . "you do not have another client running. If you use windows, reboot, "
49 . "this will fix anything.", 48 . "this will fix anything.",
50 cf::NDI_RED 49 cf::NDI_RED
51 ); 50 );
52 51
53 1 52 1
54} 53}
55 54
56sub check_clean_save { 55sub enter_map {
57 my ($pl) = @_; 56 my ($pl) = @_;
58 57
58 my $ob = $pl->ob;
59
60 my ($map, $x, $y)
61 = $ob->{_link_pos}
62 ? @{delete $ob->{_link_pos}}
63 : ($pl->maplevel, $ob->x, $ob->y);
64
65 $ob->enter_link;
66
59 if (my $time = delete $pl->{unclean_save}) { 67 if (my $time = delete $pl->{unclean_save}) {
68 if (my $m = cf::map::find $map) {
69 if ($time < $m->{instantiate_time}) {
70 # the map was reset in the meantime
71 my $age = $cf::RUNTIME - $time;
72 warn $ob->name, " map reset after logout, logout age $age\n";#d#
73
74 # for now, just go back to savebed
75 ($map, $x, $y) = $pl->savebed;
76
60 $pl->ns->send_drawinfo ( 77 $pl->ns->send_drawinfo (
78 "You didn't use a bed to reality to leave this realm, leaving your body in great danger. "
79 . "Fortunately, some friendly dwellers found you, checked your passport, and brought you to safety. "
80 . "Better use a savebed next time, much worse things could have happened...",
81 cf::NDI_RED
82 );
83 } else {
84 $pl->ns->send_drawinfo (
61 "You didn't use a savebed to leave this realm. This is very dangerous, " 85 "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, " 86 . "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.", 87 . "or monsters suddenly snapping your body. Better use a savebed next time.",
64 cf::NDI_RED 88 cf::NDI_RED
89 );
90 }
65 ); 91 }
66 #d#TODO
67 } 92 }
93
94 $ob->goto ($map, $x, $y);
68} 95}
69 96
70# delete a player directory, be non-blocking AND synchronous... 97# delete a player directory, be non-blocking AND synchronous...
71# (thats hard, so we crap out and fork). 98# (thats hard, so we crap out and fork).
72sub nuke_playerdir { 99sub nuke_playerdir {
… …
76 system "cd \Q$PLAYERDIR\E " 103 system "cd \Q$PLAYERDIR\E "
77 . "&& mv \Q$user\E ~\Q$Coro::current\E~deleting~ 2>/dev/null " 104 . "&& mv \Q$user\E ~\Q$Coro::current\E~deleting~ 2>/dev/null "
78 . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)"; 105 . "&& (rm -rf ~\Q$Coro::current\E~deleting~ &)";
79} 106}
80 107
81sub send_capabilities { 108cf::client->attach (on_addme => sub {
82 my ($ns) = @_; 109 my ($ns) = @_;
83 110
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->can_msg ($v);
186
187 } elsif ($k eq "excmd") {
188 # we support it
189
190 } else {
191 # other commands:
192 # sexp: no idea, probably for oudated servers
193 # tick: more stupidity, server should send a tick per tick
194
195 $setup{$k} = "FALSE";
196 }
197 }
198
199 $ns->send_packet (join " ", setup => %setup);
200
201 cf::datalog setup =>
202 request => $args,
203 reply => \%setup,
204 client => $ns->version,
205 ;
206}
207
208sub addme {
209 my ($ns) = @_;
210
211 if (!$ns->facecache) 111 if (!$ns->facecache)
212 { 112 {
213 $ns->send_drawinfo (<<EOF, cf::NDI_RED); 113 $ns->send_drawinfo (<<EOF, cf::NDI_RED);
214 114
215 115
216*** 116***
217*** WARNING: 117*** WARNING:
218*** Your client does not support face/image caching, 118*** Your client does not support face/image caching,
… …
286 . "(only a-z, A-Z and 0-9 are allowed), " 186 . "(only a-z, A-Z and 0-9 are allowed), "
287 . "or is not between 3 and 18 characters in length.", 187 . "or is not between 3 and 18 characters in length.",
288 cf::NDI_RED 188 cf::NDI_RED
289 ); 189 );
290 } 190 }
191 Coro::Timer::sleep 0.4;
291 } 192 }
292 193
293 check_playing $ns, $user and next; 194 check_playing $ns, $user and next;
294 195
295 $ns->send_drawinfo ( 196 $ns->send_drawinfo (
… …
306 $ns->send_drawinfo ( 207 $ns->send_drawinfo (
307 "Try to use at least three characters as your password please, " 208 "Try to use at least three characters as your password please, "
308 . "that cannot be too much to ask for :)", 209 . "that cannot be too much to ask for :)",
309 cf::NDI_RED 210 cf::NDI_RED
310 ); 211 );
212 Coro::Timer::sleep 0.4;
311 } 213 }
312 214
313 # lock this username for the remainder of this login session 215 # lock this username for the remainder of this login session
314 if ($cf::LOGIN_LOCK{$user}) { 216 if ($cf::LOGIN_LOCK{$user}) {
315 $ns->send_drawinfo ( 217 $ns->send_drawinfo (
… …
332 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) { 234 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) {
333 nuke_str $pass; 235 nuke_str $pass;
334 # password matches, wonderful 236 # password matches, wonderful
335 my $pl = cf::player::find $user or next; 237 my $pl = cf::player::find $user or next;
336 $pl->connect ($ns); 238 $pl->connect ($ns);
337 check_clean_save $pl; 239 enter_map $pl;
338 last; 240 last;
339 } elsif (can_cleanup $pl, $mtime) { 241 } elsif (can_cleanup $pl, $mtime) {
340 Coro::Timer::sleep 1; 242 Coro::Timer::sleep 1;
341 243
342 $ns->send_drawinfo ( 244 $ns->send_drawinfo (
… …
396 nuke_str $pass2; 298 nuke_str $pass2;
397 $ns->send_drawinfo ( 299 $ns->send_drawinfo (
398 "The passwords do not match, please try again.", 300 "The passwords do not match, please try again.",
399 cf::NDI_RED 301 cf::NDI_RED
400 ); 302 );
303 Coro::Timer::sleep 0.5;
401 next; 304 next;
402 } 305 }
403 306
404 nuke_str $pass2; 307 nuke_str $pass2;
405 308
406 my $pl = cf::player::new $user; 309 my $pl = cf::player::new $user;
407 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]); 310 $pl->password (crypt $pass, join '', ('.', '/', 0..9, 'A'..'Z', 'a'..'z')[rand 64, rand 64]);
408 nuke_str $pass; 311 nuke_str $pass;
409 $pl->connect ($ns); 312 $pl->connect ($ns);
410
411 my $ob = $pl->ob; 313 my $ob = $pl->ob;
314
315 $ob->goto ($pl->maplevel, $ob->x, $ob->y);
412 316
413 while () { 317 while () {
414 $ob->update_stats; 318 $ob->update_stats;
415 $pl->save_stats; 319 $pl->save_stats;
416 320
… …
426 $ob->swap_stats ($res - 1, $swap - 1); 330 $ob->swap_stats ($res - 1, $swap - 1);
427 } 331 }
428 } else { 332 } else {
429 $ob->roll_stats; 333 $ob->roll_stats;
430 } 334 }
335
336 Coro::Timer::sleep 0.2;
431 } 337 }
432 338
433 $ob->set_animation (2); 339 $ob->set_animation (2);
434 $ob->add_statbonus; 340 $ob->add_statbonus;
435 341
436 while () { 342 while () {
437 $ns->send_msg (-1, "chargen-race-title", ucfirst $pl->title); 343 $ns->send_msg (-1, "chargen-race-title", ucfirst $pl->title);
438 my $msg = $ob->msg; 344 my $msg = $ob->msg;
439 $msg =~ s/\b\n\b/ /g; 345 $msg =~ s/(?<=\S)\n(?=\S)/ /g;
440 $ns->send_msg (cf::NDI_BLUE, "chargen-race-description", $msg); 346 $ns->send_msg (cf::NDI_BLUE, "chargen-race-description", $msg);
441 347
442 my $res = query $ns, cf::CS_QUERY_SINGLECHAR, 348 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
443 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n"; 349 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n";
444 350
445 last if $res =~ /[dD]/; 351 last if $res =~ /[dD]/;
446 352
447 $pl->chargen_race_next; 353 $pl->chargen_race_next;
354 Coro::Timer::sleep 0.2;
448 } 355 }
449 356
450 $pl->chargen_race_done; 357 $pl->chargen_race_done;
358
359 while () {
360 my $res = query $ns, cf::CS_QUERY_SINGLECHAR,
361 "Now choose a gender.\nPress 'f' to become female, and 'm' to become male.\n";
362
363 if ($res =~ /^[fF]/) {
364 $pl->gender (1);
365 last;
366 } elsif ($res =~ /^[mM]/) {
367 $pl->gender (0);
368 last;
369 }
370 Coro::Timer::sleep 0.2;
371 }
372
373 $ob->reply (undef, "Welcome to Crossfire!");
451 374
452 delete $pl->{deny_save}; 375 delete $pl->{deny_save};
453 376
454 last; 377 last;
455 } 378 }
456 }); 379 });
457} 380});
458 381
459cf::register_command quit => sub { 382cf::register_command quit => sub {
460 my ($ob, $arg) = @_; 383 my ($ob, $arg) = @_;
461 384
462 $ob->reply (undef, 385 $ob->reply (undef,
… …
533 $pl->{unclean_save} = $cf::RUNTIME; 456 $pl->{unclean_save} = $cf::RUNTIME;
534 } 457 }
535 }, 458 },
536); 459);
537 460
538cf::client->attach (
539 on_addme => \&addme,
540 on_setup => \&setup,
541);
542
543############################################################################# 461#############################################################################
544 462
545our $SCHEDULE_INTERVAL = 10; # time the player scheduler sleeps between runs 463our $SCHEDULE_INTERVAL = 10; # time the player scheduler sleeps between runs
546our $SAVE_TIMEOUT = 20; # save players every n seconds 464our $SAVE_TIMEOUT = 20; # save players every n seconds
547 465
… …
563 eval { 481 eval {
564 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) { 482 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
565 cf::wait_for_tick_begin; 483 cf::wait_for_tick_begin;
566 $pl->save; 484 $pl->save;
567 485
568 unless ($pl->active) { 486 unless ($pl->active || $pl->ns) {
569 # check refcounts, this is tricky and needs to be adjusted to fit server internals 487 # check refcounts, this is tricky and needs to be adjusted to fit server internals
570 my $ob = $pl->ob; 488 my $ob = $pl->ob;
571 Scalar::Util::weaken $pl; 489
572 Scalar::Util::weaken $ob;
573 my $a_ = $pl->refcnt;#d#
574 my $b_ = $ob->refcnt;#d#
575 my $pl_ref = $pl->refcnt_cnt; 490 my $pl_ref = $pl->refcnt_cnt;
576 my $ob_ref = $ob->refcnt_cnt; 491 my $ob_ref = $ob->refcnt_cnt;
577 492
578 ## pl_ref == one from object + one from cf::PLAYER 493 ## pl_ref == $pl + ob->contr + %cf::PLAYER
579 ## ob_ref == one from simply being an object 494 ## ob_ref == $ob + pl->observe + simply being an object
580 if ($pl_ref == 2 && $ob_ref == 1) { 495 if ($pl_ref == 3 && $ob_ref == 3) {
581 warn "player-scheduler destroy ", $ob->name;#d# 496 warn "player-scheduler destroy ", $ob->name;#d#
582 497
583 # remove from sight and get fresh "copies" 498 # remove from sight and get fresh "copies"
584 $pl = delete $cf::PLAYER{$ob->name}; 499 $pl = delete $cf::PLAYER{$ob->name};
585 $ob = $pl->ob; 500 $ob = $pl->ob;
586 501
587 $ob->destroy;
588 $pl->destroy; 502 $pl->destroy; # destroys $ob
589 } else { 503 } else {
504 my $a_ = $pl->refcnt;#d#
505 my $b_ = $ob->refcnt;#d#
506
590 warn "player-scheduler refcnt ", $ob->name, " $pl_ref,$a_ $ob_ref,$b_\n";#d# 507 warn "player-scheduler refcnt ", $ob->name, " pl $pl_ref ob $ob_ref (C pl $a_ ob $b_)\n";#d#
591 } 508 }
592 } 509 }
593 } 510 }
594 }; 511 };
595 warn $@ if $@; 512 warn $@ if $@;

Diff Legend

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