566c6b246a
This diff addresses another point of https://github.com/ooni/probe/issues/1956: > - [ ] observe that we're still using a bunch of private interfaces for common interfaces such as the `Dialer`, so we can get rid of these private interfaces and always use the ones in `model`, which allows us to remove a bunch of legacy wrappers Additional cleanups may still be possible. The more I cleanup, the more I see there's extra legacy code we can dispose of (which seems good?).
29 lines
626 B
Go
29 lines
626 B
Go
package websteps
|
|
|
|
import (
|
|
"context"
|
|
"net"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/model"
|
|
"github.com/ooni/probe-cli/v3/internal/netxlite"
|
|
)
|
|
|
|
type TCPConfig struct {
|
|
Dialer model.Dialer
|
|
Endpoint string
|
|
Resolver model.Resolver
|
|
}
|
|
|
|
// TCPDo performs the TCP check.
|
|
func TCPDo(ctx context.Context, config TCPConfig) (net.Conn, error) {
|
|
if config.Dialer != nil {
|
|
return config.Dialer.DialContext(ctx, "tcp", config.Endpoint)
|
|
}
|
|
resolver := config.Resolver
|
|
if resolver == nil {
|
|
resolver = &netxlite.ResolverSystem{}
|
|
}
|
|
dialer := NewDialerResolver(resolver)
|
|
return dialer.DialContext(ctx, "tcp", config.Endpoint)
|
|
}
|