Compare commits
56 Commits
Release41-
...
Release42
| Author | SHA1 | Date | |
|---|---|---|---|
|
ed102cda03 | ||
|
|
ccadadd3fb | ||
|
|
5500fe2592 | ||
|
|
7bca0ee98f | ||
|
|
c9f7dad42f | ||
|
|
8fab75241c | ||
|
|
d3a6d46a44 | ||
|
|
56d0332bf9 | ||
|
|
e38d5eaecc | ||
|
|
54d95609bd | ||
|
|
6ca3bfdf36 | ||
|
|
0e6eeefe5e | ||
|
|
0947a8dcab | ||
|
|
0f68f0c11d | ||
|
|
d4e1da9955 | ||
|
|
fbdcb7ba41 | ||
|
|
d402d62cc5 | ||
|
|
582cdfb879 | ||
|
|
fa5e519368 | ||
|
|
2dbde718a7 | ||
|
|
b5cc8a805a | ||
|
|
c90a85dfc7 | ||
|
|
56d711a796 | ||
|
|
dd23c5fc31 | ||
|
|
4f2867b7f4 | ||
|
|
bf68385d0e | ||
|
|
aa6f6fd519 | ||
|
|
455dca9ae4 | ||
|
|
47f2f45c37 | ||
|
|
2e3e03bfda | ||
|
|
a14d4a0451 | ||
|
|
cf52eeacc9 | ||
|
|
12e7bc752c | ||
|
|
81ab3f413a | ||
|
|
1c605938e0 | ||
|
|
3d7a2a8d80 | ||
|
|
3c7b86eea7 | ||
|
|
b2037c3f96 | ||
|
|
1ac2b2ad98 | ||
|
|
7bf950c5f1 | ||
|
|
9a43f0859d | ||
|
|
905a43ac67 | ||
|
|
f14cf9105d | ||
|
|
c42f98979c | ||
|
|
8405d14625 | ||
|
|
3d0d24aacc | ||
|
|
156e910215 | ||
|
|
60a3719ec7 | ||
|
|
e897788098 | ||
|
|
1ef9da847d | ||
|
|
66b86e1a8b | ||
|
|
95f843dc43 | ||
|
|
6827554def | ||
|
|
e8eddabc85 | ||
|
|
15636c355a | ||
|
|
b473b9c6e1 |
11
.github/workflows/c-cpp.yml
vendored
11
.github/workflows/c-cpp.yml
vendored
@@ -13,5 +13,14 @@ jobs:
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- name: prepare
|
||||
run: |
|
||||
sudo apt update
|
||||
sudo apt install libgtest-dev dnsperf
|
||||
- name: make
|
||||
run: make
|
||||
run: |
|
||||
make all -j4
|
||||
make clean
|
||||
- name: test
|
||||
run: |
|
||||
make -C test test -j8
|
||||
|
||||
2
.gitignore
vendored
2
.gitignore
vendored
@@ -1,5 +1,7 @@
|
||||
.vscode
|
||||
*.o
|
||||
*.pem
|
||||
.DS_Store
|
||||
*.swp.
|
||||
systemd/smartdns.service
|
||||
test.bin
|
||||
|
||||
@@ -32,7 +32,7 @@ RUN cd /build/smartdns && \
|
||||
\
|
||||
( cd package && tar -xvf *.tar.gz && chmod a+x smartdns/etc/init.d/smartdns ) && \
|
||||
\
|
||||
mkdir -p /release/var/log /release/var/run && \
|
||||
mkdir -p /release/var/log /release/run && \
|
||||
cp package/smartdns/etc /release/ -a && \
|
||||
cp package/smartdns/usr /release/ -a && \
|
||||
cd / && rm -rf /build
|
||||
|
||||
2
Makefile
2
Makefile
@@ -18,7 +18,7 @@ DESTDIR :=
|
||||
PREFIX := /usr
|
||||
SBINDIR := $(PREFIX)/sbin
|
||||
SYSCONFDIR := /etc
|
||||
RUNSTATEDIR := /var/run
|
||||
RUNSTATEDIR := /run
|
||||
SYSTEMDSYSTEMUNITDIR := $(shell ${PKG_CONFIG} --variable=systemdsystemunitdir systemd)
|
||||
SMARTDNS_SYSTEMD = systemd/smartdns.service
|
||||
|
||||
|
||||
802
ReadMe.md
802
ReadMe.md
@@ -4,35 +4,15 @@
|
||||
|
||||
|
||||
SmartDNS 是一个运行在本地的 DNS 服务器，它接受来自本地客户端的 DNS 查询请求，然后从多个上游 DNS 服务器获取 DNS 查询结果，并将访问速度最快的结果返回给客户端，以此提高网络访问速度。
|
||||
SmartDNS 同时支持指定特定域名 IP 地址，并高性匹配，可达到过滤广告的效果; 支持DOT(DNS over TLS)和DOH(DNS over HTTPS)，更好的保护隐私。
|
||||
与 DNSmasq 的 all-servers 不同，SmartDNS 返回的是访问速度最快的解析结果。详细差异请看[常见问题](#常见问题)。
|
||||
SmartDNS 同时支持指定特定域名 IP 地址，并高性匹配，可达到过滤广告的效果; 支持DOT(DNS over TLS)和DOH(DNS over HTTPS)，更好的保护隐私。
|
||||
|
||||
支持树莓派、OpenWrt、华硕路由器原生固件和 Windows 系统等。
|
||||
与 DNSmasq 的 all-servers 不同，SmartDNS 返回的是访问速度最快的解析结果。
|
||||
|
||||
## 目录
|
||||
支持树莓派、OpenWrt、华硕路由器原生固件和 Windows 系统等。
|
||||
|
||||
- [SmartDNS](#smartdns)
|
||||
- [目录](#目录)
|
||||
- [软件效果展示](#软件效果展示)
|
||||
- [特性](#特性)
|
||||
- [架构](#架构)
|
||||
- [下载](#下载)
|
||||
- [使用官方安装源](#使用官方安装源)
|
||||
- [手工下载安装](#手工下载安装)
|
||||
- [安装和使用](#安装和使用)
|
||||
- [标准 Linux 系统 / 树莓派](#标准-linux-系统--树莓派)
|
||||
- [OpenWrt](#openwrt)
|
||||
- [华硕路由器原生固件 / 梅林固件](#华硕路由器原生固件--梅林固件)
|
||||
- [Optware / Entware](#optware--entware)
|
||||
- [WSL](#wsl)
|
||||
- [配置文件说明](#配置文件说明)
|
||||
- [常见问题](#常见问题)
|
||||
- [编译](#编译)
|
||||
- [捐赠](#捐赠)
|
||||
- [PayPal 贝宝](#paypal-贝宝)
|
||||
- [AliPay 支付宝](#alipay-支付宝)
|
||||
- [WeChat Pay 微信支付](#wechat-pay-微信支付)
|
||||
- [开源声明](#开源声明)
|
||||
## 使用指导
|
||||
|
||||
SmartDNS官网：[https://pymumu.github.io/smartdns](https://pymumu.github.io/smartdns)
|
||||
|
||||
## 软件效果展示
|
||||
|
||||
@@ -103,7 +83,7 @@ rtt min/avg/max/mdev = 5.954/6.133/6.313/0.195 ms
|
||||
支持从域名所属 IP 地址列表中查找到访问速度最快的 IP 地址，并返回给客户端，提高网络访问速度。
|
||||
|
||||
1. **支持多种查询协议**
|
||||
支持 UDP、TCP、DOT 和 DOH 查询，以及非 53 端口查询；支持通过socks5，HTTP代理查询。
|
||||
支持 UDP、TCP、DOT 和 DOH 查询及服务，以及非 53 端口查询；支持通过socks5，HTTP代理查询;
|
||||
|
||||
1. **特定域名 IP 地址指定**
|
||||
支持指定域名的 IP 地址，达到广告过滤效果、避免恶意网站的效果。
|
||||
@@ -138,772 +118,16 @@ rtt min/avg/max/mdev = 5.954/6.133/6.313/0.195 ms
|
||||
1. 上游 DNS 服务器返回域名对应的服务器 IP 地址列表，SmartDNS 则会检测从本地网络访问速度最快的服务器 IP；
|
||||
1. 最后将访问速度最快的服务器 IP 返回给本地客户端。
|
||||
|
||||
## 下载
|
||||
|
||||
### 使用官方安装源
|
||||
|
||||
smartdns已经合入主流系统的软件仓库，可以直接使用系统安装命令直接安装。
|
||||
|
||||
系统|安装方式|说明|
|
||||
--|--|--
|
||||
openwrt|opkg update<br />opkg install luci-app-smartdns<br />opkg install smartdns|22.03之后的系统。软件源路径：<https://downloads.openwrt.org/releases/>
|
||||
ddwrt|官方最新固件service页面->SmartDNS Resolver->启用。|选择界面参考：<https://forum.dd-wrt.com/demo/Services.html>
|
||||
debian|apt-get install smartdns|
|
||||
entware|ipkg update<br />ipkg install smartdns|软件源路径：<https://bin.entware.net/>
|
||||
|
||||
### 手工下载安装
|
||||
|
||||
--------------
|
||||
|
||||
下载对应系统或固件版本的 SmartDNS 安装包，对应关系如下。
|
||||
|
||||
| 支持系统（架构） | 安装包 | 支持说明 |
|
||||
| :--- | :--- | :--- |
|
||||
| 标准 Linux 系统（ARM） | smartdns.1.yyyy.MM.dd-REL.arm-debian-all.deb | ARM 的树莓派 Raspbian Stretch 和 Debian 9 系统 |
|
||||
| 标准 Linux 系统（ARM64） | smartdns.1.yyyy.MM.dd-REL.aarch64-debian-all.deb | ARM64 的 Debian Stretch 和 Debian 9 系统 |
|
||||
| 标准 Linux 系统（x86_64） | smartdns.1.yyyy.MM.dd-REL.x86_64-linux-all.tar.gz | 64 位 Linux 系统 |
|
||||
| 标准 Linux 系统（x86） | smartdns.1.yyyy.MM.dd-REL.x86-linux-all.tar.gz | 32 位 Linux 系统 |
|
||||
| WSL | smartdns.1.yyyy.MM.dd-REL.x86_64-linux-all.tar.gz | WSL |
|
||||
| Optware | smartdns.1.yyyy.MM.dd-REL.mips-optware-all.ipk | MIPS 大端架构的 Optware 系统 |
|
||||
| Optware（MIPS Little Endian） | smartdns.1.yyyy.MM.dd-REL.mipsel-optware-all.ipk | MIPS 小端架构的 Optware 系统 |
|
||||
| Optware（ARM） | smartdns.1.yyyy.MM.dd-REL.arm-optware-all.ipk | ARM 小端架构的 Optware 系统 |
|
||||
| OpenWrt（MIPS） | smartdns.1.yyyy.MM.dd-REL.mips-openwrt-all.ipk | MIPS 大端架构的 OpenWrt 系统 |
|
||||
| OpenWrt（MIPS Little Endian） | smartdns.1.yyyy.MM.dd-REL.mipsel-openwrt-all.ipk | MIPS 小端架构的 OpenWrt 系统 |
|
||||
| OpenWrt（ARM） | smartdns.1.yyyy.MM.dd-REL.arm-openwrt-all.ipk | ARM 小端架构的 OpenWrt 系统 |
|
||||
| OpenWrt LuCI | luci-app-smartdns.1.yyyy.MM.dd-REL.all.ipk | OpenWrt 管理界面 |
|
||||
| OpenWrt LuCI | luci-app-smartdns.1.yyyy.MM.dd-REL.all-luci-compat-all.ipk | OpenWrt 管理界面、OpenWrt 18.xx 及之前版本 |
|
||||
|
||||
**[前往 Release 页面下载](https://github.com/pymumu/smartdns/releases)。**
|
||||
|
||||
**请注意：**
|
||||
|
||||
- Release 释出的软件包采取静态编译，无外部依赖，但体积大。若需要小体积软件包，请自行编译或从 OpenWrt / Entware 仓库获取。
|
||||
|
||||
- 静态编译的软件包未强制判断 CPU 架构，安装不正确的软件包将会导致服务无法启动，请确保正确安装对应的版本。
|
||||
|
||||
- MacOS，Windows可获取Rust语言实现的Smartdns: [SmartDNS-rs](https://github.com/mokeyish/smartdns-rs)。
|
||||
|
||||
## 安装和使用
|
||||
|
||||
### 标准 Linux 系统 / 树莓派
|
||||
|
||||
--------------
|
||||
|
||||
1. 安装
|
||||
|
||||
下载配套安装包，并上传到 Linux 系统中。
|
||||
|
||||
标准 Linux 系统（X86 / X86_64）请执行如下命令安装：
|
||||
|
||||
```shell
|
||||
tar zxf smartdns.1.yyyy.MM.dd-REL.x86_64-linux-all.tar.gz
|
||||
cd smartdns
|
||||
chmod +x ./install
|
||||
./install -i
|
||||
```
|
||||
|
||||
树莓派或其他 Debian 系系统（ARM / ARM64）请执行如下命令安装：
|
||||
|
||||
```shell
|
||||
dpkg -i smartdns.1.yyyy.MM.dd-REL.arm-debian-all.deb
|
||||
```
|
||||
|
||||
**对于Ubuntu系统：**
|
||||
- `systemd-resolved`会占用TCP53和UDP53端口。你需要手动解决端口占用问题或者修改smartdns监听端口
|
||||
|
||||
- 日志文件在`/var/log/smartdns/smartdns.log`
|
||||
|
||||
1. 修改配置
|
||||
|
||||
安装完成后，可配置 SmartDNS 的上游服务器信息。
|
||||
|
||||
一般情况下，只需要增加 `server`[`IP`]`:port` 和 `server-tcp`[`IP`]`:port` 配置项。
|
||||
|
||||
请尽可能配置多个上游 DNS 服务器，包括国内外的服务器。
|
||||
|
||||
具体配置参数请参考[配置文件说明](#配置文件说明)。
|
||||
|
||||
```shell
|
||||
vi /etc/smartdns/smartdns.conf
|
||||
```
|
||||
|
||||
`/etc/smartdns/smartdns.conf`配置包含如下基本内容：
|
||||
|
||||
```shell
|
||||
# 指定监听的端口号
|
||||
bind []:53
|
||||
# 指定上游服务器
|
||||
server 1.1.1.1
|
||||
server-tls 8.8.8.8
|
||||
# 指定域名规则
|
||||
address /example.com/1.2.3.4
|
||||
domain-rule /example.com/ -address 1.2.3.4
|
||||
```
|
||||
|
||||
1. 启动服务
|
||||
|
||||
```shell
|
||||
systemctl enable smartdns
|
||||
systemctl start smartdns
|
||||
```
|
||||
|
||||
1. 将 DNS 请求转发到 SmartDNS 解析
|
||||
|
||||
修改本地路由器的 DNS 服务器，将 DNS 服务器配置为 SmartDNS。
|
||||
|
||||
- 登录到本地网络的路由器中，配置树莓派，分配其静态 IP 地址。
|
||||
- 修改 WAN 口或者 DHCP DNS 为树莓派 IP 地址。
|
||||
**注意：**
|
||||
I. 每款路由器配置方法不尽相同，请在网络上搜索对应配置方法。
|
||||
II. 华为等路由器可能不支持配置 DNS 为本地 IP，可修改电脑端或手机端的 DNS 服务器为树莓派 IP。
|
||||
|
||||
1. 检测服务是否配置成功
|
||||
|
||||
执行
|
||||
|
||||
```shell
|
||||
nslookup -querytype=ptr smartdns
|
||||
```
|
||||
|
||||
查看命令结果中的 `name` 是否为 `smartdns` 或你的主机名，如果是则表示生效
|
||||
|
||||
```shell
|
||||
$ nslookup -querytype=ptr smartdns
|
||||
Server: 192.168.1.1
|
||||
Address: 192.168.1.1#53
|
||||
|
||||
Non-authoritative answer:
|
||||
smartdns name = smartdns.
|
||||
```
|
||||
|
||||
### OpenWrt
|
||||
|
||||
--------------
|
||||
|
||||
1. 安装
|
||||
|
||||
将软件包（使用 WinSCP 等）上传到路由器的 `/root` 目录，执行如下命令安装
|
||||
|
||||
```shell
|
||||
opkg install smartdns.1.yyyy.MM.dd-REL.xxxx.ipk
|
||||
opkg install luci-app-smartdns.1.yyyy.MM.dd-REL.all.ipk
|
||||
```
|
||||
|
||||
- **注意：** 19.07 之前的版本，请务必安装 `luci-app-smartdns.1.yyyy.MM.dd-REL.all-luci-compat-all.ipk`。
|
||||
|
||||
1. 修改配置
|
||||
|
||||
登录 OpenWrt 管理页面，打开 `Services` -> `SmartDNS` 进行配置。
|
||||
|
||||
- 在 `Upstream Servers` 增加上游 DNS 服务器配置，建议配置多个国内外 DNS 服务器。
|
||||
- 在 `Domain Address` 指定特定域名的 IP 地址，可用于广告屏蔽。
|
||||
|
||||
1. 启用服务
|
||||
|
||||
- 替换默认Dnsmasq为主DNS。
|
||||
|
||||
登录 OpenWrt 管理界面，点击 `Services` -> `SmartDNS` -> `port`，设置端口号为`53`，smartdns会自动接管主DNS服务器。
|
||||
|
||||
- 检测转发服务是否配置成功
|
||||
|
||||
执行
|
||||
|
||||
```shell
|
||||
nslookup -querytype=ptr smartdns
|
||||
```
|
||||
|
||||
查看命令结果中的 `name` 是否为 `smartdns` 或你的主机名，如果是则表示生效
|
||||
|
||||
```shell
|
||||
$ nslookup -querytype=ptr smartdns
|
||||
Server: 192.168.1.1
|
||||
Address: 192.168.1.1#53
|
||||
|
||||
Non-authoritative answer:
|
||||
smartdns name = smartdns.
|
||||
```
|
||||
|
||||
1. 启动服务
|
||||
|
||||
勾选配置页面中的 `Enable（启用）`来启动 SmartDNS。
|
||||
|
||||
1. **注意：**
|
||||
|
||||
- 如已经安装 ChinaDNS，建议将 ChinaDNS 的上游配置为 SmartDNS。
|
||||
- 当smartdns的端口为53时，将自动接管dnsmasq为主dns。配置其他端口时，会重新启用dnsmasq为主dns。
|
||||
- 若在此过程中发生异常，可使用如下命令还原dnsmasq为主DNS
|
||||
|
||||
```shell
|
||||
uci delete dhcp.@dnsmasq[0].port
|
||||
uci commit dhcp
|
||||
/etc/init.d/dnsmasq restart
|
||||
```
|
||||
|
||||
### 华硕路由器原生固件 / 梅林固件
|
||||
|
||||
--------------
|
||||
|
||||
**说明：** 梅林固件派生自华硕固件，理论上可以直接使用华硕配套的安装包使用。但目前未经验证，如有问题，请提交 Issue。
|
||||
|
||||
1. 准备
|
||||
|
||||
在使用此软件时，需要确认路由器是否支持 U 盘，并准备好 U 盘一个。
|
||||
|
||||
1. 启用 SSH 登录
|
||||
|
||||
登录管理界面，点击 `系统管理` -> `系统设置`，配置 `Enable SSH` 为 `Lan Only`。
|
||||
SSH 登录用户名密码与管理界面相同。
|
||||
|
||||
1. 下载 `Download Master`
|
||||
|
||||
在管理界面点击 `USB 相关应用` -> `Download Master` 下载。
|
||||
下载完成后，启用 `Download Master`，如果不需要下载功能，此时可以卸载 `Download Master`，但要保证卸载前 `Download Master` 是启用的。
|
||||
|
||||
1. 安装 SmartDNS
|
||||
|
||||
将软件包（使用 WinSCP 等）上传到路由器的 `/tmp/mnt/sda1` 目录（或网上邻居复制到 sda1 共享目录），执行如下命令安装
|
||||
|
||||
```shell
|
||||
ipkg install smartdns.1.yyyy.MM.dd-REL.mipsbig.ipk
|
||||
```
|
||||
|
||||
1. 重启路由器使服务生效
|
||||
|
||||
待路由器启动后， 执行
|
||||
|
||||
```shell
|
||||
nslookup -querytype=ptr smartdns
|
||||
```
|
||||
|
||||
查看命令结果中的 `name` 是否为 `smartdns` 或你的主机名，如果是则表示生效
|
||||
|
||||
```shell
|
||||
$ nslookup -querytype=ptr smartdns
|
||||
Server: 192.168.1.1
|
||||
Address: 192.168.1.1#53
|
||||
|
||||
Non-authoritative answer:
|
||||
smartdns name = smartdns.
|
||||
```
|
||||
|
||||
1. **额外说明**
|
||||
|
||||
上述过程，SmartDNS 将安装到 U 盘根目录，采用 Optware 的模式运行。
|
||||
其目录结构如下（此处仅列出 SmartDNS 相关文件）：
|
||||
|
||||
```shell
|
||||
U 盘
|
||||
└── asusware.mipsbig
|
||||
├── bin
|
||||
├── etc
|
||||
| ├── smartdns
|
||||
| | └── smartdns.conf
|
||||
| └── init.d
|
||||
| └── S50smartdns
|
||||
├── lib
|
||||
├── sbin
|
||||
├── usr
|
||||
| └── sbin
|
||||
| └── smartdns
|
||||
....
|
||||
```
|
||||
|
||||
如要修改配置，可以 SSH 登录路由器，使用 vi 命令修改
|
||||
|
||||
```shell
|
||||
vi /opt/etc/smartdns/smartdns.conf
|
||||
```
|
||||
|
||||
`/opt/etc/smartdns/smartdns.conf`配置包含如下基本内容：
|
||||
|
||||
```shell
|
||||
# 指定监听的端口号
|
||||
bind []:53
|
||||
# 指定上游服务器
|
||||
server 1.1.1.1
|
||||
server-tls 8.8.8.8
|
||||
# 指定域名规则
|
||||
address /example.com/1.2.3.4
|
||||
domain-rule /example.com/ -address 1.2.3.4
|
||||
```
|
||||
|
||||
也可以通过网上邻居修改，网上邻居共享目录 `sda1` 看不到 `asusware.mipsbig` 目录，但可以直接在`文件管理器`中输入 `asusware.mipsbig\etc\init.d` 访问
|
||||
|
||||
```shell
|
||||
\\192.168.1.1\sda1\asusware.mipsbig\etc\init.d
|
||||
```
|
||||
|
||||
### Optware / Entware
|
||||
|
||||
--------------
|
||||
|
||||
1. 准备
|
||||
|
||||
在使用此软件时，需要确认路由器是否支持 U 盘，并准备好 U 盘一个。
|
||||
|
||||
1. 安装 SmartDNS
|
||||
|
||||
将软件（使用 WinSCP 等）上传到路由器的 `/tmp` 目录，执行如下命令安装
|
||||
|
||||
```shell
|
||||
ipkg install smartdns.1.yyyy.MM.dd-REL.mipsbig.ipk
|
||||
```
|
||||
|
||||
1. 修改 SmartDNS 配置
|
||||
|
||||
```shell
|
||||
vi /opt/etc/smartdns/smartdns.conf
|
||||
```
|
||||
|
||||
`/opt/etc/smartdns/smartdns.conf`配置包含如下基本内容：
|
||||
|
||||
```shell
|
||||
# 指定监听的端口号
|
||||
bind []:53
|
||||
# 指定上游服务器
|
||||
server 1.1.1.1
|
||||
server-tls 8.8.8.8
|
||||
# 指定域名规则
|
||||
address /example.com/1.2.3.4
|
||||
domain-rule /example.com/ -address 1.2.3.4
|
||||
```
|
||||
|
||||
另外，如需支持 IPv6，可设置工作模式为 `2`，将 DNSmasq 的 DNS 服务禁用，设置 SmartDNS 为主用 DNS 服务器。将文件 `/opt/etc/smartdns/smartdns-opt.conf` 中的 `SMARTDNS_WORKMODE` 的值修改为 `2`
|
||||
|
||||
```shell
|
||||
SMARTDNS_WORKMODE="2"
|
||||
```
|
||||
|
||||
1. 重启路由器使服务生效
|
||||
|
||||
待路由器启动后， 执行
|
||||
|
||||
```shell
|
||||
nslookup -querytype=ptr smartdns
|
||||
```
|
||||
|
||||
查看命令结果中的 `name` 是否为 `smartdns` 或你的主机名，如果是则表示生效
|
||||
|
||||
```shell
|
||||
$ nslookup -querytype=ptr smartdns
|
||||
Server: 192.168.1.1
|
||||
Address: 192.168.1.1#53
|
||||
|
||||
Non-authoritative answer:
|
||||
smartdns name = smartdns.
|
||||
```
|
||||
|
||||
**注意：** 若服务没有自动启动，则需要设置 Optware / Entware 自动启动，具体方法请参考 Optware/Entware 的文档。
|
||||
|
||||
### WSL
|
||||
|
||||
--------------
|
||||
|
||||
1. 安装 WSL
|
||||
|
||||
安装 WSL 运行环境，发行版本选择 Ubuntu 系统为例。安装步骤请参考 [WSL 安装说明](https://docs.microsoft.com/zh-CN/windows/wsl/install)
|
||||
|
||||
1. 安装 SmartDNS
|
||||
|
||||
下载适用于 WSL 的安装包，并解压到如 D 盘根目录。解压后目录如下：
|
||||
|
||||
```shell
|
||||
D:\SMARTDNS
|
||||
├─etc
|
||||
│ ├─default
|
||||
│ ├─init.d
|
||||
│ └─smartdns
|
||||
├─package
|
||||
│ └─windows
|
||||
├─src
|
||||
└─systemd
|
||||
```
|
||||
|
||||
双击 `D:\smartdns\package\windows` 目录下的 `install.bat` 进行安装。要求输入密码时，请输入 `WLS ubuntu` 的密码。
|
||||
|
||||
1. 修改配置
|
||||
|
||||
用记事本等打开 `D:\smartdns\etc\smartdns` 目录中的 `smartdns.conf` 配置文件配置 SmartDNS。
|
||||
|
||||
一般情况下，只需要增加 `server [IP]:port` 和 `server-tcp [IP]:port` 配置项，
|
||||
尽可能配置多个上游DNS服务器，包括国内外的服务器。
|
||||
|
||||
具体配置请参考[配置文件说明](#配置文件说明)。
|
||||
`smartdns.conf` 配置包含如下基本内容：
|
||||
|
||||
```shell
|
||||
# 指定监听的端口号
|
||||
bind []:53
|
||||
# 指定上游服务器
|
||||
server 1.1.1.1
|
||||
server-tls 8.8.8.8
|
||||
# 指定域名规则
|
||||
address /example.com/1.2.3.4
|
||||
domain-rule /example.com/ -address 1.2.3.4
|
||||
```
|
||||
|
||||
1. 重新加载配置
|
||||
|
||||
双击 `D:\smartdns\package\windows` 目录下的 `reload.bat` 进行重新加载。要求输入密码时，请输入 `WLS ubuntu` 的密码。
|
||||
|
||||
1. 将 DNS 请求转发到 SmartDNS 解析
|
||||
|
||||
将 Windows 的默认 DNS 服务器修改为 `127.0.0.1`，具体步骤参考 Windows [更改 TCP/IP 设置](https://support.microsoft.com/zh-cn/help/15089/windows-change-tcp-ip-settings)。
|
||||
|
||||
1. 检测服务是否配置成功
|
||||
|
||||
执行
|
||||
|
||||
```shell
|
||||
nslookup -querytype=ptr smartdns
|
||||
```
|
||||
|
||||
查看命令结果中的 `name` 是否为 `smartdns` 或你的主机名，如果是则表示生效
|
||||
|
||||
```shell
|
||||
$ nslookup -querytype=ptr smartdns
|
||||
Server: 192.168.1.1
|
||||
Address: 192.168.1.1#53
|
||||
|
||||
Non-authoritative answer:
|
||||
smartdns name = smartdns.
|
||||
```
|
||||
|
||||
## 配置文件说明
|
||||
|
||||
配置建议：**smartdns默认已设置为最优模式，适合大部分场景的DNS查询体验改善，一般情况只需要增加上游服务器地址即可，无需做其他配置修改；如有其他配置修改，请务必了解其用途，避免修改后起到反作用。**
|
||||
|
||||
| 键名 | 功能说明 | 默认值 | 可用值/要求 | 举例 |
|
||||
| :--- | :--- | :--- | :--- | :--- |
|
||||
| server-name | DNS 服务器名称 | 操作系统主机名 / smartdns | 符合主机名规格的字符串 | server-name smartdns |
|
||||
| bind | DNS 监听端口号 | [::]:53 | 可绑定多个端口。<br />IP:PORT@DEVICE: 服务器 IP:端口号@设备名<br />[-group]: 请求时使用的 DNS 服务器组<br />[-no-rule-addr]：跳过 address 规则<br />[-no-rule-nameserver]：跳过 Nameserver 规则<br />[-no-rule-ipset]：跳过 ipset 和 nftset 规则<br />[-no-rule-soa]：跳过 SOA(#) 规则<br />[-no-dualstack-selection]：停用双栈测速<br />[-no-speed-check]：停用测速<br />[-no-cache]：停止缓存 | bind :53@eth0 |
|
||||
| bind-tcp | DNS TCP 监听端口号 | [::]:53 | 可绑定多个端口。<br />IP:PORT@DEVICE: 服务器 IP:端口号@设备名<br />[-group]: 请求时使用的 DNS 服务器组<br />[-no-rule-addr]：跳过 address 规则<br />[-no-rule-nameserver]：跳过 nameserver 规则<br />[-no-rule-ipset]：跳过 ipset 和 nftset 规则。<br />[-no-rule-soa]：跳过 SOA(#) 规则<br />[-no-dualstack-selection]：停用双栈测速<br />[-no-speed-check]：停用测速<br />[-no-cache]：停止缓存 | bind-tcp :53 |
|
||||
| cache-size | 域名结果缓存个数 | 512 | 大于等于 0 的数字 | cache-size 512 |
|
||||
| cache-persist | 是否持久化缓存 | 自动。<br />当 cache-file 所在的位置有超过 128 MB 的可用空间时启用，否则禁用。 | [yes\|no] | cache-persist yes |
|
||||
| cache-file | 缓存持久化文件路径 | /tmp/<br />smartdns.cache | 合法路径字符串 | cache-file /tmp/smartdns.cache |
|
||||
| tcp-idle-time | TCP 链接空闲超时时间 | 120 | 大于等于 0 的数字 | tcp-idle-time 120 |
|
||||
| rr-ttl | 域名结果 TTL | 远程查询结果 | 大于 0 的数字 | rr-ttl 600 |
|
||||
| rr-ttl-min | 允许的最小 TTL 值 | 远程查询结果 | 大于 0 的数字 | rr-ttl-min 60 |
|
||||
| rr-ttl-max | 允许的最大 TTL 值 | 远程查询结果 | 大于 0 的数字 | rr-ttl-max 600 |
|
||||
| rr-ttl-reply-max | 允许返回给客户端的最大 TTL 值 | 远程查询结果 | 大于 0 的数字 | rr-ttl-reply-max 60 |
|
||||
| local-ttl | 本地HOST，address的TTL值 | rr-ttl-min | 大于 0 的数字 | local-ttl 60 |
|
||||
| max-reply-ip-num | 允许返回给客户的最大IP数量 | IP数量 | 大于 0 的数字 | max-reply-ip-num 1 |
|
||||
| log-level | 设置日志级别 | error | fatal、error、warn、notice、info 或 debug | log-level error |
|
||||
| log-file | 日志文件路径 | /var/log/<br />smartdns/<br />smartdns.log | 合法路径字符串 | log-file /var/log/smartdns/smartdns.log |
|
||||
| log-size | 日志大小 | 128K | 数字 + K、M 或 G | log-size 128K |
|
||||
| log-num | 日志归档个数 | openwrt为2， 其他系统为8 | 大于等于 0 的数字，0表示禁用日志 | log-num 2 |
|
||||
| log-file-mode | 日志归档文件权限 | 0640 | 文件权限 | log-file-mode 644 |
|
||||
| audit-enable | 设置审计启用 | no | [yes\|no] | audit-enable yes |
|
||||
| audit-file | 审计文件路径 | /var/log/<br />smartdns/<br />smartdns-audit.log | 合法路径字符串 | audit-file /var/log/smartdns/smartdns-audit.log |
|
||||
| audit-size | 审计大小 | 128K | 数字 + K、M 或 G | audit-size 128K |
|
||||
| audit-num | 审计归档个数 | 2 | 大于等于 0 的数字 | audit-num 2 |
|
||||
| audit-file-mode | 审计归档文件权限 | 0640 | 文件权限 | log-file-mode 644 |
|
||||
| conf-file | 附加配置文件 | 无 | 合法路径字符串 | conf-file /etc/smartdns/smartdns.more.conf |
|
||||
| server | 上游 UDP DNS | 无 | 可重复。<br />[ip][:port]\|URL：服务器 IP:端口（可选）或 URL <br />[-blacklist-ip]：配置 IP 过滤结果。<br />[-whitelist-ip]：指定仅接受参数中配置的 IP 范围<br />[-group [group] ...]：DNS 服务器所属组，比如 office 和 foreign，和 nameserver 配套使用<br />[-exclude-default-group]：将 DNS 服务器从默认组中排除。<br />[-set-mark mark]：设置数据包标记so-mark。<br />[-proxy name]：设置代理服务器。 | server 8.8.8.8:53 -blacklist-ip -group g1 -proxy proxy<br /> server tls://8.8.8.8|
|
||||
| server-tcp | 上游 TCP DNS | 无 | 可重复。<br />[ip][:port]：服务器 IP:端口（可选）<br />[-blacklist-ip]：配置 IP 过滤结果<br />[-whitelist-ip]：指定仅接受参数中配置的 IP 范围。<br />[-group [group] ...]：DNS 服务器所属组，比如 office 和 foreign，和 nameserver 配套使用<br />[-exclude-default-group]：将 DNS 服务器从默认组中排除。<br />[-set-mark mark]：设置数据包标记so-mark。<br />[-proxy name]：设置代理服务器。 | server-tcp 8.8.8.8:53 |
|
||||
| server-tls | 上游 TLS DNS | 无 | 可重复。<br />[ip][:port]：服务器 IP:端口（可选)<br />[-spki-pin [sha256-pin]]：TLS 合法性校验 SPKI 值，base64 编码的 sha256 SPKI pin 值<br />[-host-name]：TLS SNI 名称, 名称设置为-，表示停用SNI名称<br />[-tls-host-verify]：TLS 证书主机名校验<br /> [-no-check-certificate]：跳过证书校验<br />[-blacklist-ip]：配置 IP 过滤结果<br />[-whitelist-ip]：仅接受参数中配置的 IP 范围<br />[-group [group] ...]：DNS 服务器所属组，比如 office 和 foreign，和 nameserver 配套使用<br />[-exclude-default-group]：将 DNS 服务器从默认组中排除。<br />[-set-mark mark]：设置数据包标记so-mark。<br />[-proxy name]：设置代理服务器。 | server-tls 8.8.8.8:853 |
|
||||
| server-https | 上游 HTTPS DNS | 无 | 可重复。<br /><https://[host>][:port]/path：服务器 IP:端口（可选）<br />[-spki-pin [sha256-pin]]：TLS 合法性校验 SPKI 值，base64 编码的 sha256 SPKI pin 值<br />[-host-name]：TLS SNI 名称<br />[-http-host]：http 协议头主机名<br />[-tls-host-verify]：TLS 证书主机名校验<br /> [-no-check-certificate]：跳过证书校验<br />[-blacklist-ip]：配置 IP 过滤结果<br />[-whitelist-ip]：仅接受参数中配置的 IP 范围。<br />[-group [group] ...]：DNS 服务器所属组，比如 office 和 foreign，和 nameserver 配套使用<br />[-exclude-default-group]：将 DNS 服务器从默认组中排除。<br />[-set-mark]：设置数据包标记so-mark。<br />[-proxy name]：设置代理服务器。 | server-https <https://cloudflare-dns.com/dns-query> |
|
||||
| proxy-server | 代理服务器 | 无 | 可重复。<br />proxy-server URL <br />[URL]: [socks5\|http]://[username:password@]host:port<br />[-name]: 代理服务器名称。 |proxy-server socks5://user:pass@1.2.3.4:1080 -name proxy|
|
||||
| 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]<br /> [first-ping]: 最快ping响应地址模式，DNS上游最快查询时延+ping时延最短，查询等待与链接体验最佳;<br />[fastest-ip]: 最快IP地址模式，查询到的所有IP地址中ping最短的IP。需等待IP测速; <br />[fastest-response]: 最快响应的DNS结果，DNS查询等待时间最短，返回的IP地址可能不是最快。| response-mode first-ping |
|
||||
| address | 指定域名 IP 地址 | 无 | address /domain/[ip\|-\|-4\|-6\|#\|#4\|#6] <br />- 表示忽略 <br /># 表示返回 SOA <br />4 表示 IPv4 <br />6 表示 IPv6 | address /www.example.com/1.2.3.4 |
|
||||
| cname | 指定域名别名 | 无 | cname /domain/target <br />- 表示忽略 <br />指定对应域名的cname | cname /www.example.com/cdn.example.com |
|
||||
| dns64 | DNS64转换 | 无 | dns64 ip-prefix/mask <br /> ipv6前缀和掩码 | dns64 64:ff9b::/96 |
|
||||
| nameserver | 指定域名使用 server 组解析 | 无 | nameserver /domain/[group\|-], group 为组名，- 表示忽略此规则，配套 server 中的 -group 参数使用 | nameserver /www.example.com/office |
|
||||
| ipset | 域名 ipset | 无 | ipset /domain/[ipset\|-\|#[4\|6]:[ipset\|-][,#[4\|6]:[ipset\|-]]]，-表示忽略 | ipset /www.example.com/#4:dns4,#6:- <br />ipset /www.example.com/dns |
|
||||
| ipset-timeout | 设置 ipset 超时功能启用 | no | [yes\|no] | ipset-timeout yes |
|
||||
| ipset-no-speed | 当测速失败时，将域名结果设置到ipset集合中 | 无 | ipset \| #[4\|6]:ipset | ipset-no-speed #4:ipset4,#6:ipse6 <br /> ipset-no-speed ipset|
|
||||
| nftset | 域名 nftset | 无 | nftset /domain/[#4\|#6\|-]:[family#nftable#nftset\|-][,#[4\|6]:[family#nftable#nftset\|-]]]，<br />-表示忽略；<br />ipv4 地址的 family 只支持 inet 和 ip；<br />ipv6 地址的 family 只支持 inet 和 ip6；<br />由于 nft 限制，两种地址只能分开存放于两个 set 中。| nftset /www.example.com/#4:inet#tab#dns4,#6:- |
|
||||
| nftset-timeout | 设置 nftset 超时功能启用 | no | [yes\|no] | nftset-timeout yes |
|
||||
| nftset-no-speed | 当测速失败时，将域名结果设置到nftset集合中 | 无 | nftset-no-speed [#4\|#6]:[family#nftable#nftset][,#[4\|6]:[family#nftable#nftset]]] <br />ipv4 地址的 family 只支持 inet 和 ip <br />ipv6 地址的 family 只支持 inet 和 ip6 <br />由于 nft 限制，两种地址只能分开存放于两个 set 中。| nftset-no-speed #4:inet#tab#set4|
|
||||
| nftset-debug | 设置 nftset 调试功能启用 | no | [yes\|no] | nftset-debug yes |
|
||||
| domain-rules | 设置域名规则 | 无 | domain-rules /domain/ [-rules...]<br />[-c\|-speed-check-mode]：测速模式，参考 speed-check-mode 配置<br />[-a\|-address]：参考 address 配置<br />[-n\|-nameserver]：参考 nameserver 配置<br />[-p\|-ipset]：参考ipset配置<br />[-t\|-nftset]：参考nftset配置<br />[-d\|-dualstack-ip-selection]：参考 dualstack-ip-selection<br /> [-no-serve-expired]：禁用过期缓存<br />[-rr-ttl\|-rr-ttl-min\|-rr-ttl-max]: 参考配置rr-ttl, rr-ttl-min, rr-ttl-max<br />[-delete]：删除对应的规则 | domain-rules /www.example.com/ -speed-check-mode none |
|
||||
| domain-set | 设置域名集合 | 无 | domain-set [options...]<br />[-n\|-name]：域名集合名称 <br />[-t\|-type]：域名集合类型，当前仅支持list，格式为域名列表，一行一个域名。<br />[-f\|-file]：域名集合文件路径。<br /> 选项需要配合address, nameserver, ipset, nftset等需要指定域名的地方使用，使用方式为 /domain-set:[name]/| domain-set -name set -type list -file /path/to/list <br /> address /domain-set:set/1.2.4.8 |
|
||||
| bogus-nxdomain | 假冒 IP 地址过滤 | 无 | [ip/subnet]，可重复 | bogus-nxdomain 1.2.3.4/16 |
|
||||
| ignore-ip | 忽略 IP 地址 | 无 | [ip/subnet]，可重复 | ignore-ip 1.2.3.4/16 |
|
||||
| whitelist-ip | 白名单 IP 地址 | 无 | [ip/subnet]，可重复 | whitelist-ip 1.2.3.4/16 |
|
||||
| blacklist-ip | 黑名单 IP 地址 | 无 | [ip/subnet]，可重复 | blacklist-ip 1.2.3.4/16 |
|
||||
| force-AAAA-SOA | 强制 AAAA 地址返回 SOA | no | [yes\|no] | force-AAAA-SOA yes |
|
||||
| force-qtype-SOA | 强制指定 qtype 返回 SOA | qtype id | [qtypeid\|...] | force-qtype-SOA 65 28
|
||||
| prefetch-domain | 域名预先获取功能 | no | [yes\|no] | prefetch-domain yes |
|
||||
| dnsmasq-lease-file | 支持读取dnsmasq dhcp文件解析本地主机名功能 | 无 | dnsmasq dhcp lease文件路径 | dnsmasq-lease-file /var/lib/misc/dnsmasq.leases |
|
||||
| serve-expired | 过期缓存服务功能 | yes | [yes\|no]，开启此功能后，如果有请求时尝试回应 TTL 为 0 的过期记录，并发查询记录，以避免查询等待 |
|
||||
| serve-expired-ttl | 过期缓存服务最长超时时间 | 0 | 秒，0 表示停用超时，大于 0 表示指定的超时的秒数 | serve-expired-ttl 0 |
|
||||
| serve-expired-reply-ttl | 回应的过期缓存 TTL | 5 | 秒，0 表示停用超时，大于 0 表示指定的超时的秒数 | serve-expired-reply-ttl 30 |
|
||||
| dualstack-ip-selection | 双栈 IP 优选 | yes | [yes\|no] | dualstack-ip-selection yes |
|
||||
| dualstack-ip-selection-threshold | 双栈 IP 优选阈值 | 15ms | 单位为毫秒（ms） | dualstack-ip-selection-threshold [0-1000] |
|
||||
| user | 进程运行用户 | root | user [username] | user nobody |
|
||||
| ca-file | 证书文件 | /etc/ssl/<br />certs/ca-certificates.crt | 合法路径字符串 | ca-file /etc/ssl/certs/ca-certificates.crt |
|
||||
| ca-path | 证书文件路径 | /etc/ssl/certs | 合法路径字符串 | ca-path /etc/ssl/certs |
|
||||
|
||||
## 常见问题
|
||||
|
||||
1. SmartDNS 和 DNSmasq 有什么区别？
|
||||
|
||||
SmartDNS 在设计上并不是 DNSmasq 的替代品，它的主要功能集中在 DNS 解析增强上，增强部分有：
|
||||
|
||||
- 多上游服务器并发请求，对结果进行测速后，返回最佳结果；
|
||||
- address、ipset 域名匹配采用高效算法，查询匹配更加快速，即使是路由器设备也依然高效；
|
||||
- 域名匹配支持忽略特定域名，可单独匹配 IPv4 和 IPv6，支持多样化定制；
|
||||
- 针对广告屏蔽功能做增强，返回 SOA，屏蔽广告效果更佳；
|
||||
- IPv4、IPv6 双栈 IP 优选机制，在双网情况下，选择最快的网络通讯；
|
||||
- 支持最新的 TLS 和 HTTPS 协议，提供安全的 DNS 查询能力；
|
||||
- ECS 支持，使查询结果更佳准确；
|
||||
- IP 黑名单和忽略 IP 机制，使域名查询更佳准确；
|
||||
- 域名预查询，访问常用网站更加快速；
|
||||
- 域名 TTL 可指定，使访问更快速；
|
||||
- 高速缓存机制，使访问更快速；
|
||||
- 异步日志，审计机制，在记录信息的同时不影响 DNS 查询性能；
|
||||
- 域名组（group）机制，特定域名使用特定上游服务器组查询，避免隐私泄漏；
|
||||
- 第二 DNS 支持自定义更多行为。
|
||||
|
||||
1. 如何配置上游服务器最佳？
|
||||
|
||||
SmartDNS 有测速机制，在配置上游服务器时，建议配置多个上游 DNS 服务器，包含多个不同区域的服务器，但总数建议在 10 个左右。推荐搭配
|
||||
|
||||
- 运营商 DNS。
|
||||
- 国内公共 DNS，如 `119.29.29.29`, `223.5.5.5`。
|
||||
- 国外公共 DNS，如 `8.8.8.8`, `8.8.4.4`。
|
||||
|
||||
1. 如何启用审计日志？
|
||||
|
||||
审计日志记录客户端请求的域名，记录信息包括，请求时间，请求 IP，请求域名，请求类型，如果要启用审计日志，在配置界面配置 `audit-enable yes` 启用，`audit-size`、 `audit-file`、`audit-num` 分别配置审计日志文件大小，审计日志文件路径，和审计日志文件个数。审计日志文件将会压缩存储以节省空间。
|
||||
|
||||
1. 如何避免隐私泄漏？
|
||||
|
||||
默认情况下，SmartDNS 会将请求发送到所有配置的DNS服务器，若上游 DNS 服务器使用DNS，或记录日志，将会导致隐私泄漏。为避免隐私泄漏，请尽量：
|
||||
|
||||
- 配置使用可信的DNS服务器。
|
||||
- 优先使用 TLS 查询。
|
||||
- 设置上游 DNS 服务器组。
|
||||
|
||||
1. 如何屏蔽广告？
|
||||
|
||||
SmartDNS 具备高性能域名匹配算法，通过域名方式过滤广告非常高效，如要屏蔽广告，只需要配置类似如下记录即可，如，屏蔽 `*.ad.com`，则配置：
|
||||
|
||||
```shell
|
||||
address /ad.com/#
|
||||
```
|
||||
|
||||
域名的使后缀模式，过滤 `*.ad.com`，`#` 表示返回 SOA，使屏蔽广告更加高效，如果要单独屏蔽 IPv4 或 IPv6， 在 `#` 后面增加数字，如 `#4` 表示对 IPv4 生效。若想忽略特定子域名的屏蔽，如忽略 `pass.ad.com`，可配置如下：
|
||||
|
||||
```shell
|
||||
address /pass.ad.com/-
|
||||
```
|
||||
|
||||
1. 如何使用 DNS 查询分流？
|
||||
|
||||
某些情况下，需要将有些域名使用特定的 DNS 服务器来查询来做到 DNS 分流。比如
|
||||
|
||||
```shell
|
||||
.home -> 192.168.1.1 # .home 结尾的域名发送到 192.168.1.1 解析
|
||||
.office -> 10.0.0.1 # .office 结尾的域名发送到 10.0.0.1 解析
|
||||
```
|
||||
|
||||
其他域名采用默认的模式解析。
|
||||
这种情况的分流配置如下：
|
||||
|
||||
```shell
|
||||
# 配置上游，用 -group 指定组名，用 -exclude-default-group 将服务器从默认组中排除。
|
||||
server 192.168.1.1 -group home -exclude-default-group
|
||||
server 10.0.0.1 -group office -exclude-default-group
|
||||
server 8.8.8.8
|
||||
|
||||
# 配置解析的域名
|
||||
nameserver /.home/home
|
||||
nameserver /.office/office
|
||||
```
|
||||
|
||||
通过上述配置即可实现 DNS 解析分流，如果需要实现按请求端端口分流，可以配置第二 DNS 服务器，`bind` 配置增加 `--group` 参数指定分流名称。
|
||||
|
||||
```shell
|
||||
bind :7053 -group office
|
||||
bind :8053 -group home
|
||||
```
|
||||
|
||||
1. IPv4、IPv6 双栈 IP 优选功能如何使用？
|
||||
|
||||
目前 IPv6 已经开始普及，但 IPv6 网络在速度上，某些情况下还不如 IPv4。为在双栈网络下获得较好的体验，SmartDNS 提供来双栈IP优选机制，同一个域名，若 IPv4 的速度远快与 IPv6，那么 SmartDNS 就会阻止IPv6的解析、使用 IPv4 访问。可在配置文件中通过设置 `dualstack-ip-selection yes` 启用此功能，通过 `dualstack-ip-selection-threshold [time]` 来修改阈值。如果要完全禁止 IPv6 AAAA记录解析，可设置 `force-AAAA-SOA yes`。
|
||||
|
||||
1. 如何提高缓存效率，加快访问速度？
|
||||
|
||||
SmartDNS 提供了域名缓存机制，对查询的域名，进行缓存，缓存时间符合 DNS TTL 规范。为提高缓存命中率，可采用如下措施：
|
||||
|
||||
- 适当增大缓存的记录数
|
||||
|
||||
通过 `cache-size` 来设置缓存记录数。
|
||||
|
||||
查询压力大的环境下，并且有内存大的机器的情况下，可适当调大。
|
||||
|
||||
- 适当设置最小 TTL 值
|
||||
|
||||
通过 `rr-ttl-min` 将最低 DNS TTL 时间设置为一个合理值，延长缓存时间。
|
||||
|
||||
建议是超时时间设置在 10～30 分钟，避免服务器域名变化时，查询到失效域名。
|
||||
|
||||
- 开启域名预获取功能
|
||||
|
||||
通过 `prefetch-domain yes` 来启用域名预先获取功能，提高查询命中率。
|
||||
|
||||
配合上述 TTL 超时时间，SmartDNS 将在域名 TTL 即将超时时，再次发送查询请求，并缓存查询结果供后续使用。频繁访问的域名将会持续缓存。此功能将在空闲时消耗更多的 CPU。
|
||||
|
||||
- 过期缓存服务功能
|
||||
|
||||
通过 `serve-expired` 来启用过期缓存服务功能，可提高缓存命中率的同时，降低CPU占用。
|
||||
|
||||
此功能会在TTL超时后，将返回 TTL=0 给客户端，并且同时再次发送查询请求，并缓存新的结果给后续使用。
|
||||
|
||||
1. 第二 DNS 如何自定义更多行为？
|
||||
|
||||
第二 DNS 可以作为其他 DNS 服务器的上游，提供更多的查询行为，通过 bind 配置支持可以绑定多个端口，不同端口可设置不同的标志，实现不同的功能，如
|
||||
|
||||
```shell
|
||||
# 绑定 6053 端口，6053 端口的请求将采用配置 office 组的上游查询，且不对结果进行测速，忽略 address 的配置地址
|
||||
bind [::]:6053 -no-speed-check -group office -no-rule-addr
|
||||
```
|
||||
|
||||
1. DoT 的 SPKI 如何获取？
|
||||
SPKI 可以通过 DNS 服务商发布的页面获取，如果没有发布，可以通过如下命令获取，其中将对应IP地址更换为要获取 SPKI 的 IP 地址。
|
||||
|
||||
```shell
|
||||
echo | openssl s_client -connect '1.0.0.1:853' 2>/dev/null | openssl x509 -pubkey -noout | openssl pkey -pubin -outform der | openssl dgst -sha256 -binary | openssl enc -base64
|
||||
```
|
||||
|
||||
1. iOS系统解析缓慢问题怎么解决？
|
||||
IOS14开始，苹果支持了DNS HTTPS(TYPE65)记录的解析，此功能用于快速DNS查询和解决HTTPS链接相关的问题，但当前还是草案，另外会导致广告屏蔽等功能失效，建议通过如下配置关闭TYPE65记录查询。
|
||||
|
||||
```shell
|
||||
force-qtype-SOA 65
|
||||
```
|
||||
|
||||
1. 如何解析本地主机名称？
|
||||
smartdns可以配合DNSMASQ的dhcp lease文件支持本地主机名->IP地址的解析，可以配置smartdns读取dnsmasq的lease文件，并支持解析。具体配置参数如下，（注意，DNSMASQ lease文件每个系统可能不一样，需要按实际情况配置）
|
||||
|
||||
```shell
|
||||
dnsmasq-lease-file /var/lib/misc/dnsmasq.leases
|
||||
```
|
||||
|
||||
配置完成后，可以直接使用主机名连接对应的机器。但需要注意：
|
||||
|
||||
- Windows系统默认使用mDNS解析地址，如需要在windows下用使用smartdns解析，则需要在主机名后面增加`.`，表示使用DNS解析。如`ping smartdns.`
|
||||
|
||||
1. 域名集合如何使用？
|
||||
为方便按集合配置域名，对于有/domain/的配置，可以指定域名集合，方便维护。具体方法为：
|
||||
|
||||
- 使用`domain-set`配置集合文件，如
|
||||
|
||||
```shell
|
||||
domain-set -name ad -file /etc/smartdns/ad-list.conf
|
||||
```
|
||||
|
||||
ad-list.conf的格式为一个域名一行，如
|
||||
|
||||
```shell
|
||||
ad.com
|
||||
site.com
|
||||
```
|
||||
|
||||
- 在有/domain/配置的选项使用域名集合，只需要将`/domain/`配置为`/domain-set:[集合名称]/`即可，如：
|
||||
|
||||
```shell
|
||||
address /domain-set:ad/#
|
||||
domain-rules /domain-set:ad/ -a #
|
||||
nameserver /domain-set:ad/server
|
||||
...
|
||||
```
|
||||
|
||||
1. 如何使用ipset和nftset
|
||||
和Dnsmasq类似，smartdns支持ipset和nftset，可以将特定的域名通过TPROXY进行透明转发，透明转发涉工具模式对比如下：
|
||||
|
||||
1. 工具：iptable，nftable
|
||||
|
||||
iptable：成熟的路由规则配置工具。
|
||||
nftable：更加强大的规则配置工具，正在成为主流。
|
||||
|
||||
1. 模式：TPROXY，REDIRECT
|
||||
|
||||
TPROXY：支持UDP，TCP的转发，配置稍复杂。
|
||||
REDIRECT：仅支持TCP，配置简单。
|
||||
|
||||
|
||||
1. 配置REDIRECT或TPROXY转发规则
|
||||
|
||||
- 在smartdns.conf中设置需要透明转发的域名列表，比如要将`example.com`进行透明转发。则使用ipset选项，设置`example.com`的ipset规则为`proxy`。
|
||||
|
||||
```shell
|
||||
# 设置规则
|
||||
# -ipset proxy: 匹配的域名设置到ipset:tproxy中。
|
||||
# -c none: 停用测速
|
||||
# -address #6: 停用IPV6解析。
|
||||
domain-rules /example.com/ -ipset proxy -c none -address #6
|
||||
```
|
||||
1. 方式一: TCP REDIRECT转发
|
||||
|
||||
- 此方式配置简单，仅支持TCP的转发。
|
||||
执行shell命令，设置iptable规则，如果仅转发TCP则可以直接使用REDIRECT的规则，如果需要同时转发UDP和TCP，可以使用TPROXY的转发规则。如下规则按实际需求选择。具体配置如下：
|
||||
|
||||
|
||||
```shell
|
||||
# 创建ipset集合
|
||||
ipset create proxy hash:net
|
||||
# 设置转发规则，将匹配的请求转发到本机的1081端口
|
||||
iptables -t nat -I PREROUTING -p tcp -m set --match-set proxy dst -j REDIRECT --to-ports 1081
|
||||
```
|
||||
|
||||
- 在本机1081端口开启REDIRECT模式的转发程序。
|
||||
|
||||
1. 方式二：TCP/UDP TPROXY转发
|
||||
|
||||
- 此方式可同时转发TCP和UDP。
|
||||
执行shell命令，设置iptable规则，将匹配的域名TCP/UDP请求进行TPROXY方式透明转发，规则参考如下：
|
||||
|
||||
```shell
|
||||
# 设置路由规则
|
||||
ip rule add fwmark 1104 lookup 1104
|
||||
ip route add local 0.0.0.0/0 dev lo table 1104
|
||||
|
||||
# 创建ipset集合
|
||||
ipset create proxy hash:net
|
||||
|
||||
# 设置转发规则，UDP，TCP方式的TPROXY转发
|
||||
iptables -t mangle -N SMARTDNS
|
||||
iptables -t mangle -A SMARTDNS -p tcp -m set --match-set proxy dst -j TPROXY --on-ip 127.0.0.1 --on-port 1081 --tproxy-mark 1104
|
||||
iptables -t mangle -A SMARTDNS -p udp -m set --match-set proxy dst -j TPROXY --on-ip 127.0.0.1 --on-port 1081 --tproxy-mark 1104
|
||||
iptables -t mangle -A SMARTDNS -j ACCEPT
|
||||
iptables -t mangle -A PREROUTING -j SMARTDNS
|
||||
```
|
||||
|
||||
- 在本机的1081端口启动IP透明转发程序。
|
||||
|
||||
|
||||
1. 额外说明
|
||||
|
||||
- 为保证DNS查询结果的位置亲和性，可以使用smartdns的`server`代理参数，将对应域名的查询请求，通过代理查询，使结果位置更好。如：
|
||||
|
||||
```shell
|
||||
# 增加DNS上游，并设置通过名称为proxy的代理查询，查询组为pass
|
||||
server 1.2.3.4 -proxy proxy -group pass -exclude-default-group
|
||||
# 设置代理服务器信息，代理的名称为proxy
|
||||
proxy-server socks5://user:name@1.2.3.4 -name proxy
|
||||
# 设置域名规则，对匹配的域名使用代理查询结果，并将结果设置到ipset中。
|
||||
domain-rules /example.com/ -ipset proxy -c none -address #6 -nameserver pass
|
||||
```
|
||||
|
||||
- 如需要配合测速自动完成ipset的设置，可增加如下配置参数
|
||||
|
||||
```shell
|
||||
ipset-no-speed proxy
|
||||
```
|
||||
|
||||
如果使用openwrt的luci界面，可以直接在界面配置相关的域名分流规则。
|
||||
|
||||
1. 更多问题
|
||||
如有更多问题，请查阅或提交issue: [https://github.com/pymumu/smartdns/issues](https://github.com/pymumu/smartdns/issues)
|
||||
|
||||
## 编译
|
||||
|
||||
- 代码编译：
|
||||
|
||||
SmartDNS 提供了编译软件包的脚本（`package/build-pkg.sh`），支持编译 LuCI、Debian、OpenWrt 和 Optware 安装包。
|
||||
|
||||
- 文档编译：
|
||||
|
||||
文档分支为`doc`，安装`mkdocs`工具后，执行`mkdocs build`编译。
|
||||
|
||||
## 捐赠
|
||||
|
||||
如果你觉得此项目对你有帮助，请捐助我们，使项目能持续发展和更加完善。
|
||||
|
||||
695
ReadMe_en.md
695
ReadMe_en.md
@@ -2,34 +2,15 @@
|
||||
|
||||
|
||||
SmartDNS is a local DNS server. SmartDNS accepts DNS query requests from local clients, obtains DNS query results from multiple upstream DNS servers, and returns the fastest access results to clients. supports secure DNS protocols like DoT (DNS over TLS), DoH (DNS over HTTPS), better protect privacy,
|
||||
Avoiding DNS pollution and improving network access speed, supports high-performance ad filtering.
|
||||
Unlike dnsmasq's all-servers, smartdns returns the fastest access resolution. （[read more](#faq)）
|
||||
Avoiding DNS pollution and improving network access speed, supports high-performance ad filtering.
|
||||
|
||||
Unlike dnsmasq's all-servers, smartdns returns the fastest access resolution.
|
||||
|
||||
Support Raspberry Pi, openwrt, ASUS router, Windows and other devices.
|
||||
|
||||
## Table Of Content
|
||||
## Usage
|
||||
|
||||
- [SmartDNS](#smartdns)
|
||||
- [Table Of Content](#table-of-content)
|
||||
- [Software Show](#software-show)
|
||||
- [Features](#features)
|
||||
- [Architecture](#architecture)
|
||||
- [Usage](#usage)
|
||||
- [Use official installation source](#use-official-installation-source)
|
||||
- [Download the package](#download-the-package)
|
||||
- [Standard Linux system installation/Raspberry Pi, X86\_64 system](#standard-linux-system-installationraspberry-pi-x86_64-system)
|
||||
- [openwrt](#openwrt)
|
||||
- [ASUS router native firmware / Merlin firmware](#asus-router-native-firmware--merlin-firmware)
|
||||
- [optware/entware](#optwareentware)
|
||||
- [Windows 10 WSL Installation/WSL ubuntu](#windows-10-wsl-installationwsl-ubuntu)
|
||||
- [Configuration parameter](#configuration-parameter)
|
||||
- [FAQ](#faq)
|
||||
- [Compile](#compile)
|
||||
- [Donate](#donate)
|
||||
- [PayPal](#paypal)
|
||||
- [Alipay](#alipay)
|
||||
- [Wechat](#wechat)
|
||||
- [Open Source License](#open-source-license)
|
||||
Please visit website: [https://pymumu.github.io/smartdns](https://pymumu.github.io/smartdns/en)
|
||||
|
||||
## Software Show
|
||||
|
||||
@@ -101,7 +82,7 @@ From the comparison, smartdns found the fastest IP address to visit www.baidu.co
|
||||
Supports finding the fastest access IP address from the IP address list of the domain name and returning it to the client to avoid DNS pollution and improve network access speed.
|
||||
|
||||
1. **Support for multiple query protocols**
|
||||
Support UDP, TCP, DOT(DNS over TLS), DOH(DNS over HTTPS) queries, and non-53 port queries, effectively avoiding DNS pollution and protect privacy, and support query DNS over socks5, http proxy.
|
||||
Support UDP, TCP, DOT(DNS over TLS), DOH(DNS over HTTPS) queries and service, and non-53 port queries, effectively avoiding DNS pollution and protect privacy, and support query DNS over socks5, http proxy.
|
||||
|
||||
1. **Domain IP address specification**
|
||||
Support configuring IP address of specific domain to achieve the effect of advertising filtering, and avoid malicious websites.
|
||||
@@ -133,670 +114,6 @@ From the comparison, smartdns found the fastest IP address to visit www.baidu.co
|
||||
1. The upstream DNS server returns a list of Server IP addresses corresponding to the domain name. SmartDNS detects the fastest Server IP with local network access.
|
||||
1. Return the fastest accessed Server IP to the local client.
|
||||
|
||||
## Usage
|
||||
|
||||
### Use official installation source
|
||||
|
||||
smartdns can already be installed using system package management tools.
|
||||
|
||||
System|Installation|Instructions|
|
||||
--|--|--
|
||||
openwrt|opkg update<br />opkg install luci-app-smartdns<br />opkg install smartdns|systems after 22.03. Software source: <https://downloads.openwrt.org/releases/>
|
||||
ddwrt|latest firmware. goto services page abd enable SmartDNS Resolver. |Demo: <https://forum.dd-wrt.com/demo/Services.html>
|
||||
debian|apt-get install smartdns|
|
||||
entware|ipkg update<br />ipkg install smartdns|Software source: <https://bin.entware.net/>
|
||||
|
||||
### Download the package
|
||||
|
||||
--------------
|
||||
|
||||
Download the matching version of the SmartDNS installation package. The corresponding installation package is as follows.
|
||||
|
||||
|system |package|Description
|
||||
|-----|-----|-----
|
||||
|Standard Linux system (Raspberry Pi)| smartdns.xxxxxxxx.arm-debian-all.deb|Support Raspberry Pi Raspbian stretch, Debian 9 system.
|
||||
|Standard Linux system (Armbian arm64)| smartdns.xxxxxxxx.aarch64-debian-all.deb|Support Armbian debian stretch, Debian 9 system.
|
||||
|Standard Linux system (x86_64)| smartdns.xxxxxxxx.x86_64-linux-all.tar.gz|Support for x86_64 Linux systems.
|
||||
|Windows 10 WSL (ubuntu)| smartdns.xxxxxxxx.x86_64-linux-all.tar.gz|Windows 10 WSL ubuntu.
|
||||
|Standard Linux system (x86)| smartdns.xxxxxxxx.x86-linux-all.tar.gz|Support for x86_64 systems.
|
||||
|optware|smartdns.xxxxxxxx.mips-optware-all.ipk|Support the MIPS big-endian architecture for optware。
|
||||
|optware|smartdns.xxxxxxxx.mipsel-optware-all.ipk|Support the MIPS little-endian architecture for optware。
|
||||
|optware|smartdns.xxxxxxxx.arm-optware-all.ipk|Support the arm architecture for optware。
|
||||
|openwrt|smartdns.xxxxxxxx.mips-openwrt-all.ipk|Support the MIPS big-endian architecture for openwrt。
|
||||
|openwrt|smartdns.xxxxxxxx.mipsel-openwrt-all.ipk|Support the MIPS little-endian architecture for openwrt。
|
||||
|openwrt|smartdns.xxxxxxxx.arm-openwrt-all.ipk|Support the arm architecture for openwrt。
|
||||
|openwrt LUCI|luci-app-smartdns.xxxxxxxxx.all.ipk|Openwrt management interface.
|
||||
|openwrt LUCI|luci-app-smartdns.xxxxxxxxx.all-luci-compat-all|Compat Openwrt management interface for early openwrt.
|
||||
|
||||
- The released packages are statically compiled. If you need a small size package, please compile it yourself or obtain it from the openwrt / entware repository.
|
||||
|
||||
- **Please download from the Release page: [Download here](https://github.com/pymumu/smartdns/releases)**
|
||||
|
||||
|
||||
```shell
|
||||
https://github.com/pymumu/smartdns/releases
|
||||
```
|
||||
- For MacOS, Windows, you can try rust version of smartdns: [SmartDNS-rs](https://github.com/mokeyish/smartdns-rs)
|
||||
|
||||
- For the installation procedure, please refer to the following sections.
|
||||
|
||||
### Standard Linux system installation/Raspberry Pi, X86_64 system
|
||||
|
||||
--------------
|
||||
|
||||
1. Installation
|
||||
|
||||
Download the installation package like `smartdns.xxxxxxxx.arm-debian-all.deb` and upload it to the Linux system. Run the following command to install
|
||||
|
||||
```shell
|
||||
dpkg -i smartdns.xxxxxxxx.arm-debian-all.deb
|
||||
```
|
||||
|
||||
For X86-64 system, download the installation package like `smartdns.xxxxxxxx.x86_64-linux-all.tar.gz` and upload it to the Linux system. Run the following command to install
|
||||
|
||||
```shell
|
||||
tar zxf smartdns.xxxxxxxx.x86_64-linux-all.tar.gz
|
||||
cd smartdns
|
||||
chmod +x ./install
|
||||
./install -i
|
||||
```
|
||||
|
||||
**For Ubuntu system:**
|
||||
- `systemd-resolved` occupies TCP53 and UDP53 ports. You need to manually resolve the port occupancy problem or modify the SmartDNS listening port
|
||||
|
||||
- Log files in `/var/log/smartdns/smartdns.log`
|
||||
|
||||
1. Configuration
|
||||
|
||||
After the installation is complete, you can configure the upstream server to smartdns. Refer to the `Configuration Parameters` for specific configuration parameters.
|
||||
In general, you only need to add `server [IP]:port`, `server-tcp [IP]:port` configuration items.
|
||||
Configure as many upstream DNS servers as possible, including servers at home and abroad. Please refer to the `Configuration Parameters` section for configuration parameters.
|
||||
|
||||
```shell
|
||||
vi /etc/smartdns/smartdns.conf
|
||||
```
|
||||
|
||||
`smartdns.conf` example:
|
||||
|
||||
```shell
|
||||
# set listen port
|
||||
bind []:53
|
||||
# set upstream servers
|
||||
server 1.1.1.1
|
||||
server-tls 8.8.8.8
|
||||
# set domain rules
|
||||
address /example.com/1.2.3.4
|
||||
domain-rule /example.com/ -address 1.2.3.4
|
||||
```
|
||||
|
||||
1. Start Service
|
||||
|
||||
```shell
|
||||
systemctl enable smartdns
|
||||
systemctl start smartdns
|
||||
```
|
||||
|
||||
1. Forwarding DNS request to SmartDNS
|
||||
|
||||
Modify the DNS server of the local router and configure the DNS server as SmartDNS.
|
||||
- Log in to the router on the local network and configure the Raspberry Pi to assign a static IP address.
|
||||
- Modify the WAN port or DHCP DNS to the Raspberry Pi IP address.
|
||||
Note:
|
||||
I. Each router configuration method is different. Please search Baidu for related configuration methods.
|
||||
II. some routers may not support configuring custom DNS server. in this case, please modify the PC's, mobile phone's DNS server to the ip of Raspberry Pi.
|
||||
|
||||
1. Check if the service is configured successfully
|
||||
|
||||
Query domain name with `nslookup -querytype=ptr smartdns`
|
||||
Check if the `name` item in the command result is displayed as `smartdns` or `hostname`, such as `smartdns`
|
||||
|
||||
```shell
|
||||
pi@raspberrypi:~/code/smartdns_build $ nslookup -querytype=ptr smartdns
|
||||
Server: 192.168.1.1
|
||||
Address: 192.168.1.1#53
|
||||
|
||||
Non-authoritative answer:
|
||||
smartdns name = smartdns.
|
||||
```
|
||||
|
||||
### openwrt
|
||||
|
||||
--------------
|
||||
|
||||
1. Installation
|
||||
|
||||
Upload the software to the /root directory of the router with winscp or other tool, and execute the following command to install it.
|
||||
|
||||
```shell
|
||||
opkg install smartdns.xxxxxxxx.xxxx.ipk
|
||||
opkg install luci-app-smartdns.xxxxxxxx.xxxx.all.ipk
|
||||
```
|
||||
|
||||
- Note: For versions before openwrt 19.07, please install `luci-app-smartdns.xxxxxxxxx.all-luci-compat-all` package.
|
||||
|
||||
1. Configuration
|
||||
|
||||
Log in to the openwrt management page and open `Services`->`SmartDNS` to configure SmartDNS.
|
||||
- Add upstream DNS server configuration to `Upstream Servers`. It is recommended to configure multiple DNS servers at home and abroad.
|
||||
- Specify the IP address of a specific domain name in `Domain Address`, which can be used for ad blocking.
|
||||
|
||||
1. Start Service
|
||||
|
||||
There are two ways to use the SmartDNS service, `one is directly as the primary DNS service`, `the other is as the upstream of dnsmasq`.
|
||||
By default, SmartDNS uses the first method. You can choose according to your needs in the following two ways.
|
||||
|
||||
1. Method 1: SmartDNS as primary DNS Server
|
||||
|
||||
- **Enable SmartDNS as primary DNS Server**
|
||||
|
||||
Log in to the router, click on `Services`->`SmartDNS`->`port`, input port `53`, smartdns will run as primary DNS Server.
|
||||
|
||||
- **Check if the service is configured successfully**
|
||||
|
||||
Query domain name with `nslookup -querytype=ptr smartdns`
|
||||
See if the `name` item in the command result is displayed as `smartdns` or `hostname`, such as `smartdns`
|
||||
|
||||
```shell
|
||||
pi@raspberrypi:~/code/smartdns_build $ nslookup -querytype=ptr smartdns
|
||||
Server: 192.168.1.1
|
||||
Address: 192.168.1.1#53
|
||||
|
||||
Non-authoritative answer:
|
||||
smartdns name = smartdns.
|
||||
```
|
||||
|
||||
1. Start Service
|
||||
|
||||
Check the `Enable' in the configuration page to start SmartDNS server.
|
||||
|
||||
1. Note
|
||||
|
||||
- When the port of smartdns is 53, it will automatically take over dnsmasq as the primary dns. When configuring other ports, dnsmasq is re-enabled as primary dns.
|
||||
- If an exception occurs during this process, you can use the following command to restore dnsmasq as the primary DNS
|
||||
|
||||
```shell
|
||||
uci delete dhcp.@dnsmasq[0].port
|
||||
uci commit dhcp
|
||||
/etc/init.d/dnsmasq restart
|
||||
```
|
||||
|
||||
### ASUS router native firmware / Merlin firmware
|
||||
|
||||
--------------
|
||||
|
||||
Note: Merlin firmware is derived from ASUS firmware and can theoretically be used directly with the ASUS package. However, it is currently unverified. If you have any questions, please submit an issue.
|
||||
|
||||
1. Prepare
|
||||
|
||||
When using this software, you need to confirm whether the router supports U disk and prepare a USB disk.
|
||||
|
||||
1. Enable SSH login
|
||||
|
||||
Log in to the management interface, click `System Management`-> Click `System Settings` and configure `Enable SSH` to `Lan Only`.
|
||||
The SSH login username and password are the same as the management interface.
|
||||
|
||||
1. Install `Download Master`
|
||||
|
||||
In the management interface, click `USB related application`-> click `Download Master` to download.
|
||||
After the download is complete, enable `Download Master`. If you do not need the download function, you can uninstall `Download Master` here, but make sure that Download Master is enabled before uninstalling.
|
||||
|
||||
1. Install SmartDNS
|
||||
|
||||
Upload the software to the router's `/tmp/mnt/sda1` directory using winscp. (or copy the network neighborhood to the sda1 shared directory)
|
||||
|
||||
```shell
|
||||
ipkg install smartdns.xxxxxxx.mipsbig.ipk
|
||||
```
|
||||
|
||||
1. Restart router
|
||||
|
||||
After the router is started, use `nslookup -querytype=ptr smartdns` to query the domain name.
|
||||
See if the `name` item in the command result is displayed as `smartdns` or `hostname`, such as `smartdns`
|
||||
|
||||
```shell
|
||||
pi@raspberrypi:~/code/smartdns_build $ nslookup -querytype=ptr smartdns
|
||||
Server: 192.168.1.1
|
||||
Address: 192.168.1.1#53
|
||||
|
||||
Non-authoritative answer:
|
||||
smartdns name = smartdns.
|
||||
```
|
||||
|
||||
1. Note
|
||||
|
||||
In the above process, smartdns will be installed to the root directory of the U disk and run in optware mode.
|
||||
Its directory structure is as follows: (only smartdns related files are listed here)
|
||||
|
||||
```shell
|
||||
USB DISK
|
||||
└── asusware.mipsbig
|
||||
├── bin
|
||||
├── etc
|
||||
| ├── smartdns
|
||||
| | └── smartdns.conf
|
||||
| └── init.d
|
||||
| └── S50smartdns
|
||||
├── lib
|
||||
├── sbin
|
||||
├── usr
|
||||
| └── sbin
|
||||
| └── smartdns
|
||||
....
|
||||
```
|
||||
|
||||
To modify the configuration, you can use ssh to login to the router and use the vi command to modify it.
|
||||
|
||||
```shell
|
||||
vi /opt/etc/smartdns/smartdns.conf
|
||||
```
|
||||
|
||||
`smartdns.conf` example:
|
||||
|
||||
```shell
|
||||
# set listen port
|
||||
bind []:53
|
||||
# set upstream servers
|
||||
server 1.1.1.1
|
||||
server-tls 8.8.8.8
|
||||
# set domain rules
|
||||
address /example.com/1.2.3.4
|
||||
domain-rule /example.com/ -address 1.2.3.4
|
||||
```
|
||||
|
||||
It can also be modified from Network Neighborhood. From the neighbor sharing directory `sda1` you can't see the `asusware.mipsbig` directory, but you can directly enter `asusware.mipsbig\etc\init.d` in `File Manager` to modify it.
|
||||
|
||||
```shell
|
||||
\\192.168.1.1\sda1\asusware.mipsbig\etc\init.d
|
||||
```
|
||||
|
||||
### optware/entware
|
||||
|
||||
--------------
|
||||
|
||||
1. Prepare
|
||||
|
||||
When using this software, you need to confirm whether the router supports USB disk and prepare a USB disk.
|
||||
|
||||
1. Install SmartDNS
|
||||
|
||||
Upload the software to `/tmp` directory of the router using winscp, and run the following command to install.
|
||||
|
||||
```shell
|
||||
ipkg install smartdns.xxxxxxx.mipsbig.ipk
|
||||
```
|
||||
|
||||
1. Modify the smartdns configuration
|
||||
|
||||
```shell
|
||||
Vi /opt/etc/smartdns/smartdns.conf
|
||||
```
|
||||
|
||||
`smartdns.conf` example:
|
||||
|
||||
```shell
|
||||
# set listen port
|
||||
bind []:53
|
||||
# set upstream servers
|
||||
server 1.1.1.1
|
||||
server-tls 8.8.8.8
|
||||
# set domain rules
|
||||
address /example.com/1.2.3.4
|
||||
domain-rule /example.com/ -address 1.2.3.4
|
||||
```
|
||||
|
||||
Note: if you need to support IPV6, you can set the work-mode to `2`, this will disable the DNS service of dnsmasq, and smartdns run as the primary DNS server. Change `SMARTDNS_WORKMODE` in the file `/opt/etc/smartdns/smartdns-opt.conf` to `2`.
|
||||
|
||||
```shell
|
||||
SMARTDNS_WORKMODE="2"
|
||||
```
|
||||
|
||||
1. Restart the router to take effect
|
||||
|
||||
After the router is started, use `nslookup -querytype=ptr smartdns` to query the domain name.
|
||||
See if the `name` item in the command result is displayed as `smartdns` or `hostname`, such as `smartdns`
|
||||
|
||||
```shell
|
||||
Pi@raspberrypi:~/code/smartdns_build $ nslookup -querytype=ptr smartdns
|
||||
Server: 192.168.1.1
|
||||
Address: 192.168.1.1#53
|
||||
|
||||
Non-authoritative answer:
|
||||
smartdns name = smartdns.
|
||||
```
|
||||
|
||||
Note: If the service does not start automatically, you need to set optware/entware to start automatically. For details, see the optware/entware documentation.
|
||||
|
||||
### Windows 10 WSL Installation/WSL ubuntu
|
||||
|
||||
--------------
|
||||
|
||||
1. Install Windows 10 WSL ubuntu
|
||||
|
||||
Install the Windows 10 WSL environment and select Ubuntu as default distribution. Please refer to [WSL installation instructions](https://docs.microsoft.com/en-us/windows/wsl/install-win10) for installation steps
|
||||
|
||||
1. Install smartdns
|
||||
|
||||
download install package `smartdns.xxxxxxxx.x86_64-linux-all.tar.gz`，and unzip to the `D:\` directory, after decompression, the directory is as follows:
|
||||
|
||||
```shell
|
||||
D:\SMARTDNS
|
||||
├─etc
|
||||
│ ├─default
|
||||
│ ├─init.d
|
||||
│ └─smartdns
|
||||
├─package
|
||||
│ └─windows
|
||||
├─src
|
||||
└─systemd
|
||||
|
||||
```
|
||||
|
||||
Double-click `install.bat` in the `D:\smartdns\package\windows` directory for installation. Please enter the password for `WLS ubuntu` when input password.
|
||||
|
||||
1. Configuration
|
||||
|
||||
Edit `smartdns.conf` configuration file in `D:\smartdns\etc\smartdns` directory, you can configure the upstream server to smartdns. Refer to the `Configuration Parameters` for specific configuration parameters.
|
||||
In general, you only need to add `server [IP]:port`, `server-tcp [IP]:port` configuration items.
|
||||
Configure as many upstream DNS servers as possible, including servers at home and abroad. Please refer to the `Configuration Parameters` section for configuration parameters.
|
||||
|
||||
`smartdns.conf` example:
|
||||
|
||||
```shell
|
||||
# set listen port
|
||||
bind []:53
|
||||
# set upstream servers
|
||||
server 1.1.1.1
|
||||
server-tls 8.8.8.8
|
||||
# set domain rules
|
||||
address /example.com/1.2.3.4
|
||||
domain-rule /example.com/ -address 1.2.3.4
|
||||
```
|
||||
|
||||
1. Start Service
|
||||
|
||||
Double-click `reload.bat` in the `D:\smartdns\package\windows` directory for reload.
|
||||
|
||||
1. Forwarding DNS request to SmartDNS
|
||||
|
||||
Modify the default DNS server for Windows to `127.0.0.1`, with these steps referred to [IP configuration](https://support.microsoft.com/en-us/help/15089/windows-change-tcp-ip-settings)
|
||||
|
||||
1. Check if the service is configured successfully
|
||||
|
||||
Query domain name with `nslookup -querytype=ptr smartdns`
|
||||
Check if the `name` item in the command result is displayed as `smartdns` or `hostname`, such as `smartdns`
|
||||
|
||||
```shell
|
||||
pi@raspberrypi:~/code/smartdns_build $ nslookup -querytype=ptr smartdns
|
||||
Server: 192.168.1.1
|
||||
Address: 192.168.1.1#53
|
||||
|
||||
Non-authoritative answer:
|
||||
smartdns name = smartdns.
|
||||
```
|
||||
|
||||
## Configuration parameter
|
||||
|
||||
|parameter|Parameter function|Default value|Value type|Example|
|
||||
|--|--|--|--|--|
|
||||
|server-name|DNS name|host name/smartdns|any string like hostname|server-name smartdns
|
||||
|bind|DNS listening port number|[::]:53|Support binding multiple ports<br />`IP:PORT@DEVICE`: server IP, port number, and device. <br />`[-group]`: The DNS server group used when requesting. <br />`[-no-rule-addr]`: Skip the address rule. <br />`[-no-rule-nameserver]`: Skip the Nameserver rule. <br />`[-no-rule-ipset]`: Skip the Ipset or nftset rules. <br />`[-no-rule-soa]`: Skip address SOA(#) rules.<br />`[-no-dualstack-selection]`: Disable dualstack ip selection.<br />`[-no-speed-check]`: Disable speed measurement. <br />`[-no-cache]`: stop caching |bind :53@eth0
|
||||
|bind-tcp|TCP mode DNS listening port number|[::]:53|Support binding multiple ports<br />`IP:PORT@DEVICE`: server IP, port number and device. <br />`[-group]`: The DNS server group used when requesting. <br />`[-no-rule-addr]`: Skip the address rule. <br />`[-no-rule-nameserver]`: Skip the Nameserver rule. <br />`[-no-rule-ipset]`: Skip the Ipset or nftset rules. <br />`[-no-rule-soa]`: Skip address SOA(#) rules.<br />`[-no-dualstack-selection]`: Disable dualstack ip selection.<br />`[-no-speed-check]`: Disable speed measurement. <br />`[-no-cache]`: stop caching |bind-tcp :53
|
||||
|cache-size|Domain name result cache number|512|integer|cache-size 512
|
||||
|cache-persist|enable persist cache|Auto: Enabled if the location of `cache-file` has more than 128MB of free space.|[yes\|no]|cache-persist yes
|
||||
|cache-file|cache persist file|/tmp/<br />smartdns.cache|path|cache-file /tmp/smartdns.cache
|
||||
|tcp-idle-time|TCP connection idle timeout|120|integer|tcp-idle-time 120
|
||||
|rr-ttl|Domain name TTL|Remote query result|number greater than 0|rr-ttl 600
|
||||
|rr-ttl-min|Domain name Minimum TTL|Remote query result|number greater than 0|rr-ttl-min 60
|
||||
|local-ttl|ttl for address and host|rr-ttl-min|number greater than 0|local-ttl 600
|
||||
|rr-ttl-reply-max|Domain name Minimum Reply TTL|Remote query result|number greater than 0|rr-ttl-reply-max 60
|
||||
|rr-ttl-max|Domain name Maximum TTL|Remote query result|number greater than 0|rr-ttl-max 600
|
||||
|max-reply-ip-num|Maximum number of IPs returned to the client|8|number of IPs, 1~16 |max-reply-ip-num 1
|
||||
|log-level|log level|error|fatal,error,warn,notice,info,debug|log-level error
|
||||
|log-file|log path|/var/log/<br />smartdns/<br />smartdns.log|File Pah|log-file /var/log/smartdns/smartdns.log
|
||||
|log-size|log size|128K|number+K,M,G|log-size 128K
|
||||
|log-num|archived log number|2 for openwrt, 8 for other system|Integer, 0 means turn off the log|log-num 2
|
||||
|log-file-mode|archived log file mode|0640|Integer|log-file-mode 644
|
||||
|audit-enable|audit log enable|no|[yes\|no]|audit-enable yes
|
||||
|audit-file|audit log file|/var/log/<br />smartdns/<br />smartdns-audit.log|File Path|audit-file /var/log/smartdns/smartdns-audit.log
|
||||
|audit-size|audit log size|128K|number+K,M,G|audit-size 128K
|
||||
|audit-num|archived audit log number|2|Integer, 0 means turn off the log|audit-num 2
|
||||
|audit-file-mode|archived audit log file mode|0640|Integer|audit-file-mode 644
|
||||
|conf-file|additional conf file|None|File path|conf-file /etc/smartdns/smartdns.more.conf
|
||||
|server|Upstream UDP DNS server|None|Repeatable <br />`[ip][:port]\|URL`: Server IP, port optional OR URL. <br />`[-blacklist-ip]`: The "-blacklist-ip" parameter is to filtering IPs which is configured by "blacklist-ip". <br />`[-whitelist-ip]`: whitelist-ip parameter specifies that only the IP range configured in whitelist-ip is accepted. <br />`[-group [group] ...]`: The group to which the DNS server belongs, such as office, foreign, use with nameserver. <br />`[-exclude-default-group]`: Exclude DNS servers from the default group. <br />`[-set-mark mark]`：set mark on packets <br /> `[-proxy name]`: set proxy server| server 8.8.8.8:53 -blacklist-ip<br />server tls://8.8.8.8
|
||||
|server-tcp|Upstream TCP DNS server|None|Repeatable <br />`[ip][:port]`: Server IP, port optional. <br />`[-blacklist-ip]`: The "-blacklist-ip" parameter is to filtering IPs which is configured by "blacklist-ip". <br />`[-whitelist-ip]`: whitelist-ip parameter specifies that only the IP range configured in whitelist-ip is accepted. <br />`[-group [group] ...]`: The group to which the DNS server belongs, such as office, foreign, use with nameserver. <br />`[-exclude-default-group]`: Exclude DNS servers from the default group <br />`[-set-mark mark]`：set mark on packets <br /> `[-proxy name]`: set proxy server| server-tcp 8.8.8.8:53
|
||||
|server-tls|Upstream TLS DNS server|None|Repeatable <br />`[ip][:port]`: Server IP, port optional. <br />`[-spki-pin [sha256-pin]]`: TLS verify SPKI value, a base64 encoded SHA256 hash<br />`[-host-name]`:TLS Server name. `-` to disable SNI name.<br />`[-tls-host-verify]`: TLS cert hostname to verify. <br />`-no-check-certificate:`: No check certificate. <br />`[-blacklist-ip]`: The "-blacklist-ip" parameter is to filtering IPs which is configured by "blacklist-ip". <br />`[-whitelist-ip]`: whitelist-ip parameter specifies that only the IP range configured in whitelist-ip is accepted. <br />`[-group [group] ...]`: The group to which the DNS server belongs, such as office, foreign, use with nameserver. <br />`[-exclude-default-group]`: Exclude DNS servers from the default group <br /> `[-set-mark mark]`：set mark on packets <br /> `[-proxy name]`: set proxy server| server-tls 8.8.8.8:853
|
||||
|server-https|Upstream HTTPS DNS server|None|Repeatable <br />`https://[host][:port]/path`: Server IP, port optional. <br />`[-spki-pin [sha256-pin]]`: TLS verify SPKI value, a base64 encoded SHA256 hash<br />`[-host-name]`:TLS Server name<br />`[-http-host]`：http header host. <br />`[-tls-host-verify]`: TLS cert hostname to verify. <br />`-no-check-certificate:`: No check certificate. <br />`[-blacklist-ip]`: The "-blacklist-ip" parameter is to filtering IPs which is configured by "blacklist-ip". <br />`[-whitelist-ip]`: whitelist-ip parameter specifies that only the IP range configured in whitelist-ip is accepted. <br />`[-group [group] ...]`: The group to which the DNS server belongs, such as office, foreign, use with nameserver. <br />`[-exclude-default-group]`: Exclude DNS servers from the default group <br /> `[-set-mark mark]`：set mark on packets <br /> `[-proxy name]`: set proxy server| server-https <https://cloudflare-dns.com/dns-query>
|
||||
|proxy-server| proxy server | None | Repeatable. <br />`proxy-server URL` <br />[URL]: `[socks5\|http]://[username:password@]host:port`<br />[-name]: proxy server name. |proxy-server socks5://user:pass@1.2.3.4:1080 -name proxy|
|
||||
|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]<br /> [first-ping]: The fastest dns + ping response mode, DNS query delay + ping delay is the shortest;<br />[fastest-ip]: The fastest IP address mode, return the fastest ip address, may take some time to test speed. <br />[fastest-response]: The fastest response DNS result mode, the DNS query waiting time is the shortest. | response-mode first-ping |
|
||||
|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
|
||||
|cname|set cname to domain| None | cname /domain/target <br />- for ignore <br />set cname to domain. | cname /www.example.com/cdn.example.com |
|
||||
|dns64|dns64 translation | None | dns64 ip-prefix/mask <br /> ipv6 prefix and mask. | dns64 64:ff9b::/96 |
|
||||
|nameserver|To query domain with specific server group|None|nameserver /domain/[group\|-], `group` is the group name, `-` means ignore this rule, use the `-group` parameter in the related server|nameserver /www.example.com/office
|
||||
|ipset|Domain IPSet|None|ipset /domain/[ipset\|-\|#[4\|6]:[ipset\|-][,#[4\|6]:[ipset\|-]]], `-` for ignore|ipset /www.example.com/#4:dns4,#6:-
|
||||
|ipset-timeout|ipset timeout enable|no|[yes\|no]|ipset-timeout yes
|
||||
|ipset-no-speed|When speed check fails, set the ip address of the domain name to the ipset | None | ipset \| #[4\|6]:ipset | ipset-no-speed #4:ipset4,#6:ipse6 <br /> ipset-no-speed ipset|
|
||||
|nftset|Domain nftset|None|nftset /domain/[#4\|#6\|-]:[family#nftable#nftset\|-][,#[4\|6]:[family#nftable#nftset\|-]]]<br /> `-` to ignore<br />the valid families are inet and ip for ipv4 addresses while the valid ones are inet and ip6 for ipv6 addresses <br />due to the limitation of nftable <br />two types of addresses have to be stored in two sets|nftset /www.example.com/#4:inet#tab#dns4,#6:-
|
||||
|nftset-timeout|nftset timeout enable|no|[yes\|no]|nftset-timeout yes
|
||||
|nftset-no-speed|When speed check fails, set the ip address of the domain name to the nftset | None | nftset-no-speed [#4\|#6]:[family#nftable#nftset][,#[4\|6]:[family#nftable#nftset]]] <br />the valid families are inet and ip for ipv4 addresses while the valid ones are inet and ip6 for ipv6 addresses <br />due to the limitation of nftable <br />two types of addresses have to be stored in two sets| nftset-no-speed #4:inet#tab#set4|
|
||||
|nftset-debug|nftset debug enable|no|[yes\|no]|nftset-debug yes
|
||||
|domain-rules|set domain rules|None|domain-rules /domain/ [-rules...]<br />[-c\|-speed-check-mode]: set speed check mode，same as parameter speed-check-mode<br />[-a\|-address]: same as parameter `address` <br />[-n\|-nameserver]: same as parameter `nameserver`<br />[-p\|-ipset]: same as parameter `nftset`<br />[-t\|-nftset]: same as parameter `nftset`<br />[-d\|-dualstack-ip-selection]: same as parameter `dualstack-ip-selection`<br /> [-no-serve-expired]：disable serve expired<br />[-rr-ttl\|-rr-ttl-min\|-rr-ttl-max]: same as parameter: rr-ttl, rr-ttl-min, rr-ttl-max<br />[-delete]：delete rule|domain-rules /www.example.com/ -speed-check-mode none
|
||||
| domain-set | collection of domains|None| domain-set [options...]<br />[-n\|-name]：name of set <br />[-t\|-type] [list]: set type, only support list, one domain per line <br />[-f\|-file]：file path of domain set<br /> used with address, nameserver, ipset, nftset, example: /domain-set:[name]/ | domain-set -name set -type list -file /path/to/list <br /> address /domain-set:set/1.2.4.8 |
|
||||
|bogus-nxdomain|bogus IP address|None|[IP/subnet], Repeatable| bogus-nxdomain 1.2.3.4/16
|
||||
|ignore-ip|ignore ip address|None|[ip/subnet], Repeatable| ignore-ip 1.2.3.4/16
|
||||
|whitelist-ip|ip whitelist|None|[ip/subnet], Repeatable，When the filtering server responds IPs in the IP whitelist, only result in whitelist will be accepted| whitelist-ip 1.2.3.4/16
|
||||
|blacklist-ip|ip blacklist|None|[ip/subnet], Repeatable，When the filtering server responds IPs in the IP blacklist, The result will be discarded directly| blacklist-ip 1.2.3.4/16
|
||||
|force-AAAA-SOA|force AAAA query return SOA|no|[yes\|no]|force-AAAA-SOA yes
|
||||
|force-qtype-SOA|force specific qtype return SOA|qtype id|[qtypeid \| ...]|force-qtype-SOA 65 28
|
||||
|prefetch-domain|domain prefetch feature|no|[yes\|no]|prefetch-domain yes
|
||||
|dnsmasq-lease-file|Support reading dnsmasq dhcp file to resolve local hostname|None|dnsmasq dhcp lease file| dnsmasq-lease-file /var/lib/misc/dnsmasq.leases
|
||||
|serve-expired|Cache serve expired feature|yes|[yes\|no], Attempts to serve old responses from cache with a TTL of 0 in the response without waiting for the actual resolution to finish.|serve-expired yes
|
||||
|serve-expired-ttl|Cache serve expired limit TTL|0|second，0：disable，> 0 seconds after expiration|serve-expired-ttl 0
|
||||
|serve-expired-reply-ttl|TTL value to use when replying with expired data|5|second，0：disable，> 0 seconds after expiration|serve-expired-reply-ttl 30
|
||||
|dualstack-ip-selection|Dualstack ip selection|yes|[yes\|no]|dualstack-ip-selection yes
|
||||
|dualstack-ip-selection-threshold|Dualstack ip select thresholds|15ms|millisecond|dualstack-ip-selection-threshold [0-1000]
|
||||
|user|run as user|root|user [username]|user nobody
|
||||
|ca-file|certificate file|/etc/ssl/certs/<br />ca-certificates.crt|path|ca-file /etc/ssl/certs/ca-certificates.crt
|
||||
|ca-path|certificates path|/etc/ssl/certs|path|ca-path /etc/ssl/certs
|
||||
|
||||
## FAQ
|
||||
|
||||
1. What is the difference between SmartDNS and DNSMASQ?
|
||||
Smartdns is not designed to replace DNSMASQ. The main function of Smartdns is focused on DNS resolution enhancement, the difference are:
|
||||
- Multiple upstream server concurrent requests, after the results are measured, return the best results;
|
||||
- `address`, `ipset` domain name matching uses efficient algorithms, query matching is faster and more efficient, and router devices are still efficient.
|
||||
- Domain name matching supports ignoring specific domain names, and can be individually matched to IPv4, IPV6, and supports diversified customization.
|
||||
- Enhance the ad blocking feature, return SOA record, this block ads better;
|
||||
- IPV4, IPV6 dual stack IP optimization mechanism, in the case of dual network, choose the fastest network.
|
||||
- Supports the latest TLS, HTTPS protocol and provides secure DNS query capabilities.
|
||||
- DNS anti-poison mechanism, and a variety of mechanisms to avoid DNS pollution.
|
||||
- ECS support, the query results are better and more accurate.
|
||||
- IP blacklist support, ignoring the blacklist IP to make domain name queries better and more accurate.
|
||||
- Domain name pre-fetch, more faster to access popular websites.
|
||||
- Domain name TTL can be specified to make access faster.
|
||||
- Cache mechanism to make access faster.
|
||||
- Asynchronous log, audit log mechanism, does not affect DNS query performance while recording information.
|
||||
- Domain group mechanism, specific domain names use specific upstream server group queries to avoid privacy leakage.
|
||||
- The second DNS supports customizing more behavior.
|
||||
|
||||
1. What is the best practices for upstream server configuration?
|
||||
Smartdns has a speed measurement mechanism. When configuring an upstream server, it is recommended to configure multiple upstream DNS servers, including servers in different regions, but the total number is recommended to be around 10. Recommended configuration
|
||||
- Carrier DNS.
|
||||
- Public DNS, such as `8.8.8.8`, `8.8.4.4`, `1.1.1.1`.
|
||||
|
||||
For specific domain names, if there is a pollution, you can enable the anti-pollution mechanism.
|
||||
|
||||
1. How to enable the audit log
|
||||
The audit log records the domain name requested by the client. The record information includes the request time, the request IP address, the request domain name, and the request type. If you want to enable the audit log, configure `audit-enable yes` in the configuration file, `audit-size`, `Audit-file`, `audit-num` configure the audit log file size, the audit log file path, and the number of audit log files. The audit log file will be compressed to save space.
|
||||
|
||||
1. How to avoid DNS privacy leaks
|
||||
By default, smartdns will send requests to all configured DNS servers. If the upstream DNS servers record DNS logs, it will result in a DNS privacy leak. To avoid privacy leaks, try the following steps:
|
||||
- Use trusted DNS servers.
|
||||
- Use TLS servers.
|
||||
- Set up an upstream DNS server group.
|
||||
|
||||
1. How to block ads
|
||||
Smartdns has a high-performance domain name matching algorithm. It is very efficient to filter advertisements by domain name. To block ads, you only need to configure records like the following configure. For example, if you block `*.ad.com`, configure as follows:
|
||||
|
||||
```shell
|
||||
Address /ad.com/#
|
||||
```
|
||||
|
||||
The suffix mode of the domain name, filtering *.ad.com, `#` means returning SOA record. If you want to only block IPV4 or IPV6 separately, add a number after `#`, such as `#4` is for IPV4 blocking. If you want to ignore some specific subdomains, you can configure it as follows. e.g., if you ignore `pass.ad.com`, you can configure it as follows:
|
||||
|
||||
```shell
|
||||
Address /pass.ad.com/-
|
||||
```
|
||||
|
||||
1. DNS query diversion
|
||||
In some cases, some domain names need to be queried using a specific DNS server to do DNS diversion. such as.
|
||||
|
||||
```shell
|
||||
.home -> 192.168.1.1
|
||||
.office -> 10.0.0.1
|
||||
```
|
||||
|
||||
The domain name ending in .home is sent to 192.168.1.1 for resolving
|
||||
The domain name ending in .office is sent to 10.0.0.1 for resolving
|
||||
Other domain names are resolved using the default mode.
|
||||
The diversion configuration for this case is as follows:
|
||||
|
||||
```shell
|
||||
# Upstream configuration, use -group to specify the group name, and -exclude-default-group to exclude the server from the default group.
|
||||
Server 192.168.1.1 -group home -exclude-default-group
|
||||
Server 10.0.0.1 -group office -exclude-default-group
|
||||
Server 8.8.8.8
|
||||
|
||||
#Configure the resolved domain name with specific group
|
||||
Nameserver /.home/home
|
||||
Nameserver /.office/office
|
||||
```
|
||||
|
||||
You can use the above configuration to implement DNS resolution and offload. If you need to implement traffic distribution on the requesting port, you can configure the second DNS server. The bind configuration is added. The group parameter specifies the traffic distribution name.
|
||||
|
||||
```shell
|
||||
Bind :7053 -group office
|
||||
Bind :8053 -group home
|
||||
```
|
||||
|
||||
1. How to use the IPV4, IPV6 dual stack IP optimization feature
|
||||
At present, IPV6 network is not as fast as IPV4 in some cases. In order to get a better experience in the dual-stack network, SmartDNS provides a dual-stack IP optimization mechanism, the same domain name, and the speed of IPV4. Far faster than IPV6, then SmartDNS will block the resolution of IPV6, let the PC use IPV4, the feature is enabled by `dualstack-ip-selection yes`, `dualstack-ip-selection-threshold [time]` is for threshold. if you want to disable IPV6 AAAA record complete, please try `force-AAAA-SOA yes`.
|
||||
|
||||
1. How to improve cache performance
|
||||
Smartdns provides a domain name caching mechanism to cache the queried domain name, and the caching time is in accordance with the DNS TTL specification. To increase the cache hit rate, the following configuration can be taken:
|
||||
- Increase the number of cache records appropriately
|
||||
Set the number of cache records by `cache-size`.
|
||||
In the case of a query with a high pressure environment and a machine with a large memory, it can be appropriately adjusted.
|
||||
|
||||
- Set the minimum TTL value as appropriate
|
||||
Set the minimum DNS TTL time to a appropriate value by `rr-ttl-min` to extend the cache time.
|
||||
It is recommended that the timeout period be set to 10 to 30 minutes to avoid then invalid domain names when domain ip changes.
|
||||
|
||||
- Enable domain pre-acquisition
|
||||
Enable pre-fetching of domain names with `prefetch-domain yes` to improve query hit rate.
|
||||
by default, Smartdns will send domain query request again before cache expire, and cache the result for the next query. Frequently accessed domain names will continue to be cached. This feature will consume more CPU when idle.
|
||||
|
||||
- Cache serve expired feature
|
||||
Enable cache serve expired feature with `serve-expired yes` to improve the cache hit rate and reduce the CPU consumption.
|
||||
This feature will return TTL = 0 to the client after the TTL timeout, and send a new query request again at the same time, and cache the new results for later query.
|
||||
|
||||
1. How does the second DNS customize more behavior?
|
||||
The second DNS can be used as the upstream of other DNS servers to provide more query behaviors. Bind configuration support can bind multiple ports. Different ports can be set with different flags to implement different functions, such as
|
||||
|
||||
```shell
|
||||
# Binding 6053 port, request for port 6053 will be configured with the upstream query of the office group, and the result will not be measured. The address configuration address is ignored.
|
||||
bind [::]:6053 -no-speed-check -group office -no-rule-addr
|
||||
```
|
||||
|
||||
1. How to get SPKI of DOT
|
||||
The SPKI can be obtained from the page published by the DNS service provider. If it is not published, it can be obtained by the following command, replace IP with your own IP.
|
||||
|
||||
```shell
|
||||
echo | openssl s_client -connect '1.0.0.1:853' 2>/dev/null | openssl x509 -pubkey -noout | openssl pkey -pubin -outform der | openssl dgst -sha256 -binary | openssl enc -base64
|
||||
```
|
||||
|
||||
1. How to solve the problem of slow DNS resolution in iOS system?
|
||||
Since iOS14, Apple has supported the resolution of DNS HTTPS (TYPE65) records. This function is used for solving problems related to HTTPS connections, but it is still a draft, and it will cause some functions such as adblocking fail. It is recommended to disable it through the following configuration.
|
||||
|
||||
```shell
|
||||
force-qtype-SOA 65
|
||||
```
|
||||
|
||||
1. How to resolve localhost ip by hostname?
|
||||
smartdns can cooperate with the dhcp server of DNSMASQ to support the resolution of local host name to IP address. You can configure smartdns to read the lease file of dnsmasq and support the resolution. The specific configuration parameters are as follows, (note that the DNSMASQ lease file may be different for each system and needs to be configured according to the actual situation)
|
||||
|
||||
```shell
|
||||
dnsmasq-lease-file /var/lib/misc/dnsmasq.leases
|
||||
```
|
||||
|
||||
After the configuration is complete, you can directly use the host name to connect to the local machine. But need to pay attention:
|
||||
|
||||
- Windows system uses mDNS to resolve addresses by default. If you need to use smartdns to resolve addresses under Windows, you need to add `.` after the host name, indicating that DNS resolution is used. Such as `ping smartdns.`
|
||||
|
||||
1. How to use the domain set?
|
||||
To facilitate configuring domain names by set, for configurations with /domain/, you can specify a domain name set for easy maintenance. The specific method is:
|
||||
|
||||
- Use `domain-set` configuration domain set file:
|
||||
|
||||
````shell
|
||||
domain-set -name ad -file /etc/smartdns/ad-list.conf
|
||||
````
|
||||
|
||||
The format of ad-list.conf is one domain per line:
|
||||
|
||||
```shell
|
||||
ad.com
|
||||
site.com
|
||||
```
|
||||
|
||||
- To use the domain set, you only need to configure `/domain/` to `/domain-set:[collection name]/`, such as:
|
||||
|
||||
````shell
|
||||
address /domain-set:ad/#
|
||||
domain-rules /domain-set:ad/ -a #
|
||||
nameserver /domain-set:ad/server
|
||||
...
|
||||
````
|
||||
|
||||
1. How to use ipset and nftset?
|
||||
Similar to Dnsmasq, smartdns supports ipset and nftset, and can transparently forward specific domain names through TPROXY. The comparison of transparent forwarding and tool modes is as follows:
|
||||
|
||||
1. Tools: iptable, nftable
|
||||
|
||||
iptable: a mature routing rule configuration tool.
|
||||
nftable: A more powerful rule configuration tool that is becoming mainstream.
|
||||
|
||||
1. Mode: TPROXY, REDIRECT
|
||||
|
||||
TPROXY: supports UDP and TCP forwarding, and the configuration is a little complicated.
|
||||
REDIRECT: only supports TCP, easy to configure.
|
||||
|
||||
Here we only take the configuration of the most commonly used iptable/REDIRECT with ipset as an example. The specific forwarding configuration is as follows:
|
||||
|
||||
- Set the list of domain names that need to be transparently forwarded in smartdns.conf, for example, `example.com` needs to be transparently forwarded. Then use the ipset option and set the ipset rule of `example.com` to `proxy`.
|
||||
|
||||
```shell
|
||||
# set rules
|
||||
# -ipset proxy: The matching domain name is set to ipset:proxy.
|
||||
# -c none: Disable speed check.
|
||||
# -address #6: Filter IPV6 record.
|
||||
domain-rules /example.com/ -ipset proxy -c none -address #6
|
||||
```
|
||||
|
||||
- Execute shell commands, set iptable rules, and transparently forward matching domain name requests. The rules are as follows:
|
||||
|
||||
```shell
|
||||
# create ipset
|
||||
ipset create proxy hash:net
|
||||
# Set forwarding rules to forward matching requests to port 1081 of this machine
|
||||
iptables -t nat -I PREROUTING -p tcp -m set --match-set proxy dst -j REDIRECT --to-ports 1081
|
||||
```
|
||||
|
||||
- Open the forwarding program of REDIRECT mode on port 1081 of this machine.
|
||||
|
||||
1. More questions
|
||||
More questions, please read issue: [https://github.com/pymumu/smartdns/issues](https://github.com/pymumu/smartdns/issues)
|
||||
|
||||
## Compile
|
||||
|
||||
smartdns contains scripts for compiling packages, supports compiling luci, debian, openwrt, optware installation packages, and can execute `package/build-pkg.sh` compilation.
|
||||
|
||||
@@ -28,7 +28,10 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin
|
||||
|
||||
. /etc/default/smartdns
|
||||
SMARTDNS=/usr/sbin/smartdns
|
||||
PIDFILE=/var/run/smartdns.pid
|
||||
PIDFILE=/run/smartdns.pid
|
||||
if [ ! -d "/run" ]; then
|
||||
PIDFILE=/var/run/smartdns.pid
|
||||
fi
|
||||
|
||||
test -x $SMARTDNS || exit 5
|
||||
|
||||
|
||||
@@ -22,6 +22,14 @@
|
||||
# bind [IP]:[port][@device] [-group [group]] [-no-rule-addr] [-no-rule-nameserver] [-no-rule-ipset] [-no-speed-check] [-no-cache] [-no-rule-soa] [-no-dualstack-selection]
|
||||
# bind tcp server
|
||||
# bind-tcp [IP]:[port][@device] [-group [group]] [-no-rule-addr] [-no-rule-nameserver] [-no-rule-ipset] [-no-speed-check] [-no-cache] [-no-rule-soa] [-no-dualstack-selection]
|
||||
# bind tls server
|
||||
# bind-tls [IP]:[port][@device] [-group [group]] [-no-rule-addr] [-no-rule-nameserver] [-no-rule-ipset] [-no-speed-check] [-no-cache] [-no-rule-soa] [-no-dualstack-selection]
|
||||
# bind-cert-key-file [path to file]
|
||||
# tls private key file
|
||||
# bind-cert-file [path to file]
|
||||
# tls cert file
|
||||
# bind-cert-key-pass [password]
|
||||
# tls private key password
|
||||
# option:
|
||||
# -group: set domain request to use the appropriate server group.
|
||||
# -no-rule-addr: skip address rule.
|
||||
@@ -32,7 +40,8 @@
|
||||
# -no-rule-soa: Skip address SOA(#) rules.
|
||||
# -no-dualstack-selection: Disable dualstack ip selection.
|
||||
# -force-aaaa-soa: force AAAA query return SOA.
|
||||
# -set-mark: set mark on packets.
|
||||
# -ipset ipsetname: use ipset rule.
|
||||
# -nftset nftsetname: use nftset rule.
|
||||
# example:
|
||||
# IPV4:
|
||||
# bind :53
|
||||
@@ -50,7 +59,8 @@ bind [::]:53
|
||||
# dns cache size
|
||||
# cache-size [number]
|
||||
# 0: for no cache
|
||||
cache-size 32768
|
||||
# -1: auto set cache size
|
||||
# cache-size 32768
|
||||
|
||||
# enable persist cache when restart
|
||||
# cache-persist no
|
||||
@@ -58,6 +68,10 @@ cache-size 32768
|
||||
# cache persist file
|
||||
# cache-file /tmp/smartdns.cache
|
||||
|
||||
# cache persist time
|
||||
# cache-checkpoint-time [second]
|
||||
# cache-checkpoint-time 86400
|
||||
|
||||
# prefetch domain
|
||||
# prefetch-domain [yes|no]
|
||||
# prefetch-domain yes
|
||||
@@ -98,7 +112,9 @@ cache-size 32768
|
||||
|
||||
# force specific qtype return soa
|
||||
# force-qtype-SOA [qtypeid |...]
|
||||
# force-qtype-SOA [qtypeid,...]
|
||||
# force-qtype-SOA 65 28
|
||||
# force-qtype-SOA 65,28
|
||||
force-qtype-SOA 65
|
||||
|
||||
# Enable IPV4, IPV6 dual stack IP optimization selection strategy
|
||||
@@ -132,8 +148,9 @@ force-qtype-SOA 65
|
||||
# response-mode [first-ping|fastest-ip|fastest-response]
|
||||
|
||||
# set log level
|
||||
# log-level: [level], level=fatal, error, warn, notice, info, debug
|
||||
# log-level: [level], level=off, fatal, error, warn, notice, info, debug
|
||||
# log-file: file path of log file.
|
||||
# log-console [yes|no]: output log to console.
|
||||
# log-size: size of each log file, support k,m,g
|
||||
# log-num: number of logs, 0 means disable log
|
||||
log-level info
|
||||
@@ -149,6 +166,7 @@ log-level info
|
||||
# audit-SOA [yes|no]: enable or disable log soa result.
|
||||
# audit-size size of each audit file, support k,m,g
|
||||
# audit-file /var/log/smartdns-audit.log
|
||||
# audit-console [yes|no]: output audit log to console.
|
||||
# audit-file-mode [mode]: file mode of audit file.
|
||||
# audit-size 128k
|
||||
# audit-num 2
|
||||
@@ -173,6 +191,9 @@ log-level info
|
||||
# -group [group]: set server to group, use with nameserver /domain/group.
|
||||
# -exclude-default-group: exclude this server from default group.
|
||||
# -proxy [proxy-name]: use proxy to connect to server.
|
||||
# -bootstrap-dns: set as bootstrap dns server.
|
||||
# -set-mark: set mark on packets.
|
||||
# -subnet [ip/subnet]: set edns client subnet.
|
||||
# server 8.8.8.8 -blacklist-ip -check-edns -group g1 -group g2
|
||||
# server tls://dns.google:853
|
||||
# server https://dns.google/dns-query
|
||||
@@ -189,6 +210,7 @@ log-level info
|
||||
# -host-name: TLS sni hostname.
|
||||
# -no-check-certificate: no check certificate.
|
||||
# -proxy [proxy-name]: use proxy to connect to server.
|
||||
# -bootstrap-dns: set as bootstrap dns server.
|
||||
# Get SPKI with this command:
|
||||
# echo | openssl s_client -connect '[ip]:853' | openssl x509 -pubkey -noout | openssl pkey -pubin -outform der | openssl dgst -sha256 -binary | openssl enc -base64
|
||||
# default port is 853
|
||||
@@ -203,6 +225,7 @@ log-level info
|
||||
# -http-host: http host.
|
||||
# -no-check-certificate: no check certificate.
|
||||
# -proxy [proxy-name]: use proxy to connect to server.
|
||||
# -bootstrap-dns: set as bootstrap dns server.
|
||||
# default port is 443
|
||||
# server-https https://cloudflare-dns.com/dns-query
|
||||
|
||||
@@ -220,6 +243,9 @@ log-level info
|
||||
# nameserver /www.example.com/office, Set the domain name to use the appropriate server group.
|
||||
# nameserver /www.example.com/-, ignore this domain
|
||||
|
||||
# expand ptr record from address record
|
||||
# expand-ptr-from-address yes
|
||||
|
||||
# specific address to domain
|
||||
# address /domain/[ip|-|-4|-6|#|#4|#6]
|
||||
# address /www.example.com/1.2.3.4, return ip 1.2.3.4 to client
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
Package: luci-app-smartdns
|
||||
Version: git-18.201.27126-7bf0367-1
|
||||
Depends: libc, smartdns, luci-compat
|
||||
Depends: libc, smartdns
|
||||
Source: feeds/luci/applications/luci-app-smartdns
|
||||
Section: luci
|
||||
Architecture: all
|
||||
|
||||
@@ -2,15 +2,19 @@
|
||||
msgid "Additional Args for upstream dns servers"
|
||||
msgstr "额外的上游 DNS 服务器参数"
|
||||
|
||||
msgid ""
|
||||
"Additional Flags for rules, read help on domain-rule for more information."
|
||||
msgstr "额外的规则标识，具体参考domain-rule的帮助说明。"
|
||||
|
||||
msgid "Additional Rule Flag"
|
||||
msgstr "额外规则标识"
|
||||
|
||||
msgid "Additional Flags for rules, read help on domain-rule for more information."
|
||||
msgstr "额外的规则标识，具体参考domain-rule的帮助说明。"
|
||||
|
||||
msgid "Additional Server Args"
|
||||
msgstr "额外的服务器参数"
|
||||
|
||||
msgid "Additional server args, refer to the help description of the bind option."
|
||||
msgstr "额外的服务器参数，参考bind选项的帮助说明。"
|
||||
|
||||
msgid "Advanced Settings"
|
||||
msgstr "高级设置"
|
||||
|
||||
@@ -23,7 +27,7 @@ msgid "Automatically Set Dnsmasq"
|
||||
msgstr "自动设置Dnsmasq"
|
||||
|
||||
msgid "Automatically set as upstream of dnsmasq when port changes."
|
||||
msgstr "自动设置为Dnsmasq的上游服务器"
|
||||
msgstr "端口更改时自动设为 dnsmasq 的上游。"
|
||||
|
||||
msgid "Bind Device"
|
||||
msgstr "绑定到设备"
|
||||
@@ -31,13 +35,19 @@ msgstr "绑定到设备"
|
||||
msgid "Bind Device Name"
|
||||
msgstr "绑定的设备名称"
|
||||
|
||||
msgid "Block domain"
|
||||
msgstr "屏蔽域名"
|
||||
|
||||
msgid "Block domain."
|
||||
msgstr "屏蔽域名。"
|
||||
|
||||
msgid "Cache Persist"
|
||||
msgstr "持久化缓存"
|
||||
|
||||
msgid "Cache Size"
|
||||
msgstr "缓存大小"
|
||||
|
||||
msgid "Collecting data..."
|
||||
msgid "Collecting data ..."
|
||||
msgstr "正在收集数据..."
|
||||
|
||||
msgid ""
|
||||
@@ -48,6 +58,9 @@ msgstr "配置需要从指定域名服务器结果过滤的IP黑名单。"
|
||||
msgid "Configure block domain list."
|
||||
msgstr "配置屏蔽域名列表"
|
||||
|
||||
msgid "Configure domain rule list."
|
||||
msgstr "配置域名规则列表"
|
||||
|
||||
msgid "Configure forwarding domain name list."
|
||||
msgstr "配置分流域名列表"
|
||||
|
||||
@@ -63,12 +76,11 @@ msgstr "域名分流设置"
|
||||
msgid "DNS Server Name"
|
||||
msgstr "DNS服务器名称"
|
||||
|
||||
msgid "DNS Server group belongs to, such as office, home."
|
||||
msgstr "配置归属服务器组，例如office, home"
|
||||
msgid "DNS Server group"
|
||||
msgstr "服务器组"
|
||||
|
||||
msgid ""
|
||||
"DNS Server group belongs to, used with nameserver, such as office, home."
|
||||
msgstr "DNS服务器所属组， 配合nameserver使用，例如：office，home。"
|
||||
msgid "DNS Server group belongs to, such as office, home."
|
||||
msgstr "设置服务器组，例如office，home"
|
||||
|
||||
msgid "DNS Server ip"
|
||||
msgstr "DNS服务器IP"
|
||||
@@ -80,14 +92,23 @@ msgid "DNS Server type"
|
||||
msgstr "协议类型"
|
||||
|
||||
msgid "DNS domain result cache size"
|
||||
msgstr "缓存DNS的结果，缓存大小，配置零则不缓存"
|
||||
msgstr "缓存DNS的结果，缓存大小，配置零则不缓存。"
|
||||
|
||||
msgid "DNS64"
|
||||
msgstr "DNS64"
|
||||
|
||||
msgid "DNS64 Server Settings"
|
||||
msgstr "DNS64服务器配置"
|
||||
|
||||
msgid "default"
|
||||
msgstr "默认"
|
||||
|
||||
msgid "Description"
|
||||
msgstr "描述"
|
||||
|
||||
msgid "Dnsmasq Forwarded To Smartdns Failure"
|
||||
msgstr "重定向dnsmasq到smartdns失败"
|
||||
|
||||
msgid "Do not check certificate."
|
||||
msgstr "不校验证书的合法性。"
|
||||
|
||||
@@ -103,6 +124,12 @@ msgstr "域名列表"
|
||||
msgid "Domain List File"
|
||||
msgstr "域名列表文件"
|
||||
|
||||
msgid "Domain Rule List"
|
||||
msgstr "域名规则列表"
|
||||
|
||||
msgid "Domain Rule Name"
|
||||
msgstr "域名规则名称"
|
||||
|
||||
msgid "Domain Rules"
|
||||
msgstr "域名规则"
|
||||
|
||||
@@ -136,7 +163,8 @@ msgstr "下载文件设置"
|
||||
msgid ""
|
||||
"Download domain list files for domain-rule and include config files, please "
|
||||
"refresh the page after download to take effect."
|
||||
msgstr "下载域名文件列表，下载后刷新页面生效"
|
||||
msgstr ""
|
||||
"下载域名规则所需要的域名列表文件和smartdns配置文件，下载完成后刷新页面。"
|
||||
|
||||
msgid "Dual-stack IP Selection"
|
||||
msgstr "双栈IP优选"
|
||||
@@ -148,16 +176,16 @@ msgid "Enable Auto Update"
|
||||
msgstr "启用自动更新"
|
||||
|
||||
msgid "Enable IP selection between IPV4 and IPV6"
|
||||
msgstr "启用 IPV4 和 IPV6 间的 IP 优选策略"
|
||||
msgstr "启用 IPV4 和 IPV6 间的 IP 优选策略。"
|
||||
|
||||
msgid "Enable IPV6 DNS Server"
|
||||
msgstr "启用IPV6服务器"
|
||||
msgstr "启用IPV6服务器。"
|
||||
|
||||
msgid "Enable TCP DNS Server"
|
||||
msgstr "启用TCP服务器"
|
||||
msgstr "启用TCP服务器。"
|
||||
|
||||
msgid "Enable daily auto update."
|
||||
msgstr "启用每日自动更新。"
|
||||
msgstr "启用每日自动更新"
|
||||
|
||||
msgid "Enable domain prefetch, accelerate domain response speed."
|
||||
msgstr "启用域名预加载，加速域名响应速度。"
|
||||
@@ -169,10 +197,16 @@ msgid "Enable or disable smartdns server"
|
||||
msgstr "启用或禁用SmartDNS服务"
|
||||
|
||||
msgid "Exclude DNS Server from default group."
|
||||
msgstr "从default默认服务器组中排除"
|
||||
msgstr "从default默认服务器组中排除。"
|
||||
|
||||
msgid "Exclude Default Group"
|
||||
msgstr "从默认服务器组排除"
|
||||
msgstr "从默认组中排除"
|
||||
|
||||
msgid "Fastest IP"
|
||||
msgstr "最快IP"
|
||||
|
||||
msgid "Fastest Response"
|
||||
msgstr "最快响应"
|
||||
|
||||
msgid "File Name"
|
||||
msgstr "文件名"
|
||||
@@ -186,12 +220,6 @@ msgstr "使用IP黑名单过滤"
|
||||
msgid "First Ping"
|
||||
msgstr "最快PING"
|
||||
|
||||
msgid "Fastest IP"
|
||||
msgstr "最快IP"
|
||||
|
||||
msgid "Fastest Response"
|
||||
msgstr "最快响应"
|
||||
|
||||
msgid "Force AAAA SOA"
|
||||
msgstr "停用IPV6地址解析"
|
||||
|
||||
@@ -216,6 +244,9 @@ msgid ""
|
||||
msgstr ""
|
||||
"当smartdns异常时生成coredump文件，coredump文件在/tmp/smartdns.xxx.core."
|
||||
|
||||
msgid "Grant access to LuCI app smartdns"
|
||||
msgstr "授予访问 LuCI 应用 smartdns 的权限"
|
||||
|
||||
msgid "HTTP Host"
|
||||
msgstr "HTTP主机"
|
||||
|
||||
@@ -229,30 +260,29 @@ msgid "IPV6 Server"
|
||||
msgstr "IPV6服务器"
|
||||
|
||||
msgid "IPset Name"
|
||||
msgstr "IPSet名称"
|
||||
msgstr "IPset名称"
|
||||
|
||||
msgid "IPset name."
|
||||
msgstr "IPSet名称。"
|
||||
|
||||
msgid "Ipset name, Add domain result to ipset when speed check fails."
|
||||
msgstr "IPset名称，当测速失败时，将查询到的结果添加到对应的IPSet集合中。"
|
||||
|
||||
msgid "ipset name format error, format: [#[4|6]:]ipsetname"
|
||||
msgstr "IPset名称格式错误，格式：[#[4|6]:]ipsetname"
|
||||
msgstr "IPset名称。"
|
||||
|
||||
msgid "If you like this software, please buy me a cup of coffee."
|
||||
msgstr "如果本软件对你有帮助，请给作者加个蛋。"
|
||||
|
||||
msgid "Include Config Files<br>/etc/smartdns/conf.d"
|
||||
msgstr "包含配置文件"
|
||||
msgstr "包含配置文件<br>/etc/smartdns/conf.d"
|
||||
|
||||
msgid ""
|
||||
"Include other config files from /etc/smartdns/conf.d or custom path, can be "
|
||||
"downloaded from the download page."
|
||||
msgstr "包含配置文件，路径为/etc/smartdns/conf.d，或自定义配置文件路径，可以从下载页配置自动下载。"
|
||||
msgstr ""
|
||||
"包含配置文件，路径为/etc/smartdns/conf.d，或自定义配置文件路径，可以从下载页"
|
||||
"配置自动下载。面配置自动下载。"
|
||||
|
||||
msgid "Ipset name, Add domain result to ipset when speed check fails."
|
||||
msgstr "IPset名称，当测速失败时，将查询到的结果添加到对应的IPSet集合中。"
|
||||
|
||||
msgid "List of files to download."
|
||||
msgstr "下载的文件列表。"
|
||||
msgstr "下载文件列表。"
|
||||
|
||||
msgid "Listen only on the specified interfaces."
|
||||
msgstr "监听在指定的设备上，避免非本地网络的DNS查询请求。"
|
||||
@@ -260,21 +290,27 @@ msgstr "监听在指定的设备上，避免非本地网络的DNS查询请求。
|
||||
msgid "Local Port"
|
||||
msgstr "本地端口"
|
||||
|
||||
msgid "Log Size"
|
||||
msgstr "日志大小"
|
||||
|
||||
msgid "Log Level"
|
||||
msgstr "日志级别"
|
||||
|
||||
msgid "Log Number"
|
||||
msgstr "日志数量"
|
||||
|
||||
msgid "Log File"
|
||||
msgstr "日志文件路径"
|
||||
|
||||
msgid "Marking Packets"
|
||||
msgstr "数据包标记"
|
||||
|
||||
msgid "Set mark on packets."
|
||||
msgstr "设置数据包标记。"
|
||||
|
||||
msgid "Maximum TTL for all domain result."
|
||||
msgstr "所有域名的最大 TTL 值。"
|
||||
|
||||
msgid "Minimum TTL for all domain result."
|
||||
msgstr "所有域名的最小 TTL 值。"
|
||||
|
||||
msgid "Name of device name listen on."
|
||||
msgstr "绑定的设备名称。"
|
||||
|
||||
msgid "NFTset Name"
|
||||
msgstr "NFTSet名称"
|
||||
|
||||
@@ -284,36 +320,51 @@ msgstr "NFTSet名称格式错误，格式：[#[4|6]:[family#table#set]]"
|
||||
msgid "NFTset name, format: [#[4|6]:[family#table#set]]"
|
||||
msgstr "NFTSet名称，格式：[#[4|6]:[family#table#set]]"
|
||||
|
||||
msgid "Nftset name, Add domain result to nftset when speed check fails, format: [#[4|6]:[family#table#set]]"
|
||||
msgid "NOT RUNNING"
|
||||
msgstr "未运行"
|
||||
|
||||
msgid "Name of device name listen on."
|
||||
msgstr "绑定的设备名称。"
|
||||
|
||||
msgid ""
|
||||
"Nftset name, Add domain result to nftset when speed check fails, format: "
|
||||
"[#[4|6]:[family#table#set]]"
|
||||
msgstr "NFTset名称，当测速失败时，将查询到的结果添加到对应的NFTSet集合中。"
|
||||
|
||||
msgid "No"
|
||||
msgstr "否"
|
||||
|
||||
msgid "No Speed IPset Name"
|
||||
msgstr "无速度时IPSet名称"
|
||||
|
||||
msgid "No Speed NFTset Name"
|
||||
msgstr "无速度时NFTSet名称"
|
||||
|
||||
msgid "NOT RUNNING"
|
||||
msgstr "未运行"
|
||||
|
||||
msgid "No check certificate"
|
||||
msgstr "停用证书校验"
|
||||
|
||||
msgid "None"
|
||||
msgstr "无"
|
||||
|
||||
msgid "Only socks5 proxy support udp server."
|
||||
msgstr "仅SOCKS5代理支持UDP服务器。"
|
||||
|
||||
msgid "Please set proxy server first."
|
||||
msgstr "请先设置代理服务器。"
|
||||
|
||||
msgid "Proxy Server"
|
||||
msgstr "代理服务器"
|
||||
|
||||
msgid "Proxy Server Settings"
|
||||
msgstr "代理服务器设置"
|
||||
|
||||
msgid "Proxy Server URL, format: [socks5|http]://user:pass@ip:port."
|
||||
msgstr "代理服务器地址，格式：[socks5|http]://user:pass@ip:port。"
|
||||
|
||||
msgid "Proxy server URL format error, format: [socks5|http]://user:pass@ip:port."
|
||||
msgid ""
|
||||
"Proxy server URL format error, format: [socks5|http]://user:pass@ip:port."
|
||||
msgstr "代理服务器地址格式错误，格式：[socks5|http]://user:pass@ip:port。"
|
||||
|
||||
msgid "Proxy Server Settings"
|
||||
msgstr "代理服务器设置"
|
||||
|
||||
msgid "Query DNS through specific dns server group, such as office, home."
|
||||
msgstr "使用指定服务器组查询，比如office, home。"
|
||||
|
||||
@@ -326,21 +377,24 @@ msgstr "回应的域名TTL最大值"
|
||||
msgid "Reply maximum TTL for all domain result."
|
||||
msgstr "设置返回给客户端的域名TTL最大值。"
|
||||
|
||||
msgid "Report bugs"
|
||||
msgstr "报告BUG"
|
||||
|
||||
msgid "Resolve Local Hostnames"
|
||||
msgstr "解析本地主机名"
|
||||
|
||||
msgid "Resolve local hostnames by reading Dnsmasq lease file."
|
||||
msgstr "读取Dnsmasq的租约文件解析本地主机名。"
|
||||
|
||||
msgid "Response Mode"
|
||||
msgstr "响应模式"
|
||||
|
||||
msgid "Restart"
|
||||
msgstr "重启"
|
||||
|
||||
msgid "Restart smartdns"
|
||||
msgid "Restart Service"
|
||||
msgstr "重启服务"
|
||||
|
||||
msgid "Response Mode"
|
||||
msgstr "响应模式"
|
||||
|
||||
msgid "Second Server Settings"
|
||||
msgstr "第二DNS服务器"
|
||||
|
||||
@@ -350,8 +404,8 @@ msgstr "缓存过期服务"
|
||||
msgid "Server Group"
|
||||
msgstr "服务器组"
|
||||
|
||||
msgid "Server Group not exists"
|
||||
msgstr "服务器组不存在"
|
||||
msgid "Server Group %s not exists"
|
||||
msgstr "服务器组%s不存在"
|
||||
|
||||
msgid "Server Name"
|
||||
msgstr "服务器名称"
|
||||
@@ -359,19 +413,25 @@ msgstr "服务器名称"
|
||||
msgid "Set Specific domain ip address."
|
||||
msgstr "设置指定域名的IP地址。"
|
||||
|
||||
msgid "Set Specific domain rule list."
|
||||
msgstr "设置指定域名的规则列表。"
|
||||
|
||||
msgid "Set Specific ip blacklist."
|
||||
msgstr "设置指定的 IP 黑名单列表。"
|
||||
|
||||
msgid "Set TLS hostname to verify."
|
||||
msgstr "设置校验TLS主机名。"
|
||||
|
||||
msgid "Set mark on packets."
|
||||
msgstr "设置数据包标记。"
|
||||
|
||||
msgid ""
|
||||
"Set the HTTP host used for the query. Use this parameter when the host of "
|
||||
"the URL address is an IP address."
|
||||
msgstr "设置查询时使用的HTTP主机，当URL地址的host是IP地址时，使用此参数。"
|
||||
|
||||
msgid "Sets the server name indication for query."
|
||||
msgstr "设置查询时使用的服务器SNI名称。"
|
||||
msgid "Sets the server name indication for query. '-' for disable SNI name."
|
||||
msgstr "设置服务器SNI名称，‘-’表示禁用SNI名称。"
|
||||
|
||||
msgid "Settings"
|
||||
msgstr "设置"
|
||||
@@ -438,25 +498,18 @@ msgid ""
|
||||
msgstr ""
|
||||
"SmartDNS本地服务端口，当端口号设置为53时，smartdns将会自动配置为主dns。"
|
||||
|
||||
msgid ""
|
||||
"Smartdns response mode, First Ping: return the first ping IP, Fastest IP: "
|
||||
"return the fastest IP, Fastest Response: return the fastest DNS response."
|
||||
msgstr ""
|
||||
"SmartDNS响应模式，最快PING： 返回最早有ping结果的IP，速度适中；最快IP： 返回"
|
||||
"最快IP，查询请求可能延长； 最快响应：返回最快响应的结果，查询请求时间短。"
|
||||
|
||||
msgid "Smartdns server name"
|
||||
msgstr "SmartDNS的服务器名称，默认为smartdns，留空为主机名"
|
||||
|
||||
msgid "Speed check mode is invalid."
|
||||
msgstr "测速模式无效。"
|
||||
|
||||
msgid "Speed Check Mode"
|
||||
msgstr "测速模式"
|
||||
|
||||
msgid "Smartdns speed check mode. "
|
||||
msgstr "SmartDns测速模式设置。"
|
||||
|
||||
msgid ""
|
||||
"Smartdns response mode, First Ping: return the first ping IP, "
|
||||
"Fastest IP: return the fastest IP, Fastest Response: return the fastest "
|
||||
"DNS response."
|
||||
msgstr ""
|
||||
"SmartDNS响应模式，最快PING： 返回最早有ping结果的IP，速度适中；最快IP： "
|
||||
"返回最快IP，查询请求可能延长； 最快响应：返回最快响应的结果。查询请求时间短。"
|
||||
msgid "Smartdns speed check mode."
|
||||
msgstr "SmartDNS测速模式。"
|
||||
|
||||
msgid ""
|
||||
"Specify an IP address to return for any host in the given domains, Queries "
|
||||
@@ -466,12 +519,18 @@ msgstr ""
|
||||
"配置特定域名返回特定的IP地址，域名查询将不到上游服务器请求，直接返回配置的IP"
|
||||
"地址，可用于广告屏蔽。"
|
||||
|
||||
msgid "Report bugs"
|
||||
msgstr "报告BUG"
|
||||
msgid "Speed Check Mode"
|
||||
msgstr "测速模式"
|
||||
|
||||
msgid "Speed check mode is invalid."
|
||||
msgstr "测速模式无效。"
|
||||
|
||||
msgid "TCP Server"
|
||||
msgstr "TCP服务器"
|
||||
|
||||
msgid "TCP port is empty"
|
||||
msgstr "TCP端口号为空"
|
||||
|
||||
msgid "TLS Hostname Verify"
|
||||
msgstr "校验TLS主机名"
|
||||
|
||||
@@ -487,18 +546,15 @@ msgstr "设置所有域名的 TTL 值。"
|
||||
msgid "Technical Support"
|
||||
msgstr "技术支持"
|
||||
|
||||
msgid "Use Proxy"
|
||||
msgstr "使用代理"
|
||||
|
||||
msgid "Use proxy to connect to upstream DNS server."
|
||||
msgstr "使用代理连接上游DNS服务器。"
|
||||
|
||||
msgid "URL"
|
||||
msgstr "URL"
|
||||
|
||||
msgid "URL format error, format: http:// or https://"
|
||||
msgstr "URL格式错误，格式：http://或https://"
|
||||
|
||||
msgid "Update"
|
||||
msgstr "更新"
|
||||
|
||||
msgid "Update Files"
|
||||
msgstr "更新文件"
|
||||
|
||||
@@ -509,7 +565,7 @@ msgid "Upload Domain List File"
|
||||
msgstr "上传域名列表文件"
|
||||
|
||||
msgid "Upload domain list file to /etc/smartdns/domain-set"
|
||||
msgstr "上传域名列表文件到/etc/smartdns/domain-set目录"
|
||||
msgstr "上传域名列表文件到/etc/smartdns/domain-set"
|
||||
|
||||
msgid ""
|
||||
"Upload domain list file, or configure auto download from Download File "
|
||||
@@ -517,13 +573,13 @@ msgid ""
|
||||
msgstr "上传域名列表文件，或在下载文件设置页面设置自动下载。"
|
||||
|
||||
msgid "Upload domain list file."
|
||||
msgstr "上传域名列表文件。"
|
||||
msgstr "上传域名列表文件"
|
||||
|
||||
msgid "Upload smartdns config file to /etc/smartdns/conf.d"
|
||||
msgstr "上传配置文件到/etc/smartdns/conf.d目录"
|
||||
msgstr "上传配置文件到/etc/smartdns/conf.d"
|
||||
|
||||
msgid "Upstream DNS Server Configuration"
|
||||
msgstr "上游服务器配置"
|
||||
msgstr "上游DNS服务器配置"
|
||||
|
||||
msgid "Upstream Servers"
|
||||
msgstr "上游服务器"
|
||||
@@ -535,6 +591,12 @@ msgstr ""
|
||||
"上游 DNS 服务器，支持 UDP，TCP 协议。请配置多个上游 DNS 服务器，包括多个国内"
|
||||
"外服务器。"
|
||||
|
||||
msgid "Use Proxy"
|
||||
msgstr "使用代理"
|
||||
|
||||
msgid "Use proxy to connect to upstream DNS server."
|
||||
msgstr "使用代理连接上游DNS服务器。"
|
||||
|
||||
msgid ""
|
||||
"Used to verify the validity of the TLS server, The value is Base64 encoded "
|
||||
"SPKI fingerprint, leaving blank to indicate that the validity of TLS is not "
|
||||
@@ -546,6 +608,12 @@ msgstr ""
|
||||
msgid "Write cache to disk on exit and load on startup."
|
||||
msgstr "退出时保存cache到磁盘，启动时加载。"
|
||||
|
||||
msgid "Yes"
|
||||
msgstr "是"
|
||||
|
||||
msgid "default"
|
||||
msgstr "默认"
|
||||
|
||||
msgid "domain list (/etc/smartdns/domain-set)"
|
||||
msgstr "域名列表（/etc/smartdns/domain-set）"
|
||||
|
||||
@@ -555,6 +623,9 @@ msgstr "https"
|
||||
msgid "ip"
|
||||
msgstr "ip"
|
||||
|
||||
msgid "ipset name format error, format: [#[4|6]:]ipsetname"
|
||||
msgstr "IPset名称格式错误，格式：[#[4|6]:]ipsetname"
|
||||
|
||||
msgid "open website"
|
||||
msgstr "打开网站"
|
||||
|
||||
@@ -562,7 +633,7 @@ msgid "port"
|
||||
msgstr "端口"
|
||||
|
||||
msgid "smartdns config (/etc/smartdns/conf.d)"
|
||||
msgstr "配置文件（/etc/smartdns/conf.d）"
|
||||
msgstr "smartdns 配置文件（/etc/smartdns/conf.d）"
|
||||
|
||||
msgid "smartdns custom settings"
|
||||
msgstr "smartdns 自定义设置，具体配置参数参考指导"
|
||||
@@ -578,6 +649,3 @@ msgstr "类型"
|
||||
|
||||
msgid "udp"
|
||||
msgstr "udp"
|
||||
|
||||
msgid "update domain list files"
|
||||
msgstr "更新列表文件"
|
||||
|
||||
@@ -70,6 +70,7 @@ o = s:taboption("advanced", Value, "speed_check_mode", translate("Speed Check Mo
|
||||
o.rmempty = true;
|
||||
o.placeholder = "default";
|
||||
o.default = o.enabled;
|
||||
o:value("", translate("default"))
|
||||
o:value("ping,tcp:80,tcp:443");
|
||||
o:value("ping,tcp:443,tcp:80");
|
||||
o:value("tcp:80,tcp:443,ping");
|
||||
@@ -161,7 +162,7 @@ end
|
||||
|
||||
---- Domain prefetch load
|
||||
o = s:taboption("advanced", Flag, "prefetch_domain", translate("Domain prefetch"), translate("Enable domain prefetch, accelerate domain response speed."))
|
||||
o.rmempty = false
|
||||
o.rmempty = true
|
||||
o.default = o.disabled
|
||||
o.cfgvalue = function(...)
|
||||
return Flag.cfgvalue(...) or "0"
|
||||
@@ -182,8 +183,8 @@ o.rempty = true
|
||||
|
||||
---- cache-persist;
|
||||
o = s:taboption("advanced", Flag, "cache_persist", translate("Cache Persist"), translate("Write cache to disk on exit and load on startup."))
|
||||
o.rmempty = false;
|
||||
o.default = o.enabled;
|
||||
o.rmempty = false
|
||||
o.default = o.enabled
|
||||
o.cfgvalue = function(...)
|
||||
return Flag.cfgvalue(...) or "1"
|
||||
end
|
||||
@@ -198,8 +199,8 @@ end
|
||||
|
||||
-- Force AAAA SOA
|
||||
o = s:taboption("advanced", Flag, "force_aaaa_soa", translate("Force AAAA SOA"), translate("Force AAAA SOA."))
|
||||
o.rmempty = false
|
||||
o.default = o.enabled
|
||||
o.rmempty = true
|
||||
o.default = o.disabled
|
||||
o.cfgvalue = function(...)
|
||||
return Flag.cfgvalue(...) or "0"
|
||||
end
|
||||
@@ -267,6 +268,12 @@ uci:foreach("smartdns", "download-file", function(section)
|
||||
o:value(section.name);
|
||||
end)
|
||||
|
||||
---- other args
|
||||
o = s:taboption("advanced", Value, "server_flags", translate("Additional Server Args"), translate("Additional server args, refer to the help description of the bind option."))
|
||||
o.default = ""
|
||||
o.rempty = true
|
||||
o.optional = true
|
||||
|
||||
---- second dns server
|
||||
---- Eanble
|
||||
o = s:taboption("seconddns", Flag, "seconddns_enabled", translate("Enable"), translate("Enable or disable second DNS server."))
|
||||
@@ -296,7 +303,7 @@ o.datatype = "hostname"
|
||||
o.rempty = true
|
||||
|
||||
o = s:taboption("seconddns", Flag, "seconddns_no_speed_check", translate("Skip Speed Check"), translate("Do not check speed."))
|
||||
o.rmempty = false
|
||||
o.rmempty = true
|
||||
o.default = o.disabled
|
||||
o.cfgvalue = function(...)
|
||||
return Flag.cfgvalue(...) or "0"
|
||||
@@ -304,7 +311,7 @@ end
|
||||
|
||||
---- skip address rules
|
||||
o = s:taboption("seconddns", Flag, "seconddns_no_rule_addr", translate("Skip Address Rules"), translate("Skip address rules."))
|
||||
o.rmempty = false
|
||||
o.rmempty = true
|
||||
o.default = o.disabled
|
||||
o.cfgvalue = function(...)
|
||||
return Flag.cfgvalue(...) or "0"
|
||||
@@ -312,7 +319,7 @@ end
|
||||
|
||||
---- skip name server rules
|
||||
o = s:taboption("seconddns", Flag, "seconddns_no_rule_nameserver", translate("Skip Nameserver Rule"), translate("Skip nameserver rules."))
|
||||
o.rmempty = false
|
||||
o.rmempty = true
|
||||
o.default = o.disabled
|
||||
o.cfgvalue = function(...)
|
||||
return Flag.cfgvalue(...) or "0"
|
||||
@@ -320,7 +327,7 @@ end
|
||||
|
||||
---- skip ipset rules
|
||||
o = s:taboption("seconddns", Flag, "seconddns_no_rule_ipset", translate("Skip Ipset Rule"), translate("Skip ipset rules."))
|
||||
o.rmempty = false
|
||||
o.rmempty = true
|
||||
o.default = o.disabled
|
||||
o.cfgvalue = function(...)
|
||||
return Flag.cfgvalue(...) or "0"
|
||||
@@ -328,14 +335,14 @@ end
|
||||
|
||||
---- skip soa address rule
|
||||
o = s:taboption("seconddns", Flag, "seconddns_no_rule_soa", translate("Skip SOA Address Rule"), translate("Skip SOA address rules."))
|
||||
o.rmempty = false
|
||||
o.rmempty = true
|
||||
o.default = o.disabled
|
||||
o.cfgvalue = function(...)
|
||||
return Flag.cfgvalue(...) or "0"
|
||||
end
|
||||
|
||||
o = s:taboption("seconddns", Flag, "seconddns_no_dualstack_selection", translate("Skip Dualstack Selection"), translate("Skip Dualstack Selection."))
|
||||
o.rmempty = false
|
||||
o.rmempty = true
|
||||
o.default = o.disabled
|
||||
o.cfgvalue = function(...)
|
||||
return Flag.cfgvalue(...) or "0"
|
||||
@@ -343,7 +350,7 @@ end
|
||||
|
||||
---- skip cache
|
||||
o = s:taboption("seconddns", Flag, "seconddns_no_cache", translate("Skip Cache"), translate("Skip Cache."))
|
||||
o.rmempty = false
|
||||
o.rmempty = true
|
||||
o.default = o.disabled
|
||||
o.cfgvalue = function(...)
|
||||
return Flag.cfgvalue(...) or "0"
|
||||
@@ -351,12 +358,39 @@ end
|
||||
|
||||
---- Force AAAA SOA
|
||||
o = s:taboption("seconddns", Flag, "seconddns_force_aaaa_soa", translate("Force AAAA SOA"), translate("Force AAAA SOA."))
|
||||
o.rmempty = false
|
||||
o.rmempty = true
|
||||
o.default = o.disabled
|
||||
o.cfgvalue = function(...)
|
||||
return Flag.cfgvalue(...) or "0"
|
||||
end
|
||||
|
||||
o = s:taboption("seconddns", Value, "seconddns_ipset_name", translate("IPset Name"), translate("IPset name."))
|
||||
o.rmempty = true
|
||||
o.datatype = "hostname"
|
||||
o.rempty = true
|
||||
|
||||
o = s:taboption("seconddns", Value, "seconddns_nftset_name", translate("NFTset Name"), translate("NFTset name, format: [#[4|6]:[family#table#set]]"))
|
||||
o.rmempty = true
|
||||
o.datatype = "string"
|
||||
o.rempty = true
|
||||
function o.validate(self, value)
|
||||
if (value == "") then
|
||||
return value
|
||||
end
|
||||
|
||||
if (value:match("#[4|6]:[a-zA-Z0-9%-_]+#[a-zA-Z0-9%-_]+#[a-zA-Z0-9%-_]+$")) then
|
||||
return value
|
||||
end
|
||||
|
||||
return nil, translate("NFTset name format error, format: [#[4|6]:[family#table#set]]")
|
||||
end
|
||||
|
||||
---- other args
|
||||
o = s:taboption("seconddns", Value, "seconddns_server_flags", translate("Additional Server Args"), translate("Additional server args, refer to the help description of the bind option."))
|
||||
o.default = ""
|
||||
o.rempty = true
|
||||
o.optional = true
|
||||
|
||||
----- Proxy server settings
|
||||
o = s:taboption("proxy", Value, "proxy_server", translate("Proxy Server"), translate("Proxy Server URL, format: [socks5|http]://user:pass@ip:port."));
|
||||
o.datatype = 'string';
|
||||
@@ -396,12 +430,36 @@ function custom.write(self, section, value)
|
||||
end
|
||||
|
||||
o = s:taboption("custom", Flag, "coredump", translate("Generate Coredump"), translate("Generate Coredump file when smartdns crash, coredump file is located at /tmp/smartdns.xxx.core."))
|
||||
o.rmempty = false
|
||||
o.rmempty = true
|
||||
o.default = o.disabled
|
||||
o.cfgvalue = function(...)
|
||||
return Flag.cfgvalue(...) or "0"
|
||||
end
|
||||
|
||||
o = s:taboption("custom", Value, "log_size", translate("Log Size"))
|
||||
o.rmempty = true
|
||||
o.placeholder = "default"
|
||||
|
||||
o = s:taboption("custom", ListValue, "log_level", translate("Log Level"))
|
||||
o.rmempty = true
|
||||
o.placeholder = "default"
|
||||
o:value("", translate("default"))
|
||||
o:value("debug")
|
||||
o:value("info")
|
||||
o:value("notice")
|
||||
o:value("warn")
|
||||
o:value("error")
|
||||
o:value("fatal")
|
||||
o:value("off")
|
||||
|
||||
o = s:taboption("custom", Value, "log_num", translate("Log Number"))
|
||||
o.rmempty = true
|
||||
o.placeholder = "default"
|
||||
|
||||
o = s:taboption("custom", Value, "log_file", translate("Log File"))
|
||||
o.rmempty = true
|
||||
o.placeholder = "/var/log/smartdns/smartdns.log"
|
||||
|
||||
-- Upstream servers
|
||||
s = m:section(TypedSection, "server", translate("Upstream Servers"), translate("Upstream Servers, support UDP, TCP protocol. " ..
|
||||
"Please configure multiple DNS servers, including multiple foreign DNS servers."))
|
||||
@@ -500,11 +558,11 @@ end
|
||||
|
||||
o = s:taboption("forwarding", Flag, "no_speed_check", translate("Skip Speed Check"),
|
||||
translate("Do not check speed."))
|
||||
o.rmempty = false
|
||||
o.rmempty = true
|
||||
o.default = o.disabled
|
||||
|
||||
o = s:taboption("forwarding", Flag, "force_aaaa_soa", translate("Force AAAA SOA"), translate("Force AAAA SOA."))
|
||||
o.rmempty = false
|
||||
o.rmempty = true
|
||||
o.default = o.disabled
|
||||
|
||||
o = s:taboption("forwarding", Value, "ipset_name", translate("IPset Name"), translate("IPset name."))
|
||||
@@ -614,7 +672,7 @@ s.anonymous = true
|
||||
|
||||
---- download Files Settings
|
||||
o = s:option(Flag, "enable_auto_update", translate("Enable Auto Update"), translate("Enable daily auto update."))
|
||||
o.rmempty = false
|
||||
o.rmempty = true
|
||||
o.default = o.disabled
|
||||
o.rempty = true
|
||||
|
||||
@@ -636,7 +694,7 @@ o.root_directory = "/etc/smartdns/domain-set"
|
||||
|
||||
o = s:option(Button, "_updateate")
|
||||
o.title = translate("Update Files")
|
||||
o.inputtitle = translate("update domain list files")
|
||||
o.inputtitle = translate("Update Files")
|
||||
o.inputstyle = "apply"
|
||||
o.write = function()
|
||||
luci.sys.call("/etc/init.d/smartdns updatefiles >/dev/null 2>&1")
|
||||
@@ -648,11 +706,11 @@ s.addremove = true
|
||||
s.template = "cbi/tblsection"
|
||||
|
||||
o = s:option(Value, 'name', translate('File Name'), translate('File Name'))
|
||||
o.rmempty = false
|
||||
o.rmempty = true
|
||||
o.datatype = 'string'
|
||||
|
||||
o = s:option(Value, 'url', translate('URL'), translate('URL'))
|
||||
o.rmempty = false
|
||||
o.rmempty = true
|
||||
o.datatype = 'string'
|
||||
function o.validate(self, value, section)
|
||||
if value == "" then
|
||||
@@ -714,7 +772,7 @@ o.write = function()
|
||||
end
|
||||
|
||||
o = s:option(Button, "Restart")
|
||||
o.title = translate("Restart smartdns")
|
||||
o.title = translate("Restart Service")
|
||||
o.inputtitle = translate("Restart")
|
||||
o.inputstyle = "apply"
|
||||
o.write = function()
|
||||
|
||||
@@ -56,7 +56,7 @@ o.default = "udp"
|
||||
o.rempty = false
|
||||
|
||||
---- server group
|
||||
o = s:option(Value, "server_group", translate("Server Group"), translate("DNS Server group belongs to, used with nameserver, such as office, home."))
|
||||
o = s:option(Value, "server_group", translate("Server Group"), translate("DNS Server group belongs to, such as office, home."))
|
||||
o.rmempty = true
|
||||
o.placeholder = "default"
|
||||
o.datatype = "hostname"
|
||||
@@ -64,14 +64,14 @@ o.rempty = true
|
||||
|
||||
---- exclude default group
|
||||
o = s:option(Flag, "exclude_default_group", translate("Exclude Default Group"), translate("Exclude DNS Server from default group."))
|
||||
o.rmempty = false
|
||||
o.rmempty = true
|
||||
o.default = o.disabled
|
||||
o.editable = true
|
||||
o.modalonly = true
|
||||
|
||||
---- blacklist_ip
|
||||
o = s:option(Flag, "blacklist_ip", translate("IP Blacklist Filtering"), translate("Filtering IP with blacklist"))
|
||||
o.rmempty = false
|
||||
o.rmempty = true
|
||||
o.default = o.disabled
|
||||
o.cfgvalue = function(...)
|
||||
return Flag.cfgvalue(...) or "0"
|
||||
@@ -87,7 +87,7 @@ o:depends("type", "https")
|
||||
|
||||
---- certificate verify
|
||||
o = s:option(Flag, "no_check_certificate", translate("No check certificate"), translate("Do not check certificate."))
|
||||
o.rmempty = false
|
||||
o.rmempty = true
|
||||
o.default = o.disabled
|
||||
o.cfgvalue = function(...)
|
||||
return Flag.cfgvalue(...) or "0"
|
||||
@@ -154,6 +154,5 @@ end
|
||||
o = s:option(Value, "addition_arg", translate("Additional Server Args"), translate("Additional Args for upstream dns servers"))
|
||||
o.default = ""
|
||||
o.rempty = true
|
||||
o.optional = true
|
||||
|
||||
return m
|
||||
@@ -2,15 +2,19 @@
|
||||
msgid "Additional Args for upstream dns servers"
|
||||
msgstr "额外的上游 DNS 服务器参数"
|
||||
|
||||
msgid ""
|
||||
"Additional Flags for rules, read help on domain-rule for more information."
|
||||
msgstr "额外的规则标识，具体参考domain-rule的帮助说明。"
|
||||
|
||||
msgid "Additional Rule Flag"
|
||||
msgstr "额外规则标识"
|
||||
|
||||
msgid "Additional Flags for rules, read help on domain-rule for more information."
|
||||
msgstr "额外的规则标识，具体参考domain-rule的帮助说明。"
|
||||
|
||||
msgid "Additional Server Args"
|
||||
msgstr "额外的服务器参数"
|
||||
|
||||
msgid "Additional server args, refer to the help description of the bind option."
|
||||
msgstr "额外的服务器参数，参考bind选项的帮助说明。"
|
||||
|
||||
msgid "Advanced Settings"
|
||||
msgstr "高级设置"
|
||||
|
||||
@@ -88,7 +92,10 @@ msgid "DNS Server type"
|
||||
msgstr "协议类型"
|
||||
|
||||
msgid "DNS domain result cache size"
|
||||
msgstr "缓存DNS的结果，缓存大小，配置零则不缓存"
|
||||
msgstr "缓存DNS的结果，缓存大小，配置零则不缓存。"
|
||||
|
||||
msgid "DNS64"
|
||||
msgstr "DNS64"
|
||||
|
||||
msgid "DNS64 Server Settings"
|
||||
msgstr "DNS64服务器配置"
|
||||
@@ -169,13 +176,13 @@ msgid "Enable Auto Update"
|
||||
msgstr "启用自动更新"
|
||||
|
||||
msgid "Enable IP selection between IPV4 and IPV6"
|
||||
msgstr "启用 IPV4 和 IPV6 间的 IP 优选策略"
|
||||
msgstr "启用 IPV4 和 IPV6 间的 IP 优选策略。"
|
||||
|
||||
msgid "Enable IPV6 DNS Server"
|
||||
msgstr "启用IPV6服务器"
|
||||
msgstr "启用IPV6服务器。"
|
||||
|
||||
msgid "Enable TCP DNS Server"
|
||||
msgstr "启用TCP服务器"
|
||||
msgstr "启用TCP服务器。"
|
||||
|
||||
msgid "Enable daily auto update."
|
||||
msgstr "启用每日自动更新"
|
||||
@@ -190,11 +197,17 @@ msgid "Enable or disable smartdns server"
|
||||
msgstr "启用或禁用SmartDNS服务"
|
||||
|
||||
msgid "Exclude DNS Server from default group."
|
||||
msgstr "从default默认服务器组中排除"
|
||||
msgstr "从default默认服务器组中排除。"
|
||||
|
||||
msgid "Exclude Default Group"
|
||||
msgstr "从默认组中排除"
|
||||
|
||||
msgid "Fastest IP"
|
||||
msgstr "最快IP"
|
||||
|
||||
msgid "Fastest Response"
|
||||
msgstr "最快响应"
|
||||
|
||||
msgid "File Name"
|
||||
msgstr "文件名"
|
||||
|
||||
@@ -207,12 +220,6 @@ msgstr "使用IP黑名单过滤"
|
||||
msgid "First Ping"
|
||||
msgstr "最快PING"
|
||||
|
||||
msgid "Fastest IP"
|
||||
msgstr "最快IP"
|
||||
|
||||
msgid "Fastest Response"
|
||||
msgstr "最快响应"
|
||||
|
||||
msgid "Force AAAA SOA"
|
||||
msgstr "停用IPV6地址解析"
|
||||
|
||||
@@ -256,13 +263,7 @@ msgid "IPset Name"
|
||||
msgstr "IPset名称"
|
||||
|
||||
msgid "IPset name."
|
||||
msgstr "IPSet名称。"
|
||||
|
||||
msgid "Ipset name, Add domain result to ipset when speed check fails."
|
||||
msgstr "IPset名称，当测速失败时，将查询到的结果添加到对应的IPSet集合中。"
|
||||
|
||||
msgid "ipset name format error, format: [#[4|6]:]ipsetname"
|
||||
msgstr "IPset名称格式错误，格式：[#[4|6]:]ipsetname"
|
||||
msgstr "IPset名称。"
|
||||
|
||||
msgid "If you like this software, please buy me a cup of coffee."
|
||||
msgstr "如果本软件对你有帮助，请给作者加个蛋。"
|
||||
@@ -274,11 +275,14 @@ msgid ""
|
||||
"Include other config files from /etc/smartdns/conf.d or custom path, can be "
|
||||
"downloaded from the download page."
|
||||
msgstr ""
|
||||
"包含配置文件，路径为/etc/smartdns/conf.d，或自定义配置文件路径，可以从下载页配置自动下载。"
|
||||
"面配置自动下载。"
|
||||
"包含配置文件，路径为/etc/smartdns/conf.d，或自定义配置文件路径，可以从下载页"
|
||||
"配置自动下载。面配置自动下载。"
|
||||
|
||||
msgid "Ipset name, Add domain result to ipset when speed check fails."
|
||||
msgstr "IPset名称，当测速失败时，将查询到的结果添加到对应的IPSet集合中。"
|
||||
|
||||
msgid "List of files to download."
|
||||
msgstr "下载文件列表"
|
||||
msgstr "下载文件列表。"
|
||||
|
||||
msgid "Listen only on the specified interfaces."
|
||||
msgstr "监听在指定的设备上，避免非本地网络的DNS查询请求。"
|
||||
@@ -286,21 +290,27 @@ msgstr "监听在指定的设备上，避免非本地网络的DNS查询请求。
|
||||
msgid "Local Port"
|
||||
msgstr "本地端口"
|
||||
|
||||
msgid "Log Size"
|
||||
msgstr "日志大小"
|
||||
|
||||
msgid "Log Level"
|
||||
msgstr "日志级别"
|
||||
|
||||
msgid "Log Number"
|
||||
msgstr "日志数量"
|
||||
|
||||
msgid "Log File"
|
||||
msgstr "日志文件路径"
|
||||
|
||||
msgid "Marking Packets"
|
||||
msgstr "数据包标记"
|
||||
|
||||
msgid "Set mark on packets."
|
||||
msgstr "设置数据包标记。"
|
||||
|
||||
msgid "Maximum TTL for all domain result."
|
||||
msgstr "所有域名的最大 TTL 值。"
|
||||
|
||||
msgid "Minimum TTL for all domain result."
|
||||
msgstr "所有域名的最小 TTL 值。"
|
||||
|
||||
msgid "Name of device name listen on."
|
||||
msgstr "绑定的设备名称。"
|
||||
|
||||
msgid "NFTset Name"
|
||||
msgstr "NFTSet名称"
|
||||
|
||||
@@ -310,21 +320,26 @@ msgstr "NFTSet名称格式错误，格式：[#[4|6]:[family#table#set]]"
|
||||
msgid "NFTset name, format: [#[4|6]:[family#table#set]]"
|
||||
msgstr "NFTSet名称，格式：[#[4|6]:[family#table#set]]"
|
||||
|
||||
msgid "Nftset name, Add domain result to nftset when speed check fails, format: [#[4|6]:[family#table#set]]"
|
||||
msgid "NOT RUNNING"
|
||||
msgstr "未运行"
|
||||
|
||||
msgid "Name of device name listen on."
|
||||
msgstr "绑定的设备名称。"
|
||||
|
||||
msgid ""
|
||||
"Nftset name, Add domain result to nftset when speed check fails, format: "
|
||||
"[#[4|6]:[family#table#set]]"
|
||||
msgstr "NFTset名称，当测速失败时，将查询到的结果添加到对应的NFTSet集合中。"
|
||||
|
||||
msgid "No"
|
||||
msgstr "否"
|
||||
|
||||
msgid "No Speed IPset Name"
|
||||
msgstr "无速度时IPSet名称"
|
||||
|
||||
msgid "No Speed NFTset Name"
|
||||
msgstr "无速度时NFTSet名称"
|
||||
|
||||
msgid "NOT RUNNING"
|
||||
msgstr "未运行"
|
||||
|
||||
msgid "No"
|
||||
msgstr "否"
|
||||
|
||||
msgid "No check certificate"
|
||||
msgstr "停用证书校验"
|
||||
|
||||
@@ -340,15 +355,16 @@ msgstr "请先设置代理服务器。"
|
||||
msgid "Proxy Server"
|
||||
msgstr "代理服务器"
|
||||
|
||||
msgid "Proxy Server Settings"
|
||||
msgstr "代理服务器设置"
|
||||
|
||||
msgid "Proxy Server URL, format: [socks5|http]://user:pass@ip:port."
|
||||
msgstr "代理服务器地址，格式：[socks5|http]://user:pass@ip:port。"
|
||||
|
||||
msgid "Proxy server URL format error, format: [socks5|http]://user:pass@ip:port."
|
||||
msgid ""
|
||||
"Proxy server URL format error, format: [socks5|http]://user:pass@ip:port."
|
||||
msgstr "代理服务器地址格式错误，格式：[socks5|http]://user:pass@ip:port。"
|
||||
|
||||
msgid "Proxy Server Settings"
|
||||
msgstr "代理服务器设置"
|
||||
|
||||
msgid "Query DNS through specific dns server group, such as office, home."
|
||||
msgstr "使用指定服务器组查询，比如office, home。"
|
||||
|
||||
@@ -406,6 +422,9 @@ msgstr "设置指定的 IP 黑名单列表。"
|
||||
msgid "Set TLS hostname to verify."
|
||||
msgstr "设置校验TLS主机名。"
|
||||
|
||||
msgid "Set mark on packets."
|
||||
msgstr "设置数据包标记。"
|
||||
|
||||
msgid ""
|
||||
"Set the HTTP host used for the query. Use this parameter when the host of "
|
||||
"the URL address is an IP address."
|
||||
@@ -479,23 +498,19 @@ msgid ""
|
||||
msgstr ""
|
||||
"SmartDNS本地服务端口，当端口号设置为53时，smartdns将会自动配置为主dns。"
|
||||
|
||||
msgid ""
|
||||
"Smartdns response mode, First Ping: return the first ping IP, Fastest IP: "
|
||||
"return the fastest IP, Fastest Response: return the fastest DNS response."
|
||||
msgstr ""
|
||||
"SmartDNS响应模式，最快PING： 返回最早有ping结果的IP，速度适中；最快IP： 返回"
|
||||
"最快IP，查询请求可能延长； 最快响应：返回最快响应的结果，查询请求时间短。"
|
||||
|
||||
msgid "Smartdns server name"
|
||||
msgstr "SmartDNS的服务器名称，默认为smartdns，留空为主机名"
|
||||
|
||||
msgid "Smartdns speed check mode."
|
||||
msgstr "SmartDNS测速模式。"
|
||||
|
||||
msgid ""
|
||||
"Smartdns response mode, First Ping: return the first ping IP, "
|
||||
"Fastest IP: return the fastest IP, Fastest Response: return the fastest "
|
||||
"DNS response."
|
||||
msgstr ""
|
||||
"SmartDNS响应模式，最快PING： 返回最早有ping结果的IP，速度适中；最快IP： "
|
||||
"返回最快IP，查询请求可能延长； 最快响应：返回最快响应的结果。查询请求时间短。"
|
||||
|
||||
msgid "Speed Check Mode"
|
||||
msgstr "测速模式"
|
||||
|
||||
msgid ""
|
||||
"Specify an IP address to return for any host in the given domains, Queries "
|
||||
"in the domains are never forwarded and always replied to with the specified "
|
||||
@@ -504,9 +519,18 @@ msgstr ""
|
||||
"配置特定域名返回特定的IP地址，域名查询将不到上游服务器请求，直接返回配置的IP"
|
||||
"地址，可用于广告屏蔽。"
|
||||
|
||||
msgid "Speed Check Mode"
|
||||
msgstr "测速模式"
|
||||
|
||||
msgid "Speed check mode is invalid."
|
||||
msgstr "测速模式无效。"
|
||||
|
||||
msgid "TCP Server"
|
||||
msgstr "TCP服务器"
|
||||
|
||||
msgid "TCP port is empty"
|
||||
msgstr "TCP端口号为空"
|
||||
|
||||
msgid "TLS Hostname Verify"
|
||||
msgstr "校验TLS主机名"
|
||||
|
||||
@@ -522,12 +546,6 @@ msgstr "设置所有域名的 TTL 值。"
|
||||
msgid "Technical Support"
|
||||
msgstr "技术支持"
|
||||
|
||||
msgid "Use Proxy"
|
||||
msgstr "使用代理"
|
||||
|
||||
msgid "Use proxy to connect to upstream DNS server."
|
||||
msgstr "使用代理连接上游DNS服务器。"
|
||||
|
||||
msgid "URL"
|
||||
msgstr "URL"
|
||||
|
||||
@@ -570,6 +588,12 @@ msgstr ""
|
||||
"上游 DNS 服务器，支持 UDP，TCP 协议。请配置多个上游 DNS 服务器，包括多个国内"
|
||||
"外服务器。"
|
||||
|
||||
msgid "Use Proxy"
|
||||
msgstr "使用代理"
|
||||
|
||||
msgid "Use proxy to connect to upstream DNS server."
|
||||
msgstr "使用代理连接上游DNS服务器。"
|
||||
|
||||
msgid ""
|
||||
"Used to verify the validity of the TLS server, The value is Base64 encoded "
|
||||
"SPKI fingerprint, leaving blank to indicate that the validity of TLS is not "
|
||||
@@ -581,6 +605,12 @@ msgstr ""
|
||||
msgid "Write cache to disk on exit and load on startup."
|
||||
msgstr "退出时保存cache到磁盘，启动时加载。"
|
||||
|
||||
msgid "Yes"
|
||||
msgstr "是"
|
||||
|
||||
msgid "default"
|
||||
msgstr "默认"
|
||||
|
||||
msgid "domain list (/etc/smartdns/domain-set)"
|
||||
msgstr "域名列表（/etc/smartdns/domain-set）"
|
||||
|
||||
@@ -590,6 +620,9 @@ msgstr "https"
|
||||
msgid "ip"
|
||||
msgstr "ip"
|
||||
|
||||
msgid "ipset name format error, format: [#[4|6]:]ipsetname"
|
||||
msgstr "IPset名称格式错误，格式：[#[4|6]:]ipsetname"
|
||||
|
||||
msgid "open website"
|
||||
msgstr "打开网站"
|
||||
|
||||
@@ -597,7 +630,7 @@ msgid "port"
|
||||
msgstr "端口"
|
||||
|
||||
msgid "smartdns config (/etc/smartdns/conf.d)"
|
||||
msgstr "配置文件（/etc/smartdns/conf.d）"
|
||||
msgstr "smartdns 配置文件（/etc/smartdns/conf.d）"
|
||||
|
||||
msgid "smartdns custom settings"
|
||||
msgstr "smartdns 自定义设置，具体配置参数参考指导"
|
||||
@@ -613,6 +646,3 @@ msgstr "类型"
|
||||
|
||||
msgid "udp"
|
||||
msgstr "udp"
|
||||
|
||||
msgid "Yes"
|
||||
msgstr "是"
|
||||
|
||||
@@ -245,7 +245,7 @@ return view.extend({
|
||||
// Domain prefetch load ;
|
||||
o = s.taboption("advanced", form.Flag, "prefetch_domain", _("Domain prefetch"),
|
||||
_("Enable domain prefetch, accelerate domain response speed."));
|
||||
o.rmempty = false;
|
||||
o.rmempty = true;
|
||||
o.default = o.disabled;
|
||||
|
||||
// Domain Serve expired
|
||||
@@ -270,7 +270,7 @@ return view.extend({
|
||||
|
||||
// Force AAAA SOA
|
||||
o = s.taboption("advanced", form.Flag, "force_aaaa_soa", _("Force AAAA SOA"), _("Force AAAA SOA."));
|
||||
o.rmempty = false;
|
||||
o.rmempty = true;
|
||||
o.default = o.disabled;
|
||||
|
||||
// Force HTTPS SOA
|
||||
@@ -342,6 +342,12 @@ return view.extend({
|
||||
_("Reply maximum TTL for all domain result."));
|
||||
o.rempty = true;
|
||||
|
||||
// other args
|
||||
o = s.taboption("advanced", form.Value, "server_flags", _("Additional Server Args"),
|
||||
_("Additional server args, refer to the help description of the bind option."))
|
||||
o.default = ""
|
||||
o.rempty = true
|
||||
|
||||
// include config
|
||||
download_files = uci.sections('smartdns', 'download-file');
|
||||
o = s.taboption("advanced", form.DynamicList, "conf_files", _("Include Config Files<br>/etc/smartdns/conf.d"),
|
||||
@@ -365,7 +371,7 @@ return view.extend({
|
||||
o = s.taboption("seconddns", form.Flag, "seconddns_enabled", _("Enable"),
|
||||
_("Enable or disable second DNS server."));
|
||||
o.default = o.disabled;
|
||||
o.rempty = false;
|
||||
o.rempty = true;
|
||||
|
||||
// Port;
|
||||
o = s.taboption("seconddns", form.Value, "seconddns_port", _("Local Port"), _("Smartdns local server port"));
|
||||
@@ -389,48 +395,92 @@ return view.extend({
|
||||
|
||||
o = s.taboption("seconddns", form.Flag, "seconddns_no_speed_check", _("Skip Speed Check"),
|
||||
_("Do not check speed."));
|
||||
o.rmempty = false;
|
||||
o.rmempty = true;
|
||||
o.default = o.disabled;
|
||||
|
||||
// skip address rules;
|
||||
o = s.taboption("seconddns", form.Flag, "seconddns_no_rule_addr", _("Skip Address Rules"),
|
||||
_("Skip address rules."));
|
||||
o.rmempty = false;
|
||||
o.rmempty = true;
|
||||
o.default = o.disabled;
|
||||
|
||||
// skip name server rules;
|
||||
o = s.taboption("seconddns", form.Flag, "seconddns_no_rule_nameserver", _("Skip Nameserver Rule"),
|
||||
_("Skip nameserver rules."));
|
||||
o.rmempty = false;
|
||||
o.rmempty = true;
|
||||
o.default = o.disabled;
|
||||
|
||||
// skip ipset rules;
|
||||
o = s.taboption("seconddns", form.Flag, "seconddns_no_rule_ipset", _("Skip Ipset Rule"),
|
||||
_("Skip ipset rules."));
|
||||
o.rmempty = false;
|
||||
o.rmempty = true;
|
||||
o.default = o.disabled;
|
||||
|
||||
// skip soa address rule;
|
||||
o = s.taboption("seconddns", form.Flag, "seconddns_no_rule_soa", _("Skip SOA Address Rule"),
|
||||
_("Skip SOA address rules."));
|
||||
o.rmempty = false;
|
||||
o.rmempty = true;
|
||||
o.default = o.disabled;
|
||||
|
||||
o = s.taboption("seconddns", form.Flag, "seconddns_no_dualstack_selection", _("Skip Dualstack Selection"),
|
||||
_("Skip Dualstack Selection."));
|
||||
o.rmempty = false;
|
||||
o.rmempty = true;
|
||||
o.default = o.disabled;
|
||||
|
||||
// skip cache;
|
||||
o = s.taboption("seconddns", form.Flag, "seconddns_no_cache", _("Skip Cache"), _("Skip Cache."));
|
||||
o.rmempty = false;
|
||||
o.rmempty = true;
|
||||
o.default = o.disabled;
|
||||
|
||||
// Force AAAA SOA
|
||||
o = s.taboption("seconddns", form.Flag, "seconddns_force_aaaa_soa", _("Force AAAA SOA"), _("Force AAAA SOA."));
|
||||
o.rmempty = false;
|
||||
o.rmempty = true;
|
||||
o.default = o.disabled;
|
||||
|
||||
o = s.taboption("seconddns", form.Value, "seconddns_ipset_name", _("IPset Name"), _("IPset name."));
|
||||
o.rmempty = true;
|
||||
o.datatype = "string";
|
||||
o.rempty = true;
|
||||
o.validate = function (section_id, value) {
|
||||
if (value == "") {
|
||||
return true;
|
||||
}
|
||||
|
||||
var ipset = value.split(",")
|
||||
for (var i = 0; i < ipset.length; i++) {
|
||||
if (!ipset[i].match(/^(#[4|6]:)?[a-zA-Z0-9\-_]+$/)) {
|
||||
return _("ipset name format error, format: [#[4|6]:]ipsetname");
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
o = s.taboption("seconddns", form.Value, "seconddns_nftset_name", _("NFTset Name"), _("NFTset name, format: [#[4|6]:[family#table#set]]"));
|
||||
o.rmempty = true;
|
||||
o.datatype = "string";
|
||||
o.rempty = true;
|
||||
o.validate = function (section_id, value) {
|
||||
if (value == "") {
|
||||
return true;
|
||||
}
|
||||
|
||||
var nftset = value.split(",")
|
||||
for (var i = 0; i < nftset.length; i++) {
|
||||
if (!nftset[i].match(/^#[4|6]:[a-zA-Z0-9\-_]+#[a-zA-Z0-9\-_]+#[a-zA-Z0-9\-_]+$/)) {
|
||||
return _("NFTset name format error, format: [#[4|6]:[family#table#set]]");
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
// other args
|
||||
o = s.taboption("seconddns", form.Value, "seconddns_server_flags", _("Additional Server Args"),
|
||||
_("Additional server args, refer to the help description of the bind option."))
|
||||
o.default = ""
|
||||
o.rempty = true
|
||||
|
||||
///////////////////////////////////////
|
||||
// DNS64 Settings
|
||||
///////////////////////////////////////
|
||||
@@ -443,7 +493,7 @@ return view.extend({
|
||||
// download Files Settings
|
||||
///////////////////////////////////////
|
||||
o = s.taboption("files", form.Flag, "enable_auto_update", _("Enable Auto Update"), _("Enable daily auto update."));
|
||||
o.rmempty = false;
|
||||
o.rmempty = true;
|
||||
o.default = o.disabled;
|
||||
o.rempty = true;
|
||||
|
||||
@@ -483,11 +533,11 @@ return view.extend({
|
||||
ss.sortable = true;
|
||||
|
||||
so = ss.option(form.Value, 'name', _('File Name'), _('File Name'));
|
||||
so.rmempty = false;
|
||||
so.rmempty = true;
|
||||
so.datatype = 'file';
|
||||
|
||||
so = ss.option(form.Value, 'url', _('URL'), _('URL'));
|
||||
so.rmempty = false;
|
||||
so.rmempty = true;
|
||||
so.datatype = 'string';
|
||||
so.validate = function (section_id, value) {
|
||||
if (value == "") {
|
||||
@@ -548,9 +598,33 @@ return view.extend({
|
||||
|
||||
o = s.taboption("custom", form.Flag, "coredump", _("Generate Coredump"),
|
||||
_("Generate Coredump file when smartdns crash, coredump file is located at /tmp/smartdns.xxx.core."));
|
||||
o.rmempty = false;
|
||||
o.rmempty = true;
|
||||
o.default = o.disabled;
|
||||
|
||||
o = s.taboption("custom", form.Value, "log_size", _("Log Size"));
|
||||
o.rmempty = true;
|
||||
o.placeholder = "default";
|
||||
|
||||
o = s.taboption("custom", form.ListValue, "log_level", _("Log Level"));
|
||||
o.rmempty = true;
|
||||
o.placeholder = "default";
|
||||
o.value("", _("default"));
|
||||
o.value("debug");
|
||||
o.value("info");
|
||||
o.value("notice");
|
||||
o.value("warn");
|
||||
o.value("error");
|
||||
o.value("fatal");
|
||||
o.value("off");
|
||||
|
||||
o = s.taboption("custom", form.Value, "log_num", _("Log Number"));
|
||||
o.rmempty = true;
|
||||
o.placeholder = "default";
|
||||
|
||||
o = s.taboption("custom", form.Value, "log_file", _("Log File"))
|
||||
o.rmempty = true
|
||||
o.placeholder = "/var/log/smartdns/smartdns.log"
|
||||
|
||||
////////////////
|
||||
// Upstream servers;
|
||||
////////////////
|
||||
@@ -618,7 +692,7 @@ return view.extend({
|
||||
|
||||
// Advanced Options
|
||||
o = s.taboption("advanced", form.Flag, "exclude_default_group", _("Exclude Default Group"), _("Exclude DNS Server from default group."))
|
||||
o.rmempty = false;
|
||||
o.rmempty = true;
|
||||
o.default = o.disabled;
|
||||
o.editable = true;
|
||||
o.modalonly = true;
|
||||
@@ -626,7 +700,7 @@ return view.extend({
|
||||
// blacklist_ip
|
||||
o = s.taboption("advanced", form.Flag, "blacklist_ip", _("IP Blacklist Filtering"),
|
||||
_("Filtering IP with blacklist"))
|
||||
o.rmempty = false
|
||||
o.rmempty = true
|
||||
o.default = o.disabled
|
||||
o.modalonly = true;
|
||||
|
||||
@@ -643,7 +717,7 @@ return view.extend({
|
||||
// certificate verify
|
||||
o = s.taboption("advanced", form.Flag, "no_check_certificate", _("No check certificate"),
|
||||
_("Do not check certificate."))
|
||||
o.rmempty = false
|
||||
o.rmempty = true
|
||||
o.default = o.disabled
|
||||
o.modalonly = true;
|
||||
o.depends("type", "tls")
|
||||
@@ -762,11 +836,11 @@ return view.extend({
|
||||
|
||||
o = s.taboption("forwarding", form.Flag, "no_speed_check", _("Skip Speed Check"),
|
||||
_("Do not check speed."));
|
||||
o.rmempty = false;
|
||||
o.rmempty = true;
|
||||
o.default = o.disabled;
|
||||
|
||||
o = s.taboption("forwarding", form.Flag, "force_aaaa_soa", _("Force AAAA SOA"), _("Force AAAA SOA."));
|
||||
o.rmempty = false;
|
||||
o.rmempty = true;
|
||||
o.default = o.disabled;
|
||||
|
||||
o = s.taboption("forwarding", form.Value, "ipset_name", _("IPset Name"), _("IPset name."));
|
||||
@@ -916,7 +990,7 @@ return view.extend({
|
||||
|
||||
so = ss.option(form.FileUpload, "domain_list_file", _("Domain List File"),
|
||||
_("Upload domain list file, or configure auto download from Download File Setting page."));
|
||||
so.rmempty = false
|
||||
so.rmempty = true
|
||||
so.datatype = "file"
|
||||
so.rempty = true
|
||||
so.root_directory = "/etc/smartdns/domain-set"
|
||||
|
||||
@@ -1,21 +1,18 @@
|
||||
#
|
||||
# Copyright (c) 2018-2019 Nick Peng (pymumu@gmail.com)
|
||||
# Copyright (c) 2018-2023 Nick Peng (pymumu@gmail.com)
|
||||
# This is free software, licensed under the GNU General Public License v3.
|
||||
#
|
||||
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=smartdns
|
||||
PKG_VERSION:=1.2019.28
|
||||
PKG_VERSION:=1.2023.41
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
||||
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
|
||||
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_URL:=https://www.github.com/pymumu/smartdns.git
|
||||
PKG_SOURCE_VERSION:=982002e836e486fb4e360bc10e84e7e7197caf46
|
||||
PKG_MIRROR_HASH:=ae889b521ecf114660ce5597af5c361f5970a7dcb75dadf61b938ba3d2baba54
|
||||
PKG_MIRROR_HASH:=skip
|
||||
PKG_SOURCE_VERSION:=60a3719ec739be2cc1e11724ac049b09a75059cb
|
||||
|
||||
PKG_MAINTAINER:=Nick Peng <pymumu@gmail.com>
|
||||
PKG_LICENSE:=GPL-3.0-or-later
|
||||
@@ -38,8 +35,8 @@ endef
|
||||
|
||||
define Package/smartdns/description
|
||||
SmartDNS is a local DNS server which accepts DNS query requests from local network clients,
|
||||
get DNS query results from multiple upstream DNS servers concurrently, and returns the fastest IP to clients.
|
||||
Unlike dnsmasq's all-servers, smartdns returns the fastest IP.
|
||||
gets DNS query results from multiple upstream DNS servers concurrently, and returns the fastest IP to clients.
|
||||
Unlike dnsmasq's all-servers, smartdns returns the fastest IP, and encrypt DNS queries with DoT or DoH.
|
||||
endef
|
||||
|
||||
define Package/smartdns/conffiles
|
||||
@@ -52,8 +49,8 @@ define Package/smartdns/conffiles
|
||||
endef
|
||||
|
||||
define Package/smartdns/install
|
||||
$(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/config $(1)/etc/init.d $(1)/etc/smartdns
|
||||
$(INSTALL_DIR) $(1)/etc/smartdns/conf.d $(1)/etc/smartdns/domain-set
|
||||
$(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/config $(1)/etc/init.d
|
||||
$(INSTALL_DIR) $(1)/etc/smartdns $(1)/etc/smartdns/domain-set $(1)/etc/smartdns/conf.d/
|
||||
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/smartdns $(1)/usr/sbin/smartdns
|
||||
$(INSTALL_BIN) $(PKG_BUILD_DIR)/package/openwrt/files/etc/init.d/smartdns $(1)/etc/init.d/smartdns
|
||||
$(INSTALL_CONF) $(PKG_BUILD_DIR)/package/openwrt/address.conf $(1)/etc/smartdns/address.conf
|
||||
|
||||
@@ -1,14 +1,2 @@
|
||||
# Add custom settings here.
|
||||
|
||||
# set log level
|
||||
# log-level [level], level=fatal, error, warn, notice, info, debug
|
||||
# log-level error
|
||||
|
||||
# log-size k,m,g
|
||||
# log-size 128k
|
||||
|
||||
# log-file /var/log/smartdns.log
|
||||
# log-num 2
|
||||
|
||||
# List of hosts that supply bogus NX domain results
|
||||
# bogus-nxdomain [ip/subnet]
|
||||
# please read https://pymumu.github.io/smartdns/config/basic-config/
|
||||
@@ -22,7 +22,11 @@ USE_PROCD=1
|
||||
SERVICE_USE_PID=1
|
||||
SERVICE_WRITE_PID=1
|
||||
SERVICE_DAEMONIZE=1
|
||||
SERVICE_PID_FILE="/var/run/smartdns.pid"
|
||||
SERVICE_PID_FILE="/run/smartdns.pid"
|
||||
if [ ! -d "/run" ]; then
|
||||
SERVICE_PID_FILE="/var/run/smartdns.pid"
|
||||
fi
|
||||
|
||||
SMARTDNS_CONF_DIR="/etc/smartdns"
|
||||
SMARTDNS_CONF_DOWNLOAD_DIR="$SMARTDNS_CONF_DIR/conf.d"
|
||||
SMARTDNS_DOMAIN_LIST_DOWNLOAD_DIR="$SMARTDNS_CONF_DIR/domain-set"
|
||||
@@ -296,8 +300,10 @@ load_domain_rules()
|
||||
conf_append "domain-rules" "/domain-set:${domain_set_name}-forwarding-file/ $domain_set_args"
|
||||
}
|
||||
|
||||
conf_append "domain-set" "-name ${domain_set_name}-forwarding-list -file /etc/smartdns/domain-forwarding.list"
|
||||
conf_append "domain-rules" "/domain-set:${domain_set_name}-forwarding-list/ $domain_set_args"
|
||||
[ ! -z "$domain_set_args" ] && {
|
||||
conf_append "domain-set" "-name ${domain_set_name}-forwarding-list -file /etc/smartdns/domain-forwarding.list"
|
||||
conf_append "domain-rules" "/domain-set:${domain_set_name}-forwarding-list/ $domain_set_args"
|
||||
}
|
||||
|
||||
config_get block_domain_set_file "$section" "block_domain_set_file"
|
||||
[ ! -z "$block_domain_set_file" ] && {
|
||||
@@ -347,6 +353,7 @@ load_domain_rule_list()
|
||||
|
||||
config_get addition_flag "$section" "addition_flag" ""
|
||||
[ ! -z "$addition_flag" ] && domain_set_args="$domain_set_args $addition_flag"
|
||||
[ -z "$domain_set_args" ] && return
|
||||
|
||||
conf_append "domain-set" "-name domain-rule-list-${domain_set_name} -file '$domain_list_file'"
|
||||
conf_append "domain-rules" "/domain-set:domain-rule-list-${domain_set_name}/ $domain_set_args"
|
||||
@@ -425,6 +432,12 @@ load_second_server()
|
||||
config_get_bool seconddns_force_aaaa_soa "$section" "seconddns_force_aaaa_soa" "0"
|
||||
[ "$seconddns_force_aaaa_soa" = "1" ] && ARGS="$ARGS -force-aaaa-soa"
|
||||
|
||||
config_get seconddns_ipset_name "$section" "seconddns_ipset_name" ""
|
||||
[ -z "$seconddns_ipset_name" ] || ARGS="$ARGS -ipset $seconddns_ipset_name"
|
||||
|
||||
config_get seconddns_nftset_name "$section" "seconddns_nftset_name" ""
|
||||
[ -z "$seconddns_nftset_name" ] || ARGS="$ARGS -nftset $seconddns_nftset_name"
|
||||
|
||||
config_get_bool bind_device "$section" "bind_device" "0"
|
||||
config_get bind_device_name "$section" "bind_device_name" "${lan_device}"
|
||||
[ ! -z "$bind_device_name" ] && [ "$bind_device" = "1" ] && device="${bind_device_name}"
|
||||
@@ -432,6 +445,9 @@ load_second_server()
|
||||
config_get_bool "seconddns_tcp_server" "$section" "seconddns_tcp_server" "1"
|
||||
config_get ipv6_server "$section" "ipv6_server" "1"
|
||||
|
||||
config_get seconddns_server_flags "$section" "seconddns_server_flags" ""
|
||||
[ -z "$seconddns_server_flags" ] || ARGS="$ARGS $seconddns_server_flags"
|
||||
|
||||
conf_append_bind "$seconddns_port" "$device" "$seconddns_tcp_server" "$ipv6_server" "$ARGS"
|
||||
}
|
||||
|
||||
|
||||
@@ -74,6 +74,10 @@ build()
|
||||
echo "Installed-Size: $INST_SIZE" >> $ROOT/control/control
|
||||
fi
|
||||
|
||||
if [ "$STATIC" = "yes" ]; then
|
||||
sed -i "s/Depends:.*/Depends: libc/" $ROOT/control/control
|
||||
fi
|
||||
|
||||
cd $ROOT/control
|
||||
chmod +x *
|
||||
tar zcf ../control.tar.gz --owner=0 --group=0 ./
|
||||
|
||||
@@ -18,7 +18,10 @@
|
||||
SMARTDNS_BIN=/opt/usr/sbin/smartdns
|
||||
SMARTDNS_CONF=/opt/etc/smartdns/smartdns.conf
|
||||
DNSMASQ_CONF="/etc/dnsmasq.conf /var/etc/dnsmasq.conf /etc/storage/dnsmasq/dnsmasq.conf"
|
||||
SMARTDNS_PID=/var/run/smartdns.pid
|
||||
SMARTDNS_PID=/run/smartdns.pid
|
||||
if [ ! -d "/run" ]; then
|
||||
SMARTDNS_PID=/var/run/smartdns.pid
|
||||
fi
|
||||
SMARTDNS_PORT=535
|
||||
SMARTDNS_OPT=/opt/etc/smartdns/smartdns-opt.conf
|
||||
# workmode
|
||||
|
||||
@@ -21,9 +21,9 @@ OBJS=smartdns.o fast_ping.o dns_client.o dns_server.o dns.o util.o tlog.o dns_co
|
||||
# cflags
|
||||
ifndef CFLAGS
|
||||
ifdef DEBUG
|
||||
CFLAGS = -g
|
||||
CFLAGS = -g -DDEBUG
|
||||
else
|
||||
CFLAGS = -O2 -g
|
||||
CFLAGS = -O2
|
||||
endif
|
||||
CFLAGS +=-Wall -Wstrict-prototypes -fno-omit-frame-pointer -Wstrict-aliasing -funwind-tables -Wmissing-prototypes -Wshadow -Wextra -Wno-unused-parameter -Wno-implicit-fallthrough
|
||||
endif
|
||||
|
||||
132
src/dns.c
132
src/dns.c
@@ -274,6 +274,10 @@ static int _dns_encode_domain(struct dns_context *context, const char *domain)
|
||||
total_len++;
|
||||
if (dict_offset >= 0) {
|
||||
int offset = 0xc000 | dict_offset;
|
||||
if (_dns_left_len(context) < 2) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
_dns_write_short(&ptr_num, offset);
|
||||
context->ptr++;
|
||||
ptr_num = NULL;
|
||||
@@ -295,6 +299,10 @@ static int _dns_encode_domain(struct dns_context *context, const char *domain)
|
||||
domain++;
|
||||
}
|
||||
|
||||
if (_dns_left_len(context) < 1) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
*ptr_num = num;
|
||||
|
||||
if (total_len > 1) {
|
||||
@@ -575,7 +583,7 @@ struct dns_rr_nested *dns_add_rr_nested_start(struct dns_rr_nested *rr_nested_bu
|
||||
return rr_nested_buffer;
|
||||
}
|
||||
|
||||
int dns_add_rr_nested_memcpy(struct dns_rr_nested *rr_nested, void *data, int data_len)
|
||||
int dns_add_rr_nested_memcpy(struct dns_rr_nested *rr_nested, const void *data, int data_len)
|
||||
{
|
||||
if (rr_nested == NULL || data == NULL || data_len <= 0) {
|
||||
return -1;
|
||||
@@ -603,6 +611,12 @@ int dns_add_rr_nested_end(struct dns_rr_nested *rr_nested, dns_type_t rtype)
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* NO SVC keys, reset ptr */
|
||||
if (len <= 14) {
|
||||
rr_nested->context.ptr = rr_nested->rr_start;
|
||||
return 0;
|
||||
}
|
||||
|
||||
_dns_write_short(&ptr, len - rr_nested->rr_head_len);
|
||||
|
||||
return _dns_rr_add_end(rr_nested->context.packet, rr_nested->type, rtype, len);
|
||||
@@ -849,7 +863,7 @@ int dns_get_A(struct dns_rrs *rrs, char *domain, int maxsize, int *ttl, unsigned
|
||||
return _dns_get_RAW(rrs, domain, maxsize, ttl, addr, &len);
|
||||
}
|
||||
|
||||
int dns_add_PTR(struct dns_packet *packet, dns_rr_type type, const char *domain, int ttl, char *cname)
|
||||
int dns_add_PTR(struct dns_packet *packet, dns_rr_type type, const char *domain, int ttl, const char *cname)
|
||||
{
|
||||
int rr_len = strnlen(cname, DNS_MAX_CNAME_LEN) + 1;
|
||||
return _dns_add_RAW(packet, type, DNS_T_PTR, domain, ttl, cname, rr_len);
|
||||
@@ -899,6 +913,11 @@ int dns_add_SOA(struct dns_packet *packet, dns_rr_type type, const char *domain,
|
||||
unsigned char data[sizeof(*soa)];
|
||||
unsigned char *ptr = data;
|
||||
int len = 0;
|
||||
|
||||
if (soa == NULL || domain == NULL || packet == NULL) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
safe_strncpy((char *)ptr, soa->mname, DNS_MAX_CNAME_LEN);
|
||||
ptr += strnlen(soa->mname, DNS_MAX_CNAME_LEN - 1) + 1;
|
||||
safe_strncpy((char *)ptr, soa->rname, DNS_MAX_CNAME_LEN);
|
||||
@@ -1076,7 +1095,12 @@ int dns_add_HTTPS_start(struct dns_rr_nested *svcparam_buffer, struct dns_packet
|
||||
return -1;
|
||||
}
|
||||
|
||||
int target_len = strnlen(target, DNS_MAX_CNAME_LEN) + 1;
|
||||
int target_len = 0;
|
||||
if (target == NULL) {
|
||||
target = "";
|
||||
}
|
||||
|
||||
target_len = strnlen(target, DNS_MAX_CNAME_LEN) + 1;
|
||||
if (_dns_left_len(&svcparam_buffer->context) < 2 + target_len) {
|
||||
return -1;
|
||||
}
|
||||
@@ -1117,6 +1141,22 @@ int dns_HTTPS_add_port(struct dns_rr_nested *svcparam, unsigned short port)
|
||||
return 0;
|
||||
}
|
||||
|
||||
int dns_HTTPS_add_alpn(struct dns_rr_nested *svcparam, const char *alpn, int alpn_len)
|
||||
{
|
||||
if (_dns_left_len(&svcparam->context) < 2 + 2 + alpn_len) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
unsigned short value = DNS_HTTPS_T_ALPN;
|
||||
dns_add_rr_nested_memcpy(svcparam, &value, 2);
|
||||
|
||||
value = alpn_len;
|
||||
dns_add_rr_nested_memcpy(svcparam, &value, 2);
|
||||
dns_add_rr_nested_memcpy(svcparam, alpn, alpn_len);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int dns_HTTPS_add_ech(struct dns_rr_nested *svcparam, void *ech, int ech_len)
|
||||
{
|
||||
if (_dns_left_len(&svcparam->context) < 2 + 2 + ech_len) {
|
||||
@@ -1133,7 +1173,7 @@ int dns_HTTPS_add_ech(struct dns_rr_nested *svcparam, void *ech, int ech_len)
|
||||
return 0;
|
||||
}
|
||||
|
||||
int dns_HTTPS_add_ipv4hint(struct dns_rr_nested *svcparam, unsigned char addr[][DNS_RR_A_LEN], int addr_num)
|
||||
int dns_HTTPS_add_ipv4hint(struct dns_rr_nested *svcparam, unsigned char *addr[], int addr_num)
|
||||
{
|
||||
if (_dns_left_len(&svcparam->context) < 4 + addr_num * DNS_RR_A_LEN) {
|
||||
return -1;
|
||||
@@ -1151,7 +1191,8 @@ int dns_HTTPS_add_ipv4hint(struct dns_rr_nested *svcparam, unsigned char addr[][
|
||||
|
||||
return 0;
|
||||
}
|
||||
int dns_HTTPS_add_ipv6hint(struct dns_rr_nested *svcparam, unsigned char addr[][DNS_RR_AAAA_LEN], int addr_num)
|
||||
|
||||
int dns_HTTPS_add_ipv6hint(struct dns_rr_nested *svcparam, unsigned char *addr[], int addr_num)
|
||||
{
|
||||
if (_dns_left_len(&svcparam->context) < 4 + addr_num * DNS_RR_AAAA_LEN) {
|
||||
return -1;
|
||||
@@ -1175,8 +1216,8 @@ int dns_add_HTTPS_end(struct dns_rr_nested *svcparam)
|
||||
return dns_add_rr_nested_end(svcparam, DNS_T_HTTPS);
|
||||
}
|
||||
|
||||
struct dns_https_param *dns_get_HTTPS_svcparm_start(struct dns_rrs *rrs, char *domain, int maxsize, int *ttl,
|
||||
int *priority, char *target, int target_size)
|
||||
int dns_get_HTTPS_svcparm_start(struct dns_rrs *rrs, struct dns_https_param **https_param, char *domain, int maxsize,
|
||||
int *ttl, int *priority, char *target, int target_size)
|
||||
{
|
||||
int qtype = 0;
|
||||
unsigned char *data = NULL;
|
||||
@@ -1184,32 +1225,39 @@ struct dns_https_param *dns_get_HTTPS_svcparm_start(struct dns_rrs *rrs, char *d
|
||||
|
||||
data = dns_get_rr_nested_start(rrs, domain, maxsize, &qtype, ttl, &rr_len);
|
||||
if (data == NULL) {
|
||||
return NULL;
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (qtype != DNS_T_HTTPS) {
|
||||
return NULL;
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (rr_len < 2) {
|
||||
return NULL;
|
||||
return -1;
|
||||
}
|
||||
|
||||
*priority = _dns_read_short(&data);
|
||||
rr_len -= 2;
|
||||
if (rr_len <= 0) {
|
||||
return NULL;
|
||||
return -1;
|
||||
}
|
||||
|
||||
int len = strnlen((char *)data, rr_len);
|
||||
safe_strncpy(target, (char *)data, target_size);
|
||||
data += len + 1;
|
||||
rr_len -= len + 1;
|
||||
if (rr_len <= 0) {
|
||||
return NULL;
|
||||
if (rr_len < 0) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
return (struct dns_https_param *)data;
|
||||
if (rr_len == 0) {
|
||||
*https_param = NULL;
|
||||
return 0;
|
||||
}
|
||||
|
||||
*https_param = (struct dns_https_param *)data;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
struct dns_https_param *dns_get_HTTPS_svcparm_next(struct dns_rrs *rrs, struct dns_https_param *param)
|
||||
@@ -1244,10 +1292,6 @@ int dns_get_domain(struct dns_rrs *rrs, char *domain, int maxsize, int *qtype, i
|
||||
{
|
||||
struct dns_context context;
|
||||
|
||||
if (rrs->type != DNS_T_CNAME) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
_dns_init_context_by_rrs(rrs, &context);
|
||||
return _dns_get_qr_head(&context, domain, maxsize, qtype, qclass);
|
||||
}
|
||||
@@ -1687,13 +1731,13 @@ static int _dns_decode_opt_cookie(struct dns_context *context, struct dns_opt_co
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (opt_len < (int)member_size(struct dns_opt_cookie, server_cookie)) {
|
||||
if (opt_len < 8 || opt_len > (int)member_size(struct dns_opt_cookie, server_cookie)) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
memcpy(cookie->server_cookie, context->ptr, len);
|
||||
cookie->server_cookie_len = len;
|
||||
context->ptr += len;
|
||||
memcpy(cookie->server_cookie, context->ptr, opt_len);
|
||||
cookie->server_cookie_len = opt_len;
|
||||
context->ptr += opt_len;
|
||||
|
||||
tlog(TLOG_DEBUG, "OPT COOKIE");
|
||||
return 0;
|
||||
@@ -1860,13 +1904,13 @@ static int _dns_decode_opt(struct dns_context *context, dns_rr_type type, unsign
|
||||
}
|
||||
|
||||
if (errcode != 0) {
|
||||
tlog(TLOG_ERROR, "extend rcode invalid.");
|
||||
return -1;
|
||||
tlog(TLOG_DEBUG, "extend rcode invalid, %d", errcode);
|
||||
return 0;
|
||||
}
|
||||
|
||||
while (context->ptr - start < rr_len) {
|
||||
if (_dns_left_len(context) < 4) {
|
||||
tlog(TLOG_WARN, "data length is invalid, %d:%d", _dns_left_len(context),
|
||||
tlog(TLOG_DEBUG, "data length is invalid, %d:%d", _dns_left_len(context),
|
||||
(int)(context->ptr - context->data));
|
||||
return -1;
|
||||
}
|
||||
@@ -1874,7 +1918,7 @@ static int _dns_decode_opt(struct dns_context *context, dns_rr_type type, unsign
|
||||
opt_len = _dns_read_short(&context->ptr);
|
||||
|
||||
if (_dns_left_len(context) < opt_len) {
|
||||
tlog(TLOG_ERROR, "read opt data failed, opt_code = %d, opt_len = %d", opt_code, opt_len);
|
||||
tlog(TLOG_DEBUG, "read opt data failed, opt_code = %d, opt_len = %d", opt_code, opt_len);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -1929,12 +1973,16 @@ static int _dns_encode_HTTPS(struct dns_context *context, struct dns_rrs *rrs)
|
||||
int priority = 0;
|
||||
struct dns_https_param *param = NULL;
|
||||
|
||||
param = dns_get_HTTPS_svcparm_start(rrs, domain, DNS_MAX_CNAME_LEN, &ttl, &priority, target, DNS_MAX_CNAME_LEN);
|
||||
if (param == NULL) {
|
||||
tlog(TLOG_ERROR, "get https param failed.");
|
||||
return -1;
|
||||
ret =
|
||||
dns_get_HTTPS_svcparm_start(rrs, ¶m, domain, DNS_MAX_CNAME_LEN, &ttl, &priority, target, DNS_MAX_CNAME_LEN);
|
||||
if (ret < 0) {
|
||||
tlog(TLOG_DEBUG, "get https param failed.");
|
||||
return 0;
|
||||
}
|
||||
|
||||
qtype = DNS_T_HTTPS;
|
||||
qclass = DNS_C_IN;
|
||||
|
||||
ret = _dns_encode_rr_head(context, domain, qtype, qclass, ttl, 0, &rr_len_ptr);
|
||||
if (ret < 0) {
|
||||
return -1;
|
||||
@@ -1958,6 +2006,10 @@ static int _dns_encode_HTTPS(struct dns_context *context, struct dns_rrs *rrs)
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (param->len + 4 > _dns_left_len(context)) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
_dns_write_short(&context->ptr, param->key);
|
||||
_dns_write_short(&context->ptr, param->len);
|
||||
switch (param->key) {
|
||||
@@ -1978,6 +2030,10 @@ static int _dns_encode_HTTPS(struct dns_context *context, struct dns_rrs *rrs)
|
||||
}
|
||||
}
|
||||
|
||||
if (_dns_left_len(context) < 2) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
_dns_write_short(&rr_len_ptr, context->ptr - rr_start);
|
||||
|
||||
return 0;
|
||||
@@ -2101,7 +2157,7 @@ static int _dns_decode_an(struct dns_context *context, dns_rr_type type)
|
||||
|
||||
ret = dns_add_A(packet, type, domain, ttl, addr);
|
||||
if (ret < 0) {
|
||||
tlog(TLOG_ERROR, "add A failed, %s", domain);
|
||||
tlog(TLOG_DEBUG, "add A failed, %s", domain);
|
||||
return -1;
|
||||
}
|
||||
} break;
|
||||
@@ -2116,7 +2172,7 @@ static int _dns_decode_an(struct dns_context *context, dns_rr_type type)
|
||||
|
||||
ret = dns_add_CNAME(packet, type, domain, ttl, cname);
|
||||
if (ret < 0) {
|
||||
tlog(TLOG_ERROR, "add CNAME failed, %s", domain);
|
||||
tlog(TLOG_DEBUG, "add CNAME failed, %s", domain);
|
||||
return -1;
|
||||
}
|
||||
} break;
|
||||
@@ -2130,7 +2186,7 @@ static int _dns_decode_an(struct dns_context *context, dns_rr_type type)
|
||||
|
||||
ret = dns_add_SOA(packet, type, domain, ttl, &soa);
|
||||
if (ret < 0) {
|
||||
tlog(TLOG_ERROR, "add SOA failed, %s", domain);
|
||||
tlog(TLOG_DEBUG, "add SOA failed, %s", domain);
|
||||
return -1;
|
||||
}
|
||||
} break;
|
||||
@@ -2144,7 +2200,7 @@ static int _dns_decode_an(struct dns_context *context, dns_rr_type type)
|
||||
|
||||
ret = dns_add_NS(packet, type, domain, ttl, ns);
|
||||
if (ret < 0) {
|
||||
tlog(TLOG_ERROR, "add NS failed, %s", domain);
|
||||
tlog(TLOG_DEBUG, "add NS failed, %s", domain);
|
||||
return -1;
|
||||
}
|
||||
} break;
|
||||
@@ -2158,7 +2214,7 @@ static int _dns_decode_an(struct dns_context *context, dns_rr_type type)
|
||||
|
||||
ret = dns_add_PTR(packet, type, domain, ttl, name);
|
||||
if (ret < 0) {
|
||||
tlog(TLOG_ERROR, "add PTR failed, %s", domain);
|
||||
tlog(TLOG_DEBUG, "add PTR failed, %s", domain);
|
||||
return -1;
|
||||
}
|
||||
} break;
|
||||
@@ -2172,7 +2228,7 @@ static int _dns_decode_an(struct dns_context *context, dns_rr_type type)
|
||||
|
||||
ret = dns_add_AAAA(packet, type, domain, ttl, addr);
|
||||
if (ret < 0) {
|
||||
tlog(TLOG_ERROR, "add AAAA failed, %s", domain);
|
||||
tlog(TLOG_DEBUG, "add AAAA failed, %s", domain);
|
||||
return -1;
|
||||
}
|
||||
} break;
|
||||
@@ -2219,7 +2275,7 @@ static int _dns_decode_an(struct dns_context *context, dns_rr_type type)
|
||||
|
||||
ret = _dns_add_RAW(packet, type, qtype, domain, ttl, raw_data, rr_len);
|
||||
if (ret < 0) {
|
||||
tlog(TLOG_ERROR, "add raw failed, %s", domain);
|
||||
tlog(TLOG_DEBUG, "add raw failed, %s", domain);
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -2229,7 +2285,7 @@ static int _dns_decode_an(struct dns_context *context, dns_rr_type type)
|
||||
}
|
||||
|
||||
if (context->ptr - start != rr_len) {
|
||||
tlog(TLOG_ERROR, "length mismatch, %s, %ld:%d", domain, (long)(context->ptr - start), rr_len);
|
||||
tlog(TLOG_DEBUG, "length mismatch, %s, %ld:%d", domain, (long)(context->ptr - start), rr_len);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
43
src/dns.h
43
src/dns.h
@@ -19,13 +19,19 @@
|
||||
#ifndef _DNS_HEAD_H
|
||||
#define _DNS_HEAD_H
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif /*__cplusplus */
|
||||
|
||||
#define DNS_RR_A_LEN 4
|
||||
#define DNS_RR_AAAA_LEN 16
|
||||
#define DNS_MAX_CNAME_LEN 256
|
||||
#define DNS_MAX_OPT_LEN 256
|
||||
#define DNS_IN_PACKSIZE (512 * 8)
|
||||
#define DNS_PACKSIZE (512 * 12)
|
||||
#define DNS_PACKSIZE (512 * 16)
|
||||
#define DNS_DEFAULT_PACKET_SIZE 512
|
||||
#define DNS_MAX_ALPN_LEN 32
|
||||
#define DNS_MAX_ECH_LEN 256
|
||||
|
||||
#define DNS_ADDR_FAMILY_IP 1
|
||||
#define DNS_ADDR_FAMILY_IPV6 2
|
||||
@@ -198,7 +204,7 @@ struct dns_opt_ecs {
|
||||
unsigned char addr[DNS_RR_AAAA_LEN];
|
||||
} __attribute__((packed));
|
||||
|
||||
/* OPT COOLIE */
|
||||
/* OPT COOKIE */
|
||||
struct dns_opt_cookie {
|
||||
char server_cookie_len;
|
||||
unsigned char client_cookie[8];
|
||||
@@ -232,7 +238,7 @@ struct dns_rrs *dns_get_rrs_start(struct dns_packet *packet, dns_rr_type type, i
|
||||
struct dns_rr_nested *dns_add_rr_nested_start(struct dns_rr_nested *rr_nested_buffer, struct dns_packet *packet,
|
||||
dns_rr_type type, dns_type_t rtype, const char *domain, int ttl);
|
||||
int dns_add_rr_nested_end(struct dns_rr_nested *rr_nested, dns_type_t rtype);
|
||||
int dns_add_rr_nested_memcpy(struct dns_rr_nested *rr_nested, void *data, int data_len);
|
||||
int dns_add_rr_nested_memcpy(struct dns_rr_nested *rr_nested, const void *data, int data_len);
|
||||
|
||||
void *dns_get_rr_nested_start(struct dns_rrs *rrs, char *domain, int maxsize, int *qtype, int *ttl, int *rr_len);
|
||||
void *dns_get_rr_nested_next(struct dns_rrs *rrs, void *rr_nested, int rr_nested_len);
|
||||
@@ -253,7 +259,7 @@ int dns_add_A(struct dns_packet *packet, dns_rr_type type, const char *domain, i
|
||||
unsigned char addr[DNS_RR_A_LEN]);
|
||||
int dns_get_A(struct dns_rrs *rrs, char *domain, int maxsize, int *ttl, unsigned char addr[DNS_RR_A_LEN]);
|
||||
|
||||
int dns_add_PTR(struct dns_packet *packet, dns_rr_type type, const char *domain, int ttl, char *cname);
|
||||
int dns_add_PTR(struct dns_packet *packet, dns_rr_type type, const char *domain, int ttl, const char *cname);
|
||||
int dns_get_PTR(struct dns_rrs *rrs, char *domain, int maxsize, int *ttl, char *cname, int cname_size);
|
||||
|
||||
int dns_add_AAAA(struct dns_packet *packet, dns_rr_type type, const char *domain, int ttl,
|
||||
@@ -276,22 +282,26 @@ int dns_add_OPT_TCP_KEEPALIVE(struct dns_packet *packet, unsigned short timeout)
|
||||
int dns_get_OPT_TCP_KEEPALIVE(struct dns_rrs *rrs, unsigned short *opt_code, unsigned short *opt_len,
|
||||
unsigned short *timeout);
|
||||
|
||||
int dns_add_HTTPS_start(struct dns_rr_nested *svcparam_buffer, struct dns_packet *packet,
|
||||
dns_rr_type type, const char *domain, int ttl, int priority,
|
||||
const char *target);
|
||||
/* the key must be added in orders, or dig will report FORMERR */
|
||||
int dns_add_HTTPS_start(struct dns_rr_nested *svcparam_buffer, struct dns_packet *packet, dns_rr_type type,
|
||||
const char *domain, int ttl, int priority, const char *target);
|
||||
int dns_HTTPS_add_raw(struct dns_rr_nested *svcparam, unsigned short key, unsigned char *value, unsigned short len);
|
||||
int dns_HTTPS_add_port(struct dns_rr_nested *svcparam, unsigned short port);
|
||||
int dns_HTTPS_add_alpn(struct dns_rr_nested *svcparam, const char *alpn);
|
||||
/* key 1, alph */
|
||||
int dns_HTTPS_add_alpn(struct dns_rr_nested *svcparam, const char *alpn, int alpn_len);
|
||||
/* key 2, no default alph */
|
||||
int dns_HTTPS_add_no_default_alpn(struct dns_rr_nested *svcparam);
|
||||
int dns_HTTPS_add_ipv4hint(struct dns_rr_nested *svcparam, unsigned char addr[][DNS_RR_A_LEN],
|
||||
int addr_num);
|
||||
int dns_HTTPS_add_ipv6hint(struct dns_rr_nested *svcparam, unsigned char addr[][DNS_RR_AAAA_LEN],
|
||||
int addr_num);
|
||||
/* key 3, port */
|
||||
int dns_HTTPS_add_port(struct dns_rr_nested *svcparam, unsigned short port);
|
||||
/* key 4, ipv4 */
|
||||
int dns_HTTPS_add_ipv4hint(struct dns_rr_nested *svcparam, unsigned char *addr[], int addr_num);
|
||||
/* key 5, ech */
|
||||
int dns_HTTPS_add_ech(struct dns_rr_nested *svcparam, void *ech, int ech_len);
|
||||
/* key 6, ipv6*/
|
||||
int dns_HTTPS_add_ipv6hint(struct dns_rr_nested *svcparam, unsigned char *addr[], int addr_num);
|
||||
int dns_add_HTTPS_end(struct dns_rr_nested *svcparam);
|
||||
|
||||
struct dns_https_param *dns_get_HTTPS_svcparm_start(struct dns_rrs *rrs, char *domain, int maxsize, int *ttl,
|
||||
int *priority, char *target, int target_size);
|
||||
int dns_get_HTTPS_svcparm_start(struct dns_rrs *rrs, struct dns_https_param **https_param, char *domain, int maxsize,
|
||||
int *ttl, int *priority, char *target, int target_size);
|
||||
struct dns_https_param *dns_get_HTTPS_svcparm_next(struct dns_rrs *rrs, struct dns_https_param *parm);
|
||||
|
||||
/*
|
||||
@@ -310,4 +320,7 @@ struct dns_update_param {
|
||||
|
||||
int dns_packet_update(unsigned char *data, int size, struct dns_update_param *param);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif /*__cplusplus */
|
||||
#endif
|
||||
|
||||
@@ -147,7 +147,7 @@ void dns_cache_data_free(struct dns_cache_data *data)
|
||||
free(data);
|
||||
}
|
||||
|
||||
struct dns_cache_data *dns_cache_new_data(void)
|
||||
struct dns_cache_data *dns_cache_new_data_addr(void)
|
||||
{
|
||||
struct dns_cache_addr *cache_addr = malloc(sizeof(struct dns_cache_addr));
|
||||
memset(cache_addr, 0, sizeof(struct dns_cache_addr));
|
||||
@@ -157,6 +157,7 @@ struct dns_cache_data *dns_cache_new_data(void)
|
||||
|
||||
cache_addr->head.cache_type = CACHE_TYPE_NONE;
|
||||
cache_addr->head.size = sizeof(struct dns_cache_addr) - sizeof(struct dns_cache_data_head);
|
||||
cache_addr->head.magic = MAGIC_CACHE_DATA;
|
||||
|
||||
return (struct dns_cache_data *)cache_addr;
|
||||
}
|
||||
@@ -241,6 +242,7 @@ struct dns_cache_data *dns_cache_new_data_packet(void *packet, size_t packet_len
|
||||
|
||||
cache_packet->head.cache_type = CACHE_TYPE_PACKET;
|
||||
cache_packet->head.size = packet_len;
|
||||
cache_packet->head.magic = MAGIC_CACHE_DATA;
|
||||
|
||||
return (struct dns_cache_data *)cache_packet;
|
||||
}
|
||||
@@ -274,6 +276,7 @@ static int _dns_cache_replace(struct dns_cache_key *cache_key, int ttl, int spee
|
||||
dns_cache->info.ttl = ttl;
|
||||
dns_cache->info.speed = speed;
|
||||
dns_cache->info.no_inactive = no_inactive;
|
||||
dns_cache->info.is_visited = 1;
|
||||
old_cache_data = dns_cache->cache_data;
|
||||
dns_cache->cache_data = cache_data;
|
||||
list_del_init(&dns_cache->list);
|
||||
@@ -294,12 +297,14 @@ static int _dns_cache_replace(struct dns_cache_key *cache_key, int ttl, int spee
|
||||
return 0;
|
||||
}
|
||||
|
||||
int dns_cache_replace(struct dns_cache_key *cache_key, int ttl, int speed, int no_inactive, struct dns_cache_data *cache_data)
|
||||
int dns_cache_replace(struct dns_cache_key *cache_key, int ttl, int speed, int no_inactive,
|
||||
struct dns_cache_data *cache_data)
|
||||
{
|
||||
return _dns_cache_replace(cache_key, ttl, speed, no_inactive, 0, cache_data);
|
||||
}
|
||||
|
||||
int dns_cache_replace_inactive(struct dns_cache_key *cache_key, int ttl, int speed, int no_inactive, struct dns_cache_data *cache_data)
|
||||
int dns_cache_replace_inactive(struct dns_cache_key *cache_key, int ttl, int speed, int no_inactive,
|
||||
struct dns_cache_data *cache_data)
|
||||
{
|
||||
return _dns_cache_replace(cache_key, ttl, speed, no_inactive, 1, cache_data);
|
||||
}
|
||||
@@ -391,7 +396,8 @@ errout:
|
||||
return -1;
|
||||
}
|
||||
|
||||
int dns_cache_insert(struct dns_cache_key *cache_key, int ttl, int speed, int no_inactive, struct dns_cache_data *cache_data)
|
||||
int dns_cache_insert(struct dns_cache_key *cache_key, int ttl, int speed, int no_inactive,
|
||||
struct dns_cache_data *cache_data)
|
||||
{
|
||||
struct dns_cache_info info;
|
||||
|
||||
@@ -418,6 +424,7 @@ int dns_cache_insert(struct dns_cache_key *cache_key, int ttl, int speed, int no
|
||||
info.hitnum_update_add = DNS_CACHE_HITNUM_STEP;
|
||||
info.speed = speed;
|
||||
info.no_inactive = no_inactive;
|
||||
info.is_visited = 1;
|
||||
time(&info.insert_time);
|
||||
time(&info.replace_time);
|
||||
|
||||
@@ -541,6 +548,11 @@ struct dns_cache_data *dns_cache_get_data(struct dns_cache *dns_cache)
|
||||
return dns_cache->cache_data;
|
||||
}
|
||||
|
||||
int dns_cache_is_visited(struct dns_cache *dns_cache)
|
||||
{
|
||||
return dns_cache->info.is_visited;
|
||||
}
|
||||
|
||||
void dns_cache_delete(struct dns_cache *dns_cache)
|
||||
{
|
||||
pthread_mutex_lock(&dns_cache_head.lock);
|
||||
@@ -574,6 +586,7 @@ void dns_cache_update(struct dns_cache *dns_cache)
|
||||
if (dns_cache->info.hitnum_update_add < DNS_CACHE_HITNUM_STEP_MAX) {
|
||||
dns_cache->info.hitnum_update_add++;
|
||||
}
|
||||
dns_cache->info.is_visited = 1;
|
||||
}
|
||||
pthread_mutex_unlock(&dns_cache_head.lock);
|
||||
}
|
||||
@@ -707,15 +720,18 @@ static int _dns_cache_read_record(int fd, uint32_t cache_number)
|
||||
goto errout;
|
||||
}
|
||||
|
||||
if (cache_record.magic != MAGIC_CACHE_DATA) {
|
||||
if (cache_record.magic != MAGIC_RECORD) {
|
||||
tlog(TLOG_ERROR, "magic is invalid.");
|
||||
goto errout;
|
||||
}
|
||||
|
||||
if (cache_record.type == CACHE_RECORD_TYPE_ACTIVE) {
|
||||
head = &dns_cache_head.cache_list;
|
||||
} else {
|
||||
} else if (cache_record.type == CACHE_RECORD_TYPE_INACTIVE) {
|
||||
head = &dns_cache_head.inactive_list;
|
||||
} else {
|
||||
tlog(TLOG_ERROR, "read cache record type is invalid.");
|
||||
goto errout;
|
||||
}
|
||||
|
||||
ret = read(fd, &data_head, sizeof(data_head));
|
||||
@@ -724,6 +740,11 @@ static int _dns_cache_read_record(int fd, uint32_t cache_number)
|
||||
goto errout;
|
||||
}
|
||||
|
||||
if (data_head.magic != MAGIC_CACHE_DATA) {
|
||||
tlog(TLOG_ERROR, "data magic is invalid.");
|
||||
goto errout;
|
||||
}
|
||||
|
||||
if (data_head.size > 1024 * 8) {
|
||||
tlog(TLOG_ERROR, "data may invalid, skip load cache.");
|
||||
goto errout;
|
||||
@@ -742,6 +763,15 @@ static int _dns_cache_read_record(int fd, uint32_t cache_number)
|
||||
goto errout;
|
||||
}
|
||||
|
||||
/* set cache unvisited, so that when refreshing ipset/nftset, reload ipset list by restarting smartdns */
|
||||
cache_record.info.is_visited = 0;
|
||||
cache_record.info.domain[DNS_MAX_CNAME_LEN - 1] = '\0';
|
||||
cache_record.info.dns_group_name[DNS_GROUP_NAME_LEN - 1] = '\0';
|
||||
if (cache_record.type >= CACHE_RECORD_TYPE_END) {
|
||||
tlog(TLOG_ERROR, "read cache record type is invalid.");
|
||||
goto errout;
|
||||
}
|
||||
|
||||
if (_dns_cache_insert(&cache_record.info, cache_data, head) != 0) {
|
||||
tlog(TLOG_ERROR, "insert cache data failed.");
|
||||
cache_data = NULL;
|
||||
@@ -786,7 +816,7 @@ int dns_cache_load(const char *file)
|
||||
goto errout;
|
||||
}
|
||||
|
||||
if (strncmp(cache_file.version, __TIMESTAMP__, DNS_CACHE_VERSION_LEN - 1) != 0) {
|
||||
if (strncmp(cache_file.version, dns_cache_file_version(), DNS_CACHE_VERSION_LEN) != 0) {
|
||||
tlog(TLOG_WARN, "cache version is different, skip load cache.");
|
||||
goto errout;
|
||||
}
|
||||
@@ -815,7 +845,7 @@ static int _dns_cache_write_record(int fd, uint32_t *cache_number, enum CACHE_RE
|
||||
pthread_mutex_lock(&dns_cache_head.lock);
|
||||
list_for_each_entry_safe_reverse(dns_cache, tmp, head, list)
|
||||
{
|
||||
cache_record.magic = MAGIC_CACHE_DATA;
|
||||
cache_record.magic = MAGIC_RECORD;
|
||||
cache_record.type = type;
|
||||
memcpy(&cache_record.info, &dns_cache->info, sizeof(struct dns_cache_info));
|
||||
ssize_t ret = write(fd, &cache_record, sizeof(cache_record));
|
||||
@@ -856,12 +886,20 @@ static int _dns_cache_write_records(int fd, uint32_t *cache_number)
|
||||
return 0;
|
||||
}
|
||||
|
||||
int dns_cache_save(const char *file)
|
||||
int dns_cache_save(const char *file, int check_lock)
|
||||
{
|
||||
int fd = -1;
|
||||
uint32_t cache_number = 0;
|
||||
tlog(TLOG_DEBUG, "write cache file %s", file);
|
||||
|
||||
/* check lock */
|
||||
if (check_lock == 1) {
|
||||
if (pthread_mutex_trylock(&dns_cache_head.lock) != 0) {
|
||||
return -1;
|
||||
}
|
||||
pthread_mutex_unlock(&dns_cache_head.lock);
|
||||
}
|
||||
|
||||
fd = open(file, O_TRUNC | O_CREAT | O_WRONLY, 0640);
|
||||
if (fd < 0) {
|
||||
tlog(TLOG_ERROR, "create file %s failed, %s", file, strerror(errno));
|
||||
@@ -871,7 +909,7 @@ int dns_cache_save(const char *file)
|
||||
struct dns_cache_file cache_file;
|
||||
memset(&cache_file, 0, sizeof(cache_file));
|
||||
cache_file.magic = MAGIC_NUMBER;
|
||||
safe_strncpy(cache_file.version, __TIMESTAMP__, DNS_CACHE_VERSION_LEN);
|
||||
safe_strncpy(cache_file.version, dns_cache_file_version(), DNS_CACHE_VERSION_LEN);
|
||||
cache_file.cache_number = 0;
|
||||
|
||||
if (lseek(fd, sizeof(cache_file), SEEK_SET) < 0) {
|
||||
@@ -926,3 +964,9 @@ void dns_cache_destroy(void)
|
||||
|
||||
pthread_mutex_destroy(&dns_cache_head.lock);
|
||||
}
|
||||
|
||||
const char *dns_cache_file_version(void)
|
||||
{
|
||||
const char *version = "cache ver 1.0";
|
||||
return version;
|
||||
}
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <time.h>
|
||||
|
||||
#ifdef __cpluscplus
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
@@ -36,7 +36,8 @@ extern "C" {
|
||||
#define DNS_CACHE_VERSION_LEN 32
|
||||
#define DNS_CACHE_GROUP_NAME_LEN 32
|
||||
#define MAGIC_NUMBER 0x6548634163536e44
|
||||
#define MAGIC_CACHE_DATA 0x44615461
|
||||
#define MAGIC_CACHE_DATA 0x61546144
|
||||
#define MAGIC_RECORD 0x64526352
|
||||
|
||||
enum CACHE_TYPE {
|
||||
CACHE_TYPE_NONE,
|
||||
@@ -47,12 +48,14 @@ enum CACHE_TYPE {
|
||||
enum CACHE_RECORD_TYPE {
|
||||
CACHE_RECORD_TYPE_ACTIVE,
|
||||
CACHE_RECORD_TYPE_INACTIVE,
|
||||
CACHE_RECORD_TYPE_END,
|
||||
};
|
||||
|
||||
struct dns_cache_data_head {
|
||||
enum CACHE_TYPE cache_type;
|
||||
int is_soa;
|
||||
ssize_t size;
|
||||
uint32_t magic;
|
||||
};
|
||||
|
||||
struct dns_cache_data {
|
||||
@@ -89,6 +92,7 @@ struct dns_cache_info {
|
||||
int speed;
|
||||
int no_inactive;
|
||||
int hitnum_update_add;
|
||||
int is_visited;
|
||||
time_t insert_time;
|
||||
time_t replace_time;
|
||||
};
|
||||
@@ -136,9 +140,11 @@ struct dns_cache_data *dns_cache_new_data_packet(void *packet, size_t packet_len
|
||||
|
||||
int dns_cache_init(int size, int enable_inactive, int inactive_list_expired);
|
||||
|
||||
int dns_cache_replace(struct dns_cache_key *key, int ttl, int speed, int no_inactive, struct dns_cache_data *cache_data);
|
||||
int dns_cache_replace(struct dns_cache_key *key, int ttl, int speed, int no_inactive,
|
||||
struct dns_cache_data *cache_data);
|
||||
|
||||
int dns_cache_replace_inactive(struct dns_cache_key *key, int ttl, int speed, int no_inactive, struct dns_cache_data *cache_data);
|
||||
int dns_cache_replace_inactive(struct dns_cache_key *key, int ttl, int speed, int no_inactive,
|
||||
struct dns_cache_data *cache_data);
|
||||
|
||||
int dns_cache_insert(struct dns_cache_key *key, int ttl, int speed, int no_inactive, struct dns_cache_data *cache_data);
|
||||
|
||||
@@ -152,6 +158,8 @@ void dns_cache_release(struct dns_cache *dns_cache);
|
||||
|
||||
int dns_cache_hitnum_dec_get(struct dns_cache *dns_cache);
|
||||
|
||||
int dns_cache_is_visited(struct dns_cache *dns_cache);
|
||||
|
||||
void dns_cache_update(struct dns_cache *dns_cache);
|
||||
|
||||
typedef void dns_cache_callback(struct dns_cache *dns_cache);
|
||||
@@ -165,7 +173,7 @@ int dns_cache_get_cname_ttl(struct dns_cache *dns_cache);
|
||||
|
||||
int dns_cache_is_soa(struct dns_cache *dns_cache);
|
||||
|
||||
struct dns_cache_data *dns_cache_new_data(void);
|
||||
struct dns_cache_data *dns_cache_new_data_addr(void);
|
||||
|
||||
struct dns_cache_data *dns_cache_get_data(struct dns_cache *dns_cache);
|
||||
|
||||
@@ -178,9 +186,11 @@ void dns_cache_destroy(void);
|
||||
|
||||
int dns_cache_load(const char *file);
|
||||
|
||||
int dns_cache_save(const char *file);
|
||||
int dns_cache_save(const char *file, int check_lock);
|
||||
|
||||
#ifdef __cpluscplus
|
||||
const char *dns_cache_file_version(void);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
#endif // !_SMARTDNS_CACHE_H
|
||||
|
||||
431
src/dns_client.c
431
src/dns_client.c
@@ -43,6 +43,7 @@
|
||||
#include <openssl/err.h>
|
||||
#include <openssl/rand.h>
|
||||
#include <openssl/ssl.h>
|
||||
#include <openssl/x509v3.h>
|
||||
#include <pthread.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
@@ -55,7 +56,7 @@
|
||||
#include <unistd.h>
|
||||
|
||||
#define DNS_MAX_HOSTNAME 256
|
||||
#define DNS_MAX_EVENTS 64
|
||||
#define DNS_MAX_EVENTS 256
|
||||
#define DNS_HOSTNAME_LEN 128
|
||||
#define DNS_TCP_BUFFER (32 * 1024)
|
||||
#define DNS_TCP_IDLE_TIMEOUT (60 * 10)
|
||||
@@ -122,6 +123,7 @@ struct dns_server_info {
|
||||
time_t last_recv;
|
||||
unsigned long send_tick;
|
||||
int prohibit;
|
||||
int is_already_prohibit;
|
||||
|
||||
/* server addr info */
|
||||
unsigned short ai_family;
|
||||
@@ -134,6 +136,10 @@ struct dns_server_info {
|
||||
};
|
||||
|
||||
struct client_dns_server_flags flags;
|
||||
|
||||
/* ECS */
|
||||
struct dns_client_ecs ecs_ipv4;
|
||||
struct dns_client_ecs ecs_ipv6;
|
||||
};
|
||||
|
||||
struct dns_server_pending_group {
|
||||
@@ -199,6 +205,7 @@ struct dns_client {
|
||||
struct list_head dns_request_list;
|
||||
atomic_t run_period;
|
||||
atomic_t dns_server_num;
|
||||
atomic_t dns_server_prohibit_num;
|
||||
|
||||
/* ECS */
|
||||
struct dns_client_ecs ecs_ipv4;
|
||||
@@ -268,6 +275,8 @@ static int dns_client_has_bootstrap_dns = 0;
|
||||
static int _dns_client_send_udp(struct dns_server_info *server_info, void *packet, int len);
|
||||
static void _dns_client_clear_wakeup_event(void);
|
||||
static void _dns_client_do_wakeup_event(void);
|
||||
static int _dns_client_setup_ecs(char *ip, int subnet, struct dns_client_ecs *ecs_ipv4,
|
||||
struct dns_client_ecs *ecs_ipv6);
|
||||
|
||||
static ssize_t _ssl_read(struct dns_server_info *server, void *buff, int num)
|
||||
{
|
||||
@@ -447,7 +456,8 @@ errout:
|
||||
}
|
||||
|
||||
/* check whether server exists */
|
||||
static int _dns_client_server_exist(const char *server_ip, int port, dns_server_type_t server_type, struct client_dns_server_flags *flags)
|
||||
static int _dns_client_server_exist(const char *server_ip, int port, dns_server_type_t server_type,
|
||||
struct client_dns_server_flags *flags)
|
||||
{
|
||||
struct dns_server_info *server_info = NULL;
|
||||
struct dns_server_info *tmp = NULL;
|
||||
@@ -458,7 +468,7 @@ static int _dns_client_server_exist(const char *server_ip, int port, dns_server_
|
||||
continue;
|
||||
}
|
||||
|
||||
if (memcmp(&server_info->flags, flags, sizeof(*flags)) == 0) {
|
||||
if (memcmp(&server_info->flags, flags, sizeof(*flags)) != 0) {
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -489,7 +499,8 @@ static void _dns_client_server_update_ttl(struct ping_host_struct *ping_host, co
|
||||
}
|
||||
|
||||
/* get server control block by ip and port, type */
|
||||
static struct dns_server_info *_dns_client_get_server(char *server_ip, int port, dns_server_type_t server_type)
|
||||
static struct dns_server_info *_dns_client_get_server(char *server_ip, int port, dns_server_type_t server_type,
|
||||
struct client_dns_server_flags *flags)
|
||||
{
|
||||
struct dns_server_info *server_info = NULL;
|
||||
struct dns_server_info *tmp = NULL;
|
||||
@@ -510,6 +521,10 @@ static struct dns_server_info *_dns_client_get_server(char *server_ip, int port,
|
||||
continue;
|
||||
}
|
||||
|
||||
if (memcmp(&server_info->flags, flags, sizeof(*flags)) != 0) {
|
||||
continue;
|
||||
}
|
||||
|
||||
pthread_mutex_unlock(&client.server_list_lock);
|
||||
server_info_return = server_info;
|
||||
break;
|
||||
@@ -551,13 +566,9 @@ static struct dns_server_group *_dns_client_get_dnsserver_group(const char *grou
|
||||
|
||||
if (group == NULL) {
|
||||
group = client.default_group;
|
||||
tlog(TLOG_DEBUG, "send query to group %s", DNS_SERVER_GROUP_DEFAULT);
|
||||
} else {
|
||||
if (list_empty(&group->head)) {
|
||||
group = client.default_group;
|
||||
tlog(TLOG_DEBUG, "send query to group %s", DNS_SERVER_GROUP_DEFAULT);
|
||||
} else {
|
||||
tlog(TLOG_DEBUG, "send query to group %s", group_name);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -596,7 +607,7 @@ errout:
|
||||
}
|
||||
|
||||
static int _dns_client_add_to_pending_group(const char *group_name, char *server_ip, int port,
|
||||
dns_server_type_t server_type)
|
||||
dns_server_type_t server_type, struct client_dns_server_flags *flags)
|
||||
{
|
||||
struct dns_server_pending *item = NULL;
|
||||
struct dns_server_pending *tmp = NULL;
|
||||
@@ -610,6 +621,10 @@ static int _dns_client_add_to_pending_group(const char *group_name, char *server
|
||||
pthread_mutex_lock(&pending_server_mutex);
|
||||
list_for_each_entry_safe(item, tmp, &pending_servers, list)
|
||||
{
|
||||
if (memcmp(&item->flags, flags, sizeof(*flags)) != 0) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (strncmp(item->host, server_ip, DNS_HOSTNAME_LEN) == 0 && item->port == port && item->type == server_type) {
|
||||
pending = item;
|
||||
break;
|
||||
@@ -644,7 +659,8 @@ errout:
|
||||
|
||||
/* add server to group */
|
||||
static int _dns_client_add_to_group_pending(const char *group_name, char *server_ip, int port,
|
||||
dns_server_type_t server_type, int is_pending)
|
||||
dns_server_type_t server_type, struct client_dns_server_flags *flags,
|
||||
int is_pending)
|
||||
{
|
||||
struct dns_server_info *server_info = NULL;
|
||||
|
||||
@@ -652,21 +668,22 @@ static int _dns_client_add_to_group_pending(const char *group_name, char *server
|
||||
return -1;
|
||||
}
|
||||
|
||||
server_info = _dns_client_get_server(server_ip, port, server_type);
|
||||
server_info = _dns_client_get_server(server_ip, port, server_type, flags);
|
||||
if (server_info == NULL) {
|
||||
if (is_pending == 0) {
|
||||
tlog(TLOG_ERROR, "add server %s:%d to group %s failed", server_ip, port, group_name);
|
||||
return -1;
|
||||
}
|
||||
return _dns_client_add_to_pending_group(group_name, server_ip, port, server_type);
|
||||
return _dns_client_add_to_pending_group(group_name, server_ip, port, server_type, flags);
|
||||
}
|
||||
|
||||
return _dns_client_add_to_group(group_name, server_info);
|
||||
}
|
||||
|
||||
int dns_client_add_to_group(const char *group_name, char *server_ip, int port, dns_server_type_t server_type)
|
||||
int dns_client_add_to_group(const char *group_name, char *server_ip, int port, dns_server_type_t server_type,
|
||||
struct client_dns_server_flags *flags)
|
||||
{
|
||||
return _dns_client_add_to_group_pending(group_name, server_ip, port, server_type, 1);
|
||||
return _dns_client_add_to_group_pending(group_name, server_ip, port, server_type, flags, 1);
|
||||
}
|
||||
|
||||
/* free group member */
|
||||
@@ -709,12 +726,13 @@ static int _dns_client_remove_server_from_groups(struct dns_server_info *server_
|
||||
return 0;
|
||||
}
|
||||
|
||||
int dns_client_remove_from_group(const char *group_name, char *server_ip, int port, dns_server_type_t server_type)
|
||||
int dns_client_remove_from_group(const char *group_name, char *server_ip, int port, dns_server_type_t server_type,
|
||||
struct client_dns_server_flags *flags)
|
||||
{
|
||||
struct dns_server_info *server_info = NULL;
|
||||
struct dns_server_group *group = NULL;
|
||||
|
||||
server_info = _dns_client_get_server(server_ip, port, server_type);
|
||||
server_info = _dns_client_get_server(server_ip, port, server_type, flags);
|
||||
if (server_info == NULL) {
|
||||
return -1;
|
||||
}
|
||||
@@ -976,6 +994,25 @@ errout:
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static int _dns_client_server_add_ecs(struct dns_server_info *server_info, struct client_dns_server_flags *flags)
|
||||
{
|
||||
int ret = 0;
|
||||
|
||||
if (flags == NULL) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (flags->ipv4_ecs.enable) {
|
||||
ret = _dns_client_setup_ecs(flags->ipv4_ecs.ip, flags->ipv4_ecs.subnet, &server_info->ecs_ipv4, NULL);
|
||||
}
|
||||
|
||||
if (flags->ipv6_ecs.enable) {
|
||||
ret |= _dns_client_setup_ecs(flags->ipv6_ecs.ip, flags->ipv6_ecs.subnet, NULL, &server_info->ecs_ipv6);
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
/* add dns server information */
|
||||
static int _dns_client_server_add(char *server_ip, char *server_host, int port, dns_server_type_t server_type,
|
||||
struct client_dns_server_flags *flags)
|
||||
@@ -1071,10 +1108,15 @@ static int _dns_client_server_add(char *server_ip, char *server_host, int port,
|
||||
pthread_mutex_init(&server_info->lock, NULL);
|
||||
memcpy(&server_info->flags, flags, sizeof(server_info->flags));
|
||||
|
||||
if (_dns_client_server_add_ecs(server_info, flags) != 0) {
|
||||
tlog(TLOG_ERROR, "add %s ecs failed.", server_ip);
|
||||
goto errout;
|
||||
}
|
||||
|
||||
/* exclude this server from default group */
|
||||
if ((server_info->flags.server_flag & SERVER_FLAG_EXCLUDE_DEFAULT) == 0) {
|
||||
if (_dns_client_add_to_group(DNS_SERVER_GROUP_DEFAULT, server_info) != 0) {
|
||||
tlog(TLOG_ERROR, "add server to default group failed.");
|
||||
tlog(TLOG_ERROR, "add server %s to default group failed.", server_ip);
|
||||
goto errout;
|
||||
}
|
||||
}
|
||||
@@ -1403,6 +1445,11 @@ int dns_server_num(void)
|
||||
return atomic_read(&client.dns_server_num);
|
||||
}
|
||||
|
||||
int dns_server_alive_num(void)
|
||||
{
|
||||
return atomic_read(&client.dns_server_num) - atomic_read(&client.dns_server_prohibit_num);
|
||||
}
|
||||
|
||||
static void _dns_client_query_get(struct dns_query_struct *query)
|
||||
{
|
||||
if (atomic_inc_return(&query->refcnt) <= 0) {
|
||||
@@ -1609,9 +1656,10 @@ static int _dns_client_recv(struct dns_server_info *server_info, unsigned char *
|
||||
{
|
||||
int len = 0;
|
||||
int i = 0;
|
||||
int j = 0;
|
||||
int qtype = 0;
|
||||
int qclass = 0;
|
||||
char domain[DNS_MAX_CNAME_LEN];
|
||||
char domain[DNS_MAX_CNAME_LEN] = {0};
|
||||
int rr_count = 0;
|
||||
struct dns_rrs *rrs = NULL;
|
||||
unsigned char packet_buff[DNS_PACKSIZE];
|
||||
@@ -1649,10 +1697,13 @@ static int _dns_client_recv(struct dns_server_info *server_info, unsigned char *
|
||||
dns_get_OPT_payload_size(packet));
|
||||
|
||||
/* get question */
|
||||
rrs = dns_get_rrs_start(packet, DNS_RRS_QD, &rr_count);
|
||||
for (i = 0; i < rr_count && rrs; i++, rrs = dns_get_rrs_next(packet, rrs)) {
|
||||
dns_get_domain(rrs, domain, DNS_MAX_CNAME_LEN, &qtype, &qclass);
|
||||
tlog(TLOG_DEBUG, "domain: %s qtype: %d qclass: %d\n", domain, qtype, qclass);
|
||||
for (j = 0; j < DNS_RRS_END && domain[0] == '\0'; j++) {
|
||||
rrs = dns_get_rrs_start(packet, (dns_rr_type)j, &rr_count);
|
||||
for (i = 0; i < rr_count && rrs; i++, rrs = dns_get_rrs_next(packet, rrs)) {
|
||||
dns_get_domain(rrs, domain, DNS_MAX_CNAME_LEN, &qtype, &qclass);
|
||||
tlog(TLOG_DEBUG, "domain: %s qtype: %d qclass: %d\n", domain, qtype, qclass);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (dns_get_OPT_payload_size(packet) > 0) {
|
||||
@@ -1792,8 +1843,9 @@ static int _dns_client_create_socket_udp(struct dns_server_info *server_info)
|
||||
server_info->status = DNS_SERVER_STATUS_CONNECTIONLESS;
|
||||
|
||||
if (connect(fd, &server_info->addr, server_info->ai_addrlen) != 0) {
|
||||
if (errno == ENETUNREACH || errno == EHOSTUNREACH || errno == ECONNREFUSED) {
|
||||
tlog(TLOG_WARN, "connect %s failed, %s", server_info->ip, strerror(errno));
|
||||
if (errno == ENETUNREACH || errno == EHOSTUNREACH || errno == ECONNREFUSED || errno == EPERM ||
|
||||
errno == EACCES) {
|
||||
tlog(TLOG_INFO, "connect %s failed, %s", server_info->ip, strerror(errno));
|
||||
goto errout;
|
||||
}
|
||||
|
||||
@@ -2186,6 +2238,11 @@ static int _dns_client_process_udp_proxy(struct dns_server_info *server_info, st
|
||||
return ret;
|
||||
}
|
||||
|
||||
int latency = get_tick_count() - server_info->send_tick;
|
||||
if (latency < server_info->drop_packet_latency_ms) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
tlog(TLOG_DEBUG, "recv udp packet from %s, len: %d",
|
||||
get_host_by_addr(from_host, sizeof(from_host), (struct sockaddr *)&from), len);
|
||||
|
||||
@@ -2240,7 +2297,7 @@ static int _dns_client_process_udp(struct dns_server_info *server_info, struct e
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (errno == ECONNREFUSED) {
|
||||
if (errno == ECONNREFUSED || errno == ENETUNREACH || errno == EHOSTUNREACH) {
|
||||
tlog(TLOG_DEBUG, "recvfrom %s failed, %s\n", server_info->ip, strerror(errno));
|
||||
goto errout;
|
||||
}
|
||||
@@ -2723,6 +2780,61 @@ errout:
|
||||
return -1;
|
||||
}
|
||||
|
||||
static int _dns_client_verify_common_name(struct dns_server_info *server_info, X509 *cert, char *peer_CN)
|
||||
{
|
||||
char *tls_host_verify = NULL;
|
||||
GENERAL_NAMES *alt_names = NULL;
|
||||
int i = 0;
|
||||
|
||||
/* check tls host */
|
||||
tls_host_verify = _dns_client_server_get_tls_host_verify(server_info);
|
||||
if (tls_host_verify == NULL) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (tls_host_verify) {
|
||||
if (_dns_client_tls_matchName(tls_host_verify, peer_CN, strnlen(peer_CN, DNS_MAX_CNAME_LEN)) == 0) {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
alt_names = X509_get_ext_d2i(cert, NID_subject_alt_name, NULL, NULL);
|
||||
if (alt_names == NULL) {
|
||||
goto errout;
|
||||
}
|
||||
|
||||
/* found subject alt name */
|
||||
for (i = 0; i < sk_GENERAL_NAME_num(alt_names); i++) {
|
||||
GENERAL_NAME *name = sk_GENERAL_NAME_value(alt_names, i);
|
||||
if (name == NULL) {
|
||||
continue;
|
||||
}
|
||||
switch (name->type) {
|
||||
case GEN_DNS: {
|
||||
ASN1_IA5STRING *dns = name->d.dNSName;
|
||||
if (dns == NULL) {
|
||||
continue;
|
||||
}
|
||||
|
||||
tlog(TLOG_DEBUG, "peer SAN: %s", dns->data);
|
||||
if (_dns_client_tls_matchName(tls_host_verify, (char *)dns->data, dns->length) == 0) {
|
||||
tlog(TLOG_INFO, "peer SAN match: %s", dns->data);
|
||||
return 0;
|
||||
}
|
||||
} break;
|
||||
case GEN_IPADD:
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
errout:
|
||||
tlog(TLOG_WARN, "server %s CN is invalid, peer CN: %s, expect CN: %s", server_info->ip, peer_CN, tls_host_verify);
|
||||
server_info->prohibit = 1;
|
||||
return -1;
|
||||
}
|
||||
|
||||
static int _dns_client_tls_verify(struct dns_server_info *server_info)
|
||||
{
|
||||
X509 *cert = NULL;
|
||||
@@ -2736,7 +2848,7 @@ static int _dns_client_tls_verify(struct dns_server_info *server_info)
|
||||
unsigned char *key_sha256 = NULL;
|
||||
char *spki = NULL;
|
||||
int spki_len = 0;
|
||||
char *tls_host_verify = NULL;
|
||||
|
||||
if (server_info->ssl == NULL) {
|
||||
return -1;
|
||||
}
|
||||
@@ -2755,7 +2867,8 @@ static int _dns_client_tls_verify(struct dns_server_info *server_info)
|
||||
pthread_mutex_unlock(&server_info->lock);
|
||||
peer_CN[0] = '\0';
|
||||
_dns_client_tls_get_cert_CN(cert, peer_CN, sizeof(peer_CN));
|
||||
tlog(TLOG_WARN, "peer server %s certificate verify failed, ret = %ld", server_info->ip, res);
|
||||
tlog(TLOG_WARN, "peer server %s certificate verify failed, %s", server_info->ip,
|
||||
X509_verify_cert_error_string(res));
|
||||
tlog(TLOG_WARN, "peer CN: %s", peer_CN);
|
||||
goto errout;
|
||||
}
|
||||
@@ -2768,14 +2881,9 @@ static int _dns_client_tls_verify(struct dns_server_info *server_info)
|
||||
}
|
||||
|
||||
tlog(TLOG_DEBUG, "peer CN: %s", peer_CN);
|
||||
/* check tls host */
|
||||
tls_host_verify = _dns_client_server_get_tls_host_verify(server_info);
|
||||
if (tls_host_verify) {
|
||||
if (_dns_client_tls_matchName(tls_host_verify, peer_CN, strnlen(peer_CN, DNS_MAX_CNAME_LEN)) != 0) {
|
||||
tlog(TLOG_INFO, "server %s CN is invalid, peer CN: %s, expect CN: %s", server_info->ip, peer_CN,
|
||||
tls_host_verify);
|
||||
goto errout;
|
||||
}
|
||||
|
||||
if (_dns_client_verify_common_name(server_info, cert, peer_CN) != 0) {
|
||||
goto errout;
|
||||
}
|
||||
|
||||
pubkey = X509_get_X509_PUBKEY(cert);
|
||||
@@ -3254,6 +3362,80 @@ static int _dns_client_send_https(struct dns_server_info *server_info, void *pac
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int _dns_client_setup_server_packet(struct dns_server_info *server_info, struct dns_query_struct *query,
|
||||
void *default_packet, int default_packet_len,
|
||||
unsigned char *packet_data_buffer, void **packet_data, int *packet_data_len)
|
||||
{
|
||||
unsigned char packet_buff[DNS_PACKSIZE];
|
||||
struct dns_packet *packet = (struct dns_packet *)packet_buff;
|
||||
struct dns_head head;
|
||||
int encode_len = 0;
|
||||
|
||||
*packet_data = default_packet;
|
||||
*packet_data_len = default_packet_len;
|
||||
|
||||
if (query->qtype != DNS_T_AAAA && query->qtype != DNS_T_A) {
|
||||
/* no need to encode packet */
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (server_info->ecs_ipv4.enable == false && query->qtype == DNS_T_A) {
|
||||
/* no need to encode packet */
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (server_info->ecs_ipv6.enable == false && query->qtype == DNS_T_AAAA) {
|
||||
/* no need to encode packet */
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* init dns packet head */
|
||||
memset(&head, 0, sizeof(head));
|
||||
head.id = query->sid;
|
||||
head.qr = DNS_QR_QUERY;
|
||||
head.opcode = DNS_OP_QUERY;
|
||||
head.aa = 0;
|
||||
head.rd = 1;
|
||||
head.ra = 0;
|
||||
head.rcode = 0;
|
||||
|
||||
if (dns_packet_init(packet, DNS_PACKSIZE, &head) != 0) {
|
||||
tlog(TLOG_ERROR, "init packet failed.");
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* add question */
|
||||
if (dns_add_domain(packet, query->domain, query->qtype, DNS_C_IN) != 0) {
|
||||
tlog(TLOG_ERROR, "add domain to packet failed.");
|
||||
return -1;
|
||||
}
|
||||
|
||||
dns_set_OPT_payload_size(packet, DNS_IN_PACKSIZE);
|
||||
/* dns_add_OPT_TCP_KEEPALIVE(packet, 600); */
|
||||
if (query->qtype == DNS_T_A && server_info->ecs_ipv4.enable) {
|
||||
dns_add_OPT_ECS(packet, &server_info->ecs_ipv4.ecs);
|
||||
} else if (query->qtype == DNS_T_AAAA && server_info->ecs_ipv6.enable) {
|
||||
dns_add_OPT_ECS(packet, &server_info->ecs_ipv6.ecs);
|
||||
}
|
||||
|
||||
/* encode packet */
|
||||
encode_len = dns_encode(packet_data_buffer, DNS_IN_PACKSIZE, packet);
|
||||
if (encode_len <= 0) {
|
||||
tlog(TLOG_ERROR, "encode query failed.");
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (encode_len > DNS_IN_PACKSIZE) {
|
||||
BUG("size is invalid.");
|
||||
return -1;
|
||||
}
|
||||
|
||||
*packet_data = packet_data_buffer;
|
||||
*packet_data_len = encode_len;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int _dns_client_send_packet(struct dns_query_struct *query, void *packet, int len)
|
||||
{
|
||||
struct dns_server_info *server_info = NULL;
|
||||
@@ -3263,10 +3445,15 @@ static int _dns_client_send_packet(struct dns_query_struct *query, void *packet,
|
||||
int send_err = 0;
|
||||
int i = 0;
|
||||
int total_server = 0;
|
||||
int send_count = 0;
|
||||
void *packet_data = NULL;
|
||||
int packet_data_len = 0;
|
||||
unsigned char packet_data_buffer[DNS_IN_PACKSIZE];
|
||||
|
||||
query->send_tick = get_tick_count();
|
||||
|
||||
/* send query to all dns servers */
|
||||
atomic_inc(&query->dns_request_sent);
|
||||
for (i = 0; i < 2; i++) {
|
||||
total_server = 0;
|
||||
pthread_mutex_lock(&client.server_list_lock);
|
||||
@@ -3274,42 +3461,60 @@ static int _dns_client_send_packet(struct dns_query_struct *query, void *packet,
|
||||
{
|
||||
server_info = group_member->server;
|
||||
if (server_info->prohibit) {
|
||||
if (server_info->is_already_prohibit == 0) {
|
||||
server_info->is_already_prohibit = 1;
|
||||
atomic_inc(&client.dns_server_prohibit_num);
|
||||
}
|
||||
|
||||
time_t now = 0;
|
||||
time(&now);
|
||||
if ((now - 60 < server_info->last_send) && (now - 5 > server_info->last_recv)) {
|
||||
continue;
|
||||
}
|
||||
server_info->prohibit = 0;
|
||||
server_info->is_already_prohibit = 0;
|
||||
atomic_dec(&client.dns_server_prohibit_num);
|
||||
if (now - 60 > server_info->last_send) {
|
||||
_dns_client_close_socket(server_info);
|
||||
}
|
||||
}
|
||||
total_server++;
|
||||
tlog(TLOG_DEBUG, "send query to server %s", server_info->ip);
|
||||
if (server_info->fd <= 0) {
|
||||
ret = _dns_client_create_socket(server_info);
|
||||
if (ret != 0) {
|
||||
server_info->prohibit = 1;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
if (_dns_client_setup_server_packet(server_info, query, packet, len, packet_data_buffer, &packet_data,
|
||||
&packet_data_len) != 0) {
|
||||
continue;
|
||||
}
|
||||
|
||||
atomic_inc(&query->dns_request_sent);
|
||||
send_count++;
|
||||
errno = 0;
|
||||
switch (server_info->type) {
|
||||
case DNS_SERVER_UDP:
|
||||
/* udp query */
|
||||
ret = _dns_client_send_udp(server_info, packet, len);
|
||||
ret = _dns_client_send_udp(server_info, packet_data, packet_data_len);
|
||||
send_err = errno;
|
||||
break;
|
||||
case DNS_SERVER_TCP:
|
||||
/* tcp query */
|
||||
ret = _dns_client_send_tcp(server_info, packet, len);
|
||||
ret = _dns_client_send_tcp(server_info, packet_data, packet_data_len);
|
||||
send_err = errno;
|
||||
break;
|
||||
case DNS_SERVER_TLS:
|
||||
/* tls query */
|
||||
ret = _dns_client_send_tls(server_info, packet, len);
|
||||
ret = _dns_client_send_tls(server_info, packet_data, packet_data_len);
|
||||
send_err = errno;
|
||||
break;
|
||||
case DNS_SERVER_HTTPS:
|
||||
/* https query */
|
||||
ret = _dns_client_send_https(server_info, packet, len);
|
||||
ret = _dns_client_send_https(server_info, packet_data, packet_data_len);
|
||||
send_err = errno;
|
||||
break;
|
||||
default:
|
||||
@@ -3324,6 +3529,7 @@ static int _dns_client_send_packet(struct dns_query_struct *query, void *packet,
|
||||
server_info->type);
|
||||
_dns_client_close_socket(server_info);
|
||||
atomic_dec(&query->dns_request_sent);
|
||||
send_count--;
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -3331,13 +3537,14 @@ static int _dns_client_send_packet(struct dns_query_struct *query, void *packet,
|
||||
server_info->type);
|
||||
time_t now = 0;
|
||||
time(&now);
|
||||
if (now - 5 > server_info->last_recv || send_err != ENOMEM) {
|
||||
if (now - 10 > server_info->last_recv || send_err != ENOMEM) {
|
||||
server_info->prohibit = 1;
|
||||
tlog(TLOG_INFO, "server %s not alive, prohibit", server_info->ip);
|
||||
_dns_client_shutdown_socket(server_info);
|
||||
}
|
||||
|
||||
atomic_dec(&query->dns_request_sent);
|
||||
send_count--;
|
||||
continue;
|
||||
}
|
||||
time(&server_info->last_send);
|
||||
@@ -3345,13 +3552,25 @@ static int _dns_client_send_packet(struct dns_query_struct *query, void *packet,
|
||||
}
|
||||
pthread_mutex_unlock(&client.server_list_lock);
|
||||
|
||||
if (atomic_read(&query->dns_request_sent) > 0) {
|
||||
if (send_count > 0) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (atomic_read(&query->dns_request_sent) <= 0) {
|
||||
tlog(TLOG_WARN, "Send query to upstream server failed, total server number %d", total_server);
|
||||
int num = atomic_dec_return(&query->dns_request_sent);
|
||||
if (num == 0 && send_count > 0) {
|
||||
_dns_client_query_remove(query);
|
||||
}
|
||||
|
||||
if (send_count <= 0) {
|
||||
static time_t lastlog = 0;
|
||||
time_t now = 0;
|
||||
time(&now);
|
||||
if (now - lastlog > 120) {
|
||||
lastlog = now;
|
||||
tlog(TLOG_WARN, "send query %s to upstream server failed, total server number %d", query->domain,
|
||||
total_server);
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -3367,7 +3586,7 @@ static int _dns_client_dns_add_ecs(struct dns_query_struct *query, struct dns_pa
|
||||
return dns_add_OPT_ECS(packet, &query->ecs.ecs);
|
||||
}
|
||||
|
||||
static int _dns_client_send_query(struct dns_query_struct *query, const char *domain)
|
||||
static int _dns_client_send_query(struct dns_query_struct *query)
|
||||
{
|
||||
unsigned char packet_buff[DNS_PACKSIZE];
|
||||
unsigned char inpacket[DNS_IN_PACKSIZE];
|
||||
@@ -3391,7 +3610,7 @@ static int _dns_client_send_query(struct dns_query_struct *query, const char *do
|
||||
}
|
||||
|
||||
/* add question */
|
||||
if (dns_add_domain(packet, domain, query->qtype, DNS_C_IN) != 0) {
|
||||
if (dns_add_domain(packet, query->domain, query->qtype, DNS_C_IN) != 0) {
|
||||
tlog(TLOG_ERROR, "add domain to packet failed.");
|
||||
return -1;
|
||||
}
|
||||
@@ -3512,12 +3731,60 @@ static int _dns_client_query_parser_options(struct dns_query_struct *query, stru
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int _dns_client_add_hashmap(struct dns_query_struct *query)
|
||||
{
|
||||
uint32_t key = 0;
|
||||
struct hlist_node *tmp = NULL;
|
||||
struct dns_query_struct *query_check = NULL;
|
||||
int is_exists = 0;
|
||||
int loop = 0;
|
||||
|
||||
while (loop++ <= 32) {
|
||||
if (RAND_bytes((unsigned char *)&query->sid, sizeof(query->sid)) != 1) {
|
||||
query->sid = random();
|
||||
}
|
||||
|
||||
key = hash_string(query->domain);
|
||||
key = jhash(&query->sid, sizeof(query->sid), key);
|
||||
key = jhash(&query->qtype, sizeof(query->qtype), key);
|
||||
is_exists = 0;
|
||||
pthread_mutex_lock(&client.domain_map_lock);
|
||||
hash_for_each_possible_safe(client.domain_map, query_check, tmp, domain_node, key)
|
||||
{
|
||||
if (query->sid != query_check->sid) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (query->qtype != query_check->qtype) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (strncmp(query_check->domain, query->domain, DNS_MAX_CNAME_LEN) != 0) {
|
||||
continue;
|
||||
}
|
||||
|
||||
is_exists = 1;
|
||||
break;
|
||||
}
|
||||
|
||||
if (is_exists == 1) {
|
||||
pthread_mutex_unlock(&client.domain_map_lock);
|
||||
continue;
|
||||
}
|
||||
|
||||
hash_add(client.domain_map, &query->domain_node, key);
|
||||
pthread_mutex_unlock(&client.domain_map_lock);
|
||||
break;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int dns_client_query(const char *domain, int qtype, dns_client_callback callback, void *user_ptr,
|
||||
const char *group_name, struct dns_query_options *options)
|
||||
{
|
||||
struct dns_query_struct *query = NULL;
|
||||
int ret = 0;
|
||||
uint32_t key = 0;
|
||||
int unused __attribute__((unused));
|
||||
|
||||
if (domain == NULL) {
|
||||
@@ -3542,9 +3809,6 @@ int dns_client_query(const char *domain, int qtype, dns_client_callback callback
|
||||
query->qtype = qtype;
|
||||
query->send_tick = 0;
|
||||
query->has_result = 0;
|
||||
if (RAND_bytes((unsigned char *)&query->sid, sizeof(query->sid)) != 1) {
|
||||
query->sid = random();
|
||||
}
|
||||
query->server_group = _dns_client_get_dnsserver_group(group_name);
|
||||
if (query->server_group == NULL) {
|
||||
tlog(TLOG_ERROR, "get dns server group %s failed.", group_name);
|
||||
@@ -3558,16 +3822,14 @@ int dns_client_query(const char *domain, int qtype, dns_client_callback callback
|
||||
|
||||
_dns_client_query_get(query);
|
||||
/* add query to hashtable */
|
||||
key = hash_string(domain);
|
||||
key = jhash(&query->sid, sizeof(query->sid), key);
|
||||
key = jhash(&query->qtype, sizeof(query->qtype), key);
|
||||
pthread_mutex_lock(&client.domain_map_lock);
|
||||
hash_add(client.domain_map, &query->domain_node, key);
|
||||
pthread_mutex_unlock(&client.domain_map_lock);
|
||||
if (_dns_client_add_hashmap(query) != 0) {
|
||||
tlog(TLOG_ERROR, "add query to hash map failed.");
|
||||
goto errout;
|
||||
}
|
||||
|
||||
/* send query */
|
||||
_dns_client_query_get(query);
|
||||
ret = _dns_client_send_query(query, domain);
|
||||
ret = _dns_client_send_query(query);
|
||||
if (ret != 0) {
|
||||
_dns_client_query_release(query);
|
||||
goto errout_del_list;
|
||||
@@ -3583,7 +3845,8 @@ int dns_client_query(const char *domain, int qtype, dns_client_callback callback
|
||||
}
|
||||
pthread_mutex_unlock(&client.domain_map_lock);
|
||||
|
||||
tlog(TLOG_INFO, "send request %s, qtype %d, id %d\n", domain, qtype, query->sid);
|
||||
tlog(TLOG_INFO, "request: %s, qtype: %d, id: %d, group: %s", domain, qtype, query->sid,
|
||||
query->server_group->group_name);
|
||||
_dns_client_query_release(query);
|
||||
|
||||
return 0;
|
||||
@@ -3671,7 +3934,8 @@ static int _dns_client_add_pendings(struct dns_server_pending *pending, char *ip
|
||||
|
||||
list_for_each_entry_safe(group, tmp, &pending->group_list, list)
|
||||
{
|
||||
if (_dns_client_add_to_group_pending(group->group_name, ip, pending->port, pending->type, 0) != 0) {
|
||||
if (_dns_client_add_to_group_pending(group->group_name, ip, pending->port, pending->type, &pending->flags, 0) !=
|
||||
0) {
|
||||
tlog(TLOG_WARN, "add server to group failed, skip add.");
|
||||
}
|
||||
|
||||
@@ -3707,13 +3971,18 @@ static void _dns_client_remove_all_pending_servers(void)
|
||||
|
||||
static void _dns_client_add_pending_servers(void)
|
||||
{
|
||||
#ifdef TEST
|
||||
const int delay_value = 1;
|
||||
#else
|
||||
const int delay_value = 3;
|
||||
#endif
|
||||
struct dns_server_pending *pending = NULL;
|
||||
struct dns_server_pending *tmp = NULL;
|
||||
static int delay = 0;
|
||||
static int delay = delay_value;
|
||||
LIST_HEAD(retry_list);
|
||||
|
||||
/* add pending server after 3 seconds */
|
||||
if (++delay < 3) {
|
||||
if (++delay < delay_value) {
|
||||
return;
|
||||
}
|
||||
delay = 0;
|
||||
@@ -3856,7 +4125,7 @@ static void _dns_client_period_run(unsigned int msec)
|
||||
}
|
||||
} else {
|
||||
tlog(TLOG_INFO, "retry query %s, type: %d, id: %d", query->domain, query->qtype, query->sid);
|
||||
_dns_client_send_query(query, query->domain);
|
||||
_dns_client_send_query(query);
|
||||
}
|
||||
_dns_client_query_release(query);
|
||||
}
|
||||
@@ -3952,36 +4221,38 @@ static void *_dns_client_work(void *arg)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
int dns_client_set_ecs(char *ip, int subnet)
|
||||
static int _dns_client_setup_ecs(char *ip, int subnet, struct dns_client_ecs *ecs_ipv4, struct dns_client_ecs *ecs_ipv6)
|
||||
{
|
||||
struct sockaddr_storage addr;
|
||||
socklen_t addr_len = sizeof(addr);
|
||||
getaddr_by_host(ip, (struct sockaddr *)&addr, &addr_len);
|
||||
if (getaddr_by_host(ip, (struct sockaddr *)&addr, &addr_len) != 0) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
switch (addr.ss_family) {
|
||||
case AF_INET: {
|
||||
struct sockaddr_in *addr_in = NULL;
|
||||
addr_in = (struct sockaddr_in *)&addr;
|
||||
memcpy(&client.ecs_ipv4.ecs.addr, &addr_in->sin_addr.s_addr, 4);
|
||||
client.ecs_ipv4.ecs.source_prefix = subnet;
|
||||
client.ecs_ipv4.ecs.scope_prefix = 0;
|
||||
client.ecs_ipv4.ecs.family = DNS_OPT_ECS_FAMILY_IPV4;
|
||||
client.ecs_ipv4.enable = 1;
|
||||
memcpy(&ecs_ipv4->ecs.addr, &addr_in->sin_addr.s_addr, 4);
|
||||
ecs_ipv4->ecs.source_prefix = subnet;
|
||||
ecs_ipv4->ecs.scope_prefix = 0;
|
||||
ecs_ipv4->ecs.family = DNS_OPT_ECS_FAMILY_IPV4;
|
||||
ecs_ipv4->enable = 1;
|
||||
} break;
|
||||
case AF_INET6: {
|
||||
struct sockaddr_in6 *addr_in6 = NULL;
|
||||
addr_in6 = (struct sockaddr_in6 *)&addr;
|
||||
if (IN6_IS_ADDR_V4MAPPED(&addr_in6->sin6_addr)) {
|
||||
client.ecs_ipv4.ecs.source_prefix = subnet;
|
||||
client.ecs_ipv4.ecs.scope_prefix = 0;
|
||||
client.ecs_ipv4.ecs.family = DNS_OPT_ECS_FAMILY_IPV4;
|
||||
client.ecs_ipv4.enable = 1;
|
||||
ecs_ipv4->ecs.source_prefix = subnet;
|
||||
ecs_ipv4->ecs.scope_prefix = 0;
|
||||
ecs_ipv4->ecs.family = DNS_OPT_ECS_FAMILY_IPV4;
|
||||
ecs_ipv4->enable = 1;
|
||||
} else {
|
||||
memcpy(&client.ecs_ipv6.ecs.addr, addr_in6->sin6_addr.s6_addr, 16);
|
||||
client.ecs_ipv6.ecs.source_prefix = subnet;
|
||||
client.ecs_ipv6.ecs.scope_prefix = 0;
|
||||
client.ecs_ipv6.ecs.family = DNS_ADDR_FAMILY_IPV6;
|
||||
client.ecs_ipv6.enable = 1;
|
||||
memcpy(&ecs_ipv6->ecs.addr, addr_in6->sin6_addr.s6_addr, 16);
|
||||
ecs_ipv6->ecs.source_prefix = subnet;
|
||||
ecs_ipv6->ecs.scope_prefix = 0;
|
||||
ecs_ipv6->ecs.family = DNS_ADDR_FAMILY_IPV6;
|
||||
ecs_ipv6->enable = 1;
|
||||
}
|
||||
} break;
|
||||
default:
|
||||
@@ -3990,6 +4261,11 @@ int dns_client_set_ecs(char *ip, int subnet)
|
||||
return 0;
|
||||
}
|
||||
|
||||
int dns_client_set_ecs(char *ip, int subnet)
|
||||
{
|
||||
return _dns_client_setup_ecs(ip, subnet, &client.ecs_ipv4, &client.ecs_ipv6);
|
||||
}
|
||||
|
||||
static int _dns_client_create_wakeup_event(void)
|
||||
{
|
||||
int fd_wakeup = -1;
|
||||
@@ -4066,6 +4342,7 @@ int dns_client_init(void)
|
||||
memset(&client, 0, sizeof(client));
|
||||
pthread_attr_init(&attr);
|
||||
atomic_set(&client.dns_server_num, 0);
|
||||
atomic_set(&client.dns_server_prohibit_num, 0);
|
||||
atomic_set(&client.run_period, 0);
|
||||
|
||||
epollfd = epoll_create1(EPOLL_CLOEXEC);
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
#include "dns.h"
|
||||
|
||||
#ifdef __cpluscplus
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
@@ -108,6 +108,12 @@ struct client_dns_server_flag_https {
|
||||
char skip_check_cert;
|
||||
};
|
||||
|
||||
struct client_dns_server_flag_ecs {
|
||||
int enable;
|
||||
char ip[DNS_MAX_CNAME_LEN];
|
||||
int subnet;
|
||||
};
|
||||
|
||||
struct client_dns_server_flags {
|
||||
dns_server_type_t type;
|
||||
unsigned int server_flag;
|
||||
@@ -115,6 +121,9 @@ struct client_dns_server_flags {
|
||||
long long set_mark;
|
||||
int drop_packet_latency_ms;
|
||||
char proxyname[DNS_MAX_CNAME_LEN];
|
||||
struct client_dns_server_flag_ecs ipv4_ecs;
|
||||
struct client_dns_server_flag_ecs ipv6_ecs;
|
||||
|
||||
union {
|
||||
struct client_dns_server_flag_udp udp;
|
||||
struct client_dns_server_flag_tls tls;
|
||||
@@ -133,15 +142,19 @@ int dns_client_remove_server(char *server_ip, int port, dns_server_type_t server
|
||||
|
||||
int dns_client_add_group(const char *group_name);
|
||||
|
||||
int dns_client_add_to_group(const char *group_name, char *server_ip, int port, dns_server_type_t server_type);
|
||||
int dns_client_add_to_group(const char *group_name, char *server_ip, int port, dns_server_type_t server_type,
|
||||
struct client_dns_server_flags *flags);
|
||||
|
||||
int dns_client_remove_from_group(const char *group_name, char *server_ip, int port, dns_server_type_t server_type);
|
||||
int dns_client_remove_from_group(const char *group_name, char *server_ip, int port, dns_server_type_t server_type,
|
||||
struct client_dns_server_flags *flags);
|
||||
|
||||
int dns_client_remove_group(const char *group_name);
|
||||
|
||||
int dns_server_alive_num(void);
|
||||
|
||||
int dns_server_num(void);
|
||||
|
||||
#ifdef __cpluscplus
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
550
src/dns_conf.c
550
src/dns_conf.c
@@ -30,9 +30,7 @@
|
||||
#include <syslog.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#define DEFAULT_DNS_CACHE_SIZE 512
|
||||
#define DNS_MAX_REPLY_IP_NUM 8
|
||||
#define DNS_RESOLV_FILE "/etc/resolv.conf"
|
||||
|
||||
/* ipset */
|
||||
struct dns_ipset_table {
|
||||
@@ -68,6 +66,10 @@ struct dns_dns64 dns_conf_dns_dns64;
|
||||
struct dns_bind_ip dns_conf_bind_ip[DNS_MAX_BIND_IP];
|
||||
int dns_conf_bind_ip_num = 0;
|
||||
int dns_conf_tcp_idle_time = 120;
|
||||
char dns_conf_bind_ca_file[DNS_MAX_PATH];
|
||||
char dns_conf_bind_ca_key_file[DNS_MAX_PATH];
|
||||
char dns_conf_bind_ca_key_pass[DNS_MAX_PATH];
|
||||
char dns_conf_need_cert = 0;
|
||||
|
||||
int dns_conf_max_reply_ip_num = DNS_MAX_REPLY_IP_NUM;
|
||||
|
||||
@@ -80,10 +82,10 @@ static struct config_enum_list dns_conf_response_mode_enum[] = {
|
||||
enum response_mode_type dns_conf_response_mode;
|
||||
|
||||
/* cache */
|
||||
int dns_conf_cachesize = DEFAULT_DNS_CACHE_SIZE;
|
||||
ssize_t dns_conf_cachesize = -1;
|
||||
int dns_conf_prefetch = 0;
|
||||
int dns_conf_serve_expired = 1;
|
||||
int dns_conf_serve_expired_ttl = 24 * 3600; /* 1 day */
|
||||
int dns_conf_serve_expired_ttl = 24 * 3600 * 3; /* 3 days */
|
||||
int dns_conf_serve_expired_prefetch_time;
|
||||
int dns_conf_serve_expired_reply_ttl = 3;
|
||||
|
||||
@@ -92,6 +94,7 @@ struct dns_servers dns_conf_servers[DNS_MAX_SERVERS];
|
||||
char dns_conf_server_name[DNS_MAX_SERVER_NAME_LEN];
|
||||
int dns_conf_server_num;
|
||||
int dns_conf_resolv_hostname = 1;
|
||||
char dns_conf_exist_bootstrap_dns;
|
||||
|
||||
struct dns_domain_check_orders dns_conf_check_orders = {
|
||||
.orders =
|
||||
@@ -109,6 +112,7 @@ char dns_conf_log_file[DNS_MAX_PATH];
|
||||
size_t dns_conf_log_size = 1024 * 1024;
|
||||
int dns_conf_log_num = 8;
|
||||
int dns_conf_log_file_mode;
|
||||
int dns_conf_log_console;
|
||||
|
||||
/* CA file */
|
||||
char dns_conf_ca_file[DNS_MAX_PATH];
|
||||
@@ -116,6 +120,7 @@ char dns_conf_ca_path[DNS_MAX_PATH];
|
||||
|
||||
char dns_conf_cache_file[DNS_MAX_PATH];
|
||||
int dns_conf_cache_persist = 2;
|
||||
int dns_conf_cache_checkpoint_time;
|
||||
|
||||
/* auditing */
|
||||
int dns_conf_audit_enable = 0;
|
||||
@@ -124,6 +129,7 @@ char dns_conf_audit_file[DNS_MAX_PATH];
|
||||
size_t dns_conf_audit_size = 1024 * 1024;
|
||||
int dns_conf_audit_num = 2;
|
||||
int dns_conf_audit_file_mode;
|
||||
int dns_conf_audit_console;
|
||||
|
||||
/* address rules */
|
||||
art_tree dns_conf_domain_rule;
|
||||
@@ -132,7 +138,9 @@ struct dns_conf_address_rule dns_conf_address_rule;
|
||||
/* dual-stack selection */
|
||||
int dns_conf_dualstack_ip_selection = 1;
|
||||
int dns_conf_dualstack_ip_allow_force_AAAA;
|
||||
int dns_conf_dualstack_ip_selection_threshold = 15;
|
||||
int dns_conf_dualstack_ip_selection_threshold = 10;
|
||||
|
||||
int dns_conf_expand_ptr_from_address = 0;
|
||||
|
||||
/* TTL */
|
||||
int dns_conf_rr_ttl;
|
||||
@@ -160,6 +168,11 @@ struct dns_edns_client_subnet dns_conf_ipv6_ecs;
|
||||
|
||||
char dns_conf_sni_proxy_ip[DNS_MAX_IPLEN];
|
||||
|
||||
static int _conf_domain_rule_nameserver(char *domain, const char *group_name);
|
||||
static int _conf_ptr_add(const char *hostname, const char *ip, int is_dynamic);
|
||||
static int _conf_client_subnet(char *subnet, struct dns_edns_client_subnet *ipv4_ecs,
|
||||
struct dns_edns_client_subnet *ipv6_ecs);
|
||||
|
||||
static void *_new_dns_rule(enum domain_rule domain_rule)
|
||||
{
|
||||
struct dns_rule *rule;
|
||||
@@ -194,6 +207,9 @@ static void *_new_dns_rule(enum domain_rule domain_rule)
|
||||
case DOMAIN_RULE_CHECKSPEED:
|
||||
size = sizeof(struct dns_domain_check_orders);
|
||||
break;
|
||||
case DOMAIN_RULE_RESPONSE_MODE:
|
||||
size = sizeof(struct dns_response_mode_rule);
|
||||
break;
|
||||
case DOMAIN_RULE_CNAME:
|
||||
size = sizeof(struct dns_cname_rule);
|
||||
break;
|
||||
@@ -463,6 +479,7 @@ static int _config_server(int argc, char *argv[], dns_server_type_t type, int de
|
||||
unsigned int server_flag = 0;
|
||||
unsigned char *spki = NULL;
|
||||
int drop_packet_latency_ms = 0;
|
||||
int is_bootstrap_dns = 0;
|
||||
|
||||
int ttl = 0;
|
||||
/* clang-format off */
|
||||
@@ -483,6 +500,8 @@ static int _config_server(int argc, char *argv[], dns_server_type_t type, int de
|
||||
{"proxy", required_argument, NULL, 'P'}, /* proxy server */
|
||||
{"exclude-default-group", no_argument, NULL, 'E'}, /* exclude this from default group */
|
||||
{"set-mark", required_argument, NULL, 254}, /* set mark */
|
||||
{"bootstrap-dns", no_argument, NULL, 255}, /* set as bootstrap dns */
|
||||
{"subnet", required_argument, NULL, 256}, /* set subnet */
|
||||
{NULL, no_argument, NULL, 0}
|
||||
};
|
||||
/* clang-format on */
|
||||
@@ -614,11 +633,24 @@ static int _config_server(int argc, char *argv[], dns_server_type_t type, int de
|
||||
server->set_mark = atoll(optarg);
|
||||
break;
|
||||
}
|
||||
case 255: {
|
||||
is_bootstrap_dns = 1;
|
||||
break;
|
||||
}
|
||||
case 256: {
|
||||
_conf_client_subnet(optarg, &server->ipv4_ecs, &server->ipv6_ecs);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
/* if server is domain name, then verify domain */
|
||||
if (server->tls_host_verify[0] == '\0' && check_is_ipaddr(server->server) != 0) {
|
||||
safe_strncpy(server->tls_host_verify, server->server, DNS_MAX_CNAME_LEN);
|
||||
}
|
||||
|
||||
/* add new server */
|
||||
server->type = type;
|
||||
server->port = port;
|
||||
@@ -629,6 +661,12 @@ static int _config_server(int argc, char *argv[], dns_server_type_t type, int de
|
||||
dns_conf_server_num++;
|
||||
tlog(TLOG_DEBUG, "add server %s, flag: %X, ttl: %d", ip, result_flag, ttl);
|
||||
|
||||
if (is_bootstrap_dns) {
|
||||
server->server_flag |= SERVER_FLAG_EXCLUDE_DEFAULT;
|
||||
_dns_conf_get_group_set("bootstrap-dns", server);
|
||||
dns_conf_exist_bootstrap_dns = 1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
errout:
|
||||
@@ -639,6 +677,26 @@ errout:
|
||||
return -1;
|
||||
}
|
||||
|
||||
static int _config_update_bootstrap_dns_rule(void)
|
||||
{
|
||||
struct dns_servers *server = NULL;
|
||||
|
||||
if (dns_conf_exist_bootstrap_dns == 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
for (int i = 0; i < dns_conf_server_num; i++) {
|
||||
server = &dns_conf_servers[i];
|
||||
if (check_is_ipaddr(server->server) == 0) {
|
||||
continue;
|
||||
}
|
||||
|
||||
_conf_domain_rule_nameserver(server->server, "bootstrap-dns");
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int _config_domain_rule_free(struct dns_domain_rule *domain_rule)
|
||||
{
|
||||
int i = 0;
|
||||
@@ -1297,6 +1355,7 @@ static int _conf_domain_rule_nftset(char *domain, const char *nftsetname)
|
||||
goto errout;
|
||||
}
|
||||
_dns_rule_put(&nftset_rule->head);
|
||||
nftset_rule = NULL;
|
||||
}
|
||||
|
||||
goto clear;
|
||||
@@ -1357,7 +1416,7 @@ static int _config_nftset_no_speed(void *data, int argc, char *argv[])
|
||||
goto errout;
|
||||
}
|
||||
|
||||
for (char *tok = strtok(copied_name, ","); tok && nftset_num <=2 ; tok = strtok(NULL, ",")) {
|
||||
for (char *tok = strtok(copied_name, ","); tok && nftset_num <= 2; tok = strtok(NULL, ",")) {
|
||||
char *saveptr = NULL;
|
||||
char *tok_set = NULL;
|
||||
|
||||
@@ -1527,6 +1586,11 @@ static int _conf_domain_rule_address(char *domain, const char *domain_address)
|
||||
default:
|
||||
goto errout;
|
||||
}
|
||||
|
||||
/* add PTR */
|
||||
if (dns_conf_expand_ptr_from_address == 1 && _conf_ptr_add(domain, ip, 0) != 0) {
|
||||
goto errout;
|
||||
}
|
||||
}
|
||||
|
||||
/* add domain to ART-tree */
|
||||
@@ -1738,6 +1802,143 @@ errout:
|
||||
return -1;
|
||||
}
|
||||
|
||||
static int _config_bind_ip_parser_nftset(struct dns_bind_ip *bind_ip, unsigned int *server_flag, const char *nftsetname)
|
||||
{
|
||||
struct dns_nftset_rule *nftset_rule = NULL;
|
||||
struct dns_nftset_rule **bind_nftset_rule = NULL;
|
||||
const struct dns_nftset_name *nftset_name = NULL;
|
||||
enum domain_rule type = DOMAIN_RULE_MAX;
|
||||
|
||||
char *setname = NULL;
|
||||
char *tablename = NULL;
|
||||
char *family = NULL;
|
||||
char copied_name[DNS_MAX_NFTSET_NAMELEN + 1];
|
||||
|
||||
safe_strncpy(copied_name, nftsetname, DNS_MAX_NFTSET_NAMELEN);
|
||||
for (char *tok = strtok(copied_name, ","); tok; tok = strtok(NULL, ",")) {
|
||||
char *saveptr = NULL;
|
||||
char *tok_set = NULL;
|
||||
|
||||
if (strncmp(tok, "#4:", 3U) == 0) {
|
||||
bind_nftset_rule = &bind_ip->nftset_ipset_rule.nftset_ip;
|
||||
type = DOMAIN_RULE_NFTSET_IP;
|
||||
} else if (strncmp(tok, "#6:", 3U) == 0) {
|
||||
bind_nftset_rule = &bind_ip->nftset_ipset_rule.nftset_ip6;
|
||||
type = DOMAIN_RULE_NFTSET_IP6;
|
||||
} else if (strncmp(tok, "-", 2U) == 0) {
|
||||
continue;
|
||||
} else {
|
||||
return -1;
|
||||
}
|
||||
|
||||
tok_set = tok + 3;
|
||||
|
||||
if (strncmp(tok_set, "-", 2U) == 0) {
|
||||
*server_flag |= BIND_FLAG_NO_RULE_NFTSET;
|
||||
continue;
|
||||
}
|
||||
|
||||
family = strtok_r(tok_set, "#", &saveptr);
|
||||
if (family == NULL) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
tablename = strtok_r(NULL, "#", &saveptr);
|
||||
if (tablename == NULL) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
setname = strtok_r(NULL, "#", &saveptr);
|
||||
if (setname == NULL) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
/* new nftset domain */
|
||||
nftset_name = _dns_conf_get_nftable(family, tablename, setname);
|
||||
if (nftset_name == NULL) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
nftset_rule = _new_dns_rule(type);
|
||||
if (nftset_rule == NULL) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
nftset_rule->nfttablename = nftset_name->nfttablename;
|
||||
nftset_rule->nftsetname = nftset_name->nftsetname;
|
||||
nftset_rule->familyname = nftset_name->nftfamilyname;
|
||||
/* reference is 1 here */
|
||||
*bind_nftset_rule = nftset_rule;
|
||||
|
||||
nftset_rule = NULL;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int _config_bind_ip_parser_ipset(struct dns_bind_ip *bind_ip, unsigned int *server_flag, const char *ipsetname)
|
||||
{
|
||||
struct dns_ipset_rule **bind_ipset_rule = NULL;
|
||||
struct dns_ipset_rule *ipset_rule = NULL;
|
||||
const char *ipset = NULL;
|
||||
enum domain_rule type = DOMAIN_RULE_MAX;
|
||||
|
||||
char copied_name[DNS_MAX_NFTSET_NAMELEN + 1];
|
||||
|
||||
safe_strncpy(copied_name, ipsetname, DNS_MAX_NFTSET_NAMELEN);
|
||||
|
||||
for (char *tok = strtok(copied_name, ","); tok; tok = strtok(NULL, ",")) {
|
||||
if (tok[0] == '#') {
|
||||
if (strncmp(tok, "#6:", 3U) == 0) {
|
||||
bind_ipset_rule = &bind_ip->nftset_ipset_rule.ipset_ip6;
|
||||
type = DOMAIN_RULE_IPSET_IPV6;
|
||||
} else if (strncmp(tok, "#4:", 3U) == 0) {
|
||||
bind_ipset_rule = &bind_ip->nftset_ipset_rule.ipset_ip;
|
||||
type = DOMAIN_RULE_IPSET_IPV4;
|
||||
} else {
|
||||
goto errout;
|
||||
}
|
||||
tok += 3;
|
||||
} else {
|
||||
type = DOMAIN_RULE_IPSET;
|
||||
bind_ipset_rule = &bind_ip->nftset_ipset_rule.ipset;
|
||||
}
|
||||
|
||||
if (strncmp(tok, "-", 1) == 0) {
|
||||
*server_flag |= BIND_FLAG_NO_RULE_IPSET;
|
||||
continue;
|
||||
}
|
||||
|
||||
if (bind_ipset_rule == NULL) {
|
||||
continue;
|
||||
}
|
||||
|
||||
/* new ipset domain */
|
||||
ipset = _dns_conf_get_ipset(tok);
|
||||
if (ipset == NULL) {
|
||||
goto errout;
|
||||
}
|
||||
|
||||
ipset_rule = _new_dns_rule(type);
|
||||
if (ipset_rule == NULL) {
|
||||
goto errout;
|
||||
}
|
||||
|
||||
ipset_rule->ipsetname = ipset;
|
||||
/* reference is 1 here */
|
||||
*bind_ipset_rule = ipset_rule;
|
||||
ipset_rule = NULL;
|
||||
}
|
||||
|
||||
return 0;
|
||||
errout:
|
||||
if (ipset_rule) {
|
||||
_dns_rule_put(&ipset_rule->head);
|
||||
}
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
static int _config_bind_ip(int argc, char *argv[], DNS_BIND_TYPE type)
|
||||
{
|
||||
int index = dns_conf_bind_ip_num;
|
||||
@@ -1761,6 +1962,8 @@ static int _config_bind_ip(int argc, char *argv[], DNS_BIND_TYPE type)
|
||||
{"no-cache", no_argument, NULL, 'C'},
|
||||
{"no-dualstack-selection", no_argument, NULL, 'D'},
|
||||
{"force-aaaa-soa", no_argument, NULL, 'F'},
|
||||
{"ipset", required_argument, NULL, 255},
|
||||
{"nftset", required_argument, NULL, 256},
|
||||
{NULL, no_argument, NULL, 0}
|
||||
};
|
||||
/* clang-format on */
|
||||
@@ -1844,6 +2047,14 @@ static int _config_bind_ip(int argc, char *argv[], DNS_BIND_TYPE type)
|
||||
server_flag |= BIND_FLAG_FORCE_AAAA_SOA;
|
||||
break;
|
||||
}
|
||||
case 255: {
|
||||
_config_bind_ip_parser_ipset(bind_ip, &server_flag, optarg);
|
||||
break;
|
||||
}
|
||||
case 256: {
|
||||
_config_bind_ip_parser_nftset(bind_ip, &server_flag, optarg);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
@@ -1853,6 +2064,14 @@ static int _config_bind_ip(int argc, char *argv[], DNS_BIND_TYPE type)
|
||||
bind_ip->flags = server_flag;
|
||||
bind_ip->group = group;
|
||||
dns_conf_bind_ip_num++;
|
||||
if (bind_ip->type == DNS_BIND_TYPE_TLS) {
|
||||
if (bind_ip->ssl_cert_file == NULL || bind_ip->ssl_cert_key_file == NULL) {
|
||||
bind_ip->ssl_cert_file = dns_conf_bind_ca_file;
|
||||
bind_ip->ssl_cert_key_file = dns_conf_bind_ca_key_file;
|
||||
bind_ip->ssl_cert_key_pass = dns_conf_bind_ca_key_pass;
|
||||
dns_conf_need_cert = 1;
|
||||
}
|
||||
}
|
||||
tlog(TLOG_DEBUG, "bind ip %s, type: %d, flag: %X", ip, type, server_flag);
|
||||
|
||||
return 0;
|
||||
@@ -1871,6 +2090,23 @@ static int _config_bind_ip_tcp(void *data, int argc, char *argv[])
|
||||
return _config_bind_ip(argc, argv, DNS_BIND_TYPE_TCP);
|
||||
}
|
||||
|
||||
static int _config_bind_ip_tls(void *data, int argc, char *argv[])
|
||||
{
|
||||
return _config_bind_ip(argc, argv, DNS_BIND_TYPE_TLS);
|
||||
}
|
||||
|
||||
static int _config_option_parser_filepath(void *data, int argc, char *argv[])
|
||||
{
|
||||
if (argc <= 1) {
|
||||
tlog(TLOG_ERROR, "invalid parameter.");
|
||||
return -1;
|
||||
}
|
||||
|
||||
conf_get_conf_fullpath(argv[1], data, DNS_MAX_PATH);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int _config_server_udp(void *data, int argc, char *argv[])
|
||||
{
|
||||
return _config_server(argc, argv, DNS_SERVER_UDP, DEFAULT_DNS_PORT);
|
||||
@@ -2154,19 +2390,23 @@ static int _config_qtype_soa(void *data, int argc, char *argv[])
|
||||
}
|
||||
|
||||
for (i = 1; i < argc; i++) {
|
||||
soa_list = malloc(sizeof(*soa_list));
|
||||
if (soa_list == NULL) {
|
||||
tlog(TLOG_ERROR, "cannot malloc memory");
|
||||
return -1;
|
||||
}
|
||||
char sub_arg[1024];
|
||||
safe_strncpy(sub_arg, argv[i], sizeof(sub_arg));
|
||||
for (char *tok = strtok(sub_arg, ","); tok; tok = strtok(NULL, ",")) {
|
||||
soa_list = malloc(sizeof(*soa_list));
|
||||
if (soa_list == NULL) {
|
||||
tlog(TLOG_ERROR, "cannot malloc memory");
|
||||
return -1;
|
||||
}
|
||||
|
||||
memset(soa_list, 0, sizeof(*soa_list));
|
||||
soa_list->qtypeid = atol(argv[i]);
|
||||
if (soa_list->qtypeid == DNS_T_AAAA) {
|
||||
dns_conf_force_AAAA_SOA = 1;
|
||||
memset(soa_list, 0, sizeof(*soa_list));
|
||||
soa_list->qtypeid = atol(tok);
|
||||
if (soa_list->qtypeid == DNS_T_AAAA) {
|
||||
dns_conf_force_AAAA_SOA = 1;
|
||||
}
|
||||
uint32_t key = hash_32_generic(soa_list->qtypeid, 32);
|
||||
hash_add(dns_qtype_soa_table.qtype, &soa_list->node, key);
|
||||
}
|
||||
uint32_t key = hash_32_generic(soa_list->qtypeid, 32);
|
||||
hash_add(dns_qtype_soa_table.qtype, &soa_list->node, key);
|
||||
}
|
||||
|
||||
return 0;
|
||||
@@ -2242,48 +2482,52 @@ static int _conf_whitelist_ip(void *data, int argc, char *argv[])
|
||||
return _config_iplist_rule(argv[1], ADDRESS_RULE_WHITELIST);
|
||||
}
|
||||
|
||||
static int _conf_edns_client_subnet(void *data, int argc, char *argv[])
|
||||
static int _conf_client_subnet(char *subnet, struct dns_edns_client_subnet *ipv4_ecs,
|
||||
struct dns_edns_client_subnet *ipv6_ecs)
|
||||
{
|
||||
char *slash = NULL;
|
||||
char *value = NULL;
|
||||
int subnet = 0;
|
||||
int subnet_len = 0;
|
||||
struct dns_edns_client_subnet *ecs = NULL;
|
||||
struct sockaddr_storage addr;
|
||||
socklen_t addr_len = sizeof(addr);
|
||||
char str_subnet[128];
|
||||
|
||||
if (argc <= 1) {
|
||||
if (subnet == NULL) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
value = argv[1];
|
||||
|
||||
slash = strstr(value, "/");
|
||||
safe_strncpy(str_subnet, subnet, sizeof(str_subnet));
|
||||
slash = strstr(str_subnet, "/");
|
||||
if (slash) {
|
||||
*slash = 0;
|
||||
slash++;
|
||||
subnet = atoi(slash);
|
||||
if (subnet < 0 || subnet > 128) {
|
||||
subnet_len = atoi(slash);
|
||||
if (subnet_len < 0 || subnet_len > 128) {
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
if (getaddr_by_host(value, (struct sockaddr *)&addr, &addr_len) != 0) {
|
||||
if (getaddr_by_host(str_subnet, (struct sockaddr *)&addr, &addr_len) != 0) {
|
||||
goto errout;
|
||||
}
|
||||
|
||||
switch (addr.ss_family) {
|
||||
case AF_INET:
|
||||
ecs = &dns_conf_ipv4_ecs;
|
||||
ecs = ipv4_ecs;
|
||||
break;
|
||||
case AF_INET6:
|
||||
ecs = &dns_conf_ipv6_ecs;
|
||||
ecs = ipv6_ecs;
|
||||
break;
|
||||
default:
|
||||
goto errout;
|
||||
}
|
||||
|
||||
safe_strncpy(ecs->ip, value, DNS_MAX_IPLEN);
|
||||
ecs->subnet = subnet;
|
||||
if (ecs == NULL) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
safe_strncpy(ecs->ip, str_subnet, DNS_MAX_IPLEN);
|
||||
ecs->subnet = subnet_len;
|
||||
ecs->enable = 1;
|
||||
|
||||
return 0;
|
||||
@@ -2292,6 +2536,16 @@ errout:
|
||||
return -1;
|
||||
}
|
||||
|
||||
static int _conf_edns_client_subnet(void *data, int argc, char *argv[])
|
||||
{
|
||||
|
||||
if (argc <= 1) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
return _conf_client_subnet(argv[1], &dns_conf_ipv4_ecs, &dns_conf_ipv6_ecs);
|
||||
}
|
||||
|
||||
static int _conf_domain_rule_speed_check(char *domain, const char *mode)
|
||||
{
|
||||
struct dns_domain_check_orders *check_orders = NULL;
|
||||
@@ -2318,6 +2572,38 @@ errout:
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int _conf_domain_rule_response_mode(char *domain, const char *mode)
|
||||
{
|
||||
enum response_mode_type response_mode_type = DNS_RESPONSE_MODE_FIRST_PING_IP;
|
||||
struct dns_response_mode_rule *response_mode = NULL;
|
||||
|
||||
for (int i = 0; dns_conf_response_mode_enum[i].name != NULL; i++) {
|
||||
if (strcmp(mode, dns_conf_response_mode_enum[i].name) == 0) {
|
||||
response_mode_type = dns_conf_response_mode_enum[i].id;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
response_mode = _new_dns_rule(DOMAIN_RULE_RESPONSE_MODE);
|
||||
if (response_mode == NULL) {
|
||||
goto errout;
|
||||
}
|
||||
response_mode->mode = response_mode_type;
|
||||
|
||||
if (_config_domain_rule_add(domain, DOMAIN_RULE_RESPONSE_MODE, response_mode) != 0) {
|
||||
goto errout;
|
||||
}
|
||||
|
||||
_dns_rule_put(&response_mode->head);
|
||||
return 0;
|
||||
errout:
|
||||
if (response_mode) {
|
||||
_dns_rule_put(&response_mode->head);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int _conf_domain_set(void *data, int argc, char *argv[])
|
||||
{
|
||||
int opt = 0;
|
||||
@@ -2457,6 +2743,11 @@ static int _conf_domain_rule_delete(const char *domain)
|
||||
return _config_domain_rule_delete(domain);
|
||||
}
|
||||
|
||||
static int _conf_domain_rule_no_cache(const char *domain)
|
||||
{
|
||||
return _config_domain_rule_flag_set(domain, DOMAIN_FLAG_NO_CACHE, 0);
|
||||
}
|
||||
|
||||
static int _conf_domain_rules(void *data, int argc, char *argv[])
|
||||
{
|
||||
int opt = 0;
|
||||
@@ -2469,6 +2760,7 @@ static int _conf_domain_rules(void *data, int argc, char *argv[])
|
||||
/* clang-format off */
|
||||
static struct option long_options[] = {
|
||||
{"speed-check-mode", required_argument, NULL, 'c'},
|
||||
{"response-mode", required_argument, NULL, 'r'},
|
||||
{"address", required_argument, NULL, 'a'},
|
||||
{"ipset", required_argument, NULL, 'p'},
|
||||
{"nftset", required_argument, NULL, 't'},
|
||||
@@ -2480,6 +2772,7 @@ static int _conf_domain_rules(void *data, int argc, char *argv[])
|
||||
{"rr-ttl-max", required_argument, NULL, 253},
|
||||
{"no-serve-expired", no_argument, NULL, 254},
|
||||
{"delete", no_argument, NULL, 255},
|
||||
{"no-cache", no_argument, NULL, 256},
|
||||
{NULL, no_argument, NULL, 0}
|
||||
};
|
||||
/* clang-format on */
|
||||
@@ -2496,7 +2789,7 @@ static int _conf_domain_rules(void *data, int argc, char *argv[])
|
||||
/* process extra options */
|
||||
optind = 1;
|
||||
while (1) {
|
||||
opt = getopt_long_only(argc, argv, "c:a:p:t:n:d:A:", long_options, NULL);
|
||||
opt = getopt_long_only(argc, argv, "c:a:p:t:n:d:A:r:", long_options, NULL);
|
||||
if (opt == -1) {
|
||||
break;
|
||||
}
|
||||
@@ -2515,6 +2808,19 @@ static int _conf_domain_rules(void *data, int argc, char *argv[])
|
||||
|
||||
break;
|
||||
}
|
||||
case 'r': {
|
||||
const char *response_mode = optarg;
|
||||
if (response_mode == NULL) {
|
||||
goto errout;
|
||||
}
|
||||
|
||||
if (_conf_domain_rule_response_mode(domain, response_mode) != 0) {
|
||||
tlog(TLOG_ERROR, "add response-mode rule failed.");
|
||||
goto errout;
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
case 'a': {
|
||||
const char *address = optarg;
|
||||
if (address == NULL) {
|
||||
@@ -2614,6 +2920,14 @@ static int _conf_domain_rules(void *data, int argc, char *argv[])
|
||||
|
||||
return 0;
|
||||
}
|
||||
case 256: {
|
||||
if (_conf_domain_rule_no_cache(domain) != 0) {
|
||||
tlog(TLOG_ERROR, "set no-cache rule failed.");
|
||||
goto errout;
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
default:
|
||||
break;
|
||||
}
|
||||
@@ -2653,6 +2967,7 @@ static struct dns_ptr *_dns_conf_get_ptr(const char *ptr_domain)
|
||||
|
||||
safe_strncpy(ptr->ptr_domain, ptr_domain, DNS_MAX_PTR_LEN);
|
||||
hash_add(dns_ptr_table.ptr, &ptr->node, key);
|
||||
ptr->is_soa = 1;
|
||||
|
||||
return ptr;
|
||||
errout:
|
||||
@@ -2663,7 +2978,7 @@ errout:
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static int _conf_ptr_add(const char *hostname, const char *ip)
|
||||
static int _conf_ptr_add(const char *hostname, const char *ip, int is_dynamic)
|
||||
{
|
||||
struct dns_ptr *ptr = NULL;
|
||||
struct sockaddr_storage addr;
|
||||
@@ -2715,6 +3030,13 @@ static int _conf_ptr_add(const char *hostname, const char *ip)
|
||||
goto errout;
|
||||
}
|
||||
|
||||
if (is_dynamic == 1 && ptr->is_soa == 0 && ptr->is_dynamic == 0) {
|
||||
/* already set fix PTR, skip */
|
||||
return 0;
|
||||
}
|
||||
|
||||
ptr->is_dynamic = is_dynamic;
|
||||
ptr->is_soa = 0;
|
||||
safe_strncpy(ptr->hostname, hostname, DNS_MAX_CNAME_LEN);
|
||||
|
||||
return 0;
|
||||
@@ -2723,7 +3045,7 @@ errout:
|
||||
return -1;
|
||||
}
|
||||
|
||||
static void _config_ptr_table_destroy(void)
|
||||
static void _config_ptr_table_destroy(int only_dynamic)
|
||||
{
|
||||
struct dns_ptr *ptr = NULL;
|
||||
struct hlist_node *tmp = NULL;
|
||||
@@ -2731,6 +3053,10 @@ static void _config_ptr_table_destroy(void)
|
||||
|
||||
hash_for_each_safe(dns_ptr_table.ptr, i, tmp, ptr, node)
|
||||
{
|
||||
if (only_dynamic != 0 && ptr->is_dynamic == 0) {
|
||||
continue;
|
||||
}
|
||||
|
||||
hlist_del_init(&ptr->node);
|
||||
free(ptr);
|
||||
}
|
||||
@@ -2775,7 +3101,7 @@ errout:
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static int _conf_host_add(const char *hostname, const char *ip, dns_hosts_type host_type)
|
||||
static int _conf_host_add(const char *hostname, const char *ip, dns_hosts_type host_type, int is_dynamic)
|
||||
{
|
||||
struct dns_hosts *host = NULL;
|
||||
struct dns_hosts *host_other __attribute__((unused));
|
||||
@@ -2815,9 +3141,14 @@ static int _conf_host_add(const char *hostname, const char *ip, dns_hosts_type h
|
||||
goto errout;
|
||||
}
|
||||
|
||||
if (is_dynamic == 1 && host->is_soa == 0 && host->is_dynamic == 0) {
|
||||
/* already set fixed PTR, skip */
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* add this to return SOA when addr is not exist */
|
||||
host_other = _dns_conf_get_hosts(hostname, dns_type_other);
|
||||
|
||||
host->is_dynamic = is_dynamic;
|
||||
host->host_type = host_type;
|
||||
|
||||
switch (addr.ss_family) {
|
||||
@@ -2876,12 +3207,12 @@ static int _conf_dhcp_lease_dnsmasq_add(const char *file)
|
||||
continue;
|
||||
}
|
||||
|
||||
ret = _conf_host_add(hostname, ip, DNS_HOST_TYPE_DNSMASQ);
|
||||
ret = _conf_host_add(hostname, ip, DNS_HOST_TYPE_DNSMASQ, 1);
|
||||
if (ret != 0) {
|
||||
tlog(TLOG_WARN, "add host %s/%s at %d failed", hostname, ip, line_no);
|
||||
}
|
||||
|
||||
ret = _conf_ptr_add(hostname, ip);
|
||||
ret = _conf_ptr_add(hostname, ip, 1);
|
||||
if (ret != 0) {
|
||||
tlog(TLOG_WARN, "add ptr %s/%s at %d failed.", hostname, ip, line_no);
|
||||
}
|
||||
@@ -2918,7 +3249,7 @@ static int _conf_hosts_file(void *data, int argc, char *argv[])
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void _config_host_table_destroy(void)
|
||||
static void _config_host_table_destroy(int only_dynamic)
|
||||
{
|
||||
struct dns_hosts *host = NULL;
|
||||
struct hlist_node *tmp = NULL;
|
||||
@@ -2926,6 +3257,10 @@ static void _config_host_table_destroy(void)
|
||||
|
||||
hash_for_each_safe(dns_hosts_table.hosts, i, tmp, host, node)
|
||||
{
|
||||
if (only_dynamic != 0 && host->is_dynamic == 0) {
|
||||
continue;
|
||||
}
|
||||
|
||||
hlist_del_init(&host->node);
|
||||
free(host);
|
||||
}
|
||||
@@ -2956,8 +3291,8 @@ int dns_server_check_update_hosts(void)
|
||||
return -1;
|
||||
}
|
||||
|
||||
_config_ptr_table_destroy();
|
||||
_config_host_table_destroy();
|
||||
_config_ptr_table_destroy(1);
|
||||
_config_host_table_destroy(1);
|
||||
|
||||
if (_conf_dhcp_lease_dnsmasq_add(dns_conf_dnsmasq_lease_file) != 0) {
|
||||
return -1;
|
||||
@@ -2972,18 +3307,20 @@ static int _config_log_level(void *data, int argc, char *argv[])
|
||||
/* read log level and set */
|
||||
char *value = argv[1];
|
||||
|
||||
if (strncmp("debug", value, MAX_LINE_LEN) == 0) {
|
||||
if (strncasecmp("debug", value, MAX_LINE_LEN) == 0) {
|
||||
dns_conf_log_level = TLOG_DEBUG;
|
||||
} else if (strncmp("info", value, MAX_LINE_LEN) == 0) {
|
||||
} else if (strncasecmp("info", value, MAX_LINE_LEN) == 0) {
|
||||
dns_conf_log_level = TLOG_INFO;
|
||||
} else if (strncmp("notice", value, MAX_LINE_LEN) == 0) {
|
||||
} else if (strncasecmp("notice", value, MAX_LINE_LEN) == 0) {
|
||||
dns_conf_log_level = TLOG_NOTICE;
|
||||
} else if (strncmp("warn", value, MAX_LINE_LEN) == 0) {
|
||||
} else if (strncasecmp("warn", value, MAX_LINE_LEN) == 0) {
|
||||
dns_conf_log_level = TLOG_WARN;
|
||||
} else if (strncmp("error", value, MAX_LINE_LEN) == 0) {
|
||||
} else if (strncasecmp("error", value, MAX_LINE_LEN) == 0) {
|
||||
dns_conf_log_level = TLOG_ERROR;
|
||||
} else if (strncmp("fatal", value, MAX_LINE_LEN) == 0) {
|
||||
} else if (strncasecmp("fatal", value, MAX_LINE_LEN) == 0) {
|
||||
dns_conf_log_level = TLOG_FATAL;
|
||||
} else if (strncasecmp("off", value, MAX_LINE_LEN) == 0) {
|
||||
dns_conf_log_level = TLOG_OFF;
|
||||
} else {
|
||||
return -1;
|
||||
}
|
||||
@@ -3041,11 +3378,16 @@ static struct config_item _config_item[] = {
|
||||
CONF_YESNO("resolv-hostname", &dns_conf_resolv_hostname),
|
||||
CONF_CUSTOM("bind", _config_bind_ip_udp, NULL),
|
||||
CONF_CUSTOM("bind-tcp", _config_bind_ip_tcp, NULL),
|
||||
CONF_CUSTOM("bind-tls", _config_bind_ip_tls, NULL),
|
||||
CONF_CUSTOM("bind-cert-file", _config_option_parser_filepath, &dns_conf_bind_ca_file),
|
||||
CONF_CUSTOM("bind-cert-key-file", _config_option_parser_filepath, &dns_conf_bind_ca_key_file),
|
||||
CONF_STRING("bind-cert-key-pass", dns_conf_bind_ca_key_pass, DNS_MAX_PATH),
|
||||
CONF_CUSTOM("server", _config_server_udp, NULL),
|
||||
CONF_CUSTOM("server-tcp", _config_server_tcp, NULL),
|
||||
CONF_CUSTOM("server-tls", _config_server_tls, NULL),
|
||||
CONF_CUSTOM("server-https", _config_server_https, NULL),
|
||||
CONF_CUSTOM("nameserver", _config_nameserver, NULL),
|
||||
CONF_YESNO("expand-ptr-from-address", &dns_conf_expand_ptr_from_address),
|
||||
CONF_CUSTOM("address", _config_address, NULL),
|
||||
CONF_CUSTOM("cname", _config_cname, NULL),
|
||||
CONF_CUSTOM("proxy-server", _config_proxy_server, NULL),
|
||||
@@ -3058,9 +3400,10 @@ static struct config_item _config_item[] = {
|
||||
CONF_CUSTOM("nftset-no-speed", _config_nftset_no_speed, NULL),
|
||||
CONF_CUSTOM("speed-check-mode", _config_speed_check_mode, NULL),
|
||||
CONF_INT("tcp-idle-time", &dns_conf_tcp_idle_time, 0, 3600),
|
||||
CONF_INT("cache-size", &dns_conf_cachesize, 0, CONF_INT_MAX),
|
||||
CONF_STRING("cache-file", (char *)&dns_conf_cache_file, DNS_MAX_PATH),
|
||||
CONF_SSIZE("cache-size", &dns_conf_cachesize, 0, CONF_INT_MAX),
|
||||
CONF_CUSTOM("cache-file", _config_option_parser_filepath, (char *)&dns_conf_cache_file),
|
||||
CONF_YESNO("cache-persist", &dns_conf_cache_persist),
|
||||
CONF_INT("cache-checkpoint-time", &dns_conf_cache_checkpoint_time, 0, 3600 * 24 * 7),
|
||||
CONF_YESNO("prefetch-domain", &dns_conf_prefetch),
|
||||
CONF_YESNO("serve-expired", &dns_conf_serve_expired),
|
||||
CONF_INT("serve-expired-ttl", &dns_conf_serve_expired_ttl, 0, CONF_INT_MAX),
|
||||
@@ -3071,16 +3414,18 @@ static struct config_item _config_item[] = {
|
||||
CONF_INT("dualstack-ip-selection-threshold", &dns_conf_dualstack_ip_selection_threshold, 0, 1000),
|
||||
CONF_CUSTOM("dns64", _config_dns64, NULL),
|
||||
CONF_CUSTOM("log-level", _config_log_level, NULL),
|
||||
CONF_STRING("log-file", (char *)dns_conf_log_file, DNS_MAX_PATH),
|
||||
CONF_CUSTOM("log-file", _config_option_parser_filepath, (char *)dns_conf_log_file),
|
||||
CONF_SIZE("log-size", &dns_conf_log_size, 0, 1024 * 1024 * 1024),
|
||||
CONF_INT("log-num", &dns_conf_log_num, 0, 1024),
|
||||
CONF_YESNO("log-console", &dns_conf_log_console),
|
||||
CONF_INT_BASE("log-file-mode", &dns_conf_log_file_mode, 0, 511, 8),
|
||||
CONF_YESNO("audit-enable", &dns_conf_audit_enable),
|
||||
CONF_YESNO("audit-SOA", &dns_conf_audit_log_SOA),
|
||||
CONF_STRING("audit-file", (char *)&dns_conf_audit_file, DNS_MAX_PATH),
|
||||
CONF_CUSTOM("audit-file", _config_option_parser_filepath, (char *)&dns_conf_audit_file),
|
||||
CONF_INT_BASE("audit-file-mode", &dns_conf_audit_file_mode, 0, 511, 8),
|
||||
CONF_SIZE("audit-size", &dns_conf_audit_size, 0, 1024 * 1024 * 1024),
|
||||
CONF_INT("audit-num", &dns_conf_audit_num, 0, 1024),
|
||||
CONF_YESNO("audit-console", &dns_conf_audit_console),
|
||||
CONF_INT("rr-ttl", &dns_conf_rr_ttl, 0, CONF_INT_MAX),
|
||||
CONF_INT("rr-ttl-min", &dns_conf_rr_ttl_min, 0, CONF_INT_MAX),
|
||||
CONF_INT("rr-ttl-max", &dns_conf_rr_ttl_max, 0, CONF_INT_MAX),
|
||||
@@ -3163,6 +3508,15 @@ int config_additional_file(void *data, int argc, char *argv[])
|
||||
return load_conf(file_path, _config_item, _conf_printf);
|
||||
}
|
||||
|
||||
const char *dns_conf_get_cache_dir(void)
|
||||
{
|
||||
if (dns_conf_cache_file[0] == '\0') {
|
||||
return SMARTDNS_CACHE_FILE;
|
||||
}
|
||||
|
||||
return dns_conf_cache_file;
|
||||
}
|
||||
|
||||
static int _dns_server_load_conf_init(void)
|
||||
{
|
||||
dns_conf_address_rule.ipv4 = New_Radix();
|
||||
@@ -3185,6 +3539,35 @@ static int _dns_server_load_conf_init(void)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void dns_server_bind_destroy(void)
|
||||
{
|
||||
for (int i = 0; i < dns_conf_bind_ip_num; i++) {
|
||||
struct dns_bind_ip *bind_ip = &dns_conf_bind_ip[i];
|
||||
|
||||
if (bind_ip->nftset_ipset_rule.ipset) {
|
||||
_dns_rule_put(&bind_ip->nftset_ipset_rule.ipset->head);
|
||||
}
|
||||
|
||||
if (bind_ip->nftset_ipset_rule.ipset_ip) {
|
||||
_dns_rule_put(&bind_ip->nftset_ipset_rule.ipset_ip->head);
|
||||
}
|
||||
|
||||
if (bind_ip->nftset_ipset_rule.ipset_ip6) {
|
||||
_dns_rule_put(&bind_ip->nftset_ipset_rule.ipset_ip6->head);
|
||||
}
|
||||
|
||||
if (bind_ip->nftset_ipset_rule.nftset_ip) {
|
||||
_dns_rule_put(&bind_ip->nftset_ipset_rule.nftset_ip->head);
|
||||
}
|
||||
|
||||
if (bind_ip->nftset_ipset_rule.nftset_ip6) {
|
||||
_dns_rule_put(&bind_ip->nftset_ipset_rule.nftset_ip6->head);
|
||||
}
|
||||
}
|
||||
memset(dns_conf_bind_ip, 0, sizeof(dns_conf_bind_ip));
|
||||
dns_conf_bind_ip_num = 0;
|
||||
}
|
||||
|
||||
void dns_server_load_exit(void)
|
||||
{
|
||||
_config_domain_destroy();
|
||||
@@ -3193,10 +3576,25 @@ void dns_server_load_exit(void)
|
||||
_config_ipset_table_destroy();
|
||||
_config_nftset_table_destroy();
|
||||
_config_group_table_destroy();
|
||||
_config_ptr_table_destroy();
|
||||
_config_host_table_destroy();
|
||||
_config_ptr_table_destroy(0);
|
||||
_config_host_table_destroy(0);
|
||||
_config_qtype_soa_table_destroy();
|
||||
_config_proxy_table_destroy();
|
||||
|
||||
dns_conf_server_num = 0;
|
||||
dns_server_bind_destroy();
|
||||
}
|
||||
|
||||
static int _config_add_default_server_if_needed(void)
|
||||
{
|
||||
if (dns_conf_bind_ip_num > 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* add default server */
|
||||
char *argv[] = {"bind", "[::]:53", 0};
|
||||
int argc = sizeof(argv) / sizeof(char *) - 1;
|
||||
return _config_bind_ip(argc, argv, DNS_BIND_TYPE_UDP);
|
||||
}
|
||||
|
||||
static int _dns_conf_speed_check_mode_verify(void)
|
||||
@@ -3264,11 +3662,37 @@ errout:
|
||||
return -1;
|
||||
}
|
||||
|
||||
static void _dns_conf_auto_set_cache_size(void)
|
||||
{
|
||||
uint64_t memsize = get_system_mem_size();
|
||||
if (dns_conf_cachesize >= 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (memsize <= 16 * 1024 * 1024) {
|
||||
dns_conf_cachesize = 2048; /* 1MB memory */
|
||||
} else if (memsize <= 32 * 1024 * 1024) {
|
||||
dns_conf_cachesize = 8192; /* 4MB memory*/
|
||||
} else if (memsize <= 64 * 1024 * 1024) {
|
||||
dns_conf_cachesize = 16384; /* 8MB memory*/
|
||||
} else if (memsize <= 128 * 1024 * 1024) {
|
||||
dns_conf_cachesize = 32768; /* 16MB memory*/
|
||||
} else if (memsize <= 256 * 1024 * 1024) {
|
||||
dns_conf_cachesize = 65536; /* 32MB memory*/
|
||||
} else if (memsize <= 512 * 1024 * 1024) {
|
||||
dns_conf_cachesize = 131072; /* 64MB memory*/
|
||||
} else {
|
||||
dns_conf_cachesize = 262144; /* 128MB memory*/
|
||||
}
|
||||
}
|
||||
|
||||
static int _dns_conf_load_post(void)
|
||||
{
|
||||
_config_setup_smartdns_domain();
|
||||
_dns_conf_speed_check_mode_verify();
|
||||
|
||||
_dns_conf_auto_set_cache_size();
|
||||
|
||||
if (dns_conf_cachesize == 0 && dns_conf_response_mode == DNS_RESPONSE_MODE_FASTEST_RESPONSE) {
|
||||
dns_conf_response_mode = DNS_RESPONSE_MODE_FASTEST_IP;
|
||||
tlog(TLOG_WARN, "force set response to %s as cache size is 0",
|
||||
@@ -3283,26 +3707,34 @@ static int _dns_conf_load_post(void)
|
||||
dns_conf_rr_ttl_max = dns_conf_rr_ttl_min;
|
||||
}
|
||||
|
||||
if (dns_conf_local_ttl == 0) {
|
||||
dns_conf_local_ttl = dns_conf_rr_ttl_min;
|
||||
}
|
||||
|
||||
if (dns_resolv_file[0] == '\0') {
|
||||
safe_strncpy(dns_resolv_file, DNS_RESOLV_FILE, sizeof(dns_resolv_file));
|
||||
}
|
||||
|
||||
_config_domain_set_name_table_destroy();
|
||||
|
||||
_config_update_bootstrap_dns_rule();
|
||||
|
||||
_config_add_default_server_if_needed();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int dns_server_load_conf(const char *file)
|
||||
{
|
||||
int ret = 0;
|
||||
_dns_conf_load_pre();
|
||||
ret = _dns_conf_load_pre();
|
||||
if (ret != 0) {
|
||||
return ret;
|
||||
}
|
||||
|
||||
openlog("smartdns", LOG_CONS | LOG_NDELAY, LOG_LOCAL1);
|
||||
ret = load_conf(file, _config_item, _conf_printf);
|
||||
closelog();
|
||||
_dns_conf_load_post();
|
||||
if (ret != 0) {
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = _dns_conf_load_post();
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
#include "proxy.h"
|
||||
#include "radix.h"
|
||||
|
||||
#ifdef __cpluscplus
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
@@ -60,8 +60,10 @@ extern "C" {
|
||||
#define SMARTDNS_CONF_FILE "/etc/smartdns/smartdns.conf"
|
||||
#define SMARTDNS_LOG_FILE "/var/log/smartdns/smartdns.log"
|
||||
#define SMARTDNS_AUDIT_FILE "/var/log/smartdns/smartdns-audit.log"
|
||||
#define SMARTDNS_CACHE_FILE "/tmp/smartdns.cache"
|
||||
#define SMARTDNS_CACHE_FILE "/var/cache/smartdns/smartdns.cache"
|
||||
#define SMARTDNS_TMP_CACHE_FILE "/tmp/smartdns.cache"
|
||||
#define SMARTDNS_DEBUG_DIR "/tmp/smartdns"
|
||||
#define DNS_RESOLV_FILE "/etc/resolv.conf"
|
||||
|
||||
enum domain_rule {
|
||||
DOMAIN_RULE_FLAGS = 0,
|
||||
@@ -74,6 +76,7 @@ enum domain_rule {
|
||||
DOMAIN_RULE_NFTSET_IP6,
|
||||
DOMAIN_RULE_NAMESERVER,
|
||||
DOMAIN_RULE_CHECKSPEED,
|
||||
DOMAIN_RULE_RESPONSE_MODE,
|
||||
DOMAIN_RULE_CNAME,
|
||||
DOMAIN_RULE_TTL,
|
||||
DOMAIN_RULE_MAX,
|
||||
@@ -83,12 +86,15 @@ typedef enum {
|
||||
DNS_BIND_TYPE_UDP,
|
||||
DNS_BIND_TYPE_TCP,
|
||||
DNS_BIND_TYPE_TLS,
|
||||
DNS_BIND_TYPE_HTTPS,
|
||||
} DNS_BIND_TYPE;
|
||||
|
||||
#define DOMAIN_CHECK_NONE 0
|
||||
#define DOMAIN_CHECK_ICMP 1
|
||||
#define DOMAIN_CHECK_TCP 2
|
||||
#define DOMAIN_CHECK_NUM 3
|
||||
typedef enum {
|
||||
DOMAIN_CHECK_NONE = 0,
|
||||
DOMAIN_CHECK_ICMP = 1,
|
||||
DOMAIN_CHECK_TCP = 2,
|
||||
DOMAIN_CHECK_NUM = 3,
|
||||
} DOMAIN_CHECK_TYPE;
|
||||
|
||||
#define DOMAIN_FLAG_ADDR_SOA (1 << 0)
|
||||
#define DOMAIN_FLAG_ADDR_IPV4_SOA (1 << 1)
|
||||
@@ -107,6 +113,7 @@ typedef enum {
|
||||
#define DOMAIN_FLAG_NFTSET_IP6_IGN (1 << 14)
|
||||
#define DOMAIN_FLAG_NO_SERVE_EXPIRED (1 << 15)
|
||||
#define DOMAIN_FLAG_CNAME_IGN (1 << 16)
|
||||
#define DOMAIN_FLAG_NO_CACHE (1 << 17)
|
||||
|
||||
#define SERVER_FLAG_EXCLUDE_DEFAULT (1 << 0)
|
||||
|
||||
@@ -120,6 +127,13 @@ typedef enum {
|
||||
#define BIND_FLAG_NO_DUALSTACK_SELECTION (1 << 7)
|
||||
#define BIND_FLAG_FORCE_AAAA_SOA (1 << 8)
|
||||
#define BIND_FLAG_NO_RULE_CNAME (1 << 9)
|
||||
#define BIND_FLAG_NO_RULE_NFTSET (1 << 10)
|
||||
|
||||
enum response_mode_type {
|
||||
DNS_RESPONSE_MODE_FIRST_PING_IP = 0,
|
||||
DNS_RESPONSE_MODE_FASTEST_IP,
|
||||
DNS_RESPONSE_MODE_FASTEST_RESPONSE,
|
||||
};
|
||||
|
||||
struct dns_rule {
|
||||
atomic_t refcnt;
|
||||
@@ -215,7 +229,7 @@ struct dns_server_groups {
|
||||
};
|
||||
|
||||
struct dns_domain_check_order {
|
||||
char type;
|
||||
DOMAIN_CHECK_TYPE type;
|
||||
unsigned short tcp_port;
|
||||
};
|
||||
|
||||
@@ -224,6 +238,11 @@ struct dns_domain_check_orders {
|
||||
struct dns_domain_check_order orders[DOMAIN_CHECK_NUM];
|
||||
};
|
||||
|
||||
struct dns_response_mode_rule {
|
||||
struct dns_rule head;
|
||||
enum response_mode_type mode;
|
||||
};
|
||||
|
||||
struct dns_group_table {
|
||||
DECLARE_HASHTABLE(group, 8);
|
||||
};
|
||||
@@ -233,6 +252,8 @@ struct dns_ptr {
|
||||
struct hlist_node node;
|
||||
char ptr_domain[DNS_MAX_PTR_LEN];
|
||||
char hostname[DNS_MAX_CNAME_LEN];
|
||||
char is_dynamic;
|
||||
char is_soa;
|
||||
};
|
||||
|
||||
struct dns_ptr_table {
|
||||
@@ -250,7 +271,8 @@ struct dns_hosts {
|
||||
char domain[DNS_MAX_CNAME_LEN];
|
||||
dns_hosts_type host_type;
|
||||
int dns_type;
|
||||
int is_soa;
|
||||
char is_soa;
|
||||
char is_dynamic;
|
||||
union {
|
||||
unsigned char ipv4_addr[DNS_RR_A_LEN];
|
||||
unsigned char ipv6_addr[DNS_RR_AAAA_LEN];
|
||||
@@ -274,6 +296,12 @@ struct dns_proxy_table {
|
||||
};
|
||||
extern struct dns_proxy_table dns_proxy_table;
|
||||
|
||||
struct dns_edns_client_subnet {
|
||||
int enable;
|
||||
char ip[DNS_MAX_IPLEN];
|
||||
int subnet;
|
||||
};
|
||||
|
||||
struct dns_servers {
|
||||
char server[DNS_MAX_IPLEN];
|
||||
unsigned short port;
|
||||
@@ -290,6 +318,8 @@ struct dns_servers {
|
||||
char tls_host_verify[DNS_MAX_CNAME_LEN];
|
||||
char path[DNS_MAX_URL_LEN];
|
||||
char proxyname[PROXY_NAME_LEN];
|
||||
struct dns_edns_client_subnet ipv4_ecs;
|
||||
struct dns_edns_client_subnet ipv6_ecs;
|
||||
};
|
||||
|
||||
struct dns_proxy_servers {
|
||||
@@ -327,22 +357,28 @@ struct dns_ip_address_rule {
|
||||
unsigned int ip_ignore : 1;
|
||||
};
|
||||
|
||||
struct dns_edns_client_subnet {
|
||||
int enable;
|
||||
char ip[DNS_MAX_IPLEN];
|
||||
int subnet;
|
||||
};
|
||||
|
||||
struct dns_conf_address_rule {
|
||||
radix_tree_t *ipv4;
|
||||
radix_tree_t *ipv6;
|
||||
};
|
||||
|
||||
struct nftset_ipset_rules {
|
||||
struct dns_ipset_rule *ipset;
|
||||
struct dns_ipset_rule *ipset_ip;
|
||||
struct dns_ipset_rule *ipset_ip6;
|
||||
struct dns_nftset_rule *nftset_ip;
|
||||
struct dns_nftset_rule *nftset_ip6;
|
||||
};
|
||||
|
||||
struct dns_bind_ip {
|
||||
DNS_BIND_TYPE type;
|
||||
uint32_t flags;
|
||||
char ip[DNS_MAX_IPLEN];
|
||||
const char *ssl_cert_file;
|
||||
const char *ssl_cert_key_file;
|
||||
const char *ssl_cert_key_pass;
|
||||
const char *group;
|
||||
struct nftset_ipset_rules nftset_ipset_rule;
|
||||
};
|
||||
|
||||
struct dns_qtype_soa_list {
|
||||
@@ -404,8 +440,13 @@ extern struct dns_dns64 dns_conf_dns_dns64;
|
||||
extern struct dns_bind_ip dns_conf_bind_ip[DNS_MAX_BIND_IP];
|
||||
extern int dns_conf_bind_ip_num;
|
||||
|
||||
extern char dns_conf_bind_ca_file[DNS_MAX_PATH];
|
||||
extern char dns_conf_bind_ca_key_file[DNS_MAX_PATH];
|
||||
extern char dns_conf_bind_ca_key_pass[DNS_MAX_PATH];
|
||||
extern char dns_conf_need_cert;
|
||||
|
||||
extern int dns_conf_tcp_idle_time;
|
||||
extern int dns_conf_cachesize;
|
||||
extern ssize_t dns_conf_cachesize;
|
||||
extern int dns_conf_prefetch;
|
||||
extern int dns_conf_serve_expired;
|
||||
extern int dns_conf_serve_expired_ttl;
|
||||
@@ -423,12 +464,14 @@ extern char dns_conf_log_file[DNS_MAX_PATH];
|
||||
extern size_t dns_conf_log_size;
|
||||
extern int dns_conf_log_num;
|
||||
extern int dns_conf_log_file_mode;
|
||||
extern int dns_conf_log_console;
|
||||
|
||||
extern char dns_conf_ca_file[DNS_MAX_PATH];
|
||||
extern char dns_conf_ca_path[DNS_MAX_PATH];
|
||||
|
||||
extern char dns_conf_cache_file[DNS_MAX_PATH];
|
||||
extern int dns_conf_cache_persist;
|
||||
extern int dns_conf_cache_checkpoint_time;
|
||||
|
||||
extern struct dns_domain_check_orders dns_conf_check_orders;
|
||||
|
||||
@@ -441,6 +484,7 @@ extern char dns_conf_audit_file[DNS_MAX_PATH];
|
||||
extern size_t dns_conf_audit_size;
|
||||
extern int dns_conf_audit_num;
|
||||
extern int dns_conf_audit_file_mode;
|
||||
extern int dns_conf_audit_console;
|
||||
|
||||
extern char dns_conf_server_name[DNS_MAX_SERVER_NAME_LEN];
|
||||
extern art_tree dns_conf_domain_rule;
|
||||
@@ -451,11 +495,6 @@ extern int dns_conf_dualstack_ip_allow_force_AAAA;
|
||||
extern int dns_conf_dualstack_ip_selection_threshold;
|
||||
|
||||
extern int dns_conf_max_reply_ip_num;
|
||||
enum response_mode_type {
|
||||
DNS_RESPONSE_MODE_FIRST_PING_IP = 0,
|
||||
DNS_RESPONSE_MODE_FASTEST_IP,
|
||||
DNS_RESPONSE_MODE_FASTEST_RESPONSE,
|
||||
};
|
||||
extern enum response_mode_type dns_conf_response_mode;
|
||||
|
||||
extern int dns_conf_rr_ttl;
|
||||
@@ -490,7 +529,10 @@ int dns_server_check_update_hosts(void);
|
||||
struct dns_proxy_names *dns_server_get_proxy_nams(const char *proxyname);
|
||||
|
||||
extern int config_additional_file(void *data, int argc, char *argv[]);
|
||||
#ifdef __cpluscplus
|
||||
|
||||
const char *dns_conf_get_cache_dir(void);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
#endif // !_DNS_CONF
|
||||
|
||||
1333
src/dns_server.c
1333
src/dns_server.c
File diff suppressed because it is too large
Load Diff
@@ -20,10 +20,10 @@
|
||||
#define _SMART_DNS_SERVER_H
|
||||
|
||||
#include "dns.h"
|
||||
#include <stdint.h>
|
||||
#include "dns_client.h"
|
||||
#include <stdint.h>
|
||||
|
||||
#ifdef __cpluscplus
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
@@ -35,6 +35,10 @@ struct dns_server_query_option {
|
||||
struct dns_query_ecs_ip ecs_ip;
|
||||
};
|
||||
|
||||
int dns_is_ipv6_ready(void);
|
||||
|
||||
void dns_server_check_ipv6_ready(void);
|
||||
|
||||
int dns_server_init(void);
|
||||
|
||||
int dns_server_run(void);
|
||||
@@ -53,7 +57,7 @@ typedef int (*dns_result_callback)(const char *domain, dns_rtcode_t rtcode, dns_
|
||||
int dns_server_query(const char *domain, int qtype, struct dns_server_query_option *server_query_option,
|
||||
dns_result_callback callback, void *user_ptr);
|
||||
|
||||
#ifdef __cpluscplus
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
336
src/fast_ping.c
336
src/fast_ping.c
@@ -40,6 +40,7 @@
|
||||
#include <sys/eventfd.h>
|
||||
#include <sys/resource.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/timerfd.h>
|
||||
#include <sys/types.h>
|
||||
#include <unistd.h>
|
||||
|
||||
@@ -95,6 +96,18 @@ struct fast_ping_packet {
|
||||
struct fast_ping_packet_msg msg;
|
||||
};
|
||||
|
||||
struct fast_ping_fake_ip {
|
||||
struct hlist_node node;
|
||||
atomic_t ref;
|
||||
PING_TYPE type;
|
||||
FAST_PING_TYPE ping_type;
|
||||
char host[PING_MAX_HOSTLEN];
|
||||
int ttl;
|
||||
float time;
|
||||
struct sockaddr_storage addr;
|
||||
int addr_len;
|
||||
};
|
||||
|
||||
struct ping_host_struct {
|
||||
atomic_t ref;
|
||||
atomic_t notified;
|
||||
@@ -127,6 +140,9 @@ struct ping_host_struct {
|
||||
};
|
||||
socklen_t addr_len;
|
||||
struct fast_ping_packet packet;
|
||||
|
||||
struct fast_ping_fake_ip *fake;
|
||||
int fake_time_fd;
|
||||
};
|
||||
|
||||
struct fast_ping_notify_event {
|
||||
@@ -163,6 +179,8 @@ struct fast_ping_struct {
|
||||
|
||||
pthread_mutex_t map_lock;
|
||||
DECLARE_HASHTABLE(addrmap, 6);
|
||||
DECLARE_HASHTABLE(fake, 6);
|
||||
int fake_ip_num;
|
||||
};
|
||||
|
||||
static struct fast_ping_struct ping;
|
||||
@@ -170,6 +188,8 @@ static atomic_t ping_sid = ATOMIC_INIT(0);
|
||||
static int bool_print_log = 1;
|
||||
|
||||
static void _fast_ping_host_put(struct ping_host_struct *ping_host);
|
||||
static int _fast_ping_get_addr_by_type(PING_TYPE type, const char *ip_str, int port, struct addrinfo **out_gai,
|
||||
FAST_PING_TYPE *out_ping_type);
|
||||
|
||||
static void _fast_ping_wakeup_thread(void)
|
||||
{
|
||||
@@ -336,7 +356,8 @@ static struct addrinfo *_fast_ping_getaddr(const char *host, const char *port, i
|
||||
hints.ai_protocol = protocol;
|
||||
errcode = getaddrinfo(host, port, &hints, &result);
|
||||
if (errcode != 0) {
|
||||
tlog(TLOG_ERROR, "get addr info failed. host:%s, port: %s, error %s\n", host, port, gai_strerror(errcode));
|
||||
tlog(TLOG_ERROR, "get addr info failed. host:%s, port: %s, error %s\n", host != NULL ? host : "",
|
||||
port != NULL ? port : "", gai_strerror(errcode));
|
||||
goto errout;
|
||||
}
|
||||
|
||||
@@ -375,6 +396,179 @@ errout:
|
||||
return -1;
|
||||
}
|
||||
|
||||
static void _fast_ping_fake_put(struct fast_ping_fake_ip *fake)
|
||||
{
|
||||
int ref_cnt = atomic_dec_and_test(&fake->ref);
|
||||
if (!ref_cnt) {
|
||||
if (ref_cnt < 0) {
|
||||
tlog(TLOG_ERROR, "invalid refcount of fake ping %s", fake->host);
|
||||
abort();
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
pthread_mutex_lock(&ping.map_lock);
|
||||
if (hash_hashed(&fake->node)) {
|
||||
hash_del(&fake->node);
|
||||
}
|
||||
pthread_mutex_unlock(&ping.map_lock);
|
||||
|
||||
free(fake);
|
||||
}
|
||||
|
||||
static void _fast_ping_fake_remove(struct fast_ping_fake_ip *fake)
|
||||
{
|
||||
pthread_mutex_lock(&ping.map_lock);
|
||||
if (hash_hashed(&fake->node)) {
|
||||
hash_del(&fake->node);
|
||||
}
|
||||
pthread_mutex_unlock(&ping.map_lock);
|
||||
|
||||
_fast_ping_fake_put(fake);
|
||||
}
|
||||
|
||||
static void _fast_ping_fake_get(struct fast_ping_fake_ip *fake)
|
||||
{
|
||||
atomic_inc(&fake->ref);
|
||||
}
|
||||
|
||||
static struct fast_ping_fake_ip *_fast_ping_fake_find(FAST_PING_TYPE ping_type, struct sockaddr *addr, int addr_len)
|
||||
{
|
||||
struct fast_ping_fake_ip *fake = NULL;
|
||||
struct fast_ping_fake_ip *ret = NULL;
|
||||
uint32_t key = 0;
|
||||
|
||||
if (ping.fake_ip_num == 0) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
key = jhash(addr, addr_len, 0);
|
||||
key = jhash(&ping_type, sizeof(ping_type), key);
|
||||
pthread_mutex_lock(&ping.map_lock);
|
||||
hash_for_each_possible(ping.fake, fake, node, key)
|
||||
{
|
||||
if (fake->ping_type != ping_type) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (fake->addr_len != addr_len) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (memcmp(&fake->addr, addr, fake->addr_len) != 0) {
|
||||
continue;
|
||||
}
|
||||
|
||||
ret = fake;
|
||||
_fast_ping_fake_get(fake);
|
||||
break;
|
||||
}
|
||||
pthread_mutex_unlock(&ping.map_lock);
|
||||
return ret;
|
||||
}
|
||||
|
||||
int fast_ping_fake_ip_add(PING_TYPE type, const char *host, int ttl, float time)
|
||||
{
|
||||
struct fast_ping_fake_ip *fake = NULL;
|
||||
struct fast_ping_fake_ip *fake_old = NULL;
|
||||
char ip_str[PING_MAX_HOSTLEN];
|
||||
int port = -1;
|
||||
FAST_PING_TYPE ping_type = FAST_PING_END;
|
||||
uint32_t key = 0;
|
||||
int ret = -1;
|
||||
struct addrinfo *gai = NULL;
|
||||
|
||||
if (parse_ip(host, ip_str, &port) != 0) {
|
||||
goto errout;
|
||||
}
|
||||
|
||||
ret = _fast_ping_get_addr_by_type(type, ip_str, port, &gai, &ping_type);
|
||||
if (ret != 0) {
|
||||
goto errout;
|
||||
}
|
||||
|
||||
fake_old = _fast_ping_fake_find(ping_type, gai->ai_addr, gai->ai_addrlen);
|
||||
fake = malloc(sizeof(*fake));
|
||||
if (fake == NULL) {
|
||||
goto errout;
|
||||
}
|
||||
memset(fake, 0, sizeof(*fake));
|
||||
|
||||
safe_strncpy(fake->host, ip_str, PING_MAX_HOSTLEN);
|
||||
fake->ttl = ttl;
|
||||
fake->time = time;
|
||||
fake->type = type;
|
||||
fake->ping_type = ping_type;
|
||||
memcpy(&fake->addr, gai->ai_addr, gai->ai_addrlen);
|
||||
fake->addr_len = gai->ai_addrlen;
|
||||
INIT_HLIST_NODE(&fake->node);
|
||||
atomic_set(&fake->ref, 1);
|
||||
|
||||
key = jhash(&fake->addr, fake->addr_len, 0);
|
||||
key = jhash(&ping_type, sizeof(ping_type), key);
|
||||
pthread_mutex_lock(&ping.map_lock);
|
||||
hash_add(ping.fake, &fake->node, key);
|
||||
pthread_mutex_unlock(&ping.map_lock);
|
||||
ping.fake_ip_num++;
|
||||
|
||||
if (fake_old != NULL) {
|
||||
_fast_ping_fake_put(fake_old);
|
||||
_fast_ping_fake_remove(fake_old);
|
||||
}
|
||||
|
||||
freeaddrinfo(gai);
|
||||
return 0;
|
||||
errout:
|
||||
if (fake != NULL) {
|
||||
free(fake);
|
||||
}
|
||||
|
||||
if (fake_old != NULL) {
|
||||
_fast_ping_fake_put(fake_old);
|
||||
}
|
||||
|
||||
if (gai != NULL) {
|
||||
freeaddrinfo(gai);
|
||||
}
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
int fast_ping_fake_ip_remove(PING_TYPE type, const char *host)
|
||||
{
|
||||
struct fast_ping_fake_ip *fake = NULL;
|
||||
char ip_str[PING_MAX_HOSTLEN];
|
||||
int port = -1;
|
||||
int ret = -1;
|
||||
FAST_PING_TYPE ping_type = FAST_PING_END;
|
||||
struct addrinfo *gai = NULL;
|
||||
|
||||
if (parse_ip(host, ip_str, &port) != 0) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
ret = _fast_ping_get_addr_by_type(type, ip_str, port, &gai, &ping_type);
|
||||
if (ret != 0) {
|
||||
goto errout;
|
||||
}
|
||||
|
||||
fake = _fast_ping_fake_find(ping_type, gai->ai_addr, gai->ai_addrlen);
|
||||
if (fake == NULL) {
|
||||
goto errout;
|
||||
}
|
||||
|
||||
_fast_ping_fake_remove(fake);
|
||||
_fast_ping_fake_put(fake);
|
||||
ping.fake_ip_num--;
|
||||
freeaddrinfo(gai);
|
||||
return 0;
|
||||
errout:
|
||||
if (gai != NULL) {
|
||||
freeaddrinfo(gai);
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
static void _fast_ping_host_get(struct ping_host_struct *ping_host)
|
||||
{
|
||||
if (atomic_inc_return(&ping_host->ref) <= 0) {
|
||||
@@ -385,6 +579,15 @@ static void _fast_ping_host_get(struct ping_host_struct *ping_host)
|
||||
|
||||
static void _fast_ping_close_host_sock(struct ping_host_struct *ping_host)
|
||||
{
|
||||
if (ping_host->fake_time_fd > 0) {
|
||||
struct epoll_event *event = NULL;
|
||||
event = (struct epoll_event *)1;
|
||||
epoll_ctl(ping.epoll_fd, EPOLL_CTL_DEL, ping_host->fake_time_fd, event);
|
||||
|
||||
close(ping_host->fake_time_fd);
|
||||
ping_host->fake_time_fd = -1;
|
||||
}
|
||||
|
||||
if (ping_host->fd < 0) {
|
||||
return;
|
||||
}
|
||||
@@ -454,6 +657,10 @@ static void _fast_ping_host_put(struct ping_host_struct *ping_host)
|
||||
}
|
||||
|
||||
_fast_ping_close_host_sock(ping_host);
|
||||
if (ping_host->fake != NULL) {
|
||||
_fast_ping_fake_put(ping_host->fake);
|
||||
ping_host->fake = NULL;
|
||||
}
|
||||
|
||||
pthread_mutex_lock(&ping.map_lock);
|
||||
hash_del(&ping_host->addr_node);
|
||||
@@ -545,6 +752,38 @@ errout:
|
||||
return -1;
|
||||
}
|
||||
|
||||
static int _fast_ping_send_fake(struct ping_host_struct *ping_host, struct fast_ping_fake_ip *fake)
|
||||
{
|
||||
struct itimerspec its;
|
||||
int sec = fake->time / 1000;
|
||||
int cent_usec = ((long)(fake->time * 10)) % 10000;
|
||||
its.it_value.tv_sec = sec;
|
||||
its.it_value.tv_nsec = cent_usec * 1000 * 100;
|
||||
its.it_interval.tv_sec = 0;
|
||||
its.it_interval.tv_nsec = 0;
|
||||
|
||||
if (timerfd_settime(ping_host->fake_time_fd, 0, &its, NULL) < 0) {
|
||||
tlog(TLOG_ERROR, "timerfd_settime failed, %s", strerror(errno));
|
||||
goto errout;
|
||||
}
|
||||
|
||||
struct epoll_event ev;
|
||||
ev.events = EPOLLIN;
|
||||
ev.data.ptr = ping_host;
|
||||
if (epoll_ctl(ping.epoll_fd, EPOLL_CTL_ADD, ping_host->fake_time_fd, &ev) == -1) {
|
||||
if (errno != EEXIST) {
|
||||
goto errout;
|
||||
}
|
||||
}
|
||||
|
||||
ping_host->seq++;
|
||||
|
||||
return 0;
|
||||
|
||||
errout:
|
||||
return -1;
|
||||
}
|
||||
|
||||
static int _fast_ping_sendping_v4(struct ping_host_struct *ping_host)
|
||||
{
|
||||
struct fast_ping_packet *packet = &ping_host->packet;
|
||||
@@ -709,8 +948,16 @@ errout:
|
||||
static int _fast_ping_sendping(struct ping_host_struct *ping_host)
|
||||
{
|
||||
int ret = -1;
|
||||
struct fast_ping_fake_ip *fake = NULL;
|
||||
gettimeofday(&ping_host->last, NULL);
|
||||
|
||||
fake = _fast_ping_fake_find(ping_host->type, &ping_host->addr, ping_host->addr_len);
|
||||
if (fake) {
|
||||
ret = _fast_ping_send_fake(ping_host, fake);
|
||||
_fast_ping_fake_put(fake);
|
||||
return ret;
|
||||
}
|
||||
|
||||
if (ping_host->type == FAST_PING_ICMP) {
|
||||
ret = _fast_ping_sendping_v4(ping_host);
|
||||
} else if (ping_host->type == FAST_PING_ICMP6) {
|
||||
@@ -1009,13 +1256,18 @@ static int _fast_ping_get_addr_by_icmp(const char *ip_str, int port, struct addr
|
||||
goto errout;
|
||||
}
|
||||
|
||||
gai = _fast_ping_getaddr(ip_str, service, socktype, sockproto);
|
||||
if (gai == NULL) {
|
||||
goto errout;
|
||||
if (out_gai != NULL) {
|
||||
gai = _fast_ping_getaddr(ip_str, service, socktype, sockproto);
|
||||
if (gai == NULL) {
|
||||
goto errout;
|
||||
}
|
||||
|
||||
*out_gai = gai;
|
||||
}
|
||||
|
||||
*out_gai = gai;
|
||||
*out_ping_type = ping_type;
|
||||
if (out_ping_type != NULL) {
|
||||
*out_ping_type = ping_type;
|
||||
}
|
||||
|
||||
return 0;
|
||||
errout:
|
||||
@@ -1149,6 +1401,8 @@ struct ping_host_struct *fast_ping_start(PING_TYPE type, const char *host, int c
|
||||
FAST_PING_TYPE ping_type = FAST_PING_END;
|
||||
unsigned int seed = 0;
|
||||
int ret = 0;
|
||||
struct fast_ping_fake_ip *fake = NULL;
|
||||
int fake_time_fd = -1;
|
||||
|
||||
if (parse_ip(host, ip_str, &port) != 0) {
|
||||
goto errout;
|
||||
@@ -1193,6 +1447,19 @@ struct ping_host_struct *fast_ping_start(PING_TYPE type, const char *host, int c
|
||||
|
||||
tlog(TLOG_DEBUG, "ping %s, id = %d", host, ping_host->sid);
|
||||
|
||||
fake = _fast_ping_fake_find(ping_host->type, gai->ai_addr, gai->ai_addrlen);
|
||||
if (fake) {
|
||||
fake_time_fd = timerfd_create(CLOCK_MONOTONIC, TFD_NONBLOCK | TFD_CLOEXEC);
|
||||
if (fake_time_fd < 0) {
|
||||
tlog(TLOG_ERROR, "timerfd_create failed, %s", strerror(errno));
|
||||
goto errout;
|
||||
}
|
||||
/* already take ownership by find. */
|
||||
ping_host->fake = fake;
|
||||
ping_host->fake_time_fd = fake_time_fd;
|
||||
fake = NULL;
|
||||
}
|
||||
|
||||
addrkey = _fast_ping_hash_key(ping_host->sid, &ping_host->addr);
|
||||
|
||||
_fast_ping_host_get(ping_host);
|
||||
@@ -1228,6 +1495,14 @@ errout:
|
||||
free(ping_host);
|
||||
}
|
||||
|
||||
if (fake_time_fd > 0) {
|
||||
close(fake_time_fd);
|
||||
}
|
||||
|
||||
if (fake) {
|
||||
_fast_ping_fake_put(fake);
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -1364,6 +1639,33 @@ errout:
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static int _fast_ping_process_fake(struct ping_host_struct *ping_host, struct timeval *now)
|
||||
{
|
||||
struct timeval tvresult = *now;
|
||||
struct timeval *tvsend = &ping_host->last;
|
||||
uint64_t exp;
|
||||
int ret;
|
||||
|
||||
ret = read(ping_host->fake_time_fd, &exp, sizeof(uint64_t));
|
||||
if (ret < 0) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
ping_host->ttl = ping_host->fake->ttl;
|
||||
tv_sub(&tvresult, tvsend);
|
||||
if (ping_host->ping_callback) {
|
||||
_fast_ping_send_notify_event(ping_host, PING_RESULT_RESPONSE, ping_host->seq, ping_host->ttl, &tvresult);
|
||||
}
|
||||
|
||||
ping_host->send = 0;
|
||||
|
||||
if (ping_host->count == 1) {
|
||||
_fast_ping_host_remove(ping_host);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int _fast_ping_process_icmp(struct ping_host_struct *ping_host, struct timeval *now)
|
||||
{
|
||||
int len = 0;
|
||||
@@ -1591,6 +1893,11 @@ static int _fast_ping_process(struct ping_host_struct *ping_host, struct epoll_e
|
||||
{
|
||||
int ret = -1;
|
||||
|
||||
if (ping_host->fake != NULL) {
|
||||
ret = _fast_ping_process_fake(ping_host, now);
|
||||
return ret;
|
||||
}
|
||||
|
||||
switch (ping_host->type) {
|
||||
case FAST_PING_ICMP6:
|
||||
case FAST_PING_ICMP:
|
||||
@@ -1634,6 +1941,18 @@ static void _fast_ping_remove_all(void)
|
||||
}
|
||||
}
|
||||
|
||||
static void _fast_ping_remove_all_fake_ip(void)
|
||||
{
|
||||
struct fast_ping_fake_ip *fake = NULL;
|
||||
struct hlist_node *tmp = NULL;
|
||||
unsigned long i = 0;
|
||||
|
||||
hash_for_each_safe(ping.fake, i, tmp, fake, node)
|
||||
{
|
||||
_fast_ping_fake_put(fake);
|
||||
}
|
||||
}
|
||||
|
||||
static void _fast_ping_period_run(void)
|
||||
{
|
||||
struct ping_host_struct *ping_host = NULL;
|
||||
@@ -1889,10 +2208,12 @@ int fast_ping_init(void)
|
||||
INIT_LIST_HEAD(&ping.notify_event_list);
|
||||
|
||||
hash_init(ping.addrmap);
|
||||
hash_init(ping.fake);
|
||||
ping.no_unprivileged_ping = !has_unprivileged_ping();
|
||||
ping.ident = (getpid() & 0XFFFF);
|
||||
atomic_set(&ping.run, 1);
|
||||
|
||||
ping.epoll_fd = epollfd;
|
||||
ret = pthread_create(&ping.tid, &attr, _fast_ping_work, NULL);
|
||||
if (ret != 0) {
|
||||
tlog(TLOG_ERROR, "create ping work thread failed, %s\n", strerror(ret));
|
||||
@@ -1905,7 +2226,6 @@ int fast_ping_init(void)
|
||||
goto errout;
|
||||
}
|
||||
|
||||
ping.epoll_fd = epollfd;
|
||||
ret = _fast_ping_init_wakeup_event();
|
||||
if (ret != 0) {
|
||||
tlog(TLOG_ERROR, "init wakeup event failed, %s\n", strerror(errno));
|
||||
@@ -1932,6 +2252,7 @@ errout:
|
||||
|
||||
if (epollfd > 0) {
|
||||
close(epollfd);
|
||||
ping.epoll_fd = -1;
|
||||
}
|
||||
|
||||
if (ping.event_fd) {
|
||||
@@ -1996,6 +2317,7 @@ void fast_ping_exit(void)
|
||||
|
||||
_fast_ping_close_fds();
|
||||
_fast_ping_remove_all();
|
||||
_fast_ping_remove_all_fake_ip();
|
||||
_fast_ping_remove_all_notify_event();
|
||||
|
||||
pthread_cond_destroy(&ping.notify_cond);
|
||||
|
||||
@@ -21,9 +21,9 @@
|
||||
|
||||
#include <netdb.h>
|
||||
#include <sys/time.h>
|
||||
#ifdef __cpluscplus
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
#endif /*__cplusplus */
|
||||
|
||||
typedef enum {
|
||||
PING_TYPE_ICMP = 1,
|
||||
@@ -47,6 +47,10 @@ typedef void (*fast_ping_result)(struct ping_host_struct *ping_host, const char
|
||||
struct ping_host_struct *fast_ping_start(PING_TYPE type, const char *host, int count, int interval, int timeout,
|
||||
fast_ping_result ping_callback, void *userptr);
|
||||
|
||||
int fast_ping_fake_ip_add(PING_TYPE type, const char *host, int ttl, float time);
|
||||
|
||||
int fast_ping_fake_ip_remove(PING_TYPE type, const char *host);
|
||||
|
||||
/* stop ping */
|
||||
int fast_ping_stop(struct ping_host_struct *ping_host);
|
||||
|
||||
@@ -54,8 +58,8 @@ int fast_ping_init(void);
|
||||
|
||||
void fast_ping_exit(void);
|
||||
|
||||
#ifdef __cpluscplus
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
#endif /*__cplusplus */
|
||||
|
||||
#endif // !FAST_PING_H
|
||||
|
||||
@@ -19,9 +19,9 @@
|
||||
#include "http_parse.h"
|
||||
#include "hash.h"
|
||||
#include "hashtable.h"
|
||||
#include "util.h"
|
||||
#include "jhash.h"
|
||||
#include "list.h"
|
||||
#include "util.h"
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
@@ -230,7 +230,7 @@ static int _http_head_parse_response(struct http_head *http_head, char *key, cha
|
||||
if (*tmp_ptr != ' ') {
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
*tmp_ptr = '\0';
|
||||
ret_code = field_start;
|
||||
ret_msg = tmp_ptr + 1;
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
#ifndef HTTP_PARSER_H
|
||||
#define HTTP_PARSER_H
|
||||
|
||||
#ifdef __cpluscplus
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
@@ -80,7 +80,7 @@ int http_head_parse(struct http_head *http_head, const char *data, int data_len)
|
||||
|
||||
void http_head_destroy(struct http_head *http_head);
|
||||
|
||||
#ifdef __cpluscplus
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
@@ -71,6 +71,12 @@ struct config_item_size {
|
||||
size_t max;
|
||||
};
|
||||
|
||||
struct config_item_ssize {
|
||||
ssize_t *data;
|
||||
ssize_t min;
|
||||
ssize_t max;
|
||||
};
|
||||
|
||||
struct config_enum_list {
|
||||
char *name;
|
||||
int id;
|
||||
@@ -116,6 +122,13 @@ struct config_enum {
|
||||
.data = value, .min = min_value, .max = max_value \
|
||||
} \
|
||||
}
|
||||
#define CONF_SSIZE(key, value, min_value, max_value) \
|
||||
{ \
|
||||
key, conf_ssize, &(struct config_item_ssize) \
|
||||
{ \
|
||||
.data = value, .min = min_value, .max = max_value \
|
||||
} \
|
||||
}
|
||||
|
||||
#define CONF_ENUM(key, value, enum) \
|
||||
{ \
|
||||
@@ -153,13 +166,15 @@ extern int conf_yesno(const char *item, void *data, int argc, char *argv[]);
|
||||
|
||||
extern int conf_size(const char *item, void *data, int argc, char *argv[]);
|
||||
|
||||
extern int conf_ssize(const char *item, void *data, int argc, char *argv[]);
|
||||
|
||||
extern int conf_enum(const char *item, void *data, int argc, char *argv[]);
|
||||
|
||||
/*
|
||||
* Example:
|
||||
* int num = 0;
|
||||
*
|
||||
* struct config_item itmes [] = {
|
||||
* struct config_item items [] = {
|
||||
* CONF_INT("CONF_NUM", &num, -1, 10),
|
||||
* CONF_END();
|
||||
* }
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
#ifndef _NFTSET_H
|
||||
#define _NFTSET_H
|
||||
|
||||
#ifdef __cpluscplus
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
@@ -29,7 +29,7 @@ int nftset_add(const char *familyname, const char *tablename, const char *setnam
|
||||
int nftset_del(const char *familyname, const char *tablename, const char *setname, const unsigned char addr[],
|
||||
int addr_len);
|
||||
|
||||
#ifdef __cpluscplus
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
@@ -189,6 +189,39 @@ int conf_size(const char *item, void *data, int argc, char *argv[])
|
||||
return 0;
|
||||
}
|
||||
|
||||
int conf_ssize(const char *item, void *data, int argc, char *argv[])
|
||||
{
|
||||
int base = 1;
|
||||
ssize_t size = 0;
|
||||
int num = 0;
|
||||
struct config_item_ssize *item_size = data;
|
||||
char *value = argv[1];
|
||||
|
||||
if (strstr(value, "k") || strstr(value, "K")) {
|
||||
base = 1024;
|
||||
} else if (strstr(value, "m") || strstr(value, "M")) {
|
||||
base = 1024 * 1024;
|
||||
} else if (strstr(value, "g") || strstr(value, "G")) {
|
||||
base = 1024 * 1024 * 1024;
|
||||
}
|
||||
|
||||
num = atoi(value);
|
||||
if (num < 0) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
size = num * base;
|
||||
if (size > item_size->max) {
|
||||
size = item_size->max;
|
||||
} else if (size < item_size->min) {
|
||||
size = item_size->min;
|
||||
}
|
||||
|
||||
*(item_size->data) = size;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int conf_enum(const char *item, void *data, int argc, char *argv[])
|
||||
{
|
||||
struct config_enum *item_enum = data;
|
||||
@@ -321,6 +354,7 @@ static int load_conf_file(const char *file, struct config_item *items, conf_erro
|
||||
int line_no = 0;
|
||||
int line_len = 0;
|
||||
int read_len = 0;
|
||||
const char *last_file = NULL;
|
||||
|
||||
if (handler == NULL) {
|
||||
handler = load_conf_printf;
|
||||
@@ -374,6 +408,7 @@ static int load_conf_file(const char *file, struct config_item *items, conf_erro
|
||||
|
||||
conf_getopt_reset();
|
||||
/* call item function */
|
||||
last_file = current_conf_file;
|
||||
current_conf_file = file;
|
||||
call_ret = items[i].item_func(items[i].item, items[i].data, argc, argv);
|
||||
ret = handler(file, line_no, call_ret);
|
||||
@@ -383,6 +418,9 @@ static int load_conf_file(const char *file, struct config_item *items, conf_erro
|
||||
}
|
||||
|
||||
conf_getopt_reset();
|
||||
if (last_file) {
|
||||
current_conf_file = last_file;
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
|
||||
15
src/proxy.c
15
src/proxy.c
@@ -542,7 +542,7 @@ static proxy_handshake_state _proxy_handshake_socks5(struct proxy_conn *proxy_co
|
||||
return PROXY_HANDSHAKE_ERR;
|
||||
}
|
||||
|
||||
tlog(TLOG_INFO, "server %s select auth method is %d", proxy_conn->server_info->proxy_name,
|
||||
tlog(TLOG_DEBUG, "server %s select auth method is %d", proxy_conn->server_info->proxy_name,
|
||||
proxy_conn->buffer.buffer[1]);
|
||||
if (proxy_conn->buffer.buffer[1] == PROXY_SOCKS5_AUTH_USER_PASS) {
|
||||
return _proxy_handshake_socks5_send_auth(proxy_conn);
|
||||
@@ -592,7 +592,7 @@ static proxy_handshake_state _proxy_handshake_socks5(struct proxy_conn *proxy_co
|
||||
return PROXY_HANDSHAKE_ERR;
|
||||
}
|
||||
|
||||
tlog(TLOG_INFO, "server %s auth success", proxy_conn->server_info->proxy_name);
|
||||
tlog(TLOG_DEBUG, "server %s auth success", proxy_conn->server_info->proxy_name);
|
||||
proxy_conn->state = PROXY_CONN_CONNECTING;
|
||||
return _proxy_handshake_socks5_reply_connect_addr(proxy_conn);
|
||||
case PROXY_CONN_CONNECTING: {
|
||||
@@ -720,7 +720,7 @@ static proxy_handshake_state _proxy_handshake_socks5(struct proxy_conn *proxy_co
|
||||
}
|
||||
|
||||
proxy_conn->state = PROXY_CONN_CONNECTED;
|
||||
tlog(TLOG_INFO, "success connect to socks5 proxy server %s", proxy_conn->server_info->proxy_name);
|
||||
tlog(TLOG_DEBUG, "success connect to socks5 proxy server %s", proxy_conn->server_info->proxy_name);
|
||||
return PROXY_HANDSHAKE_CONNECTED;
|
||||
} break;
|
||||
default:
|
||||
@@ -802,7 +802,7 @@ static int _proxy_handshake_http(struct proxy_conn *proxy_conn)
|
||||
if (errno == EAGAIN || errno == EWOULDBLOCK) {
|
||||
return PROXY_HANDSHAKE_WANT_READ;
|
||||
}
|
||||
|
||||
|
||||
if (len == 0) {
|
||||
tlog(TLOG_ERROR, "remote server %s closed.", proxy_conn->server_info->proxy_name);
|
||||
} else {
|
||||
@@ -838,7 +838,7 @@ static int _proxy_handshake_http(struct proxy_conn *proxy_conn)
|
||||
if (proxy_conn->buffer.len < 0) {
|
||||
proxy_conn->buffer.len = 0;
|
||||
}
|
||||
tlog(TLOG_INFO, "success connect to http proxy server %s", proxy_conn->server_info->proxy_name);
|
||||
tlog(TLOG_DEBUG, "success connect to http proxy server %s", proxy_conn->server_info->proxy_name);
|
||||
proxy_conn->state = PROXY_CONN_CONNECTED;
|
||||
ret = PROXY_HANDSHAKE_CONNECTED;
|
||||
goto out;
|
||||
@@ -929,6 +929,11 @@ int proxy_conn_sendto(struct proxy_conn *proxy_conn, const void *buf, size_t len
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (sizeof(buffer) - buffer_len <= len) {
|
||||
errno = ENOSPC;
|
||||
return -1;
|
||||
}
|
||||
|
||||
memcpy(buffer + buffer_len, buf, len);
|
||||
buffer_len += len;
|
||||
|
||||
|
||||
299
src/smartdns.c
299
src/smartdns.c
@@ -17,6 +17,7 @@
|
||||
*/
|
||||
|
||||
#define _GNU_SOURCE
|
||||
#include "smartdns.h"
|
||||
#include "art.h"
|
||||
#include "atomic.h"
|
||||
#include "dns_client.h"
|
||||
@@ -46,7 +47,8 @@
|
||||
#include <ucontext.h>
|
||||
|
||||
#define MAX_KEY_LEN 64
|
||||
#define SMARTDNS_PID_FILE "/var/run/smartdns.pid"
|
||||
#define SMARTDNS_PID_FILE "/run/smartdns.pid"
|
||||
#define SMARTDNS_LEGACY_PID_FILE "/var/run/smartdns.pid"
|
||||
#define TMP_BUFF_LEN_32 32
|
||||
|
||||
static int verbose_screen;
|
||||
@@ -54,7 +56,7 @@ static int verbose_screen;
|
||||
int capget(struct __user_cap_header_struct *header, struct __user_cap_data_struct *cap);
|
||||
int capset(struct __user_cap_header_struct *header, struct __user_cap_data_struct *cap);
|
||||
|
||||
static int get_uid_gid(int *uid, int *gid)
|
||||
static int get_uid_gid(uid_t *uid, gid_t *gid)
|
||||
{
|
||||
struct passwd *result = NULL;
|
||||
struct passwd pwd;
|
||||
@@ -63,7 +65,9 @@ static int get_uid_gid(int *uid, int *gid)
|
||||
int ret = -1;
|
||||
|
||||
if (dns_conf_user[0] == '\0') {
|
||||
return -1;
|
||||
*uid = getuid();
|
||||
*gid = getgid();
|
||||
return 0;
|
||||
}
|
||||
|
||||
bufsize = sysconf(_SC_GETPW_R_SIZE_MAX);
|
||||
@@ -107,8 +111,8 @@ static int drop_root_privilege(void)
|
||||
header.version = _LINUX_CAPABILITY_VERSION;
|
||||
#endif
|
||||
header.pid = 0;
|
||||
int uid = 0;
|
||||
int gid = 0;
|
||||
uid_t uid = 0;
|
||||
gid_t gid = 0;
|
||||
int unused __attribute__((unused)) = 0;
|
||||
|
||||
if (get_uid_gid(&uid, &gid) != 0) {
|
||||
@@ -172,7 +176,7 @@ static void _show_version(void)
|
||||
printf("smartdns %s\n", str_ver);
|
||||
}
|
||||
|
||||
static int _smartdns_load_from_resolv(void)
|
||||
static int _smartdns_load_from_resolv_file(const char *resolv_file)
|
||||
{
|
||||
FILE *fp = NULL;
|
||||
char line[MAX_LINE_LEN];
|
||||
@@ -185,9 +189,9 @@ static int _smartdns_load_from_resolv(void)
|
||||
int filed_num = 0;
|
||||
int line_num = 0;
|
||||
|
||||
fp = fopen(dns_resolv_file, "r");
|
||||
fp = fopen(resolv_file, "r");
|
||||
if (fp == NULL) {
|
||||
tlog(TLOG_ERROR, "open %s failed, %s", dns_resolv_file, strerror(errno));
|
||||
tlog(TLOG_ERROR, "open %s failed, %s", resolv_file, strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -214,6 +218,7 @@ static int _smartdns_load_from_resolv(void)
|
||||
safe_strncpy(dns_conf_servers[dns_conf_server_num].server, ns_ip, DNS_MAX_IPLEN);
|
||||
dns_conf_servers[dns_conf_server_num].port = port;
|
||||
dns_conf_servers[dns_conf_server_num].type = DNS_SERVER_UDP;
|
||||
dns_conf_servers[dns_conf_server_num].set_mark = -1;
|
||||
dns_conf_server_num++;
|
||||
ret = 0;
|
||||
}
|
||||
@@ -223,6 +228,69 @@ static int _smartdns_load_from_resolv(void)
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int _smartdns_load_from_resolv(void)
|
||||
{
|
||||
return _smartdns_load_from_resolv_file(dns_resolv_file);
|
||||
}
|
||||
|
||||
static int _smartdns_load_from_default_resolv(void)
|
||||
{
|
||||
return _smartdns_load_from_resolv_file(DNS_RESOLV_FILE);
|
||||
}
|
||||
|
||||
static int _smartdns_prepare_server_flags(struct client_dns_server_flags *flags, struct dns_servers *server)
|
||||
{
|
||||
memset(flags, 0, sizeof(*flags));
|
||||
switch (server->type) {
|
||||
case DNS_SERVER_UDP: {
|
||||
struct client_dns_server_flag_udp *flag_udp = &flags->udp;
|
||||
flag_udp->ttl = server->ttl;
|
||||
} break;
|
||||
case DNS_SERVER_HTTPS: {
|
||||
struct client_dns_server_flag_https *flag_http = &flags->https;
|
||||
flag_http->spi_len = dns_client_spki_decode(server->spki, (unsigned char *)flag_http->spki);
|
||||
safe_strncpy(flag_http->hostname, server->hostname, sizeof(flag_http->hostname));
|
||||
safe_strncpy(flag_http->path, server->path, sizeof(flag_http->path));
|
||||
safe_strncpy(flag_http->httphost, server->httphost, sizeof(flag_http->httphost));
|
||||
safe_strncpy(flag_http->tls_host_verify, server->tls_host_verify, sizeof(flag_http->tls_host_verify));
|
||||
flag_http->skip_check_cert = server->skip_check_cert;
|
||||
} break;
|
||||
case DNS_SERVER_TLS: {
|
||||
struct client_dns_server_flag_tls *flag_tls = &flags->tls;
|
||||
flag_tls->spi_len = dns_client_spki_decode(server->spki, (unsigned char *)flag_tls->spki);
|
||||
safe_strncpy(flag_tls->hostname, server->hostname, sizeof(flag_tls->hostname));
|
||||
safe_strncpy(flag_tls->tls_host_verify, server->tls_host_verify, sizeof(flag_tls->tls_host_verify));
|
||||
flag_tls->skip_check_cert = server->skip_check_cert;
|
||||
|
||||
} break;
|
||||
case DNS_SERVER_TCP:
|
||||
break;
|
||||
default:
|
||||
return -1;
|
||||
break;
|
||||
}
|
||||
|
||||
flags->type = server->type;
|
||||
flags->server_flag = server->server_flag;
|
||||
flags->result_flag = server->result_flag;
|
||||
flags->set_mark = server->set_mark;
|
||||
flags->drop_packet_latency_ms = server->drop_packet_latency_ms;
|
||||
safe_strncpy(flags->proxyname, server->proxyname, sizeof(flags->proxyname));
|
||||
if (server->ipv4_ecs.enable) {
|
||||
flags->ipv4_ecs.enable = 1;
|
||||
safe_strncpy(flags->ipv4_ecs.ip, server->ipv4_ecs.ip, sizeof(flags->ipv4_ecs.ip));
|
||||
flags->ipv4_ecs.subnet = server->ipv4_ecs.subnet;
|
||||
}
|
||||
|
||||
if (server->ipv6_ecs.enable) {
|
||||
flags->ipv6_ecs.enable = 1;
|
||||
safe_strncpy(flags->ipv6_ecs.ip, server->ipv6_ecs.ip, sizeof(flags->ipv6_ecs.ip));
|
||||
flags->ipv6_ecs.subnet = server->ipv6_ecs.subnet;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int _smartdns_add_servers(void)
|
||||
{
|
||||
unsigned long i = 0;
|
||||
@@ -233,44 +301,12 @@ static int _smartdns_add_servers(void)
|
||||
struct client_dns_server_flags flags;
|
||||
|
||||
for (i = 0; i < (unsigned int)dns_conf_server_num; i++) {
|
||||
memset(&flags, 0, sizeof(flags));
|
||||
switch (dns_conf_servers[i].type) {
|
||||
case DNS_SERVER_UDP: {
|
||||
struct client_dns_server_flag_udp *flag_udp = &flags.udp;
|
||||
flag_udp->ttl = dns_conf_servers[i].ttl;
|
||||
} break;
|
||||
case DNS_SERVER_HTTPS: {
|
||||
struct client_dns_server_flag_https *flag_http = &flags.https;
|
||||
flag_http->spi_len = dns_client_spki_decode(dns_conf_servers[i].spki, (unsigned char *)flag_http->spki);
|
||||
safe_strncpy(flag_http->hostname, dns_conf_servers[i].hostname, sizeof(flag_http->hostname));
|
||||
safe_strncpy(flag_http->path, dns_conf_servers[i].path, sizeof(flag_http->path));
|
||||
safe_strncpy(flag_http->httphost, dns_conf_servers[i].httphost, sizeof(flag_http->httphost));
|
||||
safe_strncpy(flag_http->tls_host_verify, dns_conf_servers[i].tls_host_verify,
|
||||
sizeof(flag_http->tls_host_verify));
|
||||
flag_http->skip_check_cert = dns_conf_servers[i].skip_check_cert;
|
||||
} break;
|
||||
case DNS_SERVER_TLS: {
|
||||
struct client_dns_server_flag_tls *flag_tls = &flags.tls;
|
||||
flag_tls->spi_len = dns_client_spki_decode(dns_conf_servers[i].spki, (unsigned char *)flag_tls->spki);
|
||||
safe_strncpy(flag_tls->hostname, dns_conf_servers[i].hostname, sizeof(flag_tls->hostname));
|
||||
safe_strncpy(flag_tls->tls_host_verify, dns_conf_servers[i].tls_host_verify,
|
||||
sizeof(flag_tls->tls_host_verify));
|
||||
flag_tls->skip_check_cert = dns_conf_servers[i].skip_check_cert;
|
||||
|
||||
} break;
|
||||
case DNS_SERVER_TCP:
|
||||
break;
|
||||
default:
|
||||
if (_smartdns_prepare_server_flags(&flags, &dns_conf_servers[i]) != 0) {
|
||||
tlog(TLOG_ERROR, "prepare server flags failed, %s:%d", dns_conf_servers[i].server,
|
||||
dns_conf_servers[i].port);
|
||||
return -1;
|
||||
break;
|
||||
}
|
||||
|
||||
flags.type = dns_conf_servers[i].type;
|
||||
flags.server_flag = dns_conf_servers[i].server_flag;
|
||||
flags.result_flag = dns_conf_servers[i].result_flag;
|
||||
flags.set_mark = dns_conf_servers[i].set_mark;
|
||||
flags.drop_packet_latency_ms = dns_conf_servers[i].drop_packet_latency_ms;
|
||||
safe_strncpy(flags.proxyname, dns_conf_servers[i].proxyname, sizeof(flags.proxyname));
|
||||
ret = dns_client_add_server(dns_conf_servers[i].server, dns_conf_servers[i].port, dns_conf_servers[i].type,
|
||||
&flags);
|
||||
if (ret != 0) {
|
||||
@@ -292,7 +328,13 @@ static int _smartdns_add_servers(void)
|
||||
if (server == NULL) {
|
||||
continue;
|
||||
}
|
||||
ret = dns_client_add_to_group(group->group_name, server->server, server->port, server->type);
|
||||
|
||||
if (_smartdns_prepare_server_flags(&flags, server) != 0) {
|
||||
tlog(TLOG_ERROR, "prepare server flags failed, %s:%d", server->server, server->port);
|
||||
return -1;
|
||||
}
|
||||
|
||||
ret = dns_client_add_to_group(group->group_name, server->server, server->port, server->type, &flags);
|
||||
if (ret != 0) {
|
||||
tlog(TLOG_ERROR, "add server %s to group %s failed", server->server, group->group_name);
|
||||
return -1;
|
||||
@@ -344,6 +386,42 @@ static int _smartdns_set_ecs_ip(void)
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int _smartdns_create_cert(void)
|
||||
{
|
||||
uid_t uid = 0;
|
||||
gid_t gid = 0;
|
||||
|
||||
if (dns_conf_need_cert == 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (dns_conf_bind_ca_file[0] != 0 && dns_conf_bind_ca_key_file[0] != 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
conf_get_conf_fullpath("smartdns-cert.pem", dns_conf_bind_ca_file, sizeof(dns_conf_bind_ca_file));
|
||||
conf_get_conf_fullpath("smartdns-key.pem", dns_conf_bind_ca_key_file, sizeof(dns_conf_bind_ca_key_file));
|
||||
if (access(dns_conf_bind_ca_file, F_OK) == 0 && access(dns_conf_bind_ca_key_file, F_OK) == 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (generate_cert_key(dns_conf_bind_ca_key_file, dns_conf_bind_ca_file, NULL, 365 * 3) != 0) {
|
||||
tlog(TLOG_WARN, "Generate default ssl cert and key file failed. %s", strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
|
||||
int unused __attribute__((unused)) = 0;
|
||||
|
||||
if (get_uid_gid(&uid, &gid) != 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
unused = chown(dns_conf_bind_ca_file, uid, gid);
|
||||
unused = chown(dns_conf_bind_ca_key_file, uid, gid);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int _smartdns_init_ssl(void)
|
||||
{
|
||||
#if OPENSSL_API_COMPAT < 0x10100000L
|
||||
@@ -388,7 +466,10 @@ static int _smartdns_init(void)
|
||||
goto errout;
|
||||
}
|
||||
|
||||
tlog_setlogscreen(verbose_screen);
|
||||
if (verbose_screen != 0 || dns_conf_log_console != 0) {
|
||||
tlog_setlogscreen(1);
|
||||
}
|
||||
|
||||
tlog_setlevel(dns_conf_log_level);
|
||||
if (dns_conf_log_file_mode > 0) {
|
||||
tlog_set_permission(tlog_get_root(), dns_conf_log_file_mode, dns_conf_log_file_mode);
|
||||
@@ -402,12 +483,20 @@ static int _smartdns_init(void)
|
||||
goto errout;
|
||||
}
|
||||
|
||||
for (i = 0; i < 60 && dns_conf_server_num <= 0; i++) {
|
||||
for (i = 0; i < 180 && dns_conf_server_num <= 0; i++) {
|
||||
ret = _smartdns_load_from_resolv();
|
||||
if (ret == 0) {
|
||||
continue;
|
||||
}
|
||||
|
||||
/* try load from default resolv.conf file */
|
||||
if (i > 30 && strncmp(dns_resolv_file, DNS_RESOLV_FILE, MAX_LINE_LEN) != 0) {
|
||||
ret = _smartdns_load_from_default_resolv();
|
||||
if (ret == 0) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
tlog(TLOG_DEBUG, "load dns from resolv failed, retry after 1s, retry times %d.", i + 1);
|
||||
sleep(1);
|
||||
}
|
||||
@@ -539,31 +628,62 @@ static void _reg_signal(void)
|
||||
|
||||
static int _smartdns_create_logdir(void)
|
||||
{
|
||||
int uid = 0;
|
||||
int gid = 0;
|
||||
uid_t uid = 0;
|
||||
gid_t gid = 0;
|
||||
struct stat sb;
|
||||
char logdir[PATH_MAX] = {0};
|
||||
int unused __attribute__((unused)) = 0;
|
||||
|
||||
safe_strncpy(logdir, _smartdns_log_path(), PATH_MAX);
|
||||
dir_name(logdir);
|
||||
|
||||
if (access(logdir, F_OK) == 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (mkdir(logdir, 0750) != 0) {
|
||||
if (errno == EEXIST) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
int unused __attribute__((unused)) = 0;
|
||||
|
||||
if (get_uid_gid(&uid, &gid) != 0) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
unused = chown(logdir, uid, gid);
|
||||
mkdir(logdir, 0750);
|
||||
if (stat(logdir, &sb) == 0 && sb.st_uid == uid && sb.st_gid == gid && (sb.st_mode & 0700) == 0700) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (chown(logdir, uid, gid) != 0) {
|
||||
/* disable log */
|
||||
tlog_set_maxlog_count(0);
|
||||
}
|
||||
|
||||
unused = chmod(logdir, 0750);
|
||||
unused = chown(_smartdns_log_path(), uid, gid);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int _smartdns_create_cache_dir(void)
|
||||
{
|
||||
uid_t uid = 0;
|
||||
gid_t gid = 0;
|
||||
struct stat sb;
|
||||
char cache_dir[PATH_MAX] = {0};
|
||||
int unused __attribute__((unused)) = 0;
|
||||
|
||||
safe_strncpy(cache_dir, dns_conf_get_cache_dir(), PATH_MAX);
|
||||
dir_name(cache_dir);
|
||||
|
||||
if (get_uid_gid(&uid, &gid) != 0) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
mkdir(cache_dir, 0750);
|
||||
if (stat(cache_dir, &sb) == 0 && sb.st_uid == uid && sb.st_gid == gid && (sb.st_mode & 0700) == 0700) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (chown(cache_dir, uid, gid) != 0) {
|
||||
if (dns_conf_cache_file[0] == '\0') {
|
||||
safe_strncpy(dns_conf_cache_file, SMARTDNS_TMP_CACHE_FILE, sizeof(dns_conf_cache_file));
|
||||
}
|
||||
}
|
||||
|
||||
unused = chmod(cache_dir, 0750);
|
||||
unused = chown(dns_conf_get_cache_dir(), uid, gid);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -579,13 +699,48 @@ static int _set_rlimit(void)
|
||||
static int _smartdns_init_pre(void)
|
||||
{
|
||||
_smartdns_create_logdir();
|
||||
_smartdns_create_cache_dir();
|
||||
|
||||
_set_rlimit();
|
||||
|
||||
if (_smartdns_create_cert() != 0) {
|
||||
tlog(TLOG_ERROR, "create cert failed.");
|
||||
return -1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef TEST
|
||||
|
||||
static smartdns_post_func _smartdns_post = NULL;
|
||||
static void *_smartdns_post_arg = NULL;
|
||||
|
||||
int smartdns_reg_post_func(smartdns_post_func func, void *arg)
|
||||
{
|
||||
_smartdns_post = func;
|
||||
_smartdns_post_arg = arg;
|
||||
return 0;
|
||||
}
|
||||
|
||||
#define smartdns_test_notify(retval) smartdns_test_notify_func(fd_notify, retval)
|
||||
static void smartdns_test_notify_func(int fd_notify, uint64_t retval)
|
||||
{
|
||||
/* notify parent kickoff */
|
||||
if (fd_notify > 0) {
|
||||
write(fd_notify, &retval, sizeof(retval));
|
||||
}
|
||||
|
||||
if (_smartdns_post != NULL) {
|
||||
_smartdns_post(_smartdns_post_arg);
|
||||
}
|
||||
}
|
||||
|
||||
int smartdns_main(int argc, char *argv[], int fd_notify)
|
||||
#else
|
||||
#define smartdns_test_notify(retval)
|
||||
int main(int argc, char *argv[])
|
||||
#endif
|
||||
{
|
||||
int ret = 0;
|
||||
int is_foreground = 0;
|
||||
@@ -594,9 +749,15 @@ int main(int argc, char *argv[])
|
||||
char pid_file[MAX_LINE_LEN];
|
||||
int signal_ignore = 0;
|
||||
sigset_t empty_sigblock;
|
||||
struct stat sb;
|
||||
|
||||
safe_strncpy(config_file, SMARTDNS_CONF_FILE, MAX_LINE_LEN);
|
||||
safe_strncpy(pid_file, SMARTDNS_PID_FILE, MAX_LINE_LEN);
|
||||
|
||||
if (stat("/run", &sb) == 0 && S_ISDIR(sb.st_mode)) {
|
||||
safe_strncpy(pid_file, SMARTDNS_PID_FILE, MAX_LINE_LEN);
|
||||
} else {
|
||||
safe_strncpy(pid_file, SMARTDNS_LEGACY_PID_FILE, MAX_LINE_LEN);
|
||||
}
|
||||
|
||||
/* patch for Asus router: unblock all signal*/
|
||||
sigemptyset(&empty_sigblock);
|
||||
@@ -670,11 +831,11 @@ int main(int argc, char *argv[])
|
||||
goto errout;
|
||||
}
|
||||
|
||||
atexit(_smartdns_exit);
|
||||
|
||||
return _smartdns_run();
|
||||
|
||||
smartdns_test_notify(1);
|
||||
ret = _smartdns_run();
|
||||
_smartdns_exit();
|
||||
return ret;
|
||||
errout:
|
||||
|
||||
smartdns_test_notify(2);
|
||||
return 1;
|
||||
}
|
||||
|
||||
39
src/smartdns.h
Normal file
39
src/smartdns.h
Normal file
@@ -0,0 +1,39 @@
|
||||
/*************************************************************************
|
||||
*
|
||||
* Copyright (C) 2018-2023 Ruilin Peng (Nick) <pymumu@gmail.com>.
|
||||
*
|
||||
* smartdns is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* smartdns is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#ifndef SMART_DNS_H
|
||||
#define SMART_DNS_H
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif /*__cplusplus */
|
||||
|
||||
#ifdef TEST
|
||||
|
||||
typedef void (*smartdns_post_func)(void *arg);
|
||||
|
||||
int smartdns_reg_post_func(smartdns_post_func func, void *arg);
|
||||
|
||||
int smartdns_main(int argc, char *argv[], int fd_notify);
|
||||
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif /*__cplusplus */
|
||||
#endif
|
||||
28
src/tlog.c
28
src/tlog.c
@@ -628,30 +628,40 @@ int tlog_printf(struct tlog_log *log, const char *format, ...)
|
||||
return len;
|
||||
}
|
||||
|
||||
static int _tlog_early_print(const char *format, va_list ap)
|
||||
static int _tlog_early_print(tlog_level level, const char *file, int line, const char *func, const char *format, va_list ap)
|
||||
{
|
||||
char log_buf[TLOG_MAX_LINE_LEN];
|
||||
size_t len = 0;
|
||||
size_t out_len = 0;
|
||||
struct tlog_time cur_time;
|
||||
int unused __attribute__((unused));
|
||||
|
||||
if (tlog_disable_early_print) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
len = vsnprintf(log_buf, sizeof(log_buf), format, ap);
|
||||
if (_tlog_gettime(&cur_time) != 0) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
len = snprintf(log_buf, sizeof(log_buf), "[%.4d-%.2d-%.2d %.2d:%.2d:%.2d,%.3d][%5s][%17s:%-4d] ",
|
||||
cur_time.year, cur_time.mon, cur_time.mday, cur_time.hour, cur_time.min, cur_time.sec, cur_time.usec / 1000,
|
||||
tlog_get_level_string(level), file, line);
|
||||
out_len = len;
|
||||
len = vsnprintf(log_buf + out_len, sizeof(log_buf) - out_len - 1, format, ap);
|
||||
out_len += len;
|
||||
if (len <= 0) {
|
||||
return -1;
|
||||
} else if (len >= sizeof(log_buf)) {
|
||||
out_len = sizeof(log_buf);
|
||||
} else if (len >= sizeof(log_buf) - 1) {
|
||||
out_len = sizeof(log_buf) - 1;
|
||||
}
|
||||
|
||||
if (log_buf[out_len - 1] != '\n') {
|
||||
log_buf[out_len] = '\n';
|
||||
out_len++;
|
||||
}
|
||||
|
||||
unused = write(STDOUT_FILENO, log_buf, out_len);
|
||||
if (log_buf[out_len - 1] != '\n') {
|
||||
unused = write(STDOUT_FILENO, "\n", 1);
|
||||
}
|
||||
|
||||
return len;
|
||||
}
|
||||
|
||||
@@ -664,7 +674,7 @@ int tlog_vext(tlog_level level, const char *file, int line, const char *func, vo
|
||||
}
|
||||
|
||||
if (tlog.root == NULL) {
|
||||
return _tlog_early_print(format, ap);
|
||||
return _tlog_early_print(level, file, line, func, format, ap);
|
||||
}
|
||||
|
||||
if (unlikely(tlog.root->logsize <= 0)) {
|
||||
|
||||
@@ -26,7 +26,8 @@ typedef enum {
|
||||
TLOG_WARN = 3,
|
||||
TLOG_ERROR = 4,
|
||||
TLOG_FATAL = 5,
|
||||
TLOG_END = 6
|
||||
TLOG_OFF = 6,
|
||||
TLOG_END = 7
|
||||
} tlog_level;
|
||||
|
||||
struct tlog_time {
|
||||
|
||||
171
src/util.c
171
src/util.c
@@ -37,6 +37,7 @@
|
||||
#include <netinet/tcp.h>
|
||||
#include <openssl/crypto.h>
|
||||
#include <openssl/ssl.h>
|
||||
#include <openssl/x509v3.h>
|
||||
#include <pthread.h>
|
||||
#include <signal.h>
|
||||
#include <stdlib.h>
|
||||
@@ -44,6 +45,7 @@
|
||||
#include <sys/prctl.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/statvfs.h>
|
||||
#include <sys/sysinfo.h>
|
||||
#include <sys/time.h>
|
||||
#include <sys/types.h>
|
||||
#include <time.h>
|
||||
@@ -308,7 +310,7 @@ int parse_ip(const char *value, char *ip, int *port)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int _check_is_ipv4(const char *ip)
|
||||
int check_is_ipv4(const char *ip)
|
||||
{
|
||||
const char *ptr = ip;
|
||||
char c = 0;
|
||||
@@ -342,7 +344,8 @@ static int _check_is_ipv4(const char *ip)
|
||||
|
||||
return 0;
|
||||
}
|
||||
static int _check_is_ipv6(const char *ip)
|
||||
|
||||
int check_is_ipv6(const char *ip)
|
||||
{
|
||||
const char *ptr = ip;
|
||||
char c = 0;
|
||||
@@ -392,15 +395,15 @@ int check_is_ipaddr(const char *ip)
|
||||
{
|
||||
if (strstr(ip, ".")) {
|
||||
/* IPV4 */
|
||||
return _check_is_ipv4(ip);
|
||||
return check_is_ipv4(ip);
|
||||
} else if (strstr(ip, ":")) {
|
||||
/* IPV6 */
|
||||
return _check_is_ipv6(ip);
|
||||
return check_is_ipv6(ip);
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
int parse_uri(char *value, char *scheme, char *host, int *port, char *path)
|
||||
int parse_uri(const char *value, char *scheme, char *host, int *port, char *path)
|
||||
{
|
||||
return parse_uri_ext(value, scheme, NULL, NULL, host, port, path);
|
||||
}
|
||||
@@ -441,16 +444,16 @@ void urldecode(char *dst, const char *src)
|
||||
*dst++ = '\0';
|
||||
}
|
||||
|
||||
int parse_uri_ext(char *value, char *scheme, char *user, char *password, char *host, int *port, char *path)
|
||||
int parse_uri_ext(const char *value, char *scheme, char *user, char *password, char *host, int *port, char *path)
|
||||
{
|
||||
char *scheme_end = NULL;
|
||||
int field_len = 0;
|
||||
char *process_ptr = value;
|
||||
const char *process_ptr = value;
|
||||
char user_pass_host_part[PATH_MAX];
|
||||
char *user_password = NULL;
|
||||
char *host_part = NULL;
|
||||
|
||||
char *host_end = NULL;
|
||||
const char *host_end = NULL;
|
||||
|
||||
scheme_end = strstr(value, "://");
|
||||
if (scheme_end) {
|
||||
@@ -786,7 +789,7 @@ int create_pid_file(const char *pid_file)
|
||||
/* create pid file, and lock this file */
|
||||
fd = open(pid_file, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR);
|
||||
if (fd == -1) {
|
||||
fprintf(stderr, "create pid file failed, %s\n", strerror(errno));
|
||||
fprintf(stderr, "create pid file %s failed, %s\n", pid_file, strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -828,6 +831,123 @@ errout:
|
||||
return -1;
|
||||
}
|
||||
|
||||
int generate_cert_key(const char *key_path, const char *cert_path, const char *san, int days)
|
||||
{
|
||||
int ret = -1;
|
||||
#if (OPENSSL_VERSION_NUMBER <= 0x30000000L)
|
||||
RSA *rsa = NULL;
|
||||
BIGNUM *bn = NULL;
|
||||
#endif
|
||||
X509_EXTENSION *cert_ext = NULL;
|
||||
BIO *cert_file = NULL;
|
||||
BIO *key_file = NULL;
|
||||
X509 *cert = NULL;
|
||||
EVP_PKEY *pkey = NULL;
|
||||
const int RSA_KEY_LENGTH = 2048;
|
||||
|
||||
if (key_path == NULL || cert_path == NULL) {
|
||||
return ret;
|
||||
}
|
||||
|
||||
key_file = BIO_new_file(key_path, "wb");
|
||||
cert_file = BIO_new_file(cert_path, "wb");
|
||||
cert = X509_new();
|
||||
#if (OPENSSL_VERSION_NUMBER >= 0x30000000L)
|
||||
pkey = EVP_RSA_gen(RSA_KEY_LENGTH);
|
||||
#else
|
||||
bn = BN_new();
|
||||
rsa = RSA_new();
|
||||
pkey = EVP_PKEY_new();
|
||||
if (rsa == NULL || pkey == NULL || bn == NULL) {
|
||||
goto out;
|
||||
}
|
||||
|
||||
EVP_PKEY_assign(pkey, EVP_PKEY_RSA, rsa);
|
||||
BN_set_word(bn, RSA_F4);
|
||||
if (RSA_generate_key_ex(rsa, RSA_KEY_LENGTH, bn, NULL) != 1) {
|
||||
goto out;
|
||||
}
|
||||
#endif
|
||||
|
||||
if (key_file == NULL || cert_file == NULL || cert == NULL || pkey == NULL) {
|
||||
goto out;
|
||||
}
|
||||
|
||||
ASN1_INTEGER_set(X509_get_serialNumber(cert), 1); // serial number
|
||||
X509_gmtime_adj(X509_get_notBefore(cert), 0); // now
|
||||
X509_gmtime_adj(X509_get_notAfter(cert), days * 24 * 3600); // accepts secs
|
||||
|
||||
X509_set_pubkey(cert, pkey);
|
||||
|
||||
X509_NAME *name = X509_get_subject_name(cert);
|
||||
|
||||
const unsigned char *country = (unsigned char *)"smartdns";
|
||||
const unsigned char *company = (unsigned char *)"smartdns";
|
||||
const unsigned char *common_name = (unsigned char *)"smartdns";
|
||||
|
||||
X509_NAME_add_entry_by_txt(name, "C", MBSTRING_ASC, country, -1, -1, 0);
|
||||
X509_NAME_add_entry_by_txt(name, "O", MBSTRING_ASC, company, -1, -1, 0);
|
||||
X509_NAME_add_entry_by_txt(name, "CN", MBSTRING_ASC, common_name, -1, -1, 0);
|
||||
|
||||
if (san != NULL) {
|
||||
cert_ext = X509V3_EXT_conf_nid(NULL, NULL, NID_subject_alt_name, san);
|
||||
if (cert_ext == NULL) {
|
||||
goto out;
|
||||
}
|
||||
X509_add_ext(cert, cert_ext, -1);
|
||||
}
|
||||
|
||||
X509_set_issuer_name(cert, name);
|
||||
X509_sign(cert, pkey, EVP_sha256());
|
||||
|
||||
ret = PEM_write_bio_PrivateKey(key_file, pkey, NULL, NULL, 0, NULL, NULL);
|
||||
if (ret != 1) {
|
||||
goto out;
|
||||
}
|
||||
|
||||
ret = PEM_write_bio_X509(cert_file, cert);
|
||||
if (ret != 1) {
|
||||
goto out;
|
||||
}
|
||||
|
||||
chmod(key_path, S_IRUSR);
|
||||
chmod(cert_path, S_IRUSR);
|
||||
|
||||
ret = 0;
|
||||
out:
|
||||
if (cert_ext) {
|
||||
X509_EXTENSION_free(cert_ext);
|
||||
}
|
||||
|
||||
if (pkey) {
|
||||
EVP_PKEY_free(pkey);
|
||||
}
|
||||
|
||||
#if (OPENSSL_VERSION_NUMBER <= 0x30000000L)
|
||||
if (rsa && pkey == NULL) {
|
||||
RSA_free(rsa);
|
||||
}
|
||||
|
||||
if (bn) {
|
||||
BN_free(bn);
|
||||
}
|
||||
#endif
|
||||
|
||||
if (cert_file) {
|
||||
BIO_free_all(cert_file);
|
||||
}
|
||||
|
||||
if (key_file) {
|
||||
BIO_free_all(key_file);
|
||||
}
|
||||
|
||||
if (cert) {
|
||||
X509_free(cert);
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
#if OPENSSL_API_COMPAT < 0x10100000
|
||||
#define THREAD_STACK_SIZE (16 * 1024)
|
||||
static pthread_mutex_t *lock_cs;
|
||||
@@ -1107,6 +1227,16 @@ void get_compiled_time(struct tm *tm)
|
||||
tm->tm_sec = sec;
|
||||
}
|
||||
|
||||
unsigned long get_system_mem_size(void)
|
||||
{
|
||||
struct sysinfo memInfo;
|
||||
sysinfo(&memInfo);
|
||||
long long totalMem = memInfo.totalram;
|
||||
totalMem *= memInfo.mem_unit;
|
||||
|
||||
return totalMem;
|
||||
}
|
||||
|
||||
int is_numeric(const char *str)
|
||||
{
|
||||
while (*str != '\0') {
|
||||
@@ -1471,10 +1601,11 @@ static int _dns_debug_display(struct dns_packet *packet)
|
||||
char target[DNS_MAX_CNAME_LEN] = {0};
|
||||
struct dns_https_param *p = NULL;
|
||||
int priority = 0;
|
||||
int ret = 0;
|
||||
|
||||
p = dns_get_HTTPS_svcparm_start(rrs, name, DNS_MAX_CNAME_LEN, &ttl, &priority, target,
|
||||
ret = dns_get_HTTPS_svcparm_start(rrs, &p, name, DNS_MAX_CNAME_LEN, &ttl, &priority, target,
|
||||
DNS_MAX_CNAME_LEN);
|
||||
if (p == NULL) {
|
||||
if (ret != 0) {
|
||||
printf("get HTTPS svcparm failed\n");
|
||||
break;
|
||||
}
|
||||
@@ -1487,7 +1618,23 @@ static int _dns_debug_display(struct dns_packet *packet)
|
||||
printf(" HTTPS: mandatory: %s\n", p->value);
|
||||
} break;
|
||||
case DNS_HTTPS_T_ALPN: {
|
||||
printf(" HTTPS: alpn: %s\n", p->value);
|
||||
char alph[64] = {0};
|
||||
int total_alph_len = 0;
|
||||
char *ptr = (char *)p->value;
|
||||
do {
|
||||
int alphlen = *ptr;
|
||||
memcpy(alph + total_alph_len, ptr + 1, alphlen);
|
||||
total_alph_len += alphlen;
|
||||
ptr += alphlen + 1;
|
||||
alph[total_alph_len] = ',';
|
||||
total_alph_len++;
|
||||
alph[total_alph_len] = ' ';
|
||||
total_alph_len++;
|
||||
} while (ptr - (char *)p->value < p->len);
|
||||
if (total_alph_len > 2) {
|
||||
alph[total_alph_len - 2] = '\0';
|
||||
}
|
||||
printf(" HTTPS: alpn: %s\n", alph);
|
||||
} break;
|
||||
case DNS_HTTPS_T_NO_DEFAULT_ALPN: {
|
||||
printf(" HTTPS: no_default_alpn: %s\n", p->value);
|
||||
|
||||
12
src/util.h
12
src/util.h
@@ -69,9 +69,13 @@ int parse_ip(const char *value, char *ip, int *port);
|
||||
|
||||
int check_is_ipaddr(const char *ip);
|
||||
|
||||
int parse_uri(char *value, char *scheme, char *host, int *port, char *path);
|
||||
int check_is_ipv4(const char *ip);
|
||||
|
||||
int parse_uri_ext(char *value, char *scheme, char *user, char *password, char *host, int *port, char *path);
|
||||
int check_is_ipv6(const char *ip);
|
||||
|
||||
int parse_uri(const char *value, char *scheme, char *host, int *port, char *path);
|
||||
|
||||
int parse_uri_ext(const char *value, char *scheme, char *user, char *password, char *host, int *port, char *path);
|
||||
|
||||
void urldecode(char *dst, const char *src);
|
||||
|
||||
@@ -97,6 +101,8 @@ int SSL_base64_decode(const char *in, unsigned char *out);
|
||||
|
||||
int SSL_base64_encode(const void *in, int in_len, char *out);
|
||||
|
||||
int generate_cert_key(const char *key_path, const char *cert_path, const char *san, int days);
|
||||
|
||||
int create_pid_file(const char *pid_file);
|
||||
|
||||
/* Parse a TLS packet for the Server Name Indication extension in the client
|
||||
@@ -116,6 +122,8 @@ int parse_tls_header(const char *data, size_t data_len, char *hostname, const ch
|
||||
|
||||
void get_compiled_time(struct tm *tm);
|
||||
|
||||
unsigned long get_system_mem_size(void);
|
||||
|
||||
int is_numeric(const char *str);
|
||||
|
||||
int has_network_raw_cap(void);
|
||||
|
||||
47
test/Makefile
Normal file
47
test/Makefile
Normal file
@@ -0,0 +1,47 @@
|
||||
|
||||
# Copyright (C) 2018-2023 Ruilin Peng (Nick) <pymumu@gmail.com>.
|
||||
#
|
||||
# smartdns is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# smartdns is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
BIN=test.bin
|
||||
CFLAGS += -I../src -I../src/include
|
||||
CFLAGS += -DTEST
|
||||
CFLAGS += -g -Wall -Wstrict-prototypes -fno-omit-frame-pointer -Wstrict-aliasing -funwind-tables -Wmissing-prototypes -Wshadow -Wextra -Wno-unused-parameter -Wno-implicit-fallthrough
|
||||
|
||||
CXXFLAGS += -g
|
||||
CXXFLAGS += -DTEST
|
||||
CXXFLAGS += -I./ -I../src -I../src/include
|
||||
|
||||
SMARTDNS_OBJS = lib/rbtree.o lib/art.o lib/bitops.o lib/radix.o lib/conf.o lib/nftset.o
|
||||
SMARTDNS_OBJS += smartdns.o fast_ping.o dns_client.o dns_server.o dns.o util.o tlog.o dns_conf.o dns_cache.o http_parse.o proxy.o
|
||||
OBJS = $(addprefix ../src/, $(SMARTDNS_OBJS))
|
||||
|
||||
TEST_SOURCES := $(wildcard *.cc) $(wildcard */*.cc) $(wildcard */*/*.cc)
|
||||
TEST_OBJECTS := $(patsubst %.cc, %.o, $(TEST_SOURCES))
|
||||
OBJS += $(TEST_OBJECTS)
|
||||
|
||||
LDFLAGS += -lssl -lcrypto -lpthread -ldl -lgtest -lstdc++ -lm
|
||||
|
||||
.PHONY: all clean test
|
||||
|
||||
all: $(BIN)
|
||||
|
||||
$(BIN) : $(OBJS)
|
||||
$(CC) $(OBJS) -o $@ $(LDFLAGS)
|
||||
|
||||
test: $(BIN)
|
||||
./$(BIN)
|
||||
|
||||
clean:
|
||||
$(RM) $(OBJS) $(BIN)
|
||||
163
test/cases/test-address.cc
Normal file
163
test/cases/test-address.cc
Normal file
@@ -0,0 +1,163 @@
|
||||
/*************************************************************************
|
||||
*
|
||||
* Copyright (C) 2018-2023 Ruilin Peng (Nick) <pymumu@gmail.com>.
|
||||
*
|
||||
* smartdns is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* smartdns is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "client.h"
|
||||
#include "dns.h"
|
||||
#include "include/utils.h"
|
||||
#include "server.h"
|
||||
#include "util.h"
|
||||
#include "gtest/gtest.h"
|
||||
#include <fstream>
|
||||
|
||||
class Address : public ::testing::Test
|
||||
{
|
||||
protected:
|
||||
virtual void SetUp() {}
|
||||
virtual void TearDown() {}
|
||||
};
|
||||
|
||||
TEST_F(Address, soa)
|
||||
{
|
||||
smartdns::MockServer server_upstream;
|
||||
smartdns::Server server;
|
||||
|
||||
server_upstream.Start("udp://0.0.0.0:61053", [&](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype == DNS_T_A) {
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "1.2.3.4", 700);
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
} else if (request->qtype == DNS_T_AAAA) {
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "64:ff9b::102:304", 700);
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
}
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
});
|
||||
|
||||
server.Start(R"""(bind [::]:60053
|
||||
server 127.0.0.1:61053
|
||||
log-num 0
|
||||
log-console yes
|
||||
log-level debug
|
||||
speed-check-mode none
|
||||
address /a.com/#4
|
||||
address /b.com/#6
|
||||
address /c.com/#
|
||||
cache-persist no)""");
|
||||
smartdns::Client client;
|
||||
ASSERT_TRUE(client.Query("a.com A", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAuthorityNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAuthority()[0].GetName(), "a.com");
|
||||
EXPECT_EQ(client.GetAuthority()[0].GetTTL(), 30);
|
||||
EXPECT_EQ(client.GetAuthority()[0].GetType(), "SOA");
|
||||
EXPECT_EQ(client.GetAuthority()[0].GetData(),
|
||||
"a.gtld-servers.net. nstld.verisign-grs.com. 1800 1800 900 604800 86400");
|
||||
|
||||
ASSERT_TRUE(client.Query("a.com AAAA", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "a.com");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetTTL(), 700);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetType(), "AAAA");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "64:ff9b::102:304");
|
||||
|
||||
ASSERT_TRUE(client.Query("b.com A", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "b.com");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetTTL(), 700);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetType(), "A");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "1.2.3.4");
|
||||
|
||||
ASSERT_TRUE(client.Query("b.com AAAA", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 0);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAuthority()[0].GetName(), "b.com");
|
||||
EXPECT_EQ(client.GetAuthority()[0].GetTTL(), 30);
|
||||
EXPECT_EQ(client.GetAuthority()[0].GetType(), "SOA");
|
||||
EXPECT_EQ(client.GetAuthority()[0].GetData(),
|
||||
"a.gtld-servers.net. nstld.verisign-grs.com. 1800 1800 900 604800 86400");
|
||||
|
||||
ASSERT_TRUE(client.Query("c.com A", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 0);
|
||||
EXPECT_EQ(client.GetStatus(), "NXDOMAIN");
|
||||
EXPECT_EQ(client.GetAuthority()[0].GetName(), "c.com");
|
||||
EXPECT_EQ(client.GetAuthority()[0].GetTTL(), 30);
|
||||
EXPECT_EQ(client.GetAuthority()[0].GetType(), "SOA");
|
||||
EXPECT_EQ(client.GetAuthority()[0].GetData(),
|
||||
"a.gtld-servers.net. nstld.verisign-grs.com. 1800 1800 900 604800 86400");
|
||||
|
||||
ASSERT_TRUE(client.Query("c.com AAAA", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 0);
|
||||
EXPECT_EQ(client.GetStatus(), "NXDOMAIN");
|
||||
EXPECT_EQ(client.GetAuthority()[0].GetName(), "c.com");
|
||||
EXPECT_EQ(client.GetAuthority()[0].GetTTL(), 30);
|
||||
EXPECT_EQ(client.GetAuthority()[0].GetType(), "SOA");
|
||||
EXPECT_EQ(client.GetAuthority()[0].GetData(),
|
||||
"a.gtld-servers.net. nstld.verisign-grs.com. 1800 1800 900 604800 86400");
|
||||
}
|
||||
|
||||
TEST_F(Address, ip)
|
||||
{
|
||||
smartdns::MockServer server_upstream;
|
||||
smartdns::Server server;
|
||||
|
||||
server_upstream.Start("udp://0.0.0.0:61053", [&](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype == DNS_T_A) {
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "1.2.3.4", 700);
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
} else if (request->qtype == DNS_T_AAAA) {
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "64:ff9b::102:304", 700);
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
}
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
});
|
||||
|
||||
server.Start(R"""(bind [::]:60053
|
||||
server 127.0.0.1:61053
|
||||
log-num 0
|
||||
log-console yes
|
||||
log-level debug
|
||||
speed-check-mode none
|
||||
address /a.com/10.10.10.10
|
||||
address /a.com/64:ff9b::1010:1010
|
||||
cache-persist no)""");
|
||||
smartdns::Client client;
|
||||
ASSERT_TRUE(client.Query("a.com A", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "a.com");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetTTL(), 600);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetType(), "A");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "10.10.10.10");
|
||||
|
||||
ASSERT_TRUE(client.Query("a.com AAAA", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "a.com");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetTTL(), 600);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetType(), "AAAA");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "64:ff9b::1010:1010");
|
||||
}
|
||||
254
test/cases/test-bind.cc
Normal file
254
test/cases/test-bind.cc
Normal file
@@ -0,0 +1,254 @@
|
||||
/*************************************************************************
|
||||
*
|
||||
* Copyright (C) 2018-2023 Ruilin Peng (Nick) <pymumu@gmail.com>.
|
||||
*
|
||||
* smartdns is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* smartdns is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "client.h"
|
||||
#include "include/utils.h"
|
||||
#include "server.h"
|
||||
#include "gtest/gtest.h"
|
||||
#include <arpa/inet.h>
|
||||
#include <netdb.h>
|
||||
#include <netinet/in.h>
|
||||
#include <openssl/rand.h>
|
||||
#include <sys/socket.h>
|
||||
|
||||
TEST(Bind, tls)
|
||||
{
|
||||
Defer
|
||||
{
|
||||
unlink("/tmp/smartdns-cert.pem");
|
||||
unlink("/tmp/smartdns-key.pem");
|
||||
};
|
||||
|
||||
smartdns::Server server_wrap;
|
||||
smartdns::Server server;
|
||||
|
||||
server.Start(R"""(bind [::]:61053
|
||||
server-tls 127.0.0.1:60053 -no-check-certificate
|
||||
log-num 0
|
||||
log-console yes
|
||||
log-level debug
|
||||
cache-persist no)""");
|
||||
server_wrap.Start(R"""(bind-tls [::]:60053
|
||||
address /example.com/1.2.3.4
|
||||
log-num 0
|
||||
log-console yes
|
||||
log-level debug
|
||||
cache-persist no)""");
|
||||
smartdns::Client client;
|
||||
ASSERT_TRUE(client.Query("example.com", 61053));
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "1.2.3.4");
|
||||
}
|
||||
|
||||
TEST(Bind, udp_tcp)
|
||||
{
|
||||
smartdns::MockServer server_upstream;
|
||||
smartdns::MockServer server_upstream2;
|
||||
smartdns::Server server;
|
||||
|
||||
server_upstream.Start("udp://0.0.0.0:61053", [](struct smartdns::ServerRequestContext *request) {
|
||||
unsigned char addr[4] = {1, 2, 3, 4};
|
||||
dns_add_A(request->response_packet, DNS_RRS_AN, request->domain.c_str(), 611, addr);
|
||||
request->response_packet->head.rcode = DNS_RC_NOERROR;
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
});
|
||||
|
||||
server.Start(R"""(
|
||||
bind [::]:60053
|
||||
bind-tcp [::]:60053
|
||||
server 127.0.0.1:61053
|
||||
log-num 0
|
||||
log-console yes
|
||||
log-level debug
|
||||
cache-persist no)""");
|
||||
smartdns::Client client;
|
||||
ASSERT_TRUE(client.Query("a.com +tcp", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetTTL(), 3);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "1.2.3.4");
|
||||
|
||||
ASSERT_TRUE(client.Query("a.com", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_GE(client.GetAnswer()[0].GetTTL(), 609);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "1.2.3.4");
|
||||
}
|
||||
|
||||
TEST(Bind, self)
|
||||
{
|
||||
smartdns::MockServer server_upstream;
|
||||
smartdns::Server server;
|
||||
|
||||
server_upstream.Start("udp://0.0.0.0:62053", [](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype == DNS_T_A) {
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "1.2.3.4");
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
}
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
});
|
||||
|
||||
server.Start(R"""(
|
||||
bind [::]:60053 -group self
|
||||
server 127.0.0.1:61053 -group self
|
||||
bind [::]:61053 -group upstream
|
||||
server 127.0.0.1:62053 -group upstream
|
||||
log-num 0
|
||||
log-console yes
|
||||
log-level info
|
||||
cache-persist no)""");
|
||||
smartdns::Client client;
|
||||
|
||||
ASSERT_TRUE(client.Query("a.com", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_LT(client.GetQueryTime(), 100);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetTTL(), 3);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "1.2.3.4");
|
||||
}
|
||||
|
||||
TEST(Bind, nocache)
|
||||
{
|
||||
smartdns::MockServer server_upstream;
|
||||
smartdns::MockServer server_upstream2;
|
||||
smartdns::Server server;
|
||||
|
||||
server_upstream.Start("udp://0.0.0.0:61053", [](struct smartdns::ServerRequestContext *request) {
|
||||
unsigned char addr[4] = {1, 2, 3, 4};
|
||||
usleep(15 * 1000);
|
||||
dns_add_A(request->response_packet, DNS_RRS_AN, request->domain.c_str(), 611, addr);
|
||||
request->response_packet->head.rcode = DNS_RC_NOERROR;
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
});
|
||||
|
||||
server.Start(R"""(
|
||||
bind [::]:60053 --no-cache
|
||||
bind-tcp [::]:60053
|
||||
server 127.0.0.1:61053
|
||||
log-num 0
|
||||
log-console yes
|
||||
log-level debug
|
||||
cache-persist no)""");
|
||||
smartdns::Client client;
|
||||
ASSERT_TRUE(client.Query("a.com", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "a.com");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetTTL(), 3);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "1.2.3.4");
|
||||
|
||||
ASSERT_TRUE(client.Query("a.com", 60053));
|
||||
EXPECT_GT(client.GetQueryTime(), 10);
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "a.com");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetTTL(), 3);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "1.2.3.4");
|
||||
}
|
||||
|
||||
TEST(Bind, device)
|
||||
{
|
||||
smartdns::MockServer server_upstream;
|
||||
smartdns::Server server;
|
||||
|
||||
server_upstream.Start("udp://0.0.0.0:62053", [](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype == DNS_T_A) {
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "1.2.3.4");
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
}
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
});
|
||||
|
||||
server.Start(R"""(
|
||||
bind [::]:60053@lo
|
||||
server 127.0.0.1:62053
|
||||
log-num 0
|
||||
log-console yes
|
||||
log-level info
|
||||
cache-persist no)""");
|
||||
smartdns::Client client;
|
||||
|
||||
ASSERT_TRUE(client.Query("a.com", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_LT(client.GetQueryTime(), 100);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetTTL(), 3);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "1.2.3.4");
|
||||
}
|
||||
|
||||
TEST(Bind, malformed_packet)
|
||||
{
|
||||
smartdns::MockServer server_upstream;
|
||||
smartdns::Server server;
|
||||
|
||||
server_upstream.Start("udp://0.0.0.0:62053", [](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype == DNS_T_A) {
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "1.2.3.4");
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
}
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
});
|
||||
|
||||
server.Start(R"""(
|
||||
bind [::]:60053@lo
|
||||
server 127.0.0.1:62053
|
||||
log-num 0
|
||||
log-console yes
|
||||
log-level info
|
||||
cache-persist no)""");
|
||||
|
||||
int sockfd = socket(AF_INET, SOCK_DGRAM, 0);
|
||||
ASSERT_NE(sockfd, -1);
|
||||
Defer
|
||||
{
|
||||
close(sockfd);
|
||||
};
|
||||
|
||||
struct sockaddr_in server_addr;
|
||||
server_addr.sin_family = AF_INET;
|
||||
server_addr.sin_port = htons(60053);
|
||||
server_addr.sin_addr.s_addr = inet_addr("127.0.0.1");
|
||||
|
||||
for (int i = 0; i < 100000; i++) {
|
||||
char buf[4096];
|
||||
int len = random() % 4096;
|
||||
if (len <= 0) {
|
||||
len = 1;
|
||||
}
|
||||
|
||||
RAND_bytes((unsigned char *)buf, len);
|
||||
sendto(sockfd, buf, len, 0, (struct sockaddr *)&server_addr, sizeof(server_addr));
|
||||
}
|
||||
|
||||
smartdns::Client client;
|
||||
|
||||
ASSERT_TRUE(client.Query("a.com", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_LT(client.GetQueryTime(), 100);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetTTL(), 3);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "1.2.3.4");
|
||||
}
|
||||
71
test/cases/test-bootstrap.cc
Normal file
71
test/cases/test-bootstrap.cc
Normal file
@@ -0,0 +1,71 @@
|
||||
/*************************************************************************
|
||||
*
|
||||
* Copyright (C) 2018-2023 Ruilin Peng (Nick) <pymumu@gmail.com>.
|
||||
*
|
||||
* smartdns is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* smartdns is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "client.h"
|
||||
#include "dns.h"
|
||||
#include "include/utils.h"
|
||||
#include "server.h"
|
||||
#include "gtest/gtest.h"
|
||||
|
||||
class BootStrap : public ::testing::Test
|
||||
{
|
||||
protected:
|
||||
virtual void SetUp() {}
|
||||
virtual void TearDown() {}
|
||||
};
|
||||
|
||||
TEST_F(BootStrap, bootstrap)
|
||||
{
|
||||
smartdns::MockServer server_upstream;
|
||||
smartdns::MockServer server_upstream2;
|
||||
smartdns::Server server;
|
||||
|
||||
server_upstream.Start("udp://0.0.0.0:61053", [](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype != DNS_T_A) {
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
}
|
||||
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "1.2.3.4", 611);
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
});
|
||||
|
||||
server_upstream2.Start("udp://0.0.0.0:62053", [](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype != DNS_T_A) {
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
}
|
||||
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "127.0.0.1", 611);
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
});
|
||||
|
||||
server.Start(R"""(bind [::]:60053
|
||||
server udp://127.0.0.1:62053 -bootstrap-dns
|
||||
server udp://example.com:61053
|
||||
log-num 0
|
||||
log-console yes
|
||||
log-level debug
|
||||
cache-persist no)""");
|
||||
smartdns::Client client;
|
||||
usleep(2500000);
|
||||
ASSERT_TRUE(client.Query("a.com", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "a.com");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "1.2.3.4");
|
||||
}
|
||||
365
test/cases/test-cache.cc
Normal file
365
test/cases/test-cache.cc
Normal file
@@ -0,0 +1,365 @@
|
||||
/*************************************************************************
|
||||
*
|
||||
* Copyright (C) 2018-2023 Ruilin Peng (Nick) <pymumu@gmail.com>.
|
||||
*
|
||||
* smartdns is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* smartdns is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "client.h"
|
||||
#include "dns.h"
|
||||
#include "include/utils.h"
|
||||
#include "server.h"
|
||||
#include "gtest/gtest.h"
|
||||
#include <fcntl.h>
|
||||
#include <fstream>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
/* clang-format off */
|
||||
#include "dns_cache.h"
|
||||
/* clang-format on */
|
||||
|
||||
class Cache : public ::testing::Test
|
||||
{
|
||||
protected:
|
||||
void SetUp() override {}
|
||||
|
||||
void TearDown() override {}
|
||||
};
|
||||
|
||||
TEST_F(Cache, min)
|
||||
{
|
||||
smartdns::MockServer server_upstream;
|
||||
smartdns::Server server;
|
||||
|
||||
server_upstream.Start("udp://0.0.0.0:61053", [](struct smartdns::ServerRequestContext *request) {
|
||||
std::string domain = request->domain;
|
||||
if (request->domain.length() == 0) {
|
||||
return smartdns::SERVER_REQUEST_ERROR;
|
||||
}
|
||||
|
||||
if (request->qtype == DNS_T_A) {
|
||||
unsigned char addr[4] = {1, 2, 3, 4};
|
||||
dns_add_A(request->response_packet, DNS_RRS_AN, domain.c_str(), 0, addr);
|
||||
} else if (request->qtype == DNS_T_AAAA) {
|
||||
unsigned char addr[16] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
|
||||
dns_add_AAAA(request->response_packet, DNS_RRS_AN, domain.c_str(), 0, addr);
|
||||
} else {
|
||||
return smartdns::SERVER_REQUEST_ERROR;
|
||||
}
|
||||
|
||||
request->response_packet->head.rcode = DNS_RC_NOERROR;
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
});
|
||||
|
||||
server.Start(R"""(bind [::]:60053
|
||||
server 127.0.0.1:61053
|
||||
log-num 0
|
||||
cache-size 1
|
||||
rr-ttl-min 1
|
||||
speed-check-mode none
|
||||
response-mode fastest-response
|
||||
log-console yes
|
||||
log-level debug
|
||||
cache-persist no)""");
|
||||
smartdns::Client client;
|
||||
ASSERT_TRUE(client.Query("a.com", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "a.com");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetTTL(), 1);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "1.2.3.4");
|
||||
}
|
||||
|
||||
TEST_F(Cache, max_reply_ttl)
|
||||
{
|
||||
smartdns::MockServer server_upstream;
|
||||
smartdns::Server server;
|
||||
|
||||
server_upstream.Start("udp://0.0.0.0:61053", [](struct smartdns::ServerRequestContext *request) {
|
||||
std::string domain = request->domain;
|
||||
if (request->domain.length() == 0) {
|
||||
return smartdns::SERVER_REQUEST_ERROR;
|
||||
}
|
||||
|
||||
if (request->qtype == DNS_T_A) {
|
||||
unsigned char addr[4] = {1, 2, 3, 4};
|
||||
dns_add_A(request->response_packet, DNS_RRS_AN, domain.c_str(), 0, addr);
|
||||
} else if (request->qtype == DNS_T_AAAA) {
|
||||
unsigned char addr[16] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
|
||||
dns_add_AAAA(request->response_packet, DNS_RRS_AN, domain.c_str(), 0, addr);
|
||||
} else {
|
||||
return smartdns::SERVER_REQUEST_ERROR;
|
||||
}
|
||||
|
||||
request->response_packet->head.rcode = DNS_RC_NOERROR;
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
});
|
||||
|
||||
server.Start(R"""(bind [::]:60053
|
||||
server 127.0.0.1:61053
|
||||
log-num 0
|
||||
cache-size 1
|
||||
rr-ttl-min 600
|
||||
rr-ttl-reply-max 5
|
||||
speed-check-mode none
|
||||
response-mode fastest-response
|
||||
log-console yes
|
||||
log-level debug
|
||||
cache-persist no)""");
|
||||
smartdns::Client client;
|
||||
ASSERT_TRUE(client.Query("a.com", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "a.com");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetTTL(), 5);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "1.2.3.4");
|
||||
}
|
||||
|
||||
TEST_F(Cache, max_reply_ttl_expired)
|
||||
{
|
||||
smartdns::MockServer server_upstream;
|
||||
smartdns::Server server;
|
||||
|
||||
server_upstream.Start("udp://0.0.0.0:61053", [](struct smartdns::ServerRequestContext *request) {
|
||||
std::string domain = request->domain;
|
||||
if (request->domain.length() == 0) {
|
||||
return smartdns::SERVER_REQUEST_ERROR;
|
||||
}
|
||||
|
||||
if (request->qtype == DNS_T_A) {
|
||||
unsigned char addr[4] = {1, 2, 3, 4};
|
||||
dns_add_A(request->response_packet, DNS_RRS_AN, domain.c_str(), 0, addr);
|
||||
} else if (request->qtype == DNS_T_AAAA) {
|
||||
unsigned char addr[16] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
|
||||
dns_add_AAAA(request->response_packet, DNS_RRS_AN, domain.c_str(), 0, addr);
|
||||
} else {
|
||||
return smartdns::SERVER_REQUEST_ERROR;
|
||||
}
|
||||
|
||||
request->response_packet->head.rcode = DNS_RC_NOERROR;
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
});
|
||||
|
||||
server.Start(R"""(bind [::]:60053
|
||||
server 127.0.0.1:61053
|
||||
log-num 0
|
||||
cache-size 1
|
||||
rr-ttl-min 600
|
||||
rr-ttl-reply-max 6
|
||||
log-console yes
|
||||
log-level debug
|
||||
cache-persist no)""");
|
||||
smartdns::Client client;
|
||||
ASSERT_TRUE(client.Query("a.com", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "a.com");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetTTL(), 3);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "1.2.3.4");
|
||||
|
||||
ASSERT_TRUE(client.Query("a.com", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "a.com");
|
||||
EXPECT_GE(client.GetAnswer()[0].GetTTL(), 5);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "1.2.3.4");
|
||||
}
|
||||
|
||||
TEST_F(Cache, nocache)
|
||||
{
|
||||
smartdns::MockServer server_upstream;
|
||||
smartdns::Server server;
|
||||
|
||||
server_upstream.Start("udp://0.0.0.0:61053", [](struct smartdns::ServerRequestContext *request) {
|
||||
std::string domain = request->domain;
|
||||
if (request->domain.length() == 0) {
|
||||
return smartdns::SERVER_REQUEST_ERROR;
|
||||
}
|
||||
|
||||
usleep(15000);
|
||||
|
||||
if (request->qtype == DNS_T_A) {
|
||||
unsigned char addr[4] = {1, 2, 3, 4};
|
||||
dns_add_A(request->response_packet, DNS_RRS_AN, domain.c_str(), 0, addr);
|
||||
} else if (request->qtype == DNS_T_AAAA) {
|
||||
unsigned char addr[16] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
|
||||
dns_add_AAAA(request->response_packet, DNS_RRS_AN, domain.c_str(), 0, addr);
|
||||
} else {
|
||||
return smartdns::SERVER_REQUEST_ERROR;
|
||||
}
|
||||
|
||||
request->response_packet->head.rcode = DNS_RC_NOERROR;
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
});
|
||||
|
||||
server.Start(R"""(bind [::]:60053
|
||||
server 127.0.0.1:61053
|
||||
log-num 0
|
||||
cache-size 100
|
||||
rr-ttl-min 600
|
||||
rr-ttl-reply-max 5
|
||||
log-console yes
|
||||
log-level debug
|
||||
domain-rules /a.com/ --no-cache
|
||||
cache-persist no)""");
|
||||
smartdns::Client client;
|
||||
ASSERT_TRUE(client.Query("a.com", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "a.com");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetTTL(), 3);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "1.2.3.4");
|
||||
|
||||
ASSERT_TRUE(client.Query("a.com", 60053));
|
||||
EXPECT_GT(client.GetQueryTime(), 10);
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "a.com");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetTTL(), 3);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "1.2.3.4");
|
||||
}
|
||||
|
||||
TEST_F(Cache, save_file)
|
||||
{
|
||||
smartdns::MockServer server_upstream;
|
||||
auto cache_file = "/tmp/smartdns_cache." + smartdns::GenerateRandomString(10);
|
||||
std::string conf = R"""(
|
||||
bind [::]:60053@lo
|
||||
server 127.0.0.1:62053
|
||||
log-num 0
|
||||
log-console yes
|
||||
log-level debug
|
||||
cache-persist yes
|
||||
dualstack-ip-selection no
|
||||
)""";
|
||||
|
||||
conf += "cache-file " + cache_file;
|
||||
Defer
|
||||
{
|
||||
unlink(cache_file.c_str());
|
||||
};
|
||||
|
||||
server_upstream.Start("udp://0.0.0.0:62053", [](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype == DNS_T_A) {
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "1.2.3.4");
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
}
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
});
|
||||
{
|
||||
smartdns::Server server;
|
||||
server.Start(conf);
|
||||
smartdns::Client client;
|
||||
|
||||
ASSERT_TRUE(client.Query("a.com", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_LT(client.GetQueryTime(), 100);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetTTL(), 3);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "1.2.3.4");
|
||||
server.Stop();
|
||||
usleep(200 * 1000);
|
||||
}
|
||||
|
||||
ASSERT_EQ(access(cache_file.c_str(), F_OK), 0);
|
||||
|
||||
std::fstream fs(cache_file, std::ios::in);
|
||||
struct dns_cache_file head;
|
||||
memset(&head, 0, sizeof(head));
|
||||
fs.read((char *)&head, sizeof(head));
|
||||
EXPECT_EQ(head.magic, MAGIC_NUMBER);
|
||||
EXPECT_EQ(head.cache_number, 1);
|
||||
}
|
||||
|
||||
TEST_F(Cache, corrupt_file)
|
||||
{
|
||||
smartdns::MockServer server_upstream;
|
||||
auto cache_file = "/tmp/smartdns_cache." + smartdns::GenerateRandomString(10);
|
||||
std::string conf = R"""(
|
||||
bind [::]:60053@lo
|
||||
server 127.0.0.1:62053
|
||||
log-num 0
|
||||
log-console yes
|
||||
log-level debug
|
||||
dualstack-ip-selection no
|
||||
cache-persist yes
|
||||
)""";
|
||||
|
||||
conf += "cache-file " + cache_file;
|
||||
Defer
|
||||
{
|
||||
unlink(cache_file.c_str());
|
||||
};
|
||||
|
||||
server_upstream.Start("udp://0.0.0.0:62053", [](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype == DNS_T_A) {
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "1.2.3.4");
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
}
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
});
|
||||
{
|
||||
smartdns::Server server;
|
||||
server.Start(conf);
|
||||
smartdns::Client client;
|
||||
|
||||
ASSERT_TRUE(client.Query("a.com", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_LT(client.GetQueryTime(), 100);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetTTL(), 3);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "1.2.3.4");
|
||||
server.Stop();
|
||||
usleep(200 * 1000);
|
||||
}
|
||||
|
||||
ASSERT_EQ(access(cache_file.c_str(), F_OK), 0);
|
||||
|
||||
int fd = open(cache_file.c_str(), O_RDWR);
|
||||
ASSERT_NE(fd, -1);
|
||||
srandom(time(NULL));
|
||||
off_t file_size = lseek(fd, 0, SEEK_END);
|
||||
off_t offset = random() % (file_size - 300);
|
||||
std::cout << "try make corrupt at " << offset << ", file size: " << file_size << std::endl;
|
||||
lseek(fd, offset, SEEK_SET);
|
||||
for (int i = 0; i < 300; i++) {
|
||||
unsigned char c = random() % 256;
|
||||
write(fd, &c, 1);
|
||||
}
|
||||
close(fd);
|
||||
{
|
||||
smartdns::Server server;
|
||||
server.Start(conf);
|
||||
smartdns::Client client;
|
||||
|
||||
ASSERT_TRUE(client.Query("a.com", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_LT(client.GetQueryTime(), 100);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetTTL(), 3);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "1.2.3.4");
|
||||
server.Stop();
|
||||
usleep(200 * 1000);
|
||||
}
|
||||
}
|
||||
179
test/cases/test-cname.cc
Normal file
179
test/cases/test-cname.cc
Normal file
@@ -0,0 +1,179 @@
|
||||
/*************************************************************************
|
||||
*
|
||||
* Copyright (C) 2018-2023 Ruilin Peng (Nick) <pymumu@gmail.com>.
|
||||
*
|
||||
* smartdns is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* smartdns is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "client.h"
|
||||
#include "dns.h"
|
||||
#include "include/utils.h"
|
||||
#include "server.h"
|
||||
#include "gtest/gtest.h"
|
||||
|
||||
class Cname : public ::testing::Test
|
||||
{
|
||||
protected:
|
||||
virtual void SetUp() {}
|
||||
virtual void TearDown() {}
|
||||
};
|
||||
|
||||
TEST_F(Cname, cname)
|
||||
{
|
||||
smartdns::MockServer server_upstream;
|
||||
smartdns::Server server;
|
||||
|
||||
server_upstream.Start("udp://0.0.0.0:61053", [](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype != DNS_T_A) {
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
}
|
||||
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "1.2.3.4", 611);
|
||||
EXPECT_EQ(request->domain, "e.com");
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
});
|
||||
|
||||
server.Start(R"""(bind [::]:60053
|
||||
cname /a.com/b.com
|
||||
cname /b.com/c.com
|
||||
cname /c.com/d.com
|
||||
cname /d.com/e.com
|
||||
server 127.0.0.1:61053
|
||||
log-num 0
|
||||
log-console yes
|
||||
log-level debug
|
||||
cache-persist no)""");
|
||||
smartdns::Client client;
|
||||
ASSERT_TRUE(client.Query("a.com", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 2);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "a.com");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "b.com.");
|
||||
EXPECT_EQ(client.GetAnswer()[1].GetData(), "1.2.3.4");
|
||||
}
|
||||
|
||||
TEST_F(Cname, subdomain1)
|
||||
{
|
||||
smartdns::MockServer server_upstream;
|
||||
smartdns::Server server;
|
||||
|
||||
server_upstream.Start("udp://0.0.0.0:61053", [](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype != DNS_T_A) {
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
}
|
||||
|
||||
if (request->domain == "s.a.com") {
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "4.5.6.7", 700);
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
|
||||
}
|
||||
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "1.2.3.4", 611);
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
});
|
||||
|
||||
server.Start(R"""(bind [::]:60053
|
||||
cname /a.com/s.a.com
|
||||
server 127.0.0.1:61053
|
||||
log-num 0
|
||||
log-console yes
|
||||
log-level debug
|
||||
cache-persist no)""");
|
||||
smartdns::Client client;
|
||||
ASSERT_TRUE(client.Query("a.com", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 2);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "a.com");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "s.a.com.");
|
||||
EXPECT_EQ(client.GetAnswer()[1].GetData(), "4.5.6.7");
|
||||
}
|
||||
|
||||
TEST_F(Cname, subdomain2)
|
||||
{
|
||||
smartdns::MockServer server_upstream;
|
||||
smartdns::Server server;
|
||||
|
||||
server_upstream.Start("udp://0.0.0.0:61053", [](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype != DNS_T_A) {
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
}
|
||||
|
||||
if (request->domain == "a.s.a.com") {
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "4.5.6.7", 700);
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
|
||||
}
|
||||
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "1.2.3.4", 611);
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
});
|
||||
|
||||
server.Start(R"""(bind [::]:60053
|
||||
cname /a.com/s.a.com
|
||||
cname /s.a.com/a.s.a.com
|
||||
server 127.0.0.1:61053
|
||||
log-num 0
|
||||
log-console yes
|
||||
log-level debug
|
||||
cache-persist no)""");
|
||||
smartdns::Client client;
|
||||
ASSERT_TRUE(client.Query("a.com", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 2);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "a.com");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "s.a.com.");
|
||||
EXPECT_EQ(client.GetAnswer()[1].GetData(), "4.5.6.7");
|
||||
}
|
||||
|
||||
|
||||
TEST_F(Cname, loop)
|
||||
{
|
||||
smartdns::MockServer server_upstream;
|
||||
smartdns::Server server;
|
||||
|
||||
server_upstream.Start("udp://0.0.0.0:61053", [](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype != DNS_T_A) {
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
}
|
||||
|
||||
if (request->domain == "s.a.com") {
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "4.5.6.7", 700);
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
|
||||
}
|
||||
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "1.2.3.4", 611);
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
});
|
||||
|
||||
server.Start(R"""(bind [::]:60053
|
||||
cname /a.com/c.a.com
|
||||
cname /c.a.com/s.a.com
|
||||
server 127.0.0.1:61053
|
||||
log-num 0
|
||||
log-console yes
|
||||
log-level debug
|
||||
cache-persist no)""");
|
||||
smartdns::Client client;
|
||||
ASSERT_TRUE(client.Query("a.com", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 2);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "a.com");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "c.a.com.");
|
||||
EXPECT_EQ(client.GetAnswer()[1].GetData(), "4.5.6.7");
|
||||
}
|
||||
106
test/cases/test-discard-block-ip.cc
Normal file
106
test/cases/test-discard-block-ip.cc
Normal file
@@ -0,0 +1,106 @@
|
||||
/*************************************************************************
|
||||
*
|
||||
* Copyright (C) 2018-2023 Ruilin Peng (Nick) <pymumu@gmail.com>.
|
||||
*
|
||||
* smartdns is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* smartdns is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "client.h"
|
||||
#include "dns.h"
|
||||
#include "include/utils.h"
|
||||
#include "server.h"
|
||||
#include "gtest/gtest.h"
|
||||
|
||||
TEST(DiscardBlockIP, first_ping)
|
||||
{
|
||||
smartdns::MockServer server_upstream1;
|
||||
smartdns::MockServer server_upstream2;
|
||||
smartdns::Server server;
|
||||
|
||||
server_upstream1.Start("udp://0.0.0.0:61053", [](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype != DNS_T_A) {
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
}
|
||||
|
||||
unsigned char addr[4] = {0, 0, 0, 0};
|
||||
dns_add_A(request->response_packet, DNS_RRS_AN, request->domain.c_str(), 611, addr);
|
||||
request->response_packet->head.rcode = DNS_RC_NOERROR;
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
});
|
||||
|
||||
server_upstream2.Start("udp://0.0.0.0:62053", [](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype != DNS_T_A) {
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
}
|
||||
unsigned char addr[4] = {1, 2, 3, 4};
|
||||
usleep(20000);
|
||||
dns_add_A(request->response_packet, DNS_RRS_AN, request->domain.c_str(), 611, addr);
|
||||
request->response_packet->head.rcode = DNS_RC_NOERROR;
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
});
|
||||
|
||||
server.Start(R"""(bind [::]:60053
|
||||
server 127.0.0.1:61053
|
||||
server 127.0.0.1:62053
|
||||
log-num 0
|
||||
log-console yes
|
||||
log-level debug
|
||||
cache-persist no)""");
|
||||
smartdns::Client client;
|
||||
ASSERT_TRUE(client.Query("a.com", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_LT(client.GetQueryTime(), 100);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetTTL(), 3);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "1.2.3.4");
|
||||
}
|
||||
|
||||
TEST(DiscardBlockIP, first_response)
|
||||
{
|
||||
smartdns::MockServer server_upstream1;
|
||||
smartdns::MockServer server_upstream2;
|
||||
smartdns::Server server;
|
||||
|
||||
server_upstream1.Start("udp://0.0.0.0:61053", [](struct smartdns::ServerRequestContext *request) {
|
||||
unsigned char addr[4] = {0, 0, 0, 0};
|
||||
dns_add_A(request->response_packet, DNS_RRS_AN, request->domain.c_str(), 611, addr);
|
||||
request->response_packet->head.rcode = DNS_RC_NOERROR;
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
});
|
||||
|
||||
server_upstream2.Start("udp://0.0.0.0:62053", [](struct smartdns::ServerRequestContext *request) {
|
||||
unsigned char addr[4] = {1, 2, 3, 4};
|
||||
usleep(20000);
|
||||
dns_add_A(request->response_packet, DNS_RRS_AN, request->domain.c_str(), 611, addr);
|
||||
request->response_packet->head.rcode = DNS_RC_NOERROR;
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
});
|
||||
|
||||
server.Start(R"""(bind [::]:60053
|
||||
server 127.0.0.1:61053
|
||||
server 127.0.0.1:62053
|
||||
log-num 0
|
||||
log-console yes
|
||||
log-level debug
|
||||
response-mode fastest-response
|
||||
cache-persist no)""");
|
||||
smartdns::Client client;
|
||||
ASSERT_TRUE(client.Query("a.com", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetTTL(), 3);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "1.2.3.4");
|
||||
}
|
||||
64
test/cases/test-dns64.cc
Normal file
64
test/cases/test-dns64.cc
Normal file
@@ -0,0 +1,64 @@
|
||||
/*************************************************************************
|
||||
*
|
||||
* Copyright (C) 2018-2023 Ruilin Peng (Nick) <pymumu@gmail.com>.
|
||||
*
|
||||
* smartdns is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* smartdns is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "client.h"
|
||||
#include "dns.h"
|
||||
#include "include/utils.h"
|
||||
#include "server.h"
|
||||
#include "util.h"
|
||||
#include "gtest/gtest.h"
|
||||
#include <fstream>
|
||||
|
||||
class DNS64 : public ::testing::Test
|
||||
{
|
||||
protected:
|
||||
virtual void SetUp() {}
|
||||
virtual void TearDown() {}
|
||||
};
|
||||
|
||||
TEST_F(DNS64, no_dualstack)
|
||||
{
|
||||
smartdns::MockServer server_upstream;
|
||||
smartdns::Server server;
|
||||
|
||||
server_upstream.Start("udp://0.0.0.0:61053", [&](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype == DNS_T_A) {
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "1.2.3.4");
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
}
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
});
|
||||
|
||||
server.Start(R"""(bind [::]:60053
|
||||
server 127.0.0.1:61053
|
||||
log-num 0
|
||||
dns64 64:ff9b::/96
|
||||
log-console yes
|
||||
dualstack-ip-selection no
|
||||
log-level debug
|
||||
cache-persist no)""");
|
||||
smartdns::Client client;
|
||||
ASSERT_TRUE(client.Query("a.com AAAA", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "a.com");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetTTL(), 3);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetType(), "AAAA");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "64:ff9b::102:304");
|
||||
}
|
||||
73
test/cases/test-domain-rule.cc
Normal file
73
test/cases/test-domain-rule.cc
Normal file
@@ -0,0 +1,73 @@
|
||||
/*************************************************************************
|
||||
*
|
||||
* Copyright (C) 2018-2023 Ruilin Peng (Nick) <pymumu@gmail.com>.
|
||||
*
|
||||
* smartdns is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* smartdns is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "client.h"
|
||||
#include "dns.h"
|
||||
#include "include/utils.h"
|
||||
#include "server.h"
|
||||
#include "gtest/gtest.h"
|
||||
|
||||
class DomainRule : public ::testing::Test
|
||||
{
|
||||
protected:
|
||||
virtual void SetUp() {}
|
||||
virtual void TearDown() {}
|
||||
};
|
||||
|
||||
TEST_F(DomainRule, bogus_nxdomain)
|
||||
{
|
||||
smartdns::MockServer server_upstream;
|
||||
smartdns::MockServer server_upstream2;
|
||||
smartdns::Server server;
|
||||
|
||||
server_upstream.Start("udp://0.0.0.0:61053", [](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype != DNS_T_A) {
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
}
|
||||
if (request->domain == "a.com") {
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "10.11.12.13", 611);
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
}
|
||||
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "1.2.3.4", 611);
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
});
|
||||
|
||||
/* this ip will be discard, but is reachable */
|
||||
server.MockPing(PING_TYPE_ICMP, "1.2.3.4", 60, 10);
|
||||
|
||||
server.Start(R"""(bind [::]:60053
|
||||
server udp://127.0.0.1:61053 -blacklist-ip
|
||||
bogus-nxdomain 10.0.0.0/8
|
||||
log-num 0
|
||||
log-console yes
|
||||
log-level debug
|
||||
cache-persist no)""");
|
||||
smartdns::Client client;
|
||||
ASSERT_TRUE(client.Query("a.com", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAuthorityNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NXDOMAIN");
|
||||
|
||||
ASSERT_TRUE(client.Query("b.com", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "b.com");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "1.2.3.4");
|
||||
}
|
||||
87
test/cases/test-domain-set.cc
Normal file
87
test/cases/test-domain-set.cc
Normal file
@@ -0,0 +1,87 @@
|
||||
/*************************************************************************
|
||||
*
|
||||
* Copyright (C) 2018-2023 Ruilin Peng (Nick) <pymumu@gmail.com>.
|
||||
*
|
||||
* smartdns is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* smartdns is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "client.h"
|
||||
#include "dns.h"
|
||||
#include "include/utils.h"
|
||||
#include "server.h"
|
||||
#include "util.h"
|
||||
#include "gtest/gtest.h"
|
||||
#include <fstream>
|
||||
|
||||
class DomainSet : public ::testing::Test
|
||||
{
|
||||
protected:
|
||||
virtual void SetUp() {}
|
||||
virtual void TearDown() {}
|
||||
};
|
||||
|
||||
TEST_F(DomainSet, set_add)
|
||||
{
|
||||
smartdns::MockServer server_upstream;
|
||||
smartdns::Server server;
|
||||
smartdns::TempFile file_set;
|
||||
std::vector<std::string> domain_list;
|
||||
int count = 16;
|
||||
std::string config = "domain-set -name test-set -file " + file_set.GetPath() + "\n";
|
||||
config += R"""(bind [::]:60053
|
||||
server 127.0.0.1:61053
|
||||
log-num 0
|
||||
log-console yes
|
||||
log-level info
|
||||
cache-persist no
|
||||
domain-rules /domain-set:test-set/ -c none --dualstack-ip-selection no -a 9.9.9.9
|
||||
)""";
|
||||
|
||||
server_upstream.Start("udp://0.0.0.0:61053", [&](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype == DNS_T_A) {
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "1.2.3.4");
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
}
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
});
|
||||
|
||||
for (int i = 0; i < count; i++) {
|
||||
auto domain = smartdns::GenerateRandomString(10) + "." + smartdns::GenerateRandomString(3);
|
||||
file_set.Write(domain);
|
||||
file_set.Write("\n");
|
||||
domain_list.emplace_back(domain);
|
||||
}
|
||||
|
||||
std::cout << config << std::endl;
|
||||
server.Start(config);
|
||||
smartdns::Client client;
|
||||
|
||||
for (auto &domain : domain_list) {
|
||||
ASSERT_TRUE(client.Query(domain, 60053));
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), domain);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetTTL(), 600);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetType(), "A");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "9.9.9.9");
|
||||
}
|
||||
|
||||
ASSERT_TRUE(client.Query("a.com", 60053));
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "a.com");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetTTL(), 3);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetType(), "A");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "1.2.3.4");
|
||||
}
|
||||
186
test/cases/test-dualstack.cc
Normal file
186
test/cases/test-dualstack.cc
Normal file
@@ -0,0 +1,186 @@
|
||||
/*************************************************************************
|
||||
*
|
||||
* Copyright (C) 2018-2023 Ruilin Peng (Nick) <pymumu@gmail.com>.
|
||||
*
|
||||
* smartdns is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* smartdns is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "client.h"
|
||||
#include "dns.h"
|
||||
#include "include/utils.h"
|
||||
#include "server.h"
|
||||
#include "util.h"
|
||||
#include "gtest/gtest.h"
|
||||
#include <fstream>
|
||||
|
||||
class DualStack : public ::testing::Test
|
||||
{
|
||||
protected:
|
||||
virtual void SetUp() {}
|
||||
virtual void TearDown() {}
|
||||
};
|
||||
|
||||
TEST_F(DualStack, ipv4_prefer)
|
||||
{
|
||||
smartdns::MockServer server_upstream;
|
||||
smartdns::Server server;
|
||||
|
||||
server_upstream.Start("udp://0.0.0.0:61053", [&](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype == DNS_T_A) {
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "1.2.3.4");
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "5.6.7.8");
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
} else if (request->qtype == DNS_T_AAAA) {
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "2001:db8::1");
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "2001:db8::2");
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
}
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
});
|
||||
|
||||
server.MockPing(PING_TYPE_ICMP, "1.2.3.4", 60, 100);
|
||||
server.MockPing(PING_TYPE_ICMP, "5.6.7.8", 60, 110);
|
||||
server.MockPing(PING_TYPE_ICMP, "2001:db8::1", 60, 150);
|
||||
server.MockPing(PING_TYPE_ICMP, "2001:db8::2", 60, 150);
|
||||
|
||||
server.Start(R"""(bind [::]:60053
|
||||
server 127.0.0.1:61053
|
||||
log-num 0
|
||||
log-console yes
|
||||
speed-check-mode ping
|
||||
log-level debug
|
||||
cache-persist no)""");
|
||||
smartdns::Client client;
|
||||
ASSERT_TRUE(client.Query("a.com AAAA", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAuthorityNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAuthority()[0].GetName(), "a.com");
|
||||
EXPECT_EQ(client.GetAuthority()[0].GetTTL(), 3);
|
||||
EXPECT_EQ(client.GetAuthority()[0].GetType(), "SOA");
|
||||
|
||||
usleep(220 * 1000);
|
||||
ASSERT_TRUE(client.Query("a.com", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 2);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_LT(client.GetQueryTime(), 20);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "a.com");
|
||||
EXPECT_GT(client.GetAnswer()[0].GetTTL(), 597);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "1.2.3.4");
|
||||
EXPECT_EQ(client.GetAnswer()[1].GetData(), "5.6.7.8");
|
||||
}
|
||||
|
||||
TEST_F(DualStack, ipv6_prefer_allow_force_AAAA)
|
||||
{
|
||||
smartdns::MockServer server_upstream;
|
||||
smartdns::Server server;
|
||||
|
||||
server_upstream.Start("udp://0.0.0.0:61053", [&](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype == DNS_T_A) {
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "1.2.3.4");
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "5.6.7.8");
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
} else if (request->qtype == DNS_T_AAAA) {
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "2001:db8::1");
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "2001:db8::2");
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
}
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
});
|
||||
|
||||
server.MockPing(PING_TYPE_ICMP, "1.2.3.4", 60, 100);
|
||||
server.MockPing(PING_TYPE_ICMP, "5.6.7.8", 60, 110);
|
||||
server.MockPing(PING_TYPE_ICMP, "2001:db8::1", 60, 70);
|
||||
server.MockPing(PING_TYPE_ICMP, "2001:db8::2", 60, 75);
|
||||
|
||||
server.Start(R"""(bind [::]:60053
|
||||
server 127.0.0.1:61053
|
||||
log-num 0
|
||||
log-console yes
|
||||
speed-check-mode ping
|
||||
dualstack-ip-allow-force-AAAA yes
|
||||
log-level debug
|
||||
cache-persist no)""");
|
||||
smartdns::Client client;
|
||||
ASSERT_TRUE(client.Query("a.com A", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAuthorityNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAuthority()[0].GetName(), "a.com");
|
||||
EXPECT_EQ(client.GetAuthority()[0].GetTTL(), 3);
|
||||
EXPECT_EQ(client.GetAuthority()[0].GetType(), "SOA");
|
||||
|
||||
usleep(220 * 1000);
|
||||
ASSERT_TRUE(client.Query("a.com AAAA", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 2);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_LT(client.GetQueryTime(), 20);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "a.com");
|
||||
EXPECT_GT(client.GetAnswer()[0].GetTTL(), 597);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "2001:db8::1");
|
||||
EXPECT_EQ(client.GetAnswer()[1].GetData(), "2001:db8::2");
|
||||
}
|
||||
|
||||
TEST_F(DualStack, ipv6_prefer_must_exist_ipv4)
|
||||
{
|
||||
smartdns::MockServer server_upstream;
|
||||
smartdns::Server server;
|
||||
|
||||
server_upstream.Start("udp://0.0.0.0:61053", [&](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype == DNS_T_A) {
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "1.2.3.4");
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "5.6.7.8");
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
} else if (request->qtype == DNS_T_AAAA) {
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "2001:db8::1");
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "2001:db8::2");
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
}
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
});
|
||||
|
||||
server.MockPing(PING_TYPE_ICMP, "1.2.3.4", 60, 100);
|
||||
server.MockPing(PING_TYPE_ICMP, "5.6.7.8", 60, 110);
|
||||
server.MockPing(PING_TYPE_ICMP, "2001:db8::1", 60, 70);
|
||||
server.MockPing(PING_TYPE_ICMP, "2001:db8::2", 60, 100);
|
||||
|
||||
server.Start(R"""(bind [::]:60053
|
||||
server 127.0.0.1:61053
|
||||
log-num 0
|
||||
log-console yes
|
||||
speed-check-mode ping
|
||||
dualstack-ip-allow-force-AAAA yes
|
||||
log-level debug
|
||||
cache-persist no)""");
|
||||
smartdns::Client client;
|
||||
ASSERT_TRUE(client.Query("a.com A", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAuthorityNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAuthority()[0].GetName(), "a.com");
|
||||
EXPECT_EQ(client.GetAuthority()[0].GetTTL(), 3);
|
||||
EXPECT_EQ(client.GetAuthority()[0].GetType(), "SOA");
|
||||
|
||||
usleep(220 * 1000);
|
||||
ASSERT_TRUE(client.Query("a.com AAAA", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_LT(client.GetQueryTime(), 20);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "a.com");
|
||||
EXPECT_GT(client.GetAnswer()[0].GetTTL(), 597);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "2001:db8::1");
|
||||
}
|
||||
156
test/cases/test-ip-rule.cc
Normal file
156
test/cases/test-ip-rule.cc
Normal file
@@ -0,0 +1,156 @@
|
||||
/*************************************************************************
|
||||
*
|
||||
* Copyright (C) 2018-2023 Ruilin Peng (Nick) <pymumu@gmail.com>.
|
||||
*
|
||||
* smartdns is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* smartdns is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "client.h"
|
||||
#include "dns.h"
|
||||
#include "include/utils.h"
|
||||
#include "server.h"
|
||||
#include "gtest/gtest.h"
|
||||
|
||||
class IPRule : public ::testing::Test
|
||||
{
|
||||
protected:
|
||||
virtual void SetUp() {}
|
||||
virtual void TearDown() {}
|
||||
};
|
||||
|
||||
TEST_F(IPRule, white_list)
|
||||
{
|
||||
smartdns::MockServer server_upstream;
|
||||
smartdns::MockServer server_upstream2;
|
||||
smartdns::Server server;
|
||||
|
||||
server_upstream.Start("udp://0.0.0.0:61053", [](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype != DNS_T_A) {
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
}
|
||||
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "1.2.3.4", 611);
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
});
|
||||
|
||||
server_upstream2.Start("udp://0.0.0.0:62053", [](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype != DNS_T_A) {
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
}
|
||||
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "4.5.6.7", 611);
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
});
|
||||
|
||||
/* this ip will be discard, but is reachable */
|
||||
server.MockPing(PING_TYPE_ICMP, "1.2.3.4", 60, 10);
|
||||
|
||||
server.Start(R"""(bind [::]:60053
|
||||
server udp://127.0.0.1:61053 -whitelist-ip
|
||||
server udp://127.0.0.1:62053 -whitelist-ip
|
||||
whitelist-ip 4.5.6.7/24
|
||||
log-num 0
|
||||
log-console yes
|
||||
log-level debug
|
||||
cache-persist no)""");
|
||||
smartdns::Client client;
|
||||
ASSERT_TRUE(client.Query("a.com", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "a.com");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "4.5.6.7");
|
||||
}
|
||||
|
||||
TEST_F(IPRule, black_list)
|
||||
{
|
||||
smartdns::MockServer server_upstream;
|
||||
smartdns::MockServer server_upstream2;
|
||||
smartdns::Server server;
|
||||
|
||||
server_upstream.Start("udp://0.0.0.0:61053", [](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype != DNS_T_A) {
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
}
|
||||
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "1.2.3.4", 611);
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
});
|
||||
|
||||
server_upstream2.Start("udp://0.0.0.0:62053", [](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype != DNS_T_A) {
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
}
|
||||
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "4.5.6.7", 611);
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
});
|
||||
|
||||
/* this ip will be discard, but is reachable */
|
||||
server.MockPing(PING_TYPE_ICMP, "4.5.6.7", 60, 10);
|
||||
|
||||
server.Start(R"""(bind [::]:60053
|
||||
server udp://127.0.0.1:61053 -blacklist-ip
|
||||
server udp://127.0.0.1:62053 -blacklist-ip
|
||||
blacklist-ip 4.5.6.7/24
|
||||
log-num 0
|
||||
log-console yes
|
||||
log-level debug
|
||||
cache-persist no)""");
|
||||
smartdns::Client client;
|
||||
ASSERT_TRUE(client.Query("a.com", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "a.com");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "1.2.3.4");
|
||||
}
|
||||
|
||||
TEST_F(IPRule, ignore_ip)
|
||||
{
|
||||
smartdns::MockServer server_upstream;
|
||||
smartdns::MockServer server_upstream2;
|
||||
smartdns::Server server;
|
||||
|
||||
server_upstream.Start("udp://0.0.0.0:61053", [](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype != DNS_T_A) {
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
}
|
||||
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "1.2.3.4", 611);
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "4.5.6.7", 611);
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "7.8.9.10", 611);
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
});
|
||||
|
||||
/* this ip will be discard, but is reachable */
|
||||
server.MockPing(PING_TYPE_ICMP, "1.2.3.4", 60, 10);
|
||||
server.MockPing(PING_TYPE_ICMP, "4.5.6.7", 60, 90);
|
||||
server.MockPing(PING_TYPE_ICMP, "7.8.9.10", 60, 40);
|
||||
|
||||
server.Start(R"""(bind [::]:60053
|
||||
server udp://127.0.0.1:61053 -blacklist-ip
|
||||
ignore-ip 1.2.3.0/24
|
||||
log-num 0
|
||||
log-console yes
|
||||
log-level debug
|
||||
cache-persist no)""");
|
||||
smartdns::Client client;
|
||||
ASSERT_TRUE(client.Query("a.com", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "a.com");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "7.8.9.10");
|
||||
}
|
||||
60
test/cases/test-mock-server.cc
Normal file
60
test/cases/test-mock-server.cc
Normal file
@@ -0,0 +1,60 @@
|
||||
/*************************************************************************
|
||||
*
|
||||
* Copyright (C) 2018-2023 Ruilin Peng (Nick) <pymumu@gmail.com>.
|
||||
*
|
||||
* smartdns is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* smartdns is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "client.h"
|
||||
#include "include/utils.h"
|
||||
#include "server.h"
|
||||
#include "gtest/gtest.h"
|
||||
|
||||
TEST(MockServer, query_fail)
|
||||
{
|
||||
smartdns::MockServer server;
|
||||
smartdns::Client client;
|
||||
server.Start("udp://0.0.0.0:7053", [](struct smartdns::ServerRequestContext *request) {
|
||||
request->response_data_len = 0;
|
||||
return smartdns::SERVER_REQUEST_ERROR;
|
||||
});
|
||||
|
||||
ASSERT_TRUE(client.Query("example.com", 7053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
EXPECT_EQ(client.GetStatus(), "SERVFAIL");
|
||||
}
|
||||
|
||||
TEST(MockServer, soa)
|
||||
{
|
||||
smartdns::MockServer server;
|
||||
smartdns::Client client;
|
||||
server.Start("udp://0.0.0.0:7053",
|
||||
[](struct smartdns::ServerRequestContext *request) { return smartdns::SERVER_REQUEST_SOA; });
|
||||
|
||||
ASSERT_TRUE(client.Query("example.com", 7053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
EXPECT_EQ(client.GetStatus(), "NXDOMAIN");
|
||||
}
|
||||
|
||||
TEST(MockServer, noerror)
|
||||
{
|
||||
smartdns::MockServer server;
|
||||
smartdns::Client client;
|
||||
server.Start("udp://0.0.0.0:7053",
|
||||
[](struct smartdns::ServerRequestContext *request) { return smartdns::SERVER_REQUEST_OK; });
|
||||
|
||||
ASSERT_TRUE(client.Query("example.com", 7053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
}
|
||||
97
test/cases/test-nameserver.cc
Normal file
97
test/cases/test-nameserver.cc
Normal file
@@ -0,0 +1,97 @@
|
||||
/*************************************************************************
|
||||
*
|
||||
* Copyright (C) 2018-2023 Ruilin Peng (Nick) <pymumu@gmail.com>.
|
||||
*
|
||||
* smartdns is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* smartdns is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "client.h"
|
||||
#include "dns.h"
|
||||
#include "include/utils.h"
|
||||
#include "server.h"
|
||||
#include "gtest/gtest.h"
|
||||
|
||||
class NameServer : public ::testing::Test
|
||||
{
|
||||
protected:
|
||||
virtual void SetUp() {}
|
||||
virtual void TearDown() {}
|
||||
};
|
||||
|
||||
TEST_F(NameServer, cname)
|
||||
{
|
||||
smartdns::MockServer server_upstream;
|
||||
smartdns::MockServer server_upstream1;
|
||||
smartdns::MockServer server_upstream2;
|
||||
smartdns::Server server;
|
||||
|
||||
server_upstream.Start("udp://0.0.0.0:61053", [](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype != DNS_T_A) {
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
}
|
||||
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "9.10.11.12", 611);
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
});
|
||||
|
||||
server_upstream1.Start("udp://0.0.0.0:62053", [](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype != DNS_T_A) {
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
}
|
||||
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "1.2.3.4", 611);
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
});
|
||||
|
||||
server_upstream2.Start("udp://0.0.0.0:63053", [](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype != DNS_T_A) {
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
}
|
||||
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "5.6.7.8", 611);
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
});
|
||||
|
||||
server.Start(R"""(bind [::]:60053
|
||||
server 127.0.0.1:61053
|
||||
server 127.0.0.1:62053 -group g1 -exclude-default-group
|
||||
server 127.0.0.1:63053 -group g2 -exclude-default-group
|
||||
nameserver /a.com/g1
|
||||
nameserver /b.com/g2
|
||||
log-num 0
|
||||
log-console yes
|
||||
log-level debug
|
||||
cache-persist no)""");
|
||||
smartdns::Client client;
|
||||
ASSERT_TRUE(client.Query("a.com", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "a.com");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "1.2.3.4");
|
||||
|
||||
ASSERT_TRUE(client.Query("b.com", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "b.com");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "5.6.7.8");
|
||||
|
||||
ASSERT_TRUE(client.Query("c.com", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "c.com");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "9.10.11.12");
|
||||
}
|
||||
99
test/cases/test-perf.cc
Normal file
99
test/cases/test-perf.cc
Normal file
@@ -0,0 +1,99 @@
|
||||
/*************************************************************************
|
||||
*
|
||||
* Copyright (C) 2018-2023 Ruilin Peng (Nick) <pymumu@gmail.com>.
|
||||
*
|
||||
* smartdns is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* smartdns is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "client.h"
|
||||
#include "dns.h"
|
||||
#include "include/utils.h"
|
||||
#include "server.h"
|
||||
#include "gtest/gtest.h"
|
||||
#include <fstream>
|
||||
|
||||
class Perf : public ::testing::Test
|
||||
{
|
||||
protected:
|
||||
virtual void SetUp() {}
|
||||
virtual void TearDown() {}
|
||||
};
|
||||
|
||||
TEST_F(Perf, no_speed_check)
|
||||
{
|
||||
smartdns::MockServer server_upstream;
|
||||
smartdns::Server server;
|
||||
if (smartdns::IsCommandExists("dnsperf") == false) {
|
||||
printf("dnsperf not found, skip test, please install dnsperf first.\n");
|
||||
GTEST_SKIP();
|
||||
}
|
||||
|
||||
server_upstream.Start("udp://0.0.0.0:61053", [](struct smartdns::ServerRequestContext *request) {
|
||||
std::string domain = request->domain;
|
||||
if (request->domain.length() == 0) {
|
||||
return smartdns::SERVER_REQUEST_ERROR;
|
||||
}
|
||||
|
||||
if (request->qtype == DNS_T_A) {
|
||||
unsigned char addr[4] = {1, 2, 3, 4};
|
||||
dns_add_A(request->response_packet, DNS_RRS_AN, domain.c_str(), 61, addr);
|
||||
} else if (request->qtype == DNS_T_AAAA) {
|
||||
unsigned char addr[16] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
|
||||
dns_add_AAAA(request->response_packet, DNS_RRS_AN, domain.c_str(), 61, addr);
|
||||
} else {
|
||||
return smartdns::SERVER_REQUEST_ERROR;
|
||||
}
|
||||
|
||||
request->response_packet->head.rcode = DNS_RC_NOERROR;
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
});
|
||||
|
||||
server.Start(R"""(bind [::]:60053
|
||||
server 127.0.0.1:61053
|
||||
log-num 0
|
||||
log-console yes
|
||||
speed-check-mode none
|
||||
log-level error
|
||||
cache-persist no)""");
|
||||
std::string file = "/tmp/smartdns-perftest-domain.list" + smartdns::GenerateRandomString(5);
|
||||
std::string cmd = "dnsperf -p 60053";
|
||||
cmd += " -d ";
|
||||
cmd += file;
|
||||
std::ofstream ofs(file);
|
||||
ASSERT_TRUE(ofs.is_open());
|
||||
Defer
|
||||
{
|
||||
ofs.close();
|
||||
unlink(file.c_str());
|
||||
};
|
||||
|
||||
for (int i = 0; i < 100000; i++) {
|
||||
std::string domain = smartdns::GenerateRandomString(10);
|
||||
domain += ".";
|
||||
domain += smartdns::GenerateRandomString(3);
|
||||
|
||||
if (random() % 2 == 0) {
|
||||
domain += " A";
|
||||
} else {
|
||||
domain += " AAAA";
|
||||
}
|
||||
|
||||
domain += "\n";
|
||||
|
||||
ofs.write(domain.c_str(), domain.length());
|
||||
ofs.flush();
|
||||
}
|
||||
|
||||
system(cmd.c_str());
|
||||
}
|
||||
97
test/cases/test-ping.cc
Normal file
97
test/cases/test-ping.cc
Normal file
@@ -0,0 +1,97 @@
|
||||
/*************************************************************************
|
||||
*
|
||||
* Copyright (C) 2018-2023 Ruilin Peng (Nick) <pymumu@gmail.com>.
|
||||
*
|
||||
* smartdns is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* smartdns is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "client.h"
|
||||
#include "fast_ping.h"
|
||||
#include "include/utils.h"
|
||||
#include "server.h"
|
||||
#include "tlog.h"
|
||||
#include "gtest/gtest.h"
|
||||
|
||||
class Ping : public ::testing::Test
|
||||
{
|
||||
protected:
|
||||
virtual void SetUp()
|
||||
{
|
||||
EXPECT_EQ(fast_ping_init(), 0);
|
||||
loglevel = tlog_getlevel();
|
||||
tlog_setlevel(TLOG_DEBUG);
|
||||
}
|
||||
virtual void TearDown()
|
||||
{
|
||||
fast_ping_exit();
|
||||
tlog_setlevel(loglevel);
|
||||
}
|
||||
|
||||
private:
|
||||
tlog_level loglevel;
|
||||
};
|
||||
|
||||
void ping_result_callback(struct ping_host_struct *ping_host, const char *host, FAST_PING_RESULT result,
|
||||
struct sockaddr *addr, socklen_t addr_len, int seqno, int ttl, struct timeval *tv, int error,
|
||||
void *userptr)
|
||||
{
|
||||
int *count = (int *)userptr;
|
||||
*count = 1;
|
||||
}
|
||||
|
||||
TEST_F(Ping, icmp)
|
||||
{
|
||||
struct ping_host_struct *ping_host;
|
||||
int count = 0;
|
||||
ping_host = fast_ping_start(PING_TYPE_ICMP, "127.0.0.1", 1, 1, 200, ping_result_callback, &count);
|
||||
ASSERT_NE(ping_host, nullptr);
|
||||
usleep(10000);
|
||||
fast_ping_stop(ping_host);
|
||||
EXPECT_EQ(count, 1);
|
||||
}
|
||||
|
||||
TEST_F(Ping, tcp)
|
||||
{
|
||||
struct ping_host_struct *ping_host;
|
||||
int count = 0;
|
||||
ping_host = fast_ping_start(PING_TYPE_TCP, "127.0.0.1:1", 1, 1, 200, ping_result_callback, &count);
|
||||
ASSERT_NE(ping_host, nullptr);
|
||||
usleep(10000);
|
||||
fast_ping_stop(ping_host);
|
||||
EXPECT_EQ(count, 1);
|
||||
}
|
||||
|
||||
void fake_ping_result_callback(struct ping_host_struct *ping_host, const char *host, FAST_PING_RESULT result,
|
||||
struct sockaddr *addr, socklen_t addr_len, int seqno, int ttl, struct timeval *tv,
|
||||
int error, void *userptr)
|
||||
{
|
||||
if (result == PING_RESULT_RESPONSE) {
|
||||
int *count = (int *)userptr;
|
||||
double rtt = tv->tv_sec * 1000.0 + tv->tv_usec / 1000.0;
|
||||
tlog(TLOG_INFO, "from %15s: seq=%d ttl=%d time=%.3f\n", host, seqno, ttl, rtt);
|
||||
*count = (int)rtt;
|
||||
}
|
||||
}
|
||||
|
||||
TEST_F(Ping, fake_icmp)
|
||||
{
|
||||
struct ping_host_struct *ping_host;
|
||||
int count = 0;
|
||||
fast_ping_fake_ip_add(PING_TYPE_ICMP, "1.2.3.4", 60, 5);
|
||||
ping_host = fast_ping_start(PING_TYPE_ICMP, "1.2.3.4", 1, 1000, 200, fake_ping_result_callback, &count);
|
||||
ASSERT_NE(ping_host, nullptr);
|
||||
usleep(100000);
|
||||
fast_ping_stop(ping_host);
|
||||
EXPECT_GE(count, 5);
|
||||
}
|
||||
156
test/cases/test-ptr.cc
Normal file
156
test/cases/test-ptr.cc
Normal file
@@ -0,0 +1,156 @@
|
||||
/*************************************************************************
|
||||
*
|
||||
* Copyright (C) 2018-2023 Ruilin Peng (Nick) <pymumu@gmail.com>.
|
||||
*
|
||||
* smartdns is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* smartdns is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "client.h"
|
||||
#include "dns.h"
|
||||
#include "include/utils.h"
|
||||
#include "server.h"
|
||||
#include "util.h"
|
||||
#include "gtest/gtest.h"
|
||||
#include <fstream>
|
||||
|
||||
class Ptr : public ::testing::Test
|
||||
{
|
||||
protected:
|
||||
virtual void SetUp() {}
|
||||
virtual void TearDown() {}
|
||||
};
|
||||
|
||||
TEST_F(Ptr, query)
|
||||
{
|
||||
smartdns::MockServer server_upstream;
|
||||
smartdns::Server server;
|
||||
|
||||
server_upstream.Start("udp://0.0.0.0:61053", [&](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype == DNS_T_A) {
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "1.2.3.4");
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
}
|
||||
|
||||
if (request->qtype == DNS_T_PTR) {
|
||||
dns_add_PTR(request->response_packet, DNS_RRS_AN, request->domain.c_str(), 30, "my-hostname");
|
||||
request->response_packet->head.rcode = DNS_RC_NOERROR;
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
}
|
||||
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
});
|
||||
|
||||
server.Start(R"""(bind [::]:60053
|
||||
server 127.0.0.1:61053
|
||||
log-num 0
|
||||
log-console yes
|
||||
dualstack-ip-selection no
|
||||
log-level debug
|
||||
cache-persist no)""");
|
||||
smartdns::Client client;
|
||||
ASSERT_TRUE(client.Query("4.3.2.1.in-addr.arpa PTR", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "4.3.2.1.in-addr.arpa");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetTTL(), 600);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetType(), "PTR");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "my-hostname.");
|
||||
}
|
||||
|
||||
TEST_F(Ptr, address_expand_ptr)
|
||||
{
|
||||
smartdns::MockServer server_upstream;
|
||||
smartdns::Server server;
|
||||
|
||||
server_upstream.Start("udp://0.0.0.0:61053", [&](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype == DNS_T_A) {
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "1.2.3.4", 700);
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
} else if (request->qtype == DNS_T_AAAA) {
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "64:ff9b::102:304", 700);
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
}
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
});
|
||||
|
||||
server.Start(R"""(bind [::]:60053
|
||||
server 127.0.0.1:61053
|
||||
log-num 0
|
||||
log-console yes
|
||||
log-level debug
|
||||
speed-check-mode none
|
||||
expand-ptr-from-address yes
|
||||
address /a.com/10.11.12.13
|
||||
address /a.com/64:ff9b::1010:1010
|
||||
cache-persist no)""");
|
||||
smartdns::Client client;
|
||||
ASSERT_TRUE(client.Query("13.12.11.10.in-addr.arpa PTR", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "13.12.11.10.in-addr.arpa");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetTTL(), 600);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetType(), "PTR");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "a.com.");
|
||||
|
||||
ASSERT_TRUE(client.Query("0.1.0.1.0.1.0.1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.b.9.f.f.4.6.0.0.ip6.arpa PTR", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(),
|
||||
"0.1.0.1.0.1.0.1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.b.9.f.f.4.6.0.0.ip6.arpa");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetTTL(), 600);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetType(), "PTR");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "a.com.");
|
||||
}
|
||||
|
||||
TEST_F(Ptr, smartdns)
|
||||
{
|
||||
smartdns::MockServer server_upstream;
|
||||
smartdns::Server server;
|
||||
|
||||
server_upstream.Start("udp://0.0.0.0:61053", [&](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype == DNS_T_A) {
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "1.2.3.4");
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
}
|
||||
|
||||
if (request->qtype == DNS_T_PTR) {
|
||||
dns_add_PTR(request->response_packet, DNS_RRS_AN, request->domain.c_str(), 30, "my-hostname");
|
||||
request->response_packet->head.rcode = DNS_RC_NOERROR;
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
}
|
||||
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
});
|
||||
|
||||
server.Start(R"""(bind [::]:60053
|
||||
server 127.0.0.1:61053
|
||||
server-name my-server
|
||||
log-num 0
|
||||
log-console yes
|
||||
dualstack-ip-selection no
|
||||
log-level debug
|
||||
cache-persist no)""");
|
||||
smartdns::Client client;
|
||||
ASSERT_TRUE(client.Query("1.0.0.127.in-addr.arpa PTR", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "1.0.0.127.in-addr.arpa");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetTTL(), 600);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetType(), "PTR");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "my-server.");
|
||||
}
|
||||
257
test/cases/test-qtype-soa.cc
Normal file
257
test/cases/test-qtype-soa.cc
Normal file
@@ -0,0 +1,257 @@
|
||||
/*************************************************************************
|
||||
*
|
||||
* Copyright (C) 2018-2023 Ruilin Peng (Nick) <pymumu@gmail.com>.
|
||||
*
|
||||
* smartdns is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* smartdns is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "client.h"
|
||||
#include "dns.h"
|
||||
#include "include/utils.h"
|
||||
#include "server.h"
|
||||
#include "gtest/gtest.h"
|
||||
|
||||
class QtypeSOA : public ::testing::Test
|
||||
{
|
||||
protected:
|
||||
virtual void SetUp() {}
|
||||
virtual void TearDown() {}
|
||||
};
|
||||
|
||||
TEST_F(QtypeSOA, AAAA_HTTPS)
|
||||
{
|
||||
smartdns::MockServer server_upstream;
|
||||
smartdns::Server server;
|
||||
|
||||
server_upstream.Start("udp://0.0.0.0:61053", [](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype == DNS_T_A) {
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "1.2.3.4");
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "5.6.7.8");
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
} else if (request->qtype == DNS_T_AAAA) {
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "2001:db8::1");
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "2001:db8::2");
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
}
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
});
|
||||
|
||||
server.Start(R"""(bind [::]:60053
|
||||
server 127.0.0.1:61053
|
||||
log-num 0
|
||||
log-console yes
|
||||
log-level debug
|
||||
force-qtype-SOA 28,65
|
||||
cache-persist no)""");
|
||||
smartdns::Client client;
|
||||
ASSERT_TRUE(client.Query("a.com AAAA", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAuthorityNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAuthority()[0].GetName(), "a.com");
|
||||
EXPECT_EQ(client.GetAuthority()[0].GetTTL(), 30);
|
||||
EXPECT_EQ(client.GetAuthority()[0].GetType(), "SOA");
|
||||
|
||||
ASSERT_TRUE(client.Query("a.com -t HTTPS", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAuthorityNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAuthority()[0].GetName(), "a.com");
|
||||
EXPECT_EQ(client.GetAuthority()[0].GetTTL(), 30);
|
||||
EXPECT_EQ(client.GetAuthority()[0].GetType(), "SOA");
|
||||
|
||||
ASSERT_TRUE(client.Query("a.com A", 60053));
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "a.com");
|
||||
}
|
||||
|
||||
TEST_F(QtypeSOA, AAAA_Except)
|
||||
{
|
||||
smartdns::MockServer server_upstream;
|
||||
smartdns::Server server;
|
||||
|
||||
server_upstream.Start("udp://0.0.0.0:61053", [](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype == DNS_T_A) {
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "1.2.3.4");
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
} else if (request->qtype == DNS_T_AAAA) {
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "2001:db8::1");
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
}
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
});
|
||||
|
||||
server.Start(R"""(bind [::]:60053
|
||||
server 127.0.0.1:61053
|
||||
log-num 0
|
||||
log-console yes
|
||||
log-level debug
|
||||
dualstack-ip-selection no
|
||||
force-qtype-SOA 28
|
||||
address /a.com/-
|
||||
cache-persist no)""");
|
||||
smartdns::Client client;
|
||||
|
||||
ASSERT_TRUE(client.Query("a.com AAAA", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "a.com");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetTTL(), 3);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetType(), "AAAA");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "2001:db8::1");
|
||||
}
|
||||
|
||||
TEST_F(QtypeSOA, force_AAAA_SOA_Except)
|
||||
{
|
||||
smartdns::MockServer server_upstream;
|
||||
smartdns::Server server;
|
||||
|
||||
server_upstream.Start("udp://0.0.0.0:61053", [](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype == DNS_T_A) {
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "1.2.3.4");
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
} else if (request->qtype == DNS_T_AAAA) {
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "2001:db8::1");
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
}
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
});
|
||||
|
||||
server.Start(R"""(bind [::]:60053
|
||||
server 127.0.0.1:61053
|
||||
log-num 0
|
||||
log-console yes
|
||||
log-level debug
|
||||
dualstack-ip-selection no
|
||||
force-AAAA-SOA yes
|
||||
address /a.com/-
|
||||
cache-persist no)""");
|
||||
smartdns::Client client;
|
||||
|
||||
ASSERT_TRUE(client.Query("a.com AAAA", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "a.com");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetTTL(), 3);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetType(), "AAAA");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "2001:db8::1");
|
||||
}
|
||||
|
||||
TEST_F(QtypeSOA, force_AAAA_SOA)
|
||||
{
|
||||
smartdns::MockServer server_upstream;
|
||||
smartdns::Server server;
|
||||
|
||||
server_upstream.Start("udp://0.0.0.0:61053", [&](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype == DNS_T_A) {
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "1.2.3.4", 700);
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
} else if (request->qtype == DNS_T_AAAA) {
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "64:ff9b::102:304", 700);
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
}
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
});
|
||||
|
||||
server.Start(R"""(bind [::]:60053
|
||||
server 127.0.0.1:61053
|
||||
log-num 0
|
||||
log-console yes
|
||||
log-level debug
|
||||
speed-check-mode none
|
||||
force-AAAA-SOA yes
|
||||
cache-persist no)""");
|
||||
smartdns::Client client;
|
||||
ASSERT_TRUE(client.Query("a.com A", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "a.com");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetTTL(), 700);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetType(), "A");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "1.2.3.4");
|
||||
|
||||
ASSERT_TRUE(client.Query("a.com AAAA", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAuthorityNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAuthority()[0].GetName(), "a.com");
|
||||
EXPECT_EQ(client.GetAuthority()[0].GetTTL(), 30);
|
||||
EXPECT_EQ(client.GetAuthority()[0].GetType(), "SOA");
|
||||
}
|
||||
|
||||
TEST_F(QtypeSOA, bind_force_AAAA_SOA)
|
||||
{
|
||||
smartdns::MockServer server_upstream;
|
||||
smartdns::Server server;
|
||||
|
||||
server_upstream.Start("udp://0.0.0.0:61053", [&](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype == DNS_T_A) {
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "1.2.3.4", 700);
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
} else if (request->qtype == DNS_T_AAAA) {
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "64:ff9b::102:304", 700);
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
}
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
});
|
||||
|
||||
server.Start(R"""(
|
||||
bind [::]:60053
|
||||
bind [::]:60153 -force-aaaa-soa
|
||||
server 127.0.0.1:61053
|
||||
log-num 0
|
||||
log-console yes
|
||||
log-level debug
|
||||
speed-check-mode none
|
||||
cache-persist no)""");
|
||||
smartdns::Client client;
|
||||
ASSERT_TRUE(client.Query("a.com A", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "a.com");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetTTL(), 700);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetType(), "A");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "1.2.3.4");
|
||||
|
||||
ASSERT_TRUE(client.Query("a.com AAAA", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "a.com");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetTTL(), 700);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetType(), "AAAA");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "64:ff9b::102:304");
|
||||
|
||||
ASSERT_TRUE(client.Query("a.com A", 60153));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "a.com");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetTTL(), 700);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetType(), "A");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "1.2.3.4");
|
||||
|
||||
ASSERT_TRUE(client.Query("a.com AAAA", 60153));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAuthorityNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAuthority()[0].GetName(), "a.com");
|
||||
EXPECT_EQ(client.GetAuthority()[0].GetTTL(), 30);
|
||||
EXPECT_EQ(client.GetAuthority()[0].GetType(), "SOA");
|
||||
}
|
||||
96
test/cases/test-same-pending-query.cc
Normal file
96
test/cases/test-same-pending-query.cc
Normal file
@@ -0,0 +1,96 @@
|
||||
/*************************************************************************
|
||||
*
|
||||
* Copyright (C) 2018-2023 Ruilin Peng (Nick) <pymumu@gmail.com>.
|
||||
*
|
||||
* smartdns is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* smartdns is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "client.h"
|
||||
#include "dns.h"
|
||||
#include "include/utils.h"
|
||||
#include "server.h"
|
||||
#include "util.h"
|
||||
#include "gtest/gtest.h"
|
||||
#include <fstream>
|
||||
|
||||
class SamePending : public ::testing::Test
|
||||
{
|
||||
protected:
|
||||
virtual void SetUp() {}
|
||||
virtual void TearDown() {}
|
||||
};
|
||||
|
||||
TEST_F(SamePending, pending)
|
||||
{
|
||||
smartdns::MockServer server_upstream;
|
||||
smartdns::Server server;
|
||||
std::map<int, int> qid_map;
|
||||
|
||||
server_upstream.Start("udp://0.0.0.0:61053", [&](struct smartdns::ServerRequestContext *request) {
|
||||
std::string domain = request->domain;
|
||||
if (qid_map.find(request->packet->head.id) != qid_map.end()) {
|
||||
qid_map[request->packet->head.id]++;
|
||||
usleep(5000);
|
||||
} else {
|
||||
qid_map[request->packet->head.id] = 1;
|
||||
usleep(20000);
|
||||
}
|
||||
|
||||
if (request->domain.length() == 0) {
|
||||
return smartdns::SERVER_REQUEST_ERROR;
|
||||
}
|
||||
|
||||
if (request->qtype == DNS_T_A) {
|
||||
unsigned char addr[4] = {1, 2, 3, 4};
|
||||
dns_add_A(request->response_packet, DNS_RRS_AN, domain.c_str(), 61, addr);
|
||||
} else if (request->qtype == DNS_T_AAAA) {
|
||||
unsigned char addr[16] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16};
|
||||
dns_add_AAAA(request->response_packet, DNS_RRS_AN, domain.c_str(), 61, addr);
|
||||
} else {
|
||||
return smartdns::SERVER_REQUEST_ERROR;
|
||||
}
|
||||
|
||||
request->response_packet->head.rcode = DNS_RC_NOERROR;
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
});
|
||||
|
||||
server.Start(R"""(bind [::]:60053
|
||||
server 127.0.0.1:61053
|
||||
cache-size 0
|
||||
log-num 0
|
||||
log-console yes
|
||||
speed-check-mode none
|
||||
log-level error
|
||||
cache-persist no)""");
|
||||
|
||||
std::vector<std::thread> threads;
|
||||
uint64_t tick = get_tick_count();
|
||||
for (int i = 0; i < 10; i++) {
|
||||
auto t = std::thread([&]() {
|
||||
for (int j = 0; j < 10; j++) {
|
||||
smartdns::Client client;
|
||||
ASSERT_TRUE(client.Query("a.com", 60053));
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "a.com");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "1.2.3.4");
|
||||
}
|
||||
});
|
||||
threads.push_back(std::move(t));
|
||||
}
|
||||
|
||||
for (auto &t : threads) {
|
||||
t.join();
|
||||
}
|
||||
}
|
||||
68
test/cases/test-server.cc
Normal file
68
test/cases/test-server.cc
Normal file
@@ -0,0 +1,68 @@
|
||||
/*************************************************************************
|
||||
*
|
||||
* Copyright (C) 2018-2023 Ruilin Peng (Nick) <pymumu@gmail.com>.
|
||||
*
|
||||
* smartdns is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* smartdns is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "client.h"
|
||||
#include "dns.h"
|
||||
#include "include/utils.h"
|
||||
#include "server.h"
|
||||
#include "gtest/gtest.h"
|
||||
|
||||
class Server : public ::testing::Test
|
||||
{
|
||||
protected:
|
||||
virtual void SetUp() {}
|
||||
virtual void TearDown() {}
|
||||
};
|
||||
|
||||
TEST_F(Server, all_unreach)
|
||||
{
|
||||
smartdns::MockServer server_upstream;
|
||||
smartdns::Server server;
|
||||
|
||||
server_upstream.Start("udp://0.0.0.0:61053", [](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype != DNS_T_A) {
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
}
|
||||
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "1.2.3.4", 611);
|
||||
EXPECT_EQ(request->domain, "e.com");
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
});
|
||||
|
||||
server.MockPing(PING_TYPE_ICMP, "2001::", 128, 10000);
|
||||
server.Start(R"""(bind [::]:60053
|
||||
bind-tcp [::]:60053
|
||||
server tls://255.255.255.255
|
||||
server https://255.255.255.255
|
||||
server tcp://255.255.255.255
|
||||
log-num 0
|
||||
log-console yes
|
||||
log-level debug
|
||||
cache-persist no)""");
|
||||
smartdns::Client client;
|
||||
ASSERT_TRUE(client.Query("a.com", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
EXPECT_EQ(client.GetStatus(), "SERVFAIL");
|
||||
EXPECT_EQ(client.GetAnswerNum(), 0);
|
||||
|
||||
/* server should not crash */
|
||||
ASSERT_TRUE(client.Query("a.com +tcp", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
EXPECT_EQ(client.GetStatus(), "SERVFAIL");
|
||||
EXPECT_EQ(client.GetAnswerNum(), 0);
|
||||
}
|
||||
399
test/cases/test-speed-check.cc
Normal file
399
test/cases/test-speed-check.cc
Normal file
@@ -0,0 +1,399 @@
|
||||
/*************************************************************************
|
||||
*
|
||||
* Copyright (C) 2018-2023 Ruilin Peng (Nick) <pymumu@gmail.com>.
|
||||
*
|
||||
* smartdns is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* smartdns is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "client.h"
|
||||
#include "dns.h"
|
||||
#include "include/utils.h"
|
||||
#include "server.h"
|
||||
#include "util.h"
|
||||
#include "gtest/gtest.h"
|
||||
#include <fstream>
|
||||
|
||||
class SpeedCheck : public ::testing::Test
|
||||
{
|
||||
protected:
|
||||
virtual void SetUp() {}
|
||||
virtual void TearDown() {}
|
||||
};
|
||||
|
||||
TEST_F(SpeedCheck, response_mode)
|
||||
{
|
||||
smartdns::MockServer server_upstream;
|
||||
smartdns::Server server;
|
||||
|
||||
server_upstream.Start("udp://0.0.0.0:61053", [&](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype == DNS_T_A) {
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "1.2.3.4");
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "5.6.7.8");
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
}
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
});
|
||||
|
||||
server.Start(R"""(bind [::]:60053
|
||||
server 127.0.0.1:61053
|
||||
log-num 0
|
||||
log-console yes
|
||||
response-mode first-ping
|
||||
domain-rules /a.com/ -r fastest-response
|
||||
log-level debug
|
||||
cache-persist no)""");
|
||||
smartdns::Client client;
|
||||
ASSERT_TRUE(client.Query("b.com", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_GT(client.GetQueryTime(), 100);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "b.com");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetTTL(), 600);
|
||||
|
||||
ASSERT_TRUE(client.Query("a.com", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 2);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_LT(client.GetQueryTime(), 10);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "a.com");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetTTL(), 3);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "1.2.3.4");
|
||||
EXPECT_EQ(client.GetAnswer()[1].GetData(), "5.6.7.8");
|
||||
}
|
||||
|
||||
TEST_F(SpeedCheck, none)
|
||||
{
|
||||
smartdns::MockServer server_upstream;
|
||||
smartdns::Server server;
|
||||
|
||||
server_upstream.Start("udp://0.0.0.0:61053", [&](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype == DNS_T_A) {
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "1.2.3.4");
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "5.6.7.8");
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
}
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
});
|
||||
|
||||
server.Start(R"""(bind [::]:60053
|
||||
server 127.0.0.1:61053
|
||||
log-num 0
|
||||
log-console yes
|
||||
speed-check-mode none
|
||||
log-level debug
|
||||
cache-persist no)""");
|
||||
smartdns::Client client;
|
||||
ASSERT_TRUE(client.Query("b.com", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 2);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_LT(client.GetQueryTime(), 20);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "b.com");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetTTL(), 600);
|
||||
|
||||
ASSERT_TRUE(client.Query("a.com", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 2);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_LT(client.GetQueryTime(), 20);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "a.com");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetTTL(), 600);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "1.2.3.4");
|
||||
EXPECT_EQ(client.GetAnswer()[1].GetData(), "5.6.7.8");
|
||||
}
|
||||
|
||||
TEST_F(SpeedCheck, domain_rules_none)
|
||||
{
|
||||
smartdns::MockServer server_upstream;
|
||||
smartdns::Server server;
|
||||
|
||||
server_upstream.Start("udp://0.0.0.0:61053", [&](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype == DNS_T_A) {
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "1.2.3.4");
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "5.6.7.8");
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
}
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
});
|
||||
|
||||
server.Start(R"""(bind [::]:60053
|
||||
server 127.0.0.1:61053
|
||||
log-num 0
|
||||
log-console yes
|
||||
domain-rules /a.com/ -c none
|
||||
log-level debug
|
||||
cache-persist no)""");
|
||||
smartdns::Client client;
|
||||
ASSERT_TRUE(client.Query("b.com", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_GT(client.GetQueryTime(), 200);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "b.com");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetTTL(), 600);
|
||||
|
||||
ASSERT_TRUE(client.Query("a.com", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 2);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_LT(client.GetQueryTime(), 20);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "a.com");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetTTL(), 600);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "1.2.3.4");
|
||||
EXPECT_EQ(client.GetAnswer()[1].GetData(), "5.6.7.8");
|
||||
}
|
||||
|
||||
TEST_F(SpeedCheck, only_ping)
|
||||
{
|
||||
smartdns::MockServer server_upstream;
|
||||
smartdns::Server server;
|
||||
|
||||
server_upstream.Start("udp://0.0.0.0:61053", [&](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype == DNS_T_A) {
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "1.2.3.4");
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "5.6.7.8");
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
}
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
});
|
||||
|
||||
server.Start(R"""(bind [::]:60053
|
||||
server 127.0.0.1:61053
|
||||
log-num 0
|
||||
log-console yes
|
||||
speed-check-mode ping
|
||||
log-level debug
|
||||
cache-persist no)""");
|
||||
smartdns::Client client;
|
||||
ASSERT_TRUE(client.Query("b.com", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_LT(client.GetQueryTime(), 1200);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "b.com");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetTTL(), 600);
|
||||
}
|
||||
|
||||
TEST_F(SpeedCheck, no_ping_fallback_tcp)
|
||||
{
|
||||
smartdns::MockServer server_upstream;
|
||||
smartdns::Server server;
|
||||
|
||||
server_upstream.Start("udp://0.0.0.0:61053", [&](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype == DNS_T_A) {
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "1.2.3.4");
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "5.6.7.8");
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
}
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
});
|
||||
|
||||
server.MockPing(PING_TYPE_ICMP, "1.2.3.4", 60, 1000);
|
||||
server.MockPing(PING_TYPE_TCP, "5.6.7.8:80", 60, 100);
|
||||
server.Start(R"""(bind [::]:60053
|
||||
server 127.0.0.1:61053
|
||||
log-num 0
|
||||
log-console yes
|
||||
speed-check-mode ping,tcp:80
|
||||
log-level debug
|
||||
cache-persist no)""");
|
||||
smartdns::Client client;
|
||||
ASSERT_TRUE(client.Query("a.com", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_LT(client.GetQueryTime(), 500);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "a.com");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetTTL(), 3);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "5.6.7.8");
|
||||
}
|
||||
|
||||
|
||||
TEST_F(SpeedCheck, tcp_faster_than_ping)
|
||||
{
|
||||
smartdns::MockServer server_upstream;
|
||||
smartdns::Server server;
|
||||
|
||||
server_upstream.Start("udp://0.0.0.0:61053", [&](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype == DNS_T_A) {
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "1.2.3.4");
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "5.6.7.8");
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
}
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
});
|
||||
|
||||
server.MockPing(PING_TYPE_ICMP, "1.2.3.4", 60, 350);
|
||||
server.MockPing(PING_TYPE_TCP, "5.6.7.8:80", 60, 10);
|
||||
server.Start(R"""(bind [::]:60053
|
||||
server 127.0.0.1:61053
|
||||
log-num 0
|
||||
log-console yes
|
||||
speed-check-mode ping,tcp:80
|
||||
log-level debug
|
||||
cache-persist no)""");
|
||||
smartdns::Client client;
|
||||
ASSERT_TRUE(client.Query("a.com", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_LT(client.GetQueryTime(), 500);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "a.com");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetTTL(), 3);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "5.6.7.8");
|
||||
}
|
||||
|
||||
TEST_F(SpeedCheck, fastest_ip)
|
||||
{
|
||||
smartdns::MockServer server_upstream;
|
||||
smartdns::Server server;
|
||||
|
||||
server_upstream.Start("udp://0.0.0.0:61053", [&](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype == DNS_T_A) {
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "1.2.3.4");
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "5.6.7.8");
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
}
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
});
|
||||
|
||||
server.MockPing(PING_TYPE_ICMP, "1.2.3.4", 60, 100);
|
||||
server.MockPing(PING_TYPE_ICMP, "5.6.7.8", 60, 110);
|
||||
|
||||
server.Start(R"""(bind [::]:60053
|
||||
server 127.0.0.1:61053
|
||||
log-num 0
|
||||
log-console yes
|
||||
speed-check-mode ping
|
||||
dualstack-ip-selection no
|
||||
log-level debug
|
||||
cache-persist no)""");
|
||||
smartdns::Client client;
|
||||
ASSERT_TRUE(client.Query("b.com", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_LT(client.GetQueryTime(), 200);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "b.com");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetTTL(), 3);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "1.2.3.4");
|
||||
|
||||
usleep(220 * 1000);
|
||||
ASSERT_TRUE(client.Query("b.com", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 2);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_LT(client.GetQueryTime(), 20);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "b.com");
|
||||
EXPECT_GT(client.GetAnswer()[0].GetTTL(), 597);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "1.2.3.4");
|
||||
EXPECT_EQ(client.GetAnswer()[1].GetData(), "5.6.7.8");
|
||||
}
|
||||
|
||||
TEST_F(SpeedCheck, unreach_best_ipv4)
|
||||
{
|
||||
smartdns::MockServer server_upstream;
|
||||
smartdns::MockServer server_upstream2;
|
||||
smartdns::Server server;
|
||||
|
||||
server_upstream.Start("udp://0.0.0.0:61053", [&](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype == DNS_T_A) {
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "1.2.3.4");
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "5.6.7.8");
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
}
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
});
|
||||
|
||||
server_upstream2.Start("udp://0.0.0.0:62053", [&](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype == DNS_T_A) {
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "1.2.3.4");
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "9.10.11.12");
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
}
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
});
|
||||
|
||||
server.MockPing(PING_TYPE_ICMP, "1.2.3.4", 60, 10000);
|
||||
server.MockPing(PING_TYPE_ICMP, "5.6.7.8", 60, 10000);
|
||||
server.MockPing(PING_TYPE_ICMP, "9.10.11.12", 60, 10000);
|
||||
|
||||
server.Start(R"""(bind [::]:60053
|
||||
server 127.0.0.1:61053
|
||||
server 127.0.0.1:62053
|
||||
log-num 0
|
||||
log-console yes
|
||||
speed-check-mode ping
|
||||
dualstack-ip-selection no
|
||||
log-level debug
|
||||
cache-persist no)""");
|
||||
smartdns::Client client;
|
||||
ASSERT_TRUE(client.Query("a.com", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_LT(client.GetQueryTime(), 1200);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "a.com");
|
||||
EXPECT_GT(client.GetAnswer()[0].GetTTL(), 597);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "1.2.3.4");
|
||||
}
|
||||
|
||||
TEST_F(SpeedCheck, unreach_best_ipv6)
|
||||
{
|
||||
smartdns::MockServer server_upstream;
|
||||
smartdns::MockServer server_upstream2;
|
||||
smartdns::Server server;
|
||||
|
||||
server_upstream.Start("udp://0.0.0.0:61053", [&](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype == DNS_T_AAAA) {
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "2001:db8::1");
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "2001:db8::2");
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
}
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
});
|
||||
|
||||
server_upstream2.Start("udp://0.0.0.0:62053", [&](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype == DNS_T_AAAA) {
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "2001:db8::2");
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "2001:db8::3");
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
}
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
});
|
||||
|
||||
server.MockPing(PING_TYPE_ICMP, "2001:db8::1", 60, 10000);
|
||||
server.MockPing(PING_TYPE_ICMP, "2001:db8::2", 60, 10000);
|
||||
server.MockPing(PING_TYPE_ICMP, "2001:db8::3", 60, 10000);
|
||||
|
||||
server.Start(R"""(bind [::]:60053
|
||||
server 127.0.0.1:61053
|
||||
server 127.0.0.1:62053
|
||||
log-num 0
|
||||
log-console yes
|
||||
speed-check-mode ping
|
||||
dualstack-ip-selection no
|
||||
log-level debug
|
||||
cache-persist no)""");
|
||||
smartdns::Client client;
|
||||
ASSERT_TRUE(client.Query("a.com AAAA", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_LT(client.GetQueryTime(), 1200);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "a.com");
|
||||
EXPECT_GT(client.GetAnswer()[0].GetTTL(), 597);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "2001:db8::2");
|
||||
}
|
||||
447
test/cases/test-subnet.cc
Normal file
447
test/cases/test-subnet.cc
Normal file
@@ -0,0 +1,447 @@
|
||||
/*************************************************************************
|
||||
*
|
||||
* Copyright (C) 2018-2023 Ruilin Peng (Nick) <pymumu@gmail.com>.
|
||||
*
|
||||
* smartdns is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* smartdns is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "client.h"
|
||||
#include "dns.h"
|
||||
#include "include/utils.h"
|
||||
#include "server.h"
|
||||
#include "util.h"
|
||||
#include "gtest/gtest.h"
|
||||
#include <fstream>
|
||||
|
||||
class SubNet : public ::testing::Test
|
||||
{
|
||||
protected:
|
||||
virtual void SetUp() {}
|
||||
virtual void TearDown() {}
|
||||
};
|
||||
|
||||
TEST_F(SubNet, pass_subnet)
|
||||
{
|
||||
smartdns::MockServer server_upstream;
|
||||
smartdns::Server server;
|
||||
|
||||
server_upstream.Start("udp://0.0.0.0:61053", [&](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype != DNS_T_A) {
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
}
|
||||
struct dns_opt_ecs ecs;
|
||||
struct dns_rrs *rrs = NULL;
|
||||
int rr_count = 0;
|
||||
int i = 0;
|
||||
int ret = 0;
|
||||
int has_ecs = 0;
|
||||
|
||||
rr_count = 0;
|
||||
rrs = dns_get_rrs_start(request->packet, DNS_RRS_OPT, &rr_count);
|
||||
if (rr_count <= 0) {
|
||||
return smartdns::SERVER_REQUEST_ERROR;
|
||||
}
|
||||
|
||||
for (i = 0; i < rr_count && rrs; i++, rrs = dns_get_rrs_next(request->packet, rrs)) {
|
||||
memset(&ecs, 0, sizeof(ecs));
|
||||
ret = dns_get_OPT_ECS(rrs, NULL, NULL, &ecs);
|
||||
if (ret != 0) {
|
||||
continue;
|
||||
}
|
||||
has_ecs = 1;
|
||||
break;
|
||||
}
|
||||
|
||||
if (has_ecs == 0) {
|
||||
return smartdns::SERVER_REQUEST_ERROR;
|
||||
}
|
||||
|
||||
if (ecs.family != 1) {
|
||||
return smartdns::SERVER_REQUEST_ERROR;
|
||||
}
|
||||
|
||||
if (memcmp(ecs.addr, "\x08\x08\x08\x00", 4) != 0) {
|
||||
return smartdns::SERVER_REQUEST_ERROR;
|
||||
}
|
||||
|
||||
if (ecs.source_prefix != 24) {
|
||||
return smartdns::SERVER_REQUEST_ERROR;
|
||||
}
|
||||
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "1.2.3.4");
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
});
|
||||
|
||||
server.Start(R"""(bind [::]:60053
|
||||
server 127.0.0.1:61053
|
||||
log-num 0
|
||||
log-console yes
|
||||
dualstack-ip-selection no
|
||||
log-level debug
|
||||
cache-persist no)""");
|
||||
smartdns::Client client;
|
||||
ASSERT_TRUE(client.Query("a.com A +subnet=8.8.8.8/24", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "a.com");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetTTL(), 3);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetType(), "A");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "1.2.3.4");
|
||||
}
|
||||
|
||||
TEST_F(SubNet, conf)
|
||||
{
|
||||
smartdns::MockServer server_upstream;
|
||||
smartdns::Server server;
|
||||
|
||||
server_upstream.Start("udp://0.0.0.0:61053", [&](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype != DNS_T_A) {
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
}
|
||||
struct dns_opt_ecs ecs;
|
||||
struct dns_rrs *rrs = NULL;
|
||||
int rr_count = 0;
|
||||
int i = 0;
|
||||
int ret = 0;
|
||||
int has_ecs = 0;
|
||||
|
||||
rr_count = 0;
|
||||
rrs = dns_get_rrs_start(request->packet, DNS_RRS_OPT, &rr_count);
|
||||
if (rr_count <= 0) {
|
||||
return smartdns::SERVER_REQUEST_ERROR;
|
||||
}
|
||||
|
||||
for (i = 0; i < rr_count && rrs; i++, rrs = dns_get_rrs_next(request->packet, rrs)) {
|
||||
memset(&ecs, 0, sizeof(ecs));
|
||||
ret = dns_get_OPT_ECS(rrs, NULL, NULL, &ecs);
|
||||
if (ret != 0) {
|
||||
continue;
|
||||
}
|
||||
has_ecs = 1;
|
||||
break;
|
||||
}
|
||||
|
||||
if (has_ecs == 0) {
|
||||
return smartdns::SERVER_REQUEST_ERROR;
|
||||
}
|
||||
|
||||
if (ecs.family != DNS_OPT_ECS_FAMILY_IPV4) {
|
||||
return smartdns::SERVER_REQUEST_ERROR;
|
||||
}
|
||||
|
||||
if (memcmp(ecs.addr, "\x08\x08\x08\x00", 4) != 0) {
|
||||
return smartdns::SERVER_REQUEST_ERROR;
|
||||
}
|
||||
|
||||
if (ecs.source_prefix != 24) {
|
||||
return smartdns::SERVER_REQUEST_ERROR;
|
||||
}
|
||||
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "1.2.3.4");
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
});
|
||||
|
||||
server.Start(R"""(bind [::]:60053
|
||||
server 127.0.0.1:61053
|
||||
log-num 0
|
||||
log-console yes
|
||||
dualstack-ip-selection no
|
||||
edns-client-subnet 8.8.8.8/24
|
||||
log-level debug
|
||||
cache-persist no)""");
|
||||
smartdns::Client client;
|
||||
ASSERT_TRUE(client.Query("a.com A", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "a.com");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetTTL(), 3);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetType(), "A");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "1.2.3.4");
|
||||
}
|
||||
|
||||
TEST_F(SubNet, conf_v6)
|
||||
{
|
||||
smartdns::MockServer server_upstream;
|
||||
smartdns::Server server;
|
||||
|
||||
server_upstream.Start("udp://0.0.0.0:61053", [&](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype != DNS_T_AAAA) {
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
}
|
||||
struct dns_opt_ecs ecs;
|
||||
struct dns_rrs *rrs = NULL;
|
||||
int rr_count = 0;
|
||||
int i = 0;
|
||||
int ret = 0;
|
||||
int has_ecs = 0;
|
||||
|
||||
rr_count = 0;
|
||||
rrs = dns_get_rrs_start(request->packet, DNS_RRS_OPT, &rr_count);
|
||||
if (rr_count <= 0) {
|
||||
return smartdns::SERVER_REQUEST_ERROR;
|
||||
}
|
||||
|
||||
for (i = 0; i < rr_count && rrs; i++, rrs = dns_get_rrs_next(request->packet, rrs)) {
|
||||
memset(&ecs, 0, sizeof(ecs));
|
||||
ret = dns_get_OPT_ECS(rrs, NULL, NULL, &ecs);
|
||||
if (ret != 0) {
|
||||
continue;
|
||||
}
|
||||
has_ecs = 1;
|
||||
break;
|
||||
}
|
||||
|
||||
if (has_ecs == 0) {
|
||||
return smartdns::SERVER_REQUEST_ERROR;
|
||||
}
|
||||
|
||||
if (ecs.family != DNS_OPT_ECS_FAMILY_IPV6) {
|
||||
return smartdns::SERVER_REQUEST_ERROR;
|
||||
}
|
||||
|
||||
if (memcmp(ecs.addr, "\xff\xff\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00", 16) != 0) {
|
||||
return smartdns::SERVER_REQUEST_ERROR;
|
||||
}
|
||||
|
||||
if (ecs.source_prefix != 64) {
|
||||
return smartdns::SERVER_REQUEST_ERROR;
|
||||
}
|
||||
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "2001:db8::1");
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
});
|
||||
|
||||
server.MockPing(PING_TYPE_ICMP, "2001:db8::1", 60, 70);
|
||||
|
||||
server.Start(R"""(bind [::]:60053
|
||||
server 127.0.0.1:61053
|
||||
log-num 0
|
||||
log-console yes
|
||||
dualstack-ip-selection no
|
||||
edns-client-subnet ffff:ffff:ffff:ffff:ffff::/64
|
||||
log-level debug
|
||||
cache-persist no)""");
|
||||
smartdns::Client client;
|
||||
ASSERT_TRUE(client.Query("a.com AAAA", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "a.com");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetTTL(), 3);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetType(), "AAAA");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "2001:db8::1");
|
||||
}
|
||||
|
||||
TEST_F(SubNet, per_server)
|
||||
{
|
||||
smartdns::MockServer server_upstream1;
|
||||
smartdns::MockServer server_upstream2;
|
||||
smartdns::Server server;
|
||||
|
||||
server_upstream1.Start("udp://0.0.0.0:61053", [&](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype == DNS_T_A) {
|
||||
struct dns_opt_ecs ecs;
|
||||
struct dns_rrs *rrs = NULL;
|
||||
int rr_count = 0;
|
||||
int i = 0;
|
||||
int ret = 0;
|
||||
int has_ecs = 0;
|
||||
|
||||
rr_count = 0;
|
||||
rrs = dns_get_rrs_start(request->packet, DNS_RRS_OPT, &rr_count);
|
||||
if (rr_count <= 0) {
|
||||
return smartdns::SERVER_REQUEST_ERROR;
|
||||
}
|
||||
|
||||
for (i = 0; i < rr_count && rrs; i++, rrs = dns_get_rrs_next(request->packet, rrs)) {
|
||||
memset(&ecs, 0, sizeof(ecs));
|
||||
ret = dns_get_OPT_ECS(rrs, NULL, NULL, &ecs);
|
||||
if (ret != 0) {
|
||||
continue;
|
||||
}
|
||||
has_ecs = 1;
|
||||
break;
|
||||
}
|
||||
|
||||
if (has_ecs == 1) {
|
||||
return smartdns::SERVER_REQUEST_ERROR;
|
||||
}
|
||||
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "1.2.3.4");
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
}
|
||||
|
||||
if (request->qtype == DNS_T_AAAA) {
|
||||
struct dns_opt_ecs ecs;
|
||||
struct dns_rrs *rrs = NULL;
|
||||
int rr_count = 0;
|
||||
int i = 0;
|
||||
int ret = 0;
|
||||
int has_ecs = 0;
|
||||
|
||||
rr_count = 0;
|
||||
rrs = dns_get_rrs_start(request->packet, DNS_RRS_OPT, &rr_count);
|
||||
if (rr_count <= 0) {
|
||||
return smartdns::SERVER_REQUEST_ERROR;
|
||||
}
|
||||
|
||||
for (i = 0; i < rr_count && rrs; i++, rrs = dns_get_rrs_next(request->packet, rrs)) {
|
||||
memset(&ecs, 0, sizeof(ecs));
|
||||
ret = dns_get_OPT_ECS(rrs, NULL, NULL, &ecs);
|
||||
if (ret != 0) {
|
||||
continue;
|
||||
}
|
||||
has_ecs = 1;
|
||||
break;
|
||||
}
|
||||
|
||||
if (has_ecs == 1) {
|
||||
return smartdns::SERVER_REQUEST_ERROR;
|
||||
}
|
||||
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "2001:db8::1");
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
}
|
||||
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
});
|
||||
|
||||
server_upstream2.Start("udp://0.0.0.0:62053", [&](struct smartdns::ServerRequestContext *request) {
|
||||
if (request->qtype == DNS_T_A) {
|
||||
|
||||
struct dns_opt_ecs ecs;
|
||||
struct dns_rrs *rrs = NULL;
|
||||
int rr_count = 0;
|
||||
int i = 0;
|
||||
int ret = 0;
|
||||
int has_ecs = 0;
|
||||
|
||||
rr_count = 0;
|
||||
rrs = dns_get_rrs_start(request->packet, DNS_RRS_OPT, &rr_count);
|
||||
if (rr_count <= 0) {
|
||||
return smartdns::SERVER_REQUEST_ERROR;
|
||||
}
|
||||
|
||||
for (i = 0; i < rr_count && rrs; i++, rrs = dns_get_rrs_next(request->packet, rrs)) {
|
||||
memset(&ecs, 0, sizeof(ecs));
|
||||
ret = dns_get_OPT_ECS(rrs, NULL, NULL, &ecs);
|
||||
if (ret != 0) {
|
||||
continue;
|
||||
}
|
||||
has_ecs = 1;
|
||||
break;
|
||||
}
|
||||
|
||||
if (has_ecs == 0) {
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "1.2.3.4");
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
}
|
||||
|
||||
if (ecs.family != DNS_OPT_ECS_FAMILY_IPV4) {
|
||||
return smartdns::SERVER_REQUEST_ERROR;
|
||||
}
|
||||
|
||||
if (memcmp(ecs.addr, "\x08\x08\x08\x00", 4) != 0) {
|
||||
return smartdns::SERVER_REQUEST_ERROR;
|
||||
}
|
||||
|
||||
if (ecs.source_prefix != 24) {
|
||||
return smartdns::SERVER_REQUEST_ERROR;
|
||||
}
|
||||
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "5.6.7.8");
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
}
|
||||
|
||||
if (request->qtype = DNS_T_AAAA) {
|
||||
struct dns_opt_ecs ecs;
|
||||
struct dns_rrs *rrs = NULL;
|
||||
int rr_count = 0;
|
||||
int i = 0;
|
||||
int ret = 0;
|
||||
int has_ecs = 0;
|
||||
|
||||
rr_count = 0;
|
||||
rrs = dns_get_rrs_start(request->packet, DNS_RRS_OPT, &rr_count);
|
||||
if (rr_count <= 0) {
|
||||
return smartdns::SERVER_REQUEST_ERROR;
|
||||
}
|
||||
|
||||
for (i = 0; i < rr_count && rrs; i++, rrs = dns_get_rrs_next(request->packet, rrs)) {
|
||||
memset(&ecs, 0, sizeof(ecs));
|
||||
ret = dns_get_OPT_ECS(rrs, NULL, NULL, &ecs);
|
||||
if (ret != 0) {
|
||||
continue;
|
||||
}
|
||||
has_ecs = 1;
|
||||
break;
|
||||
}
|
||||
|
||||
if (has_ecs == 0) {
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "2001:db8::1");
|
||||
return smartdns::SERVER_REQUEST_ERROR;
|
||||
}
|
||||
|
||||
if (ecs.family != DNS_OPT_ECS_FAMILY_IPV6) {
|
||||
return smartdns::SERVER_REQUEST_ERROR;
|
||||
}
|
||||
|
||||
if (memcmp(ecs.addr, "\xff\xff\xff\xff\xff\xff\xff\xff\x00\x00\x00\x00\x00\x00\x00\x00", 16) != 0) {
|
||||
return smartdns::SERVER_REQUEST_ERROR;
|
||||
}
|
||||
|
||||
if (ecs.source_prefix != 64) {
|
||||
return smartdns::SERVER_REQUEST_ERROR;
|
||||
}
|
||||
|
||||
smartdns::MockServer::AddIP(request, request->domain.c_str(), "2001:db8::2");
|
||||
return smartdns::SERVER_REQUEST_OK;
|
||||
}
|
||||
|
||||
return smartdns::SERVER_REQUEST_SOA;
|
||||
});
|
||||
|
||||
server.MockPing(PING_TYPE_ICMP, "1.2.3.4", 60, 100);
|
||||
server.MockPing(PING_TYPE_ICMP, "5.6.7.8", 60, 10);
|
||||
server.MockPing(PING_TYPE_ICMP, "2001:db8::1", 60, 100);
|
||||
server.MockPing(PING_TYPE_ICMP, "2001:db8::2", 60, 10);
|
||||
server.Start(R"""(bind [::]:60053
|
||||
server 127.0.0.1:62053 -subnet=8.8.8.8/24 -subnet=ffff:ffff:ffff:ffff:ffff::/64
|
||||
server 127.0.0.1:61053
|
||||
log-num 0
|
||||
log-console yes
|
||||
dualstack-ip-selection no
|
||||
log-level debug
|
||||
cache-persist no)""");
|
||||
smartdns::Client client;
|
||||
ASSERT_TRUE(client.Query("a.com A", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "a.com");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetTTL(), 3);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetType(), "A");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "5.6.7.8");
|
||||
|
||||
ASSERT_TRUE(client.Query("a.com AAAA", 60053));
|
||||
std::cout << client.GetResult() << std::endl;
|
||||
ASSERT_EQ(client.GetAnswerNum(), 1);
|
||||
EXPECT_EQ(client.GetStatus(), "NOERROR");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetName(), "a.com");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetTTL(), 3);
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetType(), "AAAA");
|
||||
EXPECT_EQ(client.GetAnswer()[0].GetData(), "2001:db8::2");
|
||||
}
|
||||
351
test/client.cc
Normal file
351
test/client.cc
Normal file
@@ -0,0 +1,351 @@
|
||||
/*************************************************************************
|
||||
*
|
||||
* Copyright (C) 2018-2023 Ruilin Peng (Nick) <pymumu@gmail.com>.
|
||||
*
|
||||
* smartdns is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* smartdns is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "client.h"
|
||||
#include <iostream>
|
||||
#include <memory>
|
||||
#include <regex>
|
||||
#include <signal.h>
|
||||
#include <string>
|
||||
#include <sys/types.h>
|
||||
#include <sys/wait.h>
|
||||
#include <vector>
|
||||
|
||||
namespace smartdns
|
||||
{
|
||||
|
||||
std::vector<std::string> StringSplit(const std::string &s, const char delim)
|
||||
{
|
||||
std::vector<std::string> ret;
|
||||
std::string::size_type lastPos = s.find_first_not_of(delim, 0);
|
||||
std::string::size_type pos = s.find_first_of(delim, lastPos);
|
||||
while (std::string::npos != pos || std::string::npos != lastPos) {
|
||||
ret.push_back(s.substr(lastPos, pos - lastPos));
|
||||
lastPos = s.find_first_not_of(delim, pos);
|
||||
pos = s.find_first_of(delim, lastPos);
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
DNSRecord::DNSRecord() {}
|
||||
|
||||
DNSRecord::~DNSRecord() {}
|
||||
|
||||
bool DNSRecord::Parser(const std::string &line)
|
||||
{
|
||||
std::vector<std::string> fields_first = StringSplit(line, '\t');
|
||||
std::vector<std::string> fields;
|
||||
|
||||
for (const auto &f : fields_first) {
|
||||
std::vector<std::string> fields_second = StringSplit(f, ' ');
|
||||
for (const auto &s : fields_second) {
|
||||
if (s.length() > 0) {
|
||||
fields.push_back(s);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (fields.size() < 3) {
|
||||
std::cerr << "Invalid DNS record: " << line << ", size: " << fields.size() << std::endl;
|
||||
return false;
|
||||
}
|
||||
|
||||
if (fields.size() == 3) {
|
||||
name_ = fields[0];
|
||||
if (name_.size() > 1) {
|
||||
name_.resize(name_.size() - 1);
|
||||
}
|
||||
class_ = fields[1];
|
||||
type_ = fields[2];
|
||||
return true;
|
||||
}
|
||||
|
||||
name_ = fields[0];
|
||||
if (name_.size() > 1) {
|
||||
name_.resize(name_.size() - 1);
|
||||
}
|
||||
ttl_ = std::stoi(fields[1]);
|
||||
class_ = fields[2];
|
||||
type_ = fields[3];
|
||||
data_ = fields[4];
|
||||
|
||||
for (int i = 5; i < fields.size(); i++) {
|
||||
data_ += " " + fields[i];
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
std::string DNSRecord::GetName()
|
||||
{
|
||||
return name_;
|
||||
}
|
||||
|
||||
std::string DNSRecord::GetType()
|
||||
{
|
||||
return type_;
|
||||
}
|
||||
|
||||
std::string DNSRecord::GetClass()
|
||||
{
|
||||
return class_;
|
||||
}
|
||||
|
||||
int DNSRecord::GetTTL()
|
||||
{
|
||||
return ttl_;
|
||||
}
|
||||
|
||||
std::string DNSRecord::GetData()
|
||||
{
|
||||
return data_;
|
||||
}
|
||||
|
||||
Client::Client() {}
|
||||
|
||||
bool Client::Query(const std::string &dig_cmds, int port, const std::string &ip)
|
||||
{
|
||||
Clear();
|
||||
|
||||
std::string cmd = "dig ";
|
||||
if (port > 0) {
|
||||
cmd += "-p " + std::to_string(port);
|
||||
}
|
||||
|
||||
if (ip.length() > 0) {
|
||||
cmd += " @" + ip;
|
||||
} else {
|
||||
cmd += " @127.0.0.1";
|
||||
}
|
||||
|
||||
cmd += " " + dig_cmds;
|
||||
cmd += " +tries=1";
|
||||
FILE *fp = nullptr;
|
||||
|
||||
fp = popen(cmd.c_str(), "r");
|
||||
if (fp == nullptr) {
|
||||
return false;
|
||||
}
|
||||
|
||||
std::shared_ptr<FILE> pipe(fp, pclose);
|
||||
result_.clear();
|
||||
char buffer[4096];
|
||||
usleep(10000);
|
||||
while (fgets(buffer, 4096, pipe.get())) {
|
||||
result_ += buffer;
|
||||
}
|
||||
|
||||
if (ParserResult() == false) {
|
||||
Clear();
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
std::vector<DNSRecord> Client::GetQuery()
|
||||
{
|
||||
return records_query_;
|
||||
}
|
||||
|
||||
std::vector<DNSRecord> Client::GetAnswer()
|
||||
{
|
||||
return records_answer_;
|
||||
}
|
||||
|
||||
std::vector<DNSRecord> Client::GetAuthority()
|
||||
{
|
||||
return records_authority_;
|
||||
}
|
||||
|
||||
std::vector<DNSRecord> Client::GetAdditional()
|
||||
{
|
||||
return records_additional_;
|
||||
}
|
||||
|
||||
int Client::GetAnswerNum()
|
||||
{
|
||||
return answer_num_;
|
||||
}
|
||||
|
||||
int Client::GetAuthorityNum()
|
||||
{
|
||||
return authority_num_;
|
||||
}
|
||||
|
||||
std::string Client::GetStatus()
|
||||
{
|
||||
return status_;
|
||||
}
|
||||
|
||||
std::string Client::GetServer()
|
||||
{
|
||||
return server_;
|
||||
}
|
||||
|
||||
int Client::GetQueryTime()
|
||||
{
|
||||
return query_time_;
|
||||
}
|
||||
|
||||
int Client::GetMsgSize()
|
||||
{
|
||||
return msg_size_;
|
||||
}
|
||||
|
||||
std::string Client::GetFlags()
|
||||
{
|
||||
return flags_;
|
||||
}
|
||||
|
||||
std::string Client::GetResult()
|
||||
{
|
||||
return result_;
|
||||
}
|
||||
|
||||
void Client::Clear()
|
||||
{
|
||||
result_.clear();
|
||||
answer_num_ = 0;
|
||||
status_.clear();
|
||||
server_.clear();
|
||||
query_time_ = 0;
|
||||
msg_size_ = 0;
|
||||
flags_.clear();
|
||||
records_query_.clear();
|
||||
records_answer_.clear();
|
||||
records_authority_.clear();
|
||||
records_additional_.clear();
|
||||
}
|
||||
|
||||
void Client::PrintResult()
|
||||
{
|
||||
std::cout << result_ << std::endl;
|
||||
}
|
||||
|
||||
bool Client::ParserRecord(const std::string &record_str, std::vector<DNSRecord> &record)
|
||||
{
|
||||
DNSRecord r;
|
||||
|
||||
std::vector<std::string> lines = StringSplit(record_str, '\n');
|
||||
|
||||
for (auto &line : lines) {
|
||||
if (r.Parser(line) == false) {
|
||||
return false;
|
||||
}
|
||||
|
||||
record.push_back(r);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool Client::ParserResult()
|
||||
{
|
||||
std::smatch match;
|
||||
|
||||
std::regex reg_goanswer(";; Got answer:");
|
||||
if (std::regex_search(result_, match, reg_goanswer) == false) {
|
||||
std::cout << "DIG FAILED:\n" << result_ << std::endl;
|
||||
return false;
|
||||
}
|
||||
|
||||
std::regex reg_answer_num(", ANSWER: ([0-9]+),");
|
||||
if (std::regex_search(result_, match, reg_answer_num)) {
|
||||
answer_num_ = std::stoi(match[1]);
|
||||
}
|
||||
|
||||
std::regex reg_authority_num(", AUTHORITY: ([0-9]+),");
|
||||
if (std::regex_search(result_, match, reg_authority_num)) {
|
||||
authority_num_ = std::stoi(match[1]);
|
||||
}
|
||||
|
||||
std::regex reg_status(", status: ([A-Z]+),");
|
||||
if (std::regex_search(result_, match, reg_status)) {
|
||||
status_ = match[1];
|
||||
}
|
||||
|
||||
std::regex reg_server(";; SERVER: ([0-9.]+)#");
|
||||
if (std::regex_search(result_, match, reg_server)) {
|
||||
server_ = match[1];
|
||||
}
|
||||
|
||||
std::regex reg_querytime(";; Query time: ([0-9]+) msec");
|
||||
if (std::regex_search(result_, match, reg_querytime)) {
|
||||
query_time_ = std::stoi(match[1]);
|
||||
}
|
||||
|
||||
std::regex reg_msg_size(";; MSG SIZE rcvd: ([0-9]+)");
|
||||
if (std::regex_search(result_, match, reg_msg_size)) {
|
||||
msg_size_ = std::stoi(match[1]);
|
||||
}
|
||||
|
||||
std::regex reg_flags(";; flags: ([a-z A-Z]+);");
|
||||
if (std::regex_search(result_, match, reg_flags)) {
|
||||
flags_ = match[1];
|
||||
}
|
||||
|
||||
std::regex reg_question(";; QUESTION SECTION:\\n((?:.|\\n|\\r\\n)+?)\\n{2,}",
|
||||
std::regex::ECMAScript | std::regex::optimize);
|
||||
if (std::regex_search(result_, match, reg_question)) {
|
||||
if (ParserRecord(match[1], records_query_) == false) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
std::regex reg_answer(";; ANSWER SECTION:\\n((?:.|\\n|\\r\\n)+?)\\n{2,}",
|
||||
std::regex::ECMAScript | std::regex::optimize);
|
||||
if (std::regex_search(result_, match, reg_answer)) {
|
||||
if (ParserRecord(match[1], records_answer_) == false) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (answer_num_ != records_answer_.size()) {
|
||||
std::cout << "DIG FAILED: Num Not Match\n" << result_ << std::endl;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
std::regex reg_authority(";; AUTHORITY SECTION:\\n((?:.|\\n|\\r\\n)+?)\\n{2,}",
|
||||
std::regex::ECMAScript | std::regex::optimize);
|
||||
if (std::regex_search(result_, match, reg_authority)) {
|
||||
if (ParserRecord(match[1], records_authority_) == false) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (authority_num_ != records_authority_.size()) {
|
||||
std::cout << "DIG FAILED: Num Not Match\n" << result_ << std::endl;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
std::regex reg_addition(";; ADDITIONAL SECTION:\\n((?:.|\\n|\\r\\n)+?)\\n{2,}",
|
||||
std::regex::ECMAScript | std::regex::optimize);
|
||||
if (std::regex_search(result_, match, reg_answer)) {
|
||||
if (ParserRecord(match[1], records_additional_) == false) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
Client::~Client() {}
|
||||
|
||||
} // namespace smartdns
|
||||
109
test/client.h
Normal file
109
test/client.h
Normal file
@@ -0,0 +1,109 @@
|
||||
/*************************************************************************
|
||||
*
|
||||
* Copyright (C) 2018-2023 Ruilin Peng (Nick) <pymumu@gmail.com>.
|
||||
*
|
||||
* smartdns is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* smartdns is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#ifndef _SMARTDNS_CLIENT_
|
||||
#define _SMARTDNS_CLIENT_
|
||||
|
||||
#include <string>
|
||||
#include <unistd.h>
|
||||
#include <vector>
|
||||
|
||||
namespace smartdns
|
||||
{
|
||||
|
||||
class DNSRecord
|
||||
{
|
||||
public:
|
||||
DNSRecord();
|
||||
virtual ~DNSRecord();
|
||||
|
||||
bool Parser(const std::string &line);
|
||||
|
||||
std::string GetName();
|
||||
|
||||
std::string GetType();
|
||||
|
||||
std::string GetClass();
|
||||
|
||||
int GetTTL();
|
||||
|
||||
std::string GetData();
|
||||
|
||||
private:
|
||||
std::string name_;
|
||||
std::string type_;
|
||||
std::string class_;
|
||||
int ttl_;
|
||||
std::string data_;
|
||||
};
|
||||
|
||||
class Client
|
||||
{
|
||||
public:
|
||||
Client();
|
||||
virtual ~Client();
|
||||
bool Query(const std::string &dig_cmds, int port = 0, const std::string &ip = "");
|
||||
|
||||
std::string GetResult();
|
||||
|
||||
std::vector<DNSRecord> GetQuery();
|
||||
|
||||
std::vector<DNSRecord> GetAnswer();
|
||||
|
||||
std::vector<DNSRecord> GetAuthority();
|
||||
|
||||
std::vector<DNSRecord> GetAdditional();
|
||||
|
||||
int GetAnswerNum();
|
||||
|
||||
int GetAuthorityNum();
|
||||
|
||||
std::string GetStatus();
|
||||
|
||||
std::string GetServer();
|
||||
|
||||
int GetQueryTime();
|
||||
|
||||
int GetMsgSize();
|
||||
|
||||
std::string GetFlags();
|
||||
|
||||
void Clear();
|
||||
|
||||
void PrintResult();
|
||||
|
||||
private:
|
||||
bool ParserResult();
|
||||
bool ParserRecord(const std::string &record_str, std::vector<DNSRecord> &record);
|
||||
std::string result_;
|
||||
int answer_num_{0};
|
||||
int authority_num_{0};
|
||||
std::string status_;
|
||||
std::string server_;
|
||||
int query_time_{0};
|
||||
int msg_size_{0};
|
||||
std::string flags_;
|
||||
|
||||
std::vector<DNSRecord> records_query_;
|
||||
std::vector<DNSRecord> records_answer_;
|
||||
std::vector<DNSRecord> records_authority_;
|
||||
std::vector<DNSRecord> records_additional_;
|
||||
};
|
||||
|
||||
} // namespace smartdns
|
||||
#endif // _SMARTDNS_CLIENT_
|
||||
111
test/include/utils.h
Normal file
111
test/include/utils.h
Normal file
@@ -0,0 +1,111 @@
|
||||
/*************************************************************************
|
||||
*
|
||||
* Copyright (C) 2018-2023 Ruilin Peng (Nick) <pymumu@gmail.com>.
|
||||
*
|
||||
* smartdns is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* smartdns is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#ifndef _SMARTDNS_TEST_UTILS_
|
||||
#define _SMARTDNS_TEST_UTILS_
|
||||
|
||||
#include <fstream>
|
||||
#include <functional>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
namespace smartdns
|
||||
{
|
||||
|
||||
class DeferGuard
|
||||
{
|
||||
public:
|
||||
template <class Callable>
|
||||
|
||||
DeferGuard(Callable &&fn) noexcept : fn_(std::forward<Callable>(fn))
|
||||
{
|
||||
}
|
||||
DeferGuard(DeferGuard &&other) noexcept
|
||||
{
|
||||
fn_ = std::move(other.fn_);
|
||||
other.fn_ = nullptr;
|
||||
}
|
||||
|
||||
virtual ~DeferGuard()
|
||||
{
|
||||
if (fn_) {
|
||||
fn_();
|
||||
}
|
||||
};
|
||||
DeferGuard(const DeferGuard &) = delete;
|
||||
void operator=(const DeferGuard &) = delete;
|
||||
|
||||
private:
|
||||
std::function<void()> fn_;
|
||||
};
|
||||
|
||||
#define SMARTDNS_CONCAT_(a, b) a##b
|
||||
#define SMARTDNS_CONCAT(a, b) SMARTDNS_CONCAT_(a, b)
|
||||
#define Defer ::smartdns::DeferGuard SMARTDNS_CONCAT(__defer__, __LINE__) = [&]()
|
||||
|
||||
class TempFile
|
||||
{
|
||||
public:
|
||||
TempFile();
|
||||
TempFile(const std::string &line);
|
||||
virtual ~TempFile();
|
||||
|
||||
bool Write(const std::string &line);
|
||||
|
||||
std::string GetPath();
|
||||
|
||||
void SetPattern(const std::string &pattern);
|
||||
|
||||
private:
|
||||
bool NewTempFile();
|
||||
std::string path_;
|
||||
std::ofstream ofs_;
|
||||
std::string pattern_;
|
||||
};
|
||||
|
||||
class Commander
|
||||
{
|
||||
public:
|
||||
Commander();
|
||||
virtual ~Commander();
|
||||
|
||||
bool Run(const std::vector<std::string> &cmds);
|
||||
|
||||
bool Run(const std::string &cmd);
|
||||
|
||||
void Kill();
|
||||
|
||||
void Terminate();
|
||||
|
||||
int ExitCode();
|
||||
|
||||
int GetPid();
|
||||
|
||||
private:
|
||||
pid_t pid_{-1};
|
||||
int exit_code_ = {-1};
|
||||
};
|
||||
|
||||
bool IsCommandExists(const std::string &cmd);
|
||||
|
||||
std::string GenerateRandomString(int len);
|
||||
|
||||
int ParserArg(const std::string &cmd, std::vector<std::string> &args);
|
||||
|
||||
} // namespace smartdns
|
||||
#endif // _SMARTDNS_TEST_UTILS_
|
||||
460
test/server.cc
Normal file
460
test/server.cc
Normal file
@@ -0,0 +1,460 @@
|
||||
/*************************************************************************
|
||||
*
|
||||
* Copyright (C) 2018-2023 Ruilin Peng (Nick) <pymumu@gmail.com>.
|
||||
*
|
||||
* smartdns is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* smartdns is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "server.h"
|
||||
#include "dns_server.h"
|
||||
#include "fast_ping.h"
|
||||
#include "include/utils.h"
|
||||
#include "smartdns.h"
|
||||
#include "util.h"
|
||||
#include <arpa/inet.h>
|
||||
#include <fcntl.h>
|
||||
#include <fstream>
|
||||
#include <netinet/in.h>
|
||||
#include <poll.h>
|
||||
#include <signal.h>
|
||||
#include <string>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/wait.h>
|
||||
#include <unistd.h>
|
||||
#include <vector>
|
||||
|
||||
namespace smartdns
|
||||
{
|
||||
|
||||
MockServer::MockServer() {}
|
||||
|
||||
MockServer::~MockServer()
|
||||
{
|
||||
Stop();
|
||||
}
|
||||
|
||||
bool MockServer::IsRunning()
|
||||
{
|
||||
if (fd_ > 0) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
void MockServer::Stop()
|
||||
{
|
||||
if (run_ == true) {
|
||||
run_ = false;
|
||||
if (thread_.joinable()) {
|
||||
thread_.join();
|
||||
}
|
||||
}
|
||||
|
||||
if (fd_ > 0) {
|
||||
close(fd_);
|
||||
fd_;
|
||||
}
|
||||
}
|
||||
|
||||
void MockServer::Run()
|
||||
{
|
||||
while (run_ == true) {
|
||||
struct pollfd fds[1];
|
||||
fds[0].fd = fd_;
|
||||
fds[0].events = POLLIN;
|
||||
fds[0].revents = 0;
|
||||
int ret = poll(fds, 1, 100);
|
||||
if (ret == 0) {
|
||||
continue;
|
||||
} else if (ret < 0) {
|
||||
sleep(1);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (fds[0].revents & POLLIN) {
|
||||
struct sockaddr_storage from;
|
||||
socklen_t addrlen = sizeof(from);
|
||||
unsigned char in_buff[4096];
|
||||
int query_id = 0;
|
||||
int len = recvfrom(fd_, in_buff, sizeof(in_buff), 0, (struct sockaddr *)&from, &addrlen);
|
||||
if (len < 0) {
|
||||
continue;
|
||||
}
|
||||
|
||||
char packet_buff[4096];
|
||||
unsigned char response_data_buff[4096];
|
||||
unsigned char response_packet_buff[4096];
|
||||
memset(packet_buff, 0, sizeof(packet_buff));
|
||||
struct dns_packet *packet = (struct dns_packet *)packet_buff;
|
||||
struct ServerRequestContext request;
|
||||
memset(&request, 0, sizeof(request));
|
||||
|
||||
int ret = dns_decode(packet, sizeof(packet_buff), in_buff, len);
|
||||
if (ret == 0) {
|
||||
request.packet = packet;
|
||||
query_id = packet->head.id;
|
||||
if (packet->head.qr == DNS_QR_QUERY) {
|
||||
struct dns_rrs *rrs = nullptr;
|
||||
int rr_count = 0;
|
||||
int qtype = 0;
|
||||
int qclass = 0;
|
||||
char domain[256];
|
||||
|
||||
rrs = dns_get_rrs_start(packet, DNS_RRS_QD, &rr_count);
|
||||
for (int i = 0; i < rr_count && rrs; i++, rrs = dns_get_rrs_next(packet, rrs)) {
|
||||
ret = dns_get_domain(rrs, domain, sizeof(domain), &qtype, &qclass);
|
||||
if (ret == 0) {
|
||||
request.domain = domain;
|
||||
request.qtype = (dns_type)qtype;
|
||||
request.qclass = qclass;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
request.from = (struct sockaddr_storage *)&from;
|
||||
request.fromlen = addrlen;
|
||||
request.request_data = in_buff;
|
||||
request.request_data_len = len;
|
||||
request.response_packet = (struct dns_packet *)response_packet_buff;
|
||||
request.response_data = response_data_buff;
|
||||
request.response_data_len = 0;
|
||||
request.response_data_max_len = sizeof(response_data_buff);
|
||||
|
||||
struct dns_head head;
|
||||
memset(&head, 0, sizeof(head));
|
||||
head.id = query_id;
|
||||
head.qr = DNS_QR_ANSWER;
|
||||
head.opcode = DNS_OP_QUERY;
|
||||
head.aa = 0;
|
||||
head.rd = 0;
|
||||
head.ra = 1;
|
||||
head.rcode = DNS_RC_NOERROR;
|
||||
dns_packet_init(request.response_packet, sizeof(response_packet_buff), &head);
|
||||
|
||||
auto callback_ret = callback_(&request);
|
||||
if (callback_ret == SERVER_REQUEST_ERROR) {
|
||||
dns_packet_init(request.response_packet, sizeof(response_packet_buff), &head);
|
||||
request.response_packet->head.rcode = DNS_RC_SERVFAIL;
|
||||
dns_add_domain(request.response_packet, request.domain.c_str(), request.qtype, request.qclass);
|
||||
request.response_data_len =
|
||||
dns_encode(request.response_data, request.response_data_max_len, request.response_packet);
|
||||
} else if (request.response_data_len == 0) {
|
||||
if (callback_ret == SERVER_REQUEST_OK) {
|
||||
request.response_data_len =
|
||||
dns_encode(request.response_data, request.response_data_max_len, request.response_packet);
|
||||
} else if (callback_ret == SERVER_REQUEST_SOA) {
|
||||
struct dns_soa soa;
|
||||
memset(&soa, 0, sizeof(soa));
|
||||
strncpy(soa.mname, "ns1.example.com", sizeof(soa.mname));
|
||||
strncpy(soa.rname, "hostmaster.example.com", sizeof(soa.rname));
|
||||
soa.serial = 1;
|
||||
soa.refresh = 3600;
|
||||
soa.retry = 600;
|
||||
soa.expire = 86400;
|
||||
soa.minimum = 3600;
|
||||
dns_packet_init(request.response_packet, sizeof(response_packet_buff), &head);
|
||||
dns_add_domain(request.response_packet, request.domain.c_str(), request.qtype, request.qclass);
|
||||
request.response_packet->head.rcode = DNS_RC_NXDOMAIN;
|
||||
dns_add_SOA(request.response_packet, DNS_RRS_AN, request.domain.c_str(), 1, &soa);
|
||||
request.response_data_len =
|
||||
dns_encode(request.response_data, request.response_data_max_len, request.response_packet);
|
||||
}
|
||||
}
|
||||
|
||||
sendto(fd_, request.response_data, request.response_data_len, MSG_NOSIGNAL, (struct sockaddr *)&from,
|
||||
addrlen);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
bool MockServer::AddIP(struct ServerRequestContext *request, const std::string &domain, const std::string &ip, int ttl)
|
||||
{
|
||||
struct sockaddr_storage addr;
|
||||
socklen_t addrlen = sizeof(addr);
|
||||
memset(&addr, 0, sizeof(addr));
|
||||
|
||||
if (GetAddr(ip, "53", SOCK_DGRAM, IPPROTO_UDP, &addr, &addrlen)) {
|
||||
if (addr.ss_family == AF_INET) {
|
||||
struct sockaddr_in *addr4 = (struct sockaddr_in *)&addr;
|
||||
dns_add_A(request->response_packet, DNS_RRS_AN, domain.c_str(), ttl,
|
||||
(unsigned char *)&addr4->sin_addr.s_addr);
|
||||
} else if (addr.ss_family == AF_INET6) {
|
||||
struct sockaddr_in6 *addr6 = (struct sockaddr_in6 *)&addr;
|
||||
if (IN6_IS_ADDR_V4MAPPED(&addr6->sin6_addr)) {
|
||||
dns_add_A(request->response_packet, DNS_RRS_AN, domain.c_str(), ttl,
|
||||
(unsigned char *)&addr6->sin6_addr.s6_addr[12]);
|
||||
return true;
|
||||
}
|
||||
dns_add_AAAA(request->response_packet, DNS_RRS_AN, domain.c_str(), ttl,
|
||||
(unsigned char *)&addr6->sin6_addr.s6_addr);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
bool MockServer::GetAddr(const std::string &host, const std::string port, int type, int protocol,
|
||||
struct sockaddr_storage *addr, socklen_t *addrlen)
|
||||
|
||||
{
|
||||
struct addrinfo hints;
|
||||
struct addrinfo *result = nullptr;
|
||||
|
||||
memset(&hints, 0, sizeof(hints));
|
||||
hints.ai_family = AF_UNSPEC;
|
||||
hints.ai_socktype = type;
|
||||
hints.ai_protocol = protocol;
|
||||
hints.ai_flags = AI_PASSIVE;
|
||||
if (getaddrinfo(host.c_str(), port.c_str(), &hints, &result) != 0) {
|
||||
goto errout;
|
||||
}
|
||||
|
||||
memcpy(addr, result->ai_addr, result->ai_addrlen);
|
||||
*addrlen = result->ai_addrlen;
|
||||
return true;
|
||||
errout:
|
||||
if (result) {
|
||||
freeaddrinfo(result);
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
bool MockServer::Start(const std::string &url, ServerRequest callback)
|
||||
{
|
||||
char c_scheme[256];
|
||||
char c_host[256];
|
||||
int port;
|
||||
char c_path[256];
|
||||
int fd;
|
||||
int yes = 1;
|
||||
struct sockaddr_storage addr;
|
||||
socklen_t addrlen;
|
||||
|
||||
if (callback == nullptr) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (parse_uri(url.c_str(), c_scheme, c_host, &port, c_path) != 0) {
|
||||
return false;
|
||||
}
|
||||
|
||||
std::string scheme(c_scheme);
|
||||
std::string host(c_host);
|
||||
std::string path(c_path);
|
||||
|
||||
if (scheme != "udp") {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (GetAddr(host, std::to_string(port), SOCK_DGRAM, IPPROTO_UDP, &addr, &addrlen) == false) {
|
||||
return false;
|
||||
}
|
||||
|
||||
fd = socket(addr.ss_family, SOCK_DGRAM | SOCK_CLOEXEC, 0);
|
||||
if (fd < 0) {
|
||||
return false;
|
||||
}
|
||||
|
||||
setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes));
|
||||
setsockopt(fd, SOL_SOCKET, SO_REUSEPORT, &yes, sizeof(yes));
|
||||
|
||||
if (bind(fd, (struct sockaddr *)&addr, addrlen) != 0) {
|
||||
close(fd);
|
||||
return false;
|
||||
}
|
||||
|
||||
run_ = true;
|
||||
thread_ = std::thread(&MockServer::Run, this);
|
||||
fd_ = fd;
|
||||
callback_ = callback;
|
||||
return true;
|
||||
}
|
||||
|
||||
Server::Server()
|
||||
{
|
||||
mode_ = Server::CREATE_MODE_FORK;
|
||||
}
|
||||
|
||||
Server::Server(enum Server::CREATE_MODE mode)
|
||||
{
|
||||
mode_ = mode;
|
||||
}
|
||||
|
||||
void Server::MockPing(PING_TYPE type, const std::string &host, int ttl, float time)
|
||||
{
|
||||
struct MockPingIP ping_ip;
|
||||
ping_ip.type = type;
|
||||
ping_ip.host = host;
|
||||
ping_ip.ttl = ttl;
|
||||
ping_ip.time = time;
|
||||
mock_ping_ips_.push_back(ping_ip);
|
||||
}
|
||||
|
||||
void Server::StartPost(void *arg)
|
||||
{
|
||||
Server *server = (Server *)arg;
|
||||
bool has_ipv6 = false;
|
||||
for (auto &it : server->mock_ping_ips_) {
|
||||
if (has_ipv6 == false && check_is_ipv6(it.host.c_str()) == 0) {
|
||||
has_ipv6 = true;
|
||||
}
|
||||
|
||||
fast_ping_fake_ip_add(it.type, it.host.c_str(), it.ttl, it.time);
|
||||
}
|
||||
|
||||
if (has_ipv6 == true) {
|
||||
fast_ping_fake_ip_add(PING_TYPE_ICMP, "2001::", 64, 10);
|
||||
dns_server_check_ipv6_ready();
|
||||
}
|
||||
}
|
||||
|
||||
bool Server::Start(const std::string &conf, enum CONF_TYPE type)
|
||||
{
|
||||
pid_t pid = 0;
|
||||
int fds[2];
|
||||
std::string conf_file;
|
||||
|
||||
fds[0] = 0;
|
||||
fds[1] = 0;
|
||||
Defer
|
||||
{
|
||||
if (fds[0] > 0) {
|
||||
close(fds[0]);
|
||||
}
|
||||
|
||||
if (fds[0] > 0) {
|
||||
close(fds[1]);
|
||||
}
|
||||
};
|
||||
|
||||
if (type == CONF_TYPE_STRING) {
|
||||
conf_temp_file_.SetPattern("/tmp/smartdns_conf.XXXXXX");
|
||||
conf_temp_file_.Write(conf);
|
||||
conf_file = conf_temp_file_.GetPath();
|
||||
} else if (type == CONF_TYPE_FILE) {
|
||||
conf_file = conf;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (access(conf_file.c_str(), F_OK) != 0) {
|
||||
return false;
|
||||
}
|
||||
|
||||
conf_file_ = conf_file;
|
||||
|
||||
if (pipe2(fds, O_CLOEXEC | O_NONBLOCK) != 0) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (mode_ == CREATE_MODE_FORK) {
|
||||
pid = fork();
|
||||
if (pid == 0) {
|
||||
std::vector<std::string> args = {
|
||||
"smartdns", "-f", "-x", "-c", conf_file, "-p", "-",
|
||||
};
|
||||
char *argv[args.size() + 1];
|
||||
for (size_t i = 0; i < args.size(); i++) {
|
||||
argv[i] = (char *)args[i].c_str();
|
||||
}
|
||||
|
||||
smartdns_reg_post_func(Server::StartPost, this);
|
||||
smartdns_main(args.size(), argv, fds[1]);
|
||||
_exit(1);
|
||||
} else if (pid < 0) {
|
||||
return false;
|
||||
}
|
||||
} else if (mode_ == CREATE_MODE_THREAD) {
|
||||
thread_ = std::thread([&]() {
|
||||
std::vector<std::string> args = {
|
||||
"smartdns", "-f", "-x", "-c", conf_file_, "-p", "-",
|
||||
};
|
||||
char *argv[args.size() + 1];
|
||||
for (size_t i = 0; i < args.size(); i++) {
|
||||
argv[i] = (char *)args[i].c_str();
|
||||
}
|
||||
|
||||
smartdns_reg_post_func(Server::StartPost, this);
|
||||
smartdns_main(args.size(), argv, fds[1]);
|
||||
smartdns_reg_post_func(nullptr, nullptr);
|
||||
});
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
|
||||
struct pollfd pfd[1];
|
||||
pfd[0].fd = fds[0];
|
||||
pfd[0].events = POLLIN;
|
||||
|
||||
int ret = poll(pfd, 1, 10000);
|
||||
if (ret == 0) {
|
||||
if (thread_.joinable()) {
|
||||
thread_.join();
|
||||
}
|
||||
|
||||
if (pid > 0) {
|
||||
kill(pid, SIGKILL);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
pid_ = pid;
|
||||
return pid > 0;
|
||||
}
|
||||
|
||||
void Server::Stop(bool graceful)
|
||||
{
|
||||
if (thread_.joinable()) {
|
||||
dns_server_stop();
|
||||
thread_.join();
|
||||
}
|
||||
|
||||
if (pid_ > 0) {
|
||||
if (graceful) {
|
||||
kill(pid_, SIGTERM);
|
||||
} else {
|
||||
kill(pid_, SIGKILL);
|
||||
}
|
||||
}
|
||||
|
||||
waitpid(pid_, nullptr, 0);
|
||||
|
||||
pid_ = 0;
|
||||
}
|
||||
|
||||
bool Server::IsRunning()
|
||||
{
|
||||
if (pid_ <= 0) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (waitpid(pid_, nullptr, WNOHANG) == 0) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return kill(pid_, 0) == 0;
|
||||
}
|
||||
|
||||
Server::~Server()
|
||||
{
|
||||
Stop(false);
|
||||
}
|
||||
|
||||
} // namespace smartdns
|
||||
120
test/server.h
Normal file
120
test/server.h
Normal file
@@ -0,0 +1,120 @@
|
||||
/*************************************************************************
|
||||
*
|
||||
* Copyright (C) 2018-2023 Ruilin Peng (Nick) <pymumu@gmail.com>.
|
||||
*
|
||||
* smartdns is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* smartdns is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#ifndef _SMARTDNS_SERVER_
|
||||
#define _SMARTDNS_SERVER_
|
||||
|
||||
#include "dns.h"
|
||||
#include "fast_ping.h"
|
||||
#include "include/utils.h"
|
||||
#include <functional>
|
||||
#include <string>
|
||||
#include <sys/socket.h>
|
||||
#include <thread>
|
||||
#include <unistd.h>
|
||||
#include <vector>
|
||||
|
||||
namespace smartdns
|
||||
{
|
||||
|
||||
class Server
|
||||
{
|
||||
public:
|
||||
struct MockPingIP {
|
||||
PING_TYPE type;
|
||||
std::string host;
|
||||
int ttl;
|
||||
float time;
|
||||
};
|
||||
enum CONF_TYPE {
|
||||
CONF_TYPE_STRING,
|
||||
CONF_TYPE_FILE,
|
||||
};
|
||||
enum CREATE_MODE {
|
||||
CREATE_MODE_FORK,
|
||||
CREATE_MODE_THREAD,
|
||||
};
|
||||
Server();
|
||||
Server(enum CREATE_MODE mode);
|
||||
virtual ~Server();
|
||||
|
||||
void MockPing(PING_TYPE type, const std::string &host, int ttl, float time);
|
||||
bool Start(const std::string &conf, enum CONF_TYPE type = CONF_TYPE_STRING);
|
||||
void Stop(bool graceful = true);
|
||||
bool IsRunning();
|
||||
|
||||
private:
|
||||
static void StartPost(void *arg);
|
||||
pid_t pid_;
|
||||
std::thread thread_;
|
||||
int fd_;
|
||||
std::string conf_file_;
|
||||
TempFile conf_temp_file_;
|
||||
std::vector<MockPingIP> mock_ping_ips_;
|
||||
enum CREATE_MODE mode_;
|
||||
};
|
||||
|
||||
struct ServerRequestContext {
|
||||
std::string domain;
|
||||
dns_type qtype;
|
||||
int qclass;
|
||||
struct sockaddr_storage *from;
|
||||
socklen_t fromlen;
|
||||
struct dns_packet *packet;
|
||||
uint8_t *request_data;
|
||||
int request_data_len;
|
||||
uint8_t *response_data;
|
||||
struct dns_packet *response_packet;
|
||||
int response_data_max_len;
|
||||
int response_data_len;
|
||||
};
|
||||
|
||||
typedef enum {
|
||||
SERVER_REQUEST_OK = 0,
|
||||
SERVER_REQUEST_ERROR,
|
||||
SERVER_REQUEST_SOA,
|
||||
} ServerRequestResult;
|
||||
|
||||
using ServerRequest = std::function<ServerRequestResult(struct ServerRequestContext *request)>;
|
||||
|
||||
class MockServer
|
||||
{
|
||||
public:
|
||||
MockServer();
|
||||
virtual ~MockServer();
|
||||
|
||||
bool Start(const std::string &url, ServerRequest callback);
|
||||
void Stop();
|
||||
bool IsRunning();
|
||||
|
||||
static bool AddIP(struct ServerRequestContext *request, const std::string &domain, const std::string &ip,
|
||||
int ttl = 60);
|
||||
|
||||
private:
|
||||
void Run();
|
||||
|
||||
static bool GetAddr(const std::string &host, const std::string port, int type, int protocol,
|
||||
struct sockaddr_storage *addr, socklen_t *addrlen);
|
||||
int fd_{0};
|
||||
std::thread thread_;
|
||||
bool run_{false};
|
||||
ServerRequest callback_{nullptr};
|
||||
};
|
||||
|
||||
} // namespace smartdns
|
||||
#endif // _SMARTDNS_SERVER_
|
||||
25
test/test.cc
Normal file
25
test/test.cc
Normal file
@@ -0,0 +1,25 @@
|
||||
/*************************************************************************
|
||||
*
|
||||
* Copyright (C) 2018-2023 Ruilin Peng (Nick) <pymumu@gmail.com>.
|
||||
*
|
||||
* smartdns is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* smartdns is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "gtest/gtest.h"
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
::testing::InitGoogleTest(&argc, argv);
|
||||
return RUN_ALL_TESTS();
|
||||
}
|
||||
269
test/utils.cc
Normal file
269
test/utils.cc
Normal file
@@ -0,0 +1,269 @@
|
||||
#include "include/utils.h"
|
||||
#include <signal.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <sys/wait.h>
|
||||
#include <unistd.h>
|
||||
|
||||
namespace smartdns
|
||||
{
|
||||
|
||||
TempFile::TempFile()
|
||||
{
|
||||
pattern_ = "/tmp/smartdns-test-tmp.XXXXXX";
|
||||
}
|
||||
|
||||
TempFile::TempFile(const std::string &line)
|
||||
{
|
||||
pattern_ = "/tmp/smartdns-test-tmp.XXXXXX";
|
||||
}
|
||||
|
||||
TempFile::~TempFile()
|
||||
{
|
||||
if (ofs_.is_open()) {
|
||||
ofs_.close();
|
||||
ofs_.clear();
|
||||
}
|
||||
|
||||
if (path_.length() > 0) {
|
||||
unlink(path_.c_str());
|
||||
}
|
||||
}
|
||||
|
||||
void TempFile::SetPattern(const std::string &pattern)
|
||||
{
|
||||
pattern_ = pattern;
|
||||
}
|
||||
|
||||
bool TempFile::Write(const std::string &line)
|
||||
{
|
||||
if (ofs_.is_open() == false) {
|
||||
if (NewTempFile() == false) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
ofs_.write(line.data(), line.size());
|
||||
if (ofs_.fail()) {
|
||||
return false;
|
||||
}
|
||||
ofs_.flush();
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool TempFile::NewTempFile()
|
||||
{
|
||||
char filename[128];
|
||||
strncpy(filename, "/tmp/smartdns-test-tmp.XXXXXX", sizeof(filename));
|
||||
int fd = mkstemp(filename);
|
||||
if (fd < 0) {
|
||||
return false;
|
||||
}
|
||||
Defer
|
||||
{
|
||||
close(fd);
|
||||
};
|
||||
|
||||
std::ofstream ofs(filename);
|
||||
if (ofs.is_open() == false) {
|
||||
return false;
|
||||
}
|
||||
ofs_ = std::move(ofs);
|
||||
path_ = filename;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
std::string TempFile::GetPath()
|
||||
{
|
||||
if (ofs_.is_open() == false) {
|
||||
if (NewTempFile() == false) {
|
||||
return "";
|
||||
}
|
||||
}
|
||||
|
||||
return path_;
|
||||
}
|
||||
|
||||
Commander::Commander() {}
|
||||
Commander::~Commander()
|
||||
{
|
||||
Kill();
|
||||
}
|
||||
|
||||
bool Commander::Run(const std::string &cmd)
|
||||
{
|
||||
std::vector<std::string> args;
|
||||
if (ParserArg(cmd, args) != 0) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return Run(args);
|
||||
}
|
||||
|
||||
bool Commander::Run(const std::vector<std::string> &cmds)
|
||||
{
|
||||
pid_t pid;
|
||||
|
||||
if (pid_ > 0) {
|
||||
return false;
|
||||
}
|
||||
|
||||
pid = fork();
|
||||
if (pid < 0) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (pid == 0) {
|
||||
char *argv[cmds.size() + 1];
|
||||
for (int i = 0; i < cmds.size(); i++) {
|
||||
argv[i] = (char *)cmds[i].c_str();
|
||||
}
|
||||
argv[cmds.size()] = nullptr;
|
||||
execvp(argv[0], argv);
|
||||
_exit(1);
|
||||
}
|
||||
|
||||
pid_ = pid;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void Commander::Kill()
|
||||
{
|
||||
if (pid_ <= 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
kill(pid_, SIGKILL);
|
||||
}
|
||||
|
||||
void Commander::Terminate()
|
||||
{
|
||||
if (pid_ <= 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
kill(pid_, SIGTERM);
|
||||
}
|
||||
|
||||
int Commander::ExitCode()
|
||||
{
|
||||
int wstatus = 0;
|
||||
if (exit_code_ >= 0) {
|
||||
return exit_code_;
|
||||
}
|
||||
|
||||
if (pid_ <= 0) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (waitpid(pid_, &wstatus, 0) == -1) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
exit_code_ = WEXITSTATUS(wstatus);
|
||||
|
||||
return exit_code_;
|
||||
}
|
||||
|
||||
int Commander::GetPid()
|
||||
{
|
||||
return pid_;
|
||||
}
|
||||
|
||||
bool IsCommandExists(const std::string &cmd)
|
||||
{
|
||||
char *copy_path = nullptr;
|
||||
char cmd_path[4096];
|
||||
const char *env_path = getenv("PATH");
|
||||
char *save_ptr = nullptr;
|
||||
|
||||
if (env_path == nullptr) {
|
||||
env_path = "/bin:/usr/bin:/usr/local/bin";
|
||||
}
|
||||
|
||||
copy_path = strdup(env_path);
|
||||
if (copy_path == nullptr) {
|
||||
return false;
|
||||
}
|
||||
|
||||
Defer
|
||||
{
|
||||
free(copy_path);
|
||||
};
|
||||
|
||||
for (char *tok = strtok_r(copy_path, ":", &save_ptr); tok; tok = strtok_r(nullptr, ":", &save_ptr)) {
|
||||
snprintf(cmd_path, sizeof(cmd_path), "%s/%s", tok, cmd.c_str());
|
||||
if (access(cmd_path, X_OK) != 0) {
|
||||
continue;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
std::string GenerateRandomString(int len)
|
||||
{
|
||||
std::string result;
|
||||
static const char alphanum[] = "0123456789"
|
||||
"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
|
||||
"abcdefghijklmnopqrstuvwxyz";
|
||||
result.resize(len);
|
||||
|
||||
for (int i = 0; i < len; ++i) {
|
||||
result[i] = alphanum[rand() % (sizeof(alphanum) - 1)];
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
int ParserArg(const std::string &cmd, std::vector<std::string> &args)
|
||||
{
|
||||
std::string arg;
|
||||
char quoteChar = 0;
|
||||
|
||||
for (char ch : cmd) {
|
||||
if (quoteChar == '\\') {
|
||||
arg.push_back(ch);
|
||||
quoteChar = 0;
|
||||
continue;
|
||||
}
|
||||
|
||||
if (quoteChar && ch != quoteChar) {
|
||||
arg.push_back(ch);
|
||||
continue;
|
||||
}
|
||||
|
||||
switch (ch) {
|
||||
case '\'':
|
||||
case '\"':
|
||||
case '\\':
|
||||
quoteChar = quoteChar ? 0 : ch;
|
||||
break;
|
||||
case ' ':
|
||||
case '\t':
|
||||
case '\n':
|
||||
if (!arg.empty()) {
|
||||
args.push_back(arg);
|
||||
arg.clear();
|
||||
}
|
||||
break;
|
||||
default:
|
||||
arg.push_back(ch);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!arg.empty()) {
|
||||
args.push_back(arg);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
} // namespace smartdns
|
||||
Reference in New Issue
Block a user