Changeset 54 for trunk/dnsbl/DNSBL.pm

Timestamp:

12/11/14 17:22:28 (9 years ago)

Author:

Kris Deugau

Message:

/trunk/dnsbl

Extend the number of layers/depth from 3 to 7 internally. Note that only

5 are exposed in the "add" UI.

Add support to extract the CIDR range when a WHOIS lookup gives a non-CIDR

range.

Fix tracking of "seen" IPs creating the browse display.
Add the new DNSBLweb.pm to the Makefile MANIFEST, and bump the version in

the Makefile

File:

• trunk/dnsbl/DNSBL.pm (modified) (1 diff)

trunk/dnsbl/DNSBL.pm

@@ -272 +272 @@
 
 
+# take an arbitrary IP range and an IP, and return the CIDR block (if any) the IP is in.
+sub range2cidr {
+  my $self = shift;
+  my $rstart = shift;
+  my $rend = shift;
+  my $ip = shift;
+
+  $rstart = new NetAddr::IP $rstart;
+  $rend = new NetAddr::IP $rend;
+  # Basic algoithm:  Set the mask on the IP, and see if both $rstart and $rend
+  # are within the range defined by that IP/mask.  Continue making the mask
+  # larger until success.
+
+  my $mask;
+  for ($mask = 32; $mask > 0; $mask--) {
+    my $ip = NetAddr::IP->new("$ip/$mask");
+    if (NetAddr::IP->new($ip->network->addr)   >= $rstart    &&
+        NetAddr::IP->new($ip->broadcast->addr) <= $rend) {
+      next;
+    } else {
+      $mask++;
+      last;
+    }
+  }
+  my $realnet = NetAddr::IP->new("$ip/$mask")->network;
+
+  return "$realnet";
+} # end range2cidr()
+
+
 # add a block.  requires the orgid
 ##fixme needs error handling