Changeset 308 for branches/stable

Timestamp:

02/28/06 17:45:43 (18 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Fixups and cleanups for rWHOIS export script.

File:

• branches/stable/cgi-bin/extras/db2rwhois.pl (modified) (5 diffs)

branches/stable/cgi-bin/extras/db2rwhois.pl

@@ -22 +22 @@
 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 +39 @@
 
 # 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;
@@ -89 +82 @@
 # Make sure to remove the private netblocks from this.
 # No use or point in broadcasting our use of them.
+# 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 ".
@@ -94 +88 @@
         "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')");
@@ -132 +127 @@
 # cidr custid type city description notes maskbits
 
-# Creation date in record to eventually be "correct";  near-term will
-# be master's creation date;  immediate is today's date.
-my $date;
-      chomp ($date = `/bin/date +"%Y%m%d"`);
+# Fill in a generic entry for nameless allocations
 if ($desc =~ /^\s*$/) { $desc = 'Friendly ISP'; }
-#print "$i:\t$net in $master\n";
+
+      # 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".