TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-18 20:51:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

wgengine/magicsock: don't log on UDP send errors if address family known missing

Browse Source 
Fixes #376
This commit is contained in:
Brad Fitzpatrick 2020-05-29 12:40:51 -07:00
parent d3134ad0c8
commit db2a216561
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
wgengine/magicsock/magicsock.go
View File

@ -123,6 +123,13 @@ type Conn struct {
// peerLastDerp tracks which DERP node we last used to speak with a // peerLastDerp tracks which DERP node we last used to speak with a
// peer. It's only used to quiet logging, so we only log on change. // peer. It's only used to quiet logging, so we only log on change.
peerLastDerp map[key.Public]int peerLastDerp map[key.Public]int
// noV4 and noV6 are whether IPv4 and IPv6 are known to be
// missing. They're only used to suppress log spam. The name
// is named negatively because in early start-up, we don't yet
// necessarily have a netcheck.Report and don't want to skip
// logging.
noV4, noV6 syncs.AtomicBool
} }
// derpRoute is a route entry for a public key, saying that a certain // derpRoute is a route entry for a public key, saying that a certain
@ -347,6 +354,9 @@ func (c *Conn) updateNetInfo(ctx context.Context) (*netcheck.Report, error) {
return nil, err return nil, err
} }
c.noV4.Set(!report.IPv4)
c.noV6.Set(!report.IPv6)
ni := &tailcfg.NetInfo{ ni := &tailcfg.NetInfo{
DERPLatency: map[string]float64{}, DERPLatency: map[string]float64{},
MappingVariesByDestIP: report.MappingVariesByDestIP, MappingVariesByDestIP: report.MappingVariesByDestIP,
@ -746,10 +756,16 @@ var errDropDerpPacket = errors.New("too many DERP packets queued; dropping")
func (c *Conn) sendUDP(addr *net.UDPAddr, b []byte) error { func (c *Conn) sendUDP(addr *net.UDPAddr, b []byte) error {
if addr.IP.To4() != nil { if addr.IP.To4() != nil {
_, err := c.pconn4.WriteTo(b, addr) _, err := c.pconn4.WriteTo(b, addr)
if err != nil && c.noV4.Get() {
return nil
}
return err return err
} }
if c.pconn6 != nil { if c.pconn6 != nil {
_, err := c.pconn6.WriteTo(b, addr) _, err := c.pconn6.WriteTo(b, addr)
if err != nil && c.noV6.Get() {
return nil
}
return err return err
} }
return nil // ignore IPv6 dest if we don't have an IPv6 address. return nil // ignore IPv6 dest if we don't have an IPv6 address.