diff --git a/luci-app-fchomo/htdocs/luci-static/resources/view/fchomo/global.js b/luci-app-fchomo/htdocs/luci-static/resources/view/fchomo/global.js index a6b1aabb2..029347e15 100644 --- a/luci-app-fchomo/htdocs/luci-static/resources/view/fchomo/global.js +++ b/luci-app-fchomo/htdocs/luci-static/resources/view/fchomo/global.js @@ -463,7 +463,7 @@ return view.extend({ o = s.taboption('inbound', form.SectionValue, '_inbound', form.NamedSection, 'inbound', 'fchomo', _('Tun settings')); ss = o.subsection; - so = ss.option(form.RichListValue, 'tun_stack', _('Stack'), + so = ss.option(form.RichListValue || form.ListValue, 'tun_stack', _('Stack'), _('Tun stack.')); so.value('system', _('System'), _('Less compatibility and sometimes better performance.')); if (features.with_gvisor) { @@ -472,6 +472,16 @@ return view.extend({ } so.default = 'system'; so.rmempty = false; + if (!form.RichListValue) + so.onchange = function(ev, section_id, value) { + var desc = ev.target.nextSibling; + if (value === 'mixed') + desc.innerHTML = _('Mixed system TCP stack and gVisor UDP stack.'); + else if (value === 'gvisor') + desc.innerHTML = _('Based on google/gvisor.'); + else if (value === 'system') + desc.innerHTML = _('Less compatibility and sometimes better performance.'); + } so = ss.option(form.Value, 'tun_mtu', _('MTU')); so.datatype = 'uinteger'; diff --git a/luci-app-fchomo/root/etc/uci-defaults/luci-app-fchomo b/luci-app-fchomo/root/etc/uci-defaults/luci-app-fchomo index c101cb5f9..3624bdbd1 100755 --- a/luci-app-fchomo/root/etc/uci-defaults/luci-app-fchomo +++ b/luci-app-fchomo/root/etc/uci-defaults/luci-app-fchomo @@ -4,7 +4,7 @@ for d in certs provider ruleset resources templates; do mkdir -p "/etc/fchomo/$d/" 2>/dev/null done -if ! uci -q get fchomo.global.authentication; then +if ! uci -q get fchomo.global.authentication >/dev/null; then uci add_list fchomo.global.authentication="fchomodef:$(cat /proc/sys/kernel/random/uuid)" uci commit fchomo fi diff --git a/v2ray-plugin/Makefile b/v2ray-plugin/Makefile index 702e5a011..4ce136ce8 100644 --- a/v2ray-plugin/Makefile +++ b/v2ray-plugin/Makefile @@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=v2ray-plugin -PKG_VERSION:=5.17.0 +PKG_VERSION:=5.25.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/teddysun/v2ray-plugin/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=035823fa70d0c7e6afa6cced6b9d6f8b29c05a5f28852ad5954e957b61337c9e +PKG_HASH:=64d2cc376c16ade97b8e2cce69e0c98d74f530dcf8a30cf7d22255969ca5c10d PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE