Alawn/shadowsocks-libev
1
0
Fork 0
mirror of https://github.com/shadowsocks/shadowsocks-libev.git synced 2026-10-24 17:33:46 +00:00
Code Releases Activity

Merge pull request #2304 from isjerryxiao/master

Browse Source 
Fix a bug introduced in #2230, and some improvements
This commit is contained in:
Max Lv
2019-03-03 07:28:43 +08:00
committed by GitHub
parent 144138788b 1d5f250032
commit 2ee1235cc3
1 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ss-nat
+12 -18
View File
@@ -171,29 +171,23 @@ EOF
while getopts ":s:l:S:L:i:I:e:a:b:w:ouUfh" arg; do
case "$arg" in
s)
command -v dig > /dev/null &&
server=$(dig +short $OPTARG) ||
if ! [[ $OPTARG =~ $IP_REGEX ]]
then
loger 3 "Hostname detected for server but no dig present to resolve!"
exit 1
else
server=$OPTARG
fi
if [[ $OPTARG =~ $IP_REGEX ]]
then
server=$OPTARG
else
server=$(ping -4 -q -c 1 -s 0 -W 1 -w 1 $OPTARG| head -n 1 | sed -n 's/[^(]*(\([^)]*\)).*/\1/p')
fi
;;
l)
local_port=$OPTARG
;;
S)
command -v dig > /dev/null &&
SERVER=$(dig +short $OPTARG) ||
if ! [[ $OPTARG =~ $IP_REGEX ]]
then
loger 3 "Hostname detected for UDP server but no dig present to resolve!"
exit 1
else
SERVER=$OPTARG
fi
if [[ $OPTARG =~ $IP_REGEX ]]
then
SERVER=$OPTARG
else
SERVER=$(ping -4 -q -c 1 -s 0 -W 1 -w 1 $OPTARG| head -n 1 | sed -n 's/[^(]*(\([^)]*\)).*/\1/p')
fi
;;
L)
LOCAL_PORT=$OPTARG