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
81 lines
1.4 KiB
Go
81 lines
1.4 KiB
Go
package dialer
|
|
|
|
import (
|
|
"context"
|
|
"crypto/tls"
|
|
"io"
|
|
"net"
|
|
"time"
|
|
)
|
|
|
|
type EOFDialer struct{}
|
|
|
|
func (EOFDialer) DialContext(ctx context.Context, network, address string) (net.Conn, error) {
|
|
time.Sleep(10 * time.Microsecond)
|
|
return nil, io.EOF
|
|
}
|
|
|
|
type EOFConnDialer struct{}
|
|
|
|
func (EOFConnDialer) DialContext(ctx context.Context, network, address string) (net.Conn, error) {
|
|
return EOFConn{}, nil
|
|
}
|
|
|
|
type EOFConn struct {
|
|
net.Conn
|
|
}
|
|
|
|
func (EOFConn) Read(p []byte) (int, error) {
|
|
time.Sleep(10 * time.Microsecond)
|
|
return 0, io.EOF
|
|
}
|
|
|
|
func (EOFConn) Write(p []byte) (int, error) {
|
|
time.Sleep(10 * time.Microsecond)
|
|
return 0, io.EOF
|
|
}
|
|
|
|
func (EOFConn) Close() error {
|
|
time.Sleep(10 * time.Microsecond)
|
|
return io.EOF
|
|
}
|
|
|
|
func (EOFConn) LocalAddr() net.Addr {
|
|
return EOFAddr{}
|
|
}
|
|
|
|
func (EOFConn) RemoteAddr() net.Addr {
|
|
return EOFAddr{}
|
|
}
|
|
|
|
func (EOFConn) SetDeadline(t time.Time) error {
|
|
return nil
|
|
}
|
|
|
|
func (EOFConn) SetReadDeadline(t time.Time) error {
|
|
return nil
|
|
}
|
|
|
|
func (EOFConn) SetWriteDeadline(t time.Time) error {
|
|
return nil
|
|
}
|
|
|
|
type EOFAddr struct{}
|
|
|
|
func (EOFAddr) Network() string {
|
|
return "tcp"
|
|
}
|
|
|
|
func (EOFAddr) String() string {
|
|
return "127.0.0.1:1234"
|
|
}
|
|
|
|
type EOFTLSHandshaker struct{}
|
|
|
|
func (EOFTLSHandshaker) Handshake(
|
|
ctx context.Context, conn net.Conn, config *tls.Config,
|
|
) (net.Conn, tls.ConnectionState, error) {
|
|
time.Sleep(10 * time.Microsecond)
|
|
return nil, tls.ConnectionState{}, io.EOF
|
|
}
|