update to 9.7.1-P2

[tridge/bind9.git] / lib / dns / include / dns / types.h

diff --git a/lib/dns/include/dns/types.h b/lib/dns/include/dns/types.h
index 37a2900f89823e16120c11e7cf68da3bd1fb7f5f..baf46cccd74dca61658229d97fa210f8cd387f60 100644 (file)
--- a/lib/dns/include/dns/types.h
+++ b/lib/dns/include/dns/types.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2010  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1998-2003  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: types.h,v 1.130.50.3.12.1 2009/11/18 23:58:04 marka Exp $ */
+/* $Id: types.h,v 1.138.16.3 2010/05/14 23:49:21 tbox Exp $ */
 
 #ifndef DNS_TYPES_H
 #define DNS_TYPES_H 1
@@ -44,6 +44,10 @@ typedef struct dns_adbentry                  dns_adbentry_t;
 typedef struct dns_adbfind                     dns_adbfind_t;
 typedef ISC_LIST(dns_adbfind_t)                        dns_adbfindlist_t;
 typedef struct dns_byaddr                      dns_byaddr_t;
+typedef struct dns_client                      dns_client_t;
+typedef void                                   dns_clientrestrans_t;
+typedef void                                   dns_clientreqtrans_t;
+typedef void                                   dns_clientupdatetrans_t;
 typedef struct dns_cache                       dns_cache_t;
 typedef isc_uint16_t                           dns_cert_t;
 typedef struct dns_compress                    dns_compress_t;
@@ -63,6 +67,8 @@ typedef struct dns_dispatchevent              dns_dispatchevent_t;
 typedef struct dns_dispatchlist                        dns_dispatchlist_t;
 typedef struct dns_dispatchmgr                 dns_dispatchmgr_t;
 typedef struct dns_dispentry                   dns_dispentry_t;
+typedef struct dns_dnsseckey                   dns_dnsseckey_t;
+typedef ISC_LIST(dns_dnsseckey_t)              dns_dnsseckeylist_t;
 typedef struct dns_dumpctx                     dns_dumpctx_t;
 typedef struct dns_fetch                       dns_fetch_t;
 typedef struct dns_fixedname                   dns_fixedname_t;
@@ -72,6 +78,7 @@ typedef struct dns_iptable                    dns_iptable_t;
 typedef isc_uint32_t                           dns_iterations_t;
 typedef isc_uint16_t                           dns_keyflags_t;
 typedef struct dns_keynode                     dns_keynode_t;
+typedef ISC_LIST(dns_keynode_t)                        dns_keynodelist_t;
 typedef struct dns_keytable                    dns_keytable_t;
 typedef isc_uint16_t                           dns_keytag_t;
 typedef struct dns_loadctx                     dns_loadctx_t;
@@ -111,6 +118,7 @@ typedef struct dns_stats                    dns_stats_t;
 typedef isc_uint32_t                           dns_rdatastatstype_t;
 typedef struct dns_tkeyctx                     dns_tkeyctx_t;
 typedef isc_uint16_t                           dns_trust_t;
+typedef struct dns_tsec                                dns_tsec_t;
 typedef struct dns_tsig_keyring                        dns_tsig_keyring_t;
 typedef struct dns_tsigkey                     dns_tsigkey_t;
 typedef isc_uint32_t                           dns_ttl_t;
@@ -179,6 +187,15 @@ typedef enum {
        dns_masterformat_raw = 2
 } dns_masterformat_t;
 
+#ifdef ALLOW_FILTER_AAAA_ON_V4
+typedef enum {
+       dns_v4_aaaa_ok = 0,
+       dns_v4_aaaa_filter = 1,
+       dns_v4_aaaa_break_dnssec = 2
+} dns_v4_aaaa_t;
+
+#endif
+
 /*
  * These are generated by gen.c.
  */
@@ -304,6 +321,7 @@ enum {
 #define DNS_TRUST_ADDITIONAL(x)                ((x) == dns_trust_additional || \
                                         (x) == dns_trust_pending_additional)
 #define DNS_TRUST_GLUE(x)              ((x) == dns_trust_glue)
+#define DNS_TRUST_ANSWER(x)            ((x) == dns_trust_answer)
 
 
 /*%