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

Refine parsing mac

Browse Source
This commit is contained in:
Mygod
2019-02-17 12:45:25 +08:00
parent 33b964c99e
commit ab4307b60c
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,6 +5,7 @@ import be.mygod.vpnhotspot.util.parseNumericAddress
import timber.log.Timber import timber.log.Timber
import java.io.File import java.io.File
import java.io.IOException import java.io.IOException
import java.lang.NumberFormatException
import java.net.InetAddress import java.net.InetAddress
import java.net.NetworkInterface import java.net.NetworkInterface
import java.net.SocketException import java.net.SocketException
@@ -37,7 +38,7 @@ data class IpNeighbour(val ip: InetAddress, val dev: String, val lladdr: Long, v
val ip = parseNumericAddress(match.groupValues[2]) // by regex, ip is non-empty val ip = parseNumericAddress(match.groupValues[2]) // by regex, ip is non-empty
val dev = match.groupValues[3] // by regex, dev is non-empty as well val dev = match.groupValues[3] // by regex, dev is non-empty as well
var lladdr = checkLladdrNotLoopback(match.groupValues[5]) var lladdr = checkLladdrNotLoopback(match.groupValues[5])
// use ARP as fallback // use ARP as fallback for IPv4
if (lladdr.isEmpty()) lladdr = checkLladdrNotLoopback(arp() if (lladdr.isEmpty()) lladdr = checkLladdrNotLoopback(arp()
.asSequence() .asSequence()
.filter { parseNumericAddress(it[ARP_IP_ADDRESS]) == ip && it[ARP_DEVICE] == dev } .filter { parseNumericAddress(it[ARP_IP_ADDRESS]) == ip && it[ARP_DEVICE] == dev }
@@ -51,11 +52,13 @@ data class IpNeighbour(val ip: InetAddress, val dev: String, val lladdr: Long, v
"NOARP" -> return emptyList() // skip "NOARP" -> return emptyList() // skip
else -> throw IllegalArgumentException("Unknown state encountered: ${match.groupValues[7]}") else -> throw IllegalArgumentException("Unknown state encountered: ${match.groupValues[7]}")
} }
val mac = if (lladdr.isEmpty()) { val mac = try {
lladdr.macToLong()
} catch (e: NumberFormatException) {
if (match.groups[4] == null) return emptyList() if (match.groups[4] == null) return emptyList()
Timber.w(IOException("Failed to find MAC address for $line")) Timber.w(IOException("Failed to find MAC address for $line"))
0 0L
} else lladdr.macToLong() }
val result = IpNeighbour(ip, dev, mac, state) val result = IpNeighbour(ip, dev, mac, state)
val devParser = devFallback.matchEntire(dev) val devParser = devFallback.matchEntire(dev)
if (devParser != null) try { if (devParser != null) try {