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

version 1.7.3.2

Browse source
This commit is contained in:
Gerhard Rieger 2017-01-23 12:53:12 +01:00
parent 682a12e00e
commit cef0e039a8
4 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGES
View file

@ -1,4 +1,6 @@
####################### V 1.7.3.2:
corrections:
SIGSEGV and other signals could lead to a 100% CPU loop

2
VERSION
View file

@ -1 +1 @@
"1.7.3.1"
"1.7.3.2"

2
socat.spec
View file

@ -1,6 +1,6 @@
%define majorver 1.7
%define minorver 3.1
%define minorver 3.2
Summary: socat - multipurpose relay
Name: socat

20
test.sh
View file

@ -31,6 +31,7 @@ done
opt_t="-t $val_t"
UNAME=`uname`
#MICROS=100000
case "X$val_t" in
@ -69,7 +70,11 @@ TESTS="$@"; export TESTS
if type ip >/dev/null 2>&1; then
INTERFACE=$(ip r get 8.8.8.8 |grep ' dev ' |head -n 1 |sed "s/.*dev[[:space:]][[:space:]]*\([^[:space:]][^[:space:]]*\).*/\1/")
else
INTERFACE=eth0
case "$UNAME" in
Linux) INTERFACE="$(netstat -rn |grep -e "^default" -e "^0\.0\.0\.0" |awk '{print($8);}')" ;;
FreeBSD) INTERFACE="$(netstat -rn |grep -e "^default" -e "^0\.0\.0\.0" |awk '{print($4);}')" ;;
*) INTERFACE="$(netstat -rn |grep -e "^default" -e "^0\.0\.0\.0" |awk '{print($4);}')" ;;
esac
fi
MCINTERFACE=lo # !!! Linux only
#LOCALHOST=192.168.58.1
@ -156,7 +161,6 @@ F_n="%3d" # format string for test numbers
LC_ALL=C # for timestamps format...
LANG=C
LANGUAGE=C # knoppix
UNAME=`uname`
case "$UNAME" in
HP-UX|OSF1)
echo "$SOCAT -u stdin stdout" >cat.sh
@ -1695,7 +1699,7 @@ testoptions () {
local a A;
for a in $@; do
A=$(echo "$a" |tr 'a-z' 'A-Z')
if $TRACE $SOCAT -??? |grep "[^a-z0-9-]$a[^a-z0-9-]" >/dev/null; then
if $SOCAT -??? |grep "[^a-z0-9-]$a[^a-z0-9-]" >/dev/null; then
shift
continue
fi
@ -1733,7 +1737,7 @@ childprocess () {
childpids () {
case "$UNAME" in
AIX) l="$(ps -fade |grep "^........ ...... $(printf %6u $1)" |awk '{print($2);}')" ;;
FreeBSD) l="$(ps -faje |grep "^........ ..... $(printf %5u $1)" |awk '{print($2);}')" ;;
FreeBSD) l="$(ps -fl |grep "^[^ ][^ ]*[ ][ ]*[0-9][0-9]*[ ][ ]*$(printf %5u $1)" |awk '{print($2);}')" ;;
HP-UX) l="$(ps -fade |grep "^........ ..... $(printf %5u $1)" |awk '{print($2);}')" ;;
Linux) l="$(ps -fade |grep "^........ ..... $(printf %5u $1)" |awk '{print($2);}')" ;;
# NetBSD) l="$(ps -aj |grep "^........ ..... $(printf %4u $1)" |awk '{print($2);}')" ;;
@ -1742,7 +1746,7 @@ childpids () {
SunOS) l="$(ps -fade |grep "^........ ..... $(printf %5u $1)" |awk '{print($2);}')" ;;
DragonFly)l="$(ps -faje |grep "^[^ ][^ ]*[ ][ ]*..... $(printf %5u $1)" |awk '{print($2);}')" ;;
CYGWIN*) l="$(ps -pafe |grep "^[^ ]*[ ][ ]*[^ ][^ ]*[ ][ ]*$1[ ]" |awk '{print($2)';})" ;;
*) l="$(ps -fade |grep "^[^ ][^ ]*[ ][ ]*[0-9][0-9]**[ ][ ]*$(printf %5u $1) " |awk '{print($2)';})" ;; esac
*) l="$(ps -fade |grep "^[^ ][^ ]*[ ][ ]*[0-9][0-9]*[ ][ ]*$(printf %5u $1) " |awk '{print($2)';})" ;; esac
if [ -z "$l" ]; then
return 1;
fi
@ -11314,9 +11318,9 @@ esac
N=$((N+1))
done <<<"
TCP4 TCP 127.0.0.1 PORT
TCP6 TCP 127.0.0.1 PORT
TCP6 TCP [::1] PORT
SCTP4 TCP 127.0.0.1 PORT
SCTP6 TCP 127.0.0.1 PORT
SCTP6 TCP [::1] PORT
UNIX UNIX $td/test\$N.server -
"
# debugging this hanging test was difficult - following lessons learned:
@ -11390,7 +11394,7 @@ esac
N=$((N+1))
done <<<"
UDP4 UDP 127.0.0.1 PORT shut-null
UDP6 UDP 127.0.0.1 PORT shut-null
UDP6 UDP [::1] PORT shut-null
"
# debugging this hanging test was difficult - following lessons learned:
# kill <parent> had no effect when child process existed