From a2d98be2c4ec37dc4cdd6f62cff5abe72e439811 Mon Sep 17 00:00:00 2001 From: Cd1s <135119404+Cd1s@users.noreply.github.com> Date: Sat, 31 Oct 2026 13:10:47 +0700 Subject: [PATCH 1/2] docs: ra_mtu 0 means dnsmasq's default (the bridge MTU is advertised), not 'not advertised' --- docs/modules/dns.md | 2 +- docs/modules/net.md | 5 +++-- mr/mod_dns.go | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/modules/dns.md b/docs/modules/dns.md index 915eb20..4673dc8 100644 --- a/docs/modules/dns.md +++ b/docs/modules/dns.md @@ -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`. diff --git a/docs/modules/net.md b/docs/modules/net.md index 28f5881..8182ae9 100644 --- a/docs/modules/net.md +++ b/docs/modules/net.md @@ -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` 把它的 diff --git a/mr/mod_dns.go b/mr/mod_dns.go index 99f408c..09f7825 100644 --- a/mr/mod_dns.go +++ b/mr/mod_dns.go @@ -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 { From f8e2aa1bbcd47e34eb059fe577019902337535aa Mon Sep 17 00:00:00 2001 From: Cd1s <135119404+Cd1s@users.noreply.github.com> Date: Sat, 31 Oct 2026 13:13:39 +0700 Subject: [PATCH 2/2] ui: the RA MTU hint says 0 = the bridge MTU (dnsmasq default) --- rootfs/www/ui/dns.js | 2 +- rootfs/www/ui/lang/en.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rootfs/www/ui/dns.js b/rootfs/www/ui/dns.js index 271e071..b94f148 100644 --- a/rootfs/www/ui/dns.js +++ b/rootfs/www/ui/dns.js @@ -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(); })); })); }; diff --git a/rootfs/www/ui/lang/en.json b/rootfs/www/ui/lang/en.json index 5840b3f..7a573ba 100644 --- a/rootfs/www/ui/lang/en.json +++ b/rootfs/www/ui/lang/en.json @@ -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",