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

Handle interrupted dump

Browse Source
This commit is contained in:
Mygod
2019-01-18 11:46:16 +08:00
parent e43c2280c2
commit a583d6c143
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/IpMonitor.kt
View File

@@ -49,7 +49,13 @@ abstract class IpMonitor : Runnable {
} }
} }
try { try {
process.inputStream.bufferedReader().forEachLine(this::processLine) process.inputStream.bufferedReader().forEachLine {
// https://android.googlesource.com/platform/external/iproute2/+/7f7a711/lib/libnetlink.c#493
if (it.endsWith("Dump was interrupted and may be inconsistent.")) {
Timber.w(it)
process.destroy() // move on to next mode
} else processLine(it)
}
} catch (_: InterruptedIOException) { } catch (e: IOException) { } catch (_: InterruptedIOException) { } catch (e: IOException) {
if ((e.cause as? ErrnoException)?.errno != OsConstants.EBADF) Timber.w(e) if ((e.cause as? ErrnoException)?.errno != OsConstants.EBADF) Timber.w(e)
} }