bcollet/socat
1
0
Fork 0
mirror of https://repo.or.cz/socat.git synced 2024-12-22 15:32:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

test.sh: Always use ss when available

Browse source
This commit is contained in:
Gerhard Rieger 2024-06-29 09:06:11 +02:00
parent 2da070164d
commit f123013881
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
VERSION
View file

@ -1 +1 @@
"1.8.0.0" "1.8.0.0+"

10
test.sh
View file

@ -146,7 +146,7 @@ if type ip >/dev/null 2>&1; then
fi fi
if type ss >/dev/null 2>&1; then if type ss >/dev/null 2>&1; then
# on Ubuntu-10 ss has differing output format # On Ubuntu-10 ss has differing output format (no "LISTEN"), use netstat then
if ss -V |grep -q "^ss utility, iproute2-[2-6]"; then if ss -V |grep -q "^ss utility, iproute2-[2-6]"; then
SS=$(type -p ss) SS=$(type -p ss)
else else
@ -17559,12 +17559,12 @@ if grep -q " W waitpid..: child .* exited with status 130" "${te}0"; then
if [ "$DEBUG" ]; then cat "${te}0" >&2; fi if [ "$DEBUG" ]; then cat "${te}0" >&2; fi
numOK=$((numOK+1)) numOK=$((numOK+1))
else else
$PRINTF "$FAILED\n" $PRINTF "${YELLOW}FAILED (shell does not propagate SIGINT?${NORMAL}\n"
echo "$CMD0 &" echo "$CMD0 &"
cat "${te}0" >&2 cat "${te}0" >&2
numFAIL=$((numFAIL+1)) numCANT=$((numCANT+1))
listFAIL="$listFAIL $N" listCANT="$listCANT $N"
namesFAIL="$namesFAIL $NAME" namesCANT="$namesCANT $NAME"
fi fi
fi # NUMCOND fi # NUMCOND
;; ;;