mirror of
https://github.com/netbirdio/netbird.git
synced 2026-08-11 12:37:13 -04:00
09f7fb6510
Android startup opened a throwaway Sync stream to management before creating the TUN device, only to learn the initial routes, DNS config and the DNS feature flag. Server side this computed a full network map and broadcast a false connect/disconnect pair to every peer in the account on every Android start; client side it put a blocking network round trip on the critical startup path and failed the whole engine start when management was unreachable. None of its outputs are needed upfront anymore: the TUN is created empty and the first sync triggers a rebuild that pulls the fresh route and search domain state, the permanent DNS server starts with an empty config that the first sync populates, and the fake IP manager is created lazily when the DNS feature flag turns on. Remove readInitialSettings and its plumbing: the InitialRoutes and DNSFeatureFlag manager config fields, the android construction-time route setup, the initial-route bookkeeping in the notifiers and the now-unused GetNetworkMap client method.
94 lines
1.8 KiB
Go
94 lines
1.8 KiB
Go
//go:build android
|
|
|
|
package notifier
|
|
|
|
import (
|
|
"net/netip"
|
|
"slices"
|
|
"sort"
|
|
"sync"
|
|
|
|
"github.com/netbirdio/netbird/client/internal/listener"
|
|
"github.com/netbirdio/netbird/route"
|
|
)
|
|
|
|
type Notifier struct {
|
|
mu sync.Mutex
|
|
|
|
// currentRoutes is the last announced route set. It exists only to
|
|
// suppress noise: without it every network map sync would trigger the
|
|
// Java side, even when the routes did not change. The actual TUN route
|
|
// state is owned by the route manager and pulled from there.
|
|
currentRoutes []*route.Route
|
|
|
|
listener listener.NetworkChangeListener
|
|
}
|
|
|
|
func NewNotifier() *Notifier {
|
|
return &Notifier{}
|
|
}
|
|
|
|
func (n *Notifier) SetListener(listener listener.NetworkChangeListener) {
|
|
n.mu.Lock()
|
|
defer n.mu.Unlock()
|
|
n.listener = listener
|
|
}
|
|
|
|
func (n *Notifier) NotifyRouteChange() {
|
|
n.mu.Lock()
|
|
defer n.mu.Unlock()
|
|
n.notifyLocked()
|
|
}
|
|
|
|
func (n *Notifier) OnNewRoutes(idMap route.HAMap) {
|
|
var newRoutes []*route.Route
|
|
for _, routes := range idMap {
|
|
for _, r := range routes {
|
|
if r.IsDynamic() {
|
|
continue
|
|
}
|
|
newRoutes = append(newRoutes, r)
|
|
}
|
|
}
|
|
|
|
n.mu.Lock()
|
|
defer n.mu.Unlock()
|
|
if !hasRouteDiff(n.currentRoutes, newRoutes) {
|
|
return
|
|
}
|
|
|
|
n.currentRoutes = newRoutes
|
|
n.notifyLocked()
|
|
}
|
|
|
|
func (n *Notifier) OnNewPrefixes([]netip.Prefix) {
|
|
// Not used on Android
|
|
}
|
|
|
|
func (n *Notifier) notifyLocked() {
|
|
if n.listener == nil {
|
|
return
|
|
}
|
|
n.listener.OnNetworkChanged("")
|
|
}
|
|
|
|
func (n *Notifier) Close() {
|
|
// unused
|
|
}
|
|
|
|
func routesToStrings(routes []*route.Route) []string {
|
|
nets := make([]string, 0, len(routes))
|
|
for _, r := range routes {
|
|
nets = append(nets, r.NetString())
|
|
}
|
|
return nets
|
|
}
|
|
|
|
func hasRouteDiff(a []*route.Route, b []*route.Route) bool {
|
|
as := routesToStrings(a)
|
|
bs := routesToStrings(b)
|
|
sort.Strings(as)
|
|
sort.Strings(bs)
|
|
return !slices.Equal(as, bs)
|
|
}
|