X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2F80211Bundle%2FWLANBeaconPacket.hh;h=028336c5b23b22be6049d55f97bc885111c52578;hb=ddb2132be4265f8a0d7d4c954c7c9401e59d027c;hp=1e762e15d6c1b43e5894929d6c4b7bf8d0e800ed;hpb=d1284f9a03b4e3a8624842ecd39304403f53a960;p=senf.git diff --git a/senf/Packets/80211Bundle/WLANBeaconPacket.hh b/senf/Packets/80211Bundle/WLANBeaconPacket.hh index 1e762e1..028336c 100644 --- a/senf/Packets/80211Bundle/WLANBeaconPacket.hh +++ b/senf/Packets/80211Bundle/WLANBeaconPacket.hh @@ -1,101 +1,98 @@ // $Id$ // -// Copyright (C) 2008 +// Copyright (C) 2009 // Fraunhofer Institute for Open Communication Systems (FOKUS) -// Competence Center NETwork research (NET), St. Augustin, GERMANY -// Christian Niephaus // -// 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 +// Christian Niephaus /** \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 - +// 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) - Re-ordering of bits due to host byte order - - 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 + : public PacketTypeBase, + public PacketTypeMixin { - typedef senf::PacketTypeMixin mixin; - typedef senf::ConcretePacket packet; + typedef PacketTypeMixin mixin; + typedef ConcretePacket 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 WLANBeaconPacket; - } -#endif /* HH_SENF_Packets_80211Bundle_WLANBeaconPacket_ */ +//-///////////////////////////////////////////////////////////////////////////////////////////////// +//#include "WLANBeaconPacket.cci" +//#include "WLANBeaconPacket.ct" +//#include "WLANBeaconPacket.cti" +#endif // Local Variables: