don't route pc92 back to their origin

[spider.git] / perl / DXProt.pm

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index e33a310f2268f394e07271b1745f9f365381b094..c00219ecd780b4354d79fb4d61403ca017fb76ed 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -38,11 +38,6 @@ use DXProtHandle;
 use strict;
 
 use vars qw($VERSION $BRANCH);
-$VERSION = sprintf( "%d.%03d", q$Revision$ =~ /(\d+)\.(\d+)/ );
-$BRANCH = sprintf( "%d.%03d", q$Revision$ =~ /\d+\.\d+\.(\d+)\.(\d+)/  || (0,0));
-$main::build += $VERSION;
-$main::branch += $BRANCH;
-
 use vars qw($pc11_max_age $pc23_max_age $last_pc50 $eph_restime $eph_info_restime $eph_pc34_restime
                        $last_hour $last10 %eph  %pings %rcmds $ann_to_talk
                        $pingint $obscount %pc19list $chatdupeage $chatimportfn
@@ -52,6 +47,8 @@ use vars qw($pc11_max_age $pc23_max_age $last_pc50 $eph_restime $eph_info_restim
                        $eph_pc15_restime $pc92_update_period $last_pc92_update
                   );
 
+($VERSION, $BRANCH) = dxver(q$Revision$);
+
 $pc11_max_age = 1*3600;                        # the maximum age for an incoming 'real-time' pc11
 $pc23_max_age = 1*3600;                        # the maximum age for an incoming 'real-time' pc23
 
@@ -224,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;
 }
 
 #
@@ -434,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);
                }
                
@@ -783,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;
@@ -800,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;
@@ -838,6 +837,23 @@ 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) {
+                       my @parents = map {Route::Node::get($_)} $n->parents;
+                       for (@parents) {
+                               push @rdel, $n->del($_) if $_;
+                       }
+               }
+       }
+       for (@rdel) {
+               $main::me->route_pc21($main::mycall, undef, $_) if $_;
+       }
+}
+
 #
 # route a message down an appropriate interface for a callsign
 #
@@ -1212,8 +1228,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');