Conversation
This was referenced Jul 8, 2026
vernesong
force-pushed
the
dev
branch
2 times, most recently
from
July 24, 2026 11:32
10715a4 to
d8751c4
Compare
Contributor
Author
|
在复核 #5251 和已合入的 #5252 后,我确认这个 PR 不能继续按当前状态保留,先关闭,避免后续解冲突时重新带回已经修掉的问题。 具体原因:
因此这里不更新旧分支,也不把它标记为可合并。若后续出现对应的真实重复规则或缺规则反馈,我会从当时最新的 |
7 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
变更
合并两个原本拆开的 fw4 DNS 幂等修复:
nat_outputDNS 劫持规则,避免重复插入,也避免dstnat已存在时漏补本机 DNS 劫持。enable_redirect_dns=2每次重建openclash_dns_redirect前先 flush,并按 IPv4/IPv6 guarddstnat -> openclash_dns_redirectjump。这两个拆分 PR 会在
luci-app-openclash/root/etc/init.d/openclash和tests/fw4_dns_hijack_guard_test.sh上产生真实合并冲突;合并成一个 PR 后,审核者只需要审查一组完整的 fw4 DNS 幂等语义。根因
原拆分虽然行为边界清楚,但审核与合并不友好:
nat_outputDNS 劫持是否存在,不能由dstnat状态推断。验证
bash tests/fw4_dns_hijack_guard_test.shsh -n luci-app-openclash/root/etc/init.d/openclashgit diff --check origin/dev...HEADrg '^(<<<<<<<|=======|>>>>>>>)' luci-app-openclash tests