ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.323 by root, Sat Jul 28 12:02:58 2007 UTC vs.
Revision 1.336 by root, Tue Aug 21 00:31:18 2007 UTC

… …
10use Event; 10use Event;
11use Opcode; 11use Opcode;
12use Safe; 12use Safe;
13use Safe::Hole; 13use Safe::Hole;
14 14
15use Coro 3.61 (); 15use Coro 3.64 ();
16use Coro::State; 16use Coro::State;
17use Coro::Handle; 17use Coro::Handle;
18use Coro::Event; 18use Coro::Event;
19use Coro::Timer; 19use Coro::Timer;
20use Coro::Signal; 20use Coro::Signal;
21use Coro::Semaphore; 21use Coro::Semaphore;
22use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable; 23use Coro::Storable;
24use Coro::Util ();
24 25
25use JSON::XS 1.4 (); 26use JSON::XS 1.4 ();
26use BDB (); 27use BDB ();
27use Data::Dumper; 28use Data::Dumper;
28use Digest::MD5; 29use Digest::MD5;
… …
472Coro::Storable. May, of course, block. Note that the executed sub may 473Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 474never block itself or use any form of Event handling.
474 475
475=cut 476=cut
476 477
477sub _store_scalar {
478 open my $fh, ">", \my $buf
479 or die "fork_call: cannot open fh-to-buf in child : $!";
480 Storable::store_fd $_[0], $fh;
481 close $fh;
482
483 $buf
484}
485
486sub fork_call(&@) { 478sub fork_call(&@) {
487 my ($cb, @args) = @_; 479 my ($cb, @args) = @_;
488 480
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 481 # we seemingly have to make a local copy of the whole thing,
490# or die "socketpair: $!"; 482 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 483 # TODO: investigate and fix (liekly this will be rather laborious)
492 or die "pipe: $!";
493 484
494 if (my $pid = fork) { 485 my @res = Coro::Util::fork_eval {
495 close $fh2;
496
497 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498 warn "pst<$res>" unless $res =~ /^pst/;
499 $res = Coro::Storable::thaw $res;
500
501 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
502
503 Carp::confess $$res unless "ARRAY" eq ref $res;
504
505 return wantarray ? @$res : $res->[-1];
506 } else {
507 reset_signals; 486 reset_signals;
508 local $SIG{__WARN__}; 487 &$cb
509 local $SIG{__DIE__}; 488 }, @args;
510 # just in case, this hack effectively disables event
511 # in the child. cleaner and slower would be canceling all watchers,
512 # but this works for the time being.
513 local $Coro::idle;
514 $Coro::current->prio (Coro::PRIO_MAX);
515 489
516 eval { 490 wantarray ? @res : $res[-1]
517 close $fh1;
518
519 my @res = eval { $cb->(@args) };
520
521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
522 close $fh2;
523 };
524
525 warn $@ if $@;
526 _exit 0;
527 }
528} 491}
529 492
530=item $value = cf::db_get $family => $key 493=item $value = cf::db_get $family => $key
531 494
532Returns a single value from the environment database. 495Returns a single value from the environment database.
… …
1370 $self->{deny_save} = 1; 1333 $self->{deny_save} = 1;
1371 1334
1372 $cf::PLAYER{$login} = $self; 1335 $cf::PLAYER{$login} = $self;
1373 1336
1374 $self 1337 $self
1338}
1339
1340=item $player->send_msg ($channel, $msg, $color, [extra...])
1341
1342=cut
1343
1344sub send_msg {
1345 my $ns = shift->ns
1346 or return;
1347 $ns->send_msg (@_);
1375} 1348}
1376 1349
1377=item $pl->quit_character 1350=item $pl->quit_character
1378 1351
1379Nukes the player without looking back. If logged in, the connection will 1352Nukes the player without looking back. If logged in, the connection will
… …
1532=cut 1505=cut
1533 1506
1534sub ext_reply($$@) { 1507sub ext_reply($$@) {
1535 my ($self, $id, @msg) = @_; 1508 my ($self, $id, @msg) = @_;
1536 1509
1537 if ($self->ns->extcmd == 2) { 1510 $self->ns->ext_reply ($id, @msg)
1538 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1539 } elsif ($self->ns->extcmd == 1) {
1540 #TODO: version 1, remove
1541 unshift @msg, msgtype => "reply", msgid => $id;
1542 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1543 }
1544} 1511}
1545 1512
1546=item $player->ext_msg ($type, @msg) 1513=item $player->ext_msg ($type, @msg)
1547 1514
1548Sends an ext event to the client. 1515Sends an ext event to the client.
… …
1921 $self->set_darkness_map; 1888 $self->set_darkness_map;
1922 Coro::cede; 1889 Coro::cede;
1923 $self->activate; 1890 $self->activate;
1924 } 1891 }
1925 1892
1893 $self->{last_save} = $cf::RUNTIME;
1894 $self->last_access ($cf::RUNTIME);
1895
1926 $self->in_memory (cf::MAP_IN_MEMORY); 1896 $self->in_memory (cf::MAP_IN_MEMORY);
1927 } 1897 }
1928 1898
1929 $self->post_load; 1899 $self->post_load;
1930} 1900}
… …
1940 1910
1941 $self 1911 $self
1942} 1912}
1943 1913
1944# find and load all maps in the 3x3 area around a map 1914# find and load all maps in the 3x3 area around a map
1945sub load_diag { 1915sub load_neighbours {
1946 my ($map) = @_; 1916 my ($map) = @_;
1947 1917
1948 my @diag; # diagonal neighbours 1918 my @neigh; # diagonal neighbours
1949 1919
1950 for (0 .. 3) { 1920 for (0 .. 3) {
1951 my $neigh = $map->tile_path ($_) 1921 my $neigh = $map->tile_path ($_)
1952 or next; 1922 or next;
1953 $neigh = find $neigh, $map 1923 $neigh = find $neigh, $map
1954 or next; 1924 or next;
1955 $neigh->load; 1925 $neigh->load;
1956 1926
1927 push @neigh,
1957 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1928 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1958 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1929 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1959 } 1930 }
1960 1931
1961 for (@diag) { 1932 for (grep defined $_->[0], @neigh) {
1933 my ($path, $origin) = @$_;
1962 my $neigh = find @$_ 1934 my $neigh = find $path, $origin
1963 or next; 1935 or next;
1964 $neigh->load; 1936 $neigh->load;
1965 } 1937 }
1966} 1938}
1967 1939
… …
2240 $self->message ($msg, $flags); 2212 $self->message ($msg, $flags);
2241 } 2213 }
2242 } 2214 }
2243} 2215}
2244 2216
2217=item $object->send_msg ($channel, $msg, $color, [extra...])
2218
2219=cut
2220
2221sub cf::object::send_msg {
2222 my $pl = shift->contr
2223 or return;
2224 $pl->send_msg (@_);
2225}
2226
2245=item $player_object->may ("access") 2227=item $player_object->may ("access")
2246 2228
2247Returns wether the given player is authorized to access resource "access" 2229Returns wether the given player is authorized to access resource "access"
2248(e.g. "command_wizcast"). 2230(e.g. "command_wizcast").
2249 2231
… …
2326 # use -1 or undef as default coordinates, not 0, 0 2308 # use -1 or undef as default coordinates, not 0, 0
2327 ($x, $y) = ($map->enter_x, $map->enter_y) 2309 ($x, $y) = ($map->enter_x, $map->enter_y)
2328 if $x <=0 && $y <= 0; 2310 if $x <=0 && $y <= 0;
2329 2311
2330 $map->load; 2312 $map->load;
2331 $map->load_diag; 2313 $map->load_neighbours;
2332 2314
2333 return unless $self->contr->active; 2315 return unless $self->contr->active;
2334 $self->activate_recursive; 2316 $self->activate_recursive;
2335 2317
2336 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2318 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2547 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/; 2529 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2548 } 2530 }
2549 2531
2550 $color &= cf::NDI_COLOR_MASK; 2532 $color &= cf::NDI_COLOR_MASK;
2551 2533
2534 utf8::encode $msg;
2535
2552 if (0 && $msg =~ /\[/) { 2536 if (0 && $msg =~ /\[/) {
2537 # COMMAND/INFO
2553 $self->send_packet ("drawextinfo $color 4 0 $msg") 2538 $self->send_packet ("drawextinfo $color 10 8 $msg")
2554 } else { 2539 } else {
2555 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2540 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2556 $self->send_packet ("drawinfo $color $msg") 2541 $self->send_packet ("drawinfo $color $msg")
2557 } 2542 }
2558 } 2543 }
… …
2572 2557
2573 if ($extcmd == 2) { 2558 if ($extcmd == 2) {
2574 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2559 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2575 } elsif ($extcmd == 1) { # TODO: remove 2560 } elsif ($extcmd == 1) { # TODO: remove
2576 push @msg, msgtype => "event_$type"; 2561 push @msg, msgtype => "event_$type";
2562 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2563 }
2564}
2565
2566=item $client->ext_reply ($msgid, @msg)
2567
2568Sends an ext reply to the client.
2569
2570=cut
2571
2572sub cf::client::ext_reply($$@) {
2573 my ($self, $id, @msg) = @_;
2574
2575 if ($self->extcmd == 2) {
2576 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2577 } elsif ($self->ns->extcmd == 1) {
2578 #TODO: version 1, remove
2579 unshift @msg, msgtype => "reply", msgid => $id;
2577 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2580 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2578 } 2581 }
2579} 2582}
2580 2583
2581=item $success = $client->query ($flags, "text", \&cb) 2584=item $success = $client->query ($flags, "text", \&cb)
… …
2705our $safe = new Safe "safe"; 2708our $safe = new Safe "safe";
2706our $safe_hole = new Safe::Hole; 2709our $safe_hole = new Safe::Hole;
2707 2710
2708$SIG{FPE} = 'IGNORE'; 2711$SIG{FPE} = 'IGNORE';
2709 2712
2710$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2713$safe->permit_only (Opcode::opset qw(
2714 :base_core :base_mem :base_orig :base_math
2715 grepstart grepwhile mapstart mapwhile
2716 sort time
2717));
2711 2718
2712# here we export the classes and methods available to script code 2719# here we export the classes and methods available to script code
2713 2720
2714=pod 2721=pod
2715 2722
2716The following functions and methods are available within a safe environment: 2723The following functions and methods are available within a safe environment:
2717 2724
2718 cf::object 2725 cf::object
2719 contr pay_amount pay_player map x y force_find force_add 2726 contr pay_amount pay_player map x y force_find force_add
2720 insert remove 2727 insert remove name archname title slaying race
2721 2728
2722 cf::object::player 2729 cf::object::player
2723 player 2730 player
2724 2731
2725 cf::player 2732 cf::player
… …
2730 2737
2731=cut 2738=cut
2732 2739
2733for ( 2740for (
2734 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2741 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2735 insert remove)], 2742 insert remove inv name archname title slaying race)],
2736 ["cf::object::player" => qw(player)], 2743 ["cf::object::player" => qw(player)],
2737 ["cf::player" => qw(peaceful)], 2744 ["cf::player" => qw(peaceful)],
2738 ["cf::map" => qw(trigger)], 2745 ["cf::map" => qw(trigger)],
2739) { 2746) {
2740 no strict 'refs'; 2747 no strict 'refs';
… …
2816# the server's init and main functions 2823# the server's init and main functions
2817 2824
2818sub load_facedata($) { 2825sub load_facedata($) {
2819 my ($path) = @_; 2826 my ($path) = @_;
2820 2827
2828 my $enc = JSON::XS->new->utf8->canonical;
2829
2821 warn "loading facedata from $path\n"; 2830 warn "loading facedata from $path\n";
2822 2831
2823 my $facedata; 2832 my $facedata;
2824 0 < aio_load $path, $facedata 2833 0 < aio_load $path, $facedata
2825 or die "$path: $!"; 2834 or die "$path: $!";
2826 2835
2827 $facedata = Coro::Storable::thaw $facedata; 2836 $facedata = Coro::Storable::thaw $facedata;
2828 2837
2829 $facedata->{version} == 2 2838 $facedata->{version} == 2
2830 or cf::cleanup "$path: version mismatch, cannot proceed."; 2839 or cf::cleanup "$path: version mismatch, cannot proceed.";
2840
2841 # patch in the exptable
2842 $facedata->{resource}{"res/exp_table"} = {
2843 type => FT_RSRC,
2844 data => $enc->encode ([map cf::level_to_min_exp $_, 0 .. cf::settings->max_level]),
2845 };
2846 cf::cede_to_tick;
2831 2847
2832 { 2848 {
2833 my $faces = $facedata->{faceinfo}; 2849 my $faces = $facedata->{faceinfo};
2834 2850
2835 while (my ($face, $info) = each %$faces) { 2851 while (my ($face, $info) = each %$faces) {
2836 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2852 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2837 cf::face::set_visibility $idx, $info->{visibility}; 2853 cf::face::set_visibility $idx, $info->{visibility};
2838 cf::face::set_magicmap $idx, $info->{magicmap}; 2854 cf::face::set_magicmap $idx, $info->{magicmap};
2839 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2855 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2840 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2856 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2841 2857
2842 cf::cede_to_tick; 2858 cf::cede_to_tick;
2843 } 2859 }
2844 2860
2845 while (my ($face, $info) = each %$faces) { 2861 while (my ($face, $info) = each %$faces) {
… …
2870 2886
2871 { 2887 {
2872 # TODO: for gcfclient pleasure, we should give resources 2888 # TODO: for gcfclient pleasure, we should give resources
2873 # that gcfclient doesn't grok a >10000 face index. 2889 # that gcfclient doesn't grok a >10000 face index.
2874 my $res = $facedata->{resource}; 2890 my $res = $facedata->{resource};
2875 my $enc = JSON::XS->new->utf8->canonical;
2876 2891
2877 my $soundconf = delete $res->{"res/sound.conf"}; 2892 my $soundconf = delete $res->{"res/sound.conf"};
2878 2893
2879 while (my ($name, $info) = each %$res) { 2894 while (my ($name, $info) = each %$res) {
2880 my $meta = $enc->encode ({
2881 name => $name,
2882 %{ $info->{meta} || {} },
2883 });
2884
2885 my $idx = (cf::face::find $name) || cf::face::alloc $name; 2895 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2896 my $data;
2886 2897
2887 if ($info->{type} & 1) { 2898 if ($info->{type} & 1) {
2888 # prepend meta info 2899 # prepend meta info
2889 2900
2901 my $meta = $enc->encode ({
2902 name => $name,
2903 %{ $info->{meta} || {} },
2904 });
2905
2890 my $data = pack "(w/a*)*", $meta, $info->{data}; 2906 $data = pack "(w/a*)*", $meta, $info->{data};
2891 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2892
2893 cf::face::set_data $idx, 0, $data, $chk;
2894 } else {
2895 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};
2896 } 2907 }
2897 2908
2909 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2898 cf::face::set_type $idx, $info->{type}; 2910 cf::face::set_type $idx, $info->{type};
2899 2911
2900 cf::cede_to_tick; 2912 cf::cede_to_tick;
2901 } 2913 }
2902 2914
… …
2906 for (0 .. SOUND_CAST_SPELL_0 - 1) { 2918 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2907 my $sound = $soundconf->{compat}[$_] 2919 my $sound = $soundconf->{compat}[$_]
2908 or next; 2920 or next;
2909 2921
2910 my $face = cf::face::find "sound/$sound->[1]"; 2922 my $face = cf::face::find "sound/$sound->[1]";
2911
2912 cf::sound::set $sound->[0] => $face; 2923 cf::sound::set $sound->[0] => $face;
2913 cf::sound::old_sound_index $_, $face; # gcfclient-compat 2924 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2914 } 2925 }
2915 2926
2927 while (my ($k, $v) = each %{$soundconf->{event}}) {
2928 my $face = cf::face::find "sound/$v";
2929 cf::sound::set $k => $face;
2916 #TODO 2930 }
2917 } 2931 }
2918 } 2932 }
2919 2933
2920 1 2934 1
2921} 2935}

Diff Legend

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