zhao/openwrt_helloworld
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

luci: fix Hysteria2/TUIC with sing-box

Browse Source
This commit is contained in:
xiaorouji 2023-09-07 16:37:12 +08:00 committed by sbwml
parent ebc24aaac9
commit c8e3598502
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
luci-app-passwall/Makefile
View File

@ -6,7 +6,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-passwall PKG_NAME:=luci-app-passwall
PKG_VERSION:=4.70-1 PKG_VERSION:=4.70-2
PKG_RELEASE:= PKG_RELEASE:=
PKG_CONFIG_DEPENDS:= \ PKG_CONFIG_DEPENDS:= \

24
luci-app-passwall/luasrc/passwall/util_sing-box.lua
View File

@ -302,7 +302,11 @@ function gen_outbound(flag, node, tag, proxy_table)
udp_over_stream = false, udp_over_stream = false,
zero_rtt_handshake = (node.tuic_zero_rtt_handshake == "1") and true or false, zero_rtt_handshake = (node.tuic_zero_rtt_handshake == "1") and true or false,
heartbeat = tonumber(node.tuic_heartbeat), heartbeat = tonumber(node.tuic_heartbeat),
tls = tls, tls = {
enabled = true,
server_name = node.tls_serverName,
insecure = (node.tls_allowInsecure == "1") and true or false,
},
} }
end end
@ -315,7 +319,11 @@ function gen_outbound(flag, node, tag, proxy_table)
password = node.hysteria2_obfs_password password = node.hysteria2_obfs_password
}, },
password = node.hysteria2_auth_password or nil, password = node.hysteria2_auth_password or nil,
tls = tls, tls = {
enabled = true,
server_name = node.tls_serverName,
insecure = (node.tls_allowInsecure == "1") and true or false,
},
} }
end end
@ -536,7 +544,11 @@ function gen_config_server(node)
congestion_control = node.tuic_congestion_control or "cubic", congestion_control = node.tuic_congestion_control or "cubic",
zero_rtt_handshake = (node.tuic_zero_rtt_handshake == "1") and true or false, zero_rtt_handshake = (node.tuic_zero_rtt_handshake == "1") and true or false,
heartbeat = node.tuic_heartbeat .. "s", heartbeat = node.tuic_heartbeat .. "s",
tls = tls, tls = {
enabled = true,
certificate_path = node.tls_certificateFile,
key_path = node.tls_keyFile,
},
} }
end end
@ -555,7 +567,11 @@ function gen_config_server(node)
} }
}, },
ignore_client_bandwidth = (node.hysteria2_ignore_client_bandwidth == "1") and true or false, ignore_client_bandwidth = (node.hysteria2_ignore_client_bandwidth == "1") and true or false,
tls = tls, tls = {
enabled = true,
certificate_path = node.tls_certificateFile,
key_path = node.tls_keyFile,
},
} }
end end