From: Remi Gacogne Date: Thu, 8 Dec 2016 09:09:28 +0000 (+0100) Subject: Merge pull request #4702 from rgacogne/dnsdist-udp-timeout X-Git-Tag: dnsdist-1.1.0-beta2~18 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f2e59f02b8d7bcd29b4019fecc5ae96d83a1d06a;p=pdns Merge pull request #4702 from rgacogne/dnsdist-udp-timeout dnsdist: Add `setUDPTimeout(n)` --- f2e59f02b8d7bcd29b4019fecc5ae96d83a1d06a diff --cc pdns/dnsdist-console.cc index 65221eebc,686d50de1..45052f08d --- a/pdns/dnsdist-console.cc +++ b/pdns/dnsdist-console.cc @@@ -339,9 -339,9 +339,10 @@@ const std::vector g_con { "setRules", true, "list of rules", "replace the current rules with the supplied list of pairs of DNS Rules and DNS Actions (see `newRuleAction()`)" }, { "setServerPolicy", true, "policy", "set server selection policy to that policy" }, { "setServerPolicyLua", true, "name, function", "set server selection policy to one named 'name' and provided by 'function'" }, + { "setServFailWhenNoServer", true, "bool", "if set, return a ServFail when no servers are available, instead of the default behaviour of dropping the query" }, { "setTCPRecvTimeout", true, "n", "set the read timeout on TCP connections from the client, in seconds" }, { "setTCPSendTimeout", true, "n", "set the write timeout on TCP connections from the client, in seconds" }, + { "setUDPTimeout", true, "n", "set the maximum time dnsdist will wait for a response from a backend over UDP, in seconds" }, { "setVerboseHealthChecks", true, "bool", "set whether health check errors will be logged" }, { "show", true, "string", "outputs `string`" }, { "showACL", true, "", "show our ACL set" }, diff --cc pdns/dnsdist.cc index 747bdcdfa,3aa2cac85..b0eaacfd9 --- a/pdns/dnsdist.cc +++ b/pdns/dnsdist.cc @@@ -133,8 -133,8 +133,9 @@@ GlobalStateHolder