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

Allow waiting in updating records

Browse Source
This commit is contained in:
Mygod
2019-01-06 00:55:57 +08:00
parent ea9145c2bd
commit 0374b93a64
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/TrafficRecorder.kt
View File

@@ -64,7 +64,7 @@ object TrafficRecorder {
private fun doUpdate(timestamp: Long) { private fun doUpdate(timestamp: Long) {
val oldRecords = LongSparseArray<TrafficRecord>() val oldRecords = LongSparseArray<TrafficRecord>()
loop@ for (line in RootSession.use { it.execOutUnjoined("$IPTABLES -nvx -L vpnhotspot_fwd").drop(2) }) { loop@ for (line in RootSession.use { it.execOutUnjoinedWithWait("$IPTABLES -nvx -L vpnhotspot_fwd").drop(2) }) {
val columns = line.split("\\s+".toRegex()).filter { it.isNotEmpty() } val columns = line.split("\\s+".toRegex()).filter { it.isNotEmpty() }
try { try {
check(columns.size >= 9) check(columns.size >= 9)

6
mobile/src/main/java/be/mygod/vpnhotspot/util/RootSession.kt
View File

@@ -111,6 +111,12 @@ class RootSession : AutoCloseable {
checkOutput(command, result, false) checkOutput(command, result, false)
return result.out return result.out
} }
fun execOutUnjoinedWithWait(command: String): List<String> {
val result = execQuiet(command)
val message = checkOutput(command, result, false, false)
if (result.err.isNotEmpty()) Timber.i(message)
return result.out
}
fun execOut(command: String): String = execOutUnjoined(command).joinToString("\n") fun execOut(command: String): String = execOutUnjoined(command).joinToString("\n")
/** /**