force a config update to *everyone else* on pc20/22

[spider.git] / perl / DXProt.pm

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index c33d5aad747db115073cef08be9b4e8df4a117b5..843b927270166788c4232f090c79dc379165153c 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -772,26 +772,38 @@ sub send_local_config
        }
 }
 
+sub gen_my_pc92_config
+{
+       my $self = shift;
+       
+       my @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} } DXChannel::get_all();
+       dbg("ROUTE: all dxchan: " . join(',', map{$_->{call}} @dxchan)) if isdbg('routelow');
+       my @localnodes = map { my $r = Route::get($_->{call}); $r ? $r : () } @dxchan;
+       dbg("ROUTE: localnodes: " . join(',', map{$_->{call}} @localnodes)) if isdbg('routelow');
+       return pc92c($main::routeroot, @localnodes);
+}
+
 sub gen_pc92_update
 {
        my $self = shift;
        my $with_pc92_nodes = shift;
        my $node;
        my @lines;
-       
-       dbg('DXProt::gen_pc92_update') if isdbg('trace');
-
-       # 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 @lines, pc92c($main::routeroot, @localnodes);
+       my @dxchan;
+       my @localnodes;
 
+       dbg('ROUTE: DXProt::gen_pc92_update start') if isdbg('routelow');
 
+       # send 'my' configuration for all channels
+       push @lines, $self->gen_my_pc92_config;
+       
        if ($with_pc92_nodes) {
                # 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();
+               dbg("ROUTE: pc92 dxchan: " . join(',', map{$_->{call}} @dxchan)) if isdbg('routelow');
                @localnodes = map { my $r = Route::Node::get($_->{call}); $r ? $r : () } @dxchan;
+               dbg("ROUTE: pc92 localnodes: " . join(',', map{$_->{call}} @localnodes)) if isdbg('routelow');
                foreach $node (@localnodes) {
                        if ($node && $node->lastid->{92}) {
                                my @rout = map {my $r = Route::get($_); $r ? ($r) : ()} $node->nodes, $node->users;
@@ -803,13 +815,17 @@ sub gen_pc92_update
        # 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();
+       dbg("ROUTE: non pc92 dxchan: " . join(',', map{$_->{call}} @dxchan)) if isdbg('routelow');
        @localnodes = map { my $r = Route::Node::get($_->{call}); $r ? $r : () } @dxchan;
+       dbg("ROUTE: non pc92 localnodes: " . join(',', map{$_->{call}} @localnodes)) if isdbg('routelow');
        foreach $node (@localnodes) {
                if ($node) {
                        my @rout = map {my $r = Route::User::get($_); $r ? ($r) : ()} $node->users;
                        push @lines, pc92c($node, @rout);
                } 
        }
+
+       dbg('ROUTE: DXProt::gen_pc92_update end with ' . scalar @lines . ' lines') if isdbg('routelow');
        return @lines;
 }
 
@@ -840,7 +856,7 @@ sub send_pc92_update
 
 sub time_out_pc92_routes
 {
-       my @nodes = grep {$_->do_pc92 || $_->via_pc92} Route::Node::get_all();
+       my @nodes = grep {$_->call ne $main::mycall && ($_->do_pc92 || $_->via_pc92)} Route::Node::get_all();
        my @rdel;
        foreach my $n (@nodes) {
                my $o = $n->dec_obs;