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.318 by root, Tue Jul 24 04:55:34 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.
… …
1921 $self->set_darkness_map; 1891 $self->set_darkness_map;
1922 Coro::cede; 1892 Coro::cede;
1923 $self->activate; 1893 $self->activate;
1924 } 1894 }
1925 1895
1896 $self->{last_save} = $cf::RUNTIME;
1897 $self->last_access ($cf::RUNTIME);
1898
1926 $self->in_memory (cf::MAP_IN_MEMORY); 1899 $self->in_memory (cf::MAP_IN_MEMORY);
1927 } 1900 }
1928 1901
1929 $self->post_load; 1902 $self->post_load;
1930} 1903}
… …
1940 1913
1941 $self 1914 $self
1942} 1915}
1943 1916
1944# 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
1945sub load_diag { 1918sub load_neighbours {
1946 my ($map) = @_; 1919 my ($map) = @_;
1947 1920
1948 my @diag; # diagonal neighbours 1921 my @neigh; # diagonal neighbours
1949 1922
1950 for (0 .. 3) { 1923 for (0 .. 3) {
1951 my $neigh = $map->tile_path ($_) 1924 my $neigh = $map->tile_path ($_)
1952 or next; 1925 or next;
1953 $neigh = find $neigh, $map 1926 $neigh = find $neigh, $map
1954 or next; 1927 or next;
1955 $neigh->load; 1928 $neigh->load;
1956 1929
1930 push @neigh,
1957 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 1931 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1958 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 1932 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1959 } 1933 }
1960 1934
1961 for (@diag) { 1935 for (grep defined $_->[0], @neigh) {
1936 my ($path, $origin) = @$_;
1962 my $neigh = find @$_ 1937 my $neigh = find $path, $origin
1963 or next; 1938 or next;
1964 $neigh->load; 1939 $neigh->load;
1965 } 1940 }
1966} 1941}
1967 1942
… …
2240 $self->message ($msg, $flags); 2215 $self->message ($msg, $flags);
2241 } 2216 }
2242 } 2217 }
2243} 2218}
2244 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
2245=item $player_object->may ("access") 2230=item $player_object->may ("access")
2246 2231
2247Returns wether the given player is authorized to access resource "access" 2232Returns wether the given player is authorized to access resource "access"
2248(e.g. "command_wizcast"). 2233(e.g. "command_wizcast").
2249 2234
… …
2326 # use -1 or undef as default coordinates, not 0, 0 2311 # use -1 or undef as default coordinates, not 0, 0
2327 ($x, $y) = ($map->enter_x, $map->enter_y) 2312 ($x, $y) = ($map->enter_x, $map->enter_y)
2328 if $x <=0 && $y <= 0; 2313 if $x <=0 && $y <= 0;
2329 2314
2330 $map->load; 2315 $map->load;
2331 $map->load_diag; 2316 $map->load_neighbours;
2332 2317
2333 return unless $self->contr->active; 2318 return unless $self->contr->active;
2334 $self->activate_recursive; 2319 $self->activate_recursive;
2335 2320
2336 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2321 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
… …
2512sub cf::client::send_msg { 2497sub cf::client::send_msg {
2513 my ($self, $channel, $msg, $color, @extra) = @_; 2498 my ($self, $channel, $msg, $color, @extra) = @_;
2514 2499
2515 $msg = $self->pl->expand_cfpod ($msg); 2500 $msg = $self->pl->expand_cfpod ($msg);
2516 2501
2517 $color &= ~cf::NDI_UNIQUE; # just in case... 2502 $color &= cf::NDI_CLIENT_MASK; # just in case...
2518 2503
2519 if (ref $channel) { 2504 if (ref $channel) {
2520 # send meta info to client, if not yet sent 2505 # send meta info to client, if not yet sent
2521 unless (exists $self->{channel}{$channel->{id}}) { 2506 unless (exists $self->{channel}{$channel->{id}}) {
2522 $self->{channel}{$channel->{id}} = $channel; 2507 $self->{channel}{$channel->{id}} = $channel;
2523 $self->ext_msg (channel_info => %$channel); 2508 $self->ext_msg (channel_info => $channel);
2524 } 2509 }
2525 2510
2526 $channel = $channel->{id}; 2511 $channel = $channel->{id};
2527 } 2512 }
2528 2513
2529 return unless @extra || length $msg; 2514 return unless @extra || length $msg;
2530 2515
2531 if ($self->can_msg) { 2516 if ($self->can_msg) {
2517 # default colour, mask it out
2518 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2519 if $color & cf::NDI_DEF;
2520
2532 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2521 $self->send_packet ("msg " . $self->{json_coder}->encode (
2522 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2533 } else { 2523 } else {
2534 # replace some tags by gcfclient-compatible ones
2535 for ($msg) {
2536 1 while
2537 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2538 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2539 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2540 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2541 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2542 }
2543
2544 if ($color >= 0) { 2524 if ($color >= 0) {
2525 # replace some tags by gcfclient-compatible ones
2526 for ($msg) {
2527 1 while
2528 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2529 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2530 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2531 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2532 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2533 }
2534
2535 $color &= cf::NDI_COLOR_MASK;
2536
2537 utf8::encode $msg;
2538
2545 if (0 && $msg =~ /\[/) { 2539 if (0 && $msg =~ /\[/) {
2540 # COMMAND/INFO
2546 $self->send_packet ("drawextinfo $color 4 0 $msg") 2541 $self->send_packet ("drawextinfo $color 10 8 $msg")
2547 } else { 2542 } else {
2548 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2543 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2549 $self->send_packet ("drawinfo $color $msg") 2544 $self->send_packet ("drawinfo $color $msg")
2550 } 2545 }
2551 } 2546 }
… …
2565 2560
2566 if ($extcmd == 2) { 2561 if ($extcmd == 2) {
2567 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2562 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2568 } elsif ($extcmd == 1) { # TODO: remove 2563 } elsif ($extcmd == 1) { # TODO: remove
2569 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;
2570 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2583 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2571 } 2584 }
2572} 2585}
2573 2586
2574=item $success = $client->query ($flags, "text", \&cb) 2587=item $success = $client->query ($flags, "text", \&cb)
… …
2636 my ($type, $reply, @payload) = 2649 my ($type, $reply, @payload) =
2637 "ARRAY" eq ref $msg 2650 "ARRAY" eq ref $msg
2638 ? @$msg 2651 ? @$msg
2639 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2652 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2640 2653
2654 my @reply;
2655
2641 if (my $cb = $EXTICMD{$type}) { 2656 if (my $cb = $EXTICMD{$type}) {
2642 my @reply = $cb->($ns, @payload); 2657 @reply = $cb->($ns, @payload);
2643
2644 $ns->ext_reply ($reply, @reply)
2645 if $reply;
2646 } 2658 }
2659
2660 $ns->ext_reply ($reply, @reply)
2661 if $reply;
2662
2647 } else { 2663 } else {
2648 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";
2649 } 2665 }
2650 2666
2651 cf::override; 2667 cf::override;
… …
2698our $safe = new Safe "safe"; 2714our $safe = new Safe "safe";
2699our $safe_hole = new Safe::Hole; 2715our $safe_hole = new Safe::Hole;
2700 2716
2701$SIG{FPE} = 'IGNORE'; 2717$SIG{FPE} = 'IGNORE';
2702 2718
2703$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));
2704 2724
2705# here we export the classes and methods available to script code 2725# here we export the classes and methods available to script code
2706 2726
2707=pod 2727=pod
2708 2728
2709The following functions and methods are available within a safe environment: 2729The following functions and methods are available within a safe environment:
2710 2730
2711 cf::object 2731 cf::object
2712 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
2713 insert remove 2733 insert remove name archname title slaying race
2714 2734
2715 cf::object::player 2735 cf::object::player
2716 player 2736 player
2717 2737
2718 cf::player 2738 cf::player
… …
2723 2743
2724=cut 2744=cut
2725 2745
2726for ( 2746for (
2727 ["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
2728 insert remove)], 2748 insert remove inv name archname title slaying race)],
2729 ["cf::object::player" => qw(player)], 2749 ["cf::object::player" => qw(player)],
2730 ["cf::player" => qw(peaceful)], 2750 ["cf::player" => qw(peaceful)],
2731 ["cf::map" => qw(trigger)], 2751 ["cf::map" => qw(trigger)],
2732) { 2752) {
2733 no strict 'refs'; 2753 no strict 'refs';
… …
2809# the server's init and main functions 2829# the server's init and main functions
2810 2830
2811sub load_facedata($) { 2831sub load_facedata($) {
2812 my ($path) = @_; 2832 my ($path) = @_;
2813 2833
2834 my $enc = JSON::XS->new->utf8->canonical;
2835
2814 warn "loading facedata from $path\n"; 2836 warn "loading facedata from $path\n";
2815 2837
2816 my $facedata; 2838 my $facedata;
2817 0 < aio_load $path, $facedata 2839 0 < aio_load $path, $facedata
2818 or die "$path: $!"; 2840 or die "$path: $!";
2819 2841
2820 $facedata = Coro::Storable::thaw $facedata; 2842 $facedata = Coro::Storable::thaw $facedata;
2821 2843
2822 $facedata->{version} == 2 2844 $facedata->{version} == 2
2823 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;
2824 2853
2825 { 2854 {
2826 my $faces = $facedata->{faceinfo}; 2855 my $faces = $facedata->{faceinfo};
2827 2856
2828 while (my ($face, $info) = each %$faces) { 2857 while (my ($face, $info) = each %$faces) {
2829 my $idx = (cf::face::find $face) || cf::face::alloc $face; 2858 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2830 cf::face::set_visibility $idx, $info->{visibility}; 2859 cf::face::set_visibility $idx, $info->{visibility};
2831 cf::face::set_magicmap $idx, $info->{magicmap}; 2860 cf::face::set_magicmap $idx, $info->{magicmap};
2832 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 2861 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2833 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 2862 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2834 2863
2835 cf::cede_to_tick; 2864 cf::cede_to_tick;
2836 } 2865 }
2837 2866
2838 while (my ($face, $info) = each %$faces) { 2867 while (my ($face, $info) = each %$faces) {
… …
2863 2892
2864 { 2893 {
2865 # TODO: for gcfclient pleasure, we should give resources 2894 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index. 2895 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource}; 2896 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical; 2897
2898 my $soundconf = delete $res->{"res/sound.conf"};
2869 2899
2870 while (my ($name, $info) = each %$res) { 2900 while (my ($name, $info) = each %$res) {
2871 my $meta = $enc->encode ({
2872 name => $name,
2873 copyright => $info->{copyright}, #TODO#
2874 });
2875
2876 my $idx = (cf::face::find $name) || cf::face::alloc $name; 2901 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2902 my $data;
2877 2903
2878 if ($info->{type} & 1) { 2904 if ($info->{type} & 1) {
2879 # prepend meta info 2905 # prepend meta info
2880 2906
2907 my $meta = $enc->encode ({
2908 name => $name,
2909 %{ $info->{meta} || {} },
2910 });
2911
2881 my $data = pack "(w/a*)*", $meta, $info->{data}; 2912 $data = pack "(w/a*)*", $meta, $info->{data};
2882 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2883
2884 cf::face::set_data $idx, 0, $data, $chk;
2885 } else { 2913 } else {
2886 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 2914 $data = $info->{data};
2887 } 2915 }
2888 2916
2917 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2889 cf::face::set_type $idx, $info->{type}; 2918 cf::face::set_type $idx, $info->{type};
2890 2919
2891 cf::cede_to_tick; 2920 cf::cede_to_tick;
2921 }
2922
2923 if ($soundconf) {
2924 $soundconf = $enc->decode (delete $soundconf->{data});
2925
2926 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2927 my $sound = $soundconf->{compat}[$_]
2928 or next;
2929
2930 my $face = cf::face::find "sound/$sound->[1]";
2931 cf::sound::set $sound->[0] => $face;
2932 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2933 }
2934
2935 while (my ($k, $v) = each %{$soundconf->{event}}) {
2936 my $face = cf::face::find "sound/$v";
2937 cf::sound::set $k => $face;
2938 }
2892 } 2939 }
2893 } 2940 }
2894 2941
2895 1 2942 1
2896} 2943}

Diff Legend

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