add DXCIDR, fix version no tracking

[spider.git] / cmd / dx.pl

diff --git a/cmd/dx.pl b/cmd/dx.pl
index a5d3b4253f8882659dc8eeea48eac8842a837694..046af6a479b945d87bf83151eb1223ce1239f8f9 100644 (file)
--- a/cmd/dx.pl
+++ b/cmd/dx.pl
@@ -93,14 +93,18 @@ my $callnoid = basecall($self->{call});
 #$DB::single = 1;
 
 if ($DXProt::baddx->in($spotted)) {
-       $localonly++; 
+       ++$localonly; 
 }
 if ($DXProt::badspotter->in($spotternoid)) { 
-       LogDbg('DXCommand', "badspotter $spotternoid as $spotter ($oline) from $addr");
-       $localonly++; 
+       LogDbg('DXCommand', "badspotter $spotternoid as $spotter ($oline) from $ipaddr");
+       ++$localonly; 
+}
+if ($ipaddr && DXCIDR::find($ipaddr)) {
+       LogDbg('DXCommand', "Bad IP address $ipaddr $spotternoid as $spotter ($oline)");
+       ++$localonly; 
 }
 
-dbg "spotter $spotternoid/$callnoid\n";
+#dbg "spotter $spotternoid/$callnoid\";
 
 if (($spotted =~ /$spotternoid/ || $spotted =~ /$callnoid/) && $freq < $Spot::minselfspotqrg) {
        LogDbg('DXCommand', "$spotternoid/$callnoid trying to self spot below ${Spot::minselfspotqrg}KHz ($oline) from $addr, not passed on to cluster");