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

Refine ndc commands

Browse Source
This commit is contained in:
Mygod
2019-02-03 13:40:35 +08:00
parent fc8ae4b5cc
commit 788604838f
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mobile/src/main/java/be/mygod/vpnhotspot/net/Routing.kt
View File

@@ -79,7 +79,8 @@ class Routing(val caller: Any, val downstream: String, ownerAddress: InterfaceAd
private fun RootSession.Transaction.ndc(name: String, command: String, revert: String) { private fun RootSession.Transaction.ndc(name: String, command: String, revert: String) {
val result = execQuiet(command, revert) val result = execQuiet(command, revert)
RootSession.checkOutput(command, result, result.out.joinToString("\n") != "200 0 $name operation succeeded") val log = RootSession.checkOutput(command, result, result.out.last() != "200 0 $name operation succeeded")
if (result.out.size > 1) Timber.i(log)
} }
} }
@@ -232,10 +233,14 @@ class Routing(val caller: Any, val downstream: String, ownerAddress: InterfaceAd
* but may be broken when system tethering shutdown before local-only interfaces. * but may be broken when system tethering shutdown before local-only interfaces.
*/ */
fun ipForward() { fun ipForward() {
if (Build.VERSION.SDK_INT >= 23) { if (Build.VERSION.SDK_INT >= 23) try {
transaction.ndc("ipfwd", "ndc ipfwd enable vpnhotspot_$downstream", transaction.ndc("ipfwd", "ndc ipfwd enable vpnhotspot_$downstream",
"ndc ipfwd disable vpnhotspot_$downstream") "ndc ipfwd disable vpnhotspot_$downstream")
} else transaction.exec("echo 1 >/proc/sys/net/ipv4/ip_forward") return
} catch (e: RootSession.UnexpectedOutputException) {
Timber.w(e)
}
transaction.exec("echo 1 >/proc/sys/net/ipv4/ip_forward")
} }
/** /**