diff --git a/docs/config/inbound/tun.md b/docs/config/inbound/tun.md index 214ddaa9..de51d97a 100644 --- a/docs/config/inbound/tun.md +++ b/docs/config/inbound/tun.md @@ -80,8 +80,8 @@ tun 模式堆栈,如无使用问题,建议使用 `mixed`栈,默认 `gvisor * `mixed` 混合堆栈,tcp 使用 `system`栈,udp 使用 `gvisor`栈,使用体验可能相对更好 * [简单性能测试](tun.md#tun_1) * 如果打开了防火墙,则无法使用 `system` 和 `mixed` 协议栈,通过以下方式放行内核: - * Windows: 设置 -> Windows 安全中心 -> 允许应用通过防火墙 -> 选中内核(clash-verge-rev 内核为 verge-mihomo) - * MacOS: 一般无需配置,防火墙默认放行签名软件,如果遇到开启防火墙无法使用的情况,可以尝试放行:系统设置 -> 网络 -> 防火墙 -> 选项 -> 添加 Clash App + * Windows: 设置 -> Windows 安全中心 -> 允许应用通过防火墙 -> 选中内核 + * MacOS: 一般无需配置,防火墙默认放行签名软件,如果遇到开启防火墙无法使用的情况,可以尝试放行:系统设置 -> 网络 -> 防火墙 -> 选项 -> 添加 mihomo app * Linux: 一般无需配置,防火墙默认不拦截应用,如果遇到开启防火墙无法使用的情况,可以尝试放行 TUN 网卡出站流量(假设 TUN 网卡为 Mihomo): `sudo iptables -A OUTPUT -o Mihomo -j ACCEPT` ## device diff --git a/docs/config/proxies/built-in.en.md b/docs/config/proxies/built-in.en.md new file mode 100644 index 00000000..3c23c744 --- /dev/null +++ b/docs/config/proxies/built-in.en.md @@ -0,0 +1,21 @@ +# Preset outbound + +## DIRECT + +Direct, data exits directly. + +## REJECT + +Reject, intercepts data from going out. + +## REJECT-DROP + +Reject, unlike `REJECT`, this strategy silently drops the request. + +## PASS + +Bypass, skipping this rule when matching. + +## COMPATIBLE + +Compatible, appears when no node is selected in the policy group filtering, equivalent to `DIRECT`. diff --git a/docs/config/proxies/built-in.md b/docs/config/proxies/built-in.md new file mode 100644 index 00000000..e71f11a7 --- /dev/null +++ b/docs/config/proxies/built-in.md @@ -0,0 +1,21 @@ +# 预置出站 + +## DIRECT + +直连,数据直接出站 + +## REJECT + +拒绝,拦截数据出站 + +## REJECT-DROP + +拒绝,与`REJECT`不同的是,该策略将静默抛弃请求 + +## PASS + +绕过,会使匹配规则时跳过此规则 + +## COMPATIBLE + +兼容,在策略组筛选不出节点时出现,等效 `DIRECT` diff --git a/docs/config/proxy-groups/built-in.en.md b/docs/config/proxy-groups/built-in.en.md index 3c23c744..ff455e67 100644 --- a/docs/config/proxy-groups/built-in.en.md +++ b/docs/config/proxy-groups/built-in.en.md @@ -1,21 +1,11 @@ -# Preset outbound +# Predefined Proxy Group -## DIRECT +## GLOBAL -Direct, data exits directly. +Default fill all proxy-groups and proxies -## REJECT +The strategy group can also be customized in the configuration file -Reject, intercepts data from going out. +However, the web panel and some client applications sort according to the order of policy groups within the GLOBAL policy group -## REJECT-DROP - -Reject, unlike `REJECT`, this strategy silently drops the request. - -## PASS - -Bypass, skipping this rule when matching. - -## COMPATIBLE - -Compatible, appears when no node is selected in the policy group filtering, equivalent to `DIRECT`. +It is recommended to write out all the policy groups of the current configuration in full (except for the GLOBAL itself) when customizing the GLOBAL policy group \ No newline at end of file diff --git a/docs/config/proxy-groups/built-in.md b/docs/config/proxy-groups/built-in.md index e71f11a7..fdafa9c6 100644 --- a/docs/config/proxy-groups/built-in.md +++ b/docs/config/proxy-groups/built-in.md @@ -1,21 +1,11 @@ -# 预置出站 +# 预置代理组 -## DIRECT +## GLOBAL -直连,数据直接出站 +默认填充所有代理组和代理节点 -## REJECT +该策略组也可以在配置文件中自定义 -拒绝,拦截数据出站 +但 web 面板以及部分客户端使用 GLOBAL 策略组内的 策略组顺序 进行排序 -## REJECT-DROP - -拒绝,与`REJECT`不同的是,该策略将静默抛弃请求 - -## PASS - -绕过,会使匹配规则时跳过此规则 - -## COMPATIBLE - -兼容,在策略组筛选不出节点时出现,等效 `DIRECT` +建议在自定义 GLOBAL 策略组时,书写完整当前配置所有的策略组 (除了 GLOBAL 本身) \ No newline at end of file diff --git a/docs/config/proxy-groups/index.en.md b/docs/config/proxy-groups/index.en.md index b6df6dca..ddc49aa5 100644 --- a/docs/config/proxy-groups/index.en.md +++ b/docs/config/proxy-groups/index.en.md @@ -76,6 +76,9 @@ Disables `UDP` for this proxy group. ## interface-name +!!! warning + The interface-name in the proxy group will soon be deprecated, please use the [interface-name](../proxies/index.md#interface-name) in the proxy node. + Specifies the [outbound interface](../general.md#outbound-interface) for the proxy group. !!! info "" @@ -83,6 +86,10 @@ Specifies the [outbound interface](../general.md#outbound-interface) for the pro ## routing-mark + +!!! warning + The routing-mark in the proxy group will soon be deprecated, please use the [routing-mark](../proxies/index.md#routing-mark) in the proxy node. + The [routing mark](../general.md#routing-mark) attached when the proxy group is outbound. !!! info "" diff --git a/docs/config/proxy-groups/index.md b/docs/config/proxy-groups/index.md index b11f412b..181d4421 100644 --- a/docs/config/proxy-groups/index.md +++ b/docs/config/proxy-groups/index.md @@ -76,6 +76,9 @@ proxy-groups: ## interface-name +!!! warning + 代理组中的 interface-name 即将被弃用,请使用代理节点中的[interface-name](../proxies/index.md#interface-name) + 指定策略组的[出站接口](../general.md#_11) !!! info "" @@ -83,6 +86,9 @@ proxy-groups: ## routing-mark +!!! warning + 代理组中的 routing-mark 即将被弃用,请使用代理节点中的[routing-mark](../proxies/index.md#routing-mark) + 策略组出站时附带[路由标记](../general.md#_12) !!! info "" diff --git a/mkdocs.yml b/mkdocs.yml index 7b293931..a097943f 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -197,6 +197,7 @@ nav: - TLS配置: config/proxies/tls.md - 传输层配置: config/proxies/transport.md - dialer-proxy: config/proxies/dialer-proxy.md + - 内置代理策略: config/proxies/built-in.md - DIRECT: config/proxies/direct.md - DNS: config/proxies/dns.md - HTTP: config/proxies/http.md @@ -218,12 +219,12 @@ nav: - 代理集合内容: config/proxy-providers/content.md - 代理组: - 代理组配置: config/proxy-groups/index.md + - 内置代理组: config/proxy-groups/built-in.md - 手动选择: config/proxy-groups/select.md - 自动选择: config/proxy-groups/url-test.md - 自动回退: config/proxy-groups/fallback.md - 负载均衡: config/proxy-groups/load-balance.md - 链式代理: config/proxy-groups/relay.md - - 内置策略: config/proxy-groups/built-in.md - 路由规则: config/rules/index.md # - 域名规则: config/rules/domain.md # - IP规则: config/rules/ip.md