X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=1ba185b183d4123f2489115c76088b71df6d3bb1;hb=015e51891a2052454449c99fde521a36efdad9e2;hp=ef3f331707180c754807f085411992367b1b267c;hpb=2a37fdae7b5154d77fe602bf18d6fa908e634748;p=spider.git diff --git a/perl/DXProt.pm b/perl/DXProt.pm index ef3f3317..1ba185b1 100644 --- 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; } # @@ -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,6 +1131,7 @@ sub process next if $dxchan == $me; # send a pc50 out on this channel + $dxchan->{pc50_t} = $main::systime unless exists $dxchan->{pc50_t}; if ($t >= $dxchan->{pc50_t} + $DXProt::pc50_interval) { $dxchan->send(pc50(scalar DXChannel::get_all_users)); $dxchan->{pc50_t} = $t;