- unbound-checkconf -o allows query of dnstap config variables.

  Also unbound-control get_option.

git-svn-id: file:///svn/unbound/trunk@4129 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index b107b8429500bfd4536c6e01979f8f9f9fdcabdb..1265d7ccd86f56a45188666e0972e330b29ce4d1 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+24 April 2017: Wouter
+       - unbound-checkconf -o allows query of dnstap config variables.
+         Also unbound-control get_option.
+
 21 April 2017: Ralph
        - Fix #1254: clarify ratelimit-{for,below}-domain (from Manu Bretelle).
        - iana portlist update
@@ -251,7 +255,7 @@
        - Fix #1184: Log DNS replies. This includes the same logging
          information that DNS queries and response code and response size,
          patch from Larissa Feng.
-       - Fix #1185: Source IP rate limiting, patch from Larissa Feng.
+       - Fix #1187: Source IP rate limiting, patch from Larissa Feng.
 
 3 January 2017: Wouter
        - configure --enable-systemd and lets unbound use systemd sockets if

diff --git a/util/config_file.c b/util/config_file.c
index af176929dc35280a5b38c4ce197fdc7030bf20b6..3b356e1ee668b00c4d02f367c119edb1bece61b8 100644 (file)
--- a/util/config_file.c
+++ b/util/config_file.c
@@ -522,6 +522,26 @@ int config_set_option(struct config_file* cfg, const char* opt,
         * generating the address tree. */
        /* No client-subnet-always-forward here, module registration depends on
         * this option. */
+#endif
+#ifdef USE_DNSTAP
+       else S_YNO("dnstap-enable:", dnstap)
+       else S_STR("dnstap-socket-path:", dnstap_socket_path)
+       else S_YNO("dnstap-send-identity:", dnstap_send_identity)
+       else S_YNO("dnstap-send-version:", dnstap_send_version)
+       else S_STR("dnstap-identity:", dnstap_identity)
+       else S_STR("dnstap-version:", dnstap_version)
+       else S_YNO("dnstap-log-resolver-query-messages:",
+               dnstap_log_resolver_query_messages)
+       else S_YNO("dnstap-log-resolver-response-messages:",
+               dnstap_log_resolver_response_messages)
+       else S_YNO("dnstap-log-client-query-messages:",
+               dnstap_log_client_query_messages)
+       else S_YNO("dnstap-log-client-response-messages:",
+               dnstap_log_client_response_messages)
+       else S_YNO("dnstap-log-forwarder-query-messages:",
+               dnstap_log_forwarder_query_messages)
+       else S_YNO("dnstap-log-forwarder-response-messages:",
+               dnstap_log_forwarder_response_messages)
 #endif
        else if(strcmp(opt, "ip-ratelimit:") == 0) {
            IS_NUMBER_OR_ZERO; cfg->ip_ratelimit = atoi(val);
@@ -846,6 +866,26 @@ config_get_option(struct config_file* cfg, const char* opt,
        else O_DEC(opt, "max-client-subnet-ipv6", max_client_subnet_ipv6)
        else O_YNO(opt, "client-subnet-always-forward:",
                client_subnet_always_forward)
+#endif
+#ifdef USE_DNSTAP
+       else O_YNO(opt, "dnstap-enable", dnstap)
+       else O_STR(opt, "dnstap-socket-path", dnstap_socket_path)
+       else O_YNO(opt, "dnstap-send-identity", dnstap_send_identity)
+       else O_YNO(opt, "dnstap-send-version", dnstap_send_version)
+       else O_STR(opt, "dnstap-identity", dnstap_identity)
+       else O_STR(opt, "dnstap-version", dnstap_version)
+       else O_YNO(opt, "dnstap-log-resolver-query-messages",
+               dnstap_log_resolver_query_messages)
+       else O_YNO(opt, "dnstap-log-resolver-response-messages",
+               dnstap_log_resolver_response_messages)
+       else O_YNO(opt, "dnstap-log-client-query-messages",
+               dnstap_log_client_query_messages)
+       else O_YNO(opt, "dnstap-log-client-response-messages",
+               dnstap_log_client_response_messages)
+       else O_YNO(opt, "dnstap-log-forwarder-query-messages",
+               dnstap_log_forwarder_query_messages)
+       else O_YNO(opt, "dnstap-log-forwarder-response-messages",
+               dnstap_log_forwarder_response_messages)
 #endif
        else O_YNO(opt, "unblock-lan-zones", unblock_lan_zones)
        else O_YNO(opt, "insecure-lan-zones", insecure_lan_zones)