diff --git a/clashoo/Makefile b/clashoo/Makefile index 1c6f1a3a7..303ed295b 100644 --- a/clashoo/Makefile +++ b/clashoo/Makefile @@ -6,7 +6,7 @@ PKG_UPSTREAM_TAG:=v$(PKG_UPSTREAM_VERSION) PKG_SHORT_SHA:=0455d0d PKG_VERSION:=2026.11.15 -PKG_RELEASE:=33 +PKG_RELEASE:=34 PKG_SOURCE:=$(PKG_NAME)-stable-$(PKG_UPSTREAM_TAG)-$(PKG_SHORT_SHA).tar.gz PKG_SOURCE_SUBDIR:=$(PKG_NAME)-stable-$(PKG_UPSTREAM_TAG)-$(PKG_SHORT_SHA) diff --git a/clashoo/files/usr/share/clashoo/nftables/geoip6_cn.nft b/clashoo/files/usr/share/clashoo/nftables/geoip6_cn.nft index 8c529b732..3c7577b8f 100644 --- a/clashoo/files/usr/share/clashoo/nftables/geoip6_cn.nft +++ b/clashoo/files/usr/share/clashoo/nftables/geoip6_cn.nft @@ -746,9 +746,7 @@ set clashoo_china6 { 2401:f860::/46, 2401:f860:4::/47, 2401:f860:6::/48, - 2401:f860:8::/47, - 2401:f860:a::/48, - 2401:f860:c::/46, + 2401:f860:8::/45, 2401:f860:10::/44, 2401:f860:20::/43, 2401:f860:40::/42, @@ -762,12 +760,7 @@ set clashoo_china6 { 2401:f860:96::/48, 2401:f860:98::/45, 2401:f860:a0::/43, - 2401:f860:c0::/43, - 2401:f860:e0::/44, - 2401:f860:f0::/46, - 2401:f860:f4::/47, - 2401:f860:f7::/48, - 2401:f860:f8::/45, + 2401:f860:c0::/42, 2401:f860:200::/39, 2401:f860:400::/38, 2401:f860:800::/37, @@ -946,6 +939,7 @@ set clashoo_china6 { 2402:7ee0::/32, 2402:8160::/32, 2402:8180::/32, + 2402:8260::/32, 2402:8300::/32, 2402:8380::/32, 2402:85c0::/32, @@ -1242,7 +1236,7 @@ set clashoo_china6 { 2403:6380::/44, 2403:6380:20::/44, 2403:6380:33::/48, - 2403:6380:36::/47, + 2403:6380:37::/48, 2403:6380:38::/45, 2403:6380:41::/48, 2403:6380:44::/46, @@ -1751,7 +1745,6 @@ set clashoo_china6 { 2405:84c0:7000::/36, 2405:84c0:8000::/48, 2405:84c0:8002::/48, - 2405:84c0:8006::/48, 2405:84c0:800a::/47, 2405:84c0:800c::/46, 2405:84c0:8010::/48, @@ -1977,13 +1970,7 @@ set clashoo_china6 { 2406:840:428::/45, 2406:840:430::/44, 2406:840:440::/42, - 2406:840:481::/48, - 2406:840:482::/47, - 2406:840:484::/46, - 2406:840:488::/45, - 2406:840:490::/44, - 2406:840:4a0::/43, - 2406:840:4c0::/42, + 2406:840:480::/41, 2406:840:500::/42, 2406:840:541::/48, 2406:840:542::/47, @@ -2230,7 +2217,7 @@ set clashoo_china6 { 2406:840:9300::/40, 2406:840:9400::/39, 2406:840:9610::/44, - 2406:840:9630::/44, + 2406:840:9620::/43, 2406:840:9640::/43, 2406:840:9660::/48, 2406:840:9662::/47, @@ -2241,8 +2228,9 @@ set clashoo_china6 { 2406:840:9690::/44, 2406:840:96a0::/43, 2406:840:96c0::/42, - 2406:840:9800::/46, - 2406:840:9808::/45, + 2406:840:9809::/48, + 2406:840:980a::/47, + 2406:840:980c::/46, 2406:840:9810::/45, 2406:840:9818::/47, 2406:840:981b::/48, @@ -2262,7 +2250,10 @@ set clashoo_china6 { 2406:840:9968::/46, 2406:840:996d::/48, 2406:840:996e::/47, - 2406:840:9970::/44, + 2406:840:9970::/46, + 2406:840:9974::/47, + 2406:840:9976::/48, + 2406:840:9978::/45, 2406:840:9981::/48, 2406:840:9982::/47, 2406:840:9984::/46, @@ -2271,10 +2262,7 @@ set clashoo_china6 { 2406:840:99c0::/42, 2406:840:9a00::/39, 2406:840:9c00::/39, - 2406:840:9e00::/41, - 2406:840:9e80::/42, - 2406:840:9ec0::/43, - 2406:840:9ee0::/44, + 2406:840:9e00::/40, 2406:840:9f00::/41, 2406:840:9f80::/42, 2406:840:9fc0::/43, @@ -2495,11 +2483,7 @@ set clashoo_china6 { 2406:840:fa08::/45, 2406:840:fa10::/44, 2406:840:fa20::/43, - 2406:840:fa41::/48, - 2406:840:fa42::/47, - 2406:840:fa44::/46, - 2406:840:fa48::/45, - 2406:840:fa50::/44, + 2406:840:fa40::/43, 2406:840:fa70::/44, 2406:840:fa81::/48, 2406:840:fa82::/47, @@ -2548,30 +2532,35 @@ set clashoo_china6 { 2406:840:fd42::/47, 2406:840:fd44::/48, 2406:840:fd47::/48, + 2406:840:fd48::/48, 2406:840:fd4a::/47, 2406:840:fd4c::/46, 2406:840:fd51::/48, 2406:840:fd52::/47, 2406:840:fd54::/48, 2406:840:fd57::/48, + 2406:840:fd58::/48, 2406:840:fd5a::/47, 2406:840:fd5c::/46, 2406:840:fd61::/48, 2406:840:fd62::/47, 2406:840:fd64::/48, 2406:840:fd67::/48, + 2406:840:fd68::/48, 2406:840:fd6a::/47, 2406:840:fd6c::/46, 2406:840:fd71::/48, 2406:840:fd72::/47, 2406:840:fd74::/48, 2406:840:fd77::/48, + 2406:840:fd78::/48, 2406:840:fd7a::/47, 2406:840:fd7c::/46, 2406:840:fd81::/48, 2406:840:fd82::/47, 2406:840:fd84::/48, 2406:840:fd87::/48, + 2406:840:fd88::/48, 2406:840:fd8a::/47, 2406:840:fd8c::/46, 2406:840:fd94::/46, @@ -3088,34 +3077,7 @@ set clashoo_china6 { 2409:1000::/20, 2409:2000::/21, 2409:6000::/20, - 2409:8000::/21, - 2409:8800::/22, - 2409:8c00::/25, - 2409:8c80::/30, - 2409:8c84::/32, - 2409:8c85::/34, - 2409:8c85:4000::/36, - 2409:8c85:5000::/38, - 2409:8c85:5400::/43, - 2409:8c85:5420::/44, - 2409:8c85:5430::/47, - 2409:8c85:5433::/48, - 2409:8c85:5434::/46, - 2409:8c85:5438::/45, - 2409:8c85:5440::/42, - 2409:8c85:5480::/41, - 2409:8c85:5500::/40, - 2409:8c85:5600::/39, - 2409:8c85:5800::/37, - 2409:8c85:6000::/35, - 2409:8c85:8000::/33, - 2409:8c86::/31, - 2409:8c88::/29, - 2409:8c90::/28, - 2409:8ca0::/27, - 2409:8cc0::/26, - 2409:8d00::/24, - 2409:8e00::/23, + 2409:8000::/20, 240a:2000::/24, 240a:4000::/21, 240a:6000::/24, @@ -3352,7 +3314,11 @@ set clashoo_china6 { 2a0a:d685:50a::/47, 2a0a:d685:50c::/46, 2a0a:d685:510::/44, - 2a0a:d685:520::/43, + 2a0a:d685:520::/44, + 2a0a:d685:530::/45, + 2a0a:d685:538::/46, + 2a0a:d685:53c::/48, + 2a0a:d685:53e::/47, 2a0a:d685:540::/42, 2a0a:d685:580::/41, 2a0a:d685:600::/39, diff --git a/clashoo/files/usr/share/clashoo/nftables/geoip_cn.nft b/clashoo/files/usr/share/clashoo/nftables/geoip_cn.nft index 18befeb01..badb4773c 100644 --- a/clashoo/files/usr/share/clashoo/nftables/geoip_cn.nft +++ b/clashoo/files/usr/share/clashoo/nftables/geoip_cn.nft @@ -174,20 +174,7 @@ set clashoo_china { 36.51.0.0/16, 36.56.0.0/13, 36.96.0.0/11, - 36.128.0.0/13, - 36.136.0.0/14, - 36.140.0.0/17, - 36.140.128.0/18, - 36.140.192.0/20, - 36.140.208.0/21, - 36.140.216.0/23, - 36.140.218.0/24, - 36.140.220.0/22, - 36.140.224.0/19, - 36.141.0.0/16, - 36.142.0.0/15, - 36.144.0.0/12, - 36.160.0.0/11, + 36.128.0.0/10, 36.192.0.0/11, 36.248.0.0/14, 36.254.0.0/16, @@ -932,7 +919,25 @@ set clashoo_china { 60.63.0.0/16, 60.160.0.0/11, 60.194.0.0/15, - 60.200.0.0/13, + 60.200.0.0/14, + 60.204.0.0/17, + 60.204.128.0/18, + 60.204.192.0/20, + 60.204.208.0/21, + 60.204.216.0/22, + 60.204.220.0/23, + 60.204.222.0/24, + 60.204.223.0/26, + 60.204.223.64/27, + 60.204.223.97/32, + 60.204.223.98/31, + 60.204.223.100/30, + 60.204.223.104/29, + 60.204.223.112/28, + 60.204.223.128/25, + 60.204.224.0/19, + 60.205.0.0/16, + 60.206.0.0/15, 60.208.0.0/12, 60.232.0.0/15, 60.235.0.0/16, @@ -1323,7 +1328,18 @@ set clashoo_china { 103.36.96.0/22, 103.36.132.0/22, 103.36.136.0/22, - 103.36.160.0/20, + 103.36.160.0/22, + 103.36.164.0/24, + 103.36.165.0/29, + 103.36.165.8/32, + 103.36.165.10/31, + 103.36.165.12/30, + 103.36.165.16/28, + 103.36.165.32/27, + 103.36.165.64/26, + 103.36.165.128/25, + 103.36.166.0/23, + 103.36.168.0/21, 103.36.192.0/19, 103.36.224.0/20, 103.36.240.0/21, @@ -1960,6 +1976,7 @@ set clashoo_china { 103.104.104.0/22, 103.104.152.0/22, 103.104.188.0/22, + 103.104.199.0/24, 103.104.252.0/22, 103.105.0.0/21, 103.105.12.0/22, @@ -1979,7 +1996,6 @@ set clashoo_china { 103.106.96.0/22, 103.106.120.0/22, 103.106.128.0/21, - 103.106.160.0/22, 103.106.196.0/22, 103.106.202.0/24, 103.106.212.0/22, @@ -2004,6 +2020,7 @@ set clashoo_china { 103.109.20.0/22, 103.109.48.0/22, 103.109.88.0/22, + 103.109.106.0/23, 103.109.248.0/22, 103.110.92.0/22, 103.110.116.0/22, @@ -2186,10 +2203,8 @@ set clashoo_china { 103.142.186.0/23, 103.142.234.0/23, 103.142.238.0/23, - 103.142.248.0/23, 103.143.16.0/22, 103.143.74.0/23, - 103.143.120.0/23, 103.143.124.0/23, 103.143.132.0/22, 103.143.174.0/23, @@ -2412,7 +2427,6 @@ set clashoo_china { 103.196.96.0/22, 103.196.168.0/22, 103.197.0.0/22, - 103.197.180.0/22, 103.197.228.0/22, 103.198.20.0/22, 103.198.60.0/22, @@ -2762,9 +2776,7 @@ set clashoo_china { 103.238.18.0/23, 103.238.20.0/22, 103.238.24.0/21, - 103.238.32.0/21, - 103.238.40.0/22, - 103.238.46.0/23, + 103.238.32.0/20, 103.238.48.0/21, 103.238.56.0/22, 103.238.88.0/21, @@ -2971,7 +2983,23 @@ set clashoo_china { 110.44.144.0/20, 110.48.0.0/16, 110.51.0.0/16, - 110.52.0.0/15, + 110.52.0.0/17, + 110.52.128.0/18, + 110.52.192.0/21, + 110.52.200.0/23, + 110.52.202.0/25, + 110.52.202.128/26, + 110.52.202.192/27, + 110.52.202.224/29, + 110.52.202.233/32, + 110.52.202.234/31, + 110.52.202.236/30, + 110.52.202.240/28, + 110.52.203.0/24, + 110.52.204.0/22, + 110.52.208.0/20, + 110.52.224.0/19, + 110.53.0.0/16, 110.56.0.0/13, 110.64.0.0/15, 110.72.0.0/15, @@ -3325,7 +3353,6 @@ set clashoo_china { 117.120.164.0/22, 117.120.184.0/21, 117.120.196.0/22, - 117.120.208.0/21, 117.120.216.0/22, 117.120.248.0/21, 117.121.0.0/17, @@ -3337,7 +3364,6 @@ set clashoo_china { 117.132.0.0/15, 117.134.0.0/17, 117.134.128.0/18, - 117.134.208.0/23, 117.134.212.0/23, 117.134.218.0/23, 117.134.222.0/23, @@ -3469,7 +3495,9 @@ set clashoo_china { 119.160.200.0/21, 119.161.120.0/21, 119.161.128.0/21, - 119.161.144.0/21, + 119.161.145.0/24, + 119.161.146.0/23, + 119.161.148.0/22, 119.161.160.0/19, 119.161.192.0/18, 119.162.0.0/15, @@ -3938,7 +3966,8 @@ set clashoo_china { 140.249.0.0/16, 140.250.0.0/16, 140.255.0.0/16, - 142.86.200.0/21, + 141.229.15.0/24, + 142.86.204.0/22, 142.86.208.0/20, 142.86.224.0/20, 142.86.240.0/21, @@ -3988,7 +4017,7 @@ set clashoo_china { 147.78.134.0/24, 148.70.0.0/16, 149.41.64.0/18, - 149.41.192.0/19, + 149.41.208.0/20, 150.0.0.0/16, 150.115.0.0/16, 150.121.0.0/16, @@ -4028,7 +4057,7 @@ set clashoo_china { 151.158.14.0/23, 151.158.78.0/23, 151.158.80.0/23, - 151.158.123.0/24, + 151.158.122.0/23, 152.104.128.0/17, 152.136.0.0/16, 153.0.0.0/16, @@ -4133,6 +4162,7 @@ set clashoo_china { 160.236.250.0/23, 160.250.14.0/23, 160.250.16.0/22, + 160.250.24.0/23, 160.250.84.0/23, 160.250.90.0/23, 160.250.102.0/23, @@ -4269,9 +4299,7 @@ set clashoo_china { 177.203.96.0/19, 177.203.224.0/19, 178.236.38.0/23, - 178.236.233.0/24, 178.236.234.0/24, - 178.236.237.0/24, 179.236.0.0/19, 180.76.16.0/20, 180.76.32.0/19, @@ -5967,8 +5995,8 @@ set clashoo_china { 211.144.0.0/14, 211.148.0.0/16, 211.149.0.0/19, - 211.149.32.0/22, - 211.149.44.0/22, + 211.149.33.0/24, + 211.149.34.0/23, 211.149.48.0/21, 211.149.64.0/21, 211.149.80.0/21, @@ -6165,7 +6193,6 @@ set clashoo_china { 223.122.20.0/22, 223.122.26.0/23, 223.122.29.0/24, - 223.123.176.0/21, 223.123.196.0/22, 223.123.205.0/24, 223.123.206.0/23, diff --git a/clashoo/files/usr/share/clashoo/ruleset/cn-ip.srs b/clashoo/files/usr/share/clashoo/ruleset/cn-ip.srs index 29c86af01..3d4292833 100644 Binary files a/clashoo/files/usr/share/clashoo/ruleset/cn-ip.srs and b/clashoo/files/usr/share/clashoo/ruleset/cn-ip.srs differ diff --git a/clashoo/files/usr/share/clashoo/ruleset/geolocation-!cn.srs b/clashoo/files/usr/share/clashoo/ruleset/geolocation-!cn.srs index aa25f70b0..9dce579af 100644 Binary files a/clashoo/files/usr/share/clashoo/ruleset/geolocation-!cn.srs and b/clashoo/files/usr/share/clashoo/ruleset/geolocation-!cn.srs differ diff --git a/clashoo/files/usr/share/clashoo/ruleset/geosite-cn.srs b/clashoo/files/usr/share/clashoo/ruleset/geosite-cn.srs index ed14dfc06..d8e4c5d4c 100644 Binary files a/clashoo/files/usr/share/clashoo/ruleset/geosite-cn.srs and b/clashoo/files/usr/share/clashoo/ruleset/geosite-cn.srs differ diff --git a/luci-app-ipsec-vpnd/Makefile b/luci-app-ipsec-vpnd/Makefile index 534046165..e17a15677 100644 --- a/luci-app-ipsec-vpnd/Makefile +++ b/luci-app-ipsec-vpnd/Makefile @@ -11,7 +11,7 @@ LUCI_PKGARCH:=all PKG_NAME:=luci-app-ipsec-vpnd PKG_VERSION:=27.906.25.12 -PKG_RELEASE:=3 +PKG_RELEASE:=4 define Package/luci-app-ipsec-vpnd/conffiles /etc/config/ipsec-vpnd diff --git a/luci-app-ipsec-vpnd/README.md b/luci-app-ipsec-vpnd/README.md index e66876be0..1a28f583b 100644 --- a/luci-app-ipsec-vpnd/README.md +++ b/luci-app-ipsec-vpnd/README.md @@ -16,6 +16,8 @@ IKEv1 + PSK + Xauth(账号密码),目标用户是家用 / 小公司路由 - **不再自建服务实例**:本包不提供自己的 `ipsec-vpnd` 服务,charon 统一交给 strongSwan 自带的 `ipsec` 服务托管(`strongswan-ipsec` 包提供),从根本上避免两个服务抢 UDP/500、4500——抢端口时后启动的那个会**静默退出**,LuCI 上只显示「未运行」却查不到原因 - **菜单位置**:`VPN → IPSec VPN Server`(order 30) - **依赖自检与诊断**:服务启动前检查 strongSwan 运行时是否完整,缺失时拒绝启动并写明确日志;LuCI 页面顶部直接列出缺哪一项、给出对应安装命令 +- **弱网/漫游默认项**:IKEv1 连接默认开 DPD(死连接约 150s 内清理);VPN zone 自动做 MSS clamp(ipsec0 MTU 1400,避免大包 PMTU 黑洞);WAN 公网地址变化时自动重启 ipsec 清理旧 SA +- **可选 IKEv2 + MOBIKE**(`ikev2=1`):额外生成一条 IKEv2 连接,给 iOS/Android 原生「IKEv2」客户端用,手机在 Wi-Fi/蜂窝网络之间切换时不必重新握手;默认关闭,因为它只用 PSK 认证(不再校验账号密码) ## 界面与配置项 @@ -29,6 +31,7 @@ UCI 路径 `ipsec-vpnd.@ipsec[0]`,字段: | `account` | `vpnuser` | Xauth 用户名 | | `password` | `changeme` | Xauth 密码 | | `secret` | `changeme` | IKE PSK 预共享密钥 | +| `ikev2` | `0` | 是否额外提供 IKEv2(PSK + MOBIKE)连接。开启后 IKEv2 客户端只需 PSK,不需要账号密码 | VPN 客户端拨号后会拿到 `clientip` 池里一个地址,`clientdns` 指向 VPN 网关(路由器上的 `ipsec0` IP,固定为 `10.9.8.1`)。 @@ -72,6 +75,35 @@ testuser : XAUTH "testpass" `no matching CHILD_SA config found for 10.9.8.0/24 === <服务端IP>/32`, 最终报 `INVALID_ID_INFORMATION`,IKE 起来了但 CHILD SA 装不上。 +### iOS / Android 原生 IKEv2(可选,先在页面打开「启用 IKEv2」) + +IKEv2 支持 MOBIKE:手机 Wi-Fi ↔ 蜂窝切换时在协议内更新地址,不用重新做完整握手。 +服务端只用 PSK 认证(与 IKEv1 共用 `secret`),所以客户端**不需要填账号密码**; +请使用足够强的 PSK。原有 IKEv1 客户端不受影响,可同时使用。 + +- **iPhone / iPad**:设置 → 通用 → VPN 与设备管理 → VPN → 添加 VPN 配置 → 类型选 `IKEv2`; + 服务器填公网地址或 DDNS;远程 ID 留空(或填服务器地址);本地 ID 留空; + 认证选「共享密钥」,填入页面上配置的 PSK。 +- **Android 11+**:设置 → 网络 → VPN → 添加 VPN → 类型 `IKEv2/IPSec PSK`; + 服务器填公网地址;IPSec 预共享密钥填 PSK;用户名密码留空。 + +> Apple 的 IKEv2「用户名 + 密码」认证(EAP-MSCHAPv2)要求服务端出示证书,本包不会自动 +> 生成/分发证书,所以继续用 IKEv1(Cisco IPSec)+ 账号密码,或接受 IKEv2 仅 PSK。 +> 在路由上等价于:`uci set ipsec-vpnd.ipsec.ikev2=1 && uci commit ipsec-vpnd`,再在 LuCI 里保存一次(触发 apply)。 + +## 稳定性与漫游(服务端行为) + +| 机制 | 值 | 作用 | +|---|---|---| +| DPD | `dpddelay=30s` / `dpdtimeout=150s` / `dpdaction=clear` | 客户端掉线/切网后约 2.5 分钟内清掉旧 SA,不再长期显示"幽灵在线" | +| MSS clamp | `firewall.VPN.mtu_fix=1` | ipsec0 MTU 1400,出方向 SYN 自动 clamp 到 1360,避免大包卡死 | +| WAN 重拨 | `/etc/hotplug.d/iface/90-ipsec-vpnd` | 公网地址变化时才重启 ipsec;普通 ifup/renew 不踢在线客户端 | +| 生命周期 | `lifetime=4h` / `ikelifetime=8h` | 减少弱网下每小时 rekey 的失败点 | +| 提案 | IKEv2 首选 AES-128-GCM/SHA-256;IKEv1 保留 AES-128-SHA1、3DES 回退 | 新客户端走更快/更强的套件,老客户端仍可连 | + +> 这些是服务端自己的行为,不依赖 ImmortalWrt 的默认配置;安装到其它 OpenWrt/ImmortalWrt +> 设备时同样生效(MSS clamp 由本包的 uci-defaults / 升级脚本写入,DPD 等由渲染器生成)。 + ## 依赖 本包是纯 LuCI 前端 + 脚本,运行时依赖 strongSwan。**安装本包时会自动拉取下面这些依赖**(apk / ipk 的 `depends` 已声明): @@ -246,6 +278,9 @@ GNU 环境,所以改完记得也在设备上跑一遍:busybox 的 `tr` 不 | 服务显示「未运行」但 charon 明明在跑 | 说明有第二个服务实例抢占了 UDP/500、4500。本包不再自建服务,正常情况下只有系统 `ipsec` 一个实例;`ls /etc/rc.d/*ipsec*` 检查是否残留旧版 `ipsec-vpnd` 链接 | | 装完 `ipsec0` 上没有 VPN 网关地址 | 执行 `ifup VPN`;本包在安装与服务启动时都会自动执行一次 | | GitHub Actions 出包失败 | 看 `Build` workflow 的 step 日志;常见是 host 工具链 apt 装失败、或 apk-tools/po2lmo 编译报错 | +| 手机切网后显示"已连接"但打不开网页 | IKEv1 没有 MOBIKE,切网必然断;改用 IKEv2 配置(页面开启 `ikev2`),或等 DPD(约 150s)清掉旧 SA 后让客户端重连。`ipsec statusall` 能看到是否残留旧 SA | +| 网页能开,视频/大文件卡住 | 检查 MSS clamp 是否生效:`nft list ruleset \| grep ipsec0` 应有两条 maxseg;没有就 `uci set firewall.VPN.mtu_fix=1 && uci commit firewall && fw4 reload` | +| 升级后 IKEv2 开关没有/不生效 | `uci get ipsec-vpnd.ipsec.ikev2`(默认 `0`);在 LuCI 勾选「启用 IKEv2」并保存应用,渲染器会加 `conn ikev2_psk` 并重启 ipsec | ## 许可证 diff --git a/luci-app-ipsec-vpnd/htdocs/luci-static/resources/view/ipsec-vpnd.js b/luci-app-ipsec-vpnd/htdocs/luci-static/resources/view/ipsec-vpnd.js index e884febe3..5547e939d 100644 --- a/luci-app-ipsec-vpnd/htdocs/luci-static/resources/view/ipsec-vpnd.js +++ b/luci-app-ipsec-vpnd/htdocs/luci-static/resources/view/ipsec-vpnd.js @@ -167,6 +167,11 @@ return view.extend({ o.password = true; o.rmempty = false; + o = s.option(form.Flag, 'ikev2', _('Enable IKEv2 (PSK + MOBIKE)'), + _('Adds an IKEv2 connection for the native iOS/Android IKEv2 client. It supports MOBIKE, so the phone keeps the tunnel while switching between Wi-Fi and cellular. It authenticates with the PSK only (no username/password), so use a strong PSK; existing IKEv1 clients are unaffected.')); + o.default = o.disabled; + o.rmempty = false; + // 在线客户端列表:页面最底部,5s 轮询刷新。数据来自 rpcd 后端 // /usr/libexec/rpcd/ipsec-vpnd(解析 `ipsec statusall` 的 stroke 输出)。 s = m.section(form.TypedSection); diff --git a/luci-app-ipsec-vpnd/po/templates/ipsec-vpnd.pot b/luci-app-ipsec-vpnd/po/templates/ipsec-vpnd.pot index 24dc3d68c..7f1a80f26 100644 --- a/luci-app-ipsec-vpnd/po/templates/ipsec-vpnd.pot +++ b/luci-app-ipsec-vpnd/po/templates/ipsec-vpnd.pot @@ -129,3 +129,11 @@ msgstr "" #: applications/luci-app-ipsec-vpnd/htdocs/luci-static/resources/view/ipsec-vpnd.js:119 msgid "Missing dependencies" msgstr "" + +#: applications/luci-app-ipsec-vpnd/htdocs/luci-static/resources/view/ipsec-vpnd.js:170 +msgid "Enable IKEv2 (PSK + MOBIKE)" +msgstr "" + +#: applications/luci-app-ipsec-vpnd/htdocs/luci-static/resources/view/ipsec-vpnd.js:171 +msgid "Adds an IKEv2 connection for the native iOS/Android IKEv2 client. It supports MOBIKE, so the phone keeps the tunnel while switching between Wi-Fi and cellular. It authenticates with the PSK only (no username/password), so use a strong PSK; existing IKEv1 clients are unaffected." +msgstr "" diff --git a/luci-app-ipsec-vpnd/po/zh_Hans/ipsec-vpnd.po b/luci-app-ipsec-vpnd/po/zh_Hans/ipsec-vpnd.po index a95d0da84..2dbbb74cc 100644 --- a/luci-app-ipsec-vpnd/po/zh_Hans/ipsec-vpnd.po +++ b/luci-app-ipsec-vpnd/po/zh_Hans/ipsec-vpnd.po @@ -138,3 +138,11 @@ msgstr "请先安装缺失的软件包:" #: applications/luci-app-ipsec-vpnd/htdocs/luci-static/resources/view/ipsec-vpnd.js:119 msgid "Missing dependencies" msgstr "缺少依赖" + +#: applications/luci-app-ipsec-vpnd/htdocs/luci-static/resources/view/ipsec-vpnd.js:170 +msgid "Enable IKEv2 (PSK + MOBIKE)" +msgstr "启用 IKEv2(PSK + MOBIKE)" + +#: applications/luci-app-ipsec-vpnd/htdocs/luci-static/resources/view/ipsec-vpnd.js:171 +msgid "Adds an IKEv2 connection for the native iOS/Android IKEv2 client. It supports MOBIKE, so the phone keeps the tunnel while switching between Wi-Fi and cellular. It authenticates with the PSK only (no username/password), so use a strong PSK; existing IKEv1 clients are unaffected." +msgstr "为 iOS/Android 原生 IKEv2 客户端增加一条 IKEv2 连接。它支持 MOBIKE,手机在 Wi-Fi 与蜂窝网络之间切换时可保持隧道。该连接仅用 PSK 认证(不再校验账号密码),请使用足够强的 PSK;原有 IKEv1 客户端不受影响。" diff --git a/luci-app-ipsec-vpnd/root/etc/config/ipsec-vpnd b/luci-app-ipsec-vpnd/root/etc/config/ipsec-vpnd index cba1d91f3..2cba7a87e 100644 --- a/luci-app-ipsec-vpnd/root/etc/config/ipsec-vpnd +++ b/luci-app-ipsec-vpnd/root/etc/config/ipsec-vpnd @@ -9,4 +9,6 @@ config service 'ipsec' option enabled '0' option password 'changeme' option clientip '10.9.8.10/24' + # IKEv2 + MOBIKE(手机漫游)。默认关闭:IKEv2 只校验 PSK,不校验账号密码。 + option ikev2 '0' diff --git a/luci-app-ipsec-vpnd/root/etc/hotplug.d/iface/90-ipsec-vpnd b/luci-app-ipsec-vpnd/root/etc/hotplug.d/iface/90-ipsec-vpnd new file mode 100755 index 000000000..b7a807ba7 --- /dev/null +++ b/luci-app-ipsec-vpnd/root/etc/hotplug.d/iface/90-ipsec-vpnd @@ -0,0 +1,32 @@ +#!/bin/sh +# SPDX-License-Identifier: Apache-2.0 +# +# WAN 公网地址变化时重启 charon。 +# +# 为什么需要:IKEv1/IKEv2 的已有 SA 都绑在旧的本端地址上。PPPoE 重拨后 +# 旧 SA 会假死,而服务端没有 DPD 时能一直挂到 reauth 超时(约 2.8h), +# 期间 LuCI 列表里全是"在线"的旧会话。重启 charon 让所有 SA 立即失效, +# 客户端重连后拿到新的 SA。 +# +# 只在地址真的变化时重启:普通 ifup/renew 不踢在线客户端。 + +[ "$ACTION" = "ifup" ] || exit 0 +[ "$INTERFACE" = "wan" ] || exit 0 +[ "$(uci -q get ipsec-vpnd.ipsec.enabled)" = "1" ] || exit 0 +[ -x /etc/init.d/ipsec ] || exit 0 + +. /lib/functions/network.sh 2>/dev/null || exit 0 +network_get_ipaddr ip wan || exit 0 +[ -n "$ip" ] || exit 0 + +STATE="/tmp/.ipsec-vpnd-wan-ip" +old="$(cat "$STATE" 2>/dev/null)" +printf '%s\n' "$ip" > "$STATE" + +# 首次启动没有旧值:只记录,不重启(此时 ipsec 可能还没起来)。 +[ -n "$old" ] || exit 0 +[ "$old" = "$ip" ] && exit 0 + +logger -t ipsec-vpnd "WAN 地址变化 $old -> $ip,重启 ipsec 以清理旧 SA" +/etc/init.d/ipsec restart >/dev/null 2>&1 +exit 0 diff --git a/luci-app-ipsec-vpnd/root/etc/uci-defaults/luci-ipsec-vpnd b/luci-app-ipsec-vpnd/root/etc/uci-defaults/luci-ipsec-vpnd index 1183fd41e..2568bb1e8 100755 --- a/luci-app-ipsec-vpnd/root/etc/uci-defaults/luci-ipsec-vpnd +++ b/luci-app-ipsec-vpnd/root/etc/uci-defaults/luci-ipsec-vpnd @@ -79,6 +79,9 @@ uci -q batch <<-EOF >/dev/null set firewall.VPN.forward="ACCEPT" set firewall.VPN.output="ACCEPT" set firewall.VPN.network="VPN" + # ipsec0 MTU 1400,PPPoE 1492;不开 mtu_fix 时客户端可能按 1500 + # 协商 MSS,遇到 PMTU 黑洞就是"小包通、大包卡死"。 + set firewall.VPN.mtu_fix="1" delete firewall.vpn set firewall.vpn=forwarding diff --git a/luci-app-ipsec-vpnd/root/usr/lib/ipsec/luci-ipsec-vpnd-render b/luci-app-ipsec-vpnd/root/usr/lib/ipsec/luci-ipsec-vpnd-render index 73b7e369a..ec94e484f 100755 --- a/luci-app-ipsec-vpnd/root/usr/lib/ipsec/luci-ipsec-vpnd-render +++ b/luci-app-ipsec-vpnd/root/usr/lib/ipsec/luci-ipsec-vpnd-render @@ -41,11 +41,13 @@ vt_clientdns="10.9.8.1" vt_account="vpnuser" vt_password="changeme" vt_secret="changeme" +vt_ikev2="0" config_get vt_clientip "ipsec" "clientip" "$vt_clientip" config_get vt_clientdns "ipsec" "clientdns" "$vt_clientdns" config_get vt_account "ipsec" "account" "$vt_account" config_get vt_password "ipsec" "password" "$vt_password" config_get vt_secret "ipsec" "secret" "$vt_secret" +config_get vt_ikev2 "ipsec" "ikev2" "$vt_ikev2" # 先写到临时文件,再和现有文件比对:内容没变就不动文件。 # 这样 rpcd 的 apply 才知道要不要重启服务 —— 别的页面触发一次 apply @@ -63,6 +65,9 @@ cat > "$TMP_CONF" <> "$TMP_CONF" < "$TMP/lib/network.sh" < "$TMP/init/ipsec" <> "$TMP/restarts" +exit 0 +EOF +chmod 0755 "$TMP/init/ipsec" + +cat > "$TMP/bin/uci" <<'EOF' +#!/bin/sh +# uci -q get ipsec-vpnd.ipsec.enabled +[ "$1" = "-q" ] && shift +[ "$1" = "get" ] && [ "$2" = "ipsec-vpnd.ipsec.enabled" ] && { + [ "${TEST_ENABLED:-1}" = "1" ] && { echo 1; exit 0; } + exit 1 +} +exit 1 +EOF +chmod 0755 "$TMP/bin/uci" + +cat > "$TMP/bin/logger" <> "$TMP/log" +exit 0 +EOF +chmod 0755 "$TMP/bin/logger" + +sed -e "s|/lib/functions/network.sh|$TMP/lib/network.sh|g" \ + -e "s|/etc/init.d/ipsec|$TMP/init/ipsec|g" \ + -e "s|/tmp/.ipsec-vpnd-wan-ip|$TMP/wan-ip|g" \ + "$HOTPLUG" > "$TMP/hotplug" +chmod 0755 "$TMP/hotplug" +PATH="$TMP/bin:$PATH" +export PATH + +run() { + # run [enabled] + : > "$TMP/restarts"; : > "$TMP/log" + printf '%s\n' "$3" > "$TMP/ip" + TEST_ENABLED="${4:-1}" ACTION="$1" INTERFACE="$2" "$TMP/hotplug" + echo "$(wc -l < "$TMP/restarts" | tr -d ' ')" +} + +check "首次 ifup 只记录地址、不重启" "0" "$(run ifup wan 1.1.1.1)" +check "首次记录写入状态文件" "1.1.1.1" "$(cat "$TMP/wan-ip")" + +check "同一地址再次 ifup 不重启" "0" "$(run ifup wan 1.1.1.1)" +check "地址变化时重启一次" "1" "$(run ifup wan 2.2.2.2)" +check "地址变化写入日志" "1" "$(grep -c 'WAN 地址变化' "$TMP/log")" +check "变化后状态文件更新" "2.2.2.2" "$(cat "$TMP/wan-ip")" + +printf '%s\n' "2.2.2.2" > "$TMP/wan-ip" +check "非 WAN 接口不动作" "0" "$(run ifup lan 3.3.3.3)" +check "WAN 地址变化但服务未启用:不重启" "0" "$(run ifup wan 4.4.4.4 0)" +check "action=ifdown 不动作" "0" "$(run ifdown wan 5.5.5.5)" + +if [ "$fail" -eq 0 ]; then + echo "hotplug-test: 全部通过" + exit 0 +fi +echo "hotplug-test: 有失败项" +exit 1 diff --git a/luci-app-ipsec-vpnd/tests/render-test.sh b/luci-app-ipsec-vpnd/tests/render-test.sh index 9ca0776b9..a1c96abaf 100644 --- a/luci-app-ipsec-vpnd/tests/render-test.sh +++ b/luci-app-ipsec-vpnd/tests/render-test.sh @@ -46,6 +46,15 @@ count_matches() { fi } +file_sum() { + # busybox 没有 cksum;md5sum/md5 两边都有 + if command -v md5sum >/dev/null 2>&1; then + md5sum "$1" | cut -d' ' -f1 + else + md5 -q "$1" + fi +} + file_mode() { # 跨平台取权限(macOS / Linux / busybox 的 stat 参数都不一样,统一走 ls -l) ls -l "$1" 2>/dev/null | awk '{ @@ -114,15 +123,39 @@ check "secrets 含 PSK" "1" "$(count_matches '^: PSK "psk1"$' "$TMP/etc/ipsec.se check "secrets 含 XAuth" "1" "$(count_matches '^acc1 : XAUTH "pw1"$' "$TMP/etc/ipsec.secrets")" check "secrets 权限 0600" "600" "$(file_mode "$TMP/etc/ipsec.secrets")" check "首次渲染报告 changed" "changed" "$(cat "$TMP/out")" +check "IKEv1 开启 DPD" "1" "$(count_matches '^ dpdaction=clear$' "$TMP/etc/ipsec.conf")" +check "DPD 探测间隔 30s" "1" "$(count_matches '^ dpddelay=30s$' "$TMP/etc/ipsec.conf")" +check "DPD 超时 150s" "1" "$(count_matches '^ dpdtimeout=150s$' "$TMP/etc/ipsec.conf")" +check "IKE/CHILD 生命周期已显式设置" "1" "$(count_matches '^ lifetime=4h$' "$TMP/etc/ipsec.conf")" +check "默认不生成 IKEv2 conn" "0" "$(count_matches '^conn ikev2_psk$' "$TMP/etc/ipsec.conf")" # 幂等:同样的配置再渲染一次,报告 unchanged 且不改动文件 -before="$(cksum "$TMP/etc/ipsec.conf")" +before="$(file_sum "$TMP/etc/ipsec.conf")" rc="$(run_render "$TMP/uci")" check "重复渲染退出码 0" "0" "$rc" check "重复渲染报告 unchanged" "unchanged" "$(cat "$TMP/out")" -check "重复渲染不改文件" "$before" "$(cksum "$TMP/etc/ipsec.conf")" +check "重复渲染不改文件" "$before" "$(file_sum "$TMP/etc/ipsec.conf")" -# --- 2. enabled=0 ---------------------------------------------------------- +# --- 2. IKEv2 + MOBIKE ----------------------------------------------------- +cat > "$TMP/uci" <<'EOF' +enabled=1 +clientip=10.9.8.10/24 +clientdns=10.9.8.1 +account=acc1 +password=pw1 +secret=psk1 +ikev2=1 +EOF + +rc="$(run_render "$TMP/uci")" +check "ikev2=1 时渲染成功" "0" "$rc" +check "ikev2=1 时生成 IKEv2 conn" "1" "$(count_matches '^conn ikev2_psk$' "$TMP/etc/ipsec.conf")" +check "IKEv2 conn 开启 mobike" "1" "$(count_matches '^ mobike=yes$' "$TMP/etc/ipsec.conf")" +check "IKEv2 复用 clientip 地址池" "2" "$(grep -c '^ rightsourceip=10.9.8.10/24$' "$TMP/etc/ipsec.conf")" +check "IKEv2 复用 clientdns" "2" "$(grep -c '^ rightdns=10.9.8.1$' "$TMP/etc/ipsec.conf")" +check "IKEv2 不需要 EAP 凭据" "0" "$(count_matches ': EAP ' "$TMP/etc/ipsec.secrets")" + +# --- 3. enabled=0 ---------------------------------------------------------- cat > "$TMP/uci" <<'EOF' enabled=0 clientip=10.9.8.10/24 @@ -130,11 +163,13 @@ clientdns=10.9.8.1 account=acc1 password=pw1 secret=psk1 +ikev2=1 EOF rc="$(run_render "$TMP/uci")" check "enabled=0 时渲染成功" "0" "$rc" check "enabled=0 时不生成 conn" "0" "$(count_matches '^conn xauth_psk$' "$TMP/etc/ipsec.conf")" +check "enabled=0 时不生成 IKEv2 conn" "0" "$(count_matches '^conn ikev2_psk$' "$TMP/etc/ipsec.conf")" check "enabled=0 时清掉遗留 secrets" "0" "$([ -e "$TMP/etc/ipsec.secrets" ] && echo 1 || echo 0)" check "enabled=0 时报告 changed" "changed" "$(cat "$TMP/out")" diff --git a/luci-app-ipsec-vpnd/tests/run-all.sh b/luci-app-ipsec-vpnd/tests/run-all.sh index e7321dc89..5e875bc98 100644 --- a/luci-app-ipsec-vpnd/tests/run-all.sh +++ b/luci-app-ipsec-vpnd/tests/run-all.sh @@ -8,7 +8,7 @@ set -u cd "$(dirname "$0")/.." || exit 1 rc=0 -for t in tests/sanitize-test.sh tests/render-test.sh tests/sessions-parse-test.sh; do +for t in tests/sanitize-test.sh tests/hotplug-test.sh tests/render-test.sh tests/sessions-parse-test.sh; do echo "=== $t ===" sh "$t" || rc=1 echo diff --git a/luci-app-open-box/Makefile b/luci-app-open-box/Makefile index 98c922b94..17215a3f8 100644 --- a/luci-app-open-box/Makefile +++ b/luci-app-open-box/Makefile @@ -1,8 +1,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-open-box -PKG_VERSION:=0.1.449 -PKG_RELEASE:=83 +PKG_VERSION:=0.1.450 +PKG_RELEASE:=84 PKG_MAINTAINER:=liandu2024 PKG_LICENSE:=GPL-3.0-or-later diff --git a/luci-app-quickstart/root/etc/quickstart/home-launcher.json b/luci-app-quickstart/root/etc/quickstart/home-launcher.json new file mode 100644 index 000000000..f5ab40034 --- /dev/null +++ b/luci-app-quickstart/root/etc/quickstart/home-launcher.json @@ -0,0 +1 @@ +{"format":1,"generation":"545a71cd9c5bdc924d7d7867f5d5e23b","revision":8,"value":{"schemaVersion":1,"favorites":["tool-lan","tool-terminal","tool-dns","tool-logs","user-link:5003daec5641e204420013e750150e9e","user-link:13a8e5876d6008338be2dee039e0baa2","user-link:4893754702b4ca474fb313d18ac307e8","user-link:ab7eeeda3ec5045e7a287ebf3b69c066"],"links":[{"id":"user-link:5003daec5641e204420013e750150e9e","name":"固件定制下载","url":"https://openwrt.ai","glyph":"download"},{"id":"user-link:13a8e5876d6008338be2dee039e0baa2","name":"设置向导","url":"http://localhost/cgi-bin/luci/admin/system/wizard","glyph":"globe"},{"id":"user-link:4893754702b4ca474fb313d18ac307e8","name":"文件管理","url":"http://localhost/cgi-bin/luci/admin/system/footstrap-files","glyph":"folder"},{"id":"user-link:ab7eeeda3ec5045e7a287ebf3b69c066","name":"备份与更新","url":"http://localhost/cgi-bin/luci/admin/system/flash","glyph":"layers"}]},"migration":{"exists":false,"diableDisplay":[]}} diff --git a/luci-app-quickstart/root/etc/uci-defaults/50_luci-quickstart b/luci-app-quickstart/root/etc/uci-defaults/50_luci-quickstart index 048f3caf5..7812eb55e 100755 --- a/luci-app-quickstart/root/etc/uci-defaults/50_luci-quickstart +++ b/luci-app-quickstart/root/etc/uci-defaults/50_luci-quickstart @@ -1,4 +1,28 @@ #!/bin/sh +APP_JS="/www/luci-static/quickstart/app.js" + +sed -i -E ' + # 1. 去除首页顶部 iStoreOS官网 + s/[^[]*\("iStoreOS官网","iStoreOS website"\)\),1\),// + + # 2. 主题跟随系统判断 html[data-darkmode="true"] 并监听属性变化 + s/\([^()]*\.matches\)!=null\?[^:]*:window\.matchMedia\([^)]*\)\.matches/document.documentElement.dataset.darkmode==="true"/ + s/\.addEventListener\("change",([^)]+)\)/&,(new MutationObserver(\1)).observe(document.documentElement,{attributes:!0,attributeFilter:["data-darkmode"]})/ + + # 3. 去除网络连接卡片中的软件源检测与配置 + s/[a-zA-Z0-9_$]+\.networkInfo/&==="softSourceFailed"?"netSuccess":&/ + s/,"softSourceFailed"|,softSourceFailed:\[[^]]*\]|:[^:?]*==="softSourceFailed"\?"source"//g + + # 4. 彻底移除软件源配置(tool-source)入口与“恢复默认八项”按钮 + s/,\{id:"tool-source"[^}]*\}|,"tool-source"//g + s/get favorites\(\)\{return ([^}]*\.favorites)\}/get favorites(){return \1.filter(y=>y!=="tool-source")}/ + s/,[a-zA-Z0-9_$]+\("button",\{[^}]*"data-shortcut-restore":""\},[^}]*\("恢复默认八项","Restore eight defaults"\)\),1\)// + + # 5. 自定义链接支持 / 开头的绝对路径(保存时转为 http://localhost/... 以通过后端校验,展示与跳转时还原为 /...) + s/!\/\^https\?:\\\/\\\/\/\.test\(([a-zA-Z0-9_$]+\.url)\)/(\/^\\\/(?!\\\/)\/.test(\1)\&\&(\1="http:\/\/localhost"+\1),&)/ + s/path:([a-zA-Z0-9_$]+\.url),/path:\1.replace(\/^http:\\\/\\\/localhost(?=\\\/)\/,""),/ +' "$APP_JS" + rm -f /tmp/luci-indexcache /tmp/luci-indexcache.* exit 0 diff --git a/luci-proto-wwand/Makefile b/luci-proto-wwand/Makefile index be427dcf4..c82fd1ac6 100644 --- a/luci-proto-wwand/Makefile +++ b/luci-proto-wwand/Makefile @@ -20,12 +20,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-proto-wwand -PKG_VERSION:=1.8.0_pre2 -PKG_RELEASE:=19 +PKG_VERSION:=1.9.0_pre1 +PKG_RELEASE:=20 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/ddimension/luci-proto-wwand.git -PKG_SOURCE_VERSION:=c451947e1355487391964dea79d73da2e58738a4 +PKG_SOURCE_VERSION:=4e8c388e361b1e3243493a82b2009d827a158c32 PKG_MIRROR_HASH:=skip PKG_LICENSE:=GPL-2.0-only diff --git a/luci-theme-carbon/Makefile b/luci-theme-carbon/Makefile index e364bfe0c..ea8f82455 100644 --- a/luci-theme-carbon/Makefile +++ b/luci-theme-carbon/Makefile @@ -9,8 +9,8 @@ LUCI_TITLE:=Carbon Theme (Apple-style, beginner friendly) LUCI_DEPENDS:=+luci-base +curl +ca-bundle +flock LUCI_PKGARCH:=all -PKG_VERSION:=1.1.5 -PKG_RELEASE:=2 +PKG_VERSION:=1.1.6 +PKG_RELEASE:=3 PKG_LICENSE:=Apache-2.0 # Keep modern CSS/JS intact (csstidy/jsmin do not understand diff --git a/luci-theme-carbon/docs/releases/v1.1.6.md b/luci-theme-carbon/docs/releases/v1.1.6.md new file mode 100644 index 000000000..d67b5cae2 --- /dev/null +++ b/luci-theme-carbon/docs/releases/v1.1.6.md @@ -0,0 +1,25 @@ +## English + +### What's new + +- **Device upload/download speeds.** The overview can display per-device sampled average speeds from an existing `nlbwmon` collector. Readings follow its configured collection interval; initial samples, missing records and counter resets show `—`. Reads pause while the page is hidden, and DHCP lease information continues to update independently. +- **Realtime graphs.** Fix LuCI's load, bandwidth and connection graphs failing to fill the available width after collapsing or expanding the sidebar or resizing the window. Existing samples and polling are preserved, and labels keep their normal size. +- **Disk mounting dropdowns.** Fix DiskMan mount options being clipped at the bottom of the table. Open menus can extend beyond table and phone cell boundaries, while closed tables retain their original layout and rounded clipping. + +### Upgrade notes + +- After upgrading, log out of LuCI and back in once so the new read-only device traffic permissions take effect. +- Device speeds require an available `nlbwmon` collector. Carbon uses its existing settings and does not install or start it. Only traffic observed by this router is included; bridge traffic, offloaded traffic and traffic through other gateways may be missing. Systems without a supported collector retain the device list without speed readings. + +## 简体中文 + +### 更新内容 + +- **设备上下行网速。** 概览可读取已有 `nlbwmon` 采集服务的数据,显示各设备的采样平均网速。读取频率遵循采集服务的现有周期;首次采样、记录缺失或计数重置时显示 `—`。页面隐藏时暂停读取,DHCP 租约信息仍独立刷新。 +- **实时图表。** 修复 LuCI 的负载、带宽和连接数图表在折叠、展开侧栏或调整窗口大小后未铺满可用宽度的问题。保留已有采样和持续刷新,文字标签保持正常尺寸。 +- **磁盘挂载下拉框。** 修复 DiskMan 挂载选项在表格底部被裁切的问题。展开的菜单可越过表格及手机端单元格边界,关闭后保留原有布局和圆角裁切。 + +### 升级须知 + +- 升级后请退出 LuCI 并重新登录一次,让新增的设备流量只读权限生效。 +- 设备网速依赖可用的 `nlbwmon` 采集服务。Carbon 沿用其现有设置,不会安装或启动该服务。仅统计本机观测到的流量,桥接、流量卸载及经过其他网关的流量可能不完整。不支持采集服务的系统保留设备列表,不显示网速。 diff --git a/luci-theme-carbon/root/usr/share/carbon/version b/luci-theme-carbon/root/usr/share/carbon/version index 6a2c403c7..9f69f2420 100644 --- a/luci-theme-carbon/root/usr/share/carbon/version +++ b/luci-theme-carbon/root/usr/share/carbon/version @@ -1 +1 @@ -1.1.5-r3 +1.1.6-r1 diff --git a/mise/Makefile b/mise/Makefile index f04199e75..444d4d9b8 100644 --- a/mise/Makefile +++ b/mise/Makefile @@ -14,8 +14,8 @@ MISE_HASH_x86_64:=3832f39c325e343f81fe3d92b2447c5d1a5eea1bc85092bb7b6c2580622264 MISE_HASH_aarch64:=06186cfbfe947049b21d58575fb0ea800cc26ed1375f20f4b678cb3a9d679437 PKG_NAME:=mise -PKG_VERSION:=2026.11.8 -PKG_RELEASE:=57 +PKG_VERSION:=2026.11.9 +PKG_RELEASE:=58 PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION)-linux-$(MISE_ARCH)-musl.tar.gz PKG_SOURCE_URL:=https://github.com/jdx/mise/releases/download/v$(PKG_VERSION)/ PKG_HASH:=skip diff --git a/v2raya-geosite/Makefile b/v2raya-geosite/Makefile index 86ec8c207..ef9ea4814 100644 --- a/v2raya-geosite/Makefile +++ b/v2raya-geosite/Makefile @@ -10,8 +10,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=v2raya-geosite -PKG_VERSION:=20261115005626 -PKG_RELEASE:=3 +PKG_VERSION:=20261116043813 +PKG_RELEASE:=4 PKG_LICENSE:=MIT PKG_MAINTAINER:=Amr Fateem @@ -19,7 +19,7 @@ PKG_MAINTAINER:=Amr Fateem include $(INCLUDE_DIR)/package.mk GEOSITE_FILE:=dlc.dat.$(PKG_VERSION) -GEOSITE_HASH:=26e5f04c498ea651f62fa864f8e83ac5198ca311724e634d79f0ac02cdfe74fc +GEOSITE_HASH:=c449116a9ad4cf406a31c23ff254b94f4d341db0c2d5ad2924410daa62b4277b define Download/geosite URL:=https://github.com/v2fly/domain-list-community/releases/download/$(PKG_VERSION)/ diff --git a/wwand-ims/Makefile b/wwand-ims/Makefile index b2c775e19..334a92e74 100644 --- a/wwand-ims/Makefile +++ b/wwand-ims/Makefile @@ -4,10 +4,10 @@ # (wwand plugins.uc) plus a SIP daemon, kept out of the wwand sources on # purpose: it is NOT meant for upstream. # -# Sources live in https://github.com/ddimension/wwand-ims (branch main, no -# vX.Y.Z-dev marker scheme yet — it is pinned by commit like wwand-ipa, not via -# bump-source.sh). After a PKG_SOURCE_VERSION bump run -# `scripts/update-hashes.sh wwand-ims` to fill PKG_MIRROR_HASH from the SDK. +# Sources live in https://github.com/ddimension/wwand-ims, two lines like +# wwand: feed main pins its `main` (vX.Y.0-dev marker -> X.Y.0_preN), feed +# stable its release tags. Pin with `scripts/bump-source.sh wwand-ims `. +# A new module under sipd/ or ue/ needs its install line below. # # GPL-2.0-only, and pure ucode + scripts (no compiled code): the NETLINK_XFRM # binding sec-agree needs lives in wwand's own native module (wwand_io.so, @@ -21,12 +21,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=wwand-ims -PKG_VERSION:=0.1.0 -PKG_RELEASE:=2 +PKG_VERSION:=0.2.0_pre3 +PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/ddimension/wwand-ims.git -PKG_SOURCE_VERSION:=747443df0318ed305bc11c3ee2ba4d60d8df4083 +PKG_SOURCE_VERSION:=58b626743f5f7ca5cf1093ad6daad2ac53113833 PKG_MIRROR_HASH:=skip PKG_LICENSE:=GPL-2.0-only @@ -89,10 +89,12 @@ define Package/wwand-ims/install $(INSTALL_DATA) $(PKG_BUILD_DIR)/sipd/sip.uc $(1)$(IMSLIB)/sipd_sip.uc $(INSTALL_DATA) $(PKG_BUILD_DIR)/sipd/line_ue.uc $(1)$(IMSLIB)/sipd_line_ue.uc $(INSTALL_DATA) $(PKG_BUILD_DIR)/sipd/relay.uc $(1)$(IMSLIB)/sipd_relay.uc + $(INSTALL_DATA) $(PKG_BUILD_DIR)/sipd/profile.uc $(1)$(IMSLIB)/sipd_profile.uc $(INSTALL_DATA) $(PKG_BUILD_DIR)/ue/aka.uc $(1)$(IMSLIB)/ue_aka.uc $(INSTALL_DATA) $(PKG_BUILD_DIR)/ue/secagree.uc $(1)$(IMSLIB)/ue_secagree.uc $(INSTALL_DATA) $(PKG_BUILD_DIR)/ue/reg.uc $(1)$(IMSLIB)/ue_reg.uc $(INSTALL_DATA) $(PKG_BUILD_DIR)/ue/call.uc $(1)$(IMSLIB)/ue_call.uc + $(INSTALL_DATA) $(PKG_BUILD_DIR)/ue/regevent.uc $(1)$(IMSLIB)/ue_regevent.uc # the proven UE driver, run by `wwandctl ims [modem] call ` $(INSTALL_DATA) $(PKG_BUILD_DIR)/tools/ims-register.uc $(1)$(IMSLIB)/ims-register.uc # init, setup helper, example config, l3mdev hotplug diff --git a/wwand/Makefile b/wwand/Makefile index 0d7d276bc..eebb223a8 100644 --- a/wwand/Makefile +++ b/wwand/Makefile @@ -50,12 +50,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=wwand -PKG_VERSION:=1.9.0_pre50 -PKG_RELEASE:=96 +PKG_VERSION:=1.10.0_pre0 +PKG_RELEASE:=97 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/ddimension/wwand.git -PKG_SOURCE_VERSION:=844b15e01892f6804d411036ef499061987205cb +PKG_SOURCE_VERSION:=70048f8c50ff37693a0c712ae443fb678a07d97a PKG_MIRROR_HASH:=skip PKG_LICENSE:=GPL-2.0-only