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

Localize some error values

This commit is contained in:
Frank Denis 2020-03-13 18:44:30 +01:00
parent 26ebb55c8c
commit 49910d2f72
6 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dnscrypt-proxy/config.go
View File

@ -743,7 +743,7 @@ func cdLocal() {
exeFileName, err := os.Executable()
if err != nil {
dlog.Warnf("Unable to determine the executable directory: [%s] -- You will need to specify absolute paths in the configuration file", err)
} else if err = os.Chdir(filepath.Dir(exeFileName)); err != nil {
} else if err := os.Chdir(filepath.Dir(exeFileName)); err != nil {
dlog.Warnf("Unable to change working directory to [%s]: %s", exeFileName, err)
}
}

8
dnscrypt-proxy/dnscrypt_certs.go
View File

@ -226,10 +226,10 @@ func _dnsExchange(proxy *Proxy, proto string, query *dns.Msg, serverAddress stri
return nil, 0, err
}
defer pc.Close()
if err = pc.SetDeadline(time.Now().Add(proxy.timeout)); err != nil {
if err := pc.SetDeadline(time.Now().Add(proxy.timeout)); err != nil {
return nil, 0, err
}
if _, err = pc.Write(binQuery); err != nil {
if _, err := pc.Write(binQuery); err != nil {
return nil, 0, err
}
packet = make([]byte, MaxDNSPacketSize)
@ -265,14 +265,14 @@ func _dnsExchange(proxy *Proxy, proto string, query *dns.Msg, serverAddress stri
return nil, 0, err
}
defer pc.Close()
if err = pc.SetDeadline(time.Now().Add(proxy.timeout)); err != nil {
if err := pc.SetDeadline(time.Now().Add(proxy.timeout)); err != nil {
return nil, 0, err
}
binQuery, err = PrefixWithSize(binQuery)
if err != nil {
return nil, 0, err
}
if _, err = pc.Write(binQuery); err != nil {
if _, err := pc.Write(binQuery); err != nil {
return nil, 0, err
}
packet, err = ReadPrefixed(&pc)

2
dnscrypt-proxy/main.go
View File

@ -102,7 +102,7 @@ func main() {
return
}
if svc != nil {
if err = svc.Run(); err != nil {
if err := svc.Run(); err != nil {
dlog.Fatal(err)
}
} else {

2
dnscrypt-proxy/plugin_cloak.go
View File

@ -84,7 +84,7 @@ func (plugin *PluginCloak) Init(proxy *Proxy) error {
cloakedNames[line] = cloakedName
}
for line, cloakedName := range cloakedNames {
if err = plugin.patternMatcher.Add(line, cloakedName, cloakedName.lineNo); err != nil {
if err := plugin.patternMatcher.Add(line, cloakedName, cloakedName.lineNo); err != nil {
return err
}
}

10
dnscrypt-proxy/proxy.go
View File

@ -299,7 +299,7 @@ func (proxy *Proxy) tcpListener(acceptPc *net.TCPListener) {
return
}
defer proxy.clientsCountDec()
if err = clientPc.SetDeadline(time.Now().Add(proxy.timeout)); err != nil {
if err := clientPc.SetDeadline(time.Now().Add(proxy.timeout)); err != nil {
return
}
packet, err := ReadPrefixed(&clientPc)
@ -359,7 +359,7 @@ func (proxy *Proxy) exchangeWithUDPServer(serverInfo *ServerInfo, sharedKey *[32
return nil, err
}
defer pc.Close()
if err = pc.SetDeadline(time.Now().Add(serverInfo.Timeout)); err != nil {
if err := pc.SetDeadline(time.Now().Add(serverInfo.Timeout)); err != nil {
return nil, err
}
if serverInfo.RelayUDPAddr != nil {
@ -367,7 +367,7 @@ func (proxy *Proxy) exchangeWithUDPServer(serverInfo *ServerInfo, sharedKey *[32
}
encryptedResponse := make([]byte, MaxDNSPacketSize)
for tries := 2; tries > 0; tries-- {
if _, err = pc.Write(encryptedQuery); err != nil {
if _, err := pc.Write(encryptedQuery); err != nil {
return nil, err
}
length, err := pc.Read(encryptedResponse)
@ -397,7 +397,7 @@ func (proxy *Proxy) exchangeWithTCPServer(serverInfo *ServerInfo, sharedKey *[32
return nil, err
}
defer pc.Close()
if err = pc.SetDeadline(time.Now().Add(serverInfo.Timeout)); err != nil {
if err := pc.SetDeadline(time.Now().Add(serverInfo.Timeout)); err != nil {
return nil, err
}
if serverInfo.RelayTCPAddr != nil {
@ -407,7 +407,7 @@ func (proxy *Proxy) exchangeWithTCPServer(serverInfo *ServerInfo, sharedKey *[32
if err != nil {
return nil, err
}
if _, err = pc.Write(encryptedQuery); err != nil {
if _, err := pc.Write(encryptedQuery); err != nil {
return nil, err
}
encryptedResponse, err := ReadPrefixed(&pc)

3
dnscrypt-proxy/sources.go
View File

@ -41,8 +41,7 @@ type Source struct {
}
func (source *Source) checkSignature(bin, sig []byte) (err error) {
var signature minisign.Signature
if signature, err = minisign.DecodeSignature(string(sig)); err == nil {
if signature, err := minisign.DecodeSignature(string(sig)); err == nil {
_, err = source.minisignKey.Verify(bin, signature)
}
return