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

Handle interrupted dump within poll

Browse Source
This commit is contained in:
Mygod
2019-02-17 12:14:04 +08:00
parent 30075efa81
commit ab7a3b4ba7
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,6 +18,8 @@ import kotlin.concurrent.thread
abstract class IpMonitor : Runnable { abstract class IpMonitor : Runnable {
companion object { companion object {
const val KEY = "service.ipMonitor" const val KEY = "service.ipMonitor"
// https://android.googlesource.com/platform/external/iproute2/+/7f7a711/lib/libnetlink.c#493
private const val MAGIC_SUFFIX = "Dump was interrupted and may be inconsistent."
private val currentMode get() = Mode.valueOf(app.pref.getString(KEY, Mode.Poll.toString()) ?: "") private val currentMode get() = Mode.valueOf(app.pref.getString(KEY, Mode.Poll.toString()) ?: "")
} }
@@ -52,8 +54,7 @@ abstract class IpMonitor : Runnable {
} }
try { try {
process.inputStream.bufferedReader().forEachLine { process.inputStream.bufferedReader().forEachLine {
// https://android.googlesource.com/platform/external/iproute2/+/7f7a711/lib/libnetlink.c#493 if (it.endsWith(MAGIC_SUFFIX)) {
if (it.endsWith("Dump was interrupted and may be inconsistent.")) {
Timber.w(it) Timber.w(it)
process.destroy() // move on to next mode process.destroy() // move on to next mode
} else processLine(it) } else processLine(it)
@@ -100,7 +101,12 @@ abstract class IpMonitor : Runnable {
SmartSnackbar.make(R.string.noisy_su_failure).show() SmartSnackbar.make(R.string.noisy_su_failure).show()
} }
} }
process.inputStream.bufferedReader().useLines(this::processLines) process.inputStream.bufferedReader().useLines {
processLines(it.map { line ->
if (line.endsWith(MAGIC_SUFFIX)) throw IOException(line)
line
})
}
} }
override fun run() { override fun run() {
@@ -115,6 +121,7 @@ abstract class IpMonitor : Runnable {
RootSession.use { RootSession.use {
val result = it.execQuiet(command) val result = it.execQuiet(command)
RootSession.checkOutput(command, result, false) RootSession.checkOutput(command, result, false)
if (result.out.any { it.endsWith(MAGIC_SUFFIX) }) throw IOException(result.out.joinToString("\n"))
processLines(result.out.asSequence()) processLines(result.out.asSequence())
} }
} catch (e: RuntimeException) { } catch (e: RuntimeException) {