X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FDefaultBundle%2FEthernetPacket.hh;h=5a38c98b604d8b80b809e8498853937290cb9a8b;hb=9bc655e14d2d8c204ed835896cb51e42d49bd68f;hp=51a2389e2774e8b18397f248746025871897c285;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Packets/DefaultBundle/EthernetPacket.hh b/senf/Packets/DefaultBundle/EthernetPacket.hh
index 51a2389..5a38c98 100644
--- a/senf/Packets/DefaultBundle/EthernetPacket.hh
+++ b/senf/Packets/DefaultBundle/EthernetPacket.hh
@@ -28,38 +28,32 @@
 
 // Custom includes
 #include <algorithm>
-#include "../../Socket/Protocols/Raw/MACAddress.hh"
-#include "../../Packets/Packets.hh"
+#include <senf/Socket/Protocols/Raw/MACAddress.hh>
+#include <senf/Packets/Packets.hh>
 
 //#include "EthernetPacket.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
 
 namespace senf {
 
-    /** \brief Parse an Ethernet MAC address 
+    /** \brief Parse an Ethernet MAC address
 
         The ethernet MAC is returned by value as a 6-byte sequence
 
         \see MACAddress \n
             EthernetPacket
      */
-    struct MACAddressParser : public PacketParserBase
+    struct MACAddressParser
+        : public ValueParserBase<MACAddressParser, MACAddress, 6u>
     {
-        MACAddressParser(data_iterator i, state_type s) : PacketParserBase(i,s,fixed_bytes) {}
-       
-        ///////////////////////////////////////////////////////////////////////////
-
-        typedef MACAddress value_type;
-        static const size_type fixed_bytes = 6u;
+        MACAddressParser(data_iterator i, state_type s) : Base(i,s) {}
 
         value_type value() const { return MACAddress::from_data(i()); }
         void value(value_type const & v) { std::copy(v.begin(), v.end(), i()); }
-        operator value_type () { return value(); }
-        byte & operator[](size_type index) { return *boost::next(i(),index);  }
 
-        MACAddressParser const & operator= (value_type const & other) { value(other); return *this; }
+        using Base::operator=;
     };
-    
+
     /** \brief Parse an Ethernet packet
 
         Parser implementing an ethernet header.
@@ -80,7 +74,7 @@ namespace senf {
     /** \brief EtherType registry
 
         This registry registers packet types with their EtherType number.
-        
+
         \see <a href="http://www.iana.org/assignments/ethernet-numbers">Ethernet numbers</a> \n
             \ref PacketRegistry
      */
@@ -121,15 +115,18 @@ namespace senf {
 
         static factory_t nextPacketType(packet p);
         /// Dump given EthernetPacket in readable form to given output stream
-        static void dump(packet p, std::ostream & os); 
+        static void dump(packet p, std::ostream & os);
         static void finalize(packet p);
     };
 
-    /** \brief Ethernet packet typedef */
+    /** \brief Ethernet packet typedef
+        \ingroup protocolbundle_default
+     */
     typedef ConcretePacket<EthernetPacketType> EthernetPacket;
 
+
     /** \brief Parse an ethernet VLAN tag
-        
+
         Parser interpreting the ethernet VLAN tag. Fields are
 
         \see EthVLanPacketType
@@ -155,7 +152,7 @@ namespace senf {
         \par Fields:
             \ref EthVLanPacketParser
             \image html EthVLanPacket.png
-        
+
         \par Associated registries:
             \ref EtherTypes
 
@@ -165,7 +162,7 @@ namespace senf {
         \ingroup protocolbundle_default
      */
     struct EthVLanPacketType
-        : public PacketTypeBase, 
+        : public PacketTypeBase,
           public PacketTypeMixin<EthVLanPacketType, EtherTypes>
     {
 #ifndef DOXYGEN
@@ -181,7 +178,7 @@ namespace senf {
 
         /** \todo Add LLC/SNAP support -> only use the registry
             for type() values >=1536, otherwise expect an LLC header */
-        static key_t nextPacketKey(packet p) 
+        static key_t nextPacketKey(packet p)
             { return p->type(); }
 
         /// Dump given EthVLanPacket in readable form to given output stream
@@ -189,7 +186,9 @@ namespace senf {
         static void finalize(packet p);
     };
 
-    /** \brief Ethernet VLAN tag typedef */
+    /** \brief Ethernet VLAN tag typedef
+        \ingroup protocolbundle_default
+     */
     typedef ConcretePacket<EthVLanPacketType> EthVLanPacket;
 
 }