X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=perl%2FDXProt.pm;h=ee8c4aa9ef4d03e97fdfe0894e431f036ccb912c;hb=a5bd8a3c8ddca2ceb8ec805465d1b9b53f6812da;hp=c7e2abdbe44ef671be8ae3a80244338c7c045746;hpb=82de56e409a19a05761794c9588713160b51144e;p=spider.git

diff --git a/perl/DXProt.pm b/perl/DXProt.pm
index c7e2abdb..ee8c4aa9 100644
--- a/perl/DXProt.pm
+++ b/perl/DXProt.pm
@@ -197,7 +197,10 @@ sub normal
 			}
 			
 			# if this is a 'nodx' node then ignore it
-			last SWITCH if grep $field[7] =~ /^$_/,  @DXProt::nodx_node;
+			if (grep $field[7] =~ /^$_/,  @DXProt::nodx_node) {
+				dbg('chan', "Bad DXNode, dropped");
+				return;
+			}
 			
 			# convert the date to a unix date
 			my $d = cltounix($field[3], $field[4]);
@@ -291,13 +294,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) {
@@ -911,9 +912,9 @@ sub send_announce
 
 		if ($dxchan->{annfilter}) {
 			($filter, $hops) = Filter::it($dxchan->{annfilter}, @_, $self->{call} );
-			return unless $filter;
+			next unless $filter;
 		} 
-		if ($dxchan->is_ak1a) {
+		if ($dxchan->is_ak1a && $_[1] ne $main::mycall) {  # i.e not specifically routed to me
 			next if $dxchan == $self;
 			if ($hops) {
 				$routeit = $line;