c/ooni-probe-cli
Watch
1
0
Fork
You've already forked ooni-probe-cli
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor(netx): the TimeoutDialer is useless (#366)

Browse source 
We already configure a timeout in the underlying dialer, hence
there's no point in keeping the TimeoutDialer around.

Part of https://github.com/ooni/probe/issues/1507
This commit is contained in:
Simone Basso 2021-06-08 21:56:57 +02:00 • committed by GitHub
commit 8ad17775fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 21 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

6
internal/engine/netx/dialer/system.go
View file

@ -6,8 +6,8 @@ import (
"time"
)
// defaultNetDialer is the net.Dialer we use by default.
var defaultNetDialer = &net.Dialer{
// underlyingDialer is the underlying net.Dialer.
var underlyingDialer = &net.Dialer{
Timeout: 15 * time.Second,
KeepAlive: 15 * time.Second,
}
@ -17,7 +17,7 @@ type SystemDialer struct{}
// DialContext implements Dialer.DialContext
func (d SystemDialer) DialContext(ctx context.Context, network, address string) (net.Conn, error) {
return defaultNetDialer.DialContext(ctx, network, address)
return underlyingDialer.DialContext(ctx, network, address)
}
// Default is the dialer we use by default.