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 bugs with struct ip_mreq

Browse source
This commit is contained in:
Gerhard Rieger 2008-02-03 20:56:52 +01:00
parent 2e7314d523
commit 35497aa4f9
4 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES
View file

@ -29,6 +29,9 @@ corrections:
corrected option handling with STDIO; usecase: cool-write corrected option handling with STDIO; usecase: cool-write
fixed small bugs on systems with struct ip_mreq without struct ip_mreqn
(thanks to Roland Illig for sending a patch)
corrected name of option intervall to interval (old form still valid corrected name of option intervall to interval (old form still valid
for us German speaking guys) for us German speaking guys)

2
VERSION
View file

@ -1 +1 @@
"1.6.0.0+execpty+servres+fd_setsize+udp_sigchld+stdio_opts+interval" "1.6.0.0+execpty+servres+fd_setsize+udp_sigchld+stdio_opts+interval+mreq_help"

4
xiohelp.c
View file

@ -1,5 +1,5 @@
/* source: xiohelp.c */ /* source: xiohelp.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 file contains the source for the help function */ /* this file contains the source for the help function */
@ -25,7 +25,7 @@ static const char *optiontypenames[] = {
"OFF_T", "OFF64_T", "OFF_T", "OFF64_T",
#if HAVE_STRUCT_IP_MREQN #if HAVE_STRUCT_IP_MREQN
"STRUCT-IP_MREQN", "STRUCT-IP_MREQN",
#elif HAVE_STRUCT_IP_MREQN #elif HAVE_STRUCT_IP_MREQ
"STRUCT-IP_MREQ", "STRUCT-IP_MREQ",
#endif #endif
"IP4NAME", "IP4NAME",

4
xioopts.h
View file

@ -1,5 +1,5 @@
/* source: xioopts.h */ /* source: xioopts.h */
/* 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 */
#ifndef __xioopts_h_included #ifndef __xioopts_h_included
@ -49,7 +49,9 @@ enum e_types {
TYPE_LONGLONG, /* long long */ TYPE_LONGLONG, /* long long */
TYPE_OFF32, /* off_t */ TYPE_OFF32, /* off_t */
TYPE_OFF64, /* off64_t */ TYPE_OFF64, /* off64_t */
#if HAVE_STRUCT_IP_MREQ || HAVE_STRUCT_IP_MREQN
TYPE_IP_MREQN, /* for struct ip_mreq or struct ip_mreqn */ TYPE_IP_MREQN, /* for struct ip_mreq or struct ip_mreqn */
#endif
TYPE_IP4NAME, /* IPv4 hostname or address */ TYPE_IP4NAME, /* IPv4 hostname or address */
TYPE_2BYTE = TYPE_USHORT TYPE_2BYTE = TYPE_USHORT