chore: merge probe-engine into probe-cli (#201)
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
This commit is contained in:
Simone Basso
GitHub
parent
b1ce300c8d
commit
d57c78bc71
535 changed files with 66182 additions and 23 deletions
607
internal/engine/legacy/oonitemplates/oonitemplates.go
Normal file
607
internal/engine/legacy/oonitemplates/oonitemplates.go
Normal file
|
|
@ -0,0 +1,607 @@
|
|||
// Package oonitemplates contains templates for experiments.
|
||||
//
|
||||
// Every experiment should possibly be based on code inside of
|
||||
// this package. In the future we should perhaps unify the code
|
||||
// in here with the code in oonidatamodel.
|
||||
//
|
||||
// This has been forked from ooni/netx/x/porcelain because it was
|
||||
// causing too much changes to keep this code in there.
|
||||
package oonitemplates
|
||||
|
||||
import (
|
||||
"context"
|
||||
"io"
|
||||
"io/ioutil"
|
||||
"math/rand"
|
||||
"net"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
goptlib "git.torproject.org/pluggable-transports/goptlib.git"
|
||||
"github.com/ooni/probe-cli/v3/internal/engine/atomicx"
|
||||
"github.com/ooni/probe-cli/v3/internal/engine/internal/runtimex"
|
||||
"github.com/ooni/probe-cli/v3/internal/engine/legacy/netx"
|
||||
"github.com/ooni/probe-cli/v3/internal/engine/legacy/netx/handlers"
|
||||
"github.com/ooni/probe-cli/v3/internal/engine/legacy/netx/modelx"
|
||||
"gitlab.com/yawning/obfs4.git/transports"
|
||||
obfs4base "gitlab.com/yawning/obfs4.git/transports/base"
|
||||
)
|
||||
|
||||
type channelHandler struct {
|
||||
ch chan<- modelx.Measurement
|
||||
lateWrites *atomicx.Int64
|
||||
}
|
||||
|
||||
func newChannelHandler(ch chan<- modelx.Measurement) *channelHandler {
|
||||
return &channelHandler{
|
||||
ch: ch,
|
||||
lateWrites: atomicx.NewInt64(),
|
||||
}
|
||||
}
|
||||
|
||||
func (h *channelHandler) OnMeasurement(m modelx.Measurement) {
|
||||
// Implementation note: when we're closing idle connections it
|
||||
// may be that they're closed once we have stopped reading
|
||||
// therefore (1) we MUST NOT close the channel to signal that
|
||||
// we're done BECAUSE THIS IS A LIE and (2) we MUST instead
|
||||
// arrange here for non-blocking sends.
|
||||
select {
|
||||
case h.ch <- m:
|
||||
case <-time.After(100 * time.Millisecond):
|
||||
h.lateWrites.Add(1)
|
||||
}
|
||||
}
|
||||
|
||||
// Results contains the results of every operation that we care
|
||||
// about and information on the number of bytes received and sent.
|
||||
// When counting the number of bytes sent and received, we do not
|
||||
// take into account domain name resolutions performed using the
|
||||
// system resolver. We estimated that using heuristics with MK but
|
||||
// we currently don't have a good solution. TODO(bassosimone): this
|
||||
// can be improved by emitting estimates when we know that we are
|
||||
// using the system resolver, so we can pick up estimates here.
|
||||
type Results struct {
|
||||
Connects []*modelx.ConnectEvent
|
||||
HTTPRequests []*modelx.HTTPRoundTripDoneEvent
|
||||
NetworkEvents []*modelx.Measurement
|
||||
Resolves []*modelx.ResolveDoneEvent
|
||||
TLSHandshakes []*modelx.TLSHandshakeDoneEvent
|
||||
}
|
||||
|
||||
type connmapper struct {
|
||||
counter int64
|
||||
mu sync.Mutex
|
||||
once sync.Once
|
||||
table map[int64]int64
|
||||
}
|
||||
|
||||
// scramble maps a ConnID to a different number to avoid emitting
|
||||
// the port numbers. We preserve the sign because it's used to
|
||||
// distinguish between TCP (positive) and UDP (negative). A special
|
||||
// case is zero, which is always mapped to zero, since the zero
|
||||
// port means "unspecified" in netx code.
|
||||
func (m *connmapper) scramble(cid int64) int64 {
|
||||
m.once.Do(func() {
|
||||
m.table = make(map[int64]int64)
|
||||
m.table[0] = 0 // means unspecified in netx
|
||||
})
|
||||
// See https://stackoverflow.com/a/38140573/4354461
|
||||
m.mu.Lock()
|
||||
defer m.mu.Unlock()
|
||||
if value, found := m.table[cid]; found == true {
|
||||
return value
|
||||
}
|
||||
var factor int64 = 1
|
||||
if cid < 0 {
|
||||
factor = -1
|
||||
}
|
||||
m.counter++ // we must never emit zero
|
||||
value := factor * m.counter
|
||||
m.table[cid] = value
|
||||
return value
|
||||
}
|
||||
|
||||
// cm is the global connmapper
|
||||
var cm connmapper
|
||||
|
||||
func (r *Results) onMeasurement(m modelx.Measurement, lowLevel bool) {
|
||||
if m.Connect != nil {
|
||||
m.Connect.ConnID = cm.scramble(m.Connect.ConnID)
|
||||
r.Connects = append(r.Connects, m.Connect)
|
||||
if lowLevel {
|
||||
r.NetworkEvents = append(r.NetworkEvents, &m)
|
||||
}
|
||||
}
|
||||
if m.HTTPRoundTripDone != nil {
|
||||
r.HTTPRequests = append(r.HTTPRequests, m.HTTPRoundTripDone)
|
||||
}
|
||||
if m.ResolveDone != nil {
|
||||
r.Resolves = append(r.Resolves, m.ResolveDone)
|
||||
}
|
||||
if m.TLSHandshakeDone != nil {
|
||||
m.TLSHandshakeDone.ConnID = cm.scramble(m.TLSHandshakeDone.ConnID)
|
||||
r.TLSHandshakes = append(r.TLSHandshakes, m.TLSHandshakeDone)
|
||||
}
|
||||
if m.Read != nil {
|
||||
m.Read.ConnID = cm.scramble(m.Read.ConnID)
|
||||
if lowLevel {
|
||||
r.NetworkEvents = append(r.NetworkEvents, &m)
|
||||
}
|
||||
}
|
||||
if m.Write != nil {
|
||||
m.Write.ConnID = cm.scramble(m.Write.ConnID)
|
||||
if lowLevel {
|
||||
r.NetworkEvents = append(r.NetworkEvents, &m)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (r *Results) collect(
|
||||
output <-chan modelx.Measurement,
|
||||
handler modelx.Handler,
|
||||
main func(),
|
||||
lowLevel bool,
|
||||
) {
|
||||
if handler == nil {
|
||||
handler = handlers.NoHandler
|
||||
}
|
||||
done := make(chan interface{})
|
||||
go func() {
|
||||
defer close(done)
|
||||
main()
|
||||
}()
|
||||
for {
|
||||
select {
|
||||
case m := <-output:
|
||||
handler.OnMeasurement(m)
|
||||
r.onMeasurement(m, lowLevel)
|
||||
case <-done:
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
type dnsFallback struct {
|
||||
network, address string
|
||||
}
|
||||
|
||||
func configureDNS(seed int64, network, address string) (modelx.DNSResolver, error) {
|
||||
resolver, err := netx.NewResolver(network, address)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
fallbacks := []dnsFallback{
|
||||
dnsFallback{
|
||||
network: "doh",
|
||||
address: "https://cloudflare-dns.com/dns-query",
|
||||
},
|
||||
dnsFallback{
|
||||
network: "doh",
|
||||
address: "https://dns.google/dns-query",
|
||||
},
|
||||
dnsFallback{
|
||||
network: "dot",
|
||||
address: "8.8.8.8:853",
|
||||
},
|
||||
dnsFallback{
|
||||
network: "dot",
|
||||
address: "8.8.4.4:853",
|
||||
},
|
||||
dnsFallback{
|
||||
network: "dot",
|
||||
address: "1.1.1.1:853",
|
||||
},
|
||||
dnsFallback{
|
||||
network: "dot",
|
||||
address: "9.9.9.9:853",
|
||||
},
|
||||
}
|
||||
random := rand.New(rand.NewSource(seed))
|
||||
random.Shuffle(len(fallbacks), func(i, j int) {
|
||||
fallbacks[i], fallbacks[j] = fallbacks[j], fallbacks[i]
|
||||
})
|
||||
var configured int
|
||||
for i := 0; configured < 2 && i < len(fallbacks); i++ {
|
||||
if fallbacks[i].network == network {
|
||||
continue
|
||||
}
|
||||
var fallback modelx.DNSResolver
|
||||
fallback, err = netx.NewResolver(fallbacks[i].network, fallbacks[i].address)
|
||||
runtimex.PanicOnError(err, "porcelain: invalid fallbacks table")
|
||||
resolver = netx.ChainResolvers(resolver, fallback)
|
||||
configured++
|
||||
}
|
||||
return resolver, nil
|
||||
}
|
||||
|
||||
// DNSLookupConfig contains DNSLookup settings.
|
||||
type DNSLookupConfig struct {
|
||||
Beginning time.Time
|
||||
Handler modelx.Handler
|
||||
Hostname string
|
||||
ServerAddress string
|
||||
ServerNetwork string
|
||||
}
|
||||
|
||||
// DNSLookupResults contains the results of a DNSLookup
|
||||
type DNSLookupResults struct {
|
||||
TestKeys Results
|
||||
Addresses []string
|
||||
Error error
|
||||
}
|
||||
|
||||
// DNSLookup performs a DNS lookup.
|
||||
func DNSLookup(
|
||||
ctx context.Context, config DNSLookupConfig,
|
||||
) *DNSLookupResults {
|
||||
var (
|
||||
mu sync.Mutex
|
||||
results = new(DNSLookupResults)
|
||||
)
|
||||
if config.Beginning.IsZero() {
|
||||
config.Beginning = time.Now()
|
||||
}
|
||||
channel := make(chan modelx.Measurement)
|
||||
root := &modelx.MeasurementRoot{
|
||||
Beginning: config.Beginning,
|
||||
Handler: newChannelHandler(channel),
|
||||
}
|
||||
ctx = modelx.WithMeasurementRoot(ctx, root)
|
||||
resolver, err := netx.NewResolver(config.ServerNetwork, config.ServerAddress)
|
||||
if err != nil {
|
||||
results.Error = err
|
||||
return results
|
||||
}
|
||||
results.TestKeys.collect(channel, config.Handler, func() {
|
||||
addrs, err := resolver.LookupHost(ctx, config.Hostname)
|
||||
mu.Lock()
|
||||
defer mu.Unlock()
|
||||
results.Addresses, results.Error = addrs, err
|
||||
}, false)
|
||||
return results
|
||||
}
|
||||
|
||||
// HTTPDoConfig contains HTTPDo settings.
|
||||
type HTTPDoConfig struct {
|
||||
Accept string
|
||||
AcceptLanguage string
|
||||
Beginning time.Time
|
||||
Body []byte
|
||||
DNSServerAddress string
|
||||
DNSServerNetwork string
|
||||
Handler modelx.Handler
|
||||
InsecureSkipVerify bool
|
||||
Method string
|
||||
ProxyFunc func(*http.Request) (*url.URL, error)
|
||||
URL string
|
||||
UserAgent string
|
||||
|
||||
// MaxEventsBodySnapSize controls the snap size that
|
||||
// we're using for bodies returned as modelx.Measurement.
|
||||
//
|
||||
// Same rules as modelx.MeasurementRoot.MaxBodySnapSize.
|
||||
MaxEventsBodySnapSize int64
|
||||
|
||||
// MaxResponseBodySnapSize controls the snap size that
|
||||
// we're using for the HTTPDoResults.BodySnap.
|
||||
//
|
||||
// Same rules as modelx.MeasurementRoot.MaxBodySnapSize.
|
||||
MaxResponseBodySnapSize int64
|
||||
}
|
||||
|
||||
// HTTPDoResults contains the results of a HTTPDo
|
||||
type HTTPDoResults struct {
|
||||
TestKeys Results
|
||||
StatusCode int64
|
||||
Headers http.Header
|
||||
BodySnap []byte
|
||||
Error error
|
||||
}
|
||||
|
||||
// HTTPDo performs a HTTP request
|
||||
func HTTPDo(
|
||||
origCtx context.Context, config HTTPDoConfig,
|
||||
) *HTTPDoResults {
|
||||
var (
|
||||
mu sync.Mutex
|
||||
results = new(HTTPDoResults)
|
||||
)
|
||||
if config.Beginning.IsZero() {
|
||||
config.Beginning = time.Now()
|
||||
}
|
||||
channel := make(chan modelx.Measurement)
|
||||
// TODO(bassosimone): tell client to use specific CA bundle?
|
||||
root := &modelx.MeasurementRoot{
|
||||
Beginning: config.Beginning,
|
||||
Handler: newChannelHandler(channel),
|
||||
MaxBodySnapSize: config.MaxEventsBodySnapSize,
|
||||
}
|
||||
ctx := modelx.WithMeasurementRoot(origCtx, root)
|
||||
client := netx.NewHTTPClientWithProxyFunc(config.ProxyFunc)
|
||||
resolver, err := configureDNS(
|
||||
time.Now().UnixNano(),
|
||||
config.DNSServerNetwork,
|
||||
config.DNSServerAddress,
|
||||
)
|
||||
if err != nil {
|
||||
results.Error = err
|
||||
return results
|
||||
}
|
||||
client.SetResolver(resolver)
|
||||
if config.InsecureSkipVerify {
|
||||
client.ForceSkipVerify()
|
||||
}
|
||||
// TODO(bassosimone): implement sending body
|
||||
req, err := http.NewRequest(config.Method, config.URL, nil)
|
||||
if err != nil {
|
||||
results.Error = err
|
||||
return results
|
||||
}
|
||||
if config.Accept != "" {
|
||||
req.Header.Set("Accept", config.Accept)
|
||||
}
|
||||
if config.AcceptLanguage != "" {
|
||||
req.Header.Set("Accept-Language", config.AcceptLanguage)
|
||||
}
|
||||
req.Header.Set("User-Agent", config.UserAgent)
|
||||
req = req.WithContext(ctx)
|
||||
results.TestKeys.collect(channel, config.Handler, func() {
|
||||
defer client.HTTPClient.CloseIdleConnections()
|
||||
resp, err := client.HTTPClient.Do(req)
|
||||
if err != nil {
|
||||
mu.Lock()
|
||||
results.Error = err
|
||||
mu.Unlock()
|
||||
return
|
||||
}
|
||||
mu.Lock()
|
||||
results.StatusCode = int64(resp.StatusCode)
|
||||
results.Headers = resp.Header
|
||||
mu.Unlock()
|
||||
defer resp.Body.Close()
|
||||
reader := io.LimitReader(
|
||||
resp.Body, modelx.ComputeBodySnapSize(
|
||||
config.MaxResponseBodySnapSize,
|
||||
),
|
||||
)
|
||||
data, err := ioutil.ReadAll(reader)
|
||||
mu.Lock()
|
||||
results.BodySnap, results.Error = data, err
|
||||
mu.Unlock()
|
||||
}, false)
|
||||
return results
|
||||
}
|
||||
|
||||
// TLSConnectConfig contains TLSConnect settings.
|
||||
type TLSConnectConfig struct {
|
||||
Address string
|
||||
Beginning time.Time
|
||||
DNSServerAddress string
|
||||
DNSServerNetwork string
|
||||
Handler modelx.Handler
|
||||
InsecureSkipVerify bool
|
||||
SNI string
|
||||
}
|
||||
|
||||
// TLSConnectResults contains the results of a TLSConnect
|
||||
type TLSConnectResults struct {
|
||||
TestKeys Results
|
||||
Error error
|
||||
}
|
||||
|
||||
// TLSConnect performs a TLS connect.
|
||||
func TLSConnect(
|
||||
ctx context.Context, config TLSConnectConfig,
|
||||
) *TLSConnectResults {
|
||||
var (
|
||||
mu sync.Mutex
|
||||
results = new(TLSConnectResults)
|
||||
)
|
||||
if config.Beginning.IsZero() {
|
||||
config.Beginning = time.Now()
|
||||
}
|
||||
channel := make(chan modelx.Measurement)
|
||||
root := &modelx.MeasurementRoot{
|
||||
Beginning: config.Beginning,
|
||||
Handler: newChannelHandler(channel),
|
||||
}
|
||||
ctx = modelx.WithMeasurementRoot(ctx, root)
|
||||
dialer := netx.NewDialer()
|
||||
// TODO(bassosimone): tell dialer to use specific CA bundle?
|
||||
resolver, err := configureDNS(
|
||||
time.Now().UnixNano(),
|
||||
config.DNSServerNetwork,
|
||||
config.DNSServerAddress,
|
||||
)
|
||||
if err != nil {
|
||||
results.Error = err
|
||||
return results
|
||||
}
|
||||
dialer.SetResolver(resolver)
|
||||
if config.InsecureSkipVerify {
|
||||
dialer.ForceSkipVerify()
|
||||
}
|
||||
// TODO(bassosimone): can this call really fail?
|
||||
dialer.ForceSpecificSNI(config.SNI)
|
||||
results.TestKeys.collect(channel, config.Handler, func() {
|
||||
conn, err := dialer.DialTLSContext(ctx, "tcp", config.Address)
|
||||
if conn != nil {
|
||||
defer conn.Close()
|
||||
}
|
||||
mu.Lock()
|
||||
defer mu.Unlock()
|
||||
results.Error = err
|
||||
}, true)
|
||||
return results
|
||||
}
|
||||
|
||||
// TCPConnectConfig contains TCPConnect settings.
|
||||
type TCPConnectConfig struct {
|
||||
Address string
|
||||
Beginning time.Time
|
||||
DNSServerAddress string
|
||||
DNSServerNetwork string
|
||||
Handler modelx.Handler
|
||||
}
|
||||
|
||||
// TCPConnectResults contains the results of a TCPConnect
|
||||
type TCPConnectResults struct {
|
||||
TestKeys Results
|
||||
Error error
|
||||
}
|
||||
|
||||
// TCPConnect performs a TCP connect.
|
||||
func TCPConnect(
|
||||
ctx context.Context, config TCPConnectConfig,
|
||||
) *TCPConnectResults {
|
||||
var (
|
||||
mu sync.Mutex
|
||||
results = new(TCPConnectResults)
|
||||
)
|
||||
if config.Beginning.IsZero() {
|
||||
config.Beginning = time.Now()
|
||||
}
|
||||
channel := make(chan modelx.Measurement)
|
||||
root := &modelx.MeasurementRoot{
|
||||
Beginning: config.Beginning,
|
||||
Handler: newChannelHandler(channel),
|
||||
}
|
||||
ctx = modelx.WithMeasurementRoot(ctx, root)
|
||||
dialer := netx.NewDialer()
|
||||
// TODO(bassosimone): tell dialer to use specific CA bundle?
|
||||
resolver, err := configureDNS(
|
||||
time.Now().UnixNano(),
|
||||
config.DNSServerNetwork,
|
||||
config.DNSServerAddress,
|
||||
)
|
||||
if err != nil {
|
||||
results.Error = err
|
||||
return results
|
||||
}
|
||||
dialer.SetResolver(resolver)
|
||||
results.TestKeys.collect(channel, config.Handler, func() {
|
||||
conn, err := dialer.DialContext(ctx, "tcp", config.Address)
|
||||
if conn != nil {
|
||||
defer conn.Close()
|
||||
}
|
||||
mu.Lock()
|
||||
defer mu.Unlock()
|
||||
results.Error = err
|
||||
}, false)
|
||||
return results
|
||||
}
|
||||
|
||||
func init() {
|
||||
runtimex.PanicOnError(transports.Init(), "transport.Init() failed")
|
||||
}
|
||||
|
||||
// OBFS4ConnectConfig contains OBFS4Connect settings.
|
||||
type OBFS4ConnectConfig struct {
|
||||
Address string
|
||||
Beginning time.Time
|
||||
DNSServerAddress string
|
||||
DNSServerNetwork string
|
||||
Handler modelx.Handler
|
||||
Params goptlib.Args
|
||||
StateBaseDir string
|
||||
Timeout time.Duration
|
||||
ioutilTempDir func(dir string, prefix string) (string, error)
|
||||
transportsGet func(name string) obfs4base.Transport
|
||||
setDeadline func(net.Conn, time.Time) error
|
||||
}
|
||||
|
||||
// OBFS4ConnectResults contains the results of a OBFS4Connect
|
||||
type OBFS4ConnectResults struct {
|
||||
TestKeys Results
|
||||
Error error
|
||||
}
|
||||
|
||||
// OBFS4Connect performs a TCP connect.
|
||||
func OBFS4Connect(
|
||||
ctx context.Context, config OBFS4ConnectConfig,
|
||||
) *OBFS4ConnectResults {
|
||||
var (
|
||||
mu sync.Mutex
|
||||
results = new(OBFS4ConnectResults)
|
||||
)
|
||||
if config.Beginning.IsZero() {
|
||||
config.Beginning = time.Now()
|
||||
}
|
||||
channel := make(chan modelx.Measurement)
|
||||
root := &modelx.MeasurementRoot{
|
||||
Beginning: config.Beginning,
|
||||
Handler: newChannelHandler(channel),
|
||||
}
|
||||
ctx = modelx.WithMeasurementRoot(ctx, root)
|
||||
dialer := netx.NewDialer()
|
||||
// TODO(bassosimone): tell dialer to use specific CA bundle?
|
||||
resolver, err := configureDNS(
|
||||
time.Now().UnixNano(),
|
||||
config.DNSServerNetwork,
|
||||
config.DNSServerAddress,
|
||||
)
|
||||
if err != nil {
|
||||
results.Error = err
|
||||
return results
|
||||
}
|
||||
dialer.SetResolver(resolver)
|
||||
transportsGet := config.transportsGet
|
||||
if transportsGet == nil {
|
||||
transportsGet = transports.Get
|
||||
}
|
||||
txp := transportsGet("obfs4")
|
||||
ioutilTempDir := config.ioutilTempDir
|
||||
if ioutilTempDir == nil {
|
||||
ioutilTempDir = ioutil.TempDir
|
||||
}
|
||||
dirname, err := ioutilTempDir(config.StateBaseDir, "obfs4")
|
||||
if err != nil {
|
||||
results.Error = err
|
||||
return results
|
||||
}
|
||||
factory, err := txp.ClientFactory(dirname)
|
||||
if err != nil {
|
||||
results.Error = err
|
||||
return results
|
||||
}
|
||||
parsedargs, err := factory.ParseArgs(&config.Params)
|
||||
if err != nil {
|
||||
results.Error = err
|
||||
return results
|
||||
}
|
||||
results.TestKeys.collect(channel, config.Handler, func() {
|
||||
dialfunc := func(network, address string) (net.Conn, error) {
|
||||
conn, err := dialer.DialContext(ctx, network, address)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
// I didn't immediately see an API for limiting in time the
|
||||
// duration of the handshake, so let's set a deadline.
|
||||
timeout := config.Timeout
|
||||
if timeout == 0 {
|
||||
timeout = 30 * time.Second
|
||||
}
|
||||
setDeadline := config.setDeadline
|
||||
if setDeadline == nil {
|
||||
setDeadline = func(conn net.Conn, t time.Time) error {
|
||||
return conn.SetDeadline(t)
|
||||
}
|
||||
}
|
||||
if err := setDeadline(conn, time.Now().Add(timeout)); err != nil {
|
||||
conn.Close()
|
||||
return nil, err
|
||||
}
|
||||
return conn, nil
|
||||
}
|
||||
conn, err := factory.Dial("tcp", config.Address, dialfunc, parsedargs)
|
||||
if conn != nil {
|
||||
defer conn.Close()
|
||||
}
|
||||
mu.Lock()
|
||||
defer mu.Unlock()
|
||||
results.Error = err
|
||||
}, true)
|
||||
return results
|
||||
}
|
||||
Loading…
Reference in a new issue