Move zonediff_t to lib/dns/zone_p.h

Rename zonediff_t to dns__zonediff_t and move it to lib/dns/zone_p.h, so
that unit tests can be written for functions taking pointers to
structures of this type as arguments.

(cherry picked from commit ace465a9f924ca445eb31c925abde864a4f2adea)
(cherry picked from commit ea15c54d8a0e91ffae75f8ab2c4f244ba70665c1)
(cherry picked from commit 5712d9528f59f1383ef5b229e99172193ef57719)
(cherry picked from commit 5f0b4eaf7081092678d5371bfdadf724d2457ffe)

diff --git a/lib/dns/tests/dnstest.c b/lib/dns/tests/dnstest.c
index 67f213e46f41808252c17b14e3f594b3f2aa855a..28675913a4cc0429abef64d50f2a5f12637a2296 100644 (file)
--- a/lib/dns/tests/dnstest.c
+++ b/lib/dns/tests/dnstest.c
@@ -42,6 +42,7 @@
 #include <dns/fixedname.h>
 #include <dns/log.h>
 #include <dns/name.h>
+#include <dns/rdatatype.h>
 #include <dns/result.h>
 #include <dns/view.h>
 #include <dns/zone.h>
@@ -481,7 +482,8 @@ dns_test_difffromchanges(dns_diff_t *diff, const zonechange_t *changes) {
                /*
                 * Parse owner name.
                 */
-               name = dns_fixedname_initname(&fixedname);
+               dns_fixedname_init(&fixedname);
+               name = dns_fixedname_name(&fixedname);
                result = dns_name_fromstring(name, changes[i].owner, 0, mctx);
                if (result != ISC_R_SUCCESS) {
                        break;

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index e7df1e202713cf1438582222875f4a802200e9dc..b170b3f518ab000e395cfe944349ee2150c6a0b0 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -403,14 +403,9 @@ struct dns_zone {
        dns_update_state_t      *rss_state;
 };
 
-typedef struct {
-       dns_diff_t      *diff;
-       isc_boolean_t   offline;
-} zonediff_t;
-
 #define zonediff_init(z, d) \
        do { \
-               zonediff_t *_z = (z); \
+               dns__zonediff_t *_z = (z); \
                (_z)->diff = (d); \
                (_z)->offline = ISC_FALSE; \
        } while (0)
@@ -5501,7 +5496,7 @@ find_zone_keys(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver,
 }
 
 static isc_result_t
-offline(dns_db_t *db, dns_dbversion_t *ver, zonediff_t *zonediff,
+offline(dns_db_t *db, dns_dbversion_t *ver, dns__zonediff_t *zonediff,
        dns_name_t *name, dns_ttl_t ttl, dns_rdata_t *rdata)
 {
        isc_result_t result;
@@ -5610,7 +5605,7 @@ delsig_ok(dns_rdata_rrsig_t *rrsig_ptr, dst_key_t **keys, unsigned int nkeys,
  */
 static isc_result_t
 del_sigs(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver, dns_name_t *name,
-        dns_rdatatype_t type, zonediff_t *zonediff, dst_key_t **keys,
+        dns_rdatatype_t type, dns__zonediff_t *zonediff, dst_key_t **keys,
         unsigned int nkeys, isc_stdtime_t now, isc_boolean_t incremental)
 {
        isc_result_t result;
@@ -5895,7 +5890,7 @@ zone_resigninc(dns_zone_t *zone) {
        dns_db_t *db = NULL;
        dns_dbversion_t *version = NULL;
        dns_diff_t _sig_diff;
-       zonediff_t zonediff;
+       dns__zonediff_t zonediff;
        dns_fixedname_t fixed;
        dns_name_t *name;
        dns_rdataset_t rdataset;
@@ -6775,7 +6770,7 @@ update_sigs(dns_diff_t *diff, dns_db_t *db, dns_dbversion_t *version,
            dst_key_t *zone_keys[], unsigned int nkeys, dns_zone_t *zone,
            isc_stdtime_t inception, isc_stdtime_t expire, isc_stdtime_t now,
            isc_boolean_t check_ksk, isc_boolean_t keyset_kskonly,
-           zonediff_t *zonediff)
+           dns__zonediff_t *zonediff)
 {
        dns_difftuple_t *tuple;
        isc_result_t result;
@@ -6832,7 +6827,7 @@ zone_nsec3chain(dns_zone_t *zone) {
        dns_diff_t nsec_diff;
        dns_diff_t nsec3_diff;
        dns_diff_t param_diff;
-       zonediff_t zonediff;
+       dns__zonediff_t zonediff;
        dns_fixedname_t fixed;
        dns_fixedname_t nextfixed;
        dns_name_t *name, *nextname;
@@ -7731,7 +7726,7 @@ zone_sign(dns_zone_t *zone) {
        dns_dbversion_t *version = NULL;
        dns_diff_t _sig_diff;
        dns_diff_t post_diff;
-       zonediff_t zonediff;
+       dns__zonediff_t zonediff;
        dns_fixedname_t fixed;
        dns_fixedname_t nextfixed;
        dns_name_t *name, *nextname;
@@ -16775,7 +16770,7 @@ add_signing_records(dns_db_t *db, dns_rdatatype_t privatetype,
 
 static isc_result_t
 sign_apex(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *ver,
-         dns_diff_t *diff, zonediff_t *zonediff)
+         dns_diff_t *diff, dns__zonediff_t *zonediff)
 {
        isc_result_t result;
        isc_stdtime_t now, inception, soaexpire;
@@ -16995,7 +16990,7 @@ zone_rekey(dns_zone_t *zone) {
        dns_dnsseckeylist_t dnskeys, keys, rmkeys;
        dns_dnsseckey_t *key;
        dns_diff_t diff, _sig_diff;
-       zonediff_t zonediff;
+       dns__zonediff_t zonediff;
        isc_boolean_t commit = ISC_FALSE, newactive = ISC_FALSE;
        isc_boolean_t newalg = ISC_FALSE;
        isc_boolean_t fullsign;

diff --git a/lib/dns/zone_p.h b/lib/dns/zone_p.h
index 24329b0e490eb0bea23b68c52d40533493af5ded..3ef05e023ce2fd82078203a3f6a2077361b1c2f1 100644 (file)
--- a/lib/dns/zone_p.h
+++ b/lib/dns/zone_p.h
@@ -21,6 +21,11 @@
 
 ISC_LANG_BEGINDECLS
 
+typedef struct {
+       dns_diff_t      *diff;
+       isc_boolean_t   offline;
+} dns__zonediff_t;
+
 ISC_LANG_ENDDECLS
 
 #endif /* DNS_ZONE_P_H */