Changeset 273 for branches

Timestamp:

08/09/05 17:15:26 (19 years ago)

Author:

Kris Deugau

Message:

/branches/dns

Updates to main.cgi to pass rDNS data in to IPDB core
Updates to IPDB.pm to insert rDNS data into dns table
Added subst_rDNS function to IPDB.pm to take template string

and substitute printf-like patterns with IP data

Location:

branches/dns/cgi-bin

Files:

• IPDB.pm (modified) (5 diffs)
• main.cgi (modified) (2 diffs)

branches/dns/cgi-bin/IPDB.pm

@@ -184 +184 @@
 # Does all of the magic of actually allocating a netblock
 # Requires database handle, block to allocate, custid, type, city,
-#       description, notes, circuit ID, block to allocate from, 
+#       description, notes, circuit ID, block to allocate from,
+#       rDNS for the block/IP
 # Returns a success code and optional error message.
 sub allocateBlock {
-  my ($dbh,undef,undef,$custid,$type,$city,$desc,$notes,$circid) = @_;
+  my ($dbh,undef,undef,$custid,$type,$city,$desc,$notes,$circid,$rdns) = @_;
   
   my $cidr = new NetAddr::IP $_[1];
@@ -223 +224 @@
         " where ip='$cidr'");
       $sth->execute;
+
+      # rDNS change is an update as the pool should have set "unassigned..."
+      # rDNS on all IPs already.
+      $msg = "Unable to update rDNS assigning $cidr to $custid";
+      $sth = $dbh->prepare("update dns set hostname='$rdns',auto='n' where ip='$cidr'");
+      $sth->execute;
+
       $dbh->commit;
     };
@@ -405 +413 @@
 # Note that this is NOT done in a transaction, that's why it's a private
 # function and should ONLY EVER get called from allocateBlock()
+# We also do the rDNS for the pool here to save some sanity.
 sub initPool {
-  my ($dbh,undef,$type,$city,$class) = @_;
+  my ($dbh,undef,$type,$city,$class,$rdns,$domain) = @_;
   my $pool = new NetAddr::IP $_[1];
 
@@ -424 +433 @@
     $sth = $dbh->prepare("insert into poolips (pool,ip,custid,city,type)".
         " values ('$pool', ?, '6750400', '$city', '$type')");
+    my $sth2 = $dbh->prepare("insert into dns (ip,hostname) values (?, ?)");
     my @poolip_list = $pool->hostenum;
     if ($class eq 'all') { # (DSL-ish block - *all* IPs available
       if ($pool->addr !~ /\.0$/) {      # .0 causes weirdness.
         $sth->execute($pool->addr);
+        # Insert rDNS entry
+        $sth2->execute($pool->addr,subst_rDNS($rdns,$pool->addr).".".$domain);
       }
       for (my $i=0; $i<=$#poolip_list; $i++) {
         $sth->execute($poolip_list[$i]->addr);
+        # Insert rDNS entry
+        $sth2->execute($poolip_list[$i]->addr,
+                subst_rDNS($rdns,$poolip_list[$i]->addr).".".$domain);
       }
       $pool--;
       if ($pool->addr !~ /\.255$/) {    # .255 can cause weirdness.
         $sth->execute($pool->addr);
+        # Insert rDNS entry
+        $sth2->execute($pool->addr,subst_rDNS($rdns,$pool->addr).".".$domain);
       }
     } else { # (real netblock)
       for (my $i=1; $i<=$#poolip_list; $i++) {
         $sth->execute($poolip_list[$i]->addr);
+        # Insert rDNS entry
+        $sth2->execute($poolip_list[$i]->addr,
+                subst_rDNS($rdns,$poolip_list[$i]->addr).".".$domain);
       }
     }
@@ -628 +648 @@
 }
 
+
+## IPDB::subst_rDNS()
+# Substitute tokens in a template string for rDNS entries
+sub subst_rDNS {
+  my ($template,$ip) = $@;
+
+  my ($o1,$o2,$o3,$o4) = ($ip =~ /^(\d+)\.(\d+)\.(\d+)\.(\d+)/);
+  $rdns =~ s/\%o1\%/$o1/;
+  $rdns =~ s/\%o2\%/$o2/;
+  $rdns =~ s/\%o3\%/$o3/;
+  $rdns =~ s/\%o4\%/$o4/;
+  $rdns =~ s/\%d\%/$o1$-o2-$o3-$o4/;
+
+  return $rdns;
+} # end subst_rDNS()
+
 # Indicates module loaded OK.  Required by Perl.
 1;

branches/dns/cgi-bin/main.cgi

@@ -641 +641 @@
   my $cidr;
   my $alloc_from;
+  my $rdns;
 
   # Going to manually validate some items.
@@ -781 +782 @@
   $html =~ s|\$\$CITY\$\$|$webvar{city}|g;
   $html =~ s|\$\$CUSTID\$\$|$webvar{custid}|g;
+  $html =~ s|\$\$RDNS\$\$|$rdns|g;
   $webvar{circid} = desanitize($webvar{circid});
   $html =~ s|\$\$CIRCID\$\$|$webvar{circid}|g;