dnscrypt: descriptive err msgs

Author: ignoramous

intra/dnscrypt/certs.go

@@ -56,10 +56,10 @@ func fetchCurrentDNSCryptCert(proxy *DcMulti, serverName *string, pk ed25519.Pub
 	exit := proxy.exit
 
 	if exit == nil {
-		return certinfo{}, dnsx.ErrNoProxyProvider
+		return certinfo{}, log.EE("%v for %s", dnsx.ErrNoProxyProvider, serverAddress)
 	}
 	if len(pk) != ed25519.PublicKeySize {
-		return certinfo{}, errors.New("invalid public key length")
+		return certinfo{}, log.EE("invalid public key length for %s", serverAddress)
 	}
 	if !strings.HasSuffix(providerName, ".") {
 		providerName = providerName + "."
@@ -77,7 +77,7 @@ func fetchCurrentDNSCryptCert(proxy *DcMulti, serverName *string, pk ed25519.Pub
 	in, rtt, err := dnsExchange(exit.Dialer(), &query, serverAddress, serverName)
 	if err != nil || in == nil {
 		log.W("dnscrypt: [%s] TIMEOUT %v", *serverName, err)
-		return certinfo{}, core.OneErr(err, errFetchingCerts)
+		return certinfo{}, log.EE("%v for %s: %v", errFetchingCerts, serverAddress, err)
 	}
 	now := uint32(time.Now().Unix())
 	certInfo := certinfo{CryptoConstruction: xdns.UndefinedConstruction}
@@ -172,7 +172,7 @@ func fetchCurrentDNSCryptCert(proxy *DcMulti, serverName *string, pk ed25519.Pub
 		certCountStr = " - additional certificate"
 	}
 	if certInfo.CryptoConstruction == xdns.UndefinedConstruction {
-		return certInfo, errors.New("no useable cert found")
+		return certInfo, log.EE("no useable cert found for %s", serverAddress)
 	}
 	return certInfo, nil
 }

intra/dnscrypt/servers.go

@@ -201,17 +201,18 @@ func (serversInfo *ServersInfo) refreshServer(proxy *DcMulti, name string, stamp
 }
 
 func fetchServerInfo(proxy *DcMulti, name string, stamp stamps.ServerStamp) (serverinfo, error) {
-	if stamp.Proto == stamps.StampProtoTypeDNSCrypt {
+	switch stamp.Proto {
+	case stamps.StampProtoTypeDNSCrypt:
 		return fetchDNSCryptServerInfo(proxy, name, stamp)
-	} else if stamp.Proto == stamps.StampProtoTypeDoH {
+	case stamps.StampProtoTypeDoH:
 		return fetchDoHServerInfo(proxy, name, stamp)
 	}
-	return serverinfo{}, errors.New("unsupported protocol")
+	return serverinfo{}, log.EE("unsupported protocol for %s", stamp.ServerAddrStr)
 }
 
 func fetchDNSCryptServerInfo(proxy *DcMulti, name string, stamp stamps.ServerStamp) (serverinfo, error) {
 	if len(stamp.ServerPk) != ed25519.PublicKeySize {
-		serverPk, err := hex.DecodeString(strings.Replace(string(stamp.ServerPk), ":", "", -1))
+		serverPk, err := hex.DecodeString(strings.ReplaceAll(string(stamp.ServerPk), ":", ""))
 		if err != nil || len(serverPk) != ed25519.PublicKeySize {
 			return serverinfo{}, fmt.Errorf("unsupported public key for [%s]: [%s]", name, stamp.ServerPk)
 		}
@@ -235,7 +236,7 @@ func fetchDNSCryptServerInfo(proxy *DcMulti, name string, stamp stamps.ServerSta
 		return serverinfo{}, fmt.Errorf("dnscrypt: no ips for [%s]: %v", s, err)
 	}
 	if udpaddr == nil || tcpaddr == nil {
-		return serverinfo{}, errNoServers
+		return serverinfo{}, log.EE("%v for %s", errNoServers, stamp.ServerAddrStr)
 	}
 	px := proxy.proxies
 	var relay string