From 97fb67d7fdf2343068a964af35719e41deba2954 Mon Sep 17 00:00:00 2001 From: Mygod Date: Wed, 19 Dec 2018 13:05:56 +0800 Subject: [PATCH] Refine IpNeighbour parser --- mobile/src/main/java/be/mygod/vpnhotspot/net/IpNeighbour.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/net/IpNeighbour.kt b/mobile/src/main/java/be/mygod/vpnhotspot/net/IpNeighbour.kt index deec46d6..25a73767 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/net/IpNeighbour.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/net/IpNeighbour.kt @@ -25,11 +25,11 @@ data class IpNeighbour(val ip: InetAddress, val dev: String, val lladdr: String, fun parse(line: String): IpNeighbour? { return try { val match = parser.matchEntire(line)!! - val ip = parseNumericAddress(match.groupValues[2]) - val dev = match.groupValues[3] + 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 var lladdr = checkLladdrNotLoopback(match.groupValues[5]) // use ARP as fallback - if (dev.isNotEmpty() && lladdr.isEmpty()) lladdr = checkLladdrNotLoopback(arp() + if (lladdr.isEmpty()) lladdr = checkLladdrNotLoopback(arp() .asSequence() .filter { parseNumericAddress(it[ARP_IP_ADDRESS]) == ip && it[ARP_DEVICE] == dev } .map { it[ARP_HW_ADDRESS] }