TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-02-27 10:47:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

net/netcheck: add Report.IPv4 and another TODO

Browse Source
This commit is contained in:
Brad Fitzpatrick 2020-05-29 12:33:48 -07:00
parent dd6b96ba68
commit 7247e896b5
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/netcheck/netcheck.go
View File

@ -34,6 +34,7 @@ import (
type Report struct { type Report struct {
UDP bool // UDP works UDP bool // UDP works
IPv6 bool // IPv6 works IPv6 bool // IPv6 works
IPv4 bool // IPv4 works
MappingVariesByDestIP opt.Bool // for IPv4 MappingVariesByDestIP opt.Bool // for IPv4
HairPinning opt.Bool // for IPv4 HairPinning opt.Bool // for IPv4
PreferredDERP int // or 0 for unknown PreferredDERP int // or 0 for unknown
@ -576,6 +577,7 @@ func (rs *reportState) addNodeLatency(node *tailcfg.DERPNode, ipp netaddr.IPPort
// too? Would be sad if so, but who knows. // too? Would be sad if so, but who knows.
case ipp.IP.Is4(): case ipp.IP.Is4():
updateLatency(ret.RegionV4Latency, node.RegionID, d) updateLatency(ret.RegionV4Latency, node.RegionID, d)
ret.IPv4 = true
if rs.gotEP4 == "" { if rs.gotEP4 == "" {
rs.gotEP4 = ipPortStr rs.gotEP4 = ipPortStr
ret.GlobalV4 = ipPortStr ret.GlobalV4 = ipPortStr
@ -762,6 +764,7 @@ func (c *Client) measureHTTPSLatency(reg *tailcfg.DERPRegion) (time.Duration, er
node := reg.Nodes[0] // TODO: use all nodes per region node := reg.Nodes[0] // TODO: use all nodes per region
host := node.HostName host := node.HostName
// TODO: connect using provided IPv4/IPv6; use a Trasport & set the dialer // TODO: connect using provided IPv4/IPv6; use a Trasport & set the dialer
// TODO: also have the caller set the Report.IPv4 or Report.IPv6 bool
var result httpstat.Result var result httpstat.Result
hctx, cancel := context.WithTimeout(httpstat.WithHTTPStat(context.Background(), &result), 5*time.Second) hctx, cancel := context.WithTimeout(httpstat.WithHTTPStat(context.Background(), &result), 5*time.Second)
@ -793,6 +796,9 @@ func (c *Client) measureHTTPSLatency(reg *tailcfg.DERPRegion) (time.Duration, er
func (c *Client) logConciseReport(r *Report, dm *tailcfg.DERPMap) { func (c *Client) logConciseReport(r *Report, dm *tailcfg.DERPMap) {
buf := bytes.NewBuffer(make([]byte, 0, 256)) // empirically: 5 DERPs + IPv6 == ~233 bytes buf := bytes.NewBuffer(make([]byte, 0, 256)) // empirically: 5 DERPs + IPv6 == ~233 bytes
fmt.Fprintf(buf, "udp=%v", r.UDP) fmt.Fprintf(buf, "udp=%v", r.UDP)
if !r.IPv4 {
fmt.Fprintf(buf, " v4=%v", r.IPv4)
}
fmt.Fprintf(buf, " v6=%v", r.IPv6) fmt.Fprintf(buf, " v6=%v", r.IPv6)
fmt.Fprintf(buf, " mapvarydest=%v", r.MappingVariesByDestIP) fmt.Fprintf(buf, " mapvarydest=%v", r.MappingVariesByDestIP)
fmt.Fprintf(buf, " hair=%v", r.HairPinning) fmt.Fprintf(buf, " hair=%v", r.HairPinning)