// $Id$
//
-// Copyright (C) 2008
+// Copyright (C) 2009
// Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-// Christian Niephaus <cni@berlios.de>
//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+// http://senf.berlios.de/license.html
//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on,
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the
-// Free Software Foundation, Inc.,
-// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+// Software distributed under the License is distributed on an "AS IS" basis,
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V.
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+// Thorsten Horstmann <tho@berlios.de>
+// Christian Niephaus <cni@berlios.de>
/** \file
- \brief 802.11 WLANPacket public header */
+ \brief 802.11 WLAN Beacon Packet public header */
#ifndef HH_SENF_Packets_80211Bundle_WLANBeaconPacket_
#define HH_SENF_Packets_80211Bundle_WLANBeaconPacket_ 1
-#include <senf/Packets/Packets.hh>
-
+// Custom includes
+#include "InformationElements.hh"
-namespace senf
-{
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
+namespace senf {
- /** \brief 802.11 Beacon Frame parser
- (see IEEE 802.11-2007 standard - Chapter 7.2.3.1 Frame formats)
- <b>Re-ordering of bits due to host byte order</b>
-
- Frame base class.
- */
+ struct WLANBeaconPacketParser : public PacketParserBase
+ {
+ # include SENF_PARSER()
-// struct WLANBeaconPacketParser : public senf::PacketParserBase
-// {
-// #include SENF_PARSER();
-// SENF_PARSER_FIELD( elementId, UInt8Parser);
-// SENF_PARSER_FIELD( length, UInt8Parser);
-//
-// }
+ SENF_PARSER_FIELD( timestamp, UInt64LSBParser );
+ SENF_PARSER_FIELD( beaconInterval, UInt16LSBParser );
+ SENF_PARSER_SKIP ( 2,2); //capability flags
+ SENF_PARSER_FIELD( ssidIE, WLANSSIDInfoElementParser );
+ WLANSSIDInfoElementParser::value_t ssid() const { return ssidIE().value(); }
- struct WLANBeaconPacketParser : public senf::PacketParserBase
- {
- # include SENF_PARSER()
+ SENF_PARSER_FIELD( supportedRatesIE, WLANSupportedRatesInfoElementParser );
- SENF_PARSER_FIELD(timestamp, UInt64LSBParser);
- SENF_PARSER_FIELD(beaconInterval, UInt16LSBParser);
- SENF_PARSER_SKIP(2,2); //capability flags
+ SENF_PARSER_LIST ( ieList, packetSize(), WLANGenericInfoElementParser );
- //SSID element
-// SENF_PARSER_FIELD()
-
- SENF_PARSER_FINALIZE(WLANBeaconPacketParser);
-
+ SENF_PARSER_FINALIZE( WLANBeaconPacketParser );
};
-
+
/** \brief WLAN Beacon frame packet
\par Packet type (typedef):
- \refWLANBeaconPacket
+ \ref WLANBeaconPacket
\par Fields:
- \ref WLANBeaconPacket_MgtFrameParser
- \image html WLANBeaconPacket.png
\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);
+ static void dump(packet p, std::ostream & os);
};
+ /** \brief WLAN Beacon frame packet typedef
+ \ingroup protocolbundle_80211
+ */
typedef ConcretePacket<WLANBeaconPacketType> WLANBeaconPacket;
-
}
-#endif /* HH_SENF_Packets_80211Bundle_WLANBeaconPacket_ */
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
+//#include "WLANBeaconPacket.cci"
+//#include "WLANBeaconPacket.ct"
+//#include "WLANBeaconPacket.cti"
+#endif
\f
// Local Variables:
projects / senf.git / blobdiff