mirror of
https://repo.or.cz/socat.git
synced 2024-12-23 07:52:32 +00:00
version 1.7.1.1
This commit is contained in:
parent
2a34236fce
commit
30a3ec3baa
11 changed files with 21 additions and 12 deletions
7
CHANGES
7
CHANGES
|
@ -1,4 +1,6 @@
|
||||||
|
|
||||||
|
####################### V 1.7.1.1:
|
||||||
|
|
||||||
corrections:
|
corrections:
|
||||||
corrected the "fixed possible SIGSEGV" fix because SIGSEGV still might
|
corrected the "fixed possible SIGSEGV" fix because SIGSEGV still might
|
||||||
occur under those conditions. Thanks to Toni Mattila for first
|
occur under those conditions. Thanks to Toni Mattila for first
|
||||||
|
@ -15,10 +17,11 @@ corrections:
|
||||||
fixed a compile problem caused by size_t/socklen_t mismatch on 64bit
|
fixed a compile problem caused by size_t/socklen_t mismatch on 64bit
|
||||||
systems
|
systems
|
||||||
|
|
||||||
docu mentions option so-bindtodev but correct name is so-bindtodevice.
|
docu mentioned option so-bindtodev but correct name is so-bindtodevice.
|
||||||
Thanks to Jim Zimmerman for reporting.
|
Thanks to Jim Zimmerman for reporting.
|
||||||
|
|
||||||
added environment example to doc/socat-multicast.html
|
docu changes:
|
||||||
|
added environment variables example to doc/socat-multicast.html
|
||||||
|
|
||||||
####################### V 1.7.1.0:
|
####################### V 1.7.1.0:
|
||||||
|
|
||||||
|
|
2
README
2
README
|
@ -75,7 +75,7 @@ install
|
||||||
|
|
||||||
Get the tarball and extract it:
|
Get the tarball and extract it:
|
||||||
gtar xzf socat.tar.gz
|
gtar xzf socat.tar.gz
|
||||||
cd socat-1.7.1.0
|
cd socat-1.7.1.1
|
||||||
./configure
|
./configure
|
||||||
make
|
make
|
||||||
su
|
su
|
||||||
|
|
2
VERSION
2
VERSION
|
@ -1 +1 @@
|
||||||
"1.7.1.0+sigsegv+ftruncate64+fixsetenv+amd64+uniexec"
|
"1.7.1.1"
|
||||||
|
|
4
compat.h
4
compat.h
|
@ -1,5 +1,5 @@
|
||||||
/* source: compat.h */
|
/* source: compat.h */
|
||||||
/* Copyright Gerhard Rieger 2001-2008 */
|
/* Copyright Gerhard Rieger 2001-2009 */
|
||||||
/* 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 __compat_h_included
|
#ifndef __compat_h_included
|
||||||
|
@ -267,6 +267,8 @@
|
||||||
# define F_off "%d"
|
# define F_off "%d"
|
||||||
# elif HAVE_BASIC_OFF_T==5
|
# elif HAVE_BASIC_OFF_T==5
|
||||||
# define F_off "%ld"
|
# define F_off "%ld"
|
||||||
|
# elif HAVE_BASIC_OFF_T==7
|
||||||
|
# define F_off "%Ld"
|
||||||
# else
|
# else
|
||||||
#error "HAVE_BASIC_OFF_T is out of range:" HAVE_BASIC_OFF_T
|
#error "HAVE_BASIC_OFF_T is out of range:" HAVE_BASIC_OFF_T
|
||||||
# endif
|
# endif
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/* source: config.h.in */
|
/* source: config.h.in */
|
||||||
/* Copyright Gerhard Rieger 2001-2008 */
|
/* Copyright Gerhard Rieger 2001-2009 */
|
||||||
/* 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 __config_h_included
|
#ifndef __config_h_included
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
nl source: configure.in
|
nl source: configure.in
|
||||||
dnl Copyright Gerhard Rieger 2001-2008
|
dnl Copyright Gerhard Rieger 2001-2009
|
||||||
dnl Published under the GNU General Public License V.2, see file COPYING
|
dnl Published under the GNU General Public License V.2, see file COPYING
|
||||||
|
|
||||||
dnl Process this file with autoconf to produce a configure script.
|
dnl Process this file with autoconf to produce a configure script.
|
||||||
|
|
|
@ -319,7 +319,7 @@ Example: Start a receiver of the following form (tried on Linux):
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<span class="frame"><span class="shell">
|
<span class="frame"><span class="shell">
|
||||||
socat -u udp-recvfrom:8888,reuseaddr,ip-add-membership=224.1.0.1:192.168.10.2,ip-pktinfo,fork system:export
|
socat -u UDP-RECVFROM:8888,reuseaddr,ip-add-membership=224.1.0.1:192.168.10.2,ip-pktinfo,fork SYSTEM:export
|
||||||
</span></span>
|
</span></span>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
|
@ -327,7 +327,7 @@ Then send a multicast packet from the client:
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<span class="frame"><span class="shell">
|
<span class="frame"><span class="shell">
|
||||||
echo |socat -u - udp-datagram:224.1.0.1:8888
|
echo |socat -u STDIO UDP-DATAGRAM:224.1.0.1:8888
|
||||||
</span></span>
|
</span></span>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
|
|
||||||
%define majorver 1.7
|
%define majorver 1.7
|
||||||
%define minorver 1.0
|
%define minorver 1.1
|
||||||
|
|
||||||
Summary: socat - multipurpose relay
|
Summary: socat - multipurpose relay
|
||||||
Name: socat
|
Name: socat
|
||||||
|
|
2
utils.c
2
utils.c
|
@ -1,5 +1,5 @@
|
||||||
/* source: utils.c */
|
/* source: utils.c */
|
||||||
/* Copyright Gerhard Rieger 2001-2008 */
|
/* Copyright Gerhard Rieger 2001-2009 */
|
||||||
/* Published under the GNU General Public License V.2, see file COPYING */
|
/* Published under the GNU General Public License V.2, see file COPYING */
|
||||||
|
|
||||||
/* useful additions to C library */
|
/* useful additions to C library */
|
||||||
|
|
3
xio.h
3
xio.h
|
@ -347,12 +347,13 @@ union integral {
|
||||||
} ;
|
} ;
|
||||||
|
|
||||||
/* some aliases */
|
/* some aliases */
|
||||||
#define u_off u_long /* please report when this causes problems */
|
|
||||||
|
|
||||||
#if HAVE_BASIC_OFF_T==3
|
#if HAVE_BASIC_OFF_T==3
|
||||||
# define u_off u_int
|
# define u_off u_int
|
||||||
#elif HAVE_BASIC_OFF_T==5
|
#elif HAVE_BASIC_OFF_T==5
|
||||||
# define u_off u_long
|
# define u_off u_long
|
||||||
|
#elif HAVE_BASIC_OFF_T==7
|
||||||
|
# define u_off u_longlong
|
||||||
#else
|
#else
|
||||||
# error "unexpected size of off_t, please report this as bug"
|
# error "unexpected size of off_t, please report this as bug"
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1975,6 +1975,9 @@ int parseopts_table(const char **a, unsigned int groups, struct opt **opts,
|
||||||
(*opts)[i].value.u_ulong);
|
(*opts)[i].value.u_ulong);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
#if HAVE_BASIC_OFF_T==7
|
||||||
|
case TYPE_OFF32:
|
||||||
|
#endif
|
||||||
#if HAVE_TYPE_LONGLONG
|
#if HAVE_TYPE_LONGLONG
|
||||||
case TYPE_LONGLONG:
|
case TYPE_LONGLONG:
|
||||||
# if HAVE_STAT64 && defined(HAVE_BASIC_OFF64_T) && HAVE_BASIC_OFF64_T==7
|
# if HAVE_STAT64 && defined(HAVE_BASIC_OFF64_T) && HAVE_BASIC_OFF64_T==7
|
||||||
|
|
Loading…
Reference in a new issue