Nanako/DHDAXCW-Rockchip-OpenWrt
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

luci-app-ssr-plus: use icmp ping first, fallback to tcpping

Browse Source
This commit is contained in:
lean 2020-03-24 00:07:49 +08:00
parent 8ac78f3f51
commit 19abf7c09e
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/lean/luci-app-ssr-plus/Makefile
View File

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-ssr-plus PKG_NAME:=luci-app-ssr-plus
PKG_VERSION:=173 PKG_VERSION:=173
PKG_RELEASE:=5 PKG_RELEASE:=6
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)

4
package/lean/luci-app-ssr-plus/luasrc/controller/shadowsocksr.lua
View File

@ -47,9 +47,9 @@ function act_ping()
socket:setopt("socket", "sndtimeo", 3) socket:setopt("socket", "sndtimeo", 3)
e.socket = socket:connect(domain, port) e.socket = socket:connect(domain, port)
socket:close() socket:close()
e.ping = luci.sys.exec(string.format("echo -n $(tcpping -c 1 -i 1 -p %s %s 2>&1 | grep -o 'ttl=[0-9]* time=[0-9]*.[0-9]' | awk -F '=' '{print$3}') 2>/dev/null",port, domain)) e.ping = luci.sys.exec("ping -c 1 -W 1 %q 2>&1 | grep -o 'time=[0-9]*.[0-9]' | awk -F '=' '{print$2}'" % domain)
if (e.ping == "") then if (e.ping == "") then
e.ping = luci.sys.exec("ping -c 1 -W 1 %q 2>&1 | grep -o 'time=[0-9]*.[0-9]' | awk -F '=' '{print$2}'" % domain) e.ping = luci.sys.exec(string.format("echo -n $(tcpping -c 1 -i 1 -p %s %s 2>&1 | grep -o 'ttl=[0-9]* time=[0-9]*.[0-9]' | awk -F '=' '{print$3}') 2>/dev/null",port, domain))
end end
if (iret == 0) then if (iret == 0) then
luci.sys.call(" ipset del ss_spec_wan_ac " .. domain) luci.sys.call(" ipset del ss_spec_wan_ac " .. domain)

2
package/lean/luci-app-ssr-plus/luasrc/view/shadowsocksr/server_list.htm
View File

@ -45,7 +45,7 @@ local dsp = require "luci.dispatcher"
xhr(task).then(thread); xhr(task).then(thread);
} }
} }
for (let i = 0; i < 10; i++) { for (let i = 0; i < 20; i++) {
thread() thread()
} }