TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-08-25 12:47:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

derp: change NewClient constructor to an option pattern

Browse Source 
(The NewMeshClient constructor I added recently was gross in
retrospect at call sites, especially when it wasn't obvious that a
meshKey empty string meant a regular client)
This commit is contained in:
Brad Fitzpatrick
2020-06-04 11:40:12 -07:00
parent 4d599d194f
commit 5e0ff494a5
3 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
derp/derphttp/derphttp_client.go
View File

@@ -282,7 +282,7 @@ func (c *Client) connect(ctx context.Context, caller string) (client *derp.Clien
return nil, 0, fmt.Errorf("GET failed: %v: %s", err, b)
}
derpClient, err := derp.NewMeshClient(c.privateKey, httpConn, brw, c.logf, c.MeshKey)
derpClient, err := derp.NewClient(c.privateKey, httpConn, brw, c.logf, derp.MeshKey(c.MeshKey))
if err != nil {
return nil, 0, err
}