OLD | NEW |
1 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ | 1 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ |
2 /* | 2 /* |
3 * Copyright (c) 2009 CTTC | 3 * Copyright (c) 2009 CTTC |
4 * | 4 * |
5 * This program is free software; you can redistribute it and/or modify | 5 * This program is free software; you can redistribute it and/or modify |
6 * it under the terms of the GNU General Public License version 2 as | 6 * it under the terms of the GNU General Public License version 2 as |
7 * published by the Free Software Foundation; | 7 * published by the Free Software Foundation; |
8 * | 8 * |
9 * This program is distributed in the hope that it will be useful, | 9 * This program is distributed in the hope that it will be useful, |
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
259 } | 259 } |
260 } | 260 } |
261 | 261 |
262 uint32_t | 262 uint32_t |
263 RadiotapHeader::Deserialize (Buffer::Iterator start) | 263 RadiotapHeader::Deserialize (Buffer::Iterator start) |
264 { | 264 { |
265 NS_LOG_FUNCTION (this << &start); | 265 NS_LOG_FUNCTION (this << &start); |
266 | 266 |
267 uint8_t tmp = start.ReadU8 (); // major version of radiotap header | 267 uint8_t tmp = start.ReadU8 (); // major version of radiotap header |
268 NS_ASSERT_MSG (tmp == 0x00, "RadiotapHeader::Deserialize(): Unexpected major v
ersion"); | 268 NS_ASSERT_MSG (tmp == 0x00, "RadiotapHeader::Deserialize(): Unexpected major v
ersion"); |
| 269 (void)tmp; // make compiler happy |
269 start.ReadU8 (); // pad field | 270 start.ReadU8 (); // pad field |
270 | 271 |
271 m_length = start.ReadU16 (); // entire length of radiotap data + header | 272 m_length = start.ReadU16 (); // entire length of radiotap data + header |
272 m_present = start.ReadU32 (); // bits describing which fields follow header | 273 m_present = start.ReadU32 (); // bits describing which fields follow header |
273 | 274 |
274 uint32_t bytesRead = 8; | 275 uint32_t bytesRead = 8; |
275 | 276 |
276 // | 277 // |
277 // Time Synchronization Function Timer (when the first bit of the MPDU arrived
at the MAC) | 278 // Time Synchronization Function Timer (when the first bit of the MPDU arrived
at the MAC) |
278 // | 279 // |
(...skipping 539 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
818 RadiotapHeader::GetVhtGroupId () const | 819 RadiotapHeader::GetVhtGroupId () const |
819 { | 820 { |
820 NS_LOG_FUNCTION (this); | 821 NS_LOG_FUNCTION (this); |
821 return m_vhtGroupId; | 822 return m_vhtGroupId; |
822 } | 823 } |
823 | 824 |
824 uint8_t | 825 uint8_t |
825 RadiotapHeader::GetVhtPartialAid () const | 826 RadiotapHeader::GetVhtPartialAid () const |
826 { | 827 { |
827 NS_LOG_FUNCTION (this); | 828 NS_LOG_FUNCTION (this); |
828 return m_vhtPartialAid; | 829 return static_cast<int8_t>(m_vhtPartialAid); |
829 } | 830 } |
830 | 831 |
831 } // namespace ns3 | 832 } // namespace ns3 |
OLD | NEW |