miracle091/dnscrypt-proxy
miracle091/dnscrypt-proxy
1
0
Fork 0
mirror of https://github.com/DNSCrypt/dnscrypt-proxy.git synced 2024-12-29 00:30:30 +01:00
Code Issues Releases Wiki Activity

Replace SERVER_ERROR with SERVFAIL

Browse Source 
If only because SERVFAIL can be looked up on Google
This commit is contained in:
Frank Denis 2019-11-17 22:20:47 +01:00
parent 1bcd09ca5a
commit 8728361e89
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -17,9 +17,9 @@ service if they temporarily can't be refreshed.
issue when initialization took more than 30 seconds ("The service did not
respond to the start or control request in a timely fashion"). Fantastic
work by Alison Winters, thanks!
- A new error code, NETWORK_ERROR, has been introduced in order to make
the distinction between network errors and servers responding with a SERVFAIL
error code.
- The `SERVER_ERROR` error code has been split into two new error code:
`NETWORK_ERROR` (self-explanatory) and `SERVFAIL` (a response was returned,
but it includes a `SERVFAIL` error code).
* Version 2.0.31
- This version fixes two regressions introduced in version 2.0.29:

6
dnscrypt-proxy/plugins.go
View File

@ -42,7 +42,7 @@ const (
PluginsReturnCodeParseError
PluginsReturnCodeNXDomain
PluginsReturnCodeResponseError
PluginsReturnCodeServerError
PluginsReturnCodeServFail
PluginsReturnCodeNetworkError
PluginsReturnCodeCloak
PluginsReturnCodeServerTimeout
@ -57,7 +57,7 @@ var PluginsReturnCodeToString = map[PluginsReturnCode]string{
PluginsReturnCodeParseError: "PARSE_ERROR",
PluginsReturnCodeNXDomain: "NXDOMAIN",
PluginsReturnCodeResponseError: "RESPONSE_ERROR",
PluginsReturnCodeServerError: "SERVER_ERROR",
PluginsReturnCodeServFail: "SERVFAIL",
PluginsReturnCodeNetworkError: "NETWORK_ERROR",
PluginsReturnCodeCloak: "CLOAK",
PluginsReturnCodeServerTimeout: "SERVER_TIMEOUT",
@ -285,7 +285,7 @@ func (pluginsState *PluginsState) ApplyResponsePlugins(pluginsGlobals *PluginsGl
case dns.RcodeNameError:
pluginsState.returnCode = PluginsReturnCodeNXDomain
case dns.RcodeServerFailure:
pluginsState.returnCode = PluginsReturnCodeServerError
pluginsState.returnCode = PluginsReturnCodeServFail
default:
pluginsState.returnCode = PluginsReturnCodeResponseError
}