From 00d22d71207636b3dfc6978a0f94174e633bf39b Mon Sep 17 00:00:00 2001 From: Nick Peng Date: Wed, 14 Jun 2023 22:49:14 +0800 Subject: [PATCH] address: add multiple ip addresses --- docs/config/domain-address.md | 3 ++- docs/configuration.md | 2 +- en/docs/config/domain-address.md | 1 + en/docs/configuration.md | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/docs/config/domain-address.md b/docs/config/domain-address.md index 2316bcefc0..df894d7e2b 100644 --- a/docs/config/domain-address.md +++ b/docs/config/domain-address.md @@ -13,12 +13,13 @@ address除了可以设置屏蔽广告外，还可以指定域名的IP地址。 ```shell address /example.com/1.2.3.4 + address /example.com/4.5.6.7,8.9.10.11,12.13.14.15 ``` address选项中: * /domain/为后缀匹配算法，范围包含其子域名。 - * ip: 可以为IPV6，或IPV4地址 + * ip: 可以为IPV6，或IPV4地址，可以指定多个IP地址，如果有多个IP地址，查询的时候，将会进行随机排序。 1. 指定IPV6 diff --git a/docs/configuration.md b/docs/configuration.md index 00e454f92f..d65704825a 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -51,7 +51,7 @@ hide: | speed-check-mode | 测速模式选择 | 无 | [ping\|tcp:[80]\|none] | speed-check-mode ping,tcp:80,tcp:443 | | response-mode | 首次查询响应模式 | first-ping |模式：[first-ping\|fastest-ip\|fastest-response]
[first-ping]: 最快ping响应地址模式，DNS上游最快查询时延+ping时延最短，查询等待与链接体验最佳;
[fastest-ip]: 最快IP地址模式，查询到的所有IP地址中ping最短的IP。需等待IP测速;
[fastest-response]: 最快响应的DNS结果，DNS查询等待时间最短，返回的IP地址可能不是最快。| response-mode first-ping | | expand-ptr-from-address | 是否扩展Address对应的PTR记录 | no | [yes\|no] | expand-ptr-from-address yes | -| address | 指定域名 IP 地址 | 无 | address /domain/[ip\|-\|-4\|-6\|#\|#4\|#6]
- 表示忽略
# 表示返回 SOA
4 表示 IPv4
6 表示 IPv6 | address /www.example.com/1.2.3.4 | +| address | 指定域名 IP 地址 | 无 | address /domain/[ip1[,ip2,...]\|-\|-4\|-6\|#\|#4\|#6]
- 表示忽略
# 表示返回 SOA
4 表示 IPv4
6 表示 IPv6 | address /www.example.com/1.2.3.4
address /www.example.com/::1
address /example.com/1.2.3.4,5.6.7.8 | | cname | 指定域名别名 | 无 | cname /domain/target
- 表示忽略
指定对应域名的cname | cname /www.example.com/cdn.example.com | | dns64 | DNS64转换 | 无 | dns64 ip-prefix/mask
ipv6前缀和掩码 | dns64 64:ff9b::/96 | | edns-client-subnet | DNS ECS | 无 | edns-client-subnet ip-prefix/mask
指定EDNS客户端子网 | ip-prefix/mask 1.2.3.4/23 | diff --git a/en/docs/config/domain-address.md b/en/docs/config/domain-address.md index 37bd518077..7176f0f21f 100644 --- a/en/docs/config/domain-address.md +++ b/en/docs/config/domain-address.md @@ -13,6 +13,7 @@ In addition to blocking ads, `address` can also be used to specify the IP addres ```shell address /example.com/1.2.3.4 + address /example.com/4.5.6.7,8.9.10.11,12.13.14.15 ``` In the `address` option: diff --git a/en/docs/configuration.md b/en/docs/configuration.md index 8fc92a235d..fec8052e09 100644 --- a/en/docs/configuration.md +++ b/en/docs/configuration.md @@ -47,7 +47,7 @@ hide: |speed-check-mode|Speed ​​mode|None|[ping\|tcp:[80]\|none]|speed-check-mode ping,tcp:80,tcp:443 |response-mode|First query response mode|first-ping|Mode: [first-ping\|fastest-ip\|fastest-response]
[first-ping]: The fastest dns + ping response mode, DNS query delay + ping delay is the shortest;
[fastest-ip]: The fastest IP address mode, return the fastest ip address, may take some time to test speed.
[fastest-response]: The fastest response DNS result mode, the DNS query waiting time is the shortest. | response-mode first-ping | |expand-ptr-from-address| Whether to expand the address record corresponding to PTR record | no | [yes\|no] | expand-ptr-from-address yes | -|address|Domain IP address|None|address /domain/[ip\|-\|-4\|-6\|#\|#4\|#6], `-` for ignore, `#` for return SOA, `4` for IPV4, `6` for IPV6| address /www.example.com/1.2.3.4 +|address|Domain IP address|None|address /domain/[ip1[,ip2,...]\|-\|-4\|-6\|#\|#4\|#6], `-` for ignore, `#` for return SOA, `4` for IPV4, `6` for IPV6| address /www.example.com/1.2.3.4
address /www.example.com/::1
address /example.com/1.2.3.4,5.6.7.8 |cname|set cname to domain| None | cname /domain/target
- for ignore
set cname to domain. | cname /www.example.com/cdn.example.com | |dns64|dns64 translation | None | dns64 ip-prefix/mask
ipv6 prefix and mask. | dns64 64:ff9b::/96 | |edns-client-subnet| DNS ECS | None |edns-client-subnet ip-prefix/mask
set EDNS client subnet | ip-prefix/mask 1.2.3.4/23 |