X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2F80211Bundle%2FWLANBeaconPacket.hh;h=a8accfaecb89ec06a9fe4e7b3054b65077aada6a;hb=3fe57f6d48f9061fa70628ac832537de30d24b92;hp=fcfe80d06aa9dd6f8610de2191731ca222e616ea;hpb=a3f9296f648c4991a1576d4200abfdc72788bc16;p=senf.git

diff --git a/senf/Packets/80211Bundle/WLANBeaconPacket.hh b/senf/Packets/80211Bundle/WLANBeaconPacket.hh
index fcfe80d..a8accfa 100644
--- a/senf/Packets/80211Bundle/WLANBeaconPacket.hh
+++ b/senf/Packets/80211Bundle/WLANBeaconPacket.hh
@@ -28,7 +28,6 @@
 #define HH_SENF_Packets_80211Bundle_WLANBeaconPacket_ 1
 
 // Custom includes
-#include <senf/Packets/Packets.hh>
 #include "InformationElements.hh"
 
 ///////////////////////////////hh.p////////////////////////////////////////
@@ -38,38 +37,41 @@ namespace senf {
     {
     #   include SENF_PARSER()
 
-        SENF_PARSER_FIELD( timestamp,      UInt64LSBParser );
-        SENF_PARSER_FIELD( beaconInterval, UInt16LSBParser );
-        SENF_PARSER_SKIP(2,2); //capability flags
+        SENF_PARSER_FIELD( timestamp,      UInt64LSBParser   );
+        SENF_PARSER_FIELD( beaconInterval, UInt16LSBParser   );
+        SENF_PARSER_SKIP ( 2,2); //capability flags
 
-        //SSID element
-//        SENF_PARSER_FIELD()
+        SENF_PARSER_FIELD( ssidIE, WLANSSIDInfoElementParser );
+        WLANSSIDInfoElementParser::value_t ssid() const { return ssidIE().value(); }
         
-        SENF_PARSER_FINALIZE( WLANBeaconPacketParser );
+        SENF_PARSER_FIELD( supportedRatesIE, WLANSupportedRatesInfoElementParser );
+        
+        SENF_PARSER_LIST ( ieList, packetSize(), WLANGenericInfoElementParser );
         
+        SENF_PARSER_FINALIZE( WLANBeaconPacketParser );
     };
 
  
     /** \brief WLAN Beacon frame packet
 
         \par Packet type (typedef):
-            \refWLANBeaconPacket
+            \ref WLANBeaconPacket
 
         \par Fields:
 
         \ingroup protocolbundle_80211
      */
     struct WLANBeaconPacketType
-        : public senf::PacketTypeBase,
-          public senf::PacketTypeMixin<WLANBeaconPacketType>
+        : public PacketTypeBase,
+          public PacketTypeMixin<WLANBeaconPacketType>
     {
-        typedef senf::PacketTypeMixin<WLANBeaconPacketType> mixin;
-        typedef senf::ConcretePacket<WLANBeaconPacketType> packet;
+        typedef PacketTypeMixin<WLANBeaconPacketType> mixin;
+        typedef ConcretePacket<WLANBeaconPacketType> packet;
         typedef WLANBeaconPacketParser parser;
 
         using mixin::init;
         using mixin::initSize;
-        using senf::PacketTypeBase::nextPacketRange;
+        using PacketTypeBase::nextPacketRange;
 
         static void dump(packet p, std::ostream &os);
     };