DYNR/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-08-05 00:15:26 -04:00
Code Issues 23.5k Packages Projects Releases 10 Wiki Activity

[PR #5807] [client] Fix NetworkAddresses discovery on Android and re-sync on network change #23970

New Issue
Open
opened 2026-08-05 06:08:05 -04:00 by saavagebueno · 0 comments
saavagebueno commented 2026-08-05 06:08:05 -04:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/netbirdio/netbird/pull/5807
Author: @MichaelUray
Created: 4/6/2026
Status: 🔄 Open

Base: main ← Head: fix/android-network-addresses

📝 Commits (10+)

  • 90b70e5 fix(client): fix NetworkAddresses discovery on Android and re-sync on network change
  • 3ae6931 fix(client): address coderabbitai review on NetworkAddresses resync
  • 9fb609e fix(client): use ExternalIFaceDiscover for Android network addresses
  • 3dc24af fix(client): inject IFaceDiscover into root context for login-path network addresses
  • b4a69c2 fix(client): extract networkAddressWatchInterval constant
  • dabf64c fix(client): address CodeRabbit review on NetworkAddresses resync
  • ca0b06d fix(client): pass ctx to networkAddresses on FreeBSD and fix codespell
  • 9583bd2 Merge remote-tracking branch 'upstream/main' into fix/android-network-addresses
  • 60e1a9f fix(client): pass ctx to networkAddresses on iOS after merging main
  • 446a428 Merge remote-tracking branch 'upstream/main' into fix/android-network-addresses

📊 Changes

15 files changed (+586 additions, -17 deletions)

View changed files

📝 .gitignore (+2 -0)
📝 client/android/client.go (+34 -0)
📝 client/internal/engine.go (+169 -8)
➕ client/internal/network_address_sync_test.go (+102 -0)
📝 client/system/info.go (+14 -0)
📝 client/system/info_android.go (+6 -0)
📝 client/system/info_darwin.go (+1 -1)
📝 client/system/info_freebsd.go (+1 -1)
📝 client/system/info_ios.go (+7 -0)
📝 client/system/info_linux.go (+1 -1)
📝 client/system/info_test.go (+25 -1)
📝 client/system/info_windows.go (+1 -1)
📝 client/system/network_addr.go (+21 -4)
➕ client/system/network_addresses.go (+26 -0)
➕ client/system/network_addresses_android.go (+176 -0)

📄 Description

Summary

Two issues prevented posture checks from working on Android:

  1. net.Interfaces() broken on Android 11+: SELinux blocks NETLINK_ROUTE sockets (golang/go#40569). Use wlynxg/anet (already an indirect dependency via pion/ice) as drop-in replacement on Android.
  2. MAC address filter skipped all interfaces: Android 10+ returns empty HardwareAddr for all interfaces, causing the MAC-based filter to skip everything. Removed the filter since loopback is already filtered by IP and MAC is only metadata not used for posture check matching.
  3. No re-sync on network change: When a mobile device switches between WiFi and cellular, NetworkAddresses changed but were never re-synced with the management server. Added a 10s network address watcher goroutine with 30s debounce that detects changes and triggers SyncMeta.

Includes unit tests for networkAddressesEqual() and networkAddresses().

Fixes #3614 #2962

Checklist

  • Bug fix
  • Create tests that fail without the change: added unit tests for address comparison and discovery
  • Documentation is not needed for this change (internal client behavior, no user-facing API or configuration change)

By submitting this pull request, I confirm that I have read and agree to the terms of the Contributor License Agreement.

Related Issues

Related #3968 — Posture checks peer network range failed on iPhone (Android side)
Related #4657 — iOS Client loses all routes when Posture Checks enabled (Android side)
Related #5810 — Feature Request: Expose peer LAN network addresses via API

Summary by CodeRabbit

  • New Features

    • Android can trigger immediate metadata re-syncs when the underlying network changes.
    • Periodic background detection of local network changes prompts resyncs.

  • Bug Fixes

    • More reliable, debounced detection of network-address changes to reduce missed or duplicate updates.
    • Network discovery now respects caller context, captures interface MACs, and avoids loopback addresses or duplicates.

  • Tests

    • Added tests for address comparison and uniqueness.

  • Chores

    • Updated .gitignore to exclude build and generated docs directories.

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/netbirdio/netbird/pull/5807 **Author:** [@MichaelUray](https://github.com/MichaelUray) **Created:** 4/6/2026 **Status:** 🔄 Open **Base:** `main` ← **Head:** `fix/android-network-addresses` --- ### 📝 Commits (10+) - [`90b70e5`](https://github.com/netbirdio/netbird/commit/90b70e534a60bb5868cab7f165c4a9fd60ffc078) fix(client): fix NetworkAddresses discovery on Android and re-sync on network change - [`3ae6931`](https://github.com/netbirdio/netbird/commit/3ae6931e44f1ab6dcd1e3b618807fd306aef339b) fix(client): address coderabbitai review on NetworkAddresses resync - [`9fb609e`](https://github.com/netbirdio/netbird/commit/9fb609ef46c64ed9e06488639461978d60551a20) fix(client): use ExternalIFaceDiscover for Android network addresses - [`3dc24af`](https://github.com/netbirdio/netbird/commit/3dc24af0a269c688ed3fb84d30adbaffb93520da) fix(client): inject IFaceDiscover into root context for login-path network addresses - [`b4a69c2`](https://github.com/netbirdio/netbird/commit/b4a69c2c4f1e800e17392b554c05f1146274356b) fix(client): extract networkAddressWatchInterval constant - [`dabf64c`](https://github.com/netbirdio/netbird/commit/dabf64ccfef9460cfe0fb1371dbd6cb59505a429) fix(client): address CodeRabbit review on NetworkAddresses resync - [`ca0b06d`](https://github.com/netbirdio/netbird/commit/ca0b06de265f7ffdb931c731a50b2976b7f161d4) fix(client): pass ctx to networkAddresses on FreeBSD and fix codespell - [`9583bd2`](https://github.com/netbirdio/netbird/commit/9583bd29f816d3061e5a3adfdf7ff707108a703b) Merge remote-tracking branch 'upstream/main' into fix/android-network-addresses - [`60e1a9f`](https://github.com/netbirdio/netbird/commit/60e1a9fae7803f95fd4f641b981e5d5582aae240) fix(client): pass ctx to networkAddresses on iOS after merging main - [`446a428`](https://github.com/netbirdio/netbird/commit/446a42891401c2f4cf53515d32b3c58fc0c23244) Merge remote-tracking branch 'upstream/main' into fix/android-network-addresses ### 📊 Changes **15 files changed** (+586 additions, -17 deletions) <details> <summary>View changed files</summary> 📝 `.gitignore` (+2 -0) 📝 `client/android/client.go` (+34 -0) 📝 `client/internal/engine.go` (+169 -8) ➕ `client/internal/network_address_sync_test.go` (+102 -0) 📝 `client/system/info.go` (+14 -0) 📝 `client/system/info_android.go` (+6 -0) 📝 `client/system/info_darwin.go` (+1 -1) 📝 `client/system/info_freebsd.go` (+1 -1) 📝 `client/system/info_ios.go` (+7 -0) 📝 `client/system/info_linux.go` (+1 -1) 📝 `client/system/info_test.go` (+25 -1) 📝 `client/system/info_windows.go` (+1 -1) 📝 `client/system/network_addr.go` (+21 -4) ➕ `client/system/network_addresses.go` (+26 -0) ➕ `client/system/network_addresses_android.go` (+176 -0) </details> ### 📄 Description ## Summary Two issues prevented posture checks from working on Android: 1. **`net.Interfaces()` broken on Android 11+**: SELinux blocks `NETLINK_ROUTE` sockets ([golang/go#40569](https://github.com/golang/go/issues/40569)). Use `wlynxg/anet` (already an indirect dependency via pion/ice) as drop-in replacement on Android. 2. **MAC address filter skipped all interfaces**: Android 10+ returns empty `HardwareAddr` for all interfaces, causing the MAC-based filter to skip everything. Removed the filter since loopback is already filtered by IP and MAC is only metadata not used for posture check matching. 3. **No re-sync on network change**: When a mobile device switches between WiFi and cellular, NetworkAddresses changed but were never re-synced with the management server. Added a 10s network address watcher goroutine with 30s debounce that detects changes and triggers `SyncMeta`. Includes unit tests for `networkAddressesEqual()` and `networkAddresses()`. Fixes #3614 #2962 ## Checklist - [x] Bug fix - [x] Create tests that fail without the change: added unit tests for address comparison and discovery - [x] Documentation is **not needed** for this change (internal client behavior, no user-facing API or configuration change) By submitting this pull request, I confirm that I have read and agree to the terms of the [Contributor License Agreement](https://github.com/netbirdio/netbird/blob/main/CONTRIBUTOR_LICENSE_AGREEMENT.md). ## Related Issues Related #3968 — Posture checks peer network range failed on iPhone (Android side) Related #4657 — iOS Client loses all routes when Posture Checks enabled (Android side) Related #5810 — Feature Request: Expose peer LAN network addresses via API <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **New Features** * Android can trigger immediate metadata re-syncs when the underlying network changes. * Periodic background detection of local network changes prompts resyncs. * **Bug Fixes** * More reliable, debounced detection of network-address changes to reduce missed or duplicate updates. * Network discovery now respects caller context, captures interface MACs, and avoids loopback addresses or duplicates. * **Tests** * Added tests for address comparison and uniqueness. * **Chores** * Updated .gitignore to exclude build and generated docs directories. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
saavagebueno added the pull-request label 2026-08-05 06:08:05 -04:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
2021 Q4
2021 Q4
2021 Q4
2022 Q1
2022 Q1
2022 Q1
2022 Q1
2022 Q1
2022 Q1
accessibility
accessibility
accessibility
acl
acl
acl
agent
agent
agent
agent
agent
agent
Android
Android
Android
Android
Android
Android
api
api
api
authentik
authentik
authentik
automation
automation
automation
azure
azure
azure
battery-usage
battery-usage
battery-usage
bug
cache
cache
cache
client
client
client
client-ui
client-ui
client-ui
cloud
cloud
cloud
cloud-only
cloud-only
cloud-only
cloudflare
cloudflare
cloudflare
community
community
community
compatibility
compatibility
compatibility
config-idp
config-idp
config-idp
config-issue
config-issue
config-issue
connection
connection
connection
contribution
contribution
contribution
coturn
coturn
coturn
cross-vpn
cross-vpn
cross-vpn
dashboard
dashboard
dashboard
data-usage
data-usage
data-usage
distribution
distribution
distribution
dns
dns
dns
docker
docker
docker
documentation
documentation
documentation
duplicate
duplicate
duplicate
enhancement
enhancement
event-stream
event-stream
event-stream
feature-request
feature-request
feature-request
freebsd
freebsd
freebsd
getting-started
getting-started
getting-started
go
go
go
good first issue
good first issue
good first issue
gui
gui
gui
help wanted
help wanted
help wanted
home-assistant
home-assistant
home-assistant
idp
idp
idp
inconsistency
inconsistency
inconsistency
integration
integration
integration
integrations
integrations
integrations
ios
ios
ios
ipv6
ipv6
ipv6
jwt
jwt
jwt
k8s
k8s
k8s
keycloak
keycloak
keycloak
linux
linux
linux
login
login
login
macos
macos
macos
management-service
management-service
management-service
Medium
Medium
Medium
missing-docs
missing-docs
missing-docs
mobile
mobile
mobile
moved-internal
moved-internal
moved-internal
needs-review
needs-review
needs-review
netbird-ui
netbird-ui
netbird-ui
networking
networking
networking
new-platform
new-platform
new-platform
nginx
nginx
nginx
notification
notification
notification
okta
okta
okta
openwrt
openwrt
openwrt
P2
P2
P2
packaging
packaging
packaging
peer-management
peer-management
peer-management
peer-management
peer-management
peer-management
peer-management
peer-management
peer-management
performance
performance
performance
postgres
postgres
postgres
posture-checks
posture-checks
posture-checks
psk
psk
psk
pull-request
Mirrored from GitHub Pull Request
 question
question
question
refactor
refactor
refactor
relay
relay
relay
release
release
release
rfc
rfc
rfc
routes
routes
routes
security
security
security
security-improvement
security-improvement
security-improvement
security-related
security-related
security-related
self-hosting
self-hosting
self-hosting
server
server
server
signal
signal
signal
sleep-issue
sleep-issue
sleep-issue
ssh
ssh
ssh
ssl
ssl
ssl
status
status
status
store
store
store
synology
synology
synology
system-compatibility-issue
system-compatibility-issue
system-compatibility-issue
test-suite
test-suite
test-suite
third-party-integration
third-party-integration
third-party-integration
triage
triage
triage
triage
triage
triage
triage-needed
triage-needed
triage-needed
troubleshooting
troubleshooting
troubleshooting
UX
UX
UX
waiting-feedback
waiting-feedback
waiting-feedback
windows
windows
windows
wontfix
wontfix
wontfix
zitadel
zitadel
zitadel
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
dynr-servers saavagebueno
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: DYNR/netbird#23970
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?