Skip to content

Commit bd98eb8

Browse files
chore(docs): sync sing-box upstream docs (#348)
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
1 parent f1362a6 commit bd98eb8

7 files changed

Lines changed: 44 additions & 7 deletions

File tree

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
source: https://github.com/SagerNet/sing-box.git
22
branch: testing
33
version: 1.14
4-
commit: aaa1289e5c05a6bfbfa4a81e058f2aaaadf9a783
4+
commit: 8bdafbb0a011cab8f46ebb44e663f27706ddc34d
55
generated_by: scripts/sync-singbox-docs.mjs (do not edit by hand)

docs/upstream/sing-box/testing/configuration/dns/server/dhcp.md

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
icon: material/new-box
33
---
44

5+
!!! quote "Changes in sing-box 1.14.0"
6+
7+
:material-plus: [client_id](#client_id)
8+
59
!!! question "Since sing-box 1.12.0"
610

711
# DHCP
@@ -17,6 +21,7 @@ icon: material/new-box
1721
"tag": "",
1822

1923
"interface": "",
24+
"client_id": "",
2025

2126
// Dial Fields
2227
}
@@ -31,7 +36,17 @@ icon: material/new-box
3136

3237
Interface name to listen on.
3338

34-
Tge default interface will be used by default.
39+
The default interface will be used by default.
40+
41+
#### client_id
42+
43+
!!! question "Since sing-box 1.14.0"
44+
45+
DHCP client identifier (option 61) to send with queries.
46+
47+
Accepts colon-separated hexadecimal bytes (`01:aa:bb:cc:dd:ee:ff`) or a plain string.
48+
49+
A hardware identifier generated from the interface MAC address is used by default.
3550

3651
### Dial Fields
3752

docs/upstream/sing-box/testing/configuration/dns/server/dhcp.zh.md

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
icon: material/new-box
33
---
44

5+
!!! quote "sing-box 1.14.0 中的更改"
6+
7+
:material-plus: [client_id](#client_id)
8+
59
!!! question "自 sing-box 1.12.0 起"
610

711
# DHCP
@@ -17,6 +21,7 @@ icon: material/new-box
1721
"tag": "",
1822

1923
"interface": "",
24+
"client_id": "",
2025

2126
// 拨号字段
2227
}
@@ -33,6 +38,16 @@ icon: material/new-box
3338

3439
默认使用默认接口。
3540

41+
#### client_id
42+
43+
!!! question "自 sing-box 1.14.0 起"
44+
45+
查询时携带的 DHCP 客户端标识符(option 61)。
46+
47+
接受冒号分隔的十六进制字节(`01:aa:bb:cc:dd:ee:ff`)或纯文本字符串。
48+
49+
默认使用由接口 MAC 地址生成的硬件标识符。
50+
3651
### 拨号字段
3752

38-
参阅 [拨号字段](/zh/configuration/shared/dial/) 了解详情。
53+
参阅 [拨号字段](/zh/configuration/shared/dial/) 了解详情。

docs/upstream/sing-box/testing/configuration/outbound/bridge.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ icon: material/new-box
1818
or other L3 endpoints via the `route` action in
1919
[Pre-match](/configuration/shared/pre-match/); L4 connections will be rejected.
2020

21+
Traffic to local addresses of the machine (loopback, or addresses assigned to its
22+
network interfaces) will be rejected.
23+
2124
### Structure
2225

2326
```json

docs/upstream/sing-box/testing/configuration/outbound/bridge.zh.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ icon: material/new-box
1616
通过[预匹配](/zh/configuration/shared/pre-match/)中的 `route` 动作,将 L3 流量从 TUN
1717
或其他 L3 endpoints 路由到它;L4 连接将被拒绝。
1818

19+
到本机本地地址(loopback 或分配给本机网络接口的地址)的流量将被拒绝。
20+
1921
### 结构
2022

2123
```json

docs/upstream/sing-box/testing/configuration/route/rule.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -465,10 +465,11 @@ See [Wi-Fi State](/configuration/shared/wifi-state/) for details.
465465

466466
Match specified outbounds' preferred routes.
467467

468-
| Type | Match |
469-
|-------------|-----------------------------------------------|
470-
| `tailscale` | Match MagicDNS domains and peers' allowed IPs |
471-
| `wireguard` | Match peers's allowed IPs |
468+
| Type | Match |
469+
|-------------|----------------------------------------------------|
470+
| `tailscale` | Match MagicDNS domains and peers' allowed IPs |
471+
| `wireguard` | Match peers's allowed IPs |
472+
| `bridge` | Match all addresses except local addresses of the machine |
472473

473474
#### source_mac_address
474475

docs/upstream/sing-box/testing/configuration/route/rule.zh.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -467,6 +467,7 @@ icon: material/new-box
467467
|-------------|--------------------------------|
468468
| `tailscale` | 匹配 MagicDNS 域名和对端的 allowed IPs |
469469
| `wireguard` | 匹配对端的 allowed IPs |
470+
| `bridge` | 匹配除本机本地地址外的所有地址 |
470471

471472
#### source_mac_address
472473

0 commit comments

Comments
 (0)