diff --git a/CHANGES b/CHANGES index 3e3f930..bed9302 100644 --- a/CHANGES +++ b/CHANGES @@ -46,6 +46,10 @@ Testing: OpenIndiana/SunOS netstat format; many more functional and cosmetic code corrections. +Documentation: + The socktype option was documented unspecifically as type option. + Thanks to Jonas Metzger for the hint. + ####################### V 1.7.4.2: Corrections: diff --git a/doc/socat.yo b/doc/socat.yo index 595031a..37d83bd 100644 --- a/doc/socat.yo +++ b/doc/socat.yo @@ -1982,12 +1982,12 @@ label(OPTION_PROTOCOL_FAMILY)dit(bf(tt(pf=))) used as first argument to the code(socket()) or code(socketpair()) calls. This option affects address resolution and the required syntax of bind and range options. -label(OPTION_SO_TYPE)dit(bf(tt(type=))) +label(OPTION_SO_TYPE)dit(bf(tt(socktype=))) Sets the type of the socket, specified as second argument to the code(socket()) or code(socketpair()) calls, to [link(int)(TYPE_INT)]. Address resolution is not affected by this option. - Under Linux, 1 means stream oriented socket, 2 means datagram socket, and 3 - means raw socket. + Under Linux, 1 means stream oriented socket, 2 means datagram socket, 3 + means raw socket, and 5 seqpacket (stream keeping packet boundaries). label(OPTION_SO_PROTOCOL)dit(bf(tt(protocol))) Sets the protocol of the socket, specified as third argument to the code(socket()) or code(socketpair()) calls, to diff --git a/test.sh b/test.sh index 7e23188..93d3445 100755 --- a/test.sh +++ b/test.sh @@ -422,7 +422,7 @@ else SECONDIP6ADDR="[$SECONDIP6ADDR]" fi -TRUE=$(type true) +TRUE=$(which true) #E=-e # Linux if [ $(echo "x\c") = "x" ]; then E="" elif [ $(echo -e "x\c") = "x" ]; then E="-e" @@ -4046,6 +4046,7 @@ TEST="$NAME: exec against address with ignoreeof" if ! eval $NUMCOND; then :; else tf="$td/test$N.stdout" te="$td/test$N.stderr" +# remark: diagnostics to null, no good style CMD="$TRACE $SOCAT $opts -lf /dev/null EXEC:$TRUE /dev/null,ignoreeof" printf "test $F_n $TEST... " $N $CMD >"$tf" 2>"$te"