permissionlesstech/bitchat-android
1
0
Fork 0
mirror of https://github.com/permissionlesstech/bitchat-android.git synced 2026-07-25 13:25:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(wifi-aware): use bindSocket and scoped IPv6 instead of bindProcessToNetwork

Browse Source
This commit is contained in:
aidenvalue
2026-01-03 11:55:13 +01:00
parent ecc7e93930
commit 37c764b55a
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/bitchat/android/wifi-aware/WifiAwareMeshServiceLatest.kt
+16 -9
View File
@@ -536,8 +536,6 @@ class WifiAwareMeshService(private val context: Context) {
serverSockets.clear() serverSockets.clear()
peerSockets.clear() peerSockets.clear()
cm.bindProcessToNetwork(null)
peerManager.shutdown() peerManager.shutdown()
fragmentManager.shutdown() fragmentManager.shutdown()
securityManager.shutdown() securityManager.shutdown()
@@ -597,10 +595,9 @@ class WifiAwareMeshService(private val context: Context) {
val cb = object : ConnectivityManager.NetworkCallback() { val cb = object : ConnectivityManager.NetworkCallback() {
override fun onAvailable(network: Network) { override fun onAvailable(network: Network) {
cm.bindProcessToNetwork(network)
try { try {
val client = ss.accept().apply { keepAlive = true } val client = ss.accept().apply { keepAlive = true }
Log.d(TAG, "SERVER: accepted TCP from ${peerId.take(8)}… addr=${client.inetAddress?.hostAddress}") Log.d(TAG, "SERVER: accepted TCP from \${peerId.take(8)}… addr=\${client.inetAddress?.hostAddress}")
peerSockets[peerId] = client peerSockets[peerId] = client
try { peerManager.setDirectConnection(peerId, true) } catch (_: Exception) {} try { peerManager.setDirectConnection(peerId, true) } catch (_: Exception) {}
try { peerManager.addOrUpdatePeer(peerId, peerId) } catch (_: Exception) {} try { peerManager.addOrUpdatePeer(peerId, peerId) } catch (_: Exception) {}
@@ -618,9 +615,8 @@ class WifiAwareMeshService(private val context: Context) {
} }
} }
override fun onLost(network: Network) { override fun onLost(network: Network) {
cm.bindProcessToNetwork(null)
networkCallbacks.remove(peerId) networkCallbacks.remove(peerId)
Log.d(TAG, "SERVER: network lost for ${peerId.take(8)}…") Log.d(TAG, "SERVER: network lost for \${peerId.take(8)}…")
} }
} }
@@ -713,14 +709,25 @@ class WifiAwareMeshService(private val context: Context) {
val info = (nc.transportInfo as? WifiAwareNetworkInfo) ?: return val info = (nc.transportInfo as? WifiAwareNetworkInfo) ?: return
val addr = info.peerIpv6Addr as Inet6Address val addr = info.peerIpv6Addr as Inet6Address
val lp = cm.getLinkProperties(network)
val iface = lp?.interfaceName
try { try {
// Some devices deny bindSocket() (EPERM). Rely on scoped IPv6 to route correctly.
val sock = Socket() val sock = Socket()
network.bindSocket(sock)
sock.tcpNoDelay = true sock.tcpNoDelay = true
sock.keepAlive = true sock.keepAlive = true
sock.connect(java.net.InetSocketAddress(addr, port), 7000)
Log.d(TAG, "CLIENT: TCP connected to ${peerId.take(8)}… addr=$addr:$port") // Use scoped IPv6 if interface name is available
val scopedAddr = if (iface != null && addr.scopeId == 0) {
Inet6Address.getByAddress(null, addr.address, java.net.NetworkInterface.getByName(iface))
} else {
addr
}
sock.connect(java.net.InetSocketAddress(scopedAddr, port), 7000)
Log.d(TAG, "CLIENT: TCP connected to \${peerId.take(8)}… addr=\$scopedAddr:\$port (iface=\$iface)")
peerSockets[peerId] = sock peerSockets[peerId] = sock
try { peerManager.setDirectConnection(peerId, true) } catch (_: Exception) {} try { peerManager.setDirectConnection(peerId, true) } catch (_: Exception) {}
try { peerManager.addOrUpdatePeer(peerId, peerId) } catch (_: Exception) {} try { peerManager.addOrUpdatePeer(peerId, peerId) } catch (_: Exception) {}