Changeset 734 for trunk

Timestamp:

05/27/15 14:26:30 (9 years ago)

Author:

Kris Deugau

Message:

/trunk

Fix subtle edge-case bug in initPool() where the check for preexisting
net and bcast IPs looked for the wrong thing, and tried to insert them
again.

File:

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

trunk/cgi-bin/IPDB.pm

@@ -1537 +1537 @@
   my $msg;
 
-  # Trap errors so we can pass them back to the caller.  Even if the
-  # caller is only ever supposed to be local, and therefore already
-  # trapping errors.  >:(
-  local $dbh->{AutoCommit} = 0; # These need to be local so we don't
-  local $dbh->{RaiseError} = 1; # step on our toes by accident.
-
   eval {
     # have to insert all pool IPs into poolips table as "unallocated".
@@ -1589 +1583 @@
     if ($class eq 'all') { # (DSL-ish block - *all* IPs available
       if ($pool->addr !~ /\.0$/) {      # .0 causes weirdness.
-        $sth->execute($pool->addr, $pcustid, $city, $type, $parent, $master) unless $foundips{$pool->addr};
+        $sth->execute($pool->addr, $pcustid, $city, $type, $parent, $master) unless $foundips{$pool->addr."/32"};
       }
       $sth->execute($poolip_list[0]->addr, $pcustid, $city, $type, $parent, $master) unless $foundips{$poolip_list[0]};
       $pool--;
       if ($pool->addr !~ /\.255$/) {    # .255 can cause weirdness.
-        $sth->execute($pool->addr, $pcustid, $city, $type, $parent, $master) unless $foundips{$pool->addr};
+        $sth->execute($pool->addr, $pcustid, $city, $type, $parent, $master) unless $foundips{$pool->addr."/32"};
       }
     }