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

Remove IP address from configuration

Browse Source
This commit is contained in:
Mygod
2018-01-04 14:23:49 +08:00
parent 98590f743f
commit 19feec30bc
4 changed files with 25 additions and 19 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> </value>
</option> </option>
</component> </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" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">

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

@@ -16,7 +16,6 @@ import android.support.v4.content.LocalBroadcastManager
import android.util.Log import android.util.Log
import android.widget.Toast import android.widget.Toast
import be.mygod.vpnhotspot.App.Companion.app import be.mygod.vpnhotspot.App.Companion.app
import java.net.InetAddress
class HotspotService : Service(), WifiP2pManager.ChannelListener { class HotspotService : Service(), WifiP2pManager.ChannelListener {
companion object { companion object {
@@ -51,7 +50,7 @@ class HotspotService : Service(), WifiP2pManager.ChannelListener {
private lateinit var channel: WifiP2pManager.Channel private lateinit var channel: WifiP2pManager.Channel
lateinit var group: WifiP2pGroup lateinit var group: WifiP2pGroup
private set private set
var hostAddress: InetAddress? = null var hostAddress: String? = null
private set private set
private val binder = HotspotBinder() private val binder = HotspotBinder()
private var receiverRegistered = false private var receiverRegistered = false
@@ -64,23 +63,23 @@ class HotspotService : Service(), WifiP2pManager.ChannelListener {
val info = intent.getParcelableExtra<WifiP2pInfo>(WifiP2pManager.EXTRA_WIFI_P2P_INFO) val info = intent.getParcelableExtra<WifiP2pInfo>(WifiP2pManager.EXTRA_WIFI_P2P_INFO)
val net = intent.getParcelableExtra<NetworkInfo>(WifiP2pManager.EXTRA_NETWORK_INFO) val net = intent.getParcelableExtra<NetworkInfo>(WifiP2pManager.EXTRA_NETWORK_INFO)
val group = intent.getParcelableExtra<WifiP2pGroup>(WifiP2pManager.EXTRA_WIFI_P2P_GROUP) val group = intent.getParcelableExtra<WifiP2pGroup>(WifiP2pManager.EXTRA_WIFI_P2P_GROUP)
hostAddress = info.groupOwnerAddress val hostAddress = info.groupOwnerAddress?.hostAddress
val downstream = group.`interface` val downstream = group.`interface`
if (info.groupFormed && info.isGroupOwner && if (info.groupFormed && info.isGroupOwner &&
downstream != null && this@HotspotService.downstream == null) { downstream != null && hostAddress != null && this.downstream == null) {
this@HotspotService.downstream = downstream this.downstream = downstream
val ip = info.groupOwnerAddress.hostAddress this.hostAddress = hostAddress
if (noisySu("echo 1 >/proc/sys/net/ipv4/ip_forward", if (noisySu("echo 1 >/proc/sys/net/ipv4/ip_forward",
"ip route add default dev $upstream scope link table 62", "ip route add default dev $upstream scope link table 62",
"ip route add $route dev $downstream scope link table 62", "ip route add $hostAddress/$subnetPrefixLength dev $downstream scope link table 62",
"ip route add broadcast 255.255.255.255 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", "ip rule add from $hostAddress/$subnetPrefixLength lookup 62",
"iptables -N vpnhotspot_fwd", "iptables -N vpnhotspot_fwd",
"iptables -A vpnhotspot_fwd -i $upstream -o $downstream -m state --state ESTABLISHED,RELATED -j ACCEPT", "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 -A vpnhotspot_fwd -i $downstream -o $upstream -j ACCEPT",
"iptables -I FORWARD -j vpnhotspot_fwd", "iptables -I FORWARD -j vpnhotspot_fwd",
"iptables -t nat -A PREROUTING -i $downstream -p tcp -d $ip --dport 53 -j DNAT --to-destination $dns", "iptables -t nat -A PREROUTING -i $downstream -p tcp -d $hostAddress --dport 53 -j DNAT --to-destination $dns",
"iptables -t nat -A PREROUTING -i $downstream -p udp -d $ip --dport 53 -j DNAT --to-destination $dns")) { "iptables -t nat -A PREROUTING -i $downstream -p udp -d $hostAddress --dport 53 -j DNAT --to-destination $dns")) {
doStart(group) doStart(group)
} else startFailure("Something went wrong, please check logcat.") } else startFailure("Something went wrong, please check logcat.")
} }
@@ -92,11 +91,15 @@ class HotspotService : Service(), WifiP2pManager.ChannelListener {
} }
} }
// TODO: do something to these hardcoded strings
var downstream: String? = null var downstream: String? = null
private set private set
private val upstream get() = app.pref.getString("service.upstream", "tun0") private val upstream get() = app.pref.getString("service.upstream", "tun0")
private val route get() = app.pref.getString("service.route", "192.168.49.0/24") /**
* subnetPrefixLength has been the same forever but this option is here anyways. Source:
* https://android.googlesource.com/platform/frameworks/base/+/android-4.0.1_r1/wifi/java/android/net/wifi/p2p/WifiP2pService.java#1028
* https://android.googlesource.com/platform/frameworks/opt/net/wifi/+/a8d5e40/service/java/com/android/server/wifi/p2p/WifiP2pServiceImpl.java#2547
*/
private val subnetPrefixLength get() = app.pref.getString("service.subnetPrefixLength", "24")
private val dns get() = app.pref.getString("service.dns", "8.8.8.8:53") private val dns get() = app.pref.getString("service.dns", "8.8.8.8:53")
var status = Status.IDLE var status = Status.IDLE
@@ -191,10 +194,11 @@ class HotspotService : Service(), WifiP2pManager.ChannelListener {
"iptables -D FORWARD -j vpnhotspot_fwd", "iptables -D FORWARD -j vpnhotspot_fwd",
"iptables -F vpnhotspot_fwd", "iptables -F vpnhotspot_fwd",
"iptables -X vpnhotspot_fwd", "iptables -X vpnhotspot_fwd",
"ip rule del from $route lookup 62", "ip rule del from $hostAddress/$subnetPrefixLength lookup 62",
"ip route del broadcast 255.255.255.255 dev $downstream scope link table 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 $hostAddress/$subnetPrefixLength dev $downstream scope link table 62",
"ip route del default dev $upstream scope link table 62")) { "ip route del default dev $upstream scope link table 62")) {
hostAddress = null
downstream = null downstream = null
} else Toast.makeText(this, "Something went wrong, please check logcat.", Toast.LENGTH_SHORT).show() } else Toast.makeText(this, "Something went wrong, please check logcat.", Toast.LENGTH_SHORT).show()
status = Status.IDLE status = Status.IDLE

2
mobile/src/main/java/be/mygod/vpnhotspot/MainActivity.kt
View File

@@ -88,7 +88,7 @@ class MainActivity : AppCompatActivity(), ServiceConnection, Toolbar.OnMenuItemC
} }
holder.binding.device = device holder.binding.device = device
holder.binding.ipAddress = when (position) { holder.binding.ipAddress = when (position) {
0 -> binder?.service?.hostAddress?.hostAddress?.toString() 0 -> binder?.service?.hostAddress
else -> arpCache[device?.deviceAddress] else -> arpCache[device?.deviceAddress]
} }
holder.binding.executePendingBindings() holder.binding.executePendingBindings()

8
mobile/src/main/res/xml/pref_settings.xml
View File

@@ -9,10 +9,12 @@
android:summary="%s" android:summary="%s"
android:defaultValue="tun0"/> android:defaultValue="tun0"/>
<AutoSummaryEditTextPreference <AutoSummaryEditTextPreference
android:key="service.route" android:key="service.subnetPrefixLength"
android:title="Wi-Fi Direct routing" android:title="Subnet prefix length"
android:summary="%s" android:summary="%s"
android:defaultValue="192.168.49.0/24"/> android:inputType="number"
android:maxLength="3"
android:defaultValue="24"/>
<AutoSummaryEditTextPreference <AutoSummaryEditTextPreference
android:key="service.dns" android:key="service.dns"
android:title="Downstream DNS server:port" android:title="Downstream DNS server:port"