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

* 'master' of github.com:DNSCrypt/dnscrypt-proxy:
  Use DialTimeout if possible

Author: jedisct1

dnscrypt-proxy/dnsutils.go

@@ -449,7 +449,7 @@ func _dnsExchange(
 			upstreamAddr = relay.RelayUDPAddr
 		}
 		now := time.Now()
-		pc, err := net.DialUDP("udp", nil, upstreamAddr)
+		pc, err := net.DialTimeout("udp", upstreamAddr.String(), proxy.timeout)
 		if err != nil {
 			return DNSExchangeResponse{err: err}
 		}
@@ -485,7 +485,7 @@ func _dnsExchange(
 		var pc net.Conn
 		proxyDialer := proxy.xTransport.proxyDialer
 		if proxyDialer == nil {
-			pc, err = net.DialTCP("tcp", nil, upstreamAddr)
+			pc, err = net.DialTimeout("tcp", upstreamAddr.String(), proxy.timeout)
 		} else {
 			pc, err = (*proxyDialer).Dial("tcp", tcpAddr.String())
 		}

dnscrypt-proxy/netprobe_others.go

@@ -31,7 +31,7 @@ func NetProbe(proxy *Proxy, address string, timeout int) error {
 		timeout = Min(MaxTimeout, timeout)
 	}
 	for tries := timeout; tries > 0; tries-- {
-		pc, err := net.DialUDP("udp", nil, remoteUDPAddr)
+		pc, err := net.DialTimeout("udp", remoteUDPAddr.String(), proxy.timeout)
 		if err != nil {
 			if !retried {
 				retried = true

dnscrypt-proxy/netprobe_windows.go

@@ -29,7 +29,7 @@ func NetProbe(proxy *Proxy, address string, timeout int) error {
 		timeout = Min(MaxTimeout, timeout)
 	}
 	for tries := timeout; tries > 0; tries-- {
-		pc, err := net.DialUDP("udp", nil, remoteUDPAddr)
+		pc, err := net.DialTimeout("udp", remoteUDPAddr.String(), proxy.timeout)
 		if err == nil {
 			// Write at least 1 byte. This ensures that sockets are ready to use for writing.
 			// Windows specific: during the system startup, sockets can be created but the underlying buffers may not be