Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(79)

Unified Diff: src/wifi/model/mpdu-standard-aggregator.cc

Issue 14549044: Adding MPDU aggregation
Patch Set: changed A-MPDU implementation to simplify PCAP generation Created 10 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/wifi/model/mpdu-standard-aggregator.h ('k') | src/wifi/model/wifi-mac.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/wifi/model/mpdu-standard-aggregator.cc
===================================================================
new file mode 100644
--- /dev/null
+++ b/src/wifi/model/mpdu-standard-aggregator.cc
@@ -0,0 +1,155 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2013
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * 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.
+ *
+ * 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
+ *
+ * Author: Ghada Badawy <gbadawy@gmail.com>
+ */
+#include "ns3/log.h"
+#include "ns3/uinteger.h"
+
+#include "ampdu-subframe-header.h"
+#include "mpdu-standard-aggregator.h"
+
+NS_LOG_COMPONENT_DEFINE ("MpduStandardAggregator");
+
+namespace ns3 {
+
+NS_OBJECT_ENSURE_REGISTERED (MpduStandardAggregator);
+
+TypeId
+MpduStandardAggregator::GetTypeId (void)
+{
+ static TypeId tid = TypeId ("ns3::MpduStandardAggregator")
+ .SetParent<MpduAggregator> ()
+ .AddConstructor<MpduStandardAggregator> ()
+ .AddAttribute ("MaxAmpduSize", "Max length in bytes of an A-MPDU",
+ UintegerValue (32767),
+ MakeUintegerAccessor (&MpduStandardAggregator::m_maxAmpduLength),
+ MakeUintegerChecker<uint32_t> ())
+ ;
+ return tid;
+}
+
+uint32_t
+MpduStandardAggregator::GetAmpduSize(void)
+{
+ return m_maxAmpduLength;
+}
+
+MpduStandardAggregator::MpduStandardAggregator ()
+{
+}
+
+MpduStandardAggregator::~MpduStandardAggregator ()
+{
+}
+
+bool
+MpduStandardAggregator::Aggregate (Ptr<const Packet> packet, Ptr<Packet> aggregatedPacket)
+{
+ NS_LOG_FUNCTION (this);
+ Ptr<Packet> currentPacket;
+ AmpduSubframeHeader currentHdr;
+
+ uint32_t padding = CalculatePadding (aggregatedPacket);
+ uint32_t actualSize = aggregatedPacket->GetSize ();
+
+ if ((4 + packet->GetSize () + actualSize + padding) <= m_maxAmpduLength)
+ {
+ if (padding)
+ {
+ Ptr<Packet> pad = Create<Packet> (padding);
+ aggregatedPacket->AddAtEnd (pad);
+ }
+ currentHdr.SetCrc (1);
+ currentHdr.SetSig ();
+ currentHdr.SetLength (packet->GetSize ());
+ currentPacket = packet->Copy ();
+
+ currentPacket->AddHeader (currentHdr);
+ aggregatedPacket->AddAtEnd (currentPacket);
+ return true;
+ }
+ return false;
+}
+void
+MpduStandardAggregator::AddHeaderAndPad (Ptr<Packet> packet, bool last)
+{
+ NS_LOG_FUNCTION (this);
+ AmpduSubframeHeader currentHdr;
+ //This is called to prepare packets feom the aggregte queue to be sent so no need to check on total sie since it has already been
+ //done before when deciding how many packets to add to the queue
+ currentHdr.SetCrc (1);
+ currentHdr.SetSig ();
+ currentHdr.SetLength (packet->GetSize ());
+ packet->AddHeader (currentHdr);
+ uint32_t padding = CalculatePadding (packet);
+
+ if (padding && !last)
+ {
+ Ptr<Packet> pad = Create<Packet> (padding);
+ packet->AddAtEnd (pad);
+ }
+
+}
+bool
+MpduStandardAggregator::CanBeAggregated (uint32_t packetSize, Ptr<Packet> aggregatedPacket, uint8_t blockAckSize)
+{
+
+ uint32_t padding = CalculatePadding (aggregatedPacket);
+ uint32_t actualSize = aggregatedPacket->GetSize ();
+ if (blockAckSize > 0)
+ blockAckSize = blockAckSize+4+padding;
+ if ((4 + packetSize + actualSize + padding+blockAckSize) <= m_maxAmpduLength)
+ return true;
+ else
+ return false;
+}
+bool
+MpduStandardAggregator::AggregateAtFront (Ptr<const Packet> packet, Ptr<Packet> aggregatedPacket)
+{
+ NS_LOG_FUNCTION (this);
+ Ptr<Packet> currentPacket;
+ AmpduSubframeHeader currentHdr;
+
+ uint32_t padding = CalculatePadding (packet);
+ uint32_t actualSize = aggregatedPacket->GetSize ();
+
+ if ((4 + packet->GetSize () + actualSize + padding) <= m_maxAmpduLength)
+ {
+ currentHdr.SetCrc (1);
+ currentHdr.SetSig ();
+ currentHdr.SetLength (packet->GetSize ());
+ currentPacket = packet->Copy ();
+ if (padding)
+ {
+ Ptr<Packet> pad = Create<Packet> (padding);
+ currentPacket->AddAtEnd (pad);
+ }
+ currentPacket->AddHeader (currentHdr);
+ currentPacket->AddAtEnd (aggregatedPacket);
+
+ return true;
+ }
+ return false;
+}
+uint32_t
+MpduStandardAggregator::CalculatePadding (Ptr<const Packet> packet)
+{
+ return (4 - (packet->GetSize () % 4 )) % 4;
+}
+
+} // namespace ns3
« no previous file with comments | « src/wifi/model/mpdu-standard-aggregator.h ('k') | src/wifi/model/wifi-mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b