From: minima <minima>
Date: Mon, 3 Sep 2001 19:34:22 +0000 (+0000)
Subject: fixed isolation for routes finally?
X-Git-Tag: R_1_48~54
X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;h=9f7e2a3ed64a53dbb0bf2e44bcd463bceef6c45b;p=spider.git

fixed isolation for routes finally?
---

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 736cab4d..846a6c92 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) {
@@ -1833,7 +1833,7 @@ sub broadcast_route
 		if ($dxchan->{routefilter}) {
 			$dxchan->send_route($generate, @_);
 		} else {
-			$dxchan->send_route($generate, @_) unless $self->{isolate} || $dxchan->{isolate};
+			$dxchan->send_route($generate, @_) unless $self->{isolate};
 		}
 	}
 }