add time constraints and other checks on PC9x timestamp

[spider.git] / perl / DXProt.pm

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index af7d73083a9e9f68d6947ea16450c7ed2d3fa1b5..8b415974ed55cef98fd1062cc448576b8ca02a5e 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -74,7 +74,7 @@ $obscount = 2;
 $chatdupeage = 20 * 60;
 $chatimportfn = "$main::root/chat_import";
 $pc19_version = 5454;                  # the visible version no for outgoing PC19s generated from pc59
-$pc92_update_period = 2*60*60; # the period between outgoing PC92 C updates
+$pc92_update_period = 4*60*60; # the period between outgoing PC92 C updates
 $pc92_short_update_period = 15*60; # shorten the update period after a connection or start up
 $pc92_extnode_update_period = 1*60*60; # the update period for external nodes
 $pc92_keepalive_period = 1*60*60;      # frequency of PC92 K (keepalive) records
@@ -457,7 +457,6 @@ sub process
                        $pc50s = pc50($main::me, scalar DXChannel::get_all_users);
                        eph_dup($pc50s);
                        $last_pc50 = $t;
-                       time_out_pc92_routes();
                }
 
                foreach $dxchan (@dxchan) {
@@ -511,6 +510,7 @@ sub process
 
                # do the keepalive for me, if required
                if ($main::systime >= $main::me->{next_pc92_keepalive}) {
+                       time_out_pc92_routes();
                        $main::me->broadcast_pc92_keepalive($main::mycall);
                }
 
@@ -548,6 +548,7 @@ sub send_dx_spot
        foreach $dxchan (@dxchan) {
                next if $dxchan == $main::me;
                next if $dxchan == $self && $self->is_node;
+               next if $line =~ /PC61/ && !$dxchan->is_spider && !$dxchan->is_user;
                $dxchan->dx_spot($line, $self->{isolate}, @_, $self->{call});
        }
 }
@@ -856,8 +857,10 @@ sub send_local_config
        } elsif ($self->{do_pc9x}) {
                dbg("send_local_config: doing pc9x");
                my $node = Route::Node::get($self->{call});
-               $self->send_last_pc92_config($main::routeroot);
-               $self->send(pc92a($main::routeroot, $node)) unless $main::routeroot->last_PC92C =~ /$self->{call}/;
+#              $self->send_last_pc92_config($main::routeroot);
+#              $self->send(pc92a($main::routeroot, $node)) unless $main::routeroot->last_PC92C =~ /$self->{call}/;
+               $self->send(pc92a($main::routeroot, $node));
+               $self->send(pc92k($main::routeroot));
        } else {
                # create a list of all the nodes that are not connected to this connection
                # and are not themselves isolated, this to make sure that isolated nodes