Changeset 311

Timestamp:

03/28/06 15:27:06 (19 years ago)

Author:

Kris Deugau

Message:

/trunk

Copy db2rwhois.pl from /branches/stable.

File:

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

trunk/cgi-bin/extras/db2rwhois.pl

@@ -17 +17 @@
 use NetAddr::IP;
 use MyIPDB;
-use Digest::MD5 qw(md5_hex);
 
 $ENV{"PATH"} = "/bin;/usr/bin";
 
 my $rwhoisDataPath = "/etc/rwhoisd";
-
-# We'll pull this out of the database instead.  Just make sure our
-# master blocks are actually listed....  <g>
-#@masterblocks = (
-#               (new NetAddr::IP "209.91.128.0/18"),
-#               (new NetAddr::IP "66.186.64.0/19"),
-#               (new NetAddr::IP "192.168.99.0/24")
-#               );
 
 my ($dbh,$msg) = connectDB_My;
@@ -47 +38 @@
 GETMASTERS: while (my @data = $sth->fetchrow_array()) {
 
-#  if ($data[0] =~ /^(192.168.0.0|172.16.0.0|10.0.0.0)/) {
-#    next GETMASTERS;
-#  }
+# 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;
+  }
   $masterblocks[$i] = new NetAddr::IP $data[0];
+  my ($ctime,undef) = split /\s/, $data[1];
 
-print "$masterblocks[$i]\n";
+print "$masterblocks[$i] $data[1]\n";
 
   my $date;
-  chomp ($date = `/bin/date +"%Y%m%d"`);
-  my ($ctime,undef) = split /\s+/, $data[1];
+  chomp ($date = `/bin/date +"%Y-%m-%d"`);
 
 # Whew!  Ugly little varmint.
@@ -89 +82 @@
 # Make sure to remove the private netblocks from this.
 # No use or point in broadcasting our use of them.
-#$sth = $dbh->prepare("select * 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')");
-# cidr,custid,type,city,description,notes,maskbits,circuitid,createstamp,modifystamp,newcustid
-
-$sth = $dbh->prepare("select cidr,custid,type,city,description,createstamp,modifystamp from allocations");
+# Also remove the details of our "reserved CORE/WAN" blocks;  they're not critical.
+$sth = $dbh->prepare("select cidr,custid,type,city,description,createstamp,modifystamp ".
+        "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 (type = 'wr') and ".
+        "masklen(cidr) <=30");
+#" and (custid='6750400' or custid like '%-RES' or custid like '%-BUS')");
 $sth->execute;
 
-while (my ($cidr,$custid,$type,$city,$description,$ctime,$mtime) = $sth->fetchrow_array()) {
+$i=0;
+while (my ($cidr, $custid, $type, $city, $desc, $ctime, $mtime) = $sth->fetchrow_array) {
 
 # We get master block info from @masterblocks.
@@ -110 +109 @@
  # Updated-By: noc@example.com
 
-  # Get the "full" network number - just in case.
+  # Get the "full" network number
   my $net = new NetAddr::IP $cidr;
 
@@ -126 +125 @@
         or print "File open error: '$!' on '$rwhoisDataPath/$masterfilename'\n";
 
-if ($data[4] =~ /^\s*$/) { $data[4] = 'Friendly ISP'; }
-print "$type-type $net for $custid, created $ctime, modified $mtime\n";
+# cidr custid type city description notes maskbits
+
+# Fill in a generic entry for nameless allocations
+if ($desc =~ /^\s*$/) { $desc = 'Friendly ISP'; }
+
+      # Fix up datestamps.  We don't *really* need sub-microsecond resolution on our exports...
+      ($ctime) = ($ctime =~ /^(\d+-\d+-\d+)\s+/);
+      ($mtime) = ($mtime =~ /^(\d+-\d+-\d+)\s+/);
+
       print MASTERFILE "---\nID: NETBLK-ISP.$master\n".
         "Auth-Area: $master\n".
@@ -133 +139 @@
         "IP-Network: $net\n".
         "IP-Network-Block: ".$net->range."\n".
-        "Organization: $description\n".
+        "Organization: $desc\n".
 #       "Tech-Contact: $data[9]\n".
         "Tech-Contact: abuse\@example.com\n".
@@ -149 +155 @@
   #  print "$data[0]\t| $data[1]\t| $data[2]\t| $data[3]\t| $data[4]\t| ".
   #     "$data[5]\t| $data[6]\t| $data[7]\t| $data[8]\n";
-
+  $i++;
 } # while fetchrow_array()
 
 
 $dbh->disconnect;
-
-# This doesn't work, with a vengeance.
-#print qx{ /usr/bin/rwhois_indexer -c /etc/rwhoisd/rwhoisd.conf -i -v -s txt };