derp/derphttp: properly assign websocket netconn on connect (#10)

kylecarbs · web-flow · commit 1e5e724a3949 · 2023-03-06T20:23:19.000-06:00
This was causing a leak in our CI!
diff --git a/derp/derphttp/derphttp_client.go b/derp/derphttp/derphttp_client.go
@@ -348,7 +348,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:

Original file line number	Diff line number	Diff line change
`@@ -348,7 +348,7 @@ func (c Client) connect(ctx context.Context, caller string) (client derp.Clien`
`348`	`348`	`}`
`349`	`349`	`c.serverPubKey = derpClient.ServerPublicKey()`
`350`	`350`	`c.client = derpClient`
`351`		`- c.netConn = tcpConn`
	`351`	`+ c.netConn = conn`
`352`	`352`	`c.connGen++`
`353`	`353`	`return c.client, c.connGen, nil`
`354`	`354`	`case c.url != nil:`