Added input Spot filtering

[spider.git] / perl / DXProt.pm

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 6b7d1b949bf363a5c640e2405fef3d38e0e95fec..eb65eb44fd7b31415216e7b1209fdf252de50fbe 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -242,7 +242,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 +370,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 +1130,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
@@ -1688,10 +1699,10 @@ sub addrcmd
 sub disconnect
 {
        my $self = shift;
-       my $nopc39 = shift;
+       my $pc39flag = shift;
        my $call = $self->call;
 
-       unless ($nopc39) {
+       unless ($pc39flag && $pc39flag == 1) {
                $self->send_now("D", DXProt::pc39($main::mycall, $self->msg('disc1', "System Op")));
        }
 
@@ -1701,18 +1712,20 @@ sub disconnect
        
        # create a list of all the nodes that have gone and delete them from the table
        my @nodes;
-       foreach my $node (grep { $_->dxchan == $self } DXNode::get_all) {
-               next if $node->dxchancall eq $call;
+       foreach my $node (grep { $_->dxchancall eq $call } DXNode::get_all) {
+               next if $node->call eq $call;
                next if $node->call eq $main::mycall;
                push @nodes, $node->call;
                $node->del;
        }
 
        # broadcast to all other nodes that all the nodes connected to via me are gone
-       unless ($self->{isolate}) {
-               push @nodes, $call;
-               for (@nodes) {
-                       broadcast_ak1a(pc21($_, 'Gone.'), $self);
+       unless ($pc39flag && $pc39flag == 2) {
+               unless ($self->{isolate}) {
+                       push @nodes, $call;
+                       for (@nodes) {
+                               broadcast_ak1a(pc21($_, 'Gone.'), $self);
+                       }
                }
        }