From 2dc978b8a1563f6dd413a8a9456659ade00f9e9e Mon Sep 17 00:00:00 2001
From: Evan Hunt <each@isc.org>
Date: Sun, 13 Apr 2014 18:50:34 -0700
Subject: [PATCH] [master] fix "prefetch" doc

3808.	[doc]		Clean up "prefetch" documentation. [RT #35751]
---
 CHANGES                 |  2 ++
 doc/arm/Bv9ARM-book.xml | 34 +++++++++++++++++++---------------
 lib/dns/view.c          |  2 ++
 3 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/CHANGES b/CHANGES
index 93b8f440c5..abf6b17c24 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+3808.	[doc]		Clean up "prefetch" documentation. [RT #35751]
+
 3807.	[bug]		Fix sign extention bug in dns_name_fromtext when
 			lowercase is set. [RT #35743]
 
diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index 5a1fcb9b0c..443cef452f 100644
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -4953,6 +4953,8 @@ badresp:1,adberr:0,findfail:0,valfail:0]
     <optional> resolver-query-timeout <replaceable>number</replaceable> ; </optional>
     <optional> deny-answer-addresses { <replaceable>address_match_list</replaceable> } <optional> except-from { <replaceable>namelist</replaceable> } </optional>;</optional>
     <optional> deny-answer-aliases { <replaceable>namelist</replaceable> } <optional> except-from { <replaceable>namelist</replaceable> } </optional>;</optional>
+    <optional> prefetch <replaceable>number</replaceable> <optional><replaceable>number</replaceable></optional> ; </optional>
+
     <optional> rate-limit {
 	<optional> domain <replaceable>domain</replaceable> ; </optional>
 	<optional> responses-per-second <optional>size <replaceable>number</replaceable></optional> <optional>ratio <replaceable>fixedpoint</replaceable></optional> <replaceable>number</replaceable> ; </optional>
@@ -4970,13 +4972,18 @@ badresp:1,adberr:0,findfail:0,valfail:0]
 	<optional> exempt-clients  { <replaceable>address_match_list</replaceable> } ; </optional>
 	<optional> max-table-size <replaceable>number</replaceable> ; </optional>
 	<optional> min-table-size <replaceable>number</replaceable> ; </optional>
-      } ; </optional>
-    <optional> response-policy { <replaceable>zone_name</replaceable>
-	<optional> policy given | disabled | passthru | drop | nxdomain | nodata | cname <replaceable>domain</replaceable> </optional>
-	<optional> recursive-only <replaceable>yes_or_no</replaceable> </optional> <optional> max-policy-ttl <replaceable>number</replaceable> </optional> ;
-    } <optional> recursive-only <replaceable>yes_or_no</replaceable> </optional> <optional> max-policy-ttl <replaceable>number</replaceable> </optional>
-	<optional> break-dnssec <replaceable>yes_or_no</replaceable> </optional> <optional> min-ns-dots <replaceable>number</replaceable> </optional>
-	<optional> qname-wait-recurse <replaceable>yes_or_no</replaceable> </optional> ; </optional>
+    } ; </optional>
+    <optional> response-policy {
+	zone <replaceable>zone_name</replaceable> ;
+	<optional> policy <replaceable>given | disabled | passthru | drop | nxdomain | nodata | cname</replaceable> <replaceable>domain</replaceable> ; </optional>
+	<optional> recursive-only <replaceable>yes_or_no</replaceable> ; </optional>
+	<optional> max-policy-ttl <replaceable>number</replaceable> ; </optional> ;
+	<optional> recursive-only <replaceable>yes_or_no</replaceable> ; </optional>
+	<optional> max-policy-ttl <replaceable>number</replaceable> ; </optional>
+	<optional> break-dnssec <replaceable>yes_or_no</replaceable> ; </optional>
+	<optional> min-ns-dots <replaceable>number</replaceable> ; </optional>
+	<optional> qname-wait-recurse <replaceable>yes_or_no</replaceable> ; </optional>
+    } ; </optional>
 };
 </programlisting>
 
@@ -8946,8 +8953,9 @@ avoid-v6-udp-ports { 40000; range 50000 60000; };
 		  query will take place: when a cache record with a
 		  lower TTL value is encountered during query processing,
 		  it will be refreshed.  Valid trigger TTL values are 1 to
-		  10 seconds.  Setting a trigger TTL to zero disables
-		  prefetch.
+		  10 seconds.  Setting a trigger TTL to zero (0) causes
+		  prefetch to be disabled.
+		  The default trigger TTL is <literal>2</literal>.
 		</para>
 		<para>
 		  An optional second argument can be used
@@ -8955,12 +8963,8 @@ avoid-v6-udp-ports { 40000; range 50000 60000; };
 		  TTL value that will be accepted for a record to be
 		  eligible for prefetching.  The difference between
 		  the trigger TTL and the eligibility TTL must be
-		  at least 6 seconds.
-		</para>
-		<para>
-		  The default trigger and eligibility TTLs are
-		  <literal>2</literal> and <literal>9</literal>,
-		  respectively.
+		  at least 6 seconds.  
+		  The default eligibility TTL is <literal>9</literal>.
 		</para>
 	      </listitem>
 	    </varlistentry>
diff --git a/lib/dns/view.c b/lib/dns/view.c
index f0b323c651..c93a080747 100644
--- a/lib/dns/view.c
+++ b/lib/dns/view.c
@@ -190,6 +190,8 @@ dns_view_create(isc_mem_t *mctx, dns_rdataclass_t rdclass,
 	view->provideixfr = ISC_TRUE;
 	view->maxcachettl = 7 * 24 * 3600;
 	view->maxncachettl = 3 * 3600;
+	view->prefetch_eligible = 0;
+	view->prefetch_trigger = 0;
 	view->dstport = 53;
 	view->preferred_glue = 0;
 	view->flush = ISC_FALSE;