try to gather more info on disappearing nodes

[spider.git] / perl / DXProt.pm

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 84572b68246c8c00da16310df040c24d21ec9268..f4e4e0d5c4caf03ba05a7f7fab5bd0bbe6f512eb 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -221,6 +221,8 @@ sub init
        $main::me->{registered} = 1;
        $main::me->{version} = $main::version;
        $main::me->{build} = $main::build;
+       $main::me->{do_pc92} = 1;
+       $main::me->{via_pc92} = 1;
 }
 
 #
@@ -431,6 +433,7 @@ sub process
 
                if ($main::systime >= $last_pc92_update + $pc92_update_period) {
                        send_pc92_update();
+                       time_out_pc92_routes();
                        $last_pc92_update = $main::systime + int rand(180);
                }
                
@@ -780,12 +783,11 @@ sub gen_pc92_update
        # send 'my' configuration for all users and pc92 capable nodes
        my @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} } DXChannel::get_all();
        my @localnodes = map { my $r = Route::get($_->{call}); $r ? $r : () } @dxchan;
-#      push @localnodes, map { my $r = Route::Node::get($_->{call}); $r ? $r : () } DXChannel::get_all_users();
        push @lines, pc92c($main::routeroot, @localnodes);
 
 
        if ($with_pc92_nodes) {
-               # send out the configuration of all the PC92 nodes with current configuration
+               # send out the configuration of all the directly connected PC92 nodes with current configuration
                # but with the dates that the last config came in with.
                @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} && $_->{do_pc92} } DXChannel::get_all_nodes();
                @localnodes = map { my $r = Route::Node::get($_->{call}); $r ? $r : () } @dxchan;
@@ -797,7 +799,7 @@ sub gen_pc92_update
                }
        }
        
-       # send the configuration of all the 'external' nodes that don't handle PC92
+       # send the configuration of all the directly connected 'external' nodes that don't handle PC92
        # out with the 'external' marker on the first node.
        @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} && !$_->{do_pc92} } DXChannel::get_all_nodes();
        @localnodes = map { my $r = Route::Node::get($_->{call}); $r ? $r : () } @dxchan;
@@ -835,6 +837,31 @@ sub send_pc92_update
        }
 } 
 
+sub time_out_pc92_routes
+{
+       my @nodes = grep {$_->do_pc92 || $_->via_pc92} Route::Node::get_all();
+       my @rdel;
+       foreach my $n (@nodes) {
+               if ($n->dec_obs <= 0) {
+                       if (my $dxchan = DXChannel::get($n->call)) {
+                               dbg("ROUTE: disconnecting local pc92 $_->{call} on obscount") if isdbg('route');
+                               $dxchan->disconnect;
+                               next;
+                       }
+                       my @parents = map {Route::Node::get($_)} $n->parents;
+                       for (@parents) {
+                               if ($_) {
+                                       dbg("ROUTE: deleting pc92 $_->{call} from $n->{call} on obscount") if isdbg('route');
+                                       push @rdel, $n->del($_);
+                               }
+                       }
+               }
+       }
+       for (@rdel) {
+               $main::me->route_pc21($main::mycall, undef, $_) if $_;
+       }
+}
+
 #
 # route a message down an appropriate interface for a callsign
 #
@@ -1209,8 +1236,8 @@ sub broadcast_route_pc9x
        $line =~ /\^H(\d+)\^\~?$/;
        unless ($1 > 0 && $self->{isolate}) {
                foreach $dxchan (@dxchan) {
-                       next if $dxchan == $self;
-                       next if $dxchan == $main::me;
+                       next if $dxchan == $self || $main::me;
+                       next if $origin eq $dxchan->{call};     # don't route some from this call back again.
                        next unless $dxchan->{do_pc92};
                        next unless $dxchan->isa('DXProt');