Skip to content

Commit c9c4be5

Browse files
ratabbtaamarin
authored andcommitted
Improve box.iptables logic with Android version check via major version parsing (#189)
1 parent 16f2455 commit c9c4be5

File tree

2 files changed

+16
-12
lines changed

2 files changed

+16
-12
lines changed

box/scripts/box.iptables

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,16 @@ tun_forward="enable"
1212
clash_dns_forward="enable"
1313
fake_ip_range=""
1414

15-
va1=$(getprop ro.build.version.release)
16-
va2="11"
17-
if [ "$va1" -ge "$va2" ]; then
15+
# ex: 7.1.1
16+
buildVersion=$(getprop ro.build.version.release)
17+
minBuildVersion="11"
18+
IPV="iptables" # Default
19+
IP6V="ip6tables" # Default
20+
# ex: 7.1.1 -> 7
21+
buildVersionMajor=${buildVersion%%.*}
22+
if [ "$buildVersionMajor" -ge "$minBuildVersion" ]; then
1823
IPV="iptables -w 100"
1924
IP6V="ip6tables -w 100"
20-
else
21-
IPV="iptables"
22-
IP6V="ip6tables"
2325
fi
2426

2527
case "${bin_name}" in

box/scripts/net.inotify

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,16 @@ events=$1
66

77
export PATH="/data/adb/magisk:/data/adb/ksu/bin:/data/adb/ap/bin:$PATH:/system/bin"
88

9-
va1=$(getprop ro.build.version.release)
10-
va2="11"
11-
if [ "$va1" -ge "$va2" ]; then
9+
# ex: 7.1.1
10+
buildVersion=$(getprop ro.build.version.release)
11+
minBuildVersion="11"
12+
IPV="iptables" # Default
13+
IP6V="ip6tables" # Default
14+
# ex: 7.1.1 -> 7
15+
buildVersionMajor=${buildVersion%%.*}
16+
if [ "$buildVersionMajor" -ge "$minBuildVersion" ]; then
1217
IPV="iptables -w 100"
1318
IP6V="ip6tables -w 100"
14-
else
15-
IPV="iptables"
16-
IP6V="ip6tables"
1719
fi
1820

1921
iptables="${IPV}"

0 commit comments

Comments
 (0)