mirror of
https://github.com/netbirdio/netbird.git
synced 2026-04-16 07:16:38 +00:00
7483fec048
extraInitialRoutes() was meant to preserve only the fake IP route (240.0.0.0/8) across TUN rebuilds, but it re-injected any initial route missing from the current set. When the management server advertised exit node routes (0.0.0.0/0) that were later filtered by the route selector, extraInitialRoutes() re-added them, causing the Android VPN to capture all traffic with no peer to handle it. Store the fake IP route explicitly and append only that in notify(), removing the overly broad initial route diffing.
84 lines
1.6 KiB
Go
84 lines
1.6 KiB
Go
//go:build ios
|
|
|
|
package notifier
|
|
|
|
import (
|
|
"net/netip"
|
|
"slices"
|
|
"sort"
|
|
"strings"
|
|
"sync"
|
|
|
|
"github.com/netbirdio/netbird/client/internal/listener"
|
|
"github.com/netbirdio/netbird/route"
|
|
)
|
|
|
|
type Notifier struct {
|
|
currentPrefixes []string
|
|
|
|
listener listener.NetworkChangeListener
|
|
listenerMux sync.Mutex
|
|
}
|
|
|
|
func NewNotifier() *Notifier {
|
|
return &Notifier{}
|
|
}
|
|
|
|
func (n *Notifier) SetListener(listener listener.NetworkChangeListener) {
|
|
n.listenerMux.Lock()
|
|
defer n.listenerMux.Unlock()
|
|
n.listener = listener
|
|
}
|
|
|
|
func (n *Notifier) SetInitialClientRoutes([]*route.Route, []*route.Route) {
|
|
// iOS doesn't care about initial routes
|
|
}
|
|
|
|
func (n *Notifier) SetFakeIPRoute(*route.Route) {
|
|
// Not used on iOS
|
|
}
|
|
|
|
func (n *Notifier) OnNewRoutes(route.HAMap) {
|
|
// Not used on iOS
|
|
}
|
|
|
|
func (n *Notifier) OnNewPrefixes(prefixes []netip.Prefix) {
|
|
newNets := make([]string, 0)
|
|
for _, prefix := range prefixes {
|
|
newNets = append(newNets, prefix.String())
|
|
}
|
|
|
|
sort.Strings(newNets)
|
|
|
|
if slices.Equal(n.currentPrefixes, newNets) {
|
|
return
|
|
}
|
|
|
|
n.currentPrefixes = newNets
|
|
n.notify()
|
|
}
|
|
func (n *Notifier) notify() {
|
|
n.listenerMux.Lock()
|
|
defer n.listenerMux.Unlock()
|
|
if n.listener == nil {
|
|
return
|
|
}
|
|
|
|
go func(l listener.NetworkChangeListener) {
|
|
l.OnNetworkChanged(strings.Join(n.addIPv6RangeIfNeeded(n.currentPrefixes), ","))
|
|
}(n.listener)
|
|
}
|
|
|
|
func (n *Notifier) GetInitialRouteRanges() []string {
|
|
return nil
|
|
}
|
|
|
|
func (n *Notifier) addIPv6RangeIfNeeded(inputRanges []string) []string {
|
|
for _, r := range inputRanges {
|
|
if r == "0.0.0.0/0" {
|
|
return append(slices.Clone(inputRanges), "::/0")
|
|
}
|
|
}
|
|
return inputRanges
|
|
}
|