This commit is contained in:
Frank Denis 2021-01-03 16:22:23 +01:00
parent 00abe06676
commit fbd598f027
3 changed files with 6 additions and 6 deletions

View File

@ -26,7 +26,6 @@ jobs:
- name: Get the version - name: Get the version
id: get_version id: get_version
run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//} run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
- name: Set up Go 1.16beta1 - name: Set up Go 1.16beta1
uses: actions/setup-go@v1 uses: actions/setup-go@v1

View File

@ -9,7 +9,7 @@
- `dnscrypt-proxy -resolve` has been completely revamped, and now requires - `dnscrypt-proxy -resolve` has been completely revamped, and now requires
the configuration file to be accessible. It will send a query to an IP address the configuration file to be accessible. It will send a query to an IP address
of the `dnscrypt-proxy` server by default. Sending queries to arbitrary of the `dnscrypt-proxy` server by default. Sending queries to arbitrary
servers is also supported with the `-resolve name,address` syntax. servers is also supported with the new `-resolve name,address` syntax.
- Relay lists can be set to `*` for automatic relay selection. When a wildcard - Relay lists can be set to `*` for automatic relay selection. When a wildcard
is used, either for the list of servers or relays, the proxy ensures that is used, either for the list of servers or relays, the proxy ensures that
relays and servers are on distinct networks. relays and servers are on distinct networks.

View File

@ -268,16 +268,17 @@ func fetchServerInfo(proxy *Proxy, name string, stamp stamps.ServerStamp, isNew
} }
func findFarthestRoute(proxy *Proxy, name string, relayStamps []stamps.ServerStamp) *stamps.ServerStamp { func findFarthestRoute(proxy *Proxy, name string, relayStamps []stamps.ServerStamp) *stamps.ServerStamp {
var server *RegisteredServer serverIdx := -1
for _, registeredServer := range proxy.registeredServers { for i, registeredServer := range proxy.registeredServers {
if registeredServer.name == name { if registeredServer.name == name {
server = &registeredServer serverIdx = i
break break
} }
} }
if server == nil { if serverIdx < 0 {
return nil return nil
} }
server := proxy.registeredServers[serverIdx]
serverAddrStr, _ := ExtractHostAndPort(server.stamp.ServerAddrStr, 443) serverAddrStr, _ := ExtractHostAndPort(server.stamp.ServerAddrStr, 443)
serverAddr := net.ParseIP(serverAddrStr) serverAddr := net.ParseIP(serverAddrStr)
if serverAddr == nil { if serverAddr == nil {