TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-16 11:41:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

wgengine/magicsock: fix a naked return bug/crash where we returned (nil, true)

Browse Source 
The 'ok' from 'ipp, ok :=' above was the result parameter ok. Whoops.
This commit is contained in:
Brad Fitzpatrick 2021-01-19 10:57:30 -08:00
parent 51bd1feae4
commit edce91a8a6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wgengine/magicsock/magicsock.go
View File

@ -1535,21 +1535,21 @@ func (c *Conn) ReceiveIPv4(b []byte) (n int, ep conn.Endpoint, err error) {
func (c *Conn) receiveIP(b []byte, ua *net.UDPAddr, cache *ippEndpointCache) (ep conn.Endpoint, ok bool) { func (c *Conn) receiveIP(b []byte, ua *net.UDPAddr, cache *ippEndpointCache) (ep conn.Endpoint, ok bool) {
ipp, ok := netaddr.FromStdAddr(ua.IP, ua.Port, ua.Zone) ipp, ok := netaddr.FromStdAddr(ua.IP, ua.Port, ua.Zone)
if !ok { if !ok {
return return nil, false
} }
if stun.Is(b) { if stun.Is(b) {
c.stunReceiveFunc.Load().(func([]byte, netaddr.IPPort))(b, ipp) c.stunReceiveFunc.Load().(func([]byte, netaddr.IPPort))(b, ipp)
return return nil, false
} }
if c.handleDiscoMessage(b, ipp) { if c.handleDiscoMessage(b, ipp) {
return return nil, false
} }
if cache.ipp == ipp && cache.de != nil && cache.gen == cache.de.numStopAndReset() { if cache.ipp == ipp && cache.de != nil && cache.gen == cache.de.numStopAndReset() {
ep = cache.de ep = cache.de
} else { } else {
ep = c.findEndpoint(ipp, ua, b) ep = c.findEndpoint(ipp, ua, b)
if ep == nil { if ep == nil {
return return nil, false
} }
if de, ok := ep.(*discoEndpoint); ok { if de, ok := ep.(*discoEndpoint); ok {
cache.ipp = ipp cache.ipp = ipp