X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2F80211Bundle%2FRadiotapPacket.hh;h=c1e9a91a00b6ef3183f4896ca9d2508fc997656a;hb=ddb2132be4265f8a0d7d4c954c7c9401e59d027c;hp=f6bd76e793cd2c347ba9ec700f3a47db81f94457;hpb=01e8fa6cf173c60c3deb47c29c6d56718ef9548e;p=senf.git diff --git a/senf/Packets/80211Bundle/RadiotapPacket.hh b/senf/Packets/80211Bundle/RadiotapPacket.hh index f6bd76e..c1e9a91 100644 --- a/senf/Packets/80211Bundle/RadiotapPacket.hh +++ b/senf/Packets/80211Bundle/RadiotapPacket.hh @@ -2,23 +2,29 @@ // // Copyright (C) 2008 // 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): +// Stefan Bund +// Christian Niephaus /** \file \brief Radiotap header */ @@ -30,7 +36,7 @@ #include #include -///////////////////////////////hh.p//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// namespace senf { /** \brief Parse Flag field in Radiotap header @@ -135,41 +141,6 @@ namespace senf { SENF_PARSER_FIELD ( length, UInt16LSBParser ); SENF_PARSER_PRIVATE_FIELD ( presentFlags, UInt32LSBParser ); - SENF_PARSER_GOTO( presentFlags ); - - // present flags indicate which data fields are contained in the packet - // BEWARE: LSB-first bit-order !! - - // index: 7 - 0 - SENF_PARSER_BITFIELD_RO ( lockQualityPresent, 1, bool ); - SENF_PARSER_BITFIELD_RO ( dbmAntennaNoisePresent, 1, bool ); - SENF_PARSER_BITFIELD_RO ( dbmAntennaSignalPresent, 1, bool ); - SENF_PARSER_BITFIELD_RO ( fhssPresent, 1, bool ); - SENF_PARSER_BITFIELD_RO ( channelOptionsPresent, 1, bool ); - SENF_PARSER_BITFIELD_RO ( ratePresent, 1, bool ); - SENF_PARSER_BITFIELD_RO ( flagsPresent, 1, bool ); - SENF_PARSER_BITFIELD_RO ( tsftPresent, 1, bool ); - - // index: 15 - 8 - SENF_PARSER_BITFIELD_RO ( txFlagsPresent, 1, bool ); - SENF_PARSER_BITFIELD_RO ( rxFlagsPresent, 1, bool ); - SENF_PARSER_BITFIELD_RO ( dbAntennaNoisePresent, 1, bool ); - SENF_PARSER_BITFIELD_RO ( dbAntennaSignalPresent, 1, bool ); - SENF_PARSER_BITFIELD_RO ( antennaPresent, 1, bool ); - SENF_PARSER_BITFIELD_RO ( dbmTxAttenuationPresent, 1, bool ); - SENF_PARSER_BITFIELD_RO ( dbTxAttenuationPresent, 1, bool ); - SENF_PARSER_BITFIELD_RO ( txAttenuationPresent, 1, bool ); - - // index: 23 - 16 - SENF_PARSER_SKIP_BITS ( 6 ); - SENF_PARSER_BITFIELD_RO ( dataRetriesPresent, 1, bool ); - SENF_PARSER_BITFIELD_RO ( rtsRetriesPresent, 1, bool ); - - // index: 31 - 24 - SENF_PARSER_BITFIELD_RO ( extendedBitmaskPresent, 1, bool ); - SENF_PARSER_BITFIELD_RO ( vendorNamespacePresent, 1, bool ); - SENF_PARSER_BITFIELD_RO ( resetRadiotapNamespace, 1, bool ) - SENF_PARSER_SKIP_BITS ( 5 ); SENF_PARSER_FINALIZE ( RadiotapPacketParser_Header ); @@ -195,7 +166,11 @@ namespace senf { RTS_RETRIES_INDEX = 16, DATA_RETRIES_INDEX = 17, - MAX_INDEX = 17 + MAX_INDEX = 17, + + RADIOTOP_NS_INDEX = 29, + VENDOR_NS_INDEX = 30, + EXTENDED_BITMASK_INDEX = 31 }; enum PresentFlag { @@ -216,7 +191,11 @@ namespace senf { RX_FLAGS_FLAG = (1<(index); } \ - bool has_ ## name() { return name ## Present(); } \ + bool has_ ## name() { return currentTable()[index]; } \ + bool name ## Present() { return has_ ## name(); } \ type init_ ## name() { initField(index); return name(); } \ void disable_ ## name() { disableField(index); } @@ -255,7 +235,8 @@ namespace senf { // flags is special: disabling 'flags' must also disable the 'fcs' field typedef RadiotapPacketParser_Flags flags_t; flags_t flags() { return parseField(FLAGS_INDEX); } - bool has_flags() { return flagsPresent(); } + bool has_flags() { return currentTable()[FLAGS_INDEX]; } + bool flagsPresent() { return has_flags(); } flags_t init_flags() { initField(FLAGS_INDEX); return flags(); } void disable_flags() { disable_fcs(); disableField(FLAGS_INDEX); } @@ -291,7 +272,7 @@ namespace senf { typedef boost::array OffsetTable; - /////////////////////////////////////////////////////////////////////////// + //-//////////////////////////////////////////////////////////////////////// // Offset table handling static OffsetTable & offsetTable(boost::uint32_t presentFlags); @@ -300,7 +281,7 @@ namespace senf { // Generate an offset table just from the present flags static void buildOffsetTable(boost::uint32_t presentFlags, OffsetTable & table); - /////////////////////////////////////////////////////////////////////////// + //-//////////////////////////////////////////////////////////////////////// OffsetTable const & currentTable() const; OffsetTable const & getTable(boost::uint32_t presentFlags) const; @@ -315,6 +296,8 @@ namespace senf { void updatePresentFlags(boost::uint32_t flags); void insertRemoveBytes(unsigned from, unsigned to, int bytes); + OffsetTable const * currentTable_; + friend class RadiotapPacketType; }; @@ -339,11 +322,10 @@ namespace senf { typedef ConcretePacket packet; typedef RadiotapPacketParser parser; - using mixin::init; using mixin::initSize; - static void dump(packet p, std::ostream &os); - static void finalize(packet p); + static void init(packet p); + static void dump(packet p, std::ostream & os); static factory_t nextPacketType(packet p); static optional_range nextPacketRange(packet p); }; @@ -351,7 +333,7 @@ namespace senf { typedef ConcretePacket RadiotapPacket; } -///////////////////////////////hh.e//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// #include "RadiotapPacket.cci" //#include "RadiotapPacket.ct" #include "RadiotapPacket.cti"