v1.6.0pre3

~修复旁路由模式代理端口失效的问题
This commit is contained in:
juewuy
2022-05-14 11:57:49 +08:00
parent 96578960b0
commit 96138f75c6
4 changed files with 6 additions and 4 deletions

Binary file not shown.

View File

@@ -3,4 +3,4 @@ clashpre_v=2021.09.15
clash_v=v1.7.1
meta_v=alpha-eca7615
GeoIP_v=20220510
versionsh=1.6.0pre2
versionsh=1.6.0pre3

View File

@@ -231,7 +231,7 @@ setport(){
setport
elif [ "$num" = 8 ]; then
echo -----------------------------------------------
echo -e "\033[33m此处可以更改脚本内置的host地址\033[0m"
echo -e "\033[33m此处可以更改脚本内置的局域网设备IP地址\033[0m"
echo -e "\033[31m设置后如本机host地址有变动请务必手动修改\033[0m"
echo -----------------------------------------------
read -p "请输入自定义host地址(输入0移除自定义host) > " host

View File

@@ -128,8 +128,10 @@ autoSSH(){
[ -f $clashdir/dropbear_rsa_host_key ] && ln -sf $clashdir/dropbear_rsa_host_key /etc/dropbear/dropbear_rsa_host_key
}
host_lan(){
host_lan=$(ip a 2>&1 | grep -w 'inet' | grep 'global br-lan' | grep -oE '[1-9]\d{0,2}\.[1-9]\d{0,2}\.[1-9]\d{0,2}\.[1-9]\d{0,2}/[1-9]\d{0,1}' | head -n 1)
[ -n "$host_lan" ] && host_lan="-s ${host_lan}"
[ -n "$host" ] && host="$host/16"
[ -z "$host" ] && host=$(ip a 2>&1 | grep -w 'inet' | grep 'global br-lan' | grep -oE '[1-9]\d{0,2}\.[1-9]\d{0,2}\.[1-9]\d{0,2}\.[1-9]\d{0,2}/[1-9]\d{0,1}' | head -n 1)
[ -z "$host" ] && host=$(ip a 2>&1 | grep -w 'inet' | grep 'global' | grep -oE '[1-9]\d{0,2}\.[1-9]\d{0,2}\.[1-9]\d{0,2}\.[1-9]\d{0,2}/[1-9]\d{0,1}' | head -n 1)
[ -n "$host" ] && host_lan="-s ${host}"
}
#配置文件相关
getyaml(){