mirror of
https://github.com/netbirdio/netbird.git
synced 2026-08-10 12:06:03 -04:00
c8adaa45da
The Android route notifier and the DNS search-domain notifier both delivered OnNetworkChanged from a fire-and-forget goroutine per update. Two updates in quick succession could reach the Java side reordered: the TUN rebuild handler applies them in arrival order and compares against the last applied parameters, so a stale route set delivered last won as the final TUN state. This is the same reordering hazard fixed for iOS in #6454. Wrap the Android network change listener into the shared tunnelnotifier FIFO introduced in #6870, the same way RunOniOS does, and deliver both notifiers synchronously into it. Enqueueing is non-blocking, a single delivery goroutine preserves order, and calls into Java never overlap. Also stop hasRouteDiff from sorting the notifier's shared route slices in place; compare sorted copies instead.
56 lines
1018 B
Go
56 lines
1018 B
Go
package dns
|
|
|
|
import (
|
|
"reflect"
|
|
"sort"
|
|
"sync"
|
|
|
|
"github.com/netbirdio/netbird/client/internal/listener"
|
|
)
|
|
|
|
type notifier struct {
|
|
listener listener.NetworkChangeListener
|
|
listenerMux sync.Mutex
|
|
searchDomains []string
|
|
}
|
|
|
|
func newNotifier(initialSearchDomains []string) *notifier {
|
|
sort.Strings(initialSearchDomains)
|
|
return ¬ifier{
|
|
searchDomains: initialSearchDomains,
|
|
}
|
|
}
|
|
|
|
func (n *notifier) setListener(listener listener.NetworkChangeListener) {
|
|
n.listenerMux.Lock()
|
|
defer n.listenerMux.Unlock()
|
|
n.listener = listener
|
|
}
|
|
|
|
func (n *notifier) onNewSearchDomains(searchDomains []string) {
|
|
sort.Strings(searchDomains)
|
|
|
|
if len(n.searchDomains) != len(searchDomains) {
|
|
n.searchDomains = searchDomains
|
|
n.notify()
|
|
return
|
|
}
|
|
|
|
if reflect.DeepEqual(n.searchDomains, searchDomains) {
|
|
return
|
|
}
|
|
|
|
n.searchDomains = searchDomains
|
|
n.notify()
|
|
}
|
|
|
|
func (n *notifier) notify() {
|
|
n.listenerMux.Lock()
|
|
defer n.listenerMux.Unlock()
|
|
if n.listener == nil {
|
|
return
|
|
}
|
|
|
|
n.listener.OnNetworkChanged("")
|
|
}
|