From: djk <djk>
Date: Sun, 24 Oct 1999 16:25:44 +0000 (+0000)
Subject: make sure nodes only get 1 copy of an announce
X-Git-Tag: R_1_33~3
X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=3d4ef40cbe97fc74d9c95e782aa35f99c75d1202;p=spider.git

make sure nodes only get 1 copy of an announce
---

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index 97a0b0d2..741e4b33 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -291,13 +291,11 @@ sub normal
 					my $wwv = Geomag::update($main::systime, $hour, $sfi, $a, $k, "R=$r, Next K=$next$alarm", $decode_dk0wcy, $field[5], $r);
 				}
 				
-				return if $field[2] eq $main::mycall; # it's routed to me
 			} else {
 				route($field[2], $line);
-				return;			# only on a routed one
 			}
 			
-			last SWITCH;
+			return;
 		}
 		
 		if ($pcno == 13) {
@@ -913,7 +911,7 @@ sub send_announce
 			($filter, $hops) = Filter::it($dxchan->{annfilter}, @_, $self->{call} );
 			next unless $filter;
 		} 
-		if ($dxchan->is_ak1a) {
+		if ($dxchan->is_ak1a && $field[1] ne $main::mycall) {  # i.e not specifically routed to me
 			next if $dxchan == $self;
 			if ($hops) {
 				$routeit = $line;