2744. [func] Log if a query was over TCP. [RT #19961]

diff --git a/CHANGES b/CHANGES
index 07cb1231e0dd62276d58453ebd29609f243d1a16..9b218c20ddd495c1d3573302eb6d7ac59660e08b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+2744.  [func]          Log if a query was over TCP. [RT #19961]
+
 2743.  [bug]           RRSIG could be incorrectly set in the NSEC3 record
                        for a insecure delegation.
 

diff --git a/bin/named/query.c b/bin/named/query.c
index d24b2f85eda4471767f270f0a45217bbe5c5879c..4d08c90da3cf3343537f71bdd62795f202038ca8 100644 (file)
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: query.c,v 1.330 2009/10/26 23:47:35 tbox Exp $ */
+/* $Id: query.c,v 1.331 2009/11/03 04:39:41 marka Exp $ */
 
 /*! \file */
 
@@ -5073,10 +5073,12 @@ log_query(ns_client_t *client, unsigned int flags, unsigned int extflags) {
        isc_netaddr_format(&client->destaddr, onbuf, sizeof(onbuf));
 
        ns_client_log(client, NS_LOGCATEGORY_QUERIES, NS_LOGMODULE_QUERY,
-                     level, "query: %s %s %s %s%s%s%s%s (%s)", namebuf,
+                     level, "query: %s %s %s %s%s%s%s%s%s (%s)", namebuf,
                      classname, typename, WANTRECURSION(client) ? "+" : "-",
                      (client->signer != NULL) ? "S": "",
                      (client->opt != NULL) ? "E" : "",
+                     ((client->attributes & NS_CLIENTATTR_TCP) != 0) ?
+                                "T" : "",
                      ((extflags & DNS_MESSAGEEXTFLAG_DO) != 0) ? "D" : "",
                      ((flags & DNS_MESSAGEFLAG_CD) != 0) ? "C" : "",
                      onbuf);

diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index 9ea53bccd9211c1eaa7a2289c10aaad4f6aa4cf8..81665e8e7b3f221f4c10fc49a42dc94584201396 100644 (file)
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -18,7 +18,7 @@
  - PERFORMANCE OF THIS SOFTWARE.
 -->
 
-<!-- File: $Id: Bv9ARM-book.xml,v 1.440 2009/10/26 23:14:53 each Exp $ -->
+<!-- File: $Id: Bv9ARM-book.xml,v 1.441 2009/11/03 04:39:41 marka Exp $ -->
 <book xmlns:xi="http://www.w3.org/2001/XInclude">
   <title>BIND 9 Administrator Reference Manual</title>
 
@@ -4411,10 +4411,11 @@ category notify { null; };
                      class and type.  Next it reports whether the
                      Recursion Desired flag was set (+ if set, -
                      if not set), if the query was signed (S),
-                     EDNS was in use (E), if DO (DNSSEC Ok) was
-                     set (D), or if CD (Checking Disabled) was set
-                     (C).  After this the destination address the
-                     query was sent to is reported.
+                     EDNS was in use (E), if TCP was used (T), if
+                     DO (DNSSEC Ok) was set (D), or if CD (Checking
+                     Disabled) was set (C).  After this the
+                     destination address the query was sent to is
+                     reported.
                    </para>
 
                     <para>