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

Implement VPN over Wi-Fi direct

Browse Source 
Some useful commands for debugging:

* curl -H 'Host: ipinfo.io' http://216.239.38.21
* curl http://ipinfo.io
This commit is contained in:
Mygod
2018-01-03 15:18:37 +08:00
parent ff7de38882
commit a1b51db108
3 changed files with 65 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/misc.xml generated
View File

@@ -93,7 +93,7 @@
</value>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">

46
mobile/src/main/java/be/mygod/vpnhotspot/HotspotService.kt
View File

@@ -1,5 +1,6 @@
package be.mygod.vpnhotspot
import android.app.PendingIntent
import android.app.Service
import android.content.BroadcastReceiver
import android.content.Context
@@ -32,8 +33,11 @@ class HotspotService : Service(), WifiP2pManager.ChannelListener {
p2pManager.removeGroup(channel, object : WifiP2pManager.ActionListener {
override fun onSuccess() = clean()
override fun onFailure(reason: Int) {
if (reason == WifiP2pManager.BUSY) clean() else { // assuming it's already gone
Toast.makeText(this@HotspotService, "Failed to remove P2P group (reason: $reason)",
Toast.LENGTH_SHORT).show()
binder.data?.onStatusChanged()
}
}
})
}
@@ -45,6 +49,12 @@ class HotspotService : Service(), WifiP2pManager.ChannelListener {
private var receiver: BroadcastReceiver? = null
private val binder = HotspotBinder()
// TODO: do something
private val upstream = "tun0"
private val downstream = "p2p0"
private val route = "192.168.49.0/24"
private val dns = "8.8.8.8:53"
private var status = Status.IDLE
set(value) {
field = value
@@ -67,6 +77,20 @@ class HotspotService : Service(), WifiP2pManager.ChannelListener {
if (status != Status.IDLE) return START_NOT_STICKY
status = Status.STARTING
initReceiver()
if (!noisySu("echo 1 >/proc/sys/net/ipv4/ip_forward",
"ip route add default dev $upstream scope link table 62",
"ip route add $route dev $downstream scope link table 62",
"ip route add broadcast 255.255.255.255 dev $downstream scope link table 62",
"ip rule add from $route lookup 62",
"iptables -N vpnhotspot_fwd",
"iptables -A vpnhotspot_fwd -i $upstream -o $downstream -m state --state ESTABLISHED,RELATED -j ACCEPT",
"iptables -A vpnhotspot_fwd -i $downstream -o $upstream -j ACCEPT",
"iptables -I FORWARD -j vpnhotspot_fwd",
"iptables -t nat -A PREROUTING -i $downstream -p tcp --dport 53 -j DNAT --to-destination $dns",
"iptables -t nat -A PREROUTING -i $downstream -p udp --dport 53 -j DNAT --to-destination $dns")) {
startFailure("Something went wrong, please check logcat.")
return START_NOT_STICKY
}
p2pManager.requestGroupInfo(channel, {
when {
it == null -> doStart()
@@ -86,14 +110,14 @@ class HotspotService : Service(), WifiP2pManager.ChannelListener {
return START_NOT_STICKY
}
private fun doStart() {
p2pManager.createGroup(channel, object : WifiP2pManager.ActionListener, WifiP2pManager.GroupInfoListener {
private fun shutdown(msg: String) {
private fun startFailure(msg: String) {
Toast.makeText(this@HotspotService, msg, Toast.LENGTH_SHORT).show()
startForeground(0, NotificationCompat.Builder(this@HotspotService, CHANNEL).build())
clean()
}
override fun onFailure(reason: Int) = shutdown("Failed to create P2P group (reason: $reason)")
private fun doStart() {
p2pManager.createGroup(channel, object : WifiP2pManager.ActionListener, WifiP2pManager.GroupInfoListener {
override fun onFailure(reason: Int) = startFailure("Failed to create P2P group (reason: $reason)")
private var tries = 0
override fun onSuccess() = p2pManager.requestGroupInfo(channel, this)
@@ -101,7 +125,7 @@ class HotspotService : Service(), WifiP2pManager.ChannelListener {
if (group != null && group.isGroupOwner) doStart(group) else if (tries < 10) {
Thread.sleep(30L shl tries++)
onSuccess()
} else shutdown("Unexpected group: $group")
} else startFailure("Unexpected group: $group")
}
})
}
@@ -113,6 +137,8 @@ class HotspotService : Service(), WifiP2pManager.ChannelListener {
.setContentTitle(group.networkName)
.setSubText(group.passphrase)
.setSmallIcon(R.drawable.ic_device_wifi_tethering)
.setContentIntent(PendingIntent.getActivity(this, 0,
Intent(this, MainActivity::class.java), PendingIntent.FLAG_UPDATE_CURRENT))
.build())
}
@@ -133,6 +159,16 @@ class HotspotService : Service(), WifiP2pManager.ChannelListener {
}
private fun clean() {
if (!noisySu("iptables -t nat -D PREROUTING -i $downstream -p tcp --dport 53 -j DNAT --to-destination $dns",
"iptables -t nat -D PREROUTING -i $downstream -p udp --dport 53 -j DNAT --to-destination $dns",
"iptables -D FORWARD -j vpnhotspot_fwd",
"iptables -F vpnhotspot_fwd",
"iptables -X vpnhotspot_fwd",
"ip rule del from $route lookup 62",
"ip route del broadcast 255.255.255.255 dev $downstream scope link table 62",
"ip route del $route dev $downstream scope link table 62",
"ip route del default dev $upstream scope link table 62"))
Toast.makeText(this, "Something went wrong, please check logcat.", Toast.LENGTH_SHORT).show()
status = Status.IDLE
stopForeground(true)
}

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

@@ -1,9 +1,28 @@
package be.mygod.vpnhotspot
import android.content.IntentFilter
import android.util.Log
fun createIntentFilter(vararg actions: String): IntentFilter {
val result = IntentFilter()
actions.forEach { result.addAction(it) }
return result
}
const val NOISYSU_TAG = "NoisySU"
const val NOISYSU_SUFFIX = "SUCCESS\n"
fun noisySu(vararg commands: String): Boolean {
val process = ProcessBuilder("su", "-c", """function noisy() { "$@" || echo "$@" exited with $?; }
${commands.joinToString("\n") { "noisy $it" }}
echo $NOISYSU_SUFFIX""")
.redirectErrorStream(true)
.start()
process.waitFor()
var out = process.inputStream.bufferedReader().use { it.readLine() }
val result = out != NOISYSU_SUFFIX
out = out.removeSuffix(NOISYSU_SUFFIX)
if (!out.isNullOrBlank()) Log.i("noisySu", out)
val err = process.errorStream.bufferedReader().use { it.readLine() }
if (!err.isNullOrBlank()) Log.e("noisySu", err)
return result
}