bypass dscp show not work on fake ip

Signed-off-by: Joseph Mory <[email protected]>
morytyann · Jan 3, 2025 · eb2ba2e · eb2ba2e
1 parent c9e95ee
commit eb2ba2e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/luci-app-mihomo/Makefile b/luci-app-mihomo/Makefile
@@ -1,6 +1,6 @@
 include $(TOPDIR)/rules.mk
 
-PKG_VERSION:=1.17.0
+PKG_VERSION:=1.17.1
 
 LUCI_TITLE:=LuCI Support for mihomo
 LUCI_DEPENDS:=+luci-base +mihomo

diff --git 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
@@ -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
 	}