brianhansonxyz/vpnhotspotmod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use Os.if_indextoname

Browse Source
This commit is contained in:
Mygod
2020-07-11 02:59:55 +08:00
parent 6e571eccaf
commit e227353134
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mobile/src/main/java/be/mygod/vpnhotspot/net/IpNeighbour.kt
View File

@@ -2,6 +2,7 @@ package be.mygod.vpnhotspot.net
import android.os.Build import android.os.Build
import android.system.ErrnoException import android.system.ErrnoException
import android.system.Os
import android.system.OsConstants import android.system.OsConstants
import be.mygod.vpnhotspot.root.ReadArp import be.mygod.vpnhotspot.root.ReadArp
import be.mygod.vpnhotspot.root.RootManager import be.mygod.vpnhotspot.root.RootManager
@@ -13,8 +14,6 @@ import java.io.FileNotFoundException
import java.io.IOException import java.io.IOException
import java.net.Inet4Address import java.net.Inet4Address
import java.net.InetAddress import java.net.InetAddress
import java.net.NetworkInterface
import java.net.SocketException
data class IpNeighbour(val ip: InetAddress, val dev: String, val lladdr: MacAddressCompat, val state: State) { data class IpNeighbour(val ip: InetAddress, val dev: String, val lladdr: MacAddressCompat, val state: State) {
enum class State { enum class State {
@@ -39,12 +38,11 @@ data class IpNeighbour(val ip: InetAddress, val dev: String, val lladdr: MacAddr
private fun substituteDev(dev: String): Set<String> { private fun substituteDev(dev: String): Set<String> {
val devParser = devFallback.matchEntire(dev) val devParser = devFallback.matchEntire(dev)
if (devParser != null) try { if (devParser != null) {
val index = devParser.groupValues[1].toInt() val index = devParser.groupValues[1].toInt()
val iface = NetworkInterface.getByIndex(index) Os.if_indextoname(index)?.let { iface -> return setOf(dev, iface) }
if (iface == null) Timber.w("Failed to find network interface #$index") Timber.w("Failed to find network interface #$index")
else return setOf(dev, iface.name) }
} catch (_: SocketException) { }
return setOf(dev) return setOf(dev)
} }