Changeset 341 for trunk

Timestamp:

07/06/06 18:03:10 (18 years ago)

Author:

Kris Deugau

Message:

/trunk

revert commit of unknown unremembered changes to db2rwhois.pl

File:

• trunk/cgi-bin/extras/db2rwhois.pl (modified) (2 diffs)

trunk/cgi-bin/extras/db2rwhois.pl

@@ -42 +42 @@
 # Techically, we only need to exclude 204.138.172.0/24, as we "own" all of the other blocks.
 # However, 205.207.184.0/23 and 206.130.64.0/24 are, um, awkward.
-#  if ($data[0] =~ /^(192.168.0.0|172.16.0.0|10.0.0.0|20[456])/) {
-#    next GETMASTERS;
-#  }
+  if ($data[0] =~ /^(192.168.0.0|172.16.0.0|10.0.0.0|20[456])/) {
+    next GETMASTERS;
+  }
   $masterblocks[$i] = new NetAddr::IP $data[0];
   my ($ctime,undef) = split /\s/, $data[1];
@@ -98 +98 @@
 $sth = $dbh->prepare("select cidr,custid,type,city,description,createstamp,modifystamp,swip ".
         "from allocations where ".
-#       "not (cidr <<= '192.168.0.0/16') and ".
-#       "not (cidr <<= '172.16.0.0/12') and ".
-#       "not (cidr <<= '10.0.0.0/8') and ".
+        "not (cidr <<= '192.168.0.0/16') and ".
+        "not (cidr <<= '172.16.0.0/12') and ".
+        "not (cidr <<= '10.0.0.0/8') and ".
         "not (type = 'wr') and ".
         "masklen(cidr) <=30");