Skip to content

Commit 8932d65

Browse files
committed
dialers/pdial: m refactor
1 parent 6d45e7b commit 8932d65

1 file changed

Lines changed: 3 additions & 6 deletions

File tree

intra/dialers/pdial.go

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,21 +48,18 @@ func ProxyDials(dd []proxy.Dialer, network, addr string) (c net.Conn, errs error
4848
break
4949
}
5050
conn, err := ProxyDial(d, network, addr)
51-
c = conn
5251
if conn == nil && err == nil {
5352
errs = core.JoinErr(errs, errNoConn)
5453
} else if err != nil {
5554
clos(conn)
5655
log.W("pdial: trying %s dialer of %d / %d to %s", network, i, tot, addr)
5756
errs = core.JoinErr(errs, err)
5857
} else if conn != nil {
58+
c = conn
5959
errs = nil
6060
return
6161
}
6262
}
63-
if c == nil {
64-
log.W("pdial: no dialer (sz: %d) succeeded for %s", tot, addr)
65-
return nil, core.OneErr(errs, errNoDialer)
66-
}
67-
return
63+
log.W("pdial: no dialer (sz: %d) could connect to %s", tot, addr)
64+
return nil, core.OneErr(errs, errNoDialer)
6865
}

0 commit comments

Comments
 (0)