X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2F80211Bundle%2FWLANPacket.hh;h=4a91e39ba9f3ad284de6ba0a239fc724370bba10;hb=e3179a2123ad51d0d9eb63834a581145c4f77c92;hp=b0539d60f8f0a1d88ed38b3e72076f8b3a498230;hpb=5a7344d1bc318ab9105b71d65a0cc86337dcd4d5;p=senf.git

diff --git a/senf/Packets/80211Bundle/WLANPacket.hh b/senf/Packets/80211Bundle/WLANPacket.hh
index b0539d6..4a91e39 100644
--- a/senf/Packets/80211Bundle/WLANPacket.hh
+++ b/senf/Packets/80211Bundle/WLANPacket.hh
@@ -30,7 +30,7 @@
 #include <senf/Packets/DefaultBundle/EthernetPacket.hh>
 #include <senf/Packets/DefaultBundle/LlcSnapPacket.hh>
 
-///////////////////////////////hh.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf
 {
@@ -41,7 +41,7 @@ namespace senf
 
         Frame base class.
      */
-    struct WLANPacketParser : public senf::PacketParserBase
+    struct WLANPacketParser : public PacketParserBase
     {
     #   include SENF_PARSER()
 
@@ -66,7 +66,7 @@ namespace senf
         SENF_PARSER_FINALIZE(WLANPacketParser);
     };
 
-    ///////////////////////////////////////////////////////////////////////////
+    //-////////////////////////////////////////////////////////////////////////
 
     /** \brief Management frame parser
         <b>Re-ordering of bits due to LSB byte order</b>
@@ -93,12 +93,14 @@ namespace senf
         boost::uint16_t sequenceNumber() const {
             return (uint16_t)(seqNumber_2()) << 4 | seqNumber_1();
         };
+
+        void sequenceNumber(boost::uint16_t sn);
     };
 
     /** \brief WLAN Management frame packet
 
         \par Packet type (typedef):
-            \refWLANPacket_MgtFrame
+            \ref WLANPacket_MgtFrame
 
         \par Fields:
             \ref WLANPacket_MgtFrameParser
@@ -107,23 +109,26 @@ namespace senf
         \ingroup protocolbundle_80211
      */
     struct WLANPacket_MgtFrameType
-        : public senf::PacketTypeBase,
-          public senf::PacketTypeMixin<WLANPacket_MgtFrameType>
+        : public PacketTypeBase,
+          public PacketTypeMixin<WLANPacket_MgtFrameType>
     {
-        typedef senf::PacketTypeMixin<WLANPacket_MgtFrameType> mixin;
-        typedef senf::ConcretePacket<WLANPacket_MgtFrameType> packet;
+        typedef PacketTypeMixin<WLANPacket_MgtFrameType> mixin;
+        typedef ConcretePacket<WLANPacket_MgtFrameType> packet;
         typedef WLANPacket_MgtFrameParser parser;
 
         using mixin::init;
         using mixin::initSize;
-        using senf::PacketTypeBase::nextPacketRange;
+        using PacketTypeBase::nextPacketRange;
 
-        static void dump(packet p, std::ostream &os);
+        static void dump(packet p, std::ostream & os);
     };
 
+    /** \brief WLAN Management frame packet typedef
+        \ingroup protocolbundle_80211
+     */
     typedef WLANPacket_MgtFrameType::packet WLANPacket_MgtFrame;
 
-    ///////////////////////////////////////////////////////////////////////////
+    //-////////////////////////////////////////////////////////////////////////
 
     /** \brief Control frame parser
         <b>Re-ordering of bits due to LSB byte order</b>
@@ -162,23 +167,26 @@ namespace senf
         \ingroup protocolbundle_80211
      */
     struct WLANPacket_CtrlFrameType
-        : public senf::PacketTypeBase,
-          public senf::PacketTypeMixin<WLANPacket_CtrlFrameType>
+        : public PacketTypeBase,
+          public PacketTypeMixin<WLANPacket_CtrlFrameType>
     {
-        typedef senf::PacketTypeMixin<WLANPacket_CtrlFrameType> mixin;
-        typedef senf::ConcretePacket<WLANPacket_CtrlFrameType> packet;
+        typedef PacketTypeMixin<WLANPacket_CtrlFrameType> mixin;
+        typedef ConcretePacket<WLANPacket_CtrlFrameType> packet;
         typedef WLANPacket_CtrlFrameParser parser;
 
         using mixin::init;
         using mixin::initSize;
-        using senf::PacketTypeBase::nextPacketRange;
+        using PacketTypeBase::nextPacketRange;
 
-        static void dump(packet p, std::ostream &os);
+        static void dump(packet p, std::ostream & os);
     };
 
+    /** \brief WLAN Control frame packet typedef
+        \ingroup protocolbundle_80211
+     */
     typedef WLANPacket_CtrlFrameType::packet WLANPacket_CtrlFrame;
 
-    ///////////////////////////////////////////////////////////////////////////
+    //-////////////////////////////////////////////////////////////////////////
 
     /** \brief Data frame parser
         <b>Re-ordering of bits due to LSB byte order</b>
@@ -189,25 +197,36 @@ namespace senf
 
         SENF_PARSER_INHERIT(WLANPacketParser);
 
-        SENF_PARSER_GOTO(subtype);
-        SENF_PARSER_SKIP_BITS(14);                                //<pkgdraw: hide
-        SENF_PARSER_PRIVATE_BITFIELD ( dsBits,  2,  unsigned   ); //<pkgdraw: hide
-        SENF_PARSER_SKIP             ( 2, 2                    ); //<pkgdraw: hide
+    protected:
+        typedef UIntFieldParser<6, 6+2> dsBits_t;
+        dsBits_t::value_type dsBits() const { return parse<dsBits_t>( 1); }
 
-        SENF_PARSER_PRIVATE_FIELD    ( addr1, MACAddressParser );
-        SENF_PARSER_PRIVATE_FIELD    ( addr2, MACAddressParser );
-        SENF_PARSER_PRIVATE_FIELD    ( addr3, MACAddressParser );
+        MACAddressParser addr1() const { return parse<MACAddressParser>(  4); }
+        MACAddressParser addr2() const { return parse<MACAddressParser>( 10); }
+        MACAddressParser addr3() const { return parse<MACAddressParser>( 16); }
 
         //sequence Number and fragment number
         //shift bits manually due to LSB
-        SENF_PARSER_PRIVATE_BITFIELD ( seqNumber_1,    4, unsigned );
-        SENF_PARSER_BITFIELD         ( fragmentNumber, 4, unsigned );
-        SENF_PARSER_PRIVATE_FIELD    ( seqNumber_2,    UInt8Parser );
 
+        typedef UIntFieldParser<0, 0+4> seqNumber_1_t;
+        seqNumber_1_t seqNumber_1() const { return parse<seqNumber_1_t>( 22); }
+
+    public:
+        typedef UIntFieldParser<4, 4+4> fragmentNumber_t;
+        fragmentNumber_t fragmentNumber() const { return parse<fragmentNumber_t>( 22); }
+
+    protected:
+        UInt8Parser seqNumber_2() const { return parse<UInt8Parser>( 23); }
+
+    public:
         boost::uint16_t sequenceNumber() const {
             return (uint16_t)(seqNumber_2()) << 4 | seqNumber_1();
         };
 
+        void sequenceNumber(boost::uint16_t sn);
+
+        SENF_PARSER_GOTO_OFFSET( 24, 24);
+
         // TODO fourth address field in case of WDS
         // SENF_PARSER_PRIVATE_VARIANT (wds_, dsBits,
         //     ( novalue ( disable_addr4,               VoidPacketParser ))
@@ -246,30 +265,33 @@ namespace senf
         \ingroup protocolbundle_80211
      */
     struct WLANPacket_DataFrameType
-        : public senf::PacketTypeBase,
-          public senf::PacketTypeMixin<WLANPacket_DataFrameType>
+        : public PacketTypeBase,
+          public PacketTypeMixin<WLANPacket_DataFrameType>
     {
-        typedef senf::PacketTypeMixin<WLANPacket_DataFrameType> mixin;
-        typedef senf::ConcretePacket<WLANPacket_DataFrameType> packet;
+        typedef PacketTypeMixin<WLANPacket_DataFrameType> mixin;
+        typedef ConcretePacket<WLANPacket_DataFrameType> packet;
         typedef WLANPacket_DataFrameParser parser;
 
         using mixin::init;
         using mixin::initSize;
         using mixin::nextPacketRange;
 
-        static factory_t nextPacketType(packet p) { 
-            return p->subtype() == 0 || p->subtype() == 8 
-                ? LlcSnapPacket::factory() 
+        static factory_t nextPacketType(packet p) {
+            return p->subtype() == 0 || p->subtype() == 8
+                ? LlcSnapPacket::factory()
                 : no_factory();
         }
 
-        static void dump(packet p, std::ostream &os);
+        static void dump(packet p, std::ostream & os);
     };
 
+    /** \brief WLAN Data frame packet typedef
+        \ingroup protocolbundle_80211
+     */
     typedef WLANPacket_DataFrameType::packet WLANPacket_DataFrame;
 }
 
-///////////////////////////////hh.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 //#include "WLANPacket.cci"
 //#include "WLANPacket.ct"
 //#include "WLANPacket.cti"