Move NSID logging to its own category

It is very verbose, so it is useful to be able to filter it out.

diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index ebda5e5690ae7ed394f640abee59d79208831afe..4f428a45e10af52ab27a0701f8cc712347d75534 100644 (file)
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -6052,7 +6052,7 @@ options {
                  queries to authoritative name servers during iterative
                  resolution. If the authoritative server returns an NSID
                  option in its response, then its contents are logged in
-                 the <command>resolver</command> category at level
+                 the <command>nsid</command> category at level
                  <command>info</command>.
                  The default is <userinput>no</userinput>.
                </para>

diff --git a/doc/arm/logging-categories.xml b/doc/arm/logging-categories.xml
index 9d3856d4448f4fa490c8bb045fa7b7b715239a3e..25914633ab3afeddcddfd5dd0fd49255dfcf79ab 100644 (file)
--- a/doc/arm/logging-categories.xml
+++ b/doc/arm/logging-categories.xml
@@ -193,6 +193,16 @@
          </para>
        </entry>
       </row>
+      <row rowsep="0">
+       <entry colname="1">
+         <para><command>nsid</command></para>
+       </entry>
+       <entry colname="2">
+         <para>
+           NSID options received from upstream servers.
+         </para>
+       </entry>
+      </row>
       <row rowsep="0">
        <entry colname="1">
          <para><command>queries</command></para>

diff --git a/lib/dns/include/dns/log.h b/lib/dns/include/dns/log.h
index 6f4d557a71b61ae23d08431441bea0aa626de9c6..712cdfdff6f25d96179553fb5da73afecd2aaea5 100644 (file)
--- a/lib/dns/include/dns/log.h
+++ b/lib/dns/include/dns/log.h
@@ -40,6 +40,7 @@ LIBDNS_EXTERNAL_DATA extern isc_logmodule_t dns_modules[];
 #define DNS_LOGCATEGORY_SPILL          (&dns_categories[15])
 #define DNS_LOGCATEGORY_DNSTAP         (&dns_categories[16])
 #define DNS_LOGCATEGORY_ZONELOAD       (&dns_categories[17])
+#define DNS_LOGCATEGORY_NSID           (&dns_categories[18])
 
 /* Backwards compatibility. */
 #define DNS_LOGCATEGORY_GENERAL                ISC_LOGCATEGORY_GENERAL

diff --git a/lib/dns/log.c b/lib/dns/log.c
index f1d78d702706d88be2fb242eb7ba6518ae19571c..aaa281fc78d1814efeb7165146bfbf0f120fe9d1 100644 (file)
--- a/lib/dns/log.c
+++ b/lib/dns/log.c
@@ -40,6 +40,7 @@ LIBDNS_EXTERNAL_DATA isc_logcategory_t dns_categories[] = {
        { "spill",      0 },
        { "dnstap",     0 },
        { "zoneload",   0 },
+       { "nsid",       0 },
        { NULL,         0 }
 };
 

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 3c11ff2ee19c26b902b762684c2fd1a543409d20..3b18f41254b3cea271cbd61c0e212cac8deac2e5 100644 (file)
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -6964,7 +6964,7 @@ log_nsid(isc_buffer_t *opt, size_t nsid_len, resquery_t *query,
 
        isc_sockaddr_format(&query->addrinfo->sockaddr, addrbuf,
                            sizeof(addrbuf));
-       isc_log_write(dns_lctx, DNS_LOGCATEGORY_RESOLVER,
+       isc_log_write(dns_lctx, DNS_LOGCATEGORY_NSID,
                      DNS_LOGMODULE_RESOLVER, level,
                      "received NSID %s (\"%s\") from %s", buf, pbuf, addrbuf);
  cleanup: