mirror of
https://repo.or.cz/socat.git
synced 2025-07-14 23:33:23 +00:00
Small fixes with tests, logs, comments, and doc
This commit is contained in:
parent
9269897bab
commit
436d764029
6 changed files with 36 additions and 31 deletions
29
test.sh
29
test.sh
|
@ -296,7 +296,7 @@ FOPEN_MAX=$($PROCAN -c 2>/dev/null |grep '^#define[ ][ ]*FOPEN_MAX' |awk '{print
|
|||
[ "$DEFS" ] && echo "FOPEN_MAX=\"$FOPEN_MAX\"" >&2
|
||||
PF_INET6="$($PROCAN -c |grep "^#define[[:space:]]*PF_INET6[[:space:]]" |cut -d' ' -f3)"
|
||||
[ "$DEFS" ] && echo "PF_INET6=\"$PF_INET6\"" >&2
|
||||
TIOCEXCL="$($PROCAN -c |grep "^#define[[:space:]]*TIOCEXCL[[:space:]]" |cut -d' ' -f3)"
|
||||
TIOCEXCL="$($PROCAN -c |grep "^#define[[:space:]]*TIOCEXCL[[:space:]]" |{ read _ _ v; echo "$v"; })"
|
||||
[ "$DEFS" ] && echo "TIOCEXCL=\"$TIOCEXCL\"" >&2
|
||||
SOL_SOCKET="$($PROCAN -c |grep "^#define[[:space:]]*SOL_SOCKET[[:space:]]" |cut -d' ' -f3)"
|
||||
[ "$DEFS" ] && echo "SOL_SOCKET=\"$SOL_SOCKET\"" >&2
|
||||
|
@ -715,7 +715,6 @@ numCANT=0
|
|||
listOK=
|
||||
listFAIL=
|
||||
listCANT=
|
||||
namesFAIL=
|
||||
|
||||
ok () {
|
||||
numOK=$((numOK+1))
|
||||
|
@ -762,7 +761,7 @@ testecho () {
|
|||
#echo "$da" |$cmd >"$tf" 2>"$te"
|
||||
{ sleep $T; echo "$da"; sleep $T; } | { $TRACE $SOCAT $opts "$arg1" "$arg2" >"$tf" 2>"$te"; echo $? >"$td/test$N.rc"; } &
|
||||
pid1=$!
|
||||
#sleep 5 && kill $rc1 2>/dev/null &
|
||||
#sleep 5 && kill $pid1 2>/dev/null &
|
||||
# rc2=$!
|
||||
wait $pid1
|
||||
# kill $rc2 2>/dev/null
|
||||
|
@ -17969,7 +17968,7 @@ N=$((N+1))
|
|||
NAME=UDPLITE4STREAM
|
||||
case "$TESTS" in
|
||||
*%$N%*|*%functions%*|*%ip4%*|*%ipapp%*|*%udplite%*|*%$NAME%*)
|
||||
TEST="$NAME: echo via connection to UDP-Lite V4 socket"
|
||||
TEST="$NAME: echo via connection to UDP-Lite IPv4 socket"
|
||||
if ! eval $NUMCOND; then :;
|
||||
elif ! cond=$(checkconds \
|
||||
"" \
|
||||
|
@ -18029,7 +18028,7 @@ N=$((N+1))
|
|||
NAME=UDPLITE4STREAM
|
||||
case "$TESTS" in
|
||||
*%$N%*|*%functions%*|*%ip4%*|*%ipapp%*|*%udplite%*|*%$NAME%*)
|
||||
TEST="$NAME: echo via connection to UDP-Lite V4 socket"
|
||||
TEST="$NAME: echo via connection to UDP-Lite IPv4 socket"
|
||||
if ! eval $NUMCOND; then :;
|
||||
elif ! cond=$(checkconds \
|
||||
"" \
|
||||
|
@ -18086,19 +18085,19 @@ esac
|
|||
N=$((N+1))
|
||||
|
||||
|
||||
NAME=UDPLITE4STREAM
|
||||
NAME=UDPLITE6STREAM
|
||||
case "$TESTS" in
|
||||
*%$N%*|*%functions%*|*%ip4%*|*%ipapp%*|*%udplite%*|*%$NAME%*)
|
||||
TEST="$NAME: echo via connection to UDP-Lite V4 socket"
|
||||
*%$N%*|*%functions%*|*%ip6%*|*%ipapp%*|*%udplite%*|*%$NAME%*)
|
||||
TEST="$NAME: echo via connection to UDP-Lite IPv6 socket"
|
||||
if ! eval $NUMCOND; then :;
|
||||
elif ! cond=$(checkconds \
|
||||
"" \
|
||||
"" \
|
||||
"" \
|
||||
"IP4 UDPLITE LISTEN STDIO PIPE" \
|
||||
"UDPLITE4-LISTEN PIPE STDIO UDPLITE4" \
|
||||
"IP6 UDPLITE LISTEN STDIO PIPE" \
|
||||
"UDPLITE6-LISTEN PIPE STDIO UDPLITE6" \
|
||||
"so-reuseaddr" \
|
||||
"udplite4" ); then
|
||||
"udplite6" ); then
|
||||
$PRINTF "test $F_n $TEST... ${YELLOW}$cond${NORMAL}\n" $N
|
||||
cant
|
||||
else
|
||||
|
@ -18106,14 +18105,14 @@ else
|
|||
te="$td/test$N.stderr"
|
||||
tdiff="$td/test$N.diff"
|
||||
tsl=$PORT
|
||||
ts="$LOCALHOST:$tsl"
|
||||
ts="$LOCALHOST6:$tsl"
|
||||
da="test$N $(date) $RANDOM"
|
||||
CMD1="$TRACE $SOCAT $opts UDPLITE4-LISTEN:$tsl,$REUSEADDR PIPE"
|
||||
CMD2="$TRACE $SOCAT $opts - UDPLITE4:$ts"
|
||||
CMD1="$TRACE $SOCAT $opts UDPLITE6-LISTEN:$tsl,$REUSEADDR PIPE"
|
||||
CMD2="$TRACE $SOCAT $opts - UDPLITE6:$ts"
|
||||
printf "test $F_n $TEST... " $N
|
||||
$CMD1 >"$tf" 2>"${te}1" &
|
||||
pid1=$!
|
||||
waitudplite4port $tsl 1
|
||||
waitudplite6port $tsl 1
|
||||
echo "$da" |$CMD2 >>"$tf" 2>>"${te}2"
|
||||
rc2=$?
|
||||
kill $pid1 2>/dev/null; wait
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue