TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-02-18 02:48:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

derp/derphttp, net/netcheck: plumb netmon.Monitor to derp netcheck client

Browse Source 
Fixes #11981

Change-Id: I0e15a09f93aefb3cfddbc12d463c1c08b83e09fd
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2024-05-03 06:14:58 -07:00 committed by Brad Fitzpatrick
parent a03cb866b4
commit ee3bd4dbda
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
derp/derphttp/derphttp_client.go
View File

@ -136,8 +136,15 @@ func NewRegionClient(privateKey key.NodePrivate, logf logger.Logf, netMon *netmo
// NewNetcheckClient returns a Client that's only able to have its DialRegionTLS method called. // NewNetcheckClient returns a Client that's only able to have its DialRegionTLS method called.
// It's used by the netcheck package. // It's used by the netcheck package.
func NewNetcheckClient(logf logger.Logf) *Client { func NewNetcheckClient(logf logger.Logf, netMon *netmon.Monitor) *Client {
return &Client{logf: logf, clock: tstime.StdClock{}} if netMon == nil {
panic("nil netMon")
}
return &Client{
logf: logf,
clock: tstime.StdClock{},
netMon: netMon,
}
} }
// NewClient returns a new DERP-over-HTTP client. It connects lazily. // NewClient returns a new DERP-over-HTTP client. It connects lazily.

2
net/netcheck/netcheck.go
View File

@ -1176,7 +1176,7 @@ func (c *Client) measureHTTPSLatency(ctx context.Context, reg *tailcfg.DERPRegio
var ip netip.Addr var ip netip.Addr
dc := derphttp.NewNetcheckClient(c.logf) dc := derphttp.NewNetcheckClient(c.logf, c.NetMon)
defer dc.Close() defer dc.Close()
tlsConn, tcpConn, node, err := dc.DialRegionTLS(ctx, reg) tlsConn, tcpConn, node, err := dc.DialRegionTLS(ctx, reg)