Correct usage of ifconfig.co

This commit is contained in:
9seconds
2021-03-11 06:27:39 +03:00
parent d6566e5dfb
commit 6b9b437a5a
2 changed files with 53 additions and 27 deletions
+6 -11
View File
@@ -124,7 +124,7 @@ func (n *network) MakeHTTPClient(dialFunc DialFunc) *http.Client {
dialFunc = n.DialContext
}
return makeHTTPClient(n.userAgent, dialFunc)
return makeHTTPClient(n.userAgent, HTTPTimeout, dialFunc)
}
func NewNetwork(dialer Dialer, userAgent, dohHostname string, idleTimeout time.Duration) (Network, error) {
@@ -144,21 +144,16 @@ func NewNetwork(dialer Dialer, userAgent, dohHostname string, idleTimeout time.D
idleTimeout: idleTimeout,
userAgent: userAgent,
dns: doh.Resolver{
Host: dohHostname,
Class: doh.IN,
HTTPClient: &http.Client{
Timeout: DNSTimeout,
Transport: &http.Transport{
DialContext: dialer.DialContext,
},
},
Host: dohHostname,
Class: doh.IN,
HTTPClient: makeHTTPClient(userAgent, DNSTimeout, dialer.DialContext),
},
}, nil
}
func makeHTTPClient(userAgent string, dialFunc DialFunc) *http.Client {
func makeHTTPClient(userAgent string, timeout time.Duration, dialFunc DialFunc) *http.Client {
return &http.Client{
Timeout: HTTPTimeout,
Timeout: timeout,
Transport: networkHTTPTransport{
userAgent: userAgent,
next: &http.Transport{