mirror of
https://github.com/moparisthebest/socat
synced 2024-12-21 22:48:48 -05:00
fixed bugs with struct ip_mreq
This commit is contained in:
parent
2e7314d523
commit
35497aa4f9
3
CHANGES
3
CHANGES
@ -29,6 +29,9 @@ corrections:
|
||||
|
||||
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
|
||||
for us German speaking guys)
|
||||
|
||||
|
2
VERSION
2
VERSION
@ -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"
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* 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 */
|
||||
|
||||
/* this file contains the source for the help function */
|
||||
@ -25,7 +25,7 @@ static const char *optiontypenames[] = {
|
||||
"OFF_T", "OFF64_T",
|
||||
#if HAVE_STRUCT_IP_MREQN
|
||||
"STRUCT-IP_MREQN",
|
||||
#elif HAVE_STRUCT_IP_MREQN
|
||||
#elif HAVE_STRUCT_IP_MREQ
|
||||
"STRUCT-IP_MREQ",
|
||||
#endif
|
||||
"IP4NAME",
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* 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 */
|
||||
|
||||
#ifndef __xioopts_h_included
|
||||
@ -49,7 +49,9 @@ enum e_types {
|
||||
TYPE_LONGLONG, /* long long */
|
||||
TYPE_OFF32, /* off_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 */
|
||||
#endif
|
||||
TYPE_IP4NAME, /* IPv4 hostname or address */
|
||||
|
||||
TYPE_2BYTE = TYPE_USHORT
|
||||
|
Loading…
Reference in New Issue
Block a user