Packet/DefaultBundle: Make IPv6PacketparserExtension_Fragment reserver fields private

Socket: Remove net/if.h include from NetDeviceController.hh

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

diff --git a/Packets/DefaultBundle/IPv6Extensions.hh b/Packets/DefaultBundle/IPv6Extensions.hh
index 4a88310..bac52d5 100644 (file)
--- a/Packets/DefaultBundle/IPv6Extensions.hh
+++ b/Packets/DefaultBundle/IPv6Extensions.hh
@@ -46,14 +46,14 @@ namespace senf {
     {
 #       include SENF_FIXED_PARSER()
 
-        SENF_PARSER_FIELD( nextHeader     , UInt8Parser );
-        SENF_PARSER_FIELD( reserved1      , UInt8Parser );
+        SENF_PARSER_FIELD            ( nextHeader     , UInt8Parser  );
+        SENF_PARSER_PRIVATE_FIELD    ( reserved1      , UInt8Parser  );
 
-        SENF_PARSER_BITFIELD( fragmentOffset, 13, unsigned );
-        SENF_PARSER_BITFIELD( reserved2,       2, unsigned );
-        SENF_PARSER_BITFIELD( moreFragments,   1, bool     );
+        SENF_PARSER_BITFIELD         ( fragmentOffset , 13, unsigned );
+        SENF_PARSER_PRIVATE_BITFIELD ( reserved2      ,  2, unsigned );
+        SENF_PARSER_BITFIELD         ( moreFragments  ,  1, bool     );
 
-        SENF_PARSER_FIELD( id             , UInt32Parser   );
+        SENF_PARSER_FIELD            ( id             , UInt32Parser );
 
         SENF_PARSER_FINALIZE(IPv6PacketParserExtension_Fragment);
     };

diff --git a/Socket/NetdeviceController.hh b/Socket/NetdeviceController.hh
index ed74c18..6e8c06c 100644 (file)
--- a/Socket/NetdeviceController.hh
+++ b/Socket/NetdeviceController.hh
@@ -29,13 +29,14 @@
 
 // Custom includes
 #include <string>
-#include <net/if.h>
 #include "Protocols/Raw/MACAddress.hh"
 
 
 //#include "NetdeviceController.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
 
+struct ifreq;
+
 namespace senf {
 
     /** \brief Netdevice Controller