From b6b0ab72a4e04ff0eae6a6d2e1cfaeacb1201dcd Mon Sep 17 00:00:00 2001 From: gitea-action Date: Fri, 3 Jan 2025 18:00:22 +0800 Subject: [PATCH] mihomo: sync upstream last commit: https://github.com/morytyann/OpenWrt-mihomo/commit/eb2ba2ec5fa7fbe05c8ee910bbd7bcfcb7a3bcbe --- mihomo/Makefile | 2 +- mihomo/files/nftables/hijack.nft | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mihomo/Makefile b/mihomo/Makefile index 9723643f2..57e835b75 100644 --- a/mihomo/Makefile +++ b/mihomo/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mihomo -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/MetaCubeX/mihomo.git diff --git a/mihomo/files/nftables/hijack.nft b/mihomo/files/nftables/hijack.nft index ab4388583..6105d6e9b 100644 --- a/mihomo/files/nftables/hijack.nft +++ b/mihomo/files/nftables/hijack.nft @@ -183,7 +183,7 @@ table inet mihomo { ip6 daddr @china_ip6 counter return meta nfproto ipv4 meta l4proto . th dport != @proxy_dport ip daddr != $FAKE_IP counter return meta nfproto ipv6 meta l4proto . th dport != @proxy_dport counter return - meta l4proto { tcp, udp } ip dscp == @bypass_dscp counter return + meta l4proto { tcp, udp } ip dscp == @bypass_dscp ip daddr != $FAKE_IP counter return meta l4proto { tcp, udp } ip6 dscp == @bypass_dscp counter return } @@ -199,7 +199,7 @@ table inet mihomo { ip6 daddr @china_ip6 counter return meta nfproto ipv4 meta l4proto . th dport != @proxy_dport ip daddr != $FAKE_IP counter return meta nfproto ipv6 meta l4proto . th dport != @proxy_dport counter return - meta l4proto { tcp, udp } ip dscp == @bypass_dscp counter return + meta l4proto { tcp, udp } ip dscp == @bypass_dscp ip daddr != $FAKE_IP counter return meta l4proto { tcp, udp } ip6 dscp == @bypass_dscp counter return } @@ -215,7 +215,7 @@ table inet mihomo { ip6 daddr @china_ip6 counter return meta nfproto ipv4 meta l4proto . th dport != @proxy_dport ip daddr != $FAKE_IP counter return meta nfproto ipv6 meta l4proto . th dport != @proxy_dport counter return - meta l4proto { tcp, udp } ip dscp == @bypass_dscp counter return + meta l4proto { tcp, udp } ip dscp == @bypass_dscp ip daddr != $FAKE_IP counter return meta l4proto { tcp, udp } ip6 dscp == @bypass_dscp counter return meta l4proto udp th dport 53 counter return } @@ -232,7 +232,7 @@ table inet mihomo { ip6 daddr @china_ip6 counter return meta nfproto ipv4 meta l4proto . th dport != @proxy_dport ip daddr != $FAKE_IP counter return meta nfproto ipv6 meta l4proto . th dport != @proxy_dport counter return - meta l4proto { tcp, udp } ip dscp == @bypass_dscp counter return + meta l4proto { tcp, udp } ip dscp == @bypass_dscp ip daddr != $FAKE_IP counter return meta l4proto { tcp, udp } ip6 dscp == @bypass_dscp counter return meta l4proto udp th dport 53 counter return }