fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

luci-app-passwall : update to 3.5.4

Browse Source
This commit is contained in:
CN_SZTL 2020-02-12 21:44:59 +08:00
parent 8e9ec12f4d
commit 5b1e4015bf
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/lienol/luci-app-passwall/Makefile
View File

@ -6,8 +6,8 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-passwall
PKG_VERSION:=3.5.3
PKG_RELEASE:=20200211
PKG_VERSION:=3.5.4
PKG_RELEASE:=20200212
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

2
package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/api/gen_trojan_client_config_file.lua
View File

@ -20,7 +20,7 @@ local trojan = {
cert = node.trojan_cert_path,
cipher = "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES128-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA:AES128-SHA:AES256-SHA:DES-CBC3-SHA",
cipher_tls13 = "TLS_AES_128_GCM_SHA256:TLS_CHACHA20_POLY1305_SHA256:TLS_AES_256_GCM_SHA384",
sni = "",
sni = node.tls_serverName,
alpn = {"h2", "http/1.1"},
reuse_session = true,
session_ticket = false,

1
package/lienol/luci-app-passwall/luasrc/model/cbi/passwall/node_config.lua
View File

@ -248,6 +248,7 @@ v2ray_stream_security:depends("type", "V2ray_balancing")
-- [[ TLS部分 ]] --
tls_serverName = s:option(Value, "tls_serverName", translate("Domain"))
tls_serverName:depends("v2ray_stream_security", "tls")
tls_serverName:depends("trojan_verify_cert", "1")
tls_allowInsecure = s:option(Flag, "tls_allowInsecure",
translate("allowInsecure"), translate(

2
package/lienol/luci-app-passwall/root/usr/share/passwall/app.sh
View File

@ -817,12 +817,12 @@ add_dnsmasq() {
local china_dns2=$(echo $UP_CHINA_DNS | awk -F "," '{print $2}')
[ -n "$china_dns1" ] && server="server=$china_dns1"
[ -n "$china_dns2" ] && server="${server}\n${server_2}"
server="${server}\nno-resolv"
}
cat <<-EOF > /var/dnsmasq.d/dnsmasq-$CONFIG.conf
$(echo -e $server)
all-servers
no-poll
no-resolv
EOF
fi