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.327 by root, Wed Aug 1 17:22:51 2007 UTC vs.
Revision 1.338 by root, Tue Aug 21 01:07:47 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.
… …
1186 my ($type, $reply, @payload) = 1149 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg 1150 "ARRAY" eq ref $msg
1188 ? @$msg 1151 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190 1153
1154 my @reply;
1155
1191 if (my $cb = $EXTCMD{$type}) { 1156 if (my $cb = $EXTCMD{$type}) {
1192 my @reply = $cb->($pl, @payload); 1157 @reply = $cb->($pl, @payload);
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196 } 1158 }
1159
1160 $pl->ext_reply ($reply, @reply)
1161 if $reply;
1162
1197 } else { 1163 } else {
1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1164 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199 } 1165 }
1200 1166
1201 cf::override; 1167 cf::override;
… …
1370 $self->{deny_save} = 1; 1336 $self->{deny_save} = 1;
1371 1337
1372 $cf::PLAYER{$login} = $self; 1338 $cf::PLAYER{$login} = $self;
1373 1339
1374 $self 1340 $self
1341}
1342
1343=item $player->send_msg ($channel, $msg, $color, [extra...])
1344
1345=cut
1346
1347sub send_msg {
1348 my $ns = shift->ns
1349 or return;
1350 $ns->send_msg (@_);
1375} 1351}
1376 1352
1377=item $pl->quit_character 1353=item $pl->quit_character
1378 1354
1379Nukes the player without looking back. If logged in, the connection will 1355Nukes the player without looking back. If logged in, the connection will
… …
1532=cut 1508=cut
1533 1509
1534sub ext_reply($$@) { 1510sub ext_reply($$@) {
1535 my ($self, $id, @msg) = @_; 1511 my ($self, $id, @msg) = @_;
1536 1512
1537 if ($self->ns->extcmd == 2) { 1513 $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} 1514}
1545 1515
1546=item $player->ext_msg ($type, @msg) 1516=item $player->ext_msg ($type, @msg)
1547 1517
1548Sends an ext event to the client. 1518Sends an ext event to the client.
… …
1943 1913
1944 $self 1914 $self
1945} 1915}
1946 1916
1947# find and load all maps in the 3x3 area around a map 1917# find and load all maps in the 3x3 area around a map
1948sub load_diag { 1918sub load_neighbours {
1949 my ($map) = @_; 1919 my ($map) = @_;
1950 1920
1951 my @diag; # diagonal neighbours 1921 my @neigh; # diagonal neighbours
1952 1922
1953 for (0 .. 3) { 1923 for (0 .. 3) {
1954 my $neigh = $map->tile_path ($_) 1924 my $neigh = $map->tile_path ($_)
1955 or next; 1925 or next;
1956 $neigh = find $neigh, $map 1926 $neigh = find $neigh, $map
1957 or next; 1927 or next;
1958 $neigh->load; 1928 $neigh->load;
1959 1929
1930 push @neigh,
1960 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1931 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1961 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1932 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1962 } 1933 }
1963 1934
1964 for (@diag) { 1935 for (grep defined $_->[0], @neigh) {
1936 my ($path, $origin) = @$_;
1965 my $neigh = find @$_ 1937 my $neigh = find $path, $origin
1966 or next; 1938 or next;
1967 $neigh->load; 1939 $neigh->load;
1968 } 1940 }
1969} 1941}
1970 1942
… …
2243 $self->message ($msg, $flags); 2215 $self->message ($msg, $flags);
2244 } 2216 }
2245 } 2217 }
2246} 2218}
2247 2219
2220=item $object->send_msg ($channel, $msg, $color, [extra...])
2221
2222=cut
2223
2224sub cf::object::send_msg {
2225 my $pl = shift->contr
2226 or return;
2227 $pl->send_msg (@_);
2228}
2229
2248=item $player_object->may ("access") 2230=item $player_object->may ("access")
2249 2231
2250Returns wether the given player is authorized to access resource "access" 2232Returns wether the given player is authorized to access resource "access"
2251(e.g. "command_wizcast"). 2233(e.g. "command_wizcast").
2252 2234
… …
2329 # use -1 or undef as default coordinates, not 0, 0 2311 # use -1 or undef as default coordinates, not 0, 0
2330 ($x, $y) = ($map->enter_x, $map->enter_y) 2312 ($x, $y) = ($map->enter_x, $map->enter_y)
2331 if $x <=0 && $y <= 0; 2313 if $x <=0 && $y <= 0;
2332 2314
2333 $map->load; 2315 $map->load;
2334 $map->load_diag; 2316 $map->load_neighbours;
2335 2317
2336 return unless $self->contr->active; 2318 return unless $self->contr->active;
2337 $self->activate_recursive; 2319 $self->activate_recursive;
2338 2320
2339 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2321 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2553 $color &= cf::NDI_COLOR_MASK; 2535 $color &= cf::NDI_COLOR_MASK;
2554 2536
2555 utf8::encode $msg; 2537 utf8::encode $msg;
2556 2538
2557 if (0 && $msg =~ /\[/) { 2539 if (0 && $msg =~ /\[/) {
2540 # COMMAND/INFO
2558 $self->send_packet ("drawextinfo $color 4 0 $msg") 2541 $self->send_packet ("drawextinfo $color 10 8 $msg")
2559 } else { 2542 } else {
2560 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2543 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2561 $self->send_packet ("drawinfo $color $msg") 2544 $self->send_packet ("drawinfo $color $msg")
2562 } 2545 }
2563 } 2546 }
… …
2577 2560
2578 if ($extcmd == 2) { 2561 if ($extcmd == 2) {
2579 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2562 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2580 } elsif ($extcmd == 1) { # TODO: remove 2563 } elsif ($extcmd == 1) { # TODO: remove
2581 push @msg, msgtype => "event_$type"; 2564 push @msg, msgtype => "event_$type";
2565 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2566 }
2567}
2568
2569=item $client->ext_reply ($msgid, @msg)
2570
2571Sends an ext reply to the client.
2572
2573=cut
2574
2575sub cf::client::ext_reply($$@) {
2576 my ($self, $id, @msg) = @_;
2577
2578 if ($self->extcmd == 2) {
2579 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2580 } elsif ($self->ns->extcmd == 1) {
2581 #TODO: version 1, remove
2582 unshift @msg, msgtype => "reply", msgid => $id;
2582 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2583 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2583 } 2584 }
2584} 2585}
2585 2586
2586=item $success = $client->query ($flags, "text", \&cb) 2587=item $success = $client->query ($flags, "text", \&cb)
… …
2648 my ($type, $reply, @payload) = 2649 my ($type, $reply, @payload) =
2649 "ARRAY" eq ref $msg 2650 "ARRAY" eq ref $msg
2650 ? @$msg 2651 ? @$msg
2651 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2652 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2652 2653
2654 my @reply;
2655
2653 if (my $cb = $EXTICMD{$type}) { 2656 if (my $cb = $EXTICMD{$type}) {
2654 my @reply = $cb->($ns, @payload); 2657 @reply = $cb->($ns, @payload);
2655
2656 $ns->ext_reply ($reply, @reply)
2657 if $reply;
2658 } 2658 }
2659
2660 $ns->ext_reply ($reply, @reply)
2661 if $reply;
2662
2659 } else { 2663 } else {
2660 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2664 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2661 } 2665 }
2662 2666
2663 cf::override; 2667 cf::override;
… …
2710our $safe = new Safe "safe"; 2714our $safe = new Safe "safe";
2711our $safe_hole = new Safe::Hole; 2715our $safe_hole = new Safe::Hole;
2712 2716
2713$SIG{FPE} = 'IGNORE'; 2717$SIG{FPE} = 'IGNORE';
2714 2718
2715$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2719$safe->permit_only (Opcode::opset qw(
2720 :base_core :base_mem :base_orig :base_math
2721 grepstart grepwhile mapstart mapwhile
2722 sort time
2723));
2716 2724
2717# here we export the classes and methods available to script code 2725# here we export the classes and methods available to script code
2718 2726
2719=pod 2727=pod
2720 2728
2721The following functions and methods are available within a safe environment: 2729The following functions and methods are available within a safe environment:
2722 2730
2723 cf::object 2731 cf::object
2724 contr pay_amount pay_player map x y force_find force_add 2732 contr pay_amount pay_player map x y force_find force_add
2725 insert remove 2733 insert remove name archname title slaying race
2726 2734
2727 cf::object::player 2735 cf::object::player
2728 player 2736 player
2729 2737
2730 cf::player 2738 cf::player
… …
2735 2743
2736=cut 2744=cut
2737 2745
2738for ( 2746for (
2739 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 2747 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2740 insert remove)], 2748 insert remove inv name archname title slaying race)],
2741 ["cf::object::player" => qw(player)], 2749 ["cf::object::player" => qw(player)],
2742 ["cf::player" => qw(peaceful)], 2750 ["cf::player" => qw(peaceful)],
2743 ["cf::map" => qw(trigger)], 2751 ["cf::map" => qw(trigger)],
2744) { 2752) {
2745 no strict 'refs'; 2753 no strict 'refs';
… …
2821# the server's init and main functions 2829# the server's init and main functions
2822 2830
2823sub load_facedata($) { 2831sub load_facedata($) {
2824 my ($path) = @_; 2832 my ($path) = @_;
2825 2833
2834 my $enc = JSON::XS->new->utf8->canonical;
2835
2826 warn "loading facedata from $path\n"; 2836 warn "loading facedata from $path\n";
2827 2837
2828 my $facedata; 2838 my $facedata;
2829 0 < aio_load $path, $facedata 2839 0 < aio_load $path, $facedata
2830 or die "$path: $!"; 2840 or die "$path: $!";
2831 2841
2832 $facedata = Coro::Storable::thaw $facedata; 2842 $facedata = Coro::Storable::thaw $facedata;
2833 2843
2834 $facedata->{version} == 2 2844 $facedata->{version} == 2
2835 or cf::cleanup "$path: version mismatch, cannot proceed."; 2845 or cf::cleanup "$path: version mismatch, cannot proceed.";
2846
2847 # patch in the exptable
2848 $facedata->{resource}{"res/exp_table"} = {
2849 type => FT_RSRC,
2850 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2851 };
2852 cf::cede_to_tick;
2836 2853
2837 { 2854 {
2838 my $faces = $facedata->{faceinfo}; 2855 my $faces = $facedata->{faceinfo};
2839 2856
2840 while (my ($face, $info) = each %$faces) { 2857 while (my ($face, $info) = each %$faces) {
2841 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2858 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2842 cf::face::set_visibility $idx, $info->{visibility}; 2859 cf::face::set_visibility $idx, $info->{visibility};
2843 cf::face::set_magicmap $idx, $info->{magicmap}; 2860 cf::face::set_magicmap $idx, $info->{magicmap};
2844 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2861 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2845 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2862 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2846 2863
2847 cf::cede_to_tick; 2864 cf::cede_to_tick;
2848 } 2865 }
2849 2866
2850 while (my ($face, $info) = each %$faces) { 2867 while (my ($face, $info) = each %$faces) {
… …
2875 2892
2876 { 2893 {
2877 # TODO: for gcfclient pleasure, we should give resources 2894 # TODO: for gcfclient pleasure, we should give resources
2878 # that gcfclient doesn't grok a >10000 face index. 2895 # that gcfclient doesn't grok a >10000 face index.
2879 my $res = $facedata->{resource}; 2896 my $res = $facedata->{resource};
2880 my $enc = JSON::XS->new->utf8->canonical;
2881 2897
2882 my $soundconf = delete $res->{"res/sound.conf"}; 2898 my $soundconf = delete $res->{"res/sound.conf"};
2883 2899
2884 while (my ($name, $info) = each %$res) { 2900 while (my ($name, $info) = each %$res) {
2885 my $meta = $enc->encode ({
2886 name => $name,
2887 %{ $info->{meta} || {} },
2888 });
2889
2890 my $idx = (cf::face::find $name) || cf::face::alloc $name; 2901 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2902 my $data;
2891 2903
2892 if ($info->{type} & 1) { 2904 if ($info->{type} & 1) {
2893 # prepend meta info 2905 # prepend meta info
2894 2906
2907 my $meta = $enc->encode ({
2908 name => $name,
2909 %{ $info->{meta} || {} },
2910 });
2911
2895 my $data = pack "(w/a*)*", $meta, $info->{data}; 2912 $data = pack "(w/a*)*", $meta, $info->{data};
2896 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2897
2898 cf::face::set_data $idx, 0, $data, $chk;
2899 } else { 2913 } else {
2900 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 2914 $data = $info->{data};
2901 } 2915 }
2902 2916
2917 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2903 cf::face::set_type $idx, $info->{type}; 2918 cf::face::set_type $idx, $info->{type};
2904 2919
2905 cf::cede_to_tick; 2920 cf::cede_to_tick;
2906 } 2921 }
2907 2922

Diff Legend

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