From e9920e93a74431d03dbb8720e7774018fe23c3e6 Mon Sep 17 00:00:00 2001 From: gitea-action Date: Sat, 26 Oct 2024 15:30:21 +0800 Subject: [PATCH] mihomo: sync upstream last commit: https://github.com/morytyann/OpenWrt-mihomo/commit/16bce4158b7a665abb1fd145981bb7d9c7273533 --- mihomo/Makefile | 2 +- mihomo/files/mihomo.init | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/mihomo/Makefile b/mihomo/Makefile index 5373f1f9f..30f789899 100644 --- a/mihomo/Makefile +++ b/mihomo/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mihomo -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/MetaCubeX/mihomo.git diff --git a/mihomo/files/mihomo.init b/mihomo/files/mihomo.init index 54d6a715b..2a8e1913c 100644 --- a/mihomo/files/mihomo.init +++ b/mihomo/files/mihomo.init @@ -302,6 +302,10 @@ start_service() { nft -f "$HIJACK_NFT" -D FW_MARK="$FW_MARK" -D FW_MARK_MASK="$FW_MARK_MASK" -D TUN_DEVICE="$TUN_DEVICE" -D DNS_PORT="$dns_port" -D REDIR_PORT="$redir_port" -D TPROXY_PORT="$tproxy_port" nft -f "$RESERVED_IP_NFT" nft -f "$RESERVED_IP6_NFT" + if [ "$tcp_transparent_proxy_mode" != "redirect" ]; then + nft flush chain inet "$FW_TABLE" nat_output + nft flush chain inet "$FW_TABLE" dstnat + fi nft add element inet "$FW_TABLE" bypass_group \{ "$MIHOMO_GROUP" \} nft add element inet "$FW_TABLE" fake_ip \{ "$fake_ip_range" \} # dns hijack