Browse Source
Merge pull request #2304 from isjerryxiao/master
Fix a bug introduced in #2230, and some improvements
pull/2305/head
Max Lv
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
12 additions and
18 deletions
-
src/ss-nat
|
|
|
@ -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 |
|
|
|
|
