diff --git a/luci-app-passwall/Makefile b/luci-app-passwall/Makefile index a1c8bf038..9da22b065 100644 --- a/luci-app-passwall/Makefile +++ b/luci-app-passwall/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-passwall PKG_VERSION:=4.57 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_$(PKG_NAME)_Iptables_Transparent_Proxy \ diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/api/gen_v2ray.lua b/luci-app-passwall/luasrc/model/cbi/passwall/api/gen_v2ray.lua index 921a90dff..27e5e6e0a 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/api/gen_v2ray.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/api/gen_v2ray.lua @@ -156,7 +156,7 @@ function gen_outbound(node, tag, proxy_table) tlsSettings = (node.stream_security == "tls") and { serverName = node.tls_serverName, allowInsecure = (node.tls_allowInsecure == "1") and true or false, - fingerprint = (node.type == "Xray" and node.fingerprint and node.fingerprint ~= "disable") and node.fingerprint or nil + fingerprint = (node.type == "Xray" and node.fingerprint and node.fingerprint ~= "") and node.fingerprint or nil } or nil, tcpSettings = (node.transport == "tcp" and node.protocol ~= "socks") and { header = { diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/node_config.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/node_config.lua index c48f590ce..6b00b5017 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/node_config.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/node_config.lua @@ -564,7 +564,7 @@ tls_allowInsecure:depends("tls", true) tls_allowInsecure:depends("type", "Hysteria") xray_fingerprint = s:option(Value, "xray_fingerprint", translate("Finger Print")) -xray_fingerprint:value("disable", translate("Disable")) +xray_fingerprint:value("", translate("Disable")) xray_fingerprint:value("chrome") xray_fingerprint:value("firefox") xray_fingerprint:value("safari") @@ -575,7 +575,7 @@ xray_fingerprint:value("360") xray_fingerprint:value("qq") xray_fingerprint:value("random") xray_fingerprint:value("randomized") -xray_fingerprint.default = "disable" +xray_fingerprint.default = "" xray_fingerprint:depends({ type = "Xray", tls = true }) function xray_fingerprint.cfgvalue(self, section) return m:get(section, "fingerprint") @@ -583,6 +583,9 @@ end function xray_fingerprint.write(self, section, value) m:set(section, "fingerprint", value) end +function xray_fingerprint.remove(self, section) + m:del(section, "fingerprint") +end trojan_transport = s:option(ListValue, "trojan_transport", translate("Transport")) trojan_transport:value("original", translate("Original"))