From b2e3f661e7b1c6a1ddccfce086e4e16409738fe3 Mon Sep 17 00:00:00 2001 From: Testeera <135306767+Testeera@users.noreply.github.com> Date: Tue, 1 Aug 2023 21:17:04 +0800 Subject: [PATCH 1/2] Fix QCA tproxy with Docker --- scripts/start.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/scripts/start.sh b/scripts/start.sh index c4a578a..94e7266 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -1107,6 +1107,15 @@ EOF [ "$?" = 0 ] && rm -rf $TMPDIR/clash_pac || mv -f $TMPDIR/clash_pac $bindir/ui/pac } bfstart(){ + #小米7000/小米万兆tproxy + if [ -f /etc/init.d/qca-nss-ecm ];then + if [ cat /proc/sys/net/bridge/bridge-nf-call-iptables ];then + sysctl -w net.bridge.bridge-nf-call-iptables=0 + fi + if [ cat /proc/sys/net/bridge/bridge-nf-call-ip6tables ];then + sysctl -w net.bridge.bridge-nf-call-ip6tables=0 + fi + fi #读取配置文件 getconfig [ ! -d $bindir/ui ] && mkdir -p $bindir/ui From 40a2c36fc40e7f61a5421fddf8210f802c8f4ff1 Mon Sep 17 00:00:00 2001 From: Testeera Date: Tue, 1 Aug 2023 21:57:27 +0800 Subject: [PATCH 2/2] move to misnap_init.sh --- scripts/misnap_init.sh | 9 +++++++++ scripts/start.sh | 9 --------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/misnap_init.sh b/scripts/misnap_init.sh index 2a8f2f5..40900f7 100644 --- a/scripts/misnap_init.sh +++ b/scripts/misnap_init.sh @@ -55,6 +55,15 @@ init(){ cp -f $clashdir/clashservice /etc/init.d/clash chmod 755 /etc/init.d/clash #启动服务 + #小米7000/小米万兆tproxy + if [ -f /etc/init.d/qca-nss-ecm ];then + if [ cat /proc/sys/net/bridge/bridge-nf-call-iptables ];then + sysctl -w net.bridge.bridge-nf-call-iptables=0 + fi + if [ cat /proc/sys/net/bridge/bridge-nf-call-ip6tables ];then + sysctl -w net.bridge.bridge-nf-call-ip6tables=0 + fi + fi if [ ! -f $clashdir/.dis_startup ]; then #AX6S/AX6000修复tun功能 [ -f $clashdir/configs/tun.ko ] && tunfix diff --git a/scripts/start.sh b/scripts/start.sh index 94e7266..c4a578a 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -1107,15 +1107,6 @@ EOF [ "$?" = 0 ] && rm -rf $TMPDIR/clash_pac || mv -f $TMPDIR/clash_pac $bindir/ui/pac } bfstart(){ - #小米7000/小米万兆tproxy - if [ -f /etc/init.d/qca-nss-ecm ];then - if [ cat /proc/sys/net/bridge/bridge-nf-call-iptables ];then - sysctl -w net.bridge.bridge-nf-call-iptables=0 - fi - if [ cat /proc/sys/net/bridge/bridge-nf-call-ip6tables ];then - sysctl -w net.bridge.bridge-nf-call-ip6tables=0 - fi - fi #读取配置文件 getconfig [ ! -d $bindir/ui ] && mkdir -p $bindir/ui