X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FDefaultBundle%2FEthernetPacket.hh;h=b317c32e9b0edd2b3f64a657bd60e83f475b8904;hb=e3179a2123ad51d0d9eb63834a581145c4f77c92;hp=b38edfc0ffd79676ffc6dfc13187f200e83a6464;hpb=9cb871b939efe93e35dd96808d25089399acfc46;p=senf.git

diff --git a/senf/Packets/DefaultBundle/EthernetPacket.hh b/senf/Packets/DefaultBundle/EthernetPacket.hh
index b38edfc..b317c32 100644
--- a/senf/Packets/DefaultBundle/EthernetPacket.hh
+++ b/senf/Packets/DefaultBundle/EthernetPacket.hh
@@ -27,12 +27,11 @@
 #define HH_SENF_Packets_DefaultBundle_EthernetPacket_ 1
 
 // Custom includes
-#include <algorithm>
 #include <senf/Socket/Protocols/Raw/MACAddress.hh>
 #include <senf/Packets/Packets.hh>
 
 //#include "EthernetPacket.mpp"
-///////////////////////////////hh.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf {
 
@@ -43,21 +42,15 @@ namespace senf {
         \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
@@ -199,7 +192,7 @@ namespace senf {
 
 }
 
-///////////////////////////////hh.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 //#include "EthernetPacket.cci"
 //#include "EthernetPacket.ct"
 //#include "EthernetPacket.cti"