diff --git a/Socket/BSDSocketProtocol.cc b/Socket/BSDSocketProtocol.cc
index 20afd8a89c70cdcd718400a5f85ce08f19d20bfc..07201cf5fba961cf8ee7d71bbb01877f9dc5220e 100644
--- a/Socket/BSDSocketProtocol.cc
+++ b/Socket/BSDSocketProtocol.cc
@@ -60,11 +60,6 @@ prefix_ void senf::BSDSocketProtocol::linger(bool enable, unsigned timeout)
prefix_ struct timeval senf::BSDSocketProtocol::timestamp()
const
{
- /** \bug Check, why this fails with ENOFILE (!!!!) at least when
- called from a tcp socket.Maybe this is only available for
- datagram sockets ? That could make sense from the description
- (what is the last packet passed to the user on a stream
- socket?) Further investigation necessary ... */
struct timeval tv;
if (::ioctl(body().fd(), SIOCGSTAMP, &tv) < 0)
throw SystemException(errno);
diff --git a/Socket/BSDSocketProtocol.hh b/Socket/BSDSocketProtocol.hh
index bfdef2b0aba154c36ff008dec00111b7fb3f1c01..63c8d42c07b02a5afc50ae36a4509f21ddc0414a 100644
--- a/Socket/BSDSocketProtocol.hh
+++ b/Socket/BSDSocketProtocol.hh
@@ -65,7 +65,8 @@ namespace senf {
the last network packet passed to the user has been
received from the network. This allows precise network
timing.
- \returns timestamp when packet was received */
+ \returns timestamp when packet was received
+ \todo Move this to DatagramSocketProtocol class */
};
/** \brief Protocol facet providing basic connection oriented BSD socket functions
diff --git a/Socket/PacketSocketHandle.cc b/Socket/PacketSocketHandle.cc
index 007a1a3a3d475ef6436758a81705c6be128efb5e..f3234acd18df5c8c7735209b06511c0711395077 100644
--- a/Socket/PacketSocketHandle.cc
+++ b/Socket/PacketSocketHandle.cc
@@ -77,33 +77,6 @@ prefix_ bool senf::PacketProtocol::eof()
return false;
}
-prefix_ void senf::PacketProtocol::promisc(std::string interface, PromiscMode mode)
- const
-{
- /** \bug There are some failures here ... need to investigate */
-
- // The interface is really stupid: as far as i understand, it is possible to
- // enable PROMISC and ALLMULTI seperately, however PROMISC is really a superset
- // of ALLMULTI ... grmpf ... therefore we allways set/reset both to implement sane
- // semantics
-
- struct packet_mreq mreq;
- mreq.mr_ifindex = ::if_nametoindex(interface.c_str());
- if (mreq.mr_ifindex == 0)
- throw SystemException(EINVAL);
- mreq.mr_alen = 0;
-
- mreq.mr_type = PACKET_MR_PROMISC;
- int command = mode == Promiscuous ? PACKET_ADD_MEMBERSHIP : PACKET_DROP_MEMBERSHIP;
- if (::setsockopt(body().fd(),SOL_PACKET,command,&mreq,sizeof(mreq)) < 0)
- throw SystemException(errno);
-
- mreq.mr_type = PACKET_MR_ALLMULTI;
- command = mode == AllMulticast ? PACKET_ADD_MEMBERSHIP : PACKET_DROP_MEMBERSHIP;
- if (::setsockopt(body().fd(),SOL_PACKET,command,&mreq,sizeof(mreq)) < 0)
- throw SystemException(errno);
-}
-
prefix_ void senf::PacketProtocol::do_mc_i(std::string interface,
detail::LLAddressCopier const & copier, bool add)
const
diff --git a/Socket/PacketSocketHandle.hh b/Socket/PacketSocketHandle.hh
index 1acde96168c15b52c4cae278e96f33c40d53244a..5eb371999056f854fede529b854d0b89d054c9bd 100644
--- a/Socket/PacketSocketHandle.hh
+++ b/Socket/PacketSocketHandle.hh
@@ -22,6 +22,8 @@
/** \file
\brief PacketProtocol and PacketSocketHandle public header
+
+ \todo Implement global promisc() helper based on ioctl() interface.
*/
#ifndef HH_PacketSocketHandle_
@@ -83,8 +85,6 @@ namespace senf {
public:
enum SocketType { RawSocket, DatagramSocket };
///< Socket types
- enum PromiscMode { Promiscuous, AllMulticast, None };
- ///< Interface modes
///\name Constructors
///@{
@@ -112,23 +112,6 @@ namespace senf {
///\name Protocol Interface
///@{
- void promisc(std::string interface, PromiscMode mode) const;
- ///< Change interface mode
- /**< This member will change the reception on the given
- interface. The modes available are
-
- <dl>
- <dt><em>None</em></dt><dd>No special mode set. Only receive
- packets addressed to the interface or of joined
- multicast groups</dd>
- <dt><em>AllMulticast</em></dt><dd>Additionally receive all
- multicast traffic</dd>
- <dt><em> Promiscuous</em></dt><dd>Receive all packets on the
- wire</dd>
- </dl>
-
- \param[in] interface interface to modify
- \param[in] mode new interface mode */
// See LLSocketAddress for a discussion/rationale for ForwardRange here
template <class ForwardRange>
diff --git a/Socket/PacketSocketHandle.test.cc b/Socket/PacketSocketHandle.test.cc
index 769b3d72857e92e36a88002c0652d45ad1fd13bc..9b731f55a53dad0b7901903b0acacc03d180cef8 100644
--- a/Socket/PacketSocketHandle.test.cc
+++ b/Socket/PacketSocketHandle.test.cc
@@ -48,26 +48,17 @@ BOOST_AUTO_UNIT_TEST(packetSocketHandle)
{
senf::PacketSocketHandle sock;
- BOOST_CHECK_NO_THROW( sock.bind(senf::LLSocketAddress("lo")) );
+ BOOST_CHECK_NO_THROW( sock.bind(senf::LLSocketAddress("eth0")) );
senf::LLSocketAddress a;
BOOST_CHECK_NO_THROW( sock.local(a) );
- BOOST_CHECK_EQUAL( a.interface(), "lo" );
+ BOOST_CHECK_EQUAL( a.interface(), "eth0" );
// How am I supposed to test read and write .. grmpf ..
- /*
- BOOST_CHECK_NO_THROW( sock.protocol().promisc(
- "lo",senf::PacketProtocol::Promiscuous) );
- BOOST_CHECK_NO_THROW( sock.protocol().promisc(
- "lo",senf::PacketProtocol::AllMulticast) );
- BOOST_CHECK_NO_THROW( sock.protocol().promisc(
- "lo",senf::PacketProtocol::None) );
- */
-
BOOST_CHECK_NO_THROW( sock.protocol().mcAdd(
- "lo",senf::llAddress("01-02-03-04-05-06")) );
+ "eth0",senf::llAddress("01-02-03-04-05-06")) );
BOOST_CHECK_NO_THROW( sock.protocol().mcDrop(
- "lo",senf::llAddress("01-02-03-04-05-06")) );
+ "eth0",senf::llAddress("01-02-03-04-05-06")) );
BOOST_CHECK_NO_THROW( sock.protocol().available() );
BOOST_CHECK( ! sock.eof() );
diff --git a/Socket/ReadWritePolicy.cc b/Socket/ReadWritePolicy.cc
index 8d550918933f8cf7784a1b000999214449efea8f..ed753ee2aaa85003aff264c4dab957d875f5b8f9 100644
--- a/Socket/ReadWritePolicy.cc
+++ b/Socket/ReadWritePolicy.cc
@@ -102,7 +102,7 @@ prefix_ unsigned senf::WriteablePolicy::do_write(FileHandle handle, char const *
prefix_ unsigned senf::WriteablePolicy::do_writeto(FileHandle handle,
char const * buffer, unsigned size,
- struct sockaddr * addr, socklen_t len)
+ struct sockaddr const * addr, socklen_t len)
{
int rv = -1;
do {
diff --git a/Socket/ReadWritePolicy.hh b/Socket/ReadWritePolicy.hh
index 552b8739c76d4d09f90f9716d6275838e3cb15c7..3cb649541714031d3b62e1c85755d676234438f7 100644
--- a/Socket/ReadWritePolicy.hh
+++ b/Socket/ReadWritePolicy.hh
@@ -123,7 +123,7 @@ namespace senf {
private:
static unsigned do_write(FileHandle handle, char const * buffer, unsigned size);
static unsigned do_writeto(FileHandle handle, char const * buffer, unsigned size,
- struct sockaddr * addr, socklen_t len);
+ struct sockaddr const * addr, socklen_t len);
};
/** \brief WritePolicy for unwriteable sockets
diff --git a/Socket/TCPSocketHandle.test.cc b/Socket/TCPSocketHandle.test.cc
index 85a0e95f4de92e1b18abb72171241d964d34a204..7faefa414d6a000b680ae28830e7e328acc2ef57 100644
--- a/Socket/TCPSocketHandle.test.cc
+++ b/Socket/TCPSocketHandle.test.cc
@@ -175,8 +175,6 @@ BOOST_AUTO_UNIT_TEST(tcpv4ClientSocketHandle)
BOOST_CHECK_EQUAL( sock.sndbuf(), 2048u );
BOOST_CHECK_NO_THROW( sock.write("TEST-WRITE") );
BOOST_CHECK_EQUAL( sock.read(), "TEST-WRITE" );
- // this fails with ENOFILE ... why ????
- // BOOST_CHECK_NO_THROW( sock.protocol().timestamp() );
BOOST_CHECK( !sock.eof() );
sock.write("QUIT");
sleep(1);
diff --git a/Socket/UDPSocketHandle.test.cc b/Socket/UDPSocketHandle.test.cc
new file mode 100644
index 0000000000000000000000000000000000000000..3102685848d9821ae149efffdc1b9f88bcd66aae
--- /dev/null
+++ b/Socket/UDPSocketHandle.test.cc
@@ -0,0 +1,178 @@
+// Copyright (C) 2007
+// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
+// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+// Stefan Bund <g0dil@berlios.de>
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the
+// Free Software Foundation, Inc.,
+// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+/** \file
+ \brief UDPSocketHandle.test unit tests */
+
+//#include "UDPSocketHandle.test.hh"
+//#include "UDPSocketHandle.test.ih"
+
+// Custom includes
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include "UDPSocketHandle.hh"
+#include <iostream>
+
+#include <boost/test/auto_unit_test.hpp>
+#include <boost/test/test_tools.hpp>
+
+#define prefix_
+///////////////////////////////cc.p////////////////////////////////////////
+
+namespace {
+
+ void error(char const * fn, char const * proc="")
+ {
+ std::cerr << "\n" << proc << ((*proc)?": ":"") << fn << ": " << strerror(errno) << std::endl;
+ }
+
+ void fail(char const * proc, char const * fn)
+ {
+ error(fn,proc);
+ _exit(1);
+ }
+
+ int server_pid = 0;
+
+ void start(void (*fn)())
+ {
+ server_pid = ::fork();
+ if (server_pid < 0) BOOST_FAIL("fork()");
+ if (server_pid == 0) {
+ (*fn)();
+ _exit(0);
+ }
+ }
+
+ void wait()
+ {
+ int status;
+ if (waitpid(server_pid,&status,0)<0)
+ BOOST_FAIL("waitpid()");
+ BOOST_CHECK_EQUAL( status , 0 );
+ }
+
+ void stop()
+ {
+ if (server_pid) {
+ kill(server_pid,9);
+ wait();
+ server_pid = 0;
+ }
+ }
+
+}
+
+///////////////////////////////////////////////////////////////////////////
+
+namespace {
+
+ void server_v4()
+ {
+ int sock = socket(PF_INET,SOCK_DGRAM,0);
+ if (sock<0) fail("server_v4","socket()");
+ struct sockaddr_in sin;
+ ::memset(&sin,0,sizeof(sin));
+ sin.sin_family = AF_INET;
+ sin.sin_port = htons(12345);
+ sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+ if (bind(sock,(struct sockaddr *)&sin,sizeof(sin))<0) fail("server_v4","bind()");
+
+ sin.sin_port = htons(23456);
+ char buffer[1024];
+ while (1) {
+ int n = read(sock,buffer,1024);
+ if (n == 4 && strncmp(buffer,"QUIT",4) == 0)
+ break;
+ sendto(sock,buffer,n,0,(struct sockaddr *)&sin,sizeof(sin));
+ }
+
+ if (close(sock) < 0) fail("server_v4","close()");
+ }
+
+ void server_v6()
+ {
+ int sock = socket(PF_INET6,SOCK_DGRAM,0);
+ if (sock<0) fail("server_v6","socket()");
+ struct sockaddr_in6 sin;
+ ::memset(&sin,0,sizeof(sin));
+ sin.sin6_family = AF_INET6;
+ sin.sin6_port = htons(12345);
+ sin.sin6_addr = in6addr_loopback;
+ if (bind(sock,(struct sockaddr *)&sin,sizeof(sin))<0) fail("server_v6","bind()");
+
+ sin.sin6_port = htons(23456);
+ char buffer[1024];
+ while (1) {
+ int n = read(sock,buffer,1024);
+ if (n == 4 && strncmp(buffer,"QUIT",4) == 0)
+ break;
+ sendto(sock,buffer,n,0,(struct sockaddr *)&sin,sizeof(sin));
+ }
+
+ if (close(sock) < 0) fail("server_v6","close()");
+ }
+
+}
+
+BOOST_AUTO_UNIT_TEST(udpv4ClientSocketHandle)
+{
+ try {
+ alarm(10);
+ start(server_v4);
+ senf::UDPv4ClientSocketHandle sock;
+ BOOST_CHECK_NO_THROW( sock.bind("127.0.0.1:23456") );
+ BOOST_CHECK( sock.local() == "127.0.0.1:23456" );
+ BOOST_CHECK_NO_THROW( sock.rcvbuf(2048) );
+ BOOST_CHECK_EQUAL( sock.rcvbuf(), 2048u );
+ BOOST_CHECK_NO_THROW( sock.sndbuf(2048) );
+ BOOST_CHECK_EQUAL( sock.sndbuf(), 2048u );
+ BOOST_CHECK_NO_THROW( sock.writeto("127.0.0.1:12345","TEST-WRITE") );
+ BOOST_CHECK_EQUAL( sock.read(), "TEST-WRITE" );
+ BOOST_CHECK_NO_THROW( sock.protocol().timestamp() );
+ sock.writeto("127.0.0.1:12345","QUIT");
+ sleep(1);
+ stop();
+ sleep(1);
+ alarm(0);
+ } catch (...) {
+ alarm(0);
+ sleep(1);
+ stop();
+ sleep(1);
+ throw;
+ }
+}
+
+///////////////////////////////cc.e////////////////////////////////////////
+#undef prefix_
+
+
+// Local Variables:
+// mode: c++
+// fill-column: 100
+// c-file-style: "senf"
+// indent-tabs-mode: nil
+// ispell-local-dictionary: "american"
+// End:
diff --git a/senfscons/xrefhtml.xslt b/senfscons/xrefhtml.xslt
index 37333861760e00e89c4d48eb187047b838c7e174..b9c6e7c3c51e6956b2e33f1fee25795fdc170631 100644
--- a/senfscons/xrefhtml.xslt
+++ b/senfscons/xrefhtml.xslt
@@ -22,29 +22,34 @@
<div class="nav">
<xsl:text> -- </xsl:text>
<xsl:for-each select="str:split($types)">
- <xsl:element name="a">
- <xsl:attribute name="href">#<xsl:value-of select="."/></xsl:attribute>
- <xsl:value-of select="translate(.,'abcdefghijklmnopqrstuvwxyz','ABCDEFGHIJKLMNOPQRSTUVWXYZ')"/><xsl:text>S</xsl:text>
- </xsl:element>
- <xsl:text> -- </xsl:text>
+ <xsl:variable name="type" select="string(.)"/>
+ <xsl:if test="$doc//xreflist[@type=$type]">
+ <xsl:element name="a">
+ <xsl:attribute name="href">#<xsl:value-of select="."/></xsl:attribute>
+ <xsl:value-of select="translate(.,'abcdefghijklmnopqrstuvwxyz','ABCDEFGHIJKLMNOPQRSTUVWXYZ')"/><xsl:text>S</xsl:text>
+ </xsl:element>
+ <xsl:text> -- </xsl:text>
+ </xsl:if>
</xsl:for-each>
</div>
<xsl:for-each select="str:split($types)">
<xsl:variable name="type" select="string(.)"/>
- <xsl:element name="div">
- <xsl:attribute name="class"><xsl:value-of select="$type"/></xsl:attribute>
- <xsl:element name="a">
- <xsl:attribute name="name"><xsl:value-of select="$type"/></xsl:attribute>
- <h2>Open <xsl:value-of select="translate($type,'abcdefghijklmnopqrstuvwxyz','ABCDEFGHIJKLMNOPQRSTUVWXYZ')"/>s</h2>
+ <xsl:if test="$doc//xreflist[@type=$type]">
+ <xsl:element name="div">
+ <xsl:attribute name="class"><xsl:value-of select="$type"/></xsl:attribute>
+ <xsl:element name="a">
+ <xsl:attribute name="name"><xsl:value-of select="$type"/></xsl:attribute>
+ <h2>Open <xsl:value-of select="translate($type,'abcdefghijklmnopqrstuvwxyz','ABCDEFGHIJKLMNOPQRSTUVWXYZ')"/>s</h2>
+ </xsl:element>
+ <xsl:for-each select="$doc//xreflist[@type=$type]">
+ <xsl:sort select="@module"/>
+ <h3><xsl:value-of select="@module"/> module</h3>
+ <dl>
+ <xsl:apply-templates/>
+ </dl>
+ </xsl:for-each>
</xsl:element>
- <xsl:for-each select="$doc//xreflist[@type=$type]">
- <xsl:sort select="@module"/>
- <h3><xsl:value-of select="@module"/> module</h3>
- <dl>
- <xsl:apply-templates/>
- </dl>
- </xsl:for-each>
- </xsl:element>
+ </xsl:if>
</xsl:for-each>
</div>
</xsl:template>