X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2F80211Bundle%2FRadiotapPacket.cc;fp=senf%2FPackets%2F80211Bundle%2FRadiotapPacket.cc;h=474f4b0f882e9ec94a8fec4ea1f40b3fbb8f8330;hb=9cb871b939efe93e35dd96808d25089399acfc46;hp=7fd01cfacee356680b9058477191db03b6e3fee9;hpb=3a43b572a2c0028b353d47e86fa7546633d6e2cf;p=senf.git diff --git a/senf/Packets/80211Bundle/RadiotapPacket.cc b/senf/Packets/80211Bundle/RadiotapPacket.cc index 7fd01cf..474f4b0 100644 --- a/senf/Packets/80211Bundle/RadiotapPacket.cc +++ b/senf/Packets/80211Bundle/RadiotapPacket.cc @@ -51,7 +51,7 @@ prefix_ void senf::RadiotapPacketType::dump(packet p, std::ostream &os) DUMP_OPTIONAL_FIELD( fhss, unsigned, "FHSS" ); DUMP_OPTIONAL_FIELD( dbmAntennaSignal, signed, "antenna signal (dBm)" ); DUMP_OPTIONAL_FIELD( dbmAntennaNoise, signed, "antenna noise (dBm)" ); - DUMP_OPTIONAL_FIELD( lockQuality, unsigned, "lock quality" ); + DUMP_OPTIONAL_FIELD( lockQuality, unsigned, "lock quality" ); DUMP_OPTIONAL_FIELD( txAttenuation, unsigned, "tx attenuation" ); DUMP_OPTIONAL_FIELD( dbTxAttenuation, unsigned, "tx attenuation (dB)" ); DUMP_OPTIONAL_FIELD( dbmTxAttenuation, signed, "tx attenuation (dBm)" ); @@ -81,8 +81,8 @@ senf::RadiotapPacketType::nextPacketRange(packet p) { size_type h (senf::bytes(p.parser())); size_type t (p->flagsPresent() && p->flags().fcsAtEnd() ? 4 : 0); - return p.size() < h+t - ? no_range() + return p.size() < h+t + ? no_range() : optional_range( range(p.data().begin() + h, p.data().end() - t) ); }