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

Support buggy devices without if_indextoname

Browse Source
This commit is contained in:
Mygod
2018-12-25 23:39:08 +08:00
parent 5a6b19d31a
commit 1cf9b7378d
2 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,6 +5,8 @@ import timber.log.Timber
import java.io.File
import java.io.IOException
import java.net.InetAddress
import java.net.NetworkInterface
import java.net.SocketException
data class IpNeighbour(val ip: InetAddress, val dev: String, val lladdr: String, val state: State) {
enum class State {
@@ -20,9 +22,15 @@ data class IpNeighbour(val ip: InetAddress, val dev: String, val lladdr: String,
*/
private val parser = "^(Deleted )?([^ ]+) dev ([^ ]+) (lladdr (.[^ ]+))?.*?( ([INCOMPLET,RAHBSDYF]+))?\$"
.toRegex()
/**
* Fallback format will be used if if_indextoname returns null, which some stupid devices do.
*
* Source: https://android.googlesource.com/platform/external/iproute2/+/4b9e917/lib/ll_map.c#152
*/
private val devFallback = "^if(\\d+)\$".toRegex()
private fun checkLladdrNotLoopback(lladdr: String) = if (lladdr == "00:00:00:00:00:00") "" else lladdr
fun parse(line: String): IpNeighbour? {
fun parse(line: String): List<IpNeighbour> {
return try {
val match = parser.matchEntire(line)!!
val ip = parseNumericAddress(match.groupValues[2]) // by regex, ip is non-empty
@@ -39,13 +47,21 @@ data class IpNeighbour(val ip: InetAddress, val dev: String, val lladdr: String,
"", "INCOMPLETE" -> State.INCOMPLETE
"REACHABLE", "DELAY", "STALE", "PROBE", "PERMANENT" -> State.VALID
"FAILED" -> State.FAILED
"NOARP" -> return null // skip
"NOARP" -> return emptyList() // skip
else -> throw IllegalArgumentException("Unknown state encountered: ${match.groupValues[7]}")
}
IpNeighbour(ip, dev, lladdr, state)
val result = IpNeighbour(ip, dev, lladdr, state)
val devParser = devFallback.matchEntire(dev)
if (devParser != null) try {
return listOf(IpNeighbour(ip, NetworkInterface.getByIndex(devParser.groupValues[1].toInt()).name,
lladdr, state), result)
} catch (e: SocketException) {
Timber.w(e)
}
listOf(result)
} catch (e: Exception) {
Timber.w(IllegalArgumentException("Unable to parse line: $line", e))
null
emptyList()
}
}

13
mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/IpNeighbourMonitor.kt
View File

@@ -40,11 +40,11 @@ class IpNeighbourMonitor private constructor() : IpMonitor() {
override fun processLine(line: String) {
synchronized(neighbours) {
val neighbour = IpNeighbour.parse(line) ?: return
val changed = if (neighbour.state == IpNeighbour.State.DELETING)
neighbours.remove(neighbour.ip) != null
else neighbours.put(neighbour.ip, neighbour) != neighbour
if (changed) postUpdateLocked()
if (IpNeighbour.parse(line).map { neighbour ->
if (neighbour.state == IpNeighbour.State.DELETING)
neighbours.remove(neighbour.ip) != null
else neighbours.put(neighbour.ip, neighbour) != neighbour
}.any { it }) postUpdateLocked()
}
}
@@ -52,8 +52,7 @@ class IpNeighbourMonitor private constructor() : IpMonitor() {
synchronized(neighbours) {
neighbours.clear()
neighbours.putAll(lines
.map(IpNeighbour.Companion::parse)
.filterNotNull()
.flatMap { IpNeighbour.parse(it).asSequence() }
.filter { it.state != IpNeighbour.State.DELETING } // skip entries without lladdr
.associateBy { it.ip })
postUpdateLocked()