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?).
30 lines
738 B
Go
30 lines
738 B
Go
package internal
|
|
|
|
import (
|
|
"context"
|
|
"net"
|
|
"time"
|
|
|
|
"github.com/ooni/probe-cli/v3/internal/model"
|
|
)
|
|
|
|
// Dialer creates net.Conn instances where (1) we delay writes if
|
|
// a delay is configured and (2) we split outgoing buffers if there
|
|
// is a configured splitter function.
|
|
type Dialer struct {
|
|
model.Dialer
|
|
Delay time.Duration
|
|
Splitter func([]byte) [][]byte
|
|
}
|
|
|
|
// DialContext implements netx.Dialer.DialContext.
|
|
func (d Dialer) DialContext(ctx context.Context, network, address string) (net.Conn, error) {
|
|
conn, err := d.Dialer.DialContext(ctx, network, address)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
conn = SleeperWriter{Conn: conn, Delay: d.Delay}
|
|
conn = SplitterWriter{Conn: conn, Splitter: d.Splitter}
|
|
return conn, nil
|
|
}
|