X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl%2FDXProt.pm;h=f5b6a81860d6a85a4ce5478d2322429f3ff3f86e;hb=ffe3cb4d7395dc23a8d4e37d81b0009707681136;hp=736cab4d41d1a58496cb0b7bfcb305dec26f557d;hpb=b51a81586ebf52195e587daf321eb7053a2de16e;p=spider.git diff --git a/perl/DXProt.pm b/perl/DXProt.pm index 736cab4d..f5b6a818 100644 --- a/perl/DXProt.pm +++ b/perl/DXProt.pm @@ -1789,7 +1789,7 @@ sub send_route for (; @_ && $no; $no--) { my $r = shift; - if ($self->{routefilter}) { + if (!$self->{isolate} && $self->{routefilter}) { $filter = undef; if ($r) { ($filter, $hops) = $self->{routefilter}->it($self->{call}, $self->{dxcc}, $self->{itu}, $self->{cq}, $r->call, $r->dxcc, $r->itu, $r->cq); @@ -1802,7 +1802,7 @@ sub send_route dbg("was sent a null value") if isdbg('chanerr'); } } else { - push @rin, $r; + push @rin, $r unless $self->{isolate} && $r->call ne $main::mycall; } } if (@rin) { @@ -1827,13 +1827,11 @@ sub broadcast_route my $dxchan; my $line; - foreach $dxchan (@dxchan) { - next if $dxchan == $self; - next if $dxchan == $me; - if ($dxchan->{routefilter}) { + unless ($self->{isolate}) { + foreach $dxchan (@dxchan) { + next if $dxchan == $self; + next if $dxchan == $me; $dxchan->send_route($generate, @_); - } else { - $dxchan->send_route($generate, @_) unless $self->{isolate} || $dxchan->{isolate}; } } }