Changeset 634 for trunk/cgi-bin/IPDB.pm

Timestamp:

10/09/14 12:37:39 (10 years ago)

Author:

Kris Deugau

Message:

/trunk

Commit 8/mumble for work done intermittently over the past ~year.
See #5, comment 25:

• Netblock update

File:

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

trunk/cgi-bin/IPDB.pm

@@ -1166 +1166 @@
   return ('FAIL', 'Missing block to update') if !$args{block};
 
+  # Spaces don't show up well in lots of places.  Make sure they don't get into the DB.
+  $args{custid} =~ s/^\s+//;
+  $args{custid} =~ s/\s+$//;
+
   # do it all in a transaction
   local $dbh->{AutoCommit} = 0;
@@ -1179 +1183 @@
   }
 
+  my $binfo;
   my $updtable = 'allocations';
-  my $keyfield = 'cidr';
+  my $keyfield = 'id';
   if ($args{type} =~ /^(.)i$/) {
     $updtable = 'poolips';
-    $keyfield = 'ip';
+    $binfo = getBlockData($dbh, $args{block}, 'i');
   } else {
 ## fixme:  there's got to be a better way...
+    $binfo = getBlockData($dbh, $args{block});
     if ($args{swip}) {
       if ($args{swip} eq 'on' || $args{swip} eq '1' || $args{swip} eq 'y') {
@@ -1203 +1209 @@
   return ('FAIL', 'No fields to update') if !@fieldlist;
 
-#  push @vallist, $args{block}, $args{rdepth}, $args{vrf};
-  push @vallist, $args{block}, $args{rdepth};
+  push @vallist, $args{block};
   my $sql = "UPDATE $updtable SET ";
   $sql .= join " = ?, ", @fieldlist;
-#  $sql .= " = ? WHERE $keyfield = ? AND rdepth = ? AND vrf = ?";
-  $sql .= " = ? WHERE $keyfield = ? AND rdepth = ? ";
+  $sql .= " = ? WHERE $keyfield = ?";
 
   eval {
@@ -1216 +1220 @@
     if ($args{node}) {
       # done with delete/insert so we don't have to worry about funkyness updating a node ref that isn't there
-      $dbh->do("DELETE FROM noderef WHERE block = ?", undef, ($args{block}) );
-      $dbh->do("INSERT INTO noderef (block,node_id) VALUES (?,?)", undef, ($args{block}, $args{node}) );
+      $dbh->do("DELETE FROM noderef WHERE block = ?", undef, ($binfo->{block}) );
+      $dbh->do("INSERT INTO noderef (block,node_id) VALUES (?,?)", undef, ($binfo->{block}, $args{node}) )
+        if $args{node} ne '--';
     }
 
@@ -1228 +1233 @@
   }
 
-  _rpc('addOrUpdateRevRec', cidr => $args{block}, name => $args{rdns}, rpcuser => $args{user});
+  $binfo->{block} =~ s|/32$||;
+  _rpc('addOrUpdateRevRec', cidr => $binfo->{block}, name => $args{rdns}, rpcuser => $args{user});
   return ('OK','OK');
 } # end updateBlock()