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

Revert "Refrain from using reflection to parse numerical address"

Browse Source 
This reverts commit 72851d4417.

See also: https://issuetracker.google.com/issues/123456213
This commit is contained in:
Mygod
2019-01-27 16:07:38 +08:00
parent d0026f6d82
commit 73d29cba20
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,8 +34,8 @@ data class IpNeighbour(val ip: InetAddress, val dev: String, val lladdr: Long, v
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
val dev = match.groupValues[3] // by regex, dev is non-empty as well
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 (lladdr.isEmpty()) lladdr = checkLladdrNotLoopback(arp()