added run_cmd to the cron system to run any DXCluster command

[spider.git] / perl / DXProt.pm

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index e92ca8a1acbada27e04fac33e8e3c64dd105d24b..a6587209179a8da21428e20a5176672265e8e61f 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -179,6 +179,7 @@ sub init
        do "$main::data/hop_table.pl" if -e "$main::data/hop_table.pl";
        confess $@ if $@;
        $me->{sort} = 'S';    # S for spider
+       $me->{priv} = 9;
 }
 
 #
@@ -242,7 +243,7 @@ sub start
                $self->{lastping} = $main::systime + ($self->pingint / 2);
        }
        $self->state('init');
-       $self->pc50_t(time);
+       $self->{pc50_t} = $main::systime;
 
        # send info to all logged in thingies
        $self->tell_login('loginn');
@@ -370,8 +371,19 @@ sub normal
                                        return;
                                }
                        }
+
+                       my @spot = Spot::prepare($field[1], $field[2], $d, $field[5], $field[6], $field[7]);
+                       # global spot filtering on INPUT
+                       if ($self->{inspotsfilter}) {
+                               my ($filter, $hops) = $self->{inspotsfilter}->it(@spot);
+                               unless ($filter) {
+                                       dbg('chan', "PCPROT: Rejected by filter");
+                                       return;
+                               }
+                       }
                        
-                       my @spot = Spot::add($field[1], $field[2], $d, $field[5], $field[6], $field[7]);
+                       # add it 
+                       Spot::add(@spot);
 
             #
                        # @spot at this point contains:-
@@ -1119,9 +1131,9 @@ sub process
                next if $dxchan == $me;
                
                # send a pc50 out on this channel
-               if ($t >= $dxchan->pc50_t + $DXProt::pc50_interval) {
+               if ($t >= $dxchan->{pc50_t} + $DXProt::pc50_interval) {
                        $dxchan->send(pc50(scalar DXChannel::get_all_users));
-                       $dxchan->pc50_t($t);
+                       $dxchan->{pc50_t} = $t;
                } 
 
                # send a ping out on this channel