xm/MIXBOX-ARCHIVE
1
0
Fork 0
mirror of https://github.com/monlor/MIXBOX-ARCHIVE.git synced 2026-03-14 09:21:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed status error of v2ray, remain domain while using ws mode of v2ray

Browse Source
This commit is contained in:
leafnsand
2019-02-21 12:03:02 +08:00
parent 6f3c34ae9e
commit 7f3b70dbad
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
apps/shadowsocks/scripts/general_v2ray_config.sh
View File

@@ -28,10 +28,12 @@ local ws="null"
local h2="null" local h2="null"
local tls="null" local tls="null"
IFIP=`echo $ss_server | grep -E "([0-9]{1,3}[\.]){3}[0-9]{1,3}|:"` if [ "$ss_network" != "ws" ]; then
if [ -z "$IFIP" ]; then IFIP=`echo $ss_server | grep -E "([0-9]{1,3}[\.]){3}[0-9]{1,3}|:"`
ss_server_tmp=`nslookup $ss_server | sed 1,2d | grep -Eo "([0-9]{1,3}[\.]){3}[0-9]{1,3}" | head -1` if [ -z "$IFIP" ]; then
[ -z "$ss_server_tmp" ] && logsh "【$service】" "v2ray服务器地址解析失败，跳过解析！" || ss_server="$ss_server_tmp" ss_server_tmp=`nslookup $ss_server | sed 1,2d | grep -Eo "([0-9]{1,3}[\.]){3}[0-9]{1,3}" | head -1`
[ -z "$ss_server_tmp" ] && logsh "【$service】" "v2ray服务器地址解析失败，跳过解析！" || ss_server="$ss_server_tmp"
fi
fi fi
get_ws_header() { get_ws_header() {

8
apps/shadowsocks/scripts/shadowsocks.sh
View File

@@ -701,7 +701,13 @@ status() {
#if [ "$result" == '0' ] || [ "$http_status" != "200" ]; then #if [ "$result" == '0' ] || [ "$http_status" != "200" ]; then
result2=$(iptables -t nat -S | grep SHADOWSOCK) result2=$(iptables -t nat -S | grep SHADOWSOCK)
[ "$ssgena" == '1' ] && ssgflag=", 游戏节点: $ssgid($ssg_mode)" [ "$ssgena" == '1' ] && ssgflag=", 游戏节点: $ssgid($ssg_mode)"
if [ "$result1" -ge 3 ]; then
process_count=3
if [ "$proxy_type" == "v2ray" ]; then
process_count=2
fi
if [ "$result1" -ge $process_count ]; then
if [ -n "$result2" ]; then if [ -n "$result2" ]; then
status="运行节点: $id($ss_mode)$ssgflag|1" status="运行节点: $id($ss_mode)$ssgflag|1"
else else