github/portmaster
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix intel tests

Browse Source
This commit is contained in:
Daniel
2019-05-22 16:05:57 +02:00
parent a2bad3524c
commit 3f66df222e
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
intel/clients.go
View File

@@ -20,6 +20,13 @@ func SetLocalAddrFactory(laf func(network string) net.Addr) {
} }
} }
func getLocalAddr(network string) net.Addr {
if localAddrFactory != nil {
return localAddrFactory(network)
}
return nil
}
type clientManager struct { type clientManager struct {
dnsClient *dns.Client dnsClient *dns.Client
factory func() *dns.Client factory func() *dns.Client
@@ -38,7 +45,7 @@ func newDNSClientManager(resolver *Resolver) *clientManager {
return &dns.Client{ return &dns.Client{
Timeout: 5 * time.Second, Timeout: 5 * time.Second,
Dialer: &net.Dialer{ Dialer: &net.Dialer{
LocalAddr: localAddrFactory("udp"), LocalAddr: getLocalAddr("udp"),
}, },
} }
}, },
@@ -53,7 +60,7 @@ func newTCPClientManager(resolver *Resolver) *clientManager {
Net: "tcp", Net: "tcp",
Timeout: 5 * time.Second, Timeout: 5 * time.Second,
Dialer: &net.Dialer{ Dialer: &net.Dialer{
LocalAddr: localAddrFactory("tcp"), LocalAddr: getLocalAddr("tcp"),
}, },
} }
}, },
@@ -74,7 +81,7 @@ func newTLSClientManager(resolver *Resolver) *clientManager {
}, },
Timeout: 5 * time.Second, Timeout: 5 * time.Second,
Dialer: &net.Dialer{ Dialer: &net.Dialer{
LocalAddr: localAddrFactory("tcp"), LocalAddr: getLocalAddr("tcp"),
}, },
} }
}, },
@@ -94,7 +101,7 @@ func newHTTPSClientManager(resolver *Resolver) *clientManager {
}, },
Timeout: 5 * time.Second, Timeout: 5 * time.Second,
Dialer: &net.Dialer{ Dialer: &net.Dialer{
LocalAddr: localAddrFactory("tcp"), LocalAddr: getLocalAddr("tcp"),
}, },
} }
if resolver.VerifyDomain != "" { if resolver.VerifyDomain != "" {