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

Prevent blocking on errorStream

Browse Source
This commit is contained in:
Mygod
2018-02-24 00:54:40 -08:00
parent ee5197cadc
commit b9511eedbe
2 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mobile/src/main/java/be/mygod/vpnhotspot/Utils.kt
View File

@@ -43,6 +43,17 @@ fun NetworkInterface.formatAddresses() =
}))
.joinToString("\n")
/**
* Wrapper for kotlin.concurrent.thread that silences uncaught exceptions.
*/
fun thread(name: String? = null, start: Boolean = true, isDaemon: Boolean = false,
contextClassLoader: ClassLoader? = null, priority: Int = -1, block: () -> Unit): Thread {
val thread = kotlin.concurrent.thread(false, isDaemon, contextClassLoader, name, priority, block)
thread.setUncaughtExceptionHandler { _, _ -> app.toast(R.string.noisy_su_failure) }
if (start) thread.start()
return thread
}
private const val NOISYSU_TAG = "NoisySU"
private const val NOISYSU_SUFFIX = "SUCCESS\n"
fun loggerSuStream(command: String): InputStream? {
@@ -55,11 +66,12 @@ fun loggerSuStream(command: String): InputStream? {
e.printStackTrace()
return null
}
try {
thread("LoggerSU-error") {
val err = process.errorStream.bufferedReader().readText()
if (err.isNotBlank()) Log.e(NOISYSU_TAG, err)
} catch (e: IOException) {
e.printStackTrace()
if (err.isNotBlank()) {
Log.e(NOISYSU_TAG, err)
app.toast(R.string.noisy_su_failure)
}
}
return process.inputStream
}

27
mobile/src/main/java/be/mygod/vpnhotspot/net/IpNeighbourMonitor.kt
View File

@@ -5,6 +5,7 @@ import android.util.Log
import be.mygod.vpnhotspot.App.Companion.app
import be.mygod.vpnhotspot.R
import be.mygod.vpnhotspot.debugLog
import be.mygod.vpnhotspot.thread
import java.io.InterruptedIOException
class IpNeighbourMonitor private constructor() {
@@ -32,17 +33,6 @@ class IpNeighbourMonitor private constructor() {
val process = monitor.monitor
if (process != null) thread(TAG + "-killer") { process.destroy() }
}
/**
* Wrapper for kotlin.concurrent.thread that silences uncaught exceptions.
*/
private fun thread(name: String? = null, start: Boolean = true, isDaemon: Boolean = false,
contextClassLoader: ClassLoader? = null, priority: Int = -1, block: () -> Unit): Thread {
val thread = kotlin.concurrent.thread(false, isDaemon, contextClassLoader, name, priority, block)
thread.setUncaughtExceptionHandler { _, _ -> app.toast(R.string.noisy_su_failure) }
if (start) thread.start()
return thread
}
}
interface Callback {
@@ -56,13 +46,13 @@ class IpNeighbourMonitor private constructor() {
private var monitor: Process? = null
init {
thread(name = TAG + "-input") {
thread(TAG + "-input") {
// monitor may get rejected by SELinux
val monitor = ProcessBuilder("sh", "-c", "ip monitor neigh || su -c ip monitor neigh")
.redirectErrorStream(true)
.start()
this.monitor = monitor
thread(name = TAG + "-error") {
thread(TAG + "-error") {
try {
monitor.errorStream.bufferedReader().forEachLine { Log.e(TAG, it) }
} catch (ignore: InterruptedIOException) { }
@@ -84,13 +74,18 @@ class IpNeighbourMonitor private constructor() {
}
}
fun flush() = thread(name = TAG + "-flush") {
fun flush() = thread(TAG + "-flush") {
val process = ProcessBuilder("ip", "neigh")
.redirectErrorStream(true)
.start()
process.waitFor()
val err = process.errorStream.bufferedReader().readText()
if (err.isNotBlank()) Log.e(TAG, err)
thread(TAG + "-flush-error") {
val err = process.errorStream.bufferedReader().readText()
if (err.isNotBlank()) {
Log.e(TAG, err)
app.toast(R.string.noisy_su_failure)
}
}
process.inputStream.bufferedReader().useLines {
synchronized(neighbours) {
neighbours.clear()