diff --git a/CHANGES b/CHANGES index 80ab410..4f328b1 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,6 @@ +####################### V 1.7.1.0: + new features: address options shut-none, shut-down, and shut-close allow to control socat's half close behaviour diff --git a/README b/README index e0ebc54..ff1577e 100644 --- a/README +++ b/README @@ -75,7 +75,7 @@ install Get the tarball and extract it: gtar xzf socat.tar.gz - cd socat-1.7.0.0 + cd socat-1.7.1.0 ./configure make su diff --git a/VERSION b/VERSION index 726d12a..978ec68 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -"1.7.0.1+shutnull+suearly+typos" +"1.7.1.0" diff --git a/doc/socat-multicast.html b/doc/socat-multicast.html index 4f7305e..a4caedd 100644 --- a/doc/socat-multicast.html +++ b/doc/socat-multicast.html @@ -1,4 +1,4 @@ - + IP Multicasting with Socat @@ -301,7 +301,7 @@ Please note that the new features could not be successfully tested on IPv6; these sections thus apply to IPv4 only.

-

This document was last modified in July 2008.

+

This document was last modified in April 2009.

More info about socat datagrams

@@ -336,7 +336,7 @@ with one peer address
broadcasting on Wikipedia

-Copyright: Gerhard Rieger 2007-2008
+Copyright: Gerhard Rieger 2007-2009
License: GNU Free Documentation License (FDL)

diff --git a/doc/socat-tun.html b/doc/socat-tun.html index 4d1d680..28c302b 100644 --- a/doc/socat-tun.html +++ b/doc/socat-tun.html @@ -1,4 +1,4 @@ - + Building TUN based virtual networks with socat @@ -140,7 +140,7 @@ transfer.

Linux TUN/TAP support was added to socat in version 1.6.0.

-

This document was last modified in March 2007.

+

This document was last modified in April 2009.

More info about socat TUN/TAP support

@@ -157,7 +157,7 @@ Linux TUN/TAP support was added to socat in version 1.6.0.

TUN/TAP on Wikipedia

-Copyright: Gerhard Rieger 2007
+Copyright: Gerhard Rieger 2007-2009
License: GNU Free Documentation License (FDL)

diff --git a/doc/socat.yo b/doc/socat.yo index 1c072cf..67c2a69 100644 --- a/doc/socat.yo +++ b/doc/socat.yo @@ -53,7 +53,6 @@ from a large set of different types of data sinks and sources (see link(address types)(ADDRESS_TYPES)), and because lots of link(address options)(ADDRESS_OPTIONS) may be applied to the streams, socat can be used for many different purposes. -It might be one of the tools that one `has already needed'. Filan() is a utility that prints information about its active file descriptors to stdout. It has been written for debugging socat(), but might be @@ -497,6 +496,7 @@ label(ADDRESS_OPENSSL_CONNECT)dit(bf(tt(OPENSSL::))) link(cafile)(OPTION_OPENSSL_CAFILE), link(capath)(OPTION_OPENSSL_CAPATH), link(certificate)(OPTION_OPENSSL_CERTIFICATE), + link(key)(OPTION_OPENSSL_KEY), link(bind)(OPTION_BIND), link(pf)(OPTION_PROTOCOL_FAMILY), link(connect-timeout)(OPTION_CONNECT_TIMEOUT), @@ -523,6 +523,7 @@ label(ADDRESS_OPENSSL_LISTEN)dit(bf(tt(OPENSSL-LISTEN:))) link(cafile)(OPTION_OPENSSL_CAFILE), link(capath)(OPTION_OPENSSL_CAPATH), link(certificate)(OPTION_OPENSSL_CERTIFICATE), + link(key)(OPTION_OPENSSL_KEY), link(fork)(OPTION_FORK), link(bind)(OPTION_BIND), link(range)(OPTION_RANGE), @@ -1689,7 +1690,7 @@ label(OPTION_SETUID)dit(bf(tt(setuid=))) option does not drop group related privileges. Check if option link(su)(OPTION_SUBSTUSER) better fits your needs. label(OPTION_SETUID_EARLY)dit(bf(tt(setuid-early=))) - Like link(setuid)(OPTION_SETSUID) but is performed before opening the + Like link(setuid)(OPTION_SETUID) but is performed before opening the address. label(OPTION_SUBSTUSER)dit(bf(tt(su=))) Changes the link()(TYPE_USER) (owner) and groups of the process after @@ -3263,14 +3264,13 @@ servers), and the original client request. label(EXAMPLE_ANCILLARY) dit(bf(tt(socat -d -d UDP4-RECVFROM:9999,so-broadcast,so-timestamp,ip-pktinfo,ip-recverr,ip-recvopts,ip-recvtos,ip-recvttl!!- SYSTEM:'export; sleep 1' |grep SOCAT))) -waits for an incoming UDP packets on port 9999 and prints the environment +waits for an incoming UDP packet on port 9999 and prints the environment variables provided by socat. On BSD based systems you have to replace link(tt(ip-pktinfo))(OPTION_IP_PKTINFO) with link(tt(ip-recvdstaddr))(OPTION_IP_RECVDSTADDR),link(tt(ip-recvif))(OPTION_IP_RECVIF). Especially interesting is SOCAT_IP_DSTADDR: it contains the target address of the packet which may be a unicast, multicast, or broadcast address. -label(EXAMPLE_GENERICSOCKET) dit(bf(tt())) @@ -3466,7 +3466,7 @@ standard specifications available on the Internet for free. label(VERSION) manpagesection(VERSION) -This man page describes version 1.7.0 of socat(). +This man page describes version 1.7.1 of socat(). label(BUGS) diff --git a/mail.sh b/mail.sh index 1ea265e..7bc2c5e 100755 --- a/mail.sh +++ b/mail.sh @@ -1,6 +1,6 @@ #! /bin/sh # source: mail.sh -# Copyright Gerhard Rieger 2001-2005 +# Copyright Gerhard Rieger 2001-2009 # Published under the GNU General Public License V.2, see file COPYING #set -vx diff --git a/socat.spec b/socat.spec index b62286f..ec7c0ae 100644 --- a/socat.spec +++ b/socat.spec @@ -1,6 +1,6 @@ %define majorver 1.7 -%define minorver 0.1 +%define minorver 1.0 Summary: socat - multipurpose relay Name: socat diff --git a/xioopts.h b/xioopts.h index f630268..25b3bcf 100644 --- a/xioopts.h +++ b/xioopts.h @@ -444,7 +444,7 @@ enum e_optcode { OPT_NOFLSH, /* termios.c_lflag */ OPT_NOFORK, /* exec, system */ OPT_NOPROMPT, /* readline */ - OPT_NULL_EOF, /* receiving empty packet triggers EOF */ + OPT_NULL_EOF, /* receiving empty packet triggers EOF */ #ifdef OCRNL OPT_OCRNL, /* termios.c_oflag */ #endif diff --git a/xioshutdown.c b/xioshutdown.c index 69621cf..3b2a765 100644 --- a/xioshutdown.c +++ b/xioshutdown.c @@ -59,9 +59,10 @@ int xioshutdown(xiofile_t *sock, int how) { default: ; } - + if (false) { + ; #if WITH_OPENSSL - if ((sock->stream.dtype & XIODATA_MASK) == XIODATA_OPENSSL) { + } else if ((sock->stream.dtype & XIODATA_MASK) == XIODATA_OPENSSL) { sycSSL_shutdown (sock->stream.para.openssl.ssl); /*! what about half/full close? */ #endif /* WITH_OPENSSL */