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

Diff Legend

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