miracle091/dnscrypt-proxy
miracle091
/
dnscrypt-proxy
mirror of https://github.com/DNSCrypt/dnscrypt-proxy.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:DNSCrypt/dnscrypt-proxy 

* 'master' of github.com:DNSCrypt/dnscrypt-proxy:
  use global 'timeout' option for forwarding queries (#1284)
This commit is contained in:
Frank Denis 2020-04-18 21:18:53 +02:00
parent 2779d92f01 f71244ed74
commit dd522bb726
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dnscrypt-proxy/plugin_forward.go
View File

@ -93,7 +93,7 @@ func (plugin *PluginForward) Eval(pluginsState *PluginsState, msg *dns.Msg) erro
} }
server := servers[rand.Intn(len(servers))] server := servers[rand.Intn(len(servers))]
pluginsState.serverName = server pluginsState.serverName = server
client := dns.Client{Net: pluginsState.serverProto} client := dns.Client{Net: pluginsState.serverProto, Timeout: pluginsState.timeout}
respMsg, _, err := client.Exchange(msg, server) respMsg, _, err := client.Exchange(msg, server)
if err != nil { if err != nil {
return err return err

2
dnscrypt-proxy/plugins.go
View File

@ -87,6 +87,7 @@ type PluginsState struct {
returnCode PluginsReturnCode returnCode PluginsReturnCode
serverName string serverName string
serverProto string serverProto string
timeout time.Duration
} }
func (proxy *Proxy) InitPluginsGlobals() error { func (proxy *Proxy) InitPluginsGlobals() error {
@ -240,6 +241,7 @@ func NewPluginsState(proxy *Proxy, clientProto string, clientAddr *net.Addr, ser
qName: "", qName: "",
serverName: "-", serverName: "-",
serverProto: serverProto, serverProto: serverProto,
timeout: proxy.timeout,
requestStart: start, requestStart: start,
maxUnencryptedUDPSafePayloadSize: MaxDNSUDPSafePacketSize, maxUnencryptedUDPSafePayloadSize: MaxDNSUDPSafePacketSize,
sessionData: make(map[string]interface{}), sessionData: make(map[string]interface{}),