Changeset 105 for trunk

Timestamp:

07/15/11 17:45:46 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Fix AXFR import buglets on long TXT, SPF, and "other" records;

should probably push that op into a function

Allow importing PTR records; otherwise we can't import

.in-addr.arpa or .ip6.arpa reverse zones.

File:

• trunk/DNSDB.pm (modified) (4 diffs)

trunk/DNSDB.pm

@@ -1403 +1403 @@
 # processing depending on the record.  le sigh.
 
+##fixme:  what record types other than TXT can/will have >255-byte payloads?
+
       if ($type eq 'A') {
         push @vallist, $rr->address;
@@ -1418 +1420 @@
         $soaflag = 1;
       } elsif ($type eq 'PTR') {
+        push @vallist, $rr->ptrdname;
         # hmm.  PTR records should not be in forward zones.
       } elsif ($type eq 'MX') {
@@ -1427 +1430 @@
 ##fixme:  Net::DNS docs say this should be deprecated for rdatastr() or char_str_list(),
 ## but don't really seem enthusiastic about it.
-        push @vallist, $rr->txtdata;
+        my $rrdata = $rr->txtdata;
+        if (length($rrdata) > 100 ) {
+          # extralong records get an entry in a separate table.
+          $dbh->do("INSERT INTO longrecs (recdata) VALUES (?)", undef, ($rrdata) );
+          my ($longid) = $dbh->selectrow_array("SELECT longrec_id FROM longrecs WHERE recdata=?", undef, ($rrdata) );
+          $sql .= ",longrec_id";
+          $vallen .= ",?";
+          push @vallist, '';
+          push @vallist, $longid;
+        } else {
+          push @vallist, $rrdata;
+        }
       } elsif ($type eq 'SPF') {
 ##fixme: and the same caveat here, since it is apparently a clone of ::TXT
-        push @vallist, $rr->txtdata;
+        my $rrdata = $rr->txtdata;
+        if (length($rrdata) > 100 ) {
+          # extralong records get an entry in a separate table.
+          $dbh->do("INSERT INTO longrecs (recdata) VALUES (?)", undef, ($rrdata) );
+          my ($longid) = $dbh->selectrow_array("SELECT longrec_id FROM longrecs WHERE recdata=?", undef, ($rrdata) );
+          $sql .= ",longrec_id";
+          $vallen .= ",?";
+          push @vallist, '';
+          push @vallist, $longid;
+        } else {
+          push @vallist, $rrdata;
+        }
       } elsif ($type eq 'AAAA') {
         push @vallist, $rr->address;
@@ -1444 +1469 @@
         push @vallist, ($rr->flags.":".$rr->protocol.":".$rr->algorithm.":".$rr->key.":".$rr->keytag.":".$rr->privatekeyname);
       } else {
-        push @vallist, $rr->rdatastr;
+        my $rrdata = $rr->rdatastr;
+        if (length($rrdata) > 100 ) {
+          # extralong records get an entry in a separate table.
+          $dbh->do("INSERT INTO longrecs (recdata) VALUES (?)", undef, ($rrdata) );
+          my ($longid) = $dbh->selectrow_array("SELECT longrec_id FROM longrecs WHERE recdata=?", undef, ($rrdata) );
+          $sql .= ",longrec_id";
+          $vallen .= ",?";
+          push @vallist, '';
+          push @vallist, $longid;
+        } else {
+          push @vallist, $rrdata;
+        }
         # Finding a different record type is not fatal.... just problematic.
         # We may not be able to export it correctly.