TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-25 19:15:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

net/netcheck, tailcfg: track whether OS supports IPv6

Browse Source 
We had previously added this to the netcheck report in #5087 but never
copied it into the NetInfo struct. Additionally, add it to log lines so
it's visible to support.

Change-Id: Ib6266f7c6aeb2eb2a28922aeafd950fe1bf5627e
Signed-off-by: Andrew Dunham <andrew@tailscale.com>
This commit is contained in:
Andrew Dunham 2022-10-21 15:13:49 -04:00 committed by Andrew Dunham
parent 42d9e7171c
commit 74693793be
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/netcheck/netcheck.go
View File

@ -1342,6 +1342,9 @@ func (c *Client) logConciseReport(r *Report, dm *tailcfg.DERPMap) {
} }
fmt.Fprintf(w, " v6=%v", r.IPv6) fmt.Fprintf(w, " v6=%v", r.IPv6)
if !r.IPv6 {
fmt.Fprintf(w, " v6os=%v", r.OSHasIPv6)
}
fmt.Fprintf(w, " mapvarydest=%v", r.MappingVariesByDestIP) fmt.Fprintf(w, " mapvarydest=%v", r.MappingVariesByDestIP)
fmt.Fprintf(w, " hair=%v", r.HairPinning) fmt.Fprintf(w, " hair=%v", r.HairPinning)
if r.AnyPortMappingChecked() { if r.AnyPortMappingChecked() {

7
tailcfg/tailcfg.go
View File

@ -597,11 +597,10 @@ func (ni *NetInfo) String() string {
if ni == nil { if ni == nil {
return "NetInfo(nil)" return "NetInfo(nil)"
} }
return fmt.Sprintf("NetInfo{varies=%v hairpin=%v ipv6=%v udp=%v icmpv4=%v derp=#%v portmap=%v link=%q}", return fmt.Sprintf("NetInfo{varies=%v hairpin=%v ipv6=%v ipv6os=%v udp=%v icmpv4=%v derp=#%v portmap=%v link=%q}",
ni.MappingVariesByDestIP, ni.HairPinning, ni.WorkingIPv6, ni.MappingVariesByDestIP, ni.HairPinning, ni.WorkingIPv6,
ni.WorkingUDP, ni.WorkingICMPv4, ni.PreferredDERP, ni.OSHasIPv6, ni.WorkingUDP, ni.WorkingICMPv4,
ni.portMapSummary(), ni.PreferredDERP, ni.portMapSummary(), ni.LinkType)
ni.LinkType)
} }
func (ni *NetInfo) portMapSummary() string { func (ni *NetInfo) portMapSummary() string {

1
wgengine/magicsock/magicsock.go
View File

@ -807,6 +807,7 @@ func (c *Conn) updateNetInfo(ctx context.Context) (*netcheck.Report, error) {
ni.DERPLatency[fmt.Sprintf("%d-v6", rid)] = d.Seconds() ni.DERPLatency[fmt.Sprintf("%d-v6", rid)] = d.Seconds()
} }
ni.WorkingIPv6.Set(report.IPv6) ni.WorkingIPv6.Set(report.IPv6)
ni.OSHasIPv6.Set(report.OSHasIPv6)
ni.WorkingUDP.Set(report.UDP) ni.WorkingUDP.Set(report.UDP)
ni.WorkingICMPv4.Set(report.ICMPv4) ni.WorkingICMPv4.Set(report.ICMPv4)
ni.PreferredDERP = report.PreferredDERP ni.PreferredDERP = report.PreferredDERP