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

replaced FOPEN_MAX with FD_SETSIZE

Browse source
This commit is contained in:
Gerhard Rieger 2008-02-01 22:26:01 +01:00
parent 989790c57f
commit 8fbff188e1
4 changed files with 53 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -12,6 +12,10 @@ corrections:
service name resolution failed due to byte order mistake service name resolution failed due to byte order mistake
(thanks to James Sainsbury for reporting this problem) (thanks to James Sainsbury for reporting this problem)
socat would hang when invoked with many file descriptors already opened
fix: replaced FOPEN_MAX with FD_SETSIZE
thanks to Daniel Lucq for reporting this problem.
corrected some print statements and variable names corrected some print statements and variable names
make uninstall did not uninstall procan make uninstall did not uninstall procan

2
VERSION
View file

@ -1 +1 @@
"1.6.0.0+execpty+servres" "1.6.0.0+execpty+servres+fd_setsize"

14
socat.c
View file

@ -1,5 +1,5 @@
/* source: socat.c */ /* source: socat.c */
/* Copyright Gerhard Rieger 2001-2007 */ /* Copyright Gerhard Rieger 2001-2008 */
/* Published under the GNU General Public License V.2, see file COPYING */ /* Published under the GNU General Public License V.2, see file COPYING */
/* this is the main source, including command line option parsing, general /* this is the main source, including command line option parsing, general
@ -658,17 +658,17 @@ int childleftdata(xiofile_t *xfd) {
/*0 FD_SET(XIO_GETRDFD(xfd), &expt);*/ /*0 FD_SET(XIO_GETRDFD(xfd), &expt);*/
} }
do { do {
retval = Select(FOPEN_MAX, &in, &out, &expt, &time0); retval = Select(FD_SETSIZE, &in, &out, &expt, &time0);
} while (retval < 0 && errno == EINTR); } while (retval < 0 && errno == EINTR);
if (retval < 0) { if (retval < 0) {
#if HAVE_FDS_BITS #if HAVE_FDS_BITS
Error5("select(%d, &0x%lx, &0x%lx, &0x%lx, {0}): %s", Error5("select(%d, &0x%lx, &0x%lx, &0x%lx, {0}): %s",
FOPEN_MAX, in.fds_bits[0], out.fds_bits[0], FD_SETSIZE, in.fds_bits[0], out.fds_bits[0],
expt.fds_bits[0], strerror(errno)); expt.fds_bits[0], strerror(errno));
#else #else
Error5("select(%d, &0x%lx, &0x%lx, &0x%lx, {0}): %s", Error5("select(%d, &0x%lx, &0x%lx, &0x%lx, {0}): %s",
FOPEN_MAX, in.__fds_bits[0], out.__fds_bits[0], FD_SETSIZE, in.__fds_bits[0], out.__fds_bits[0],
expt.__fds_bits[0], strerror(errno)); expt.__fds_bits[0], strerror(errno));
#endif #endif
return -1; return -1;
@ -835,7 +835,7 @@ int _socat(void) {
FD_SET(XIO_GETWRFD(sock1), &out); FD_SET(XIO_GETWRFD(sock1), &out);
} }
} }
retval = Select(FOPEN_MAX, &in, &out, &expt, to); retval = Select(FD_SETSIZE, &in, &out, &expt, to);
_errno = errno; _errno = errno;
if (retval < 0 && errno == EINTR) { if (retval < 0 && errno == EINTR) {
Info1("select(): %s", strerror(errno)); Info1("select(): %s", strerror(errno));
@ -851,12 +851,12 @@ int _socat(void) {
if (retval < 0) { if (retval < 0) {
#if HAVE_FDS_BITS #if HAVE_FDS_BITS
Error7("select(%d, &0x%lx, &0x%lx, &0x%lx, %s%lu): %s", Error7("select(%d, &0x%lx, &0x%lx, &0x%lx, %s%lu): %s",
FOPEN_MAX, in.fds_bits[0], out.fds_bits[0], FD_SETSIZE, in.fds_bits[0], out.fds_bits[0],
expt.fds_bits[0], to?"&":"NULL/", to?to->tv_sec:0, expt.fds_bits[0], to?"&":"NULL/", to?to->tv_sec:0,
strerror(errno)); strerror(errno));
#else #else
Error7("select(%d, &0x%lx, &0x%lx, &0x%lx, %s%lu): %s", Error7("select(%d, &0x%lx, &0x%lx, &0x%lx, %s%lu): %s",
FOPEN_MAX, in.__fds_bits[0], out.__fds_bits[0], FD_SETSIZE, in.__fds_bits[0], out.__fds_bits[0],
expt.__fds_bits[0], to?"&":"NULL/", to?to->tv_sec:0, expt.__fds_bits[0], to?"&":"NULL/", to?to->tv_sec:0,
strerror(errno)); strerror(errno));
#endif #endif

41
test.sh
View file

@ -7896,6 +7896,47 @@ esac
N=$((N+1)) N=$((N+1))
# test: up to socat 1.6.0.0, the highest file descriptor supported in socats
# transfer engine was FOPEN_MAX-1; this usually worked fine but would fail when
# socat was invoked with many file descriptors already opened. socat would
# just hang in the select() call. Thanks to Daniel Lucq for reporting this
# problem.
# FOPEN_MAX on different OS's:
# OS FOPEN_ ulimit ulimit FD_
# MAX -H -n -S -n SETSIZE
# Linux 2.6: 16 1024 1024 1024
# HP-UX 11.11: 60 2048 2048 2048
# FreeBSD: 20 11095 11095 1024
# Cygwin: 20 unlimit 256 64
# AIX: 32767 65534 65534
NAME=EXCEED_FOPEN_MAX
case "$TESTS" in
*%functions%*|*%maxfds%*|*%$NAME%*)
TEST="$NAME: more than FOPEN_MAX FDs in use"
# this test opens a number of FDs before socat is invoked. socat will have to
# allocate higher FD numbers and thus hang if it cannot handle them.
REDIR=
#set -vx
FOPEN_MAX=$($PROCAN -c 2>/dev/null |grep '^#define[ ][ ]*FOPEN_MAX' |awk '{print($3);}')
if [ -z "$FOPEN_MAX" ]; then
$PRINTF "test $F_n $TEST... ${YELLOW}could not determine FOPEN_MAX${NORMAL}\n" "$N"
numCANT=$((numCANT+1))
else
OPEN_FILES=$FOPEN_MAX # more than the highest FOPEN_MAX
i=3; while [ "$i" -lt "$OPEN_FILES" ]; do
REDIR="$REDIR $i>&2"
i=$((i+1))
done
#echo "$REDIR"
#testecho "$N" "$TEST" "" "pipe" "$opts -T 3" "" 1
#set -vx
eval testecho "\"$N\"" "\"$TEST\"" "\"\"" "pipe" "\"$opts -T 1\"" 1 $REDIR
#set +vx
fi # could determine FOPEN_MAX
esac
N=$((N+1))
echo "summary: $((N-1)) tests; $numOK ok, $numFAIL failed, $numCANT could not be performed" echo "summary: $((N-1)) tests; $numOK ok, $numFAIL failed, $numCANT could not be performed"
if [ "$numFAIL" -gt 0 ]; then if [ "$numFAIL" -gt 0 ]; then