From 5aad0b5c8212d2d9e6faf917501fe44696508f43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= Date: Mon, 11 Dec 2023 19:16:02 +0800 Subject: [PATCH] documentation: Update rule match logic description --- docs/configuration/dns/rule.md | 4 +++- docs/configuration/dns/rule.zh.md | 4 +++- docs/configuration/route/rule.md | 6 ++++-- docs/configuration/route/rule.zh.md | 6 ++++-- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/docs/configuration/dns/rule.md b/docs/configuration/dns/rule.md index 513da60e..c393a919 100644 --- a/docs/configuration/dns/rule.md +++ b/docs/configuration/dns/rule.md @@ -134,10 +134,12 @@ icon: material/alert-decagram The default rule uses the following matching logic: (`domain` || `domain_suffix` || `domain_keyword` || `domain_regex` || `geosite`) && (`port` || `port_range`) && - (`source_geoip` || `source_ip_cidr`) && + (`source_geoip` || `source_ip_cidr` ｜｜ `source_ip_is_private`) && (`source_port` || `source_port_range`) && `other fields` + Additionally, included rule sets can be considered merged rather than as a single rule sub-item. + #### inbound Tags of [Inbound](/configuration/inbound). diff --git a/docs/configuration/dns/rule.zh.md b/docs/configuration/dns/rule.zh.md index 6fac5851..41e90281 100644 --- a/docs/configuration/dns/rule.zh.md +++ b/docs/configuration/dns/rule.zh.md @@ -131,10 +131,12 @@ icon: material/alert-decagram 默认规则使用以下匹配逻辑: (`domain` || `domain_suffix` || `domain_keyword` || `domain_regex` || `geosite`) && (`port` || `port_range`) && - (`source_geoip` || `source_ip_cidr`) && + (`source_geoip` || `source_ip_cidr` || `source_ip_is_private`) && (`source_port` || `source_port_range`) && `other fields` + 另外，引用的规则集可视为被合并，而不是作为一个单独的规则子项。 + #### inbound [入站](/zh/configuration/inbound) 标签. diff --git a/docs/configuration/route/rule.md b/docs/configuration/route/rule.md index aefc607c..ec19d0ef 100644 --- a/docs/configuration/route/rule.md +++ b/docs/configuration/route/rule.md @@ -134,12 +134,14 @@ icon: material/alert-decagram !!! note "" The default rule uses the following matching logic: - (`domain` || `domain_suffix` || `domain_keyword` || `domain_regex` || `geosite` || `geoip` || `ip_cidr`) && + (`domain` || `domain_suffix` || `domain_keyword` || `domain_regex` || `geosite` || `geoip` || `ip_cidr` || `ip_is_private`) && (`port` || `port_range`) && - (`source_geoip` || `source_ip_cidr`) && + (`source_geoip` || `source_ip_cidr` || `source_ip_is_private`) && (`source_port` || `source_port_range`) && `other fields` + Additionally, included rule sets can be considered merged rather than as a single rule sub-item. + #### inbound Tags of [Inbound](/configuration/inbound). diff --git a/docs/configuration/route/rule.zh.md b/docs/configuration/route/rule.zh.md index 06c202b3..53cad723 100644 --- a/docs/configuration/route/rule.zh.md +++ b/docs/configuration/route/rule.zh.md @@ -132,12 +132,14 @@ icon: material/alert-decagram !!! note "" 默认规则使用以下匹配逻辑: - (`domain` || `domain_suffix` || `domain_keyword` || `domain_regex` || `geosite` || `geoip` || `ip_cidr`) && + (`domain` || `domain_suffix` || `domain_keyword` || `domain_regex` || `geosite` || `geoip` || `ip_cidr` || `ip_is_private`) && (`port` || `port_range`) && - (`source_geoip` || `source_ip_cidr`) && + (`source_geoip` || `source_ip_cidr` || `source_ip_is_private`) && (`source_port` || `source_port_range`) && `other fields` + 另外，引用的规则集可视为被合并，而不是作为一个单独的规则子项。 + #### inbound [入站](/zh/configuration/inbound) 标签。