//
// Copyright (C) 2008
// 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):
+// Stefan Bund <g0dil@berlios.de>
+// Christian Niephaus <cni@berlios.de>
/** \file
\brief Radiotap header */
#include <senf/Packets/Packets.hh>
#include <boost/array.hpp>
-///////////////////////////////hh.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
namespace senf {
/** \brief Parse Flag field in Radiotap header
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 );
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 {
RX_FLAGS_FLAG = (1<<RX_FLAGS_INDEX),
TX_FLAGS_FLAG = (1<<TX_FLAGS_INDEX),
RTS_RETRIES_FLAG = (1<<RTS_RETRIES_INDEX),
- DATA_RETRIES_FLAG = (1<<DATA_RETRIES_INDEX)
+ DATA_RETRIES_FLAG = (1<<DATA_RETRIES_INDEX),
+
+ RADIOTOP_NS_FLAG = (1<<RADIOTOP_NS_INDEX),
+ VENDOR_NS_FLAG = (1<<VENDOR_NS_INDEX),
+ EXTENDED_BITMASK_FLAG = (1<<EXTENDED_BITMASK_INDEX)
};
static unsigned const FIELD_SIZE[MAX_INDEX+2];
size_type bytes() const;
- // ////////////////////////////////////////////////////////////////////////
+ //-////////////////////////////////////////////////////////////////////////
# define FIELD(name,type,index) \
typedef type name ## _t; \
type name() { return parseField<type>(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); }
// flags is special: disabling 'flags' must also disable the 'fcs' field
typedef RadiotapPacketParser_Flags flags_t;
flags_t flags() { return parseField<flags_t>(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); }
typedef boost::array<size_type,MAX_INDEX+2> OffsetTable;
- ///////////////////////////////////////////////////////////////////////////
+ //-////////////////////////////////////////////////////////////////////////
// Offset table handling
static OffsetTable & offsetTable(boost::uint32_t presentFlags);
// 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;
void updatePresentFlags(boost::uint32_t flags);
void insertRemoveBytes(unsigned from, unsigned to, int bytes);
+ OffsetTable const * currentTable_;
+
friend class RadiotapPacketType;
};
typedef ConcretePacket<RadiotapPacketType> 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);
};
typedef ConcretePacket<RadiotapPacketType> RadiotapPacket;
}
-///////////////////////////////hh.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
#include "RadiotapPacket.cci"
//#include "RadiotapPacket.ct"
#include "RadiotapPacket.cti"