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

Revert "xtransport layer to netip and immediate dependencies (#2159)" 

This reverts commit baee50f1dc.
This commit is contained in:
Frank Denis 2022-08-10 22:24:36 +02:00
parent e124623ffc
commit 937c1e63e2
3 changed files with 27 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dnscrypt-proxy/config.go
View File

@ -931,7 +931,7 @@ func cdLocal() {
func isIPAndPort(addrStr string) error {
host, port := ExtractHostAndPort(addrStr, -1)
if _, err := ParseIP(host); err != nil {
if ip := ParseIP(host); ip == nil {
return fmt.Errorf("Host does not parse as IP '%s'", addrStr)
} else if port == -1 {
return fmt.Errorf("Port missing '%s'", addrStr)

6
dnscrypt-proxy/serversInfo.go
View File

@ -260,7 +260,7 @@ func (serversInfo *ServersInfo) estimatorUpdate(currentActive int) {
if activeCount == serversCount {
return
}
candidate := rand.Intn(serversCount-activeCount) + activeCount
candidate := rand.Intn(serversCount-activeCount)+activeCount
candidateRtt, currentActiveRtt := serversInfo.inner[candidate].rtt.Value(), serversInfo.inner[currentActive].rtt.Value()
if currentActiveRtt < 0 {
currentActiveRtt = candidateRtt
@ -529,7 +529,7 @@ func route(proxy *Proxy, name string, serverProto stamps.StampProtoType) (*Relay
}
if len(relayCandidateStamp.ServerAddrStr) > 0 {
ipOnly, _ := ExtractHostAndPort(relayCandidateStamp.ServerAddrStr, -1)
if ip, err := ParseIP(ipOnly); err != nil {
if ip := ParseIP(ipOnly); ip != nil {
host, _ := ExtractHostAndPort(relayCandidateStamp.ProviderName, -1)
proxy.xTransport.saveCachedIP(host, ip, -1*time.Second)
}
@ -665,7 +665,7 @@ func fetchDoHServerInfo(proxy *Proxy, name string, stamp stamps.ServerStamp, isN
// in order to fingerprint clients across multiple IP addresses.
if len(stamp.ServerAddrStr) > 0 {
ipOnly, _ := ExtractHostAndPort(stamp.ServerAddrStr, -1)
if ip, err := ParseIP(ipOnly); err != nil {
if ip := ParseIP(ipOnly); ip != nil {
host, _ := ExtractHostAndPort(stamp.ProviderName, -1)
proxy.xTransport.saveCachedIP(host, ip, -1*time.Second)
}

49
dnscrypt-proxy/xtransport.go
View File

@ -14,7 +14,6 @@ import (
"math/rand"
"net"
"net/http"
"net/netip"
"net/url"
"strconv"
"strings"
@ -39,7 +38,7 @@ const (
)
type CachedIPItem struct {
ip netip.Addr
ip net.IP
expiration *time.Time
}
@ -93,13 +92,13 @@ func NewXTransport() *XTransport {
return &xTransport
}
func ParseIP(ipStr string) (netip.Addr, error) {
return netip.ParseAddr(strings.TrimRight(strings.TrimLeft(ipStr, "["), "]"))
func ParseIP(ipStr string) net.IP {
return net.ParseIP(strings.TrimRight(strings.TrimLeft(ipStr, "["), "]"))
}
// If ttl < 0, never expire
// Otherwise, ttl is set to max(ttl, MinResolverIPTTL)
func (xTransport *XTransport) saveCachedIP(host string, ip netip.Addr, ttl time.Duration) {
func (xTransport *XTransport) saveCachedIP(host string, ip net.IP, ttl time.Duration) {
item := &CachedIPItem{ip: ip, expiration: nil}
if ttl >= 0 {
if ttl < MinResolverIPTTL {
@ -113,8 +112,8 @@ func (xTransport *XTransport) saveCachedIP(host string, ip netip.Addr, ttl time.
xTransport.cachedIPs.Unlock()
}
func (xTransport *XTransport) loadCachedIP(host string) (ip netip.Addr, expired bool) {
ip, expired = netip.IPv4Unspecified(), false
func (xTransport *XTransport) loadCachedIP(host string) (ip net.IP, expired bool) {
ip, expired = nil, false
xTransport.cachedIPs.RLock()
item, ok := xTransport.cachedIPs.cache[host]
xTransport.cachedIPs.RUnlock()
@ -149,9 +148,9 @@ func (xTransport *XTransport) rebuildTransport() {
// resolveAndUpdateCache() is always called in `Fetch()` before the `Dial()`
// method is used, so that a cached entry must be present at this point.
cachedIP, _ := xTransport.loadCachedIP(host)
if cachedIP != netip.IPv4Unspecified() {
if cachedIP.Is4() {
ipOnly = cachedIP.String()
if cachedIP != nil {
if ipv4 := cachedIP.To4(); ipv4 != nil {
ipOnly = ipv4.String()
} else {
ipOnly = "[" + cachedIP.String() + "]"
}
@ -229,23 +228,23 @@ func (xTransport *XTransport) rebuildTransport() {
}
}
func (xTransport *XTransport) resolveUsingSystem(host string) (ip netip.Addr, ttl time.Duration, err error) {
func (xTransport *XTransport) resolveUsingSystem(host string) (ip net.IP, ttl time.Duration, err error) {
ttl = SystemResolverIPTTL
var foundIPs []string
foundIPs, err = net.LookupHost(host)
if err != nil {
return
}
ips := make([]netip.Addr, 0)
ips := make([]net.IP, 0)
for _, ip := range foundIPs {
if foundIP, err := netip.ParseAddr(ip); err == nil {
if foundIP := net.ParseIP(ip); foundIP != nil {
if xTransport.useIPv4 {
if foundIP.Is4() {
if ipv4 := foundIP.To4(); ipv4 != nil {
ips = append(ips, foundIP)
}
}
if xTransport.useIPv6 {
if foundIP.Is6() || foundIP.Is4In6() {
if ipv6 := foundIP.To16(); ipv6 != nil {
ips = append(ips, foundIP)
}
}
@ -260,7 +259,7 @@ func (xTransport *XTransport) resolveUsingSystem(host string) (ip netip.Addr, tt
func (xTransport *XTransport) resolveUsingResolver(
proto, host string,
resolver string,
) (ip netip.Addr, ttl time.Duration, err error) {
) (ip net.IP, ttl time.Duration, err error) {
dnsClient := dns.Client{Net: proto}
if xTransport.useIPv4 {
msg := dns.Msg{}
@ -276,7 +275,7 @@ func (xTransport *XTransport) resolveUsingResolver(
}
if len(answers) > 0 {
answer := answers[rand.Intn(len(answers))]
ip, _ = netip.ParseAddr(answer.(*dns.A).A.String())
ip = answer.(*dns.A).A
ttl = time.Duration(answer.Header().Ttl) * time.Second
return
}
@ -296,7 +295,7 @@ func (xTransport *XTransport) resolveUsingResolver(
}
if len(answers) > 0 {
answer := answers[rand.Intn(len(answers))]
ip, _ = netip.ParseAddr(answer.(*dns.AAAA).AAAA.String())
ip = answer.(*dns.AAAA).AAAA
ttl = time.Duration(answer.Header().Ttl) * time.Second
return
}
@ -308,7 +307,7 @@ func (xTransport *XTransport) resolveUsingResolver(
func (xTransport *XTransport) resolveUsingResolvers(
proto, host string,
resolvers []string,
) (ip netip.Addr, ttl time.Duration, err error) {
) (ip net.IP, ttl time.Duration, err error) {
for i, resolver := range resolvers {
ip, ttl, err = xTransport.resolveUsingResolver(proto, host, resolver)
if err == nil {
@ -328,18 +327,16 @@ func (xTransport *XTransport) resolveAndUpdateCache(host string) error {
if xTransport.proxyDialer != nil || xTransport.httpProxyFunction != nil {
return nil
}
_, err := ParseIP(host)
if err != nil {
if ParseIP(host) != nil {
return nil
}
cachedIP, expired := xTransport.loadCachedIP(host)
if cachedIP != netip.IPv4Unspecified() && !expired {
if cachedIP != nil && !expired {
return nil
}
var foundIP netip.Addr
var foundIP net.IP
var ttl time.Duration
var err error
if !xTransport.ignoreSystemDNS {
foundIP, ttl, err = xTransport.resolveUsingSystem(host)
}
@ -372,7 +369,7 @@ func (xTransport *XTransport) resolveAndUpdateCache(host string) error {
ttl = MinResolverIPTTL
}
if err != nil {
if cachedIP != netip.IPv4Unspecified() {
if cachedIP != nil {
dlog.Noticef("Using stale [%v] cached address for a grace period", host)
foundIP = cachedIP
ttl = ExpiredCachedIPGraceTTL