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.17 by root, Mon Jan 8 14:11:05 2007 UTC vs.
Revision 1.27 by root, Mon Jan 22 03:44:41 2007 UTC

1#! perl 1#! perl # MANDATORY
2 2
3# login handling 3# login handling
4 4
5use Fcntl; 5use Fcntl;
6use Coro::AIO; 6use Coro::AIO;
… …
21 21
22 $current 22 $current
23} 23}
24 24
25sub can_cleanup { 25sub can_cleanup {
26 my ($playerfile, $mtime) = @_; 26 my ($pl, $mtime) = @_;
27 27
28 my $age = time - $mtime; 28 my $age = time - $mtime;
29 my $level = $playerfile =~ /^level (\d+)$/m ? $1 : return; 29 my $level = $pl->ob->level;
30 30
31 ($level <= 3 && $age > 7 * 86400) # 7 days for level 0..3 31 ($level <= 3 && $age > 7 * 86400) # 7 days for level 0..3
32 || ($level <= 9 && $age > 90 * 86400) # 3 months for level 4..9 32 || ($level <= 9 && $age > 90 * 86400) # 3 months for level 4..9
33 || ($level <= 20 && $age > 180 * 86400) # 6 months for level 10..20 33 || ($level <= 20 && $age > 180 * 86400) # 6 months for level 10..20
34 || $age > 700 * 86400 # 2 years for everybody else 34 || $age > 700 * 86400 # 2 years for everybody else
… …
55} 55}
56 56
57sub check_clean_save { 57sub check_clean_save {
58 my ($pl) = @_; 58 my ($pl) = @_;
59 59
60 unless (delete $pl->{clean_save}) { 60 if (my $time = delete $pl->{unclean_save}) {
61 $pl->ns->send_drawinfo (
62 "You didn't use a savebed to leave this realm. This is very dangerous, "
63 . "as lots of things could happen when you leave by other means, such as cave-ins, "
64 . "or monsters suddenly snapping your body. Better use a savebed next time.",
65 cf::NDI_RED
66 );
61 #d#TODO 67 #d#TODO
62 } 68 }
63} 69}
64 70
65# delete a player directory, be non-blocking AND synchronous... 71# delete a player directory, be non-blocking AND synchronous...
… …
145 local $cf::LOGIN_LOCK{$user} = 1; 151 local $cf::LOGIN_LOCK{$user} = 1;
146 152
147 check_playing $ns, $user and next; 153 check_playing $ns, $user and next;
148 154
149 # try to read the user file and check the password 155 # try to read the user file and check the password
150 if (my $fh = aio_open cf::player::path $user, O_RDONLY, 0) { 156 if (my $pl = cf::player::find $user) {
157 aio_stat $pl->path and next;
151 my $mtime = (stat $fh)[9]; 158 my $mtime = (stat _)[9];
152
153 0 < aio_read $fh, 0, 16384, my $buf, 0 or next;
154 $buf =~ /^password (\S+)$/m or next;
155 my $hash = $1; 159 my $hash = $pl->password;
156 160
157 if ($hash eq crypt $pass, $hash) { 161 if ($cf::CFG{ext_login_nocheck} or $hash eq crypt $pass, $hash) {
158 nuke_str $pass; 162 nuke_str $pass;
159 # password matches, wonderful 163 # password matches, wonderful
160 my $pl = cf::player::find $user or next; 164 my $pl = cf::player::find $user or next;
161 $pl->connect ($ns); 165 $pl->connect ($ns);
162 check_clean_save $pl; 166 check_clean_save $pl;
163 $pl->{clean_save} = 1;
164 last; 167 last;
165 } elsif (can_cleanup $buf, $mtime) { 168 } elsif (can_cleanup $pl, $mtime) {
166 Coro::Timer::sleep 1; 169 Coro::Timer::sleep 1;
167 170
168 $ns->send_drawinfo ( 171 $ns->send_drawinfo (
169 "Player exists, but password does not match. If this is your account, " 172 "Player exists, but password does not match. If this is your account, "
170 . "please try again. If not, you can now decide to take over this account " 173 . "please try again. If not, you can now decide to take over this account "
… …
178 181
179 # check if the file hasn't changed 182 # check if the file hasn't changed
180 aio_stat cf::player::path $user and next; 183 aio_stat cf::player::path $user and next;
181 $mtime == (stat _)[9] or next; 184 $mtime == (stat _)[9] or next;
182 185
183 nuke_playerdir $user; 186 $pl->quit_character;
184 187
185 # fall through to creation 188 # fall through to creation
186 } else { 189 } else {
187 nuke_str $pass; 190 nuke_str $pass;
188 191
… …
296 299
297 my $pl = $ob->contr; 300 my $pl = $ob->contr;
298 301
299 # update respawn position 302 # update respawn position
300 $pl->savebed ($bed->map->path, $bed->x, $bed->y); 303 $pl->savebed ($bed->map->path, $bed->x, $bed->y);
304 cf::async { $pl->save };
301 305
302 $pl->killer ("left"); 306 $pl->killer ("left");
303 $ob->check_score; 307 $ob->check_score;
304 308
305 $ob->reply (undef, "In the future, you will wake up here when you die."); 309 $ob->reply (undef, "In the future, you will wake up here when you die.");
… …
329 333
330 if ($cleanly) { 334 if ($cleanly) {
331 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 335 $_->ob->message ("$name left the game.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
332 } else { 336 } else {
333 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list; 337 $_->ob->message ("$name uncerimoniously disconnected.", cf::NDI_DK_ORANGE | cf::NDI_UNIQUE) for cf::player::list;
334 delete $pl->{clean_save}; 338 $pl->{unclean_save} = $cf::RUNTIME;
335 } 339 }
336 }, 340 },
337); 341);
338 342
339cf::client->attach ( 343cf::client->attach (
340 on_addme => \&addme, 344 on_addme => \&addme,
341); 345);
342 346
343############################################################################# 347#############################################################################
344 348
345our $SCHEDULE_INTERVAL = 10; # time the player scheduler sleeps between runs 349our $SCHEDULE_INTERVAL = 10; # time the player scheduler sleeps between runs
346our $SAVE_TIMEOUT = 200; # save players every n seconds 350our $SAVE_TIMEOUT = 20; # save players every n seconds
347our $SAVE_INTERVAL = 0.1; # save at max. one player every $SAVE_INTERVAL
348 351
349our $SCHEDULER = cf::async_ext { 352our $SCHEDULER = cf::async_ext {
353 my $schedule_interval = Coro::Event->timer (after => 1, interval => $SCHEDULE_INTERVAL);
350 while () { 354 while () {
351 Coro::Timer::sleep $SCHEDULE_INTERVAL; 355 $schedule_interval->next;
352 356
353 # this weird form of iteration over values is used because 357 # this weird form of iteration over values is used because
354 # the hash changes underneath us frequently, and for 358 # the hash changes underneath us frequently, and for
355 # keeps a direct reference to the value without (in 5.8 perls) 359 # keeps a direct reference to the value without (in 5.8 perls)
356 # keeping a reference, so this is prone to crashes or worse. 360 # keeping a reference, so this is prone to crashes or worse.
… …
360 or next; 364 or next;
361 $pl->valid or next; 365 $pl->valid or next;
362 366
363 eval { 367 eval {
364 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) { 368 if ($pl->{last_save} + $SAVE_TIMEOUT <= $cf::RUNTIME) {
369 $cf::WAIT_FOR_TICK_ONE->wait;
365 $pl->save; 370 $pl->save;
366 Coro::Timer::sleep $SAVE_INTERVAL;
367 }
368 371
369 unless ($pl->active) { 372 unless ($pl->active) {
370 # check refcounts, this is tricky and needs to be adjusted to fit server internals 373 # check refcounts, this is tricky and needs to be adjusted to fit server internals
371 my $ob = $pl->ob; 374 my $ob = $pl->ob;
372 Scalar::Util::weaken $pl; 375 Scalar::Util::weaken $pl;
373 Scalar::Util::weaken $ob; 376 Scalar::Util::weaken $ob;
374 my $a_ = $pl->refcnt; 377 my $a_ = $pl->refcnt;#d#
375 my $b_ = $ob->refcnt; 378 my $b_ = $ob->refcnt;#d#
376 my $pl_ref = $pl->refcnt_cnt; 379 my $pl_ref = $pl->refcnt_cnt;
377 my $ob_ref = $ob->refcnt_cnt; 380 my $ob_ref = $ob->refcnt_cnt;
378 381
379 if ($pl_ref == 2 && $ob_ref == 1) {
380 warn "player-scheduler destroy ", $ob->name;#d#
381 delete $cf::PLAYER{$ob->name};
382 # pl_ref == one from object + one from cf::PLAYER 382 ## pl_ref == one from object + one from cf::PLAYER
383 # ob_ref == one from simply being an object 383 ## ob_ref == one from simply being an object
384 if ($pl_ref == 2 && $ob_ref == 1) {
385 warn "player-scheduler destroy ", $ob->name;#d#
386
387 # remove from sight and get fresh "copies"
388 $pl = delete $cf::PLAYER{$ob->name};
389 $ob = $pl->ob;
390
384 $ob->destroy; 391 $ob->destroy;
385 $pl->destroy; 392 $pl->destroy;
386 } else { 393 } else {
387 warn "player-scheduler refcnt ", $ob->name, " $pl_ref,$a_ $ob_ref,$b_\n";#d# 394 warn "player-scheduler refcnt ", $ob->name, " $pl_ref,$a_ $ob_ref,$b_\n";#d#
395 }
388 } 396 }
389 } 397 }
390 }; 398 };
391 warn $@ if $@; 399 warn $@ if $@;
392 Coro::cede; 400 Coro::cede;

Diff Legend

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