Changeset 59 for trunk

Timestamp:

12/15/14 17:20:17 (9 years ago)

Author:

Kris Deugau

Message:

/trunk/dnsbl

Polish CIDR autofinder to only get used on non-CIDR ranges; Postgres is

happy to take CIDR ranges.

Add missing IP highlight flag to DNSBLweb.pm

Location:

trunk/dnsbl

Files:

• DNSBLweb.pm (modified) (1 diff)
• dnsbl.cgi (modified) (1 diff)

trunk/dnsbl/DNSBLweb.pm

@@ -84 +84 @@
       $iprow{ipcount} = $data4[1];
       $iprow{indent} = '  'x$lvl;
+      $iprow{repeater} = 1 if $ip eq $data4[0];
 #       ip        | count | s4list |             added
       push @iprows, \%iprow;

trunk/dnsbl/dnsbl.cgi

@@ -138 +138 @@
     }
     if ($webvar{$blockn} =~ /-/) {
-      $err .= "Autofinding CIDR block containing $webvar{ip} for range '$webvar{$blockn}': ";
-      my ($s,$f) = split /[\s-]+/, $webvar{$blockn};
-      my $cidr = $dnsbl->range2cidr($s, $f, $webvar{ip});
-      $err .= "$cidr<br>\n";
-      $webvar{$blockn} = $cidr;
+      my $tmp = new NetAddr::IP $webvar{$blockn};
+      if (!$tmp) {
+        # Don't need to autofind ranges that are already CIDR-matched
+        $err .= "Autofinding CIDR block containing $webvar{ip} for range '$webvar{$blockn}': ";
+        my ($s,$f) = split /[\s-]+/, $webvar{$blockn};
+        my $cidr = $dnsbl->range2cidr($s, $f, $webvar{ip});
+        $err .= "$cidr<br>\n";
+        $webvar{$blockn} = $cidr;
+      }
     }
     if (!$dnsbl->blockexists($webvar{$blockn})) {