Changeset 659

Timestamp:

09/12/14 18:00:03 (10 years ago)

Author:

Kris Deugau

Message:

/trunk

Shave off a confusing nuisance in naming; rename addRec() to rpc_addRec()
in dns-rpc.cgi. Now we can tell more easily whether this is a local
redirect call or (supposed to be) a call to the core DNSDB::addRec()...
and therefore what calling convention we use.

File:

• trunk/dns-rpc.cgi (modified) (11 diffs)

trunk/dns-rpc.cgi

@@ -83 +83 @@
         'dnsdb.getRecList'      => \&getRecList,
         'dnsdb.getRecCount'     => \&getRecCount,
-        'dnsdb.addRec'          => \&addRec,
+        'dnsdb.addRec'          => \&rpc_addRec,
         'dnsdb.updateRec'       => \&updateRec,
 #sub downconvert {
@@ -462 +462 @@
 }
 
-sub addRec {
+sub rpc_addRec {
   my %args = @_;
 
@@ -489 +489 @@
   die "$msg\n" if $code eq 'FAIL';
   return $msg;
-}
+} # rpc_addRec
 
 sub updateRec {
@@ -508 +508 @@
   }
   # stamp has special handling when blank or 0.  "undefined" from the caller should mean "don't change"
-  $args{stamp} = $oldrec->{stamp} if !defined($args{stamp}) && defined($oldrec->{stamp});
+  $args{stamp} = $oldrec->{stamp} if !defined($args{stamp}) && $oldrec->{stampactive};
 
   # allow passing text types rather than DNS integer IDs
@@ -545 +545 @@
         # Aren't Magic Numbers Fun?  See pseudotype list in dnsadmin.
         my $type = ($cidr->{isv6} ? 65284 : ($cidr->masklen == 32 ? 65280 : 65283) );
-        addRec(defrec =>'n', revrec => 'y', parent_id => $zonelist->[0]->{rdns_id}, type => $type,
+        rpc_addRec(defrec => 'n', revrec => 'y', parent_id => $zonelist->[0]->{rdns_id}, type => $type,
           address => "$cidr", %args);
       } else {
@@ -554 +554 @@
                 || $rec->{type} == 65282 || $rec->{type} == 65283 || $rec->{type} == 65284;
           next unless $rec->{val} eq $filt;     # make sure we really update the record we want to update.
-          $dnsdb->updateRec(defrec =>'n', revrec => 'y', id => $rec->{record_id},
+          updateRec(defrec =>'n', revrec => 'y', id => $rec->{record_id},
             parent_id => $zonelist->[0]->{rdns_id}, %args);
           $flag = 1;
@@ -563 +563 @@
           # Aren't Magic Numbers Fun?  See pseudotype list in dnsadmin.
           my $type = ($cidr->{isv6} ? 65282 : ($cidr->masklen == 32 ? 65280 : 65283) );
-          $dnsdb->addRec(defrec =>'n', revrec => 'y', parent_id => $zonelist->[0]->{rdns_id}, type => $type,
+          rpc_addRec(defrec => 'n', revrec => 'y', parent_id => $zonelist->[0]->{rdns_id}, type => $type,
             address => "$cidr", %args);
         }
@@ -578 +578 @@
       if (scalar(@$reclist) == 0) {
         my $type = ($args{cidr}->{isv6} ? 65282 : ($args{cidr}->masklen == 32 ? 65280 : 65283) );
-        $dnsdb->addRec(defrec =>'n', revrec => 'y', parent_id => $zdata->{rdns_id}, type => $type,
+        rpc_addRec(defrec => 'n', revrec => 'y', parent_id => $zdata->{rdns_id}, type => $type,
           address => "$args{cidr}", %args);
       } else {
@@ -644 +644 @@
           # Edge case;  we've just gone and axed all the records in the reverse zone.
           # Re-add one to match the parent if we've been given a pattern to use.
-          $dnsdb->addRec(defrec =>'n', revrec => 'y', parent_id => $zonelist->[0]->{rdns_id},
+          rpc_addRec(defrec => 'n', revrec => 'y', parent_id => $zonelist->[0]->{rdns_id},
                  type => ($zone->{isv6} ? 65284 : 65283), address => "$cidr", %args);
         }
@@ -686 +686 @@
 # yes, yes we do, past the close of the else
 #        my $type = ($args{cidr}->{isv6} ? 65282 : ($args{cidr}->masklen == 32 ? 65280 : 65283) );
-#        addRec(defrec =>'n', revrec => 'y', parent_id => $zdata->{rdns_id}, type => $type,
+#        rpc_addRec(defrec => 'n', revrec => 'y', parent_id => $zdata->{rdns_id}, type => $type,
 #          address => "$args{cidr}", %args);
       } else {
@@ -706 +706 @@
         # We've just gone and axed all the records in the reverse zone.
         # Re-add one to match the parent if we've been given a pattern to use.
-        $dnsdb->addRec(defrec =>'n', revrec => 'y', parent_id => $zdata->{rdns_id},
+        rpc_addRec(defrec => 'n', revrec => 'y', parent_id => $zdata->{rdns_id},
                type => ($cidr->{isv6} ? 65284 : 65283),
                address => $zdata->{revnet}, name => $args{parpatt}, %args);