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 MIRKO BANCHI | 3 * Copyright (c) 2009 MIRKO BANCHI |
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 |
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
12 * GNU General Public License for more details. | 12 * GNU General Public License for more details. |
13 * | 13 * |
14 * You should have received a copy of the GNU General Public License | 14 * You should have received a copy of the GNU General Public License |
15 * along with this program; if not, write to the Free Software | 15 * along with this program; if not, write to the Free Software |
16 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 16 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
17 * | 17 * |
18 * Author: Mirko Banchi <mk.banchi@gmail.com> | 18 * Author: Mirko Banchi <mk.banchi@gmail.com> |
19 */ | 19 */ |
20 | 20 |
21 #include "ns3/log.h" | 21 #include "ns3/log.h" |
22 #include "ns3/uinteger.h" | 22 #include "ns3/packet.h" |
23 #include "msdu-aggregator.h" | 23 #include "msdu-aggregator.h" |
| 24 #include "amsdu-subframe-header.h" |
24 | 25 |
25 namespace ns3 { | 26 namespace ns3 { |
26 | 27 |
27 NS_LOG_COMPONENT_DEFINE ("MsduAggregator"); | 28 NS_LOG_COMPONENT_DEFINE ("MsduAggregator"); |
28 | 29 |
29 NS_OBJECT_ENSURE_REGISTERED (MsduAggregator); | 30 NS_OBJECT_ENSURE_REGISTERED (MsduAggregator); |
30 | 31 |
31 TypeId | 32 TypeId |
32 MsduAggregator::GetTypeId (void) | 33 MsduAggregator::GetTypeId (void) |
33 { | 34 { |
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
125 } | 126 } |
126 | 127 |
127 std::pair<Ptr<Packet>, AmsduSubframeHeader> packetHdr (extractedMsdu, hdr)
; | 128 std::pair<Ptr<Packet>, AmsduSubframeHeader> packetHdr (extractedMsdu, hdr)
; |
128 set.push_back (packetHdr); | 129 set.push_back (packetHdr); |
129 } | 130 } |
130 NS_LOG_INFO ("Deaggreated A-MSDU: extracted " << set.size () << " MSDUs"); | 131 NS_LOG_INFO ("Deaggreated A-MSDU: extracted " << set.size () << " MSDUs"); |
131 return set; | 132 return set; |
132 } | 133 } |
133 | 134 |
134 } //namespace ns3 | 135 } //namespace ns3 |
OLD | NEW |