fix set/iso for send_local_config

diff --git a/Changes b/Changes
index d6f33553ece2ed7a3e1b668ecea578152732da8b..5da4f7b3899571feb9904d18fd8d9abd00833274 100644 (file)
--- a/Changes
+++ b/Changes
@@ -8,7 +8,7 @@ on the 14th minute in the connection time for each channel. This should
 reduce (slightly) the dups that are dumped.
 5. Speed up input queue processing (a lot).
 6. make set/isolate and acc/route mutually exclusive (and issue appropriate
-error messages).
+error messages) and fix set/iso on PC18 input.
 7. Improve stat/route_node and stat/route_user for diagnostics.
 8. strip top bit of comments in ann/spots.
 9. fix the announce filtering problem.

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 51348c82c0cb6e94e282fe922a46284db377cbb3..8ee77084fd0a339f70f05912cb5b75e129e71b95 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -654,7 +654,7 @@ sub normal
                        # first clear out any nodes on this dxchannel
                        my $parent = Route::Node::get($self->{call});
                        my @rout = $parent->del_nodes;
-                       $self->route_pc21(@rout, $parent);
+                       $self->route_pc21(@rout, $parent) if @rout;
                        $self->send_local_config();
                        $self->send(pc20());
                        return;             # we don't pass these on
@@ -1405,7 +1405,7 @@ sub send_local_config
                # 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
         # don't appear outside of this node
-               my @dxchan = grep { $_->call ne $main::mycall && $_->call ne $self->{call} } DXChannel::get_all_nodes();
+               my @dxchan = grep { $_->call ne $main::mycall && $_ != $self && !$_->{isolate} } DXChannel::get_all_nodes();
                @localnodes = map { my $r = Route::Node::get($_->{call}); $r ? $r : () } @dxchan if @dxchan;
                my @intcalls = map { $_->nodes } @localnodes if @localnodes;
                my $ref = Route::Node::get($self->{call});