Skip to content

android: stop watching legacy netmap notifications#797

Merged
bradfitz merged 1 commit into
mainfrom
bradfitz/rm_netmap
May 27, 2026
Merged

android: stop watching legacy netmap notifications#797
bradfitz merged 1 commit into
mainfrom
bradfitz/rm_netmap

Conversation

@bradfitz

Copy link
Copy Markdown
Member

Follow up to tailscale/tailscale#19607, which introduced the
constant-time node add/remove path and temporarily kept Android on
legacy Notify.NetMap emission.

Move the Android app notification watcher to InitialStatus plus
peer-change notifications, and opt both Android watchers out of
runtime NetMap delivery.

Updates tailscale/tailscale#12542

@bradfitz bradfitz requested review from barnstar and kari-ts May 26, 2026 18:41
Capabilities = Capabilities,
CapMap = CapMap,
ComputedName = computedName,
ComputedNameWithHost = computedName)

@kari-ts kari-ts May 26, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like we're not using ComputedNameWithHost today, though it's something we could do. Could you make this mirror InitDisplayName and show computedName (HostName) https://github.com/tailscale/tailscale/blob/main/tailcfg/tailcfg.go#L615 ?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

@bradfitz bradfitz force-pushed the bradfitz/rm_netmap branch from 752d39e to 1d60693 Compare May 27, 2026 19:18
@bradfitz

Copy link
Copy Markdown
Member Author

just fixed some problems around account switching back & forth between accounts where the previous version was retaining nodes in the display list (not in Go in wireguard) from the old account. seems to all work in the latest version now

Follow up to tailscale/tailscale#19607, which introduced the
constant-time node add/remove path and temporarily kept Android on
legacy Notify.NetMap emission.

Move the Android app notification watcher to InitialStatus plus
peer-change notifications, and opt both Android watchers out of
runtime NetMap delivery.

Updates tailscale/tailscale#12542

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
@bradfitz bradfitz force-pushed the bradfitz/rm_netmap branch from 1d60693 to 2907cce Compare May 27, 2026 20:03
@bradfitz

Copy link
Copy Markdown
Member Author

(merging per Slack chat w/ @kari-ts)

@bradfitz bradfitz merged commit 76c0e0e into main May 27, 2026
4 checks passed
@bradfitz bradfitz deleted the bradfitz/rm_netmap branch May 27, 2026 20:48
}

val self = notify.SelfChange
if (initial == null && self != null && !next.isSameSelf(self)) {

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we need to do userProfiles.clear() here too?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bradfitz added a commit that referenced this pull request May 27, 2026
… profile switch

This simplifies #797 now that tailscale/tailscale#19890 is in,
addressing #797 (comment)
which made me find the WatchIPNBus publishing-side bug.

In bumping oss, we also got a new go.toolchain.rev, which made me find
missing Makefile dependencies too (the AAR wasn't being rebuilt), so
fix that too.

Updates tailscale/tailscale#19889

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants