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

Fixed use of old rfd1 component

Browse source
This commit is contained in:
Gerhard Rieger 2013-06-21 17:17:57 +02:00
parent 2f00bfbdb7
commit 63bf093949
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGES
View file

@ -228,7 +228,10 @@ corrections:
mixed directions mixed directions
socat_open sprintf overflow socat_open sprintf overflow
fixed bidirectional UDP-LISTEN error Fixed bidirectional UDP-LISTEN error
Compilation failed under some non-Linux operating systems due to use
of old rfd1 component
porting: porting:
Red Hat issue 1020203: configure checks fail with some compilers. Red Hat issue 1020203: configure checks fail with some compilers.

4
xio-socks5.c
View file

@ -146,7 +146,7 @@ static int xioopen_socks5_client(int argc, const char *argv[],
#endif #endif
#if 0 #if 0
if (xfd->fd1 < 0) { if (xfd->rfd < 0) {
/* this cannot fork because we retrieved fork option above */ /* this cannot fork because we retrieved fork option above */
result = result =
_xioopen_connect (xfd, _xioopen_connect (xfd,
@ -166,7 +166,7 @@ static int xioopen_socks5_client(int argc, const char *argv[],
default: default:
return result; return result;
} }
xfd->fd1 = xfd->wfd = xfd->fd; xfd->rfd = xfd->wfd = xfd->fd;
} else } else
#endif #endif
xfd->dtype = XIODATA_STREAM; xfd->dtype = XIODATA_STREAM;

4
xioopts.c
View file

@ -4124,10 +4124,10 @@ mc:addr
opt->desc = ODESC_ERROR; continue; opt->desc = ODESC_ERROR; continue;
} }
#else #else
if (Setsockopt(xfd->fd1, opt->desc->major, opt->desc->minor, if (Setsockopt(xfd->rfd, opt->desc->major, opt->desc->minor,
&ip4_mreqn.mreq, sizeof(ip4_mreqn.mreq)) < 0) { &ip4_mreqn.mreq, sizeof(ip4_mreqn.mreq)) < 0) {
Error7("setsockopt(%d, %d, %d, {0x%08x,0x%08x}, "F_Zu"): %s", Error7("setsockopt(%d, %d, %d, {0x%08x,0x%08x}, "F_Zu"): %s",
xfd->fd1, opt->desc->major, opt->desc->minor, xfd->rfd, opt->desc->major, opt->desc->minor,
ip4_mreqn.mreq.imr_multiaddr, ip4_mreqn.mreq.imr_multiaddr,
ip4_mreqn.mreq.imr_interface, ip4_mreqn.mreq.imr_interface,
sizeof(ip4_mreqn.mreq), sizeof(ip4_mreqn.mreq),