Socket/Protocols: Move incorrectly placed members from AddressableBSDSocketProtocol...

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

diff --git a/Socket/Protocols/INet/ConnectedRawINetSocketHandle.hh b/Socket/Protocols/INet/ConnectedRawINetSocketHandle.hh
index e1795d3..0f29279 100644 (file)
--- a/Socket/Protocols/INet/ConnectedRawINetSocketHandle.hh
+++ b/Socket/Protocols/INet/ConnectedRawINetSocketHandle.hh
@@ -1,8 +1,8 @@
 // $Id: ConnectedRawINetSocketHandle.hh 597 2008-01-15 09:16:20Z g0dil $
 //
-// Copyright (C) 2007 
-// Fraunhofer Institute for Open Communication Systems (FOKUS) 
-// Competence Center NETwork research (NET), St. Augustin, GERMANY 
+// Copyright (C) 2007
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
 //     David Wagner <dw6@berlios.de>
 //
 // This program is free software; you can redistribute it and/or modify
@@ -24,9 +24,10 @@
 #define CONNECTEDRAWINETSOCKETHANDLE_HH_
 
 // Custom includes
-#include "INetProtocol.hh"
-#include "RawINetProtocol.hh"
+#include "INetSocketProtocol.hh"
+#include "RawINetSocketProtocol.hh"
 #include "../../../Socket/Protocols/BSDSocketProtocol.hh"
+#include "../../../Socket/Protocols/DatagramSocketProtocol.hh"
 #include "../../../Socket/FramingPolicy.hh"
 #include "../../../Socket/CommunicationPolicy.hh"
 #include "../../../Socket/ReadWritePolicy.hh"
@@ -75,9 +76,9 @@ namespace senf {
      */
     class ConnectedRawV4SocketProtocol
         : public ConcreteSocketProtocol<ConnectedRawV4Socket_Policy, ConnectedRawV4SocketProtocol>,
-          public IPv4Protocol,
-          public RawINetProtocol,
+          public RawINetSocketProtocol,
           public BSDSocketProtocol,
+         public DatagramSocketProtocol,
           public AddressableBSDSocketProtocol
     {
     public:
@@ -144,9 +145,9 @@ namespace senf {
      */
     class ConnectedRawV6SocketProtocol
         : public ConcreteSocketProtocol<ConnectedRawV6Socket_Policy, ConnectedRawV6SocketProtocol>,
-          public IPv6Protocol,
-          public RawINetProtocol,
+          public RawINetSocketProtocol,
           public BSDSocketProtocol,
+         public DatagramSocketProtocol,
           public AddressableBSDSocketProtocol
     {
     public: