hpz937/zurg
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Properly set transport

Browse Source
This commit is contained in:
Ben Sarmiento
2023-11-28 13:21:20 +01:00
parent 9f5e1a1ec5
commit ee766dba6a
1 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
pkg/http/client.go
View File

@@ -38,35 +38,34 @@ func (r *HTTPClient) Do(req *http.Request) (*http.Response, error) {
if r.config.ShouldForceIPv6() { if r.config.ShouldForceIPv6() {
dialer := &net.Dialer{} dialer := &net.Dialer{}
transport := &http.Transport{ transport := r.Client.Transport.(*http.Transport).Clone()
DialContext: func(ctx context.Context, network, addr string) (net.Conn, error) { transport.DialContext = func(ctx context.Context, network, addr string) (net.Conn, error) {
host, port, err := net.SplitHostPort(addr) host, port, err := net.SplitHostPort(addr)
if err != nil {
return nil, err
}
if ipv6, ok := r.IPv6.Get(host); !ok {
// Lookup IP address if not found in map
ips, err := net.LookupIP(host)
if err != nil { if err != nil {
return nil, err return nil, err
} }
if ipv6, ok := r.IPv6.Get(host); !ok { for _, ip := range ips {
// Lookup IP address if not found in map if ip.To4() == nil { // IPv6
ips, err := net.LookupIP(host) ipv6 = ip
if err != nil { r.IPv6.Set(host, ipv6)
return nil, err break
} }
for _, ip := range ips { }
if ip.To4() == nil { // IPv6 if ipv6 == nil { // No IPv6 address found, fallback to default
ipv6 = ip addr = net.JoinHostPort(host, port)
r.IPv6.Set(host, ipv6) } else {
break
}
}
if ipv6 == nil { // No IPv6 address found, fallback to default
addr = net.JoinHostPort(host, port)
} else {
addr = net.JoinHostPort(ipv6.String(), port)
}
} else if ipv6 != nil && host == req.URL.Hostname() {
addr = net.JoinHostPort(ipv6.String(), port) addr = net.JoinHostPort(ipv6.String(), port)
} }
return dialer.DialContext(ctx, network, addr) } else if ipv6 != nil && host == req.URL.Hostname() {
}, addr = net.JoinHostPort(ipv6.String(), port)
}
return dialer.DialContext(ctx, network, addr)
} }
r.Client.Transport = transport r.Client.Transport = transport
} }