version 1.7.1.0

This commit is contained in:
Gerhard Rieger 2009-04-02 21:30:50 +02:00
parent 6e4db297ae
commit 7c2039ada8
10 changed files with 21 additions and 18 deletions

View File

@ -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

2
README
View File

@ -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

View File

@ -1 +1 @@
"1.7.0.1+shutnull+suearly+typos"
"1.7.1.0"

View File

@ -1,4 +1,4 @@
<!-- $Revision: 1.1 $ $Date: 2007/03/06 20:54:43 $ -->
<!-- source: doc/socat-multicast.html -->
<html><head>
<title>IP Multicasting with Socat</title>
<link rel="stylesheet" type="text/css" href="dest-unreach.css">
@ -301,7 +301,7 @@ Please note that the new features could not be successfully tested on IPv6;
these sections thus apply to IPv4 only.
</p>
<p>This document was last modified in July 2008.</p>
<p>This document was last modified in April 2009.</p>
<h2>More info about socat datagrams</h2>
@ -336,7 +336,7 @@ with one peer address<br>
<a href="http://en.wikipedia.org/wiki/Broadcast_address">broadcasting on Wikipedia</a><br>
<p>
<small>Copyright: Gerhard Rieger 2007-2008</small><br>
<small>Copyright: Gerhard Rieger 2007-2009</small><br>
<small>License: <a href="http://www.fsf.org/licensing/licenses/fdl.html">GNU Free Documentation License (FDL)</a></small>
</p>

View File

@ -1,4 +1,4 @@
<!-- $Revision: 1.1 $ $Date: 2007/03/06 20:54:43 $ -->
<!-- source: doc/socat-tun.html -->
<html><head>
<title>Building TUN based virtual networks with socat</title>
<link rel="stylesheet" type="text/css" href="dest-unreach.css">
@ -140,7 +140,7 @@ transfer.<p>
<p>
Linux TUN/TAP support was added to socat in version 1.6.0.</p>
<p>This document was last modified in March 2007.</p>
<p>This document was last modified in April 2009.</p>
<h2>More info about socat TUN/TAP support</h2>
@ -157,7 +157,7 @@ Linux TUN/TAP support was added to socat in version 1.6.0.</p>
<a href="http://en.wikipedia.org/wiki/TUN/TAP">TUN/TAP on Wikipedia</a><br>
<p>
<small>Copyright: Gerhard Rieger 2007</small><br>
<small>Copyright: Gerhard Rieger 2007-2009</small><br>
<small>License: <a href="http://www.fsf.org/licensing/licenses/fdl.html">GNU Free Documentation License (FDL)</a></small>
</p>

View File

@ -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:<host>:<port>)))
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:<port>)))
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=<user>)))
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=<user>)))
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=<user>)))
Changes the link(<user>)(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)

View File

@ -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

View File

@ -1,6 +1,6 @@
%define majorver 1.7
%define minorver 0.1
%define minorver 1.0
Summary: socat - multipurpose relay
Name: socat

View File

@ -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

View File

@ -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 */