Changeset 722 for trunk/cgi-bin

Timestamp:

05/20/15 13:53:31 (10 years ago)

Author:

Kris Deugau

Message:

/trunk

Fix minor bugs in _compactFree() that would only affect guided allocation

• set the now-misnamed "routed" field correctly
• set the VRF to match the parent

File:

• trunk/cgi-bin/IPDB.pm (modified) (2 diffs)

trunk/cgi-bin/IPDB.pm

@@ -155 +155 @@
 sub _compactFree {
   my $dbh = shift;
-
   my $parent = shift;
 
   # Rather than having the caller provide all the details
   my $pinfo = getBlockData($dbh, $parent);
-  my $ftype = (split //, $pinfo->{type})[1];
+  my $ftype = (split //, $pinfo->{type})[0];
 
 # NetAddr::IP->compact() attempts to produce the smallest inclusive block
@@ -201 +200 @@
 
   # now we walk the new list of compacted blocks, and see which ones we need to insert
-  $sth = $dbh->prepare("INSERT INTO freeblocks (cidr,city,routed,parent_id,master_id) VALUES (?,?,?,?,?)");
+  $sth = $dbh->prepare("INSERT INTO freeblocks (cidr,city,routed,vrf,parent_id,master_id) VALUES (?,?,?,?,?)");
   foreach my $cme (@combinelist) {
     next if grep { $cme == $_ } @rawfb; # skip if the combined block was in the raw list
-    $sth->execute($cme, $pinfo->{city}, $ftype, $parent, $pinfo->{master_id});
+    $sth->execute($cme, $pinfo->{city}, $ftype, $pinfo->{vrf}, $parent, $pinfo->{master_id});
   }