Skip to content

fix: fix BlockEndpoint condition checks #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deansheather merged 1 commit into from
Apr 22, 2025
Merged

fix: fix BlockEndpoint condition checks #71

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 24 additions & 25 deletions wgengine/magicsock/endpoint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -790,29 +790,29 @@ func (de *endpoint) updateFromNode(n *tailcfg.Node, heartbeatDisabled bool) {
}

var newIpps []netip.AddrPort
if !de.blockEndpoints {
for i, epStr := range n.Endpoints {
if i > math.MaxInt16 {
// Seems unlikely.
continue
}
ipp, err := netip.ParseAddrPort(epStr)
if err != nil {
de.c.logf("magicsock: bogus netmap endpoint %q", epStr)
continue
}
if st, ok := de.endpointState[ipp]; ok {
st.index = int16(i)
} else {
de.endpointState[ipp] = &endpointState{index: int16(i)}
newIpps = append(newIpps, ipp)
}
for i, epStr := range n.Endpoints {
if i > math.MaxInt16 {
// Seems unlikely.
continue
}
ipp, err := netip.ParseAddrPort(epStr)
if err != nil {
de.c.logf("magicsock: bogus netmap endpoint %q", epStr)
continue
}
if de.blockEndpoints && ipp.Addr() != tailcfg.DerpMagicIPAddr {
de.c.dlogf("[v1] magicsock: disco: updateFromNode: %v received non-DERP endpoint %v, but endpoints blocked",
de.publicKey.ShortString(),
ipp,
)
continue
}
if st, ok := de.endpointState[ipp]; ok {
st.index = int16(i)
} else {
de.endpointState[ipp] = &endpointState{index: int16(i)}
newIpps = append(newIpps, ipp)
}
} else {
de.c.dlogf("[v1] magicsock: disco: updateFromNode: %v received %d endpoints, but endpoints blocked",
de.publicKey.ShortString(),
len(n.Endpoints),
)
}
if len(newIpps) > 0 {
de.debugUpdates.Add(EndpointChange{
Expand Down Expand Up @@ -842,9 +842,8 @@ func (de *endpoint) addCandidateEndpoint(ep netip.AddrPort, forRxPingTxID stun.T
de.mu.Lock()
defer de.mu.Unlock()

isDERP := ep.Addr() == tailcfg.DerpMagicIPAddr
if isDERP && de.blockEndpoints {
de.c.logf("[unexpected] attempted to add candidate endpoint %v to %v (%v) but endpoints blocked", ep, de.discoShort(), de.publicKey.ShortString())
if de.blockEndpoints && ep.Addr() != tailcfg.DerpMagicIPAddr {
de.c.logf("[unexpected] attempted to add non-DERP candidate endpoint %v to %v (%v) but endpoints blocked", ep, de.discoShort(), de.publicKey.ShortString())
return false
}

Expand Down
Loading