d57c78bc71
This is how I did it: 1. `git clone https://github.com/ooni/probe-engine internal/engine` 2. ``` (cd internal/engine && git describe --tags) v0.23.0 ``` 3. `nvim go.mod` (merging `go.mod` with `internal/engine/go.mod` 4. `rm -rf internal/.git internal/engine/go.{mod,sum}` 5. `git add internal/engine` 6. `find . -type f -name \*.go -exec sed -i 's@/ooni/probe-engine@/ooni/probe-cli/v3/internal/engine@g' {} \;` 7. `go build ./...` (passes) 8. `go test -race ./...` (temporary failure on RiseupVPN) 9. `go mod tidy` 10. this commit message Once this piece of work is done, we can build a new version of `ooniprobe` that is using `internal/engine` directly. We need to do more work to ensure all the other functionality in `probe-engine` (e.g. making mobile packages) are still WAI. Part of https://github.com/ooni/probe/issues/1335
25 lines
554 B
Go
25 lines
554 B
Go
package dialer
|
|
|
|
import (
|
|
"context"
|
|
"net"
|
|
"time"
|
|
)
|
|
|
|
// TimeoutDialer is a Dialer that enforces a timeout
|
|
type TimeoutDialer struct {
|
|
Dialer
|
|
ConnectTimeout time.Duration // default: 30 seconds
|
|
}
|
|
|
|
// DialContext implements Dialer.DialContext
|
|
func (d TimeoutDialer) DialContext(ctx context.Context, network, address string) (net.Conn, error) {
|
|
timeout := 30 * time.Second
|
|
if d.ConnectTimeout != 0 {
|
|
timeout = d.ConnectTimeout
|
|
}
|
|
ctx, cancel := context.WithTimeout(ctx, timeout)
|
|
defer cancel()
|
|
return d.Dialer.DialContext(ctx, network, address)
|
|
}
|