From 1485aeb263a5d1471cbe6ff3356c3ca3ad023f57 Mon Sep 17 00:00:00 2001
From: g0dil <g0dil@wiback.org>
Date: Fri, 3 Apr 2009 22:11:47 +0000
Subject: [PATCH] Packet/DefaultBundle: Make IPv6PacketparserExtension_Fragment
reserver fields private Socket: Remove net/if.h include from
NetDeviceController.hh
---
Packets/DefaultBundle/IPv6Extensions.hh | 12 ++++++------
Socket/NetdeviceController.hh | 3 ++-
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/Packets/DefaultBundle/IPv6Extensions.hh b/Packets/DefaultBundle/IPv6Extensions.hh
index 4a88310eb..bac52d5c4 100644
--- 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 ed74c18f8..6e8c06c87 100644
--- 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
--
GitLab