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

Fix MAC not showing for failures

Browse Source
This commit is contained in:
Mygod
2018-01-20 23:39:07 -08:00
parent 8655562518
commit 03ccaf2a98
4 changed files with 54 additions and 35 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

@@ -1,9 +1,8 @@
package be.mygod.vpnhotspot.net
import android.util.Log
import be.mygod.vpnhotspot.debugLog
data class IpNeighbour(val ip: String, val dev: String, val lladdr: String) {
data class IpNeighbour(val ip: String, val dev: String, val lladdr: String, val state: State) {
enum class State {
INCOMPLETE, VALID, VALID_DELAY, FAILED, DELETING
}
@@ -15,29 +14,36 @@ data class IpNeighbour(val ip: String, val dev: String, val lladdr: String) {
* Parser based on:
* https://android.googlesource.com/platform/external/iproute2/+/ad0a6a2/ip/ipneigh.c#194
* https://people.cs.clemson.edu/~westall/853/notes/arpstate.pdf
* Assumptions: IPv4 only, RTM_GETNEIGH is never used and show_stats = 0
* Assumptions: IP addr (key) always present, IPv4 only, RTM_GETNEIGH is never used and show_stats = 0
*/
private val parser =
"^(Deleted )?((.+?) )?(dev (.+?) )?(lladdr (.+?))?( proxy)?( ([INCOMPLET,RAHBSDYF]+))?\$".toRegex()
fun parse(line: String): Pair<IpNeighbour, State>? {
"^(Deleted )?(.+?) (dev (.+?) )?(lladdr (.+?))?( proxy)?( ([INCOMPLET,RAHBSDYF]+))?\$".toRegex()
fun parse(line: String): IpNeighbour? {
val match = parser.matchEntire(line)
if (match == null) {
if (!line.isBlank()) Log.w(TAG, line)
return null
}
val neighbour = IpNeighbour(match.groupValues[3], match.groupValues[5], match.groupValues[7])
val state = if (match.groupValues[1].isNotEmpty()) State.DELETING else when (match.groupValues[10]) {
val ip = match.groupValues[2]
val dev = match.groupValues[4]
var lladdr = match.groupValues[6]
// use ARP as fallback
if (dev.isNotBlank() && lladdr.isBlank()) lladdr = (NetUtils.arp()
.filter { it[NetUtils.ARP_IP_ADDRESS] == ip && it[NetUtils.ARP_DEVICE] == dev }
.map { it[NetUtils.ARP_HW_ADDRESS] }
.singleOrNull() ?: "")
val state = if (match.groupValues[1].isNotEmpty()) State.DELETING else when (match.groupValues[9]) {
"", "INCOMPLETE" -> State.INCOMPLETE
"REACHABLE", "STALE", "PROBE", "PERMANENT" -> State.VALID
"DELAY" -> State.VALID_DELAY
"FAILED" -> State.FAILED
"NOARP" -> return null // skip
else -> {
Log.w(TAG, "Unknown state encountered: ${match.groupValues[10]}")
Log.w(TAG, "Unknown state encountered: ${match.groupValues[9]}")
return null
}
}
return Pair(neighbour, state)
return IpNeighbour(ip, dev, lladdr, state)
}
}
}