Fix deadlock on network update

nekohasekai · nekohasekai · commit 6ef2a6cdaaea · 2024-02-26T22:52:11.000+08:00
diff --git a/monitor_shared.go b/monitor_shared.go
@@ -132,9 +132,6 @@ func (m *defaultInterfaceMonitor) DefaultInterfaceName(destination netip.Addr) s
 			}
 		}
 	}
-	if m.defaultInterfaceIndex == -1 {
-		m.checkUpdate()
-	}
 	return m.defaultInterfaceName
 }
 
@@ -146,9 +143,6 @@ func (m *defaultInterfaceMonitor) DefaultInterfaceIndex(destination netip.Addr)
 			}
 		}
 	}
-	if m.defaultInterfaceIndex == -1 {
-		m.checkUpdate()
-	}
 	return m.defaultInterfaceIndex
 }
 
@@ -160,9 +154,6 @@ func (m *defaultInterfaceMonitor) DefaultInterface(destination netip.Addr) (stri
 			}
 		}
 	}
-	if m.defaultInterfaceIndex == -1 {
-		m.checkUpdate()
-	}
 	return m.defaultInterfaceName, m.defaultInterfaceIndex
 }
 

Original file line number	Diff line number	Diff line change
`@@ -132,9 +132,6 @@ func (m *defaultInterfaceMonitor) DefaultInterfaceName(destination netip.Addr) s`
`132`	`132`	`}`
`133`	`133`	`}`
`134`	`134`	`}`
`135`		`- if m.defaultInterfaceIndex == -1 {`
`136`		`- m.checkUpdate()`
`137`		`- }`
`138`	`135`	`return m.defaultInterfaceName`
`139`	`136`	`}`
`140`	`137`
`@@ -146,9 +143,6 @@ func (m *defaultInterfaceMonitor) DefaultInterfaceIndex(destination netip.Addr)`
`146`	`143`	`}`
`147`	`144`	`}`
`148`	`145`	`}`
`149`		`- if m.defaultInterfaceIndex == -1 {`
`150`		`- m.checkUpdate()`
`151`		`- }`
`152`	`146`	`return m.defaultInterfaceIndex`
`153`	`147`	`}`
`154`	`148`
`@@ -160,9 +154,6 @@ func (m *defaultInterfaceMonitor) DefaultInterface(destination netip.Addr) (stri`
`160`	`154`	`}`
`161`	`155`	`}`
`162`	`156`	`}`
`163`		`- if m.defaultInterfaceIndex == -1 {`
`164`		`- m.checkUpdate()`
`165`		`- }`
`166`	`157`	`return m.defaultInterfaceName, m.defaultInterfaceIndex`
`167`	`158`	`}`
`168`	`159`