Merged revisions 570-572,574-575,578-579,581-595,598-611 via svnmerge from

[senf.git] / Socket / Protocols / INet / ConnectedRawINetSocketHandle.hh

diff --git a/Socket/Protocols/INet/ConnectedRawInetSocketHandle.hh b/Socket/Protocols/INet/ConnectedRawINetSocketHandle.hh
similarity index 96%
rename from Socket/Protocols/INet/ConnectedRawInetSocketHandle.hh
rename to Socket/Protocols/INet/ConnectedRawINetSocketHandle.hh
index 3fb1bd7..5cd86f8 100644 (file)
--- a/Socket/Protocols/INet/ConnectedRawInetSocketHandle.hh
+++ b/Socket/Protocols/INet/ConnectedRawINetSocketHandle.hh
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: ConnectedRawINetSocketHandle.hh 597 2008-01-15 09:16:20Z g0dil $
 //
 // Copyright (C) 2007 
 // Fraunhofer Institute for Open Communication Systems (FOKUS) 
@@ -25,12 +25,11 @@
 
 // Custom includes
 #include "INetProtocol.hh"
-#include "RawInetProtocol.hh"
+#include "RawINetProtocol.hh"
 #include "../../../Socket/Protocols/BSDSocketProtocol.hh"
 #include "../../../Socket/FramingPolicy.hh"
 #include "../../../Socket/CommunicationPolicy.hh"
 #include "../../../Socket/ReadWritePolicy.hh"
-#include "../../../Socket/BufferingPolicy.hh"
 #include "../../../Socket/ProtocolClientSocketHandle.hh"
 
 
@@ -46,8 +45,7 @@ namespace senf {
         DatagramFramingPolicy,
         ConnectedCommunicationPolicy,
         ReadablePolicy,
-        WriteablePolicy,
-        SocketBufferingPolicy
+        WriteablePolicy
         >::policy ConnectedRawV4Socket_Policy;   ///< Socket Policy of the Connected RawV4 Protocol
 
     /** \brief IPv4 RAW Socket Protocol, connected
@@ -78,7 +76,7 @@ namespace senf {
     class ConnectedRawV4SocketProtocol
         : public ConcreteSocketProtocol<ConnectedRawV4Socket_Policy>,
           public IPv4Protocol,
-          public RawInetProtocol,
+          public RawINetProtocol,
           public BSDSocketProtocol,
           public AddressableBSDSocketProtocol//,
 //          public senf::pool_alloc_mixin<RawV4Socket_Policy>
@@ -122,8 +120,7 @@ namespace senf {
         DatagramFramingPolicy,
         ConnectedCommunicationPolicy,
         ReadablePolicy,
-        WriteablePolicy,
-        SocketBufferingPolicy
+        WriteablePolicy
         >::policy ConnectedRawV6Socket_Policy;   ///< Socket Policy of the RawV6 Protocol
 
     /** \brief IPv6 RAW Socket Protocol, connected
@@ -154,7 +151,7 @@ namespace senf {
     class ConnectedRawV6SocketProtocol
         : public ConcreteSocketProtocol<ConnectedRawV6Socket_Policy>,
           public IPv6Protocol,
-          public RawInetProtocol,
+          public RawINetProtocol,
           public BSDSocketProtocol,
           public AddressableBSDSocketProtocol//,
 //          public senf::pool_alloc_mixin<RawV6SocketProtocol>