tidy the isolate code up a bit

[spider.git] / perl / DXProt.pm

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index e41951da26b4f932be9b8103bb52e75e21adcfcd..2e43068a6951c7f42517c98a5170b57bd76fba68 100644 (file)
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -1145,7 +1145,7 @@ sub dx_spot
                ($filter, $hops) = $self->{spotsfilter}->it(@_);
                return unless $filter;
        }
-       send_prot_line($self, $filter, $hops, $isolate, $line)
+       send_prot_line($self, $filter, $hops, $isolate, $line);
 }
 
 sub send_prot_line
@@ -1161,7 +1161,7 @@ sub send_prot_line
                return unless $routeit;
        }
        if ($filter) {
-               $self->send($routeit) if $routeit;
+               $self->send($routeit);
        } else {
                $self->send($routeit) unless $self->{isolate} || $isolate;
        }
@@ -1605,10 +1605,7 @@ sub process_rcmd_reply
                my $s = $rcmds{$fromnode};
                if ($s) {
                        my $dxchan = DXChannel->get($s->{call});
-                       my $ref = DXChannel->get($user) || $dxchan;
-                       if ($ref->{call} eq $main::mycall) {
-                               $ref = DXChannel->get($main::myalias) || $ref;
-                       }
+                       my $ref = $user eq $tonode ? $dxchan : (DXChannel->get($user) || $dxchan);
                        $ref->send($line) if $ref;
                        delete $rcmds{$fromnode} if !$dxchan;
                } else {
@@ -1757,7 +1754,7 @@ sub send_route
                                $routeit = adjust_hops($self, $line);  # adjust its hop count by node name
                                next unless $routeit;
                        }
-                       $self->send($routeit) if $self->{routefilter} || !$self->{isolate};
+                       $self->send($routeit);
                }
        }
 }
@@ -1773,10 +1770,10 @@ sub broadcast_route
        foreach $dxchan (@dxchan) {
                next if $dxchan == $self;
                next if $dxchan == $me;
-               if ($dxchan->{routefilter} || !$self->{isolate}) {
-                       $dxchan->send_route($generate, @_) 
+               if ($dxchan->{routefilter}) {
+                       $dxchan->send_route($generate, @_);
                } else {
-                       dbg('DXPROT: isolated') if isdbg('chanerr');
+                       $dxchan->send_route($generate, @_) unless $self->{isolate} || $dxchan->{isolate};
                }
        }
 }