From 07f168e0e797e6be93343699606c576e15968eb6 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Wed, 5 Feb 2020 00:25:06 +0800 Subject: [PATCH] luci-app-openclash: bump to v0.36.3-beta --- package/ctcgfw/luci-app-openclash/Makefile | 2 +- .../files/etc/init.d/openclash | 22 ++++++++++--------- .../files/etc/openclash/openclash_version | 4 ++-- .../model/cbi/openclash/game-settings.lua | 9 +++++++- .../lua/luci/model/cbi/openclash/settings.lua | 1 + .../lib/lua/luci/view/openclash/status.htm | 8 +++++++ .../i18n/zh-cn/openclash.zh-cn.po | 3 +++ 7 files changed, 35 insertions(+), 14 deletions(-) diff --git a/package/ctcgfw/luci-app-openclash/Makefile b/package/ctcgfw/luci-app-openclash/Makefile index c09597b7ea..7b3f22a1fe 100644 --- a/package/ctcgfw/luci-app-openclash/Makefile +++ b/package/ctcgfw/luci-app-openclash/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-openclash -PKG_VERSION:=0.36.2 +PKG_VERSION:=0.36.3 PKG_RELEASE:=beta PKG_MAINTAINER:=vernesong diff --git a/package/ctcgfw/luci-app-openclash/files/etc/init.d/openclash b/package/ctcgfw/luci-app-openclash/files/etc/init.d/openclash index 05218d247e..3c25a48ecf 100755 --- a/package/ctcgfw/luci-app-openclash/files/etc/init.d/openclash +++ b/package/ctcgfw/luci-app-openclash/files/etc/init.d/openclash @@ -626,6 +626,10 @@ if [ "$enable" -eq 1 ] && [ -f "$CONFIG_FILE" ]; then en_mode_tun="1" en_mode="fake-ip" fi + if [ "$en_mode" = "redir-host-tun" ]; then + en_mode_tun="1" + en_mode="redir-host" + fi if [ "$en_mode" = "redir-host-vpn" ]; then en_mode_tun="2" en_mode="redir-host" @@ -716,13 +720,8 @@ mkdir -p /var/etc cat > "/var/etc/openclash.include" <<-EOF /etc/init.d/openclash restart EOF - if [ "$en_mode_tun" != "2" ]; then + if [ -z "$en_mode_tun" ]; then iptables -t nat -N openclash - - if [ "$en_mode_tun" = "1" ]; then - iptables -t nat -A openclash -d 198.18.0.0/16 -j RETURN - fi - iptables -t nat -A openclash -d 0.0.0.0/8 -j RETURN iptables -t nat -A openclash -d 10.0.0.0/8 -j RETURN iptables -t nat -A openclash -d 127.0.0.0/8 -j RETURN @@ -736,10 +735,8 @@ EOF fi iptables -t nat -A openclash -p tcp -j REDIRECT --to-ports "$proxy_port" iptables -t nat -A PREROUTING -p tcp -j openclash + iptables -t nat -A OUTPUT -p tcp -d 198.18.0.0/16 -j REDIRECT --to-ports "$proxy_port" - if [ "$en_mode_tun" != 1 ]; then - iptables -t nat -A OUTPUT -p tcp -d 198.18.0.0/16 -j REDIRECT --to-ports "$proxy_port" - fi if [ "$ipv6_enable" -eq 1 ]; then ip6tables -t nat -N openclash @@ -747,7 +744,7 @@ EOF ip6tables -t nat -A PREROUTING -p tcp -j openclash fi else - #TUN2模式 + #TUN模式 ipset create localnetwork hash:net ipset add localnetwork 127.0.0.0/8 ipset add localnetwork 10.0.0.0/8 @@ -757,9 +754,13 @@ EOF ipset add localnetwork 240.0.0.0/4 ipset add localnetwork 172.16.0.0/12 #启动TUN + if [ "$en_mode_tun" = "2" ]; then ip tuntap add user root mode tun clash0 ip link set clash0 up ip route replace default dev clash0 table "$PROXY_ROUTE_TABLE" + elif [ "$en_mode_tun" = "1" ]; then + ip route replace default dev utun table "$PROXY_ROUTE_TABLE" + fi ip rule add fwmark "$PROXY_FWMARK" table "$PROXY_ROUTE_TABLE" #设置防火墙 iptables -t mangle -N openclash @@ -887,6 +888,7 @@ stop() ip link set dev clash0 down >/dev/null 2>&1 ip tuntap del clash0 mode tun >/dev/null 2>&1 ip route del default dev clash0 table "$PROXY_ROUTE_TABLE" >/dev/null 2>&1 + ip route del default dev utun table "$PROXY_ROUTE_TABLE" >/dev/null 2>&1 ip rule del fwmark "$PROXY_FWMARK" table "$PROXY_ROUTE_TABLE" >/dev/null 2>&1 iptables -t mangle -D OUTPUT -j openclash >/dev/null 2>&1 diff --git a/package/ctcgfw/luci-app-openclash/files/etc/openclash/openclash_version b/package/ctcgfw/luci-app-openclash/files/etc/openclash/openclash_version index f36499d105..6b2ddf1825 100644 --- a/package/ctcgfw/luci-app-openclash/files/etc/openclash/openclash_version +++ b/package/ctcgfw/luci-app-openclash/files/etc/openclash/openclash_version @@ -1,2 +1,2 @@ -v0.36.2-beta -data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAXMAAAAqCAMAAAB2kksrAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQ4IDc5LjE2NDAzNiwgMjAxOS8wOC8xMy0wMTowNjo1NyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIDIxLjAgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjg5NDIzMUEwM0I3NTExRUFCQjZGRDQ0QjZERTkyNjYxIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjg5NDIzMUExM0I3NTExRUFCQjZGRDQ0QjZERTkyNjYxIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6ODk0MjMxOUUzQjc1MTFFQUJCNkZENDRCNkRFOTI2NjEiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6ODk0MjMxOUYzQjc1MTFFQUJCNkZENDRCNkRFOTI2NjEiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz471t8EAAADAFBMVEVtbW09PT2Gv9+EvN1Jns6TvdXB1eCEhIS6urokhLs6lspYpdI1dZuizOWx0eNFmsoGVYLR5vIHX5EJeLiCgoKenp53t9va2tqlpaXR4uxTiqplnr54eHjf39/n5+c/Pz/GxsahoaEkapLOzs5jlLFpaWkKaqEJca2RkZFxcXG/v79GRkasrKy1tbWTxeEHXI4KdrSDs84JZZlmrdbKysoGbamy1eoYYo1iYmIWaJcJYZQEXI4FYJQEU4CStchLS0tDQ0Pg4OAEWYkXgb6Li4tkq9OjwNGyytkFcK2ixdl2dnbAwMCcnJwrjsZGi7Lw9fcGdLLCwsJBQUFCQkImcZxFkbyDqsG2trZFgKKXl5eyzdzQ3+gFaaIJWIWEtNDS0tLQ0NA2kcZlZWUnicGNjY2jyN4ahMEGZJochsNHnM0FcrBzobsHZ50HVoQHbKWDrcVyn7iBudmjzuavr69gYGCDq8IZdaqUlJTB2ed0dHQEYpiJweIwk8sUXol0sdVGg6Y1h7UFZZsHV4YIcrARgsMCc7QBcrNRUVFUVFRVVVVSUlILfL1WVlYKe7wFdrcHeLkDdLUDdbUOgMADdLQEdrYOf8AEdbYSg8NXV1cSg8QShMQThMUAcrIOf78Gd7gNfr8Nfr4Mfb4Mfb0IebkJeroJe7sJers6OjqqqqrU1NTV1dWrq6tISEipqak7OzuAgIB+fn7w9/tJSUnC3u6BgYGCqcDq6upMTEzz8/ODvNz19fX09PTh7/fv9Pd/f3/B3e0HcKuFvt6ErMLg6u+JiYnA1N/B3e7o6OjB3u4IaJ+hv9AFZ5/g6vDg7vaEvd10s9jW1tbC3+/D3+8LerkGdbQFZ6CDu9wLdK9Gm8sIWYcZg8AFa6YEVYPv9voKebiDr8gLb6hVos8nbZQJcKsEV4eErcVUk7eyz+DP5PGSudBGiK4GW4tkmbfB2+qixNdTU1MPgMEQgcJZWVlaWlpfX19bW1tcXFxNTU1eXl5PT09QUFBYWFhdXV1OTk7///////948PWPAAABAHRSTlP///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////8AU/cHJQAADDZJREFUeNrsVwlUVNcZfoOEUUQRdALRkVFBRR8Yo4K44IBiMLEmSNwRrXpi3EgNxhiNpsG0FRkIbbrRJaYJQbbBMCCLLHHft+ybZE+XmDTTWhsQw0f/e997M+8NYDhN6zkzx+8c7v23+/33fffNew+hvb1u0/CrnoA/uAG2P2Frbxfa47de9Qz83i2wPaBdqBvV4iH4nXtgu03Y5CmSt/zWTfCEMOpbT8FP3ATbhW9vaX6z4UGa/9NdIHzjMbil+c3HP9wFwr89Brc0v/l41l0g/Mtj8Gt3Qaea6yMiIsL/D6exUq9f6XAEvb47a4x6YzfZn+sSvrd73e7rGnx2TW8vLy9v18CcjkUd1z7nBa/n/msIV1wRs7AOHPGLY658T+gj9Bq/Dosd9mxM6A7Fq3i1m82e7wJrXueX8/oaTXSOFEVDb6UsnftenRUF+LpwemnrNPD28n7+huigubEaCCo1GEKplf77ah6BCLWbPRrxjqMFwv+3mv+pC7yGOwbdN+gOvKaJegMpR47cfT/gzX1fG5B45EjiYZciH15kW6PlPIzDXbW7YY5DuK5FTDxqBR2D2VA74Pr3BGmu8UcBSsPFqM3qDoWoE7vZ7IXOMR7nJqampk68H+PVYe+7P01l4XNIZ+5qGxJZWeqITor87sftWlLS9YWucKMch9BBpdoYXVyF2SzqdNnDu6utcYDmeAYMEDrX3BqCobJZgoVtcrGxc8YYF80FbZMYpULBi50jGusDP37n48AjiFaH30lNDRwxYtx7R/Aac9Phk5o6jgIjXIoms6JpUpETpOuLL87x9lWFvBWP5xxBTY0EV83rYDDt4la2mRkl2M+9/SiRx8XxQOn1UpTGlNJjiGVL2QugrpTXATHcLYnhjgQH+y4DqmUB6Y7PI+Fms3x1wnUN+fWh1TzMKEshESfw0OwYuVLgCxeqt26R0RsNstWA3haLDZc/JPuNH8NmUeGdcWPZ9MYXeJCm1cCnk9+wuEIuGvtnVGoTpGvvBv42kPzV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 \ No newline at end of file +v0.36.3-beta +data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAXMAAAAqCAMAAAB2kksrAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQ4IDc5LjE2NDAzNiwgMjAxOS8wOC8xMy0wMTowNjo1NyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIDIxLjAgKFdpbmRvd3MpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjg0QUYxNkVDNDc1NDExRUFCMjQzQTlFNjg1NThBN0RBIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjg0QUYxNkVENDc1NDExRUFCMjQzQTlFNjg1NThBN0RBIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6ODRBRjE2RUE0NzU0MTFFQUIyNDNBOUU2ODU1OEE3REEiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6ODRBRjE2RUI0NzU0MTFFQUIyNDNBOUU2ODU1OEE3REEiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz6zH6ceAAADAFBMVEXR0dFJns4reqdFmsptbW09PT2EvN0GVYKEhIS6uroihLzB1eCiwNJYpdIHX5EJeLgJdbTR5vKCgoIGcKyenp5jlLHa2tqlpaXR4ux4eHgkapLf39/n5+c5lcqStck/Pz/GxsahoaHOzs5paWmizOUJca1lnLuy1uqSu9KRkZFxcXEKaqEEYJW/v79GRkasrKx3t9u1tbUIXIwwk8uTxeFmrdY0dJoFbamDs84IYZTKyso2kcViYmIEWYkWaJcEU4AEXI5LS0uyythDQ0NFgKHg4OCLi4tkq9Ox0eOixdgXYo1GirEHdLF2dnYXgL3AwMCcnJzCwsIFaaJBQUEJZJhCQkJVlbomcJu2traXl5cIaJ6yzdwJWIVFkb0GbKaEtNBlZWUahMEmicGNjY2kzuajyN4FcrByn7hHnM1zobsHZ53w9fcJb6mDrcXR3+ivr6+DqsGhv9BgYGAchsODq8Irjsc1hrQZdapGg6aUlJQGZJrB2ecEYph0dHRVjKuJweJTiah0sdUFZZt0p8QRgsMCc7QBcrNRUVFUVFRVVVVSUlILfL1WVlYFdrcHeLkKe7wEdrYDdbUOf8AEdbYDdLQDdLUOgMASg8NXV1cSg8QShMQAcrIThMUGd7gOf78Nfr8Nfr4Mfb4Mfb0IebkJeroJe7sJers6OjqqqqrU1NTV1dVISEirq6upqanw9/s7OzuAgIB+fn4HVoRJSUnC3u6BgYHq6urz8/P19fVMTEzh7/f09PSDvNx/f3/v9PeGvt+Hv9/g6u/g6vCFvt7B3e3A1N+CqcCGv9+ErMKJiYnB3e7o6OgUXokFZ5+Evd3B3u50s9jg7vbW1tYLerkGdbQFZ6BGm8vD3+9Vos8Fa6YZg8AIWYfC3+8EVYODu9yDr8gHV4cLdK8KeLfv9vrg7vcJcKsEV4eAudmyz+AnhrxjpszP5PEFdLNEgKPB2+pTU1MPgMEQgcJZWVlaWlpfX19bW1tcXFxNTU1eXl5PT09QUFBYWFhdXV1OTk7///////8NL6p8AAABAHRSTlP///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////8AU/cHJQAADFFJREFUeNrsVwlUVNcZHgIjowgRGSCDwCiKiMsjuEZFh4GARolWMHHD9Ri3WJdoEk3UGtJWBISuKV3Mhsg+BlBWQ4S4L2hi9sREk5o0rem01gbE8NH/3vfe8N4AhtPkeM7M8TvHd//1++/77uO9UdPWVrV+4A1nwF8cAKN+Zmlr07TFbb/hHPiTQ2CUd5umamizk+CPjoFRFs16Z5G8+Q8Ogp9phn7nLPi5g2CU5ru7mt9pOJHm/3YUaL51GtzV/M7jX44CzX+dBnc1v/N4wVGg+Y/T4DeOgk4110VERIS7/fiqLNHpltgcN52uOz0GnaGb7C92hReC7j9yf1CH6CbPI0eOuNgHnrQrc6GY5yb75hM48eL/Dc11e0TNrQJH3Lyo6z8Qugidyq/CPJs9ExO6Q/E23u7msJe6wKb3+e28v0kVfVKMosZTLlvO/ROqKjEGywk7zhM40dW4l1xOuLx0W3TQ3FAB+BXr9SE0SvdDNY9AhNLNGIE429EC4T+u5i93gU9w3+Dpg+/DJ6qoC7Du5MnejwMu3A+yADEnT8a8oaoCGoJPBjcA6vDLb9gHupnj0NxSIyoOlW5aBrO+su+tHwjSXOUPBdwkcx4q07pDIWiFbg57pXOMQcO05OTkaY9jjDLs0jsgmYUbsJy5Sy2IYWXJw1TNHltYLDkGNWpS0vWVrnC7HIemg0qVUdrYcrNZ0GozBnZXW0Nf1fH07evWueZFgRggmYWY2yoVGzpnjLLT3E09JEqukPFq5wjDaq+1V9Z6nUSYMnwlOdlr2LDZH5/EJ8xdDo/k5NkUGKZqTk4eOX/Y/JFbADXpm3jz1VefdAlShFxkj+dsQVWNCHvNq6A37uJWhpkZhTjEvUMolK7z4oDiW8Uojiqm1xDLFrMPQFUxrwOiuFsYxR0RNvZdelRIAtITn03CzWT5ivhbKvJbAyp4mFEWQySO56GZUVKlG2+cq9x6ugRP1EhWDTzT0y3YcpHsi1tgSVfgyuzP2XJxCB6jZSkQMPti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 \ No newline at end of file diff --git a/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/game-settings.lua b/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/game-settings.lua index 2119956859..c5d71577cb 100644 --- a/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/game-settings.lua +++ b/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/game-settings.lua @@ -11,7 +11,14 @@ local uci = require "luci.model.uci".cursor() m = Map(openclash, translate("Game Rules and Groups")) m.pageaction = false -m.description=translate("注意事项：
游戏模式为测试功能，不保证可用性。使用的内核由comzyh修改
项目地址：https://github.com/comzyh/clash
使用步骤：
1、在《服务器与策略组管理》页面创建您准备使用的游戏策略组和游戏节点（节点添加时必须选择要加入的策略组），策略组类型建议:FallBack，游戏节点必须支持UDP
2、在此页面的游戏规则列表下载您要使用的游戏规则
3、在此页面上方设置您已下载的游戏规则的对应策略组并保存设置
4、替换内核，下载地址：（https://github.com/vernesong/OpenClash/releases/tag/TUN）
5、在《全局设置》-《常规设置》-《运行模式》中选择游戏模式并启动") +m.description=translate("注意事项：
游戏代理为测试功能，不保证可用性。其中游戏模式使用的内核由comzyh修改 \ +
项目地址：https://github.com/comzyh/clash
使用步骤： \ +
1、在《服务器与策略组管理》页面创建您准备使用的游戏策略组和游戏节点（节点添加时必须选择要加入的策略组），策略组类型建议:FallBack，游戏节点必须支持UDP \ +
2、在此页面的游戏规则列表下载您要使用的游戏规则 \ +
3、在此页面上方设置您已下载的游戏规则的对应策略组并保存设置 \ +
4、替换内核一，下载地址：https://github.com/Dreamacro/clash/releases/tag/TUN \ +
或替换内核二，下载地址：https://github.com/vernesong/OpenClash/releases/tag/TUN \ +
5、在《全局设置》-《常规设置》-《运行模式》中选择TUN模式（内核一）或者游戏模式（内核二）并启动") function IsRuleFile(e) diff --git a/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/settings.lua b/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/settings.lua index 981dd42bf6..ba5b701c4a 100644 --- a/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/settings.lua +++ b/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/settings.lua @@ -48,6 +48,7 @@ o = s:taboption("settings", ListValue, "en_mode", font_red..bold_on..translate(" o.description = translate("Select Mode For OpenClash Work, Network Error Try Flush DNS Cache") o:value("redir-host", translate("redir-host")) o:value("fake-ip", translate("fake-ip")) +o:value("redir-host-tun", translate("redir-host(tun mode)")) o:value("fake-ip-tun", translate("fake-ip(tun mode)")) o:value("redir-host-vpn", translate("redir-host-vpn(game mode)")) o:value("fake-ip-vpn", translate("fake-ip-vpn(game mode)")) diff --git a/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/view/openclash/status.htm b/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/view/openclash/status.htm index 2b4106a367..32c736a8da 100644 --- a/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/view/openclash/status.htm +++ b/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/view/openclash/status.htm @@ -55,6 +55,10 @@ { mode.innerHTML = status.clash ? "<%: Redir-Host（兼容）模式 %>" : '<%:NOT RUNNING%>'; } + else if ( status.mode == "redir-host-tun\n" ) + { + mode.innerHTML = status.clash ? "<%: Redir-Host（TUN）模式 %>" : '<%:NOT RUNNING%>'; + } else if ( status.mode == "fake-ip-tun\n" ) { mode.innerHTML = status.clash ? "<%: Fake-IP（TUN）模式 %>" : '<%:NOT RUNNING%>'; @@ -86,6 +90,10 @@ { mode.innerHTML = status.clash ? "<%: Redir-Host（兼容）模式 %>" : '<%:NOT RUNNING%>'; } + else if ( status.mode == "redir-host-tun\n" ) + { + mode.innerHTML = status.clash ? "<%: Redir-Host（TUN）模式 %>" : '<%:NOT RUNNING%>'; + } else if ( status.mode == "fake-ip-tun\n" ) { mode.innerHTML = status.clash ? "<%: Fake-IP（TUN）模式 %>" : '<%:NOT RUNNING%>'; diff --git a/package/ctcgfw/luci-app-openclash/i18n/zh-cn/openclash.zh-cn.po b/package/ctcgfw/luci-app-openclash/i18n/zh-cn/openclash.zh-cn.po index b3c7fcebba..cd41999eba 100644 --- a/package/ctcgfw/luci-app-openclash/i18n/zh-cn/openclash.zh-cn.po +++ b/package/ctcgfw/luci-app-openclash/i18n/zh-cn/openclash.zh-cn.po @@ -95,6 +95,9 @@ msgstr "Redir-Host（兼容）模式" msgid "fake-ip" msgstr "Fake-IP（增强）模式" +msgid "redir-host(tun mode)" +msgstr "Redir-Host（TUN）模式【依赖kmod-tun】" + msgid "fake-ip(tun mode)" msgstr "Fake-IP（TUN）模式【依赖kmod-tun】"