From: Matt Joiner <anacrolix@gmail.com>
Date: Fri, 15 Jun 2018 12:39:37 +0000 (+1000)
Subject: Remove old Client.dialTCP
X-Git-Tag: v1.0.0~127^2~24
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=81dcb9b779d52a6d40318627c7bf2d02d3c2e179;p=btrtrc.git

Remove old Client.dialTCP
---

diff --git a/client.go b/client.go
index d4c08422..b7d57b09 100644
--- a/client.go
+++ b/client.go
@@ -471,22 +471,6 @@ func (cl *Client) dopplegangerAddr(addr string) bool {
 	return ok
 }
 
-func (cl *Client) dialTCP(ctx context.Context, addr string) (c net.Conn, err error) {
-	d := net.Dialer{
-		// Can't bind to the listen address, even though we intend to create an
-		// endpoint pair that is distinct. Oh well.
-
-		// LocalAddr: cl.tcpListener.Addr(),
-	}
-	c, err = d.DialContext(ctx, "tcp"+ipNetworkSuffix(!cl.config.DisableIPv4 && !cl.config.DisableIPv4Peers, !cl.config.DisableIPv6), addr)
-	countDialResult(err)
-	if err == nil {
-		c.(*net.TCPConn).SetLinger(0)
-	}
-	c = pproffd.WrapNetConn(c)
-	return
-}
-
 func ipNetworkSuffix(allowIpv4, allowIpv6 bool) string {
 	switch {
 	case allowIpv4 && allowIpv6:
@@ -535,6 +519,12 @@ func (cl *Client) dialFirst(ctx context.Context, addr string) net.Conn {
 		left++
 		go func() {
 			c, err := f(ctx, addr)
+			// This is a bit optimistic, but it looks non-trivial to thread
+			// this through the proxy code. Set it now in case we close the
+			// connection forthwith.
+			if tc, ok := c.(*net.TCPConn); ok {
+				tc.SetLinger(0)
+			}
 			countDialResult(err)
 			resCh <- dialResult{c}
 		}()