jp/baresip-studio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved network and DNS server update

Browse Source
This commit is contained in:
Juha Heinanen
2026-04-17 21:54:44 +03:00
parent db086ad11d
commit 2d9b1b13bf
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
+13 -10
View File
@@ -1935,7 +1935,7 @@ class BaresipService: Service() {
private fun updateNetwork() { private fun updateNetwork() {
if (!isNativeReady) return if (!isNativeReady) return
updateDnsServers() val dnsChanged = updateDnsServers()
val addresses = linkAddresses() val addresses = linkAddresses()
if (linkAddresses != addresses) if (linkAddresses != addresses)
@@ -1960,10 +1960,10 @@ class BaresipService: Service() {
} }
val active = cm.activeNetwork val active = cm.activeNetwork
if (added != removed || activeNetwork != active) if (added != removed || activeNetwork != active || dnsChanged)
Log.d(TAG, "Added/Removed = $added/$removed Old/New Active = $activeNetwork/$active") Log.d(TAG, "Added/Removed = $added/$removed Old/New Active = $activeNetwork/$active DNS Changed = $dnsChanged")
if (added > 0 || removed > 0 || active != activeNetwork) { if (added > 0 || removed > 0 || active != activeNetwork || dnsChanged) {
Api.net_debug() Api.net_debug()
linkAddresses = addresses linkAddresses = addresses
activeNetwork = active activeNetwork = active
@@ -1994,13 +1994,14 @@ class BaresipService: Service() {
synchronized(allNetworks) { synchronized(allNetworks) {
for (n in allNetworks) { for (n in allNetworks) {
val caps = cm.getNetworkCapabilities(n) ?: continue val caps = cm.getNetworkCapabilities(n) ?: continue
if (caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_FOREGROUND)) { if (caps.hasCapability(NetworkCapabilities.NET_CAPABILITY_FOREGROUND) ||
caps.hasTransport(NetworkCapabilities.TRANSPORT_VPN)
) {
val props = cm.getLinkProperties(n) ?: continue val props = cm.getLinkProperties(n) ?: continue
for (la in props.linkAddresses) for (la in props.linkAddresses)
if (la.scope == OsConstants.RT_SCOPE_UNIVERSE && if (la.scope == OsConstants.RT_SCOPE_UNIVERSE &&
props.interfaceName != null && la.address.hostAddress != null && props.interfaceName != null && la.address.hostAddress != null &&
afMatch(la.address.hostAddress!!) afMatch(la.address.hostAddress!!))
)
addresses[la.address.hostAddress!!] = props.interfaceName!! addresses[la.address.hostAddress!!] = props.interfaceName!!
} }
} }
@@ -2021,9 +2022,9 @@ class BaresipService: Service() {
} }
} }
private fun updateDnsServers() { private fun updateDnsServers(): Boolean {
if (isServiceRunning && !dynDns) if (isServiceRunning && !dynDns)
return return false
val servers = mutableListOf<InetAddress>() val servers = mutableListOf<InetAddress>()
// Use DNS servers first from active network (if available) // Use DNS servers first from active network (if available)
val activeNetwork = cm.activeNetwork val activeNetwork = cm.activeNetwork
@@ -2047,8 +2048,10 @@ class BaresipService: Service() {
} else { } else {
// Log.d(TAG, "Updated DNS servers: '${servers}'") // Log.d(TAG, "Updated DNS servers: '${servers}'")
dnsServers = servers dnsServers = servers
return true
} }
} }
return false
} }
private fun registerAndroidContactsObserver() { private fun registerAndroidContactsObserver() {