Merge pull request madeye#28 from icew4y/master

fix the issue that the hotspot on newer versions of Android doesn't f…
bongtrop · May 20, 2022 · 4538e90 · 4538e90
2 parents 8416617 + b8225c1
commit 4538e90
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/app/src/main/assets/armeabi-v7a/proxy.sh b/app/src/main/assets/armeabi-v7a/proxy.sh
@@ -132,12 +132,16 @@ redsocks {
  $DIR/redsocks -p $DIR/redsocks.pid -c $DIR/redsocks.conf
  iptables -A INPUT -i ap+ -p tcp --dport 8123 -j ACCEPT
  iptables -A INPUT -i ap+ -p tcp --dport 8124 -j ACCEPT
+ iptables -A INPUT -i wlan1 -p tcp --dport 8123 -j ACCEPT
+ iptables -A INPUT -i wlan1 -p tcp --dport 8124 -j ACCEPT
  iptables -A INPUT -i lo -p tcp --dport 8123 -j ACCEPT
  iptables -A INPUT -i lo -p tcp --dport 8124 -j ACCEPT
  iptables -A INPUT -p tcp --dport 8123 -j DROP
  iptables -A INPUT -p tcp --dport 8124 -j DROP
  iptables -t nat -A PREROUTING -i ap+ -p tcp -d 192.168.43.1/24 -j RETURN
  iptables -t nat -A PREROUTING -i ap+ -p tcp -j REDIRECT --to $proxy_port
+ iptables -t nat -A PREROUTING -i wlan1 -p tcp -d 192.168.43.1/24 -j RETURN
+ iptables -t nat -A PREROUTING -i wlan1 -p tcp -j REDIRECT --to $proxy_port
  ;;
 stop)
 
@@ -146,6 +150,11 @@ stop)
  iptables -t nat -D PREROUTING -i ap+ -p tcp -j REDIRECT --to 8124
  iptables -D INPUT -i ap+ -p tcp --dport 8123 -j ACCEPT
  iptables -D INPUT -i ap+ -p tcp --dport 8124 -j ACCEPT
+ iptables -t nat -D PREROUTING -i wlan1 -p tcp -d 192.168.43.1/24 -j RETURN
+ iptables -t nat -D PREROUTING -i wlan1 -p tcp -j REDIRECT --to 8123
+ iptables -t nat -D PREROUTING -i wlan1 -p tcp -j REDIRECT --to 8124
+ iptables -D INPUT -i wlan1 -p tcp --dport 8123 -j ACCEPT
+ iptables -D INPUT -i wlan1 -p tcp --dport 8124 -j ACCEPT
  iptables -D INPUT -i lo -p tcp --dport 8123 -j ACCEPT
  iptables -D INPUT -i lo -p tcp --dport 8124 -j ACCEPT
  iptables -D INPUT -p tcp --dport 8123 -j DROP

diff --git a/app/src/main/assets/x86/proxy.sh b/app/src/main/assets/x86/proxy.sh
@@ -132,12 +132,16 @@ redsocks {
  $DIR/redsocks -p $DIR/redsocks.pid -c $DIR/redsocks.conf
  iptables -A INPUT -i ap+ -p tcp --dport 8123 -j ACCEPT
  iptables -A INPUT -i ap+ -p tcp --dport 8124 -j ACCEPT
+ iptables -A INPUT -i wlan1 -p tcp --dport 8123 -j ACCEPT
+ iptables -A INPUT -i wlan1 -p tcp --dport 8124 -j ACCEPT
  iptables -A INPUT -i lo -p tcp --dport 8123 -j ACCEPT
  iptables -A INPUT -i lo -p tcp --dport 8124 -j ACCEPT
  iptables -A INPUT -p tcp --dport 8123 -j DROP
  iptables -A INPUT -p tcp --dport 8124 -j DROP
  iptables -t nat -A PREROUTING -i ap+ -p tcp -d 192.168.43.1/24 -j RETURN
  iptables -t nat -A PREROUTING -i ap+ -p tcp -j REDIRECT --to $proxy_port
+ iptables -t nat -A PREROUTING -i wlan1 -p tcp -d 192.168.43.1/24 -j RETURN
+ iptables -t nat -A PREROUTING -i wlan1 -p tcp -j REDIRECT --to $proxy_port
  ;;
 stop)
 
@@ -146,6 +150,11 @@ stop)
  iptables -t nat -D PREROUTING -i ap+ -p tcp -j REDIRECT --to 8124
  iptables -D INPUT -i ap+ -p tcp --dport 8123 -j ACCEPT
  iptables -D INPUT -i ap+ -p tcp --dport 8124 -j ACCEPT
+ iptables -t nat -D PREROUTING -i wlan1 -p tcp -d 192.168.43.1/24 -j RETURN
+ iptables -t nat -D PREROUTING -i wlan1 -p tcp -j REDIRECT --to 8123
+ iptables -t nat -D PREROUTING -i wlan1 -p tcp -j REDIRECT --to 8124
+ iptables -D INPUT -i wlan1 -p tcp --dport 8123 -j ACCEPT
+ iptables -D INPUT -i wlan1 -p tcp --dport 8124 -j ACCEPT
  iptables -D INPUT -i lo -p tcp --dport 8123 -j ACCEPT
  iptables -D INPUT -i lo -p tcp --dport 8124 -j ACCEPT
  iptables -D INPUT -p tcp --dport 8123 -j DROP