Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/modules/dns.md
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ the bridge has (`constructor:`), i.e. the prefix dhcpcd delegated.
| `ra_interval` | 60 | seconds, 4–900 (dnsmasq keeps lifetimes ≥ 3 × the interval; the RFC 9096 cap is 2700 s) |
| `ra_lifetime` | 1800 | router lifetime, 60–9000, ≥ interval |
| `ra_priority` | medium | `high` / `low` |
| `ra_mtu` | 0 | advertised MTU, 0 = not advertised (1280–9000) |
| `ra_mtu` | 0 | advertised MTU (1280–9000); 0 = dnsmasq's default, the bridge's own MTU |

The home config (`ipv6_ra: true`, no `ipv6` block) renders
`dhcp-range=::,constructor:br-lan,ra-only,45m` + `ra-param=br-lan,60,1800`.
Expand Down
5 changes: 3 additions & 2 deletions docs/modules/net.md
Original file line number Diff line number Diff line change
Expand Up @@ -232,8 +232,9 @@ ra / ndp / dhcpv6 都设 `relay`,上游口再加 `master`;下游口默认是
`accept_ra=2` 的宿主机网桥)会把它当成自己的默认路由;最好在下游网桥上做 RA guard(只放 relay 发给普通主机的 RA),
不要只依赖可能被别的脚本改回去的 sysctl。不该拿公网 IPv6 的主机,在下游网桥上过滤它的 IPv6 帧。relay 只处理 ND / RA / DHCPv6,
不做 L2 桥接,IPv4 和 DHCPv4 的隔离不受影响。
- 路由器的 RA 默认不带 MTU,下游主机按 1500 发包,靠 PMTUD(ICMPv6 Packet Too Big 已放行,TCP 另有 MSS 钳制)。
WAN 是 PPPoE(1492)而下游有 UDP 大包(QUIC、WireGuard)时,可以设 `dhcp.ipv6.ra_mtu: 1492`,relay 会把它一起转发下去。
- 路由器的 RA 默认通告 `br-lan` 的 MTU(通常 1500),下游主机按它发包,WAN 方向更小的 MTU 靠 PMTUD(ICMPv6 Packet Too Big
已放行,TCP 另有 MSS 钳制)。WAN 是 PPPoE(1492)而下游有 UDP 大包(QUIC、WireGuard)时,可以设 `dhcp.ipv6.ra_mtu: 1492`,
relay 会把它一起转发下去。
- 前缀变化时,路由器照常通告新前缀并让旧前缀过期,relay 原样转发。

没有任何开了 `ipv6` 的 DHCP / 静态 WAN 落在其上的 WAN 接口(`ipv6: false`,或只跑 PPPoE)不收 RA:`network.sh` 把它的
Expand Down
2 changes: 1 addition & 1 deletion mr/mod_dns.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ type RA struct {
Interval int `yaml:"ra_interval"` // seconds between unsolicited RAs (default 60)
Lifetime int `yaml:"ra_lifetime"` // router lifetime in seconds (default 1800)
Priority string `yaml:"ra_priority"` // "" (medium) | high | low
MTU int `yaml:"ra_mtu"` // advertised MTU (0 = not advertised)
MTU int `yaml:"ra_mtu"` // advertised MTU (0 = dnsmasq's default: the bridge's MTU)
}

type Host struct {
Expand Down
2 changes: 1 addition & 1 deletion rootfs/www/ui/dns.js
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ const raTab = ()=>{
...field("RA 间隔(秒)", inNum(r,"ra_interval",{placeholder:"60"}), "0 = 默认 60;4-900"),
...field("路由器生存期(秒)", inNum(r,"ra_lifetime",{placeholder:"1800"}), "0 = 默认 1800;60-9000"),
...field("路由器优先级", inSel(r,"ra_priority",[["","中(默认)"],["high","高"],["low","低"]])),
...field("通告 MTU", inNum(r,"ra_mtu"), "0 = 不通告;PPPoE 可填 1492")] : []));
...field("通告 MTU", inNum(r,"ra_mtu"), "0 = 默认(网桥自己的 MTU);PPPoE 可填 1492")] : []));
return card(n.name+"("+n.bridge+")", onEdit(body, e=>{ if (!(e.target.closest&&e.target.closest("label.sw"))) attach(); }));
}));
};
Expand Down
2 changes: 1 addition & 1 deletion rootfs/www/ui/lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@
"高": "High",
"低": "Low",
"通告 MTU": "Advertised MTU",
"0 = 不通告;PPPoE 可填 1492": "0 = not advertised; 1492 for PPPoE",
"0 = 默认(网桥自己的 MTU);PPPoE 可填 1492": "0 = default (the bridge MTU); 1492 for PPPoE",
"地址池": "Pools",
"静态分配": "Static leases",
"DHCP 选项": "DHCP options",
Expand Down
Loading