From: djk Date: Sun, 21 Feb 1999 20:57:41 +0000 (+0000) Subject: think I have it working finally X-Git-Tag: R_1_24~7 X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=c36b11f5bda0555f5ff58e0499c77652b5d0f6ca;p=spider.git think I have it working finally --- diff --git a/perl/DXProt.pm b/perl/DXProt.pm index a16789c7..f218d5f3 100644 --- a/perl/DXProt.pm +++ b/perl/DXProt.pm @@ -236,12 +236,13 @@ sub normal # send it if it isn't the except list and isn't isolated and still has a hop count foreach $dxchan (@dxchan) { next if $dxchan == $self; - my $routeit = adjust_hops($dxchan, $line); # adjust its hop count by node name my $filter = Filter::it($dxchan->{spotfilter}, @spot) if $dxchan->{spotfilter}; + my $routeit = adjust_hops($dxchan, $line); # adjust its hop count by node name + next unless $routeit; if ($filter) { $dxchan->send($routeit) if $routeit; } else { - $dxchan->send($routeit) unless $dxchan->{isolate} || !$routeit; + $dxchan->send($routeit) unless $dxchan->{isolate} || $self->{isolate}; } } diff --git a/perl/Spot.pm b/perl/Spot.pm index 6f21535a..75e34c11 100644 --- a/perl/Spot.pm +++ b/perl/Spot.pm @@ -69,7 +69,7 @@ sub add # automagically closes the output file (if any)). $fp->writeunix($out[2], $buf); - return (@spot, $spotted_itu, $spotted_cq, $spotter_itu, $spotter_cq); + return (@out, $spotted_itu, $spotted_cq, $spotter_itu, $spotter_cq); } # search the spot database for records based on the field no and an expression