derp/derphttp: properly assign websocket netconn on connect

kylecarbs · kylecarbs · commit cba78896e7e7 · 2023-03-07T01:51:42.000Z
This was causing a leak in our CI!
diff --git a/derp/derphttp/derphttp_client.go b/derp/derphttp/derphttp_client.go
@@ -331,6 +331,7 @@ func (c *Client) connect(ctx context.Context, caller string) (client *derp.Clien
 			c.logf("%s: websocket to %v error: %v", caller, urlStr, err)
 			return nil, 0, err
 		}
+
 		brw := bufio.NewReadWriter(bufio.NewReader(conn), bufio.NewWriter(conn))
 		derpClient, err := derp.NewClient(c.privateKey, conn, brw, c.logf,
 			derp.MeshKey(c.MeshKey),
@@ -348,7 +349,7 @@ func (c *Client) connect(ctx context.Context, caller string) (client *derp.Clien
 		}
 		c.serverPubKey = derpClient.ServerPublicKey()
 		c.client = derpClient
-		c.netConn = tcpConn
+		c.netConn = conn
 		c.connGen++
 		return c.client, c.connGen, nil
 	case c.url != nil:
