mirror of
https://github.com/SagerNet/sing-tun.git
synced 2025-12-24 13:18:21 +08:00
Better atomic using
This commit is contained in:
@@ -51,12 +51,11 @@ func (m *defaultInterfaceMonitor) checkUpdate() error {
|
||||
return err
|
||||
}
|
||||
|
||||
oldInterface := m.defaultInterface.Load()
|
||||
newInterface, err := m.interfaceFinder.ByIndex(link.Attrs().Index)
|
||||
if err != nil {
|
||||
return E.Cause(err, "find updated interface: ", link.Attrs().Name)
|
||||
}
|
||||
m.defaultInterface.Store(newInterface)
|
||||
oldInterface := m.defaultInterface.Swap(newInterface)
|
||||
if oldInterface != nil && oldInterface.Equals(*newInterface) && oldVPNEnabled == m.androidVPNEnabled {
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -165,12 +165,11 @@ func (m *defaultInterfaceMonitor) checkUpdate() error {
|
||||
if defaultInterface == nil {
|
||||
return ErrNoRoute
|
||||
}
|
||||
oldInterface := m.defaultInterface.Load()
|
||||
newInterface, err := m.interfaceFinder.ByIndex(defaultInterface.Index)
|
||||
if err != nil {
|
||||
return E.Cause(err, "find updated interface: ", defaultInterface.Name)
|
||||
}
|
||||
m.defaultInterface.Store(newInterface)
|
||||
oldInterface := m.defaultInterface.Swap(newInterface)
|
||||
if oldInterface != nil && oldInterface.Equals(*newInterface) {
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -25,12 +25,11 @@ func (m *defaultInterfaceMonitor) checkUpdate() error {
|
||||
return err
|
||||
}
|
||||
|
||||
oldInterface := m.defaultInterface.Load()
|
||||
newInterface, err := m.interfaceFinder.ByIndex(link.Attrs().Index)
|
||||
if err != nil {
|
||||
return E.Cause(err, "find updated interface: ", link.Attrs().Name)
|
||||
}
|
||||
m.defaultInterface.Store(newInterface)
|
||||
oldInterface := m.defaultInterface.Swap(newInterface)
|
||||
if oldInterface != nil && oldInterface.Equals(*newInterface) {
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -102,12 +102,11 @@ func (m *defaultInterfaceMonitor) checkUpdate() error {
|
||||
return ErrNoRoute
|
||||
}
|
||||
|
||||
oldInterface := m.defaultInterface.Load()
|
||||
newInterface, err := m.interfaceFinder.ByIndex(index)
|
||||
if err != nil {
|
||||
return E.Cause(err, "find updated interface: ", alias)
|
||||
}
|
||||
m.defaultInterface.Store(newInterface)
|
||||
oldInterface := m.defaultInterface.Swap(newInterface)
|
||||
if oldInterface != nil && oldInterface.Equals(*newInterface) {
|
||||
return nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user