Commit Graph
1356 Commits
Author SHA1 Message Date
juewuy 8172c3b35d Merge pull request #1339 from xiaowuap/codex/preserve-subscription-geodata
fix: preserve subscription geodata settings in Clash config
2026-10-24 10:32:15 +08:00
juewuy b4eb924653 Merge pull request #1338 from 212duo/fix/issue-1331-task-syntax-error
fix(task): 修复自动任务名称包含括号等特殊字符导致脚本语法报错的问题 (fixes #1331)
2026-10-24 10:31:07 +08:00
juewuy 436d3db976 Merge pull request #1318 from rponeawa/codex/udp-buffer-limit-setting
feat: 增加可选的 UDP 缓冲上限设置
2026-10-24 10:26:57 +08:00
juewuy 2176f5dc10 Merge pull request #1317 from pluswave/localdns
Feat: 增加局域网内部域名直接解析功能。
2026-10-24 10:25:54 +08:00
LeoHLee 3f3eb9d231 Update disk space checks to use POSIX compliant df
不加-P参数时,在Filesystem名称超过20字符时会换行,导致脚本解析出错
2026-10-05 03:26:53 +08:00
What To Eat 585fdd9ae7 fix: preserve subscription geodata settings when merging Clash config 2026-09-13 01:26:51 +08:00
212duo 6951f24696 fix(task): 修复自动任务名称包含括号等特殊字符导致脚本语法报错的问题 (fixes #1331)
- 为 afstart/bfstart/running 及 crontab 中 task.sh 的任务描述参数添加双引号保护
- 避免在 BusyBox ash 环境下因圆括号等字符被识别为子 shell 触发 unexpected "(" 错误
- 优化 task_manager 对带引号和空格的任务描述提取逻辑
2026-09-06 02:08:14 +08:00
rponeandClaude Fable 5 a42f988a6e fix: also raise rmem/wmem default buffers
部分 Mihomo/quic-go 构建不显式调用 setsockopt,UDP socket 缓冲直接
继承内核 default 值。实测仅提高 max 无法改善吞吐(仍被限制在约
229KB),需同时提高 rmem_default/wmem_default 才生效。

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
2026-08-12 09:40:49 +08:00
纯白色冰淇淋 d37267bceb ~修复 Docker 删除重建容器后丢失开机自启状态的问题:将 s6 自启标记持久化到 configs 卷,并在启动时通过 S6_STAGE2_HOOK 同步 2026-08-11 11:54:40 +08:00
rpone 6614a7dcaf feat: add optional UDP buffer limit tuning 2026-08-06 21:48:14 +08:00
Zhang Zengbo f9e2076976 Feat: 增加局域网内部域名直接解析功能。 2026-08-06 10:29:28 +08:00
juewuy 0ab3fade1b ~优化新手引导中启用IP转发的提示及实现逻辑 2026-08-02 10:39:00 +08:00
juewuy 29fe229554 ~增加UI选项的翻译文本 2026-08-02 10:25:55 +08:00
juewuy 4da9c5a2ff ~修复下载自定义数据库时无法输入超过9的数字的bug 2026-07-30 14:45:47 +08:00
juewuy e621d37d16 ~现在对未启用IP转发的设备,启动局域网代理时默认会检查并启用IP转发 2026-07-29 10:52:12 +08:00
juewuy d8941fb202 ~增加对ss命令的兼容以替代netstat命令 2026-07-29 10:42:38 +08:00
juewuy db8ba09663 ~优化清理数据库提示并增加对.metadb文件的清理 2026-07-29 10:13:37 +08:00
juewuy b27028d9bf ~现在修改劫持范围时不再重置代理模式 2026-07-29 09:59:38 +08:00
juewuy 6cf5f02231 ~修复热更新配置失败的bug 2026-07-29 09:56:56 +08:00
DustinWin cc56656695 适配 sing-box 内核规则集新特性
`route.rule_set.tag` 支持了数组,修改后避免报错“cn 规则集重复”。
2026-07-18 22:47:17 +08:00
juewuy 6ed020a864 ~修复中文括号 2026-07-18 20:36:07 +08:00
juewuy c71fcce870 ~给没有 CIDR 前缀的裸 IP 补 /32 2026-07-18 20:16:51 +08:00
juewuy 0f2a0b437c ~修复语法错误 2026-07-18 20:08:06 +08:00
juewuy 8b8d47c633 ~优化文件结构 2026-07-18 19:45:22 +08:00
juewuy 7df1d7aafa ~修复提示 2026-07-18 19:35:13 +08:00
juewuy 947d93d3ea ~适配singbox1.14+版本内核
~修复debug模式提示找不到内核的bug
2026-07-14 10:47:13 +08:00
juewuy bc26306ebd ~修复文件格式 2026-07-14 09:56:54 +08:00
juewuy 021960fbe7 ~增加梅林固件启动时优化系统默认内存检测机制 2026-07-14 08:41:16 +08:00
juewuy bda31de05d ~修复在线更新订阅定时任务失效的bug 2026-07-13 17:00:50 +08:00
juewuy 2ef92f42ed ~将fakeip地址从28.0.0.0/8调整为198.18.0.0/15 2026-07-13 15:48:34 +08:00
juewuy 7603a480cd ~修复自定义DNS劫持端口界面的错误提示文本 2026-07-13 15:41:43 +08:00
juewuy 9401a48c02 ~修复安装目录末尾会包含/的bug 2026-07-13 15:30:48 +08:00
juewuy 47e50ee608 ~修复部分华硕设备提示找不到crontab的bug 2026-07-13 15:30:21 +08:00
juewuy 5cf7aba112 ~修复容器劫持开关失效的bug 2026-07-13 15:23:13 +08:00
juewuy b2d8ad9774 ~适配1.14+版本singbox内核 2026-07-13 15:10:50 +08:00
juewuy a3f2aa9b96 Merge pull request #1284 from wray-lee/patch-1
修复某些情况下引入的default字段污染变量
2026-07-13 14:24:01 +08:00
juewuy c100d0312d Merge pull request #1271 from fyzhu/patch-1
fix sed error
2026-07-13 14:22:57 +08:00
juewuy baaad12501 Merge pull request #1293 from kannakamuiuwu/dev
fix: 修复iptables放行端口添加过多导致溢出的错误
2026-07-13 14:12:27 +08:00
Feng Yu c4532c979f fix(ecs): 公网IP轮询加IPv4校验,新增oray源,避免错误页伪成功
原轮询 [ -n "$ip" ] 只判非空,members.3322.org 被限流返回 429 HTML
错误页时也判为成功 return,后续更可靠的源不会被尝试。

- 每个响应用 grep -oE 提取合法 IPv4,提取失败(HTML/空)则继续下一个
- 新增 http://ddns.oray.com/checkip 放首位(响应含 'Current IP Address:'
  前缀,grep 提取末尾 IPv4),比 3322 免费 DDNS 更稳定
- 移除 http://4.ipw.cn(部分运营商 DNS 解析失败)
2026-07-11 22:42:53 +08:00
Feng Yu d4e0ec8fb0 fix(ecs): singbox 分支补齐 ecs_address 判空,失败时终端告警
singbox_modify.sh 之前 ecs_address 为空时仍写入 client_subnet:"",
导致 sing-box 启动时 netip.ParsePrefix("") 报 'no /' FATAL,
服务无法启动。根因是 get_ecsip.sh 在部分环境(如梅林 resolv.conf
无 # Interface wan 标记、members.3322.org 被限流)下拿不到公网 IP。

- singbox_modify.sh: 与 mihomo 分支对齐,加 [ -n ecs_address ] 判空,
  失败时不写字段并 logger 告警
- clash_modify.sh: logger 补颜色码 33(黄色),使告警同样打印到终端,
  原来无颜色码只写日志文件用户无感知
2026-07-11 22:42:53 +08:00
juewuy 732d17087e Merge pull request #1302 from DustinWin/new-dev
sing-box 域名嗅探相关优化
2026-07-11 16:39:32 +08:00
Xiaoyi 433774071a core: choose core storage by weighing rom cost vs ram cost
Replaces the binary compressed-rom check with store_raw_worth_it(),
which decides per environment: store the naked binary on $BINDIR (0 RAM)
only when $TMPDIR is tmpfs AND $BINDIR can hold it with margin
(estimated ~2:1 on squashfs/ubifs, full size otherwise). Otherwise keep
a compressed copy and decompress to tmp as before. core_webget skips
the upx core when raw storage is viable, fetching tar.gz instead.

Rationale (rough budgets for a ~40M core): raw on squashfs ~15M rom /
0 RAM; gz 10M rom / ~40M RAM; upx 9M rom / ~40M RAM (memfd). Raw wins
when rom has room; compressed wins when rom is the scarce resource.

Also corrects the upx branch symlink target $TMPDIR -> $BINDIR (#1295).

For #1304
2026-07-11 16:38:49 +08:00
Xiaoyi 55cfa65875 core: prefer raw binary on compressed rom, avoid upx on tmpfs devices
Adds store_on_rom() helper (tmpfs $TMPDIR + squashfs/ubifs/overlay
$BINDIR). On such devices core_webget no longer downloads the upx core
(its stub decompresses into a memfd = RAM at runtime); it fetches the
tar.gz instead and core_check stores the naked binary as
$BINDIR/CrashCore.raw, symlinked from $TMPDIR. The binary is
transparently compressed on rom and file-backed/reclaimable at runtime
(RssShmem 0). Other filesystems and explicit upx keep prior behavior.

Also corrects the upx branch symlink target $TMPDIR -> $BINDIR (same
dangling-symlink issue as #1295).

For #1304
2026-07-11 15:59:42 +08:00
Xiaoyi edd6936903 core: store naked core on compressed rom instead of unpacking to tmpfs
On OpenWrt $TMPDIR is tmpfs (RAM) and $BINDIR sits on a
transparently-compressed fs (squashfs/ubifs). Unpacking the core to
$TMPDIR pins the whole ~40MB binary in unreclaimable Shmem, and a
compressed copy is still kept on rom - paying twice.

When $TMPDIR is tmpfs and $BINDIR is squashfs/ubifs/overlay, store the
verified naked binary as $BINDIR/CrashCore.raw and symlink
$TMPDIR/CrashCore to it, dropping the downloaded archive. The binary is
transparently compressed on rom (~2.2:1, comparable to keeping .gz) and
its text/rodata become file-backed and reclaimable at runtime
(RssShmem 0). Other filesystems keep the existing behavior.

The upx branch's symlink target is also corrected from $TMPDIR to
$BINDIR (same dangling-symlink issue as #1295).

For #1304
2026-07-11 15:41:46 +08:00
DustinWin 988c0cde34 sing-box 域名嗅探相关优化 2026-07-07 10:53:01 +08:00
DustinWin a85cd5b505 Merge branch 'juewuy:dev' into dev 2026-07-07 10:45:02 +08:00
Kanna Kamui f89ac976a7 Update fw_stop.sh 2026-06-25 20:59:30 +08:00
Kanna Kamui c25c7800be fix: 修复iptables放行端口添加过多导致溢出的错误
```
iptables v1.8.10 (nf_tables): too many ports specified
Try `iptables -h' or 'iptables --help' for more information.
iptables v1.8.10 (nf_tables): too many ports specified
Try `iptables -h' or 'iptables --help' for more information.
```
iptables放行端口添加过多导致溢出
2026-06-25 20:56:00 +08:00
Arias Oscar ca6e79d864 fix: 修复iptables放行端口添加过多导致溢出的错误 2026-06-25 17:11:53 +08:00
Wray a2720dbe3e 修复某些情况下引入的default字段污染变量 2026-06-07 22:42:28 +09:00