mirror of
https://github.com/kenzok8/openwrt-packages.git
synced 2025-01-08 11:37:36 +08:00
update 2023-03-13 14:21:23
This commit is contained in:
github-actions[bot]
parent
b6ed1afedd
commit
d998b0e8ea
@ -7,7 +7,7 @@
|
||||
<br />
|
||||
2、 最佳配置：在1的基础上，再在 访问控制 + 增加需要过滤的客户端 + 过滤HTTP(S)协议 + 对应客服端安装证书。
|
||||
<br />
|
||||
3、 使用步骤：A、更新规则，B、恢复证书，C、设置要过滤的https客户端ip，D、清除浏览器或APP数据。
|
||||
3、 使用步骤：A、更新规则，B、恢复证书，C、设置要过滤的https客户端ip，D、清除浏览器或APP数据或断网重连。
|
||||
<br />
|
||||
4、 Adblock Plus的Host列表 + KoolProxy黑名单模式运行更流畅上网体验。
|
||||
<br />
|
||||
@ -15,7 +15,7 @@
|
||||
<br />
|
||||
6、 在路由器下的设备，在浏览器中输入<u><font color='#FF0000'>110.110.110.110</font></u>来下载证书，导入证书目录请选择“受信任的根证书颁发机构”。
|
||||
<br />
|
||||
7、 安装完证书后，请清除浏览器的缓存、视频APP的全部数据。如果访问网页弹出不安全提示，请检查证书是否安装正确。
|
||||
7、 安装完证书后，请在客户端机器上<u><font color='#FF0000'>清除浏览器的缓存、视频APP的全部数据、断开网络重新联网</font></u>。如果访问网页弹出不安全提示，请检查证书是否安装正确。
|
||||
<br />
|
||||
8、 如果想在多台路由器上使用一个证书，请先备份证书，然后再在另一个路由器上恢复证书即可。
|
||||
<br />
|
||||
|
||||
@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=luci-app-passwall
|
||||
PKG_VERSION:=4.60
|
||||
PKG_RELEASE:=3
|
||||
PKG_RELEASE:=4
|
||||
|
||||
PKG_CONFIG_DEPENDS:= \
|
||||
CONFIG_PACKAGE_$(PKG_NAME)_Iptables_Transparent_Proxy \
|
||||
|
||||
@ -33,14 +33,6 @@ local function get_domain_excluded()
|
||||
end
|
||||
|
||||
function gen_outbound(flag, node, tag, proxy_table)
|
||||
local proxy = 0
|
||||
local proxy_tag = "nil"
|
||||
local dialerProxy = nil
|
||||
if proxy_table ~= nil and type(proxy_table) == "table" then
|
||||
proxy = proxy_table.proxy or 0
|
||||
proxy_tag = proxy_table.tag or "nil"
|
||||
dialerProxy = proxy_table.dialerProxy
|
||||
end
|
||||
local result = nil
|
||||
if node and node ~= "nil" then
|
||||
local node_id = node[".name"]
|
||||
@ -48,20 +40,32 @@ function gen_outbound(flag, node, tag, proxy_table)
|
||||
tag = node_id
|
||||
end
|
||||
|
||||
local proxy = 0
|
||||
local proxy_tag = "nil"
|
||||
local dialerProxy = nil
|
||||
if proxy_table ~= nil and type(proxy_table) == "table" then
|
||||
proxy = proxy_table.proxy or 0
|
||||
proxy_tag = proxy_table.tag or "nil"
|
||||
dialerProxy = proxy_table.dialerProxy
|
||||
end
|
||||
|
||||
if node.type == "V2ray" or node.type == "Xray" then
|
||||
proxy = 0
|
||||
if proxy_tag ~= "nil" then
|
||||
if dialerProxy and dialerProxy == "1" then
|
||||
node.streamSettings = {
|
||||
sockopt = {
|
||||
dialerProxy = proxy_tag
|
||||
if node.type == "Xray" and node.tlsflow == "xtls-rprx-vision" then
|
||||
else
|
||||
proxy = 0
|
||||
if proxy_tag ~= "nil" then
|
||||
if dialerProxy and dialerProxy == "1" then
|
||||
node.streamSettings = {
|
||||
sockopt = {
|
||||
dialerProxy = proxy_tag
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
node.proxySettings = {
|
||||
tag = proxy_tag,
|
||||
transportLayer = true
|
||||
}
|
||||
else
|
||||
node.proxySettings = {
|
||||
tag = proxy_tag,
|
||||
transportLayer = true
|
||||
}
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -96,7 +100,9 @@ function gen_outbound(flag, node, tag, proxy_table)
|
||||
node.port = new_port
|
||||
end
|
||||
node.stream_security = "none"
|
||||
else
|
||||
end
|
||||
|
||||
if node.type == "V2ray" or node.type == "Xray" then
|
||||
if node.tls and node.tls == "1" then
|
||||
node.stream_security = "tls"
|
||||
if node.type == "Xray" and node.reality and node.reality == "1" then
|
||||
@ -611,7 +617,14 @@ function gen_config(var)
|
||||
table.insert(outbounds, main_node_outbound)
|
||||
proxy = 1
|
||||
proxy_tag = "main"
|
||||
local pre_proxy = nil
|
||||
if default_node.type ~= "V2ray" and default_node.type ~= "Xray" then
|
||||
pre_proxy = true
|
||||
end
|
||||
if default_node.type == "Xray" and default_node.tlsflow == "xtls-rprx-vision" then
|
||||
pre_proxy = true
|
||||
end
|
||||
if pre_proxy then
|
||||
proxy_tag = nil
|
||||
new_port = get_new_port()
|
||||
table.insert(inbounds, {
|
||||
@ -672,7 +685,14 @@ function gen_config(var)
|
||||
table.insert(outbounds, new_outbound)
|
||||
outboundTag = name
|
||||
else
|
||||
local pre_proxy = nil
|
||||
if _node.type ~= "V2ray" and _node.type ~= "Xray" then
|
||||
pre_proxy = true
|
||||
end
|
||||
if _node.type == "Xray" and _node.tlsflow == "xtls-rprx-vision" then
|
||||
pre_proxy = true
|
||||
end
|
||||
if pre_proxy then
|
||||
if proxy_tag ~= "nil" then
|
||||
new_port = get_new_port()
|
||||
table.insert(inbounds, {
|
||||
|
||||
@ -35,7 +35,7 @@ unlock() {
|
||||
boot() {
|
||||
local delay=$(uci -q get ${CONFIG}.@global_delay[0].start_delay || echo 1)
|
||||
if [ "$delay" -gt 0 ]; then
|
||||
echolog "执行启动延时 $delay 秒后再启动!"
|
||||
$APP_FILE echolog "执行启动延时 $delay 秒后再启动!"
|
||||
sleep $delay
|
||||
fi
|
||||
restart
|
||||
|
||||
@ -282,7 +282,7 @@ function import_ssr_url(btn, urlname, sid) {
|
||||
if (ssm.tls == "tls") {
|
||||
document.getElementsByName('cbid.shadowsocksr.' + sid + '.tls')[0].checked = true;
|
||||
document.getElementsByName('cbid.shadowsocksr.' + sid + '.tls')[0].dispatchEvent(event);
|
||||
document.getElementsByName('cbid.shadowsocksr.' + sid + '.tls_host')[0].value = ssm.host;
|
||||
document.getElementsByName('cbid.shadowsocksr.' + sid + '.tls_host')[0].value = ssm.sni || ssm.host;
|
||||
}
|
||||
document.getElementsByName('cbid.shadowsocksr.' + sid + '.mux')[0].checked = true;
|
||||
document.getElementsByName('cbid.shadowsocksr.' + sid + '.mux')[0].dispatchEvent(event);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user