Socket: Renamed all protocol classes and files to end in SocketProtocol

git-svn-id: https://svn.berlios.de/svnroot/repos/senf/trunk@685 270642c3-0616-0410-b53a-bc976706d245

diff --git a/Socket/ClientSocketHandle.test.cc b/Socket/ClientSocketHandle.test.cc
index 98a5c83..9dda3e7 100644 (file)
--- a/Socket/ClientSocketHandle.test.cc
+++ b/Socket/ClientSocketHandle.test.cc
@@ -40,13 +40,13 @@
 namespace {
 
     class MySocketHandle
-        : public senf::ClientSocketHandle<senf::test::SomeProtocol::Policy>
+        : public senf::ClientSocketHandle<senf::test::SomeSocketProtocol::Policy>
     {
     public:
         MySocketHandle()
-            : senf::ClientSocketHandle<senf::test::SomeProtocol::Policy>(
+            : senf::ClientSocketHandle<senf::test::SomeSocketProtocol::Policy>(
                 std::auto_ptr<senf::SocketBody>(
-                    new senf::ProtocolSocketBody<senf::test::SomeProtocol>(false)))
+                    new senf::ProtocolSocketBody<senf::test::SomeSocketProtocol>(false)))
             {}
     };
 
@@ -70,7 +70,7 @@ BOOST_AUTO_UNIT_TEST(clientSocketHandle)
         OtherSocketHandle osh (myh);
         BOOST_CHECKPOINT("Assigning socket handle");
         osh = myh;
-        typedef senf::ClientSocketHandle<senf::test::SomeProtocol::Policy> SomeSocketHandle;
+        typedef senf::ClientSocketHandle<senf::test::SomeSocketProtocol::Policy> SomeSocketHandle;
         BOOST_CHECKPOINT("static_casting socket handle");
         SomeSocketHandle ssh =
             senf::static_socket_cast<SomeSocketHandle>(osh);

diff --git a/Socket/Mainpage.dox b/Socket/Mainpage.dox
index 946d03e..c473505 100644 (file)
--- a/Socket/Mainpage.dox
+++ b/Socket/Mainpage.dox
@@ -150,7 +150,7 @@ namespace senf {
     ProtocolClientSocketHandle or ProtocolServerSocketHandle. You will probably not use these
     templates as is but use proper typedefs (for example TCPv4ClientSocketHandle or
     PacketSocketHandle). The documentation for these socket handles are found in the protocol class
-    (for example TCPv4SocketProtocol or PacketProtocol).
+    (for example TCPv4SocketProtocol or PacketSocketProtocol).
 
     \section usage_reusable Writing Reusable Components
 
@@ -210,8 +210,8 @@ namespace senf {
     After the protocol class has been defined, you will probably want to provide typedefs for the
     new protocol sockets. If the new protocol is connection oriented, this will be like
     \code
-    typedef ProtocolClientSocketHandle<MyProtocolClass> MyProtocolClientSocketHandle;
-    typedef ProtocolServerSocketHandle<MyProtocolClass> MyProtocolServerSocketHandle;
+    typedef ProtocolClientSocketHandle<MySocketProtocolClass> MySocketProtocolClientSocketHandle;
+    typedef ProtocolServerSocketHandle<MySocketProtocolClass> MySocketProtocolServerSocketHandle;
     \endcode
 
     \section extend_policy Extending the policy framework

diff --git a/Socket/ProtocolClientSocketHandle.test.cc b/Socket/ProtocolClientSocketHandle.test.cc
index 6318a29..861f299 100644 (file)
--- a/Socket/ProtocolClientSocketHandle.test.cc
+++ b/Socket/ProtocolClientSocketHandle.test.cc
@@ -36,16 +36,16 @@
 ///////////////////////////////cc.p////////////////////////////////////////
 
 namespace {
-    struct MyProtocol : public senf::test::SomeProtocol
+    struct MySocketProtocol : public senf::test::SomeSocketProtocol
     {
-        using senf::test::SomeProtocol::init_client;
+        using senf::test::SomeSocketProtocol::init_client;
         void init_client(char const *,unsigned) const {}
     };
 }
 
 BOOST_AUTO_UNIT_TEST(protocolClientSocketHandle)
 {
-    typedef senf::ProtocolClientSocketHandle<MyProtocol> MySocketHandle;
+    typedef senf::ProtocolClientSocketHandle<MySocketProtocol> MySocketHandle;
 
     {
         typedef senf::MakeSocketPolicy<

diff --git a/Socket/ProtocolServerSocketHandle.test.cc b/Socket/ProtocolServerSocketHandle.test.cc
index b8065ee..86d91e4 100644 (file)
--- a/Socket/ProtocolServerSocketHandle.test.cc
+++ b/Socket/ProtocolServerSocketHandle.test.cc
@@ -37,16 +37,16 @@
 
 namespace {
 
-    struct MyProtocol : public senf::test::SomeProtocol
+    struct MySocketProtocol : public senf::test::SomeSocketProtocol
     {
-        using senf::test::SomeProtocol::init_server;
+        using senf::test::SomeSocketProtocol::init_server;
         void init_server(char const *,unsigned) const {}
     };
 }
 
 BOOST_AUTO_UNIT_TEST(protocolServerSocketHandle)
 {
-    typedef senf::ProtocolServerSocketHandle<MyProtocol> MySocketHandle;
+    typedef senf::ProtocolServerSocketHandle<MySocketProtocol> MySocketHandle;
 
     {
         typedef senf::MakeSocketPolicy<
@@ -68,8 +68,8 @@ BOOST_AUTO_UNIT_TEST(protocolServerSocketHandle)
         BOOST_CHECK_EQUAL( h.dumpState(),
                            "file.handle: -1\n"
                            "file.refcount: 2\n"
-                           "handle: senf::ProtocolServerSocketHandle<(anonymous namespace)::MyProtocol>\n"
-                           "socket.protocol: (anonymous namespace)::MyProtocol\n"
+                           "handle: senf::ProtocolServerSocketHandle<(anonymous namespace)::MySocketProtocol>\n"
+                           "socket.protocol: (anonymous namespace)::MySocketProtocol\n"
                            "socket.protocol.policy: senf::SocketPolicy<senf::test::SomeAddressingPolicy, senf::test::SomeFramingPolicy, senf::test::SomeCommunicationPolicy, senf::test::SomeReadPolicy, senf::test::SomeWritePolicy>\n"
                            "socket.server: true\n" );
 

diff --git a/Socket/Protocols/DVB/DVBDemuxHandles.cc b/Socket/Protocols/DVB/DVBDemuxHandles.cc
index 2ea218e..3016a52 100644 (file)
--- a/Socket/Protocols/DVB/DVBDemuxHandles.cc
+++ b/Socket/Protocols/DVB/DVBDemuxHandles.cc
@@ -40,7 +40,7 @@
 ///////////////////////////////////////////////////////////////////////////
 // senf::DVBDemuxHandles
 
-prefix_ void senf::DVBDemuxSectionProtocol::init_client(unsigned short adapter, unsigned short device)
+prefix_ void senf::DVBDemuxSectionSocketProtocol::init_client(unsigned short adapter, unsigned short device)
     const
 {
     std::string devDemux = str( boost::format(
@@ -51,13 +51,13 @@ prefix_ void senf::DVBDemuxSectionProtocol::init_client(unsigned short adapter,
     fd(f);
 }
 
-prefix_ unsigned senf::DVBDemuxSectionProtocol::available()
+prefix_ unsigned senf::DVBDemuxSectionSocketProtocol::available()
     const
 {
     return 4096;
 }
 
-prefix_ void senf::DVBDemuxSectionProtocol::setSectionFilter(struct dmx_sct_filter_params *filter)
+prefix_ void senf::DVBDemuxSectionSocketProtocol::setSectionFilter(struct dmx_sct_filter_params *filter)
     const
 {
     if (::ioctl(fd(), DMX_SET_FILTER, filter) < 0)
@@ -66,7 +66,7 @@ prefix_ void senf::DVBDemuxSectionProtocol::setSectionFilter(struct dmx_sct_filt
 
 // ----------------------------------------------------------------
 
-prefix_ void senf::DVBDemuxPESProtocol::init_client(unsigned short adapter, unsigned short device)
+prefix_ void senf::DVBDemuxPESSocketProtocol::init_client(unsigned short adapter, unsigned short device)
     const
 {
     std::string devDemux = str( boost::format(
@@ -77,13 +77,13 @@ prefix_ void senf::DVBDemuxPESProtocol::init_client(unsigned short adapter, unsi
     fd(f);
 }
 
-prefix_ unsigned senf::DVBDemuxPESProtocol::available()
+prefix_ unsigned senf::DVBDemuxPESSocketProtocol::available()
     const
 {
     return 4096; //???
 }
 
-prefix_ void senf::DVBDemuxPESProtocol::setPESFilter(struct dmx_pes_filter_params *filter)
+prefix_ void senf::DVBDemuxPESSocketProtocol::setPESFilter(struct dmx_pes_filter_params *filter)
     const
 {
     if (::ioctl(fd(), DMX_SET_PES_FILTER, filter) < 0)
@@ -92,7 +92,7 @@ prefix_ void senf::DVBDemuxPESProtocol::setPESFilter(struct dmx_pes_filter_param
 
 // ----------------------------------------------------------------
 
-prefix_ void senf::DVBDvrProtocol::init_client(unsigned short adapter, unsigned short device)
+prefix_ void senf::DVBDvrSocketProtocol::init_client(unsigned short adapter, unsigned short device)
     const
 {
     std::string devDvr = str( boost::format(
@@ -103,7 +103,7 @@ prefix_ void senf::DVBDvrProtocol::init_client(unsigned short adapter, unsigned
     fd(f);
 }
 
-prefix_ unsigned senf::DVBDvrProtocol::available()
+prefix_ unsigned senf::DVBDvrSocketProtocol::available()
     const
 {
     return 188;

diff --git a/Socket/Protocols/DVB/DVBDemuxHandles.hh b/Socket/Protocols/DVB/DVBDemuxHandles.hh
index fe4ce36..aae5d80 100644 (file)
--- a/Socket/Protocols/DVB/DVBDemuxHandles.hh
+++ b/Socket/Protocols/DVB/DVBDemuxHandles.hh
@@ -31,7 +31,7 @@
 #include "../../../Socket/CommunicationPolicy.hh"
 #include "../../../Socket/ReadWritePolicy.hh"
 #include "../../../Socket/ProtocolClientSocketHandle.hh"
-#include "DVBDemuxProtocol.hh"
+#include "DVBDemuxSocketProtocol.hh"
 
 //#include "DVBDemuxHandles.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
@@ -51,9 +51,9 @@ namespace senf {
 
     /** \brief xxx
      */
-    class DVBDemuxSectionProtocol
-        : public ConcreteSocketProtocol<DVBDemux_Policy, DVBDemuxSectionProtocol>,
-          public DVBDemuxProtocol
+    class DVBDemuxSectionSocketProtocol
+        : public ConcreteSocketProtocol<DVBDemux_Policy, DVBDemuxSectionSocketProtocol>,
+          public DVBDemuxSocketProtocol
     {
     public:
         ///////////////////////////////////////////////////////////////////////////
@@ -78,15 +78,15 @@ namespace senf {
         void setSectionFilter(struct dmx_sct_filter_params *filter) const;    
     };
 
-    typedef ProtocolClientSocketHandle<DVBDemuxSectionProtocol> DVBDemuxSectionHandle;
+    typedef ProtocolClientSocketHandle<DVBDemuxSectionSocketProtocol> DVBDemuxSectionHandle;
     
     // ----------------------------------------------------------------
     
     /** \brief xxx
      */
-    class DVBDemuxPESProtocol
-        : public ConcreteSocketProtocol<DVBDemux_Policy,DVBDemuxPESProtocol>,
-          public DVBDemuxProtocol
+    class DVBDemuxPESSocketProtocol
+        : public ConcreteSocketProtocol<DVBDemux_Policy,DVBDemuxPESSocketProtocol>,
+          public DVBDemuxSocketProtocol
     {
     public:
         ///////////////////////////////////////////////////////////////////////////
@@ -111,7 +111,7 @@ namespace senf {
         void setPESFilter(struct dmx_pes_filter_params *filter) const;    
     };
 
-    typedef ProtocolClientSocketHandle<DVBDemuxPESProtocol> DVBDemuxPESHandle;
+    typedef ProtocolClientSocketHandle<DVBDemuxPESSocketProtocol> DVBDemuxPESHandle;
 
     
     // ----------------------------------------------------------------
@@ -119,9 +119,9 @@ namespace senf {
     
     /** \brief xxx
          */
-    class DVBDvrProtocol
-        : public ConcreteSocketProtocol<DVBDemux_Policy, DVBDvrProtocol>,
-          public DVBDemuxProtocol
+    class DVBDvrSocketProtocol
+        : public ConcreteSocketProtocol<DVBDemux_Policy, DVBDvrSocketProtocol>,
+          public DVBDemuxSocketProtocol
     {
     public:
         ///////////////////////////////////////////////////////////////////////////
@@ -144,7 +144,7 @@ namespace senf {
         ///@}
      };
 
-     typedef ProtocolClientSocketHandle<DVBDvrProtocol> DVBDvrHandle;
+     typedef ProtocolClientSocketHandle<DVBDvrSocketProtocol> DVBDvrHandle;
 
     ///@}
     

diff --git a/Socket/Protocols/DVB/DVBDemuxProtocol.cc b/Socket/Protocols/DVB/DVBDemuxSocketProtocol.cc
similarity index 79%
rename from Socket/Protocols/DVB/DVBDemuxProtocol.cc
rename to Socket/Protocols/DVB/DVBDemuxSocketProtocol.cc
index 79023cc..ce4cef4 100644 (file)
--- a/Socket/Protocols/DVB/DVBDemuxProtocol.cc
+++ b/Socket/Protocols/DVB/DVBDemuxSocketProtocol.cc
@@ -21,10 +21,10 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief DVBDemuxProtocol non-inline non-template implementation */
+    \brief DVBDemuxSocketProtocol non-inline non-template implementation */
 
-#include "DVBDemuxProtocol.hh"
-//#include "DVBDemuxProtocol.ih"
+#include "DVBDemuxSocketProtocol.hh"
+//#include "DVBDemuxSocketProtocol.ih"
 
 // Custom includes
 #include <sys/socket.h>
@@ -34,32 +34,32 @@
 #include <linux/sockios.h>
 #include "../../../Socket/SocketHandle.hh"
 
-//#include "DVBDemuxProtocol.mpp"
+//#include "DVBDemuxSocketProtocol.mpp"
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
-prefix_ void senf::DVBDemuxProtocol::setBufferSize(unsigned long size)
+prefix_ void senf::DVBDemuxSocketProtocol::setBufferSize(unsigned long size)
     const
 {
     if (::ioctl(fd(), DMX_SET_BUFFER_SIZE, size) < 0)
         throw SystemException();
 }
 
-prefix_ void senf::DVBDemuxProtocol::startFiltering()
+prefix_ void senf::DVBDemuxSocketProtocol::startFiltering()
     const
 {
     if (::ioctl(fd(), DMX_START) < 0)
         throw SystemException();
 }
 
-prefix_ void senf::DVBDemuxProtocol::stopFiltering()
+prefix_ void senf::DVBDemuxSocketProtocol::stopFiltering()
     const
 {
     if (::ioctl(fd(), DMX_STOP) < 0)
         throw SystemException();
 }
 
-prefix_ bool senf::DVBDemuxProtocol::eof()
+prefix_ bool senf::DVBDemuxSocketProtocol::eof()
     const
 {
     return false;
@@ -67,7 +67,7 @@ prefix_ bool senf::DVBDemuxProtocol::eof()
 
 ///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_
-//#include "DVBDemuxProtocol.mpp"
+//#include "DVBDemuxSocketProtocol.mpp"
 
 \f
 // Local Variables:

diff --git a/Socket/Protocols/DVB/DVBDemuxProtocol.hh b/Socket/Protocols/DVB/DVBDemuxSocketProtocol.hh
similarity index 85%
rename from Socket/Protocols/DVB/DVBDemuxProtocol.hh
rename to Socket/Protocols/DVB/DVBDemuxSocketProtocol.hh
index fd9e8da..e5963e9 100644 (file)
--- a/Socket/Protocols/DVB/DVBDemuxProtocol.hh
+++ b/Socket/Protocols/DVB/DVBDemuxSocketProtocol.hh
@@ -21,17 +21,17 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief DVBDemuxProtocol public header */
+    \brief DVBDemuxSocketProtocol public header */
 
-#ifndef HH_DVBDemuxProtocol_
-#define HH_DVBDemuxProtocol_ 1
+#ifndef HH_DVBDemuxSocketProtocol_
+#define HH_DVBDemuxSocketProtocol_ 1
 
 #include <linux/dvb/dmx.h> 
 
 // Custom includes
 #include "../../../Socket/SocketProtocol.hh"
 
-//#include "DVBProtocol.mpp"
+//#include "DVBSocketProtocol.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
 
 namespace senf {
@@ -41,7 +41,7 @@ namespace senf {
 
     /** xxx
      */
-    class DVBDemuxProtocol
+    class DVBDemuxSocketProtocol
         : public virtual SocketProtocol
     {
     public:
@@ -62,9 +62,9 @@ namespace senf {
 }
 
 ///////////////////////////////hh.e////////////////////////////////////////
-//#include "DVBDemuxProtocol.cci"
-//#include "DVBDemuxProtocol.ct"
-//#include "DVBDemuxProtocol.cti"
+//#include "DVBDemuxSocketProtocol.cci"
+//#include "DVBDemuxSocketProtocol.ct"
+//#include "DVBDemuxSocketProtocol.cti"
 #endif
 
 \f

diff --git a/Socket/Protocols/DVB/DVBFrontendHandle.cc b/Socket/Protocols/DVB/DVBFrontendHandle.cc
index 96ff4f2..28ef5fa 100644 (file)
--- a/Socket/Protocols/DVB/DVBFrontendHandle.cc
+++ b/Socket/Protocols/DVB/DVBFrontendHandle.cc
@@ -40,7 +40,7 @@
 ///////////////////////////////////////////////////////////////////////////
 // senf::DVBFrontendHandle
 
-prefix_ void senf::DVBFrontendProtocol::init_client(uint8_t adapter, boost::uint8_t device)
+prefix_ void senf::DVBFrontendSocketProtocol::init_client(uint8_t adapter, boost::uint8_t device)
     const
 {
     std::string devFrontend = str( boost::format(
@@ -51,19 +51,19 @@ prefix_ void senf::DVBFrontendProtocol::init_client(uint8_t adapter, boost::uint
     fd(f);
 }
 
-prefix_ unsigned senf::DVBFrontendProtocol::available()
+prefix_ unsigned senf::DVBFrontendSocketProtocol::available()
     const
 {
     return 0;
 }
 
-prefix_ bool senf::DVBFrontendProtocol::eof()
+prefix_ bool senf::DVBFrontendSocketProtocol::eof()
     const
 {
     return false;
 }
 
-prefix_ void senf::DVBFrontendProtocol::signalStrength(int16_t *strength)
+prefix_ void senf::DVBFrontendSocketProtocol::signalStrength(int16_t *strength)
     const
 {
     if (::ioctl(fd(), FE_READ_SIGNAL_STRENGTH, strength) < 0)

diff --git a/Socket/Protocols/DVB/DVBFrontendHandle.hh b/Socket/Protocols/DVB/DVBFrontendHandle.hh
index cbe5bd8..275f550 100644 (file)
--- a/Socket/Protocols/DVB/DVBFrontendHandle.hh
+++ b/Socket/Protocols/DVB/DVBFrontendHandle.hh
@@ -53,8 +53,8 @@ namespace senf {
 
     /** \brief xxx
      */
-    class DVBFrontendProtocol
-        : public ConcreteSocketProtocol<DVBFrontend_Policy, DVBFrontendProtocol>
+    class DVBFrontendSocketProtocol
+        : public ConcreteSocketProtocol<DVBFrontend_Policy, DVBFrontendSocketProtocol>
     {
     public:
         ///////////////////////////////////////////////////////////////////////////
@@ -80,7 +80,7 @@ namespace senf {
         void signalStrength(int16_t *strength) const;
     };
 
-    typedef ProtocolClientSocketHandle<DVBFrontendProtocol> DVBFrontendHandle;
+    typedef ProtocolClientSocketHandle<DVBFrontendSocketProtocol> DVBFrontendHandle;
 
     ///@}
 }

diff --git a/Socket/Protocols/INet/ConnectedRawINetSocketHandle.hh b/Socket/Protocols/INet/ConnectedRawINetSocketHandle.hh
index 2707f3b..1ce0c8d 100644 (file)
--- a/Socket/Protocols/INet/ConnectedRawINetSocketHandle.hh
+++ b/Socket/Protocols/INet/ConnectedRawINetSocketHandle.hh
@@ -24,8 +24,8 @@
 #define CONNECTEDRAWINETSOCKETHANDLE_HH_
 
 // Custom includes
-#include "INetProtocol.hh"
-#include "RawINetProtocol.hh"
+#include "INetSocketProtocol.hh"
+#include "RawINetSocketProtocol.hh"
 #include "../../../Socket/Protocols/BSDSocketProtocol.hh"
 #include "../../../Socket/FramingPolicy.hh"
 #include "../../../Socket/CommunicationPolicy.hh"
@@ -75,7 +75,7 @@ namespace senf {
      */
     class ConnectedRawV4SocketProtocol
         : public ConcreteSocketProtocol<ConnectedRawV4Socket_Policy, ConnectedRawV4SocketProtocol>,
-          public RawINetProtocol,
+          public RawINetSocketProtocol,
           public BSDSocketProtocol,
           public AddressableBSDSocketProtocol
     {
@@ -143,7 +143,7 @@ namespace senf {
      */
     class ConnectedRawV6SocketProtocol
         : public ConcreteSocketProtocol<ConnectedRawV6Socket_Policy, ConnectedRawV6SocketProtocol>,
-          public RawINetProtocol,
+          public RawINetSocketProtocol,
           public BSDSocketProtocol,
           public AddressableBSDSocketProtocol
     {

diff --git a/Socket/Protocols/INet/ConnectedUDPSocketHandle.hh b/Socket/Protocols/INet/ConnectedUDPSocketHandle.hh
index 4c5fecb..d3e27e4 100644 (file)
--- a/Socket/Protocols/INet/ConnectedUDPSocketHandle.hh
+++ b/Socket/Protocols/INet/ConnectedUDPSocketHandle.hh
@@ -31,8 +31,8 @@
 #define HH_ConnectedUDPSocketHandle_ 1
 
 // Custom includes
-#include "INetProtocol.hh"
-#include "UDPProtocol.hh"
+#include "INetSocketProtocol.hh"
+#include "UDPSocketProtocol.hh"
 #include "../../../Socket/Protocols/BSDSocketProtocol.hh"
 #include "../../../Socket/FramingPolicy.hh"
 #include "../../../Socket/CommunicationPolicy.hh"
@@ -78,7 +78,7 @@ namespace senf {
      */
     class ConnectedUDPv4SocketProtocol
         : public ConcreteSocketProtocol<ConnectedUDPv4Socket_Policy, ConnectedUDPv4SocketProtocol>,
-          public UDPProtocol,
+          public UDPSocketProtocol,
           public BSDSocketProtocol,
           public AddressableBSDSocketProtocol
     {
@@ -137,7 +137,7 @@ namespace senf {
      */
     class ConnectedUDPv6SocketProtocol
         : public ConcreteSocketProtocol<ConnectedUDPv6Socket_Policy, ConnectedUDPv6SocketProtocol>,
-          public UDPProtocol,
+          public UDPSocketProtocol,
           public BSDSocketProtocol,
           public AddressableBSDSocketProtocol
     {

diff --git a/Socket/Protocols/INet/INetProtocol.cc b/Socket/Protocols/INet/INetSocketProtocol.cc
similarity index 85%
rename from Socket/Protocols/INet/INetProtocol.cc
rename to Socket/Protocols/INet/INetSocketProtocol.cc
index bf32dea..207c5a4 100644 (file)
--- a/Socket/Protocols/INet/INetProtocol.cc
+++ b/Socket/Protocols/INet/INetSocketProtocol.cc
@@ -23,8 +23,8 @@
 /** \file
     \brief INet[46]Protocol non-inline non-template implementation */
 
-#include "INetProtocol.hh"
-//#include "INetProtocol.ih"
+#include "INetSocketProtocol.hh"
+//#include "INetSocketProtocol.ih"
 
 // Custom includes
 #include <sys/socket.h>
@@ -32,21 +32,21 @@
 #include <net/if.h>
 #include "../../../Utils/Exception.hh"
 
-//#include "INetProtocol.mpp"
+//#include "INetSocketProtocol.mpp"
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////
-// senf::INetProtocol
+// senf::INetSocketProtocol
 
-prefix_ void senf::INetProtocol::bindInterface(std::string const & iface)
+prefix_ void senf::INetSocketProtocol::bindInterface(std::string const & iface)
     const
 {
     if (::setsockopt(fd(), SOL_SOCKET, SO_BINDTODEVICE, iface.c_str(), iface.size()) < 0)
         throw SystemException("::setsockopt(SO_BINDTODEVICE)");
 }
 
-prefix_ std::string senf::INetProtocol::bindInterface()
+prefix_ std::string senf::INetSocketProtocol::bindInterface()
 {
     char iface[IFNAMSIZ];
     socklen_t size (sizeof(iface));
@@ -58,14 +58,14 @@ prefix_ std::string senf::INetProtocol::bindInterface()
 }
 
 ///////////////////////////////////////////////////////////////////////////
-// senf::IPv4Protocol
+// senf::IPv4SocketProtocol
 
 ///////////////////////////////////////////////////////////////////////////
-// senf::IPv6Protocol
+// senf::IPv6SocketProtocol
 
 ///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_
-//#include "INetProtocol.mpp"
+//#include "INetSocketProtocol.mpp"
 
 \f
 // Local Variables:

diff --git a/Socket/Protocols/INet/INetProtocol.hh b/Socket/Protocols/INet/INetSocketProtocol.hh
similarity index 92%
rename from Socket/Protocols/INet/INetProtocol.hh
rename to Socket/Protocols/INet/INetSocketProtocol.hh
index b37021e..49a1123 100644 (file)
--- a/Socket/Protocols/INet/INetProtocol.hh
+++ b/Socket/Protocols/INet/INetSocketProtocol.hh
@@ -30,8 +30,8 @@
     for SOCK_DGRAM (UDP) and not SOCK_STREAM (TCP) sockets
  */
 
-#ifndef HH_INetProtocol_
-#define HH_INetProtocol_ 1
+#ifndef HH_INetSocketProtocol_
+#define HH_INetSocketProtocol_ 1
 
 // Custom includes
 #include "../../../Socket/SocketProtocol.hh"
@@ -39,7 +39,7 @@
 #include "../../../Socket/ClientSocketHandle.hh"
 #include "../../../Socket/CommunicationPolicy.hh"
 
-//#include "INetProtocol.mpp"
+//#include "INetSocketProtocol.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
 
 namespace senf {
@@ -47,7 +47,7 @@ namespace senf {
     /// \addtogroup protocol_facets_group
     /// @{
 
-    class INetProtocol
+    class INetSocketProtocol
         : public virtual SocketProtocol
     {
     public:
@@ -74,9 +74,9 @@ namespace senf {
 }
 
 ///////////////////////////////hh.e////////////////////////////////////////
-//#include "INetProtocol.cci"
-//#include "INetProtocol.ct"
-//#include "INetProtocol.cti"
+//#include "INetSocketProtocol.cci"
+//#include "INetSocketProtocol.ct"
+//#include "INetSocketProtocol.cti"
 #endif
 
 \f

diff --git a/Socket/Protocols/INet/MulticastProtocol.cc b/Socket/Protocols/INet/MulticastSocketProtocol.cc
similarity index 80%
rename from Socket/Protocols/INet/MulticastProtocol.cc
rename to Socket/Protocols/INet/MulticastSocketProtocol.cc
index f836495..8c7fb37 100644 (file)
--- a/Socket/Protocols/INet/MulticastProtocol.cc
+++ b/Socket/Protocols/INet/MulticastSocketProtocol.cc
@@ -21,31 +21,31 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief MulticastProtocol non-inline non-template implementation */
+    \brief MulticastSocketProtocol non-inline non-template implementation */
 
-#include "MulticastProtocol.hh"
-//#include "MulticastProtocol.ih"
+#include "MulticastSocketProtocol.hh"
+//#include "MulticastSocketProtocol.ih"
 
 // Custom includes
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <net/if.h> // for if_nametoindex
 
-//#include "MulticastProtocol.mpp"
+//#include "MulticastSocketProtocol.mpp"
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
 ///////////////////////////////////////////////////////////////////////////
-// senf::MulticastProtocol
+// senf::MulticastSocketProtocol
 
-prefix_ void senf::MulticastProtocol::broadcastEnabled(bool v)
+prefix_ void senf::MulticastSocketProtocol::broadcastEnabled(bool v)
 {
     int ivalue (v);
     if (::setsockopt(fd(), SOL_SOCKET, SO_BROADCAST, &ivalue, sizeof(ivalue)) < 0)
         throw SystemException("::setsockopt(SO_BROADCAST)");
 }
 
-prefix_ bool senf::MulticastProtocol::broadcastEnabled()
+prefix_ bool senf::MulticastSocketProtocol::broadcastEnabled()
 {
     int value (0);
     ::socklen_t len (sizeof(value));
@@ -54,7 +54,7 @@ prefix_ bool senf::MulticastProtocol::broadcastEnabled()
     return value;
 }
 
-prefix_ bool senf::MulticastProtocol::mcLoop()
+prefix_ bool senf::MulticastSocketProtocol::mcLoop()
     const
 {
     int value;
@@ -64,7 +64,7 @@ prefix_ bool senf::MulticastProtocol::mcLoop()
     return value;
 }
 
-prefix_ void senf::MulticastProtocol::mcLoop(bool value)
+prefix_ void senf::MulticastSocketProtocol::mcLoop(bool value)
     const
 {
     int ivalue (value);
@@ -72,7 +72,7 @@ prefix_ void senf::MulticastProtocol::mcLoop(bool value)
         throw SystemException();
 }
 
-prefix_ void senf::MulticastProtocol::mcIface(std::string const & iface)
+prefix_ void senf::MulticastSocketProtocol::mcIface(std::string const & iface)
     const
 {
     struct ip_mreqn mreqn;
@@ -86,7 +86,7 @@ prefix_ void senf::MulticastProtocol::mcIface(std::string const & iface)
         throw SystemException();
 }
 
-prefix_ unsigned senf::MulticastProtocol::mcTTL()
+prefix_ unsigned senf::MulticastSocketProtocol::mcTTL()
     const
 {
     int value;
@@ -96,7 +96,7 @@ prefix_ unsigned senf::MulticastProtocol::mcTTL()
     return value;
 }
 
-prefix_ void senf::MulticastProtocol::mcTTL(unsigned value)
+prefix_ void senf::MulticastSocketProtocol::mcTTL(unsigned value)
     const
 {
     if (::setsockopt(fd(),SOL_IP,IP_MULTICAST_TTL,&value,sizeof(value)) < 0)
@@ -104,9 +104,9 @@ prefix_ void senf::MulticastProtocol::mcTTL(unsigned value)
 }
 
 ///////////////////////////////////////////////////////////////////////////
-// senf::INet4MulticastProtocol
+// senf::INet4MulticastSocketProtocol
 
-prefix_ void senf::INet4MulticastProtocol::mcAddMembership(INet4Address const & mcAddr)
+prefix_ void senf::INet4MulticastSocketProtocol::mcAddMembership(INet4Address const & mcAddr)
     const
 {
     struct ip_mreqn mreqn;
@@ -117,7 +117,7 @@ prefix_ void senf::INet4MulticastProtocol::mcAddMembership(INet4Address const &
         throw SystemException("::setsockopt(IP_ADD_MEMBERSHIP");
 }
 
-prefix_ void senf::INet4MulticastProtocol::mcAddMembership(INet4Address const & mcAddr,
+prefix_ void senf::INet4MulticastSocketProtocol::mcAddMembership(INet4Address const & mcAddr,
                                                            INet4Address const & localAddr)
     const
 {
@@ -129,7 +129,7 @@ prefix_ void senf::INet4MulticastProtocol::mcAddMembership(INet4Address const &
         throw SystemException("::setsockopt(IP_ADD_MEMBERSHIP");
 }
 
-prefix_ void senf::INet4MulticastProtocol::mcAddMembership(INet4Address const & mcAddr,
+prefix_ void senf::INet4MulticastSocketProtocol::mcAddMembership(INet4Address const & mcAddr,
                                                            std::string const & iface)
     const
 {
@@ -143,7 +143,7 @@ prefix_ void senf::INet4MulticastProtocol::mcAddMembership(INet4Address const &
         throw SystemException("::setsockopt(IP_ADD_MEMBERSHIP");
 }
 
-prefix_ void senf::INet4MulticastProtocol::mcDropMembership(INet4Address const & mcAddr)
+prefix_ void senf::INet4MulticastSocketProtocol::mcDropMembership(INet4Address const & mcAddr)
     const
 {
     struct ip_mreqn mreqn;
@@ -154,7 +154,7 @@ prefix_ void senf::INet4MulticastProtocol::mcDropMembership(INet4Address const &
         throw SystemException();
 }
 
-prefix_ void senf::INet4MulticastProtocol::mcDropMembership(INet4Address const & mcAddr,
+prefix_ void senf::INet4MulticastSocketProtocol::mcDropMembership(INet4Address const & mcAddr,
                                                             INet4Address const & localAddr)
     const
 {
@@ -166,7 +166,7 @@ prefix_ void senf::INet4MulticastProtocol::mcDropMembership(INet4Address const &
         throw SystemException();
 }
 
-prefix_ void senf::INet4MulticastProtocol::mcDropMembership(INet4Address const & mcAddr,
+prefix_ void senf::INet4MulticastSocketProtocol::mcDropMembership(INet4Address const & mcAddr,
                                                             std::string const & iface)
     const
 {
@@ -181,9 +181,9 @@ prefix_ void senf::INet4MulticastProtocol::mcDropMembership(INet4Address const &
 }
 
 ///////////////////////////////////////////////////////////////////////////
-// senf::INet6MulticastProtocol
+// senf::INet6MulticastSocketProtocol
 
-prefix_ void senf::INet6MulticastProtocol::mcAddMembership(INet6Address const & mcAddr)
+prefix_ void senf::INet6MulticastSocketProtocol::mcAddMembership(INet6Address const & mcAddr)
     const
 {
     struct ipv6_mreq mreqn;
@@ -193,7 +193,7 @@ prefix_ void senf::INet6MulticastProtocol::mcAddMembership(INet6Address const &
         throw SystemException("::setsockopt(IPV6_ADD_MEMBERSHIP");
 }
 
-prefix_ void senf::INet6MulticastProtocol::mcAddMembership(INet6Address const & mcAddr,
+prefix_ void senf::INet6MulticastSocketProtocol::mcAddMembership(INet6Address const & mcAddr,
                                                            std::string const & iface)
 {
     struct ipv6_mreq mreqn;
@@ -205,7 +205,7 @@ prefix_ void senf::INet6MulticastProtocol::mcAddMembership(INet6Address const &
         throw SystemException("::setsockopt(IPV6_ADD_MEMBERSHIP");
 }
 
-prefix_ void senf::INet6MulticastProtocol::mcDropMembership(INet6Address const & mcAddr)
+prefix_ void senf::INet6MulticastSocketProtocol::mcDropMembership(INet6Address const & mcAddr)
     const
 {
     struct ipv6_mreq mreqn;
@@ -216,7 +216,7 @@ prefix_ void senf::INet6MulticastProtocol::mcDropMembership(INet6Address const &
 }
 
 prefix_ void
-senf::INet6MulticastProtocol::mcDropMembership(INet6Address const & mcAddr,
+senf::INet6MulticastSocketProtocol::mcDropMembership(INet6Address const & mcAddr,
                                                std::string const & iface)
     const
 {
@@ -231,7 +231,7 @@ senf::INet6MulticastProtocol::mcDropMembership(INet6Address const & mcAddr,
 
 ///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_
-//#include "MulticastProtocol.mpp"
+//#include "MulticastSocketProtocol.mpp"
 
 \f
 // Local Variables:

diff --git a/Socket/Protocols/INet/MulticastProtocol.hh b/Socket/Protocols/INet/MulticastSocketProtocol.hh
similarity index 96%
rename from Socket/Protocols/INet/MulticastProtocol.hh
rename to Socket/Protocols/INet/MulticastSocketProtocol.hh
index d5398db..1925757 100644 (file)
--- a/Socket/Protocols/INet/MulticastProtocol.hh
+++ b/Socket/Protocols/INet/MulticastSocketProtocol.hh
@@ -21,17 +21,17 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief MulticastProtocol public header */
+    \brief MulticastSocketProtocol public header */
 
-#ifndef HH_MulticastProtocol_
-#define HH_MulticastProtocol_ 1
+#ifndef HH_MulticastSocketProtocol_
+#define HH_MulticastSocketProtocol_ 1
 
 // Custom includes
 #include "../../../Socket/SocketProtocol.hh"
 #include "INet4Address.hh"
 #include "INet6Address.hh"
 
-//#include "MulticastProtocol.mpp"
+//#include "MulticastSocketProtocol.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
 
 namespace senf {
@@ -39,7 +39,7 @@ namespace senf {
     ///\addtogroup protocol_facets_group
     ///\{
    
-    class MulticastProtocol 
+    class MulticastSocketProtocol 
         : public virtual SocketProtocol
     {
     public:
@@ -67,7 +67,7 @@ namespace senf {
                                              data from */
     };
 
-    class INet4MulticastProtocol
+    class INet4MulticastSocketProtocol
         : public virtual SocketProtocol
     {
     public:
@@ -122,7 +122,7 @@ namespace senf {
                                              \param[in] iface interface name */
     };
 
-    class INet6MulticastProtocol
+    class INet6MulticastSocketProtocol
         : public virtual SocketProtocol
     {
     public:
@@ -178,9 +178,9 @@ namespace senf {
 }
 
 ///////////////////////////////hh.e////////////////////////////////////////
-//#include "MulticastProtocol.cci"
-//#include "MulticastProtocol.ct"
-//#include "MulticastProtocol.cti"
+//#include "MulticastSocketProtocol.cci"
+//#include "MulticastSocketProtocol.ct"
+//#include "MulticastSocketProtocol.cti"
 #endif
 
 \f

diff --git a/Socket/Protocols/INet/RawINetSocketHandle.hh b/Socket/Protocols/INet/RawINetSocketHandle.hh
index c7e828e..6424b1f 100644 (file)
--- a/Socket/Protocols/INet/RawINetSocketHandle.hh
+++ b/Socket/Protocols/INet/RawINetSocketHandle.hh
@@ -25,9 +25,9 @@
 
 
 // Custom includes
-#include "INetProtocol.hh"
-#include "RawINetProtocol.hh"
-#include "MulticastProtocol.hh"
+#include "INetSocketProtocol.hh"
+#include "RawINetSocketProtocol.hh"
+#include "MulticastSocketProtocol.hh"
 #include "../../../Socket/Protocols/BSDSocketProtocol.hh"
 #include "../../../Socket/FramingPolicy.hh"
 #include "../../../Socket/CommunicationPolicy.hh"
@@ -75,11 +75,11 @@ namespace senf {
      */
     class RawV4SocketProtocol
         : public ConcreteSocketProtocol<RawV4Socket_Policy, RawV4SocketProtocol>,
-          public RawINetProtocol,
+          public RawINetSocketProtocol,
           public BSDSocketProtocol,
           public AddressableBSDSocketProtocol,
-          public MulticastProtocol,
-          public INet4MulticastProtocol
+          public MulticastSocketProtocol,
+          public INet4MulticastSocketProtocol
     {
     public:
         ///////////////////////////////////////////////////////////////////////////
@@ -143,11 +143,11 @@ namespace senf {
      */
     class RawV6SocketProtocol
         : public ConcreteSocketProtocol<RawV6Socket_Policy,RawV6SocketProtocol>,
-          public RawINetProtocol,
+          public RawINetSocketProtocol,
           public BSDSocketProtocol,
           public AddressableBSDSocketProtocol,
-          public MulticastProtocol,
-          public INet4MulticastProtocol
+          public MulticastSocketProtocol,
+          public INet4MulticastSocketProtocol
     {
     public:
         ///////////////////////////////////////////////////////////////////////////

diff --git a/Socket/Protocols/INet/RawINetProtocol.cc b/Socket/Protocols/INet/RawINetSocketProtocol.cc
similarity index 85%
rename from Socket/Protocols/INet/RawINetProtocol.cc
rename to Socket/Protocols/INet/RawINetSocketProtocol.cc
index 58debf9..636c20f 100644 (file)
--- a/Socket/Protocols/INet/RawINetProtocol.cc
+++ b/Socket/Protocols/INet/RawINetSocketProtocol.cc
@@ -1,4 +1,4 @@
-// $Id: RawINetProtocol.cc 597 2008-01-15 09:16:20Z g0dil $
+// $Id: RawINetSocketProtocol.cc 597 2008-01-15 09:16:20Z g0dil $
 //
 // Copyright (C) 2007
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 
-#include "RawINetProtocol.hh"
+#include "RawINetSocketProtocol.hh"
 
 // Custom includes
 #include <sys/socket.h>
@@ -31,11 +31,11 @@
 #include <net/if.h> // for if_nametoindex
 #include "../../../Socket/SocketHandle.hh"
 
-//#include "UDPProtocol.mpp"
+//#include "UDPSocketProtocol.mpp"
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
-prefix_ unsigned senf::RawINetProtocol::available()
+prefix_ unsigned senf::RawINetSocketProtocol::available()
     const
 {
     int n;
@@ -44,7 +44,7 @@ prefix_ unsigned senf::RawINetProtocol::available()
     return n;
 }
 
-prefix_ bool senf::RawINetProtocol::eof()
+prefix_ bool senf::RawINetSocketProtocol::eof()
     const
 {
     return false;
@@ -52,7 +52,7 @@ prefix_ bool senf::RawINetProtocol::eof()
 
 ///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_
-//#include "UDPProtocol.mpp"
+//#include "UDPSocketProtocol.mpp"
 
 \f
 // Local Variables:

diff --git a/Socket/Protocols/INet/RawINetProtocol.hh b/Socket/Protocols/INet/RawINetSocketProtocol.hh
similarity index 93%
rename from Socket/Protocols/INet/RawINetProtocol.hh
rename to Socket/Protocols/INet/RawINetSocketProtocol.hh
index 902ddd7..6af734a 100644 (file)
--- a/Socket/Protocols/INet/RawINetProtocol.hh
+++ b/Socket/Protocols/INet/RawINetSocketProtocol.hh
@@ -1,4 +1,4 @@
-// $Id: RawINetProtocol.hh 597 2008-01-15 09:16:20Z g0dil $
+// $Id: RawINetSocketProtocol.hh 597 2008-01-15 09:16:20Z g0dil $
 //
 // Copyright (C) 2007
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
@@ -25,7 +25,7 @@
 
 // Custom includes
 #include "INetAddressing.hh"
-#include "INetProtocol.hh"
+#include "INetSocketProtocol.hh"
 #include "../../../Socket/Protocols/BSDSocketProtocol.hh"
 #include "../../../Socket/FramingPolicy.hh"
 #include "../../../Socket/CommunicationPolicy.hh"
@@ -43,7 +43,7 @@ namespace senf {
         which are available on a PF_INET[6]/RAW socket.
         
      */
-    class RawINetProtocol
+    class RawINetSocketProtocol
         : public virtual SocketProtocol
     {
     public:

diff --git a/Socket/Protocols/INet/TCPSocketHandle.hh b/Socket/Protocols/INet/TCPSocketHandle.hh
index 9039518..fb5d4d6 100644 (file)
--- a/Socket/Protocols/INet/TCPSocketHandle.hh
+++ b/Socket/Protocols/INet/TCPSocketHandle.hh
@@ -31,8 +31,8 @@
 #define HH_TCPSocketHandle_ 1
 
 // Custom includes
-#include "INetProtocol.hh"
-#include "TCPProtocol.hh"
+#include "INetSocketProtocol.hh"
+#include "TCPSocketProtocol.hh"
 #include "../../../Socket/Protocols/BSDSocketProtocol.hh"
 #include "../../../Socket/FramingPolicy.hh"
 #include "../../../Socket/CommunicationPolicy.hh"
@@ -80,7 +80,7 @@ namespace senf {
      */
     class TCPv4SocketProtocol
         : public ConcreteSocketProtocol<TCPv4Socket_Policy,TCPv4SocketProtocol>,
-          public TCPProtocol,
+          public TCPSocketProtocol,
           public BSDSocketProtocol,
           public AddressableBSDSocketProtocol
     {
@@ -155,7 +155,7 @@ namespace senf {
      */
     class TCPv6SocketProtocol
         : public ConcreteSocketProtocol<TCPv6Socket_Policy,TCPv6SocketProtocol>,
-          public TCPProtocol,
+          public TCPSocketProtocol,
           public BSDSocketProtocol,
           public AddressableBSDSocketProtocol
     {

diff --git a/Socket/Protocols/INet/TCPProtocol.cc b/Socket/Protocols/INet/TCPSocketProtocol.cc
similarity index 81%
rename from Socket/Protocols/INet/TCPProtocol.cc
rename to Socket/Protocols/INet/TCPSocketProtocol.cc
index 6cfe2b6..4888934 100644 (file)
--- a/Socket/Protocols/INet/TCPProtocol.cc
+++ b/Socket/Protocols/INet/TCPSocketProtocol.cc
@@ -21,11 +21,11 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief TCPProtocol non-inline non-template implementation
+    \brief TCPSocketProtocol non-inline non-template implementation
  */
 
-#include "TCPProtocol.hh"
-//#include "TCPProtocol.ih"
+#include "TCPSocketProtocol.hh"
+//#include "TCPSocketProtocol.ih"
 
 // Custom includes
 #include <sys/socket.h>
@@ -35,11 +35,11 @@
 #include <linux/sockios.h> // for SIOCINQ / SIOCOUTQ
 #include "../../../Socket/SocketHandle.hh"
 
-//#include "TCPProtocol.mpp"
+//#include "TCPSocketProtocol.mpp"
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
-prefix_ bool senf::TCPProtocol::nodelay()
+prefix_ bool senf::TCPSocketProtocol::nodelay()
     const
 {
     int value;
@@ -49,7 +49,7 @@ prefix_ bool senf::TCPProtocol::nodelay()
     return value;
 }
 
-prefix_ void senf::TCPProtocol::nodelay(bool value)
+prefix_ void senf::TCPSocketProtocol::nodelay(bool value)
     const
 {
     int ivalue (value);
@@ -57,7 +57,7 @@ prefix_ void senf::TCPProtocol::nodelay(bool value)
         throw SystemException();
 }
 
-prefix_ unsigned senf::TCPProtocol::siocinq()
+prefix_ unsigned senf::TCPSocketProtocol::siocinq()
     const
 {
     int n;
@@ -66,7 +66,7 @@ prefix_ unsigned senf::TCPProtocol::siocinq()
     return n;
 }
 
-prefix_ unsigned senf::TCPProtocol::siocoutq()
+prefix_ unsigned senf::TCPSocketProtocol::siocoutq()
     const
 {
     int n;
@@ -75,13 +75,13 @@ prefix_ unsigned senf::TCPProtocol::siocoutq()
     return n;
 }
 
-prefix_ unsigned senf::TCPProtocol::available()
+prefix_ unsigned senf::TCPSocketProtocol::available()
     const
 {
     return siocinq();
 }
 
-prefix_ bool senf::TCPProtocol::eof()
+prefix_ bool senf::TCPSocketProtocol::eof()
     const
 {
     return fh().readable() && available()==0;
@@ -90,7 +90,7 @@ prefix_ bool senf::TCPProtocol::eof()
 
 ///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_
-//#include "TCPProtocol.mpp"
+//#include "TCPSocketProtocol.mpp"
 
 \f
 // Local Variables:

diff --git a/Socket/Protocols/INet/TCPProtocol.hh b/Socket/Protocols/INet/TCPSocketProtocol.hh
similarity index 90%
rename from Socket/Protocols/INet/TCPProtocol.hh
rename to Socket/Protocols/INet/TCPSocketProtocol.hh
index 914a3fa..2fb2b3e 100644 (file)
--- a/Socket/Protocols/INet/TCPProtocol.hh
+++ b/Socket/Protocols/INet/TCPSocketProtocol.hh
@@ -21,16 +21,16 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief TCPProtocol public header
+    \brief TCPSocketProtocol public header
  */
 
-#ifndef HH_TCPProtocol_
-#define HH_TCPProtocol_ 1
+#ifndef HH_TCPSocketProtocol_
+#define HH_TCPSocketProtocol_ 1
 
 // Custom includes
 #include "../../../Socket/SocketProtocol.hh"
 
-//#include "TCPProtocol.mpp"
+//#include "TCPSocketProtocol.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
 
 namespace senf {
@@ -43,7 +43,7 @@ namespace senf {
         This protocol facet provides all those protocol functions,
         which are available on any TCP socket.
      */
-    class TCPProtocol
+    class TCPSocketProtocol
         : public virtual SocketProtocol
     {
     public:
@@ -72,9 +72,9 @@ namespace senf {
 }
 
 ///////////////////////////////hh.e////////////////////////////////////////
-//#include "TCPProtocol.cci"
-//#include "TCPProtocol.ct"
-//#include "TCPProtocol.cti"
+//#include "TCPSocketProtocol.cci"
+//#include "TCPSocketProtocol.ct"
+//#include "TCPSocketProtocol.cti"
 #endif
 
 \f

diff --git a/Socket/Protocols/INet/UDPSocketHandle.hh b/Socket/Protocols/INet/UDPSocketHandle.hh
index b8a8fd5..cbb427b 100644 (file)
--- a/Socket/Protocols/INet/UDPSocketHandle.hh
+++ b/Socket/Protocols/INet/UDPSocketHandle.hh
@@ -31,9 +31,9 @@
 #define HH_UDPSocketHandle_ 1
 
 // Custom includes
-#include "INetProtocol.hh"
-#include "UDPProtocol.hh"
-#include "MulticastProtocol.hh"
+#include "INetSocketProtocol.hh"
+#include "UDPSocketProtocol.hh"
+#include "MulticastSocketProtocol.hh"
 #include "../../../Socket/Protocols/BSDSocketProtocol.hh"
 #include "../../../Socket/Protocols/DatagramSocketProtocol.hh"
 #include "../../../Socket/FramingPolicy.hh"
@@ -80,9 +80,9 @@ namespace senf {
      */
     class UDPv4SocketProtocol
         : public ConcreteSocketProtocol<UDPv4Socket_Policy, UDPv4SocketProtocol>,
-          public UDPProtocol,
-          public MulticastProtocol,
-          public INet4MulticastProtocol,
+          public UDPSocketProtocol,
+          public MulticastSocketProtocol,
+          public INet4MulticastSocketProtocol,
           public BSDSocketProtocol,
           public DatagramSocketProtocol,
           public AddressableBSDSocketProtocol
@@ -141,9 +141,9 @@ namespace senf {
      */
     class UDPv6SocketProtocol
         : public ConcreteSocketProtocol<UDPv6Socket_Policy, UDPv6SocketProtocol>,
-          public UDPProtocol,
-          public MulticastProtocol,
-          public INet6MulticastProtocol,
+          public UDPSocketProtocol,
+          public MulticastSocketProtocol,
+          public INet6MulticastSocketProtocol,
           public BSDSocketProtocol,
           public DatagramSocketProtocol,
           public AddressableBSDSocketProtocol

diff --git a/Socket/Protocols/INet/UDPProtocol.cc b/Socket/Protocols/INet/UDPSocketProtocol.cc
similarity index 85%
rename from Socket/Protocols/INet/UDPProtocol.cc
rename to Socket/Protocols/INet/UDPSocketProtocol.cc
index 70ff4c5..4c61e76 100644 (file)
--- a/Socket/Protocols/INet/UDPProtocol.cc
+++ b/Socket/Protocols/INet/UDPSocketProtocol.cc
@@ -21,11 +21,11 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief TCPProtocol non-inline non-template implementation
+    \brief TCPSocketProtocol non-inline non-template implementation
  */
 
-#include "UDPProtocol.hh"
-//#include "UDPProtocol.ih"
+#include "UDPSocketProtocol.hh"
+//#include "UDPSocketProtocol.ih"
 
 // Custom includes
 #include <sys/socket.h>
@@ -36,11 +36,11 @@
 #include <net/if.h> // for if_nametoindex
 #include "../../../Socket/SocketHandle.hh"
 
-//#include "UDPProtocol.mpp"
+//#include "UDPSocketProtocol.mpp"
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
-prefix_ unsigned senf::UDPProtocol::available()
+prefix_ unsigned senf::UDPSocketProtocol::available()
     const
 {
     int n;
@@ -49,7 +49,7 @@ prefix_ unsigned senf::UDPProtocol::available()
     return n;
 }
 
-prefix_ bool senf::UDPProtocol::eof()
+prefix_ bool senf::UDPSocketProtocol::eof()
     const
 {
     return false;
@@ -57,7 +57,7 @@ prefix_ bool senf::UDPProtocol::eof()
 
 ///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_
-//#include "UDPProtocol.mpp"
+//#include "UDPSocketProtocol.mpp"
 
 \f
 // Local Variables:

diff --git a/Socket/Protocols/INet/UDPProtocol.hh b/Socket/Protocols/INet/UDPSocketProtocol.hh
similarity index 87%
rename from Socket/Protocols/INet/UDPProtocol.hh
rename to Socket/Protocols/INet/UDPSocketProtocol.hh
index 96b541f..f1f89eb 100644 (file)
--- a/Socket/Protocols/INet/UDPProtocol.hh
+++ b/Socket/Protocols/INet/UDPSocketProtocol.hh
@@ -21,17 +21,17 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief UDPProtocol public header
+    \brief UDPSocketProtocol public header
  */
 
-#ifndef HH_UDPProtocol_
-#define HH_UDPProtocol_ 1
+#ifndef HH_UDPSocketProtocol_
+#define HH_UDPSocketProtocol_ 1
 
 // Custom includes
 #include "../../../Socket/SocketProtocol.hh"
 #include "INetAddressing.hh"
 
-//#include "UDPProtocol.mpp"
+//#include "UDPSocketProtocol.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
 
 namespace senf {
@@ -44,7 +44,7 @@ namespace senf {
         This protocol facet provides all those protocol functions,
         which are available on any UDP socket.
      */
-    class UDPProtocol
+    class UDPSocketProtocol
         : public virtual SocketProtocol
     {
     public:
@@ -61,9 +61,9 @@ namespace senf {
 }
 
 ///////////////////////////////hh.e////////////////////////////////////////
-//#include "UDPProtocol.cci"
-//#include "UDPProtocol.ct"
-//#include "UDPProtocol.cti"
+//#include "UDPSocketProtocol.cci"
+//#include "UDPSocketProtocol.ct"
+//#include "UDPSocketProtocol.cti"
 #endif
 
 \f

diff --git a/Socket/Protocols/Raw/MACAddress.hh b/Socket/Protocols/Raw/MACAddress.hh
index f3aad01..f8739be 100644 (file)
--- a/Socket/Protocols/Raw/MACAddress.hh
+++ b/Socket/Protocols/Raw/MACAddress.hh
@@ -69,7 +69,8 @@ namespace senf {
                                         /**< The string representation must exactly match the form
                                              <tt>dd:dd:dd:dd:dd:dd</tt> where <tt>d</tt> is any
                                              hexadecimal digit. In place of ':', '-' is also
-                                             accepted as a delimiter. */
+                                             accepted as a delimiter.
+                                             \throws AddressSyntaxException */
 
         template <class InputIterator> 
         static MACAddress from_data(InputIterator i);

diff --git a/Socket/Protocols/Raw/PacketSocketHandle.cc b/Socket/Protocols/Raw/PacketSocketHandle.cc
index fc0c1f9..54345f1 100644 (file)
--- a/Socket/Protocols/Raw/PacketSocketHandle.cc
+++ b/Socket/Protocols/Raw/PacketSocketHandle.cc
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief PacketProtocol and PacketSocketHandle non-inline non-template implementation
+    \brief PacketSocketProtocol and PacketSocketHandle non-inline non-template implementation
  */
 
 #include "PacketSocketHandle.hh"
@@ -40,7 +40,7 @@
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
-prefix_ void senf::PacketProtocol::init_client(SocketType type, int protocol)
+prefix_ void senf::PacketSocketProtocol::init_client(SocketType type, int protocol)
     const
 {
     int socktype = SOCK_RAW;
@@ -54,7 +54,7 @@ prefix_ void senf::PacketProtocol::init_client(SocketType type, int protocol)
     fd(sock);
 }
 
-prefix_ unsigned senf::PacketProtocol::available()
+prefix_ unsigned senf::PacketSocketProtocol::available()
     const
 {
     if (! fh().readable())
@@ -65,7 +65,7 @@ prefix_ unsigned senf::PacketProtocol::available()
     return l;
 }
 
-prefix_ bool senf::PacketProtocol::eof()
+prefix_ bool senf::PacketSocketProtocol::eof()
     const
 {
     return false;
@@ -90,14 +90,14 @@ namespace {
 
 }
 
-prefix_ void senf::PacketProtocol::mcAdd(std::string const & interface,
+prefix_ void senf::PacketSocketProtocol::mcAdd(std::string const & interface,
                                          MACAddress const & address)
     const
 {
     do_mc(fd(),interface,address,true);
 }
 
-prefix_ void senf::PacketProtocol::mcDrop(std::string const & interface,
+prefix_ void senf::PacketSocketProtocol::mcDrop(std::string const & interface,
                                           MACAddress const & address)
     const
 {

diff --git a/Socket/Protocols/Raw/PacketSocketHandle.hh b/Socket/Protocols/Raw/PacketSocketHandle.hh
index 4869214..a5f643a 100644 (file)
--- a/Socket/Protocols/Raw/PacketSocketHandle.hh
+++ b/Socket/Protocols/Raw/PacketSocketHandle.hh
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief PacketProtocol and PacketSocketHandle public header
+    \brief PacketSocketProtocol and PacketSocketHandle public header
  */
 
 #ifndef HH_PacketSocketHandle_
@@ -52,7 +52,7 @@ namespace senf {
         UnconnectedCommunicationPolicy,
         ReadablePolicy,
         WriteablePolicy
-        >::policy Packet_Policy;        ///< Policy of PacketProtocol
+        >::policy Packet_Policy;        ///< Policy of PacketSocketProtocol
 
     /** \brief Raw Packet-Socket access (Linux)
 
@@ -67,15 +67,15 @@ namespace senf {
         \par Address Type:
         LLSocketAddress
 
-        The PacketProtocol provides access to the linux packet socket API. This API gives access to
+        The PacketSocketProtocol provides access to the linux packet socket API. This API gives access to
         the low level network packets. The packet socket allows read() and write() operations. The
-        PacketProtocol has no concept of a server socket.
+        PacketSocketProtocol has no concept of a server socket.
 
         This class is utilized as the protocol class of the ProtocolClientSocketHandle via the
         Socket Handle typedefs above.
      */
-    class PacketProtocol
-        : public ConcreteSocketProtocol<Packet_Policy, PacketProtocol>,
+    class PacketSocketProtocol
+        : public ConcreteSocketProtocol<Packet_Policy, PacketSocketProtocol>,
           public BSDSocketProtocol
     {
     public:
@@ -132,8 +132,8 @@ namespace senf {
         ///@}
     };
 
-    typedef ProtocolClientSocketHandle<PacketProtocol> PacketSocketHandle;
-                                        ///< SocketHandle of the PacketProtocol
+    typedef ProtocolClientSocketHandle<PacketSocketProtocol> PacketSocketHandle;
+                                        ///< SocketHandle of the PacketSocketProtocol
                                         /**< \related PacketPrototol */
 
     /// @}

diff --git a/Socket/Protocols/Raw/TunTapSocketHandle.cc b/Socket/Protocols/Raw/TunTapSocketHandle.cc
index 564a8b5..8784b99 100644 (file)
--- a/Socket/Protocols/Raw/TunTapSocketHandle.cc
+++ b/Socket/Protocols/Raw/TunTapSocketHandle.cc
@@ -39,13 +39,13 @@
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
-prefix_ void senf::TapProtocol::init_client() 
+prefix_ void senf::TapSocketProtocol::init_client() 
     const
 {
     init_client(std::string());
 }
 
-prefix_ void senf::TapProtocol::init_client(std::string const & interface_name, bool const NO_PI) 
+prefix_ void senf::TapSocketProtocol::init_client(std::string const & interface_name, bool const NO_PI) 
     const
 {
     int f;
@@ -62,7 +62,7 @@ prefix_ void senf::TapProtocol::init_client(std::string const & interface_name,
     fd(f);
 }
 
-prefix_ unsigned senf::TapProtocol::available()
+prefix_ unsigned senf::TapSocketProtocol::available()
   const
 {
   if (! fh().readable())
@@ -77,7 +77,7 @@ prefix_ unsigned senf::TapProtocol::available()
 /*
 #include <linux/sockios.h> // for SIOCINQ / SIOCOUTQ
 
-prefix_ unsigned senf::TapProtocol::available()
+prefix_ unsigned senf::TapSocketProtocol::available()
   const
 {
   if (! body().readable())
@@ -89,7 +89,7 @@ prefix_ unsigned senf::TapProtocol::available()
 }
 */
 
-prefix_ bool senf::TapProtocol::eof()
+prefix_ bool senf::TapSocketProtocol::eof()
     const
 {
     return false;

diff --git a/Socket/Protocols/Raw/TunTapSocketHandle.hh b/Socket/Protocols/Raw/TunTapSocketHandle.hh
index f2c21f2..751aef0 100644 (file)
--- a/Socket/Protocols/Raw/TunTapSocketHandle.hh
+++ b/Socket/Protocols/Raw/TunTapSocketHandle.hh
@@ -21,7 +21,7 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief PacketProtocol and PacketSocketHandle public header
+    \brief PacketSocketProtocol and PacketSocketHandle public header
  */
 
 #ifndef HH_TunTapSocketHandle_
@@ -70,8 +70,8 @@ namespace senf {
         This class is utilized as the protocol class of the ProtocolClientSocketHandle via the
         Socket Handle typedefs above.
      */
-    class TapProtocol
-        : public ConcreteSocketProtocol<Tap_Policy,TapProtocol>,
+    class TapSocketProtocol
+        : public ConcreteSocketProtocol<Tap_Policy,TapSocketProtocol>,
           public BSDSocketProtocol
     {
     public:
@@ -102,8 +102,8 @@ namespace senf {
         ///@}
     };
 
-    typedef ProtocolClientSocketHandle<TapProtocol> TapSocketHandle;
-                                        ///< SocketHandle of TapProtocol
+    typedef ProtocolClientSocketHandle<TapSocketProtocol> TapSocketHandle;
+                                        ///< SocketHandle of TapSocketProtocol
                                         /**< \related TapPrototol */
 
     /// @}

diff --git a/Socket/Protocols/UN/ConnectedUNDatagramSocketHandle.hh b/Socket/Protocols/UN/ConnectedUNDatagramSocketHandle.hh
index 9e7cecf..fc7493b 100644 (file)
--- a/Socket/Protocols/UN/ConnectedUNDatagramSocketHandle.hh
+++ b/Socket/Protocols/UN/ConnectedUNDatagramSocketHandle.hh
@@ -28,7 +28,7 @@
 
 // Custom includes
 #include "UNAddressing.hh"
-#include "UNProtocol.hh"
+#include "UNSocketProtocol.hh"
 #include "../../../Socket/Protocols/BSDSocketProtocol.hh"
 #include "../../../Socket/FramingPolicy.hh"
 #include "../../../Socket/CommunicationPolicy.hh"
@@ -73,7 +73,7 @@ namespace senf {
     class ConnectedUNDatagramSocketProtocol
         : public ConcreteSocketProtocol<ConnectedUNDatagramSocket_Policy,
                                         ConnectedUNDatagramSocketProtocol>,
-          public UNProtocol, 
+          public UNSocketProtocol, 
           public BSDSocketProtocol,
           public AddressableBSDSocketProtocol
     {

diff --git a/Socket/Protocols/UN/UNDatagramSocketHandle.hh b/Socket/Protocols/UN/UNDatagramSocketHandle.hh
index a1a7b23..03e5d53 100644 (file)
--- a/Socket/Protocols/UN/UNDatagramSocketHandle.hh
+++ b/Socket/Protocols/UN/UNDatagramSocketHandle.hh
@@ -28,7 +28,7 @@
 
 // Custom includes
 #include "UNAddressing.hh"
-#include "UNProtocol.hh"
+#include "UNSocketProtocol.hh"
 #include "../../../Socket/Protocols/BSDSocketProtocol.hh"
 #include "../../../Socket/FramingPolicy.hh"
 #include "../../../Socket/CommunicationPolicy.hh"
@@ -73,7 +73,7 @@ namespace senf {
     class UNDatagramSocketProtocol
         : public ConcreteSocketProtocol<UNDatagramSocket_Policy,
                                         UNDatagramSocketProtocol>,
-          public UNProtocol, 
+          public UNSocketProtocol, 
           public BSDSocketProtocol,
           public AddressableBSDSocketProtocol
     {

diff --git a/Socket/Protocols/UN/UNProtocol.cc b/Socket/Protocols/UN/UNSocketProtocol.cc
similarity index 82%
rename from Socket/Protocols/UN/UNProtocol.cc
rename to Socket/Protocols/UN/UNSocketProtocol.cc
index f86458c..7cc6b5f 100644 (file)
--- a/Socket/Protocols/UN/UNProtocol.cc
+++ b/Socket/Protocols/UN/UNSocketProtocol.cc
@@ -21,10 +21,10 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief UNProtocol non-inline non-template implementation */
+    \brief UNSocketProtocol non-inline non-template implementation */
 
-#include "UNProtocol.hh"
-//#include "UNProtocol.ih"
+#include "UNSocketProtocol.hh"
+//#include "UNSocketProtocol.ih"
 
 // Custom includes
 #include <fstream>
@@ -33,10 +33,10 @@
 #include <linux/sockios.h> // for SIOCINQ / SIOCOUTQ
 #include "../../../Utils/Exception.hh"
 
-//#include "UNProtocol.mpp"
+//#include "UNSocketProtocol.mpp"
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
-prefix_ unsigned senf::UNProtocol::available()
+prefix_ unsigned senf::UNSocketProtocol::available()
     const
 {
     int n;
@@ -45,13 +45,13 @@ prefix_ unsigned senf::UNProtocol::available()
     return n;
 }
 
-prefix_ bool senf::UNProtocol::eof()
+prefix_ bool senf::UNSocketProtocol::eof()
     const
 {
     return false;
 }
 
-prefix_ void senf::UNProtocol::close() 
+prefix_ void senf::UNSocketProtocol::close() 
     const
 {
     check_and_unlink();
@@ -59,7 +59,7 @@ prefix_ void senf::UNProtocol::close()
     SocketProtocol::close();
 }
 
-prefix_ void senf::UNProtocol::terminate() 
+prefix_ void senf::UNSocketProtocol::terminate() 
     const
 {
     check_and_unlink();
@@ -67,7 +67,7 @@ prefix_ void senf::UNProtocol::terminate()
     SocketProtocol::terminate();
 }
 
-prefix_ void senf::UNProtocol::check_and_unlink()
+prefix_ void senf::UNSocketProtocol::check_and_unlink()
     const
 {
     typedef ClientSocketHandle<MakeSocketPolicy<UNAddressingPolicy>::policy> UNSocketHandle;
@@ -81,7 +81,7 @@ prefix_ void senf::UNProtocol::check_and_unlink()
     
 ///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_
-//#include "UNProtocol.mpp"
+//#include "UNSocketProtocol.mpp"
 
 \f
 // Local Variables:

diff --git a/Socket/Protocols/UN/UNProtocol.hh b/Socket/Protocols/UN/UNSocketProtocol.hh
similarity index 91%
rename from Socket/Protocols/UN/UNProtocol.hh
rename to Socket/Protocols/UN/UNSocketProtocol.hh
index ccf1ddc..d7a4699 100644 (file)
--- a/Socket/Protocols/UN/UNProtocol.hh
+++ b/Socket/Protocols/UN/UNSocketProtocol.hh
@@ -21,10 +21,10 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief UNProtocol public header */
+    \brief UNSocketProtocol public header */
 
-#ifndef HH_UNProtocol_
-#define HH_UNProtocol_ 1
+#ifndef HH_UNSocketProtocol_
+#define HH_UNSocketProtocol_ 1
 
 // Custom includes
 #include "../../../Socket/SocketProtocol.hh"
@@ -32,7 +32,7 @@
 #include "../../../Socket/ClientSocketHandle.hh"
 #include "../../../Socket/CommunicationPolicy.hh"
 
-//#include "UNProtocol.mpp"
+//#include "UNSocketProtocol.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
 
 namespace senf {
@@ -45,7 +45,7 @@ namespace senf {
         This protocol facet introduces all the socket api protocol members which are related to Unix 
         Domain addressing.
      */
-    class UNProtocol
+    class UNSocketProtocol
         : public virtual SocketProtocol
     {
     public:
@@ -75,9 +75,9 @@ namespace senf {
 }
 
 ///////////////////////////////hh.e////////////////////////////////////////
-//#include "UNProtocol.cci"
-//#include "UNProtocol.ct"
-//#include "UNProtocol.cti"
+//#include "UNSocketProtocol.cci"
+//#include "UNSocketProtocol.ct"
+//#include "UNSocketProtocol.cti"
 #endif
 
 \f

diff --git a/Socket/Protocols/UN/UNProtocol.test.cc b/Socket/Protocols/UN/UNSocketProtocol.test.cc
similarity index 90%
rename from Socket/Protocols/UN/UNProtocol.test.cc
rename to Socket/Protocols/UN/UNSocketProtocol.test.cc
index dacb3c7..7b3ce29 100644 (file)
--- a/Socket/Protocols/UN/UNProtocol.test.cc
+++ b/Socket/Protocols/UN/UNSocketProtocol.test.cc
@@ -21,13 +21,13 @@
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /** \file
-    \brief UNProtocol.test unit tests */
+    \brief UNSocketProtocol.test unit tests */
 
-//#include "UNProtocol.test.hh"
-//#include "UNProtocol.test.ih"
+//#include "UNSocketProtocol.test.hh"
+//#include "UNSocketProtocol.test.ih"
 
 // Custom includes
-#include "UNProtocol.hh"
+#include "UNSocketProtocol.hh"
 
 #include "../../../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>

diff --git a/Socket/ServerSocketHandle.test.cc b/Socket/ServerSocketHandle.test.cc
index fbe85ae..0180144 100644 (file)
--- a/Socket/ServerSocketHandle.test.cc
+++ b/Socket/ServerSocketHandle.test.cc
@@ -40,13 +40,13 @@
 namespace {
 
     class MySocketHandle
-        : public senf::ServerSocketHandle<senf::test::SomeProtocol::Policy>
+        : public senf::ServerSocketHandle<senf::test::SomeSocketProtocol::Policy>
     {
     public:
         MySocketHandle()
-            : senf::ServerSocketHandle<senf::test::SomeProtocol::Policy>(
+            : senf::ServerSocketHandle<senf::test::SomeSocketProtocol::Policy>(
                 std::auto_ptr<senf::SocketBody>(
-                    new senf::ProtocolSocketBody<senf::test::SomeProtocol>(true)))
+                    new senf::ProtocolSocketBody<senf::test::SomeSocketProtocol>(true)))
             {}
     };
 
@@ -65,7 +65,7 @@ BOOST_AUTO_UNIT_TEST(serverSocketHandle)
     OtherSocketHandle osh (myh);
     osh = myh;
 
-    typedef senf::ServerSocketHandle<senf::test::SomeProtocol::Policy> SomeSocketHandle;
+    typedef senf::ServerSocketHandle<senf::test::SomeSocketProtocol::Policy> SomeSocketHandle;
     SomeSocketHandle ssh = senf::static_socket_cast<SomeSocketHandle>(osh);
 
     typedef senf::ServerSocketHandle<senf::MakeSocketPolicy<

diff --git a/Socket/SocketHandle.test.cc b/Socket/SocketHandle.test.cc
index 709fb9f..63fff9e 100644 (file)
--- a/Socket/SocketHandle.test.cc
+++ b/Socket/SocketHandle.test.cc
@@ -39,13 +39,13 @@
 namespace {
 
     class MySocketHandle
-        : public senf::SocketHandle<senf::test::SomeProtocol::Policy>
+        : public senf::SocketHandle<senf::test::SomeSocketProtocol::Policy>
     {
     public:
         MySocketHandle()
-            : senf::SocketHandle<senf::test::SomeProtocol::Policy>(
+            : senf::SocketHandle<senf::test::SomeSocketProtocol::Policy>(
                 std::auto_ptr<senf::SocketBody>(
-                    new senf::ProtocolSocketBody<senf::test::SomeProtocol>(false, 0)))
+                    new senf::ProtocolSocketBody<senf::test::SomeSocketProtocol>(false, 0)))
             {}
     };
 
@@ -71,7 +71,7 @@ BOOST_AUTO_UNIT_TEST(socketHandle)
         OtherSocketHandle osh (myh);
         osh = myh;
 
-        typedef senf::SocketHandle<senf::test::SomeProtocol::Policy> SomeSocketHandle;
+        typedef senf::SocketHandle<senf::test::SomeSocketProtocol::Policy> SomeSocketHandle;
         SomeSocketHandle ssh = senf::static_socket_cast<SomeSocketHandle>(osh);
 
         BOOST_CHECK_NO_THROW( senf::dynamic_socket_cast<SomeSocketHandle>(osh) );
@@ -91,13 +91,13 @@ BOOST_AUTO_UNIT_TEST(socketHandle)
                            "file.handle: 0\n"
                            "file.refcount: 3\n"
                            "handle: senf::SocketHandle<senf::SocketPolicy<senf::test::SomeAddressingPolicy, senf::test::SomeFramingPolicy, senf::test::SomeCommunicationPolicy, senf::test::SomeReadPolicy, senf::test::SomeWritePolicy> >\n"
-                           "socket.protocol: senf::test::SomeProtocol\n"
+                           "socket.protocol: senf::test::SomeSocketProtocol\n"
                            "socket.protocol.policy: senf::SocketPolicy<senf::test::SomeAddressingPolicy, senf::test::SomeFramingPolicy, senf::test::SomeCommunicationPolicy, senf::test::SomeReadPolicy, senf::test::SomeWritePolicy>\n"
                            "socket.server: false\n" );
     }
     
     // Ensure, the destructor is called and calls the correct close() implementation
-    BOOST_CHECK_EQUAL( senf::test::SomeProtocol::closeCount(), 1u );
+    BOOST_CHECK_EQUAL( senf::test::SomeSocketProtocol::closeCount(), 1u );
 }
 
 ///////////////////////////////cc.e////////////////////////////////////////

diff --git a/Socket/SocketProtocol.hh b/Socket/SocketProtocol.hh
index 72ddad5..ef4f22d 100644 (file)
--- a/Socket/SocketProtocol.hh
+++ b/Socket/SocketProtocol.hh
@@ -39,12 +39,12 @@
     <area shape="rect" alt="SocketProtocol" href="classsenf_1_1SocketProtocol.html" title="SocketProtocol" coords="1,2,120,26" />
     <area shape="rect" alt="BSDSocketProtocol" href="classsenf_1_1BSDSocketProtocol.html" title="BSDSocketProtocol" coords="124,118,276,143" />
     <area shape="rect" alt="AddressableBSDSocketProtocol" href="classsenf_1_1AddressableBSDSocketProtocol.html" title="AddressableBSDSocketProtocol" coords="82,200,314,224" />
-    <area shape="rect" alt="IPv4Protocol" href="classsenf_1_1IPv4Protocol.html" title="IPv4Protocol" coords="149,272,252,296" />
-    <area shape="rect" alt="IPv6Protocol" href="classsenf_1_1IPv6Protocol.html" title="IPv6Protocol" coords="149,335,251,359" />
-    <area shape="rect" alt="TCPProtocol" href="classsenf_1_1TCPProtocol.html" title="TCPProtocol" coords="151,398,248,420" />
+    <area shape="rect" alt="IPv4SocketProtocol" href="classsenf_1_1IPv4SocketProtocol.html" title="IPv4SocketProtocol" coords="149,272,252,296" />
+    <area shape="rect" alt="IPv6SocketProtocol" href="classsenf_1_1IPv6SocketProtocol.html" title="IPv6SocketProtocol" coords="149,335,251,359" />
+    <area shape="rect" alt="TCPSocketProtocol" href="classsenf_1_1TCPSocketProtocol.html" title="TCPSocketProtocol" coords="151,398,248,420" />
     <area shape="rect" alt="TCPv4SocketProtocol" href="classsenf_1_1TCPv4SocketProtocol.html" title="TCPv4SocketProtocol" coords="288,471,405,494" />
     <area shape="rect" alt="TCPv6SocketProtocol" href="classsenf_1_1TCPv6SocketProtocol.html" title="TCPv6SocketProtocol" coords="424,470,540,494" />
-    <area shape="rect" alt="PacketProtocol" href="classsenf_1_1PacketProtocol.html" title="PacketProtocol" coords="560,469,680,495" />
+    <area shape="rect" alt="PacketSocketProtocol" href="classsenf_1_1PacketSocketProtocol.html" title="PacketSocketProtocol" coords="560,469,680,495" />
     </map>
     <img src="Protocols.png" border="0" alt="Protocols" usemap="#protocols">
     \endhtmlonly
@@ -266,7 +266,7 @@ namespace senf {
         A protocol implementation may define the protocol interface directly. It can also
         (additionally) make use of multiple inheritance to combine a set of protocol facets into a
         specific protocol implementation (i.e. TCPv4SocketProtocol inherits from
-        ConcreteSocketProtocol and from the protocol facets IPv4Protocol, TCPProtocol,
+        ConcreteSocketProtocol and from the protocol facets IPv4SocketProtocol, TCPSocketProtocol,
         BSDSocketProtocol and AddressableBSDSocketProtocol). The protocol facets are not concrete
         protocols themselves, they are combined to build concrete protocols. This structure will
         remove a lot of code duplication. It is important to ensure, that the protocol facets do not

diff --git a/Socket/SocketProtocol.test.cc b/Socket/SocketProtocol.test.cc
index a3ba523..a6e855b 100644 (file)
--- a/Socket/SocketProtocol.test.cc
+++ b/Socket/SocketProtocol.test.cc
@@ -38,7 +38,7 @@
 
 BOOST_AUTO_UNIT_TEST(socketProtocol)
 {
-    senf::test::SomeProtocol protocol;
+    senf::test::SomeSocketProtocol protocol;
 
     // This would fail an assertion ...
     // BOOST_CHECK( protocol.body() == 0 );

diff --git a/Socket/SocketProtocol.test.hh b/Socket/SocketProtocol.test.hh
index 68a6466..bdfb5f7 100644 (file)
--- a/Socket/SocketProtocol.test.hh
+++ b/Socket/SocketProtocol.test.hh
@@ -34,11 +34,11 @@
 namespace senf {
 namespace test {
 
-    class SomeProtocol
-        : public ConcreteSocketProtocol<SomeSocketPolicy,SomeProtocol>
+    class SomeSocketProtocol
+        : public ConcreteSocketProtocol<SomeSocketPolicy,SomeSocketProtocol>
     {
     public:
-        ~SomeProtocol() {}
+        ~SomeSocketProtocol() {}
 
         void init_client() const { fd(0); }
         void init_server() const { fd(0); }

diff --git a/Utils/Exception.cc b/Utils/Exception.cc
index 5e69277..28073e6 100644 (file)
--- a/Utils/Exception.cc
+++ b/Utils/Exception.cc
@@ -44,6 +44,17 @@ prefix_ char const * senf::Exception::what()
     return message_.c_str();
 }
 
+///////////////////////////////////////////////////////////////////////////
+// senf::SystemException
+
+prefix_ void senf::SystemException::init(std::string const & where, int code)
+{
+    code_ = code;
+    if (! where.empty())
+        (*this) << where << ": ";
+    (*this) << "(" << code << ") " << description();
+}
+
 ///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_
 

diff --git a/Utils/Exception.cci b/Utils/Exception.cci
index 84f5d7b..efe4961 100644 (file)
--- a/Utils/Exception.cci
+++ b/Utils/Exception.cci
@@ -82,14 +82,6 @@ prefix_  senf::SystemException::~SystemException()
     throw()
 {}
 
-prefix_ void senf::SystemException::init(std::string const & where, int code)
-{
-    code_ = code;
-    if (! where.empty())
-        (*this) << where << ": ";
-    (*this) << "(" << code << ") " << description();
-}
-
 ///////////////////////////////cci.e///////////////////////////////////////
 #undef prefix_