Attachment #3220 for bug #3010

View | Details | Raw Unified | Return to bug 3010
Collapse All | Expand All

(-)a/examples/wireless/examples-to-run.py (-3 / +3 lines)

Lines 41-50 cpp_examples = [	Link Here

    ("ht-wifi-network --simulationTime=0.1 --frequency=5 --useRts=1 --minExpectedThroughput=5 --maxExpectedThroughput=130", "True", "True"),

    ("ht-wifi-network --simulationTime=0.1 --frequency=5 --useRts=1 --minExpectedThroughput=5 --maxExpectedThroughput=130", "True", "True"),

    ("ht-wifi-network --simulationTime=0.1 --frequency=2.4 --useRts=0 --minExpectedThroughput=5 --maxExpectedThroughput=132", "True", "True"),

    ("ht-wifi-network --simulationTime=0.1 --frequency=2.4 --useRts=0 --minExpectedThroughput=5 --maxExpectedThroughput=132", "True", "True"),

    ("ht-wifi-network --simulationTime=0.1 --frequency=2.4 --useRts=1 --minExpectedThroughput=4.5 --maxExpectedThroughput=128", "True", "True"),

    ("ht-wifi-network --simulationTime=0.1 --frequency=2.4 --useRts=1 --minExpectedThroughput=4.5 --maxExpectedThroughput=128", "True", "True"),

    ("vht-wifi-network --simulationTime=0.1 --useRts=0  --minExpectedThroughput=5 --maxExpectedThroughput=555", "True", "True"),

    ("vht-wifi-network --simulationTime=0.1 --useRts=0  --minExpectedThroughput=5 --maxExpectedThroughput=607", "True", "True"),

    ("vht-wifi-network --simulationTime=0.2 --useRts=1", "True", "True"),

    ("vht-wifi-network --simulationTime=0.2 --useRts=1", "True", "True"),

    ("he-wifi-network --simulationTime=0.25 --frequency=5 --useRts=0  --minExpectedThroughput=6 --maxExpectedThroughput=754", "True", "True"),

    ("he-wifi-network --simulationTime=0.25 --frequency=5 --useRts=0  --minExpectedThroughput=6 --maxExpectedThroughput=844", "True", "True"),

    ("he-wifi-network --simulationTime=0.3 --frequency=5 --useRts=1 --minExpectedThroughput=6 --maxExpectedThroughput=639", "True", "True"),

    ("he-wifi-network --simulationTime=0.3 --frequency=5 --useRts=1 --minExpectedThroughput=6 --maxExpectedThroughput=745", "True", "True"),

    ("he-wifi-network --simulationTime=0.25 --frequency=2.4 --useRts=0 --minExpectedThroughput=6 --maxExpectedThroughput=238", "True", "True"),

    ("he-wifi-network --simulationTime=0.25 --frequency=2.4 --useRts=0 --minExpectedThroughput=6 --maxExpectedThroughput=238", "True", "True"),

    ("he-wifi-network --simulationTime=0.3 --frequency=2.4 --useRts=1 --minExpectedThroughput=6 --maxExpectedThroughput=224", "True", "True"),

    ("he-wifi-network --simulationTime=0.3 --frequency=2.4 --useRts=1 --minExpectedThroughput=6 --maxExpectedThroughput=224", "True", "True"),

    ("simple-ht-hidden-stations --simulationTime=1 --enableRts=0 --nMpdus=32 --minExpectedThroughput=59 --maxExpectedThroughput=60", "True", "True"),

    ("simple-ht-hidden-stations --simulationTime=1 --enableRts=0 --nMpdus=32 --minExpectedThroughput=59 --maxExpectedThroughput=60", "True", "True"),




{
  bool udp = true;
  bool useRts = false;
  bool useExtendedBlockAck = false;
  double simulationTime = 10; //seconds
  double distance = 1.0; //meters
  double frequency = 5.0; //whether 2.4 or 5.0 GHz

  cmd.AddValue ("simulationTime", "Simulation time in seconds", simulationTime);
  cmd.AddValue ("udp", "UDP if set to 1, TCP otherwise", udp);
  cmd.AddValue ("useRts", "Enable/disable RTS/CTS", useRts);
  cmd.AddValue ("useExtendedBlockAck", "Enable/disable use of extended BACK", useExtendedBlockAck);
  cmd.AddValue ("mcs", "if set, limit testing to a specific MCS (0-7)", mcs);
  cmd.AddValue ("minExpectedThroughput", "if set, simulation fails if the lowest throughput is below this value", minExpectedThroughput);
  cmd.AddValue ("maxExpectedThroughput", "if set, simulation fails if the highest throughput is above this value", maxExpectedThroughput);

              NetDeviceContainer apDevice;
              apDevice = wifi.Install (phy, mac, wifiApNode);

              // Set channel width, guard interval and MPDU buffer size
              Config::Set ("/NodeList/*/DeviceList/*/$ns3::WifiNetDevice/Phy/ChannelWidth", UintegerValue (channelWidth));
              Config::Set ("/NodeList/*/DeviceList/*/$ns3::WifiNetDevice/HeConfiguration/GuardInterval", TimeValue (NanoSeconds (gi)));
              Config::Set ("/NodeList/*/DeviceList/*/$ns3::WifiNetDevice/HeConfiguration/MpduBufferSize", UintegerValue (useExtendedBlockAck ? 256 : 64));

              // mobility.
              MobilityHelper mobility;

(-)a/examples/wireless/wifi-aggregation.cc (-19 / +58 lines)

Lines 32-37	Link Here

#include "ns3/udp-client-server-helper.h"

#include "ns3/udp-client-server-helper.h"

#include "ns3/packet-sink-helper.h"

#include "ns3/packet-sink-helper.h"

#include "ns3/yans-wifi-channel.h"

#include "ns3/yans-wifi-channel.h"

#include "ns3/wifi-net-device.h"

#include "ns3/ht-configuration.h"

// This is an example that illustrates how 802.11n aggregation is configured.

// This is an example that illustrates how 802.11n aggregation is configured.

// It defines 4 independent Wi-Fi networks (working on different channels).

// It defines 4 independent Wi-Fi networks (working on different channels).

Lines 109-115 int main (int argc, char *argv[])	Link Here

109

  NetDeviceContainer staDeviceA, staDeviceB, staDeviceC, staDeviceD, apDeviceA, apDeviceB, apDeviceC, apDeviceD;

111

  NetDeviceContainer staDeviceA, staDeviceB, staDeviceC, staDeviceD, apDeviceA, apDeviceB, apDeviceC, apDeviceD;

110

  Ssid ssid;

112

  Ssid ssid;

111

113

112

  //Network A

114

  // Network A

113

  ssid = Ssid ("network-A");

115

  ssid = Ssid ("network-A");

114

  phy.Set ("ChannelNumber", UintegerValue (36));

116

  phy.Set ("ChannelNumber", UintegerValue (36));

115

  mac.SetType ("ns3::StaWifiMac",

117

  mac.SetType ("ns3::StaWifiMac",

Lines 121-181 int main (int argc, char *argv[])	Link Here

121

               "EnableBeaconJitter", BooleanValue (false));

123

               "EnableBeaconJitter", BooleanValue (false));

122

  apDeviceA = wifi.Install (phy, mac, wifiApNodes.Get (0));

124

  apDeviceA = wifi.Install (phy, mac, wifiApNodes.Get (0));

123

125

124

  //Network B

126

  // Network B

125

  ssid = Ssid ("network-B");

127

  ssid = Ssid ("network-B");

126

  phy.Set ("ChannelNumber", UintegerValue (40));

128

  phy.Set ("ChannelNumber", UintegerValue (40));

127

  mac.SetType ("ns3::StaWifiMac",

129

  mac.SetType ("ns3::StaWifiMac",

128

               "Ssid", SsidValue (ssid),

130

               "Ssid", SsidValue (ssid));

129

               "BE_MaxAmpduSize", UintegerValue (0)); //Disable A-MPDU

130

131

  staDeviceB = wifi.Install (phy, mac, wifiStaNodes.Get (1));

132

  staDeviceB = wifi.Install (phy, mac, wifiStaNodes.Get (1));

133

134

  // Disable A-MPDU

135

  Ptr<NetDevice> dev = wifiStaNodes.Get (1)->GetDevice (0);

136

  Ptr<WifiNetDevice> wifi_dev = DynamicCast<WifiNetDevice> (dev);

137

  Ptr<HtConfiguration> htConfiguration = wifi_dev->GetHtConfiguration ();

138

  htConfiguration->SetBeMaxAmpduSize (0);

132

139

133

  mac.SetType ("ns3::ApWifiMac",

140

  mac.SetType ("ns3::ApWifiMac",

134

               "Ssid", SsidValue (ssid),

141

               "Ssid", SsidValue (ssid),

135

               "EnableBeaconJitter", BooleanValue (false));

142

               "EnableBeaconJitter", BooleanValue (false));

136

  apDeviceB = wifi.Install (phy, mac, wifiApNodes.Get (1));

143

  apDeviceB = wifi.Install (phy, mac, wifiApNodes.Get (1));

137

144

138

  //Network C

145

  // Disable A-MPDU

146

  dev = wifiApNodes.Get (1)->GetDevice (0);

147

  wifi_dev = DynamicCast<WifiNetDevice> (dev);

148

  htConfiguration = wifi_dev->GetHtConfiguration ();

149

  htConfiguration->SetBeMaxAmpduSize (0);

150

151

  // Network C

139

  ssid = Ssid ("network-C");

152

  ssid = Ssid ("network-C");

140

  phy.Set ("ChannelNumber", UintegerValue (44));

153

  phy.Set ("ChannelNumber", UintegerValue (44));

141

  mac.SetType ("ns3::StaWifiMac",

154

  mac.SetType ("ns3::StaWifiMac",

142

               "Ssid", SsidValue (ssid),

155

               "Ssid", SsidValue (ssid));

143

               "BE_MaxAmpduSize", UintegerValue (0), //Disable A-MPDU

144

               "BE_MaxAmsduSize", UintegerValue (7935)); //Enable A-MSDU with the highest maximum size allowed by the standard (7935 bytes)

145

156

146

  staDeviceC = wifi.Install (phy, mac, wifiStaNodes.Get (2));

157

  staDeviceC = wifi.Install (phy, mac, wifiStaNodes.Get (2));

147

158

159

  // Disable A-MPDU and enable A-MSDU with the highest maximum size allowed by the standard (7935 bytes)

160

  dev = wifiStaNodes.Get (2)->GetDevice (0);

161

  wifi_dev = DynamicCast<WifiNetDevice> (dev);

162

  htConfiguration = wifi_dev->GetHtConfiguration ();

163

  htConfiguration->SetBeMaxAmpduSize (0);

164

  htConfiguration->SetBeMaxAmsduSize (7935);

165

148

  mac.SetType ("ns3::ApWifiMac",

166

  mac.SetType ("ns3::ApWifiMac",

149

               "Ssid", SsidValue (ssid),

167

               "Ssid", SsidValue (ssid),

150

               "EnableBeaconJitter", BooleanValue (false));

168

               "EnableBeaconJitter", BooleanValue (false));

151

  apDeviceC = wifi.Install (phy, mac, wifiApNodes.Get (2));

169

  apDeviceC = wifi.Install (phy, mac, wifiApNodes.Get (2));

152

170

153

  //Network D

171

  // Disable A-MPDU and enable A-MSDU with the highest maximum size allowed by the standard (7935 bytes)

172

  dev = wifiApNodes.Get (2)->GetDevice (0);

173

  wifi_dev = DynamicCast<WifiNetDevice> (dev);

174

  htConfiguration = wifi_dev->GetHtConfiguration ();

175

  htConfiguration->SetBeMaxAmpduSize (0);

176

  htConfiguration->SetBeMaxAmsduSize (7935);

177

178

  // Network D

154

  ssid = Ssid ("network-D");

179

  ssid = Ssid ("network-D");

155

  phy.Set ("ChannelNumber", UintegerValue (48));

180

  phy.Set ("ChannelNumber", UintegerValue (48));

156

  mac.SetType ("ns3::StaWifiMac",

181

  mac.SetType ("ns3::StaWifiMac",

157

               "Ssid", SsidValue (ssid),

182

               "Ssid", SsidValue (ssid));

158

               "BE_MaxAmpduSize", UintegerValue (32768), //Enable A-MPDU with a smaller size than the default one

159

               "BE_MaxAmsduSize", UintegerValue (3839)); //Enable A-MSDU with the smallest maximum size allowed by the standard (3839 bytes)

160

183

161

  staDeviceD = wifi.Install (phy, mac, wifiStaNodes.Get (3));

184

  staDeviceD = wifi.Install (phy, mac, wifiStaNodes.Get (3));

162

185

186

  // Enable A-MPDU with a smaller size than the default one and

187

  // enable A-MSDU with the smallest maximum size allowed by the standard (3839 bytes)

188

  dev = wifiStaNodes.Get (3)->GetDevice (0);

189

  wifi_dev = DynamicCast<WifiNetDevice> (dev);

190

  htConfiguration = wifi_dev->GetHtConfiguration ();

191

  htConfiguration->SetBeMaxAmpduSize (32768);

192

  htConfiguration->SetBeMaxAmsduSize (3839);

193

163

  mac.SetType ("ns3::ApWifiMac",

194

  mac.SetType ("ns3::ApWifiMac",

164

               "Ssid", SsidValue (ssid),

195

               "Ssid", SsidValue (ssid),

165

               "EnableBeaconJitter", BooleanValue (false));

196

               "EnableBeaconJitter", BooleanValue (false));

166

  apDeviceD = wifi.Install (phy, mac, wifiApNodes.Get (3));

197

  apDeviceD = wifi.Install (phy, mac, wifiApNodes.Get (3));

167

198

168

  /* Setting mobility model */

199

  // Enable A-MPDU with a smaller size than the default one and

200

  // enable A-MSDU with the smallest maximum size allowed by the standard (3839 bytes)

201

  dev = wifiApNodes.Get (3)->GetDevice (0);

202

  wifi_dev = DynamicCast<WifiNetDevice> (dev);

203

  htConfiguration = wifi_dev->GetHtConfiguration ();

204

  htConfiguration->SetBeMaxAmpduSize (32768);

205

  htConfiguration->SetBeMaxAmsduSize (3839);

206

207

  // Setting mobility model

169

  MobilityHelper mobility;

208

  MobilityHelper mobility;

170

  Ptr<ListPositionAllocator> positionAlloc = CreateObject<ListPositionAllocator> ();

209

  Ptr<ListPositionAllocator> positionAlloc = CreateObject<ListPositionAllocator> ();

171

  mobility.SetMobilityModel ("ns3::ConstantPositionMobilityModel");

210

  mobility.SetMobilityModel ("ns3::ConstantPositionMobilityModel");

172

211

173

  //Set position for APs

212

  // Set position for APs

174

  positionAlloc->Add (Vector (0.0, 0.0, 0.0));

213

  positionAlloc->Add (Vector (0.0, 0.0, 0.0));

175

  positionAlloc->Add (Vector (10.0, 0.0, 0.0));

214

  positionAlloc->Add (Vector (10.0, 0.0, 0.0));

176

  positionAlloc->Add (Vector (20.0, 0.0, 0.0));

215

  positionAlloc->Add (Vector (20.0, 0.0, 0.0));

177

  positionAlloc->Add (Vector (30.0, 0.0, 0.0));

216

  positionAlloc->Add (Vector (30.0, 0.0, 0.0));

178

  //Set position for STAs

217

  // Set position for STAs

179

  positionAlloc->Add (Vector (distance, 0.0, 0.0));

218

  positionAlloc->Add (Vector (distance, 0.0, 0.0));

180

  positionAlloc->Add (Vector (10 + distance, 0.0, 0.0));

219

  positionAlloc->Add (Vector (10 + distance, 0.0, 0.0));

181

  positionAlloc->Add (Vector (20 + distance, 0.0, 0.0));

220

  positionAlloc->Add (Vector (20 + distance, 0.0, 0.0));

Lines 185-191 int main (int argc, char *argv[])	Link Here

185

  mobility.Install (wifiApNodes);

224

  mobility.Install (wifiApNodes);

186

  mobility.Install (wifiStaNodes);

225

  mobility.Install (wifiStaNodes);

187

226

188

  /* Internet stack */

227

  // Internet stack

189

  InternetStackHelper stack;

228

  InternetStackHelper stack;

190

  stack.Install (wifiApNodes);

229

  stack.Install (wifiApNodes);

191

  stack.Install (wifiStaNodes);

230

  stack.Install (wifiStaNodes);

Lines 215-221 int main (int argc, char *argv[])	Link Here

215

  Ipv4InterfaceContainer ApInterfaceD;

254

  Ipv4InterfaceContainer ApInterfaceD;

216

  ApInterfaceD = address.Assign (apDeviceD);

255

  ApInterfaceD = address.Assign (apDeviceD);

217

256

218

  /* Setting applications */

257

  // Setting applications

219

  uint16_t port = 9;

258

  uint16_t port = 9;

220

  UdpServerHelper serverA (port);

259

  UdpServerHelper serverA (port);

221

  ApplicationContainer serverAppA = serverA.Install (wifiStaNodes.Get (0));

260

  ApplicationContainer serverAppA = serverA.Install (wifiStaNodes.Get (0));

Lines 288-294 int main (int argc, char *argv[])	Link Here

288

  Simulator::Stop (Seconds (simulationTime + 1));

327

  Simulator::Stop (Seconds (simulationTime + 1));

289

  Simulator::Run ();

328

  Simulator::Run ();

290

329

291

  /* Show results */

330

  // Show results

292

  uint64_t totalPacketsThroughA = DynamicCast<UdpServer> (serverAppA.Get (0))->GetReceived ();

331

  uint64_t totalPacketsThroughA = DynamicCast<UdpServer> (serverAppA.Get (0))->GetReceived ();

293

  uint64_t totalPacketsThroughB = DynamicCast<UdpServer> (serverAppB.Get (0))->GetReceived ();

332

  uint64_t totalPacketsThroughB = DynamicCast<UdpServer> (serverAppB.Get (0))->GetReceived ();

294

  uint64_t totalPacketsThroughC = DynamicCast<UdpServer> (serverAppC.Get (0))->GetReceived ();

333

  uint64_t totalPacketsThroughC = DynamicCast<UdpServer> (serverAppC.Get (0))->GetReceived ();




                   MakeUintegerAccessor (&HeConfiguration::GetMpduBufferSize,
                                         &HeConfiguration::SetMpduBufferSize),
                   MakeUintegerChecker<uint16_t> (64, 256))
    .AddAttribute ("VO_MaxAmsduSize",
                   "Maximum length in bytes of an A-MSDU for AC_VO access class. "
                   "Value 0 means A-MSDU is disabled for that AC.",
                   UintegerValue (0),
                   MakeUintegerAccessor (&HeConfiguration::SetVoMaxAmsduSize,
                                         &HeConfiguration::GetVoMaxAmsduSize),
                   MakeUintegerChecker<uint16_t> (0, 11454))
    .AddAttribute ("VI_MaxAmsduSize",
                   "Maximum length in bytes of an A-MSDU for AC_VI access class."
                   "Value 0 means A-MSDU is disabled for that AC.",
                   UintegerValue (0),
                   MakeUintegerAccessor (&HeConfiguration::SetViMaxAmsduSize,
                                         &HeConfiguration::GetViMaxAmsduSize),
                   MakeUintegerChecker<uint16_t> (0, 11454))
    .AddAttribute ("BE_MaxAmsduSize",
                   "Maximum length in bytes of an A-MSDU for AC_BE access class."
                   "Value 0 means A-MSDU is disabled for that AC.",
                   UintegerValue (0),
                   MakeUintegerAccessor (&HeConfiguration::SetBeMaxAmsduSize,
                                         &HeConfiguration::GetBeMaxAmsduSize),
                   MakeUintegerChecker<uint16_t> (0, 11454))
    .AddAttribute ("BK_MaxAmsduSize",
                   "Maximum length in bytes of an A-MSDU for AC_BK access class."
                   "Value 0 means A-MSDU is disabled for that AC.",
                   UintegerValue (0),
                   MakeUintegerAccessor (&HeConfiguration::SetBkMaxAmsduSize,
                                         &HeConfiguration::GetBkMaxAmsduSize),
                   MakeUintegerChecker<uint16_t> (0, 11454))
    .AddAttribute ("VO_MaxAmpduSize",
                   "Maximum length in bytes of an A-MPDU for AC_VO access class."
                   "Value 0 means A-MPDU is disabled for that AC.",
                   UintegerValue (0),
                   MakeUintegerAccessor (&HeConfiguration::SetVoMaxAmpduSize,
                                         &HeConfiguration::GetVoMaxAmpduSize),
                   MakeUintegerChecker<uint32_t> (0, 4194303))
    .AddAttribute ("VI_MaxAmpduSize",
                   "Maximum length in bytes of an A-MPDU for AC_VI access class."
                   "Value 0 means A-MPDU is disabled for that AC.",
                   UintegerValue (4194303),
                   MakeUintegerAccessor (&HeConfiguration::SetViMaxAmpduSize,
                                         &HeConfiguration::GetViMaxAmpduSize),
                   MakeUintegerChecker<uint32_t> (0, 4194303))
    .AddAttribute ("BE_MaxAmpduSize",
                   "Maximum length in bytes of an A-MPDU for AC_BE access class."
                   "Value 0 means A-MPDU is disabled for that AC.",
                   UintegerValue (4194303),
                   MakeUintegerAccessor (&HeConfiguration::SetBeMaxAmpduSize,
                                         &HeConfiguration::GetBeMaxAmpduSize),
                   MakeUintegerChecker<uint32_t> (0, 4194303))
    .AddAttribute ("BK_MaxAmpduSize",
                   "Maximum length in bytes of an A-MPDU for AC_BK access class."
                   "Value 0 means A-MPDU is disabled for that AC.",
                   UintegerValue (0),
                   MakeUintegerAccessor (&HeConfiguration::SetBkMaxAmpduSize,
                                         &HeConfiguration::GetBkMaxAmpduSize),
                   MakeUintegerChecker<uint32_t> (0, 4194303))
    ;
    return tid;
}

  return m_mpduBufferSize;
}

void
HeConfiguration::SetVoMaxAmsduSize (uint16_t size)
{
  NS_LOG_FUNCTION (this << size);
  m_voMaxAmsduSize = size;
}

uint16_t
HeConfiguration::GetVoMaxAmsduSize (void) const
{
  return m_voMaxAmsduSize;
}

void
HeConfiguration::SetViMaxAmsduSize (uint16_t size)
{
  NS_LOG_FUNCTION (this << size);
  m_viMaxAmsduSize = size;
}

uint16_t
HeConfiguration::GetViMaxAmsduSize (void) const
{
  return m_viMaxAmsduSize;
}

void
HeConfiguration::SetBeMaxAmsduSize (uint16_t size)
{
  NS_LOG_FUNCTION (this << size);
  m_beMaxAmsduSize = size;
}

uint16_t
HeConfiguration::GetBeMaxAmsduSize (void) const
{
  return m_beMaxAmsduSize;
}

void
HeConfiguration::SetBkMaxAmsduSize (uint16_t size)
{
  NS_LOG_FUNCTION (this << size);
  m_bkMaxAmsduSize = size;
}

uint16_t
HeConfiguration::GetBkMaxAmsduSize (void) const
{
  return m_bkMaxAmsduSize;
}

void
HeConfiguration::SetVoMaxAmpduSize (uint32_t size)
{
  NS_LOG_FUNCTION (this << size);
  m_voMaxAmpduSize = size;
}

uint32_t
HeConfiguration::GetVoMaxAmpduSize (void) const
{
  return m_voMaxAmpduSize;
}

void
HeConfiguration::SetViMaxAmpduSize (uint32_t size)
{
  NS_LOG_FUNCTION (this << size);
  m_viMaxAmpduSize = size;
}

uint32_t
HeConfiguration::GetViMaxAmpduSize (void) const
{
  return m_viMaxAmpduSize;
}

void
HeConfiguration::SetBeMaxAmpduSize (uint32_t size)
{
  NS_LOG_FUNCTION (this << size);
  m_beMaxAmpduSize = size;
}

uint32_t
HeConfiguration::GetBeMaxAmpduSize (void) const
{
  return m_beMaxAmpduSize;
}

void
HeConfiguration::SetBkMaxAmpduSize (uint32_t size)
{
  NS_LOG_FUNCTION (this << size);
  m_bkMaxAmpduSize = size;
}

uint32_t
HeConfiguration::GetBkMaxAmpduSize (void) const
{
  return m_bkMaxAmpduSize;
}

} //namespace ns3




   * \return the MPDU buffer size to receive A-MPDUs
   */
  uint16_t GetMpduBufferSize (void) const;
  /**
   * Set the maximum A-MSDU size for AC_VO.
   *
   * \param size the maximum A-MSDU size for AC_VO.
   */
  void SetVoMaxAmsduSize (uint16_t size);
  /**
   * \return the maximum A-MSDU size for AC_VO.
   */
  uint16_t GetVoMaxAmsduSize (void) const;
  /**
   * Set the maximum A-MSDU size for AC_VI.
   *
   * \param size the maximum A-MSDU size for AC_VI.
   */
  void SetViMaxAmsduSize (uint16_t size);
  /**
   * \return the maximum A-MSDU size for AC_VI.
   */
  uint16_t GetViMaxAmsduSize (void) const;
  /**
   * Set the maximum A-MSDU size for AC_BE.
   *
   * \param size the maximum A-MSDU size for AC_BE.
   */
  void SetBeMaxAmsduSize (uint16_t size);
  /**
   * \return the maximum A-MSDU size for AC_BE.
   */
  uint16_t GetBeMaxAmsduSize (void) const;
  /**
   * Set the maximum A-MSDU size for AC_BK.
   *
   * \param size the maximum A-MSDU size for AC_BK.
   */
  void SetBkMaxAmsduSize (uint16_t size);
  /**
   * \return the maximum A-MSDU size for AC_BK.
   */
  uint16_t GetBkMaxAmsduSize (void) const;
  /**
   * Set the maximum A-MPDU size for AC_VO.
   *
   * \param size the maximum A-MPDU size for AC_VO.
   */
  void SetVoMaxAmpduSize (uint32_t size);
  /**
   * \return the maximum A-MPDU size for AC_VO.
   */
  uint32_t GetVoMaxAmpduSize (void) const;
  /**
   * Set the maximum A-MPDU size for AC_VI.
   *
   * \param size the maximum A-MPDU size for AC_VI.
   */
  void SetViMaxAmpduSize (uint32_t size);
  /**
   * \return the maximum A-MPDU size for AC_VI.
   */
  uint32_t GetViMaxAmpduSize (void) const;
  /**
   * Set the maximum A-MPDU size for AC_BE.
   *
   * \param size the maximum A-MPDU size for AC_BE.
   */
  void SetBeMaxAmpduSize (uint32_t size);
  /**
   * \return the maximum A-MPDU size for AC_BE.
   */
  uint32_t GetBeMaxAmpduSize (void) const;
  /**
   * Set the maximum A-MPDU size for AC_BK.
   *
   * \param size the maximum A-MPDU size for AC_BK.
   */
  void SetBkMaxAmpduSize (uint32_t size);
  /**
   * \return the maximum A-MPDU size for AC_BK.
   */
  uint32_t GetBkMaxAmpduSize (void) const;


private:
  Time m_guardInterval;      //!< Supported HE guard interval
  uint8_t m_bssColor;        //!< BSS color
  uint16_t m_mpduBufferSize; //!< MPDU buffer size

  uint16_t m_voMaxAmsduSize; ///< maximum A-MSDU size for AC_VO
  uint16_t m_viMaxAmsduSize; ///< maximum A-MSDU size for AC_VI
  uint16_t m_beMaxAmsduSize; ///< maximum A-MSDU size for AC_BE
  uint16_t m_bkMaxAmsduSize; ///< maximum A-MSDU size for AC_BK

  uint32_t m_voMaxAmpduSize; ///< maximum A-MPDU size for AC_VO
  uint32_t m_viMaxAmpduSize; ///< maximum A-MPDU size for AC_VI
  uint32_t m_beMaxAmpduSize; ///< maximum A-MPDU size for AC_BE
  uint32_t m_bkMaxAmpduSize; ///< maximum A-MPDU size for AC_BK
};

} //namespace ns3





#include "ns3/log.h"
#include "ns3/boolean.h"
#include "ns3/uinteger.h"
#include "ht-configuration.h"

namespace ns3 {

                   MakeBooleanAccessor (&HtConfiguration::SetRifsSupported,
                                        &HtConfiguration::GetRifsSupported),
                   MakeBooleanChecker ())
    .AddAttribute ("VO_MaxAmsduSize",
                   "Maximum length in bytes of an A-MSDU for AC_VO access class. "
                   "Value 0 means A-MSDU is disabled for that AC.",
                   UintegerValue (0),
                   MakeUintegerAccessor (&HtConfiguration::SetVoMaxAmsduSize,
                                         &HtConfiguration::GetVoMaxAmsduSize),
                   MakeUintegerChecker<uint16_t> (0, 7935))
    .AddAttribute ("VI_MaxAmsduSize",
                   "Maximum length in bytes of an A-MSDU for AC_VI access class."
                   "Value 0 means A-MSDU is disabled for that AC.",
                   UintegerValue (0),
                   MakeUintegerAccessor (&HtConfiguration::SetViMaxAmsduSize,
                                         &HtConfiguration::GetViMaxAmsduSize),
                   MakeUintegerChecker<uint16_t> (0, 7935))
    .AddAttribute ("BE_MaxAmsduSize",
                   "Maximum length in bytes of an A-MSDU for AC_BE access class."
                   "Value 0 means A-MSDU is disabled for that AC.",
                   UintegerValue (0),
                   MakeUintegerAccessor (&HtConfiguration::SetBeMaxAmsduSize,
                                         &HtConfiguration::GetBeMaxAmsduSize),
                   MakeUintegerChecker<uint16_t> (0, 7935))
    .AddAttribute ("BK_MaxAmsduSize",
                   "Maximum length in bytes of an A-MSDU for AC_BK access class."
                   "Value 0 means A-MSDU is disabled for that AC.",
                   UintegerValue (0),
                   MakeUintegerAccessor (&HtConfiguration::SetBkMaxAmsduSize,
                                         &HtConfiguration::GetBkMaxAmsduSize),
                   MakeUintegerChecker<uint16_t> (0, 7935))
    .AddAttribute ("VO_MaxAmpduSize",
                   "Maximum length in bytes of an A-MPDU for AC_VO access class."
                   "Value 0 means A-MPDU is disabled for that AC.",
                   UintegerValue (0),
                   MakeUintegerAccessor (&HtConfiguration::SetVoMaxAmpduSize,
                                         &HtConfiguration::GetVoMaxAmpduSize),
                   MakeUintegerChecker<uint32_t> (0, 65535))
    .AddAttribute ("VI_MaxAmpduSize",
                   "Maximum length in bytes of an A-MPDU for AC_VI access class."
                   "Value 0 means A-MPDU is disabled for that AC.",
                   UintegerValue (65535),
                   MakeUintegerAccessor (&HtConfiguration::SetViMaxAmpduSize,
                                         &HtConfiguration::GetViMaxAmpduSize),
                   MakeUintegerChecker<uint32_t> (0, 65535))
    .AddAttribute ("BE_MaxAmpduSize",
                   "Maximum length in bytes of an A-MPDU for AC_BE access class."
                   "Value 0 means A-MPDU is disabled for that AC.",
                   UintegerValue (65535),
                   MakeUintegerAccessor (&HtConfiguration::SetBeMaxAmpduSize,
                                         &HtConfiguration::GetBeMaxAmpduSize),
                   MakeUintegerChecker<uint32_t> (0, 65535))
    .AddAttribute ("BK_MaxAmpduSize",
                   "Maximum length in bytes of an A-MPDU for AC_BK access class."
                   "Value 0 means A-MPDU is disabled for that AC.",
                   UintegerValue (0),
                   MakeUintegerAccessor (&HtConfiguration::SetBkMaxAmpduSize,
                                         &HtConfiguration::GetBkMaxAmpduSize),
                   MakeUintegerChecker<uint32_t> (0, 65535))
    ;
    return tid;
}

  return m_rifsSupported;
}

void
HtConfiguration::SetVoMaxAmsduSize (uint16_t size)
{
  NS_LOG_FUNCTION (this << size);
  m_voMaxAmsduSize = size;
}

uint16_t
HtConfiguration::GetVoMaxAmsduSize (void) const
{
  return m_voMaxAmsduSize;
}

void
HtConfiguration::SetViMaxAmsduSize (uint16_t size)
{
  NS_LOG_FUNCTION (this << size);
  m_viMaxAmsduSize = size;
}

uint16_t
HtConfiguration::GetViMaxAmsduSize (void) const
{
  return m_viMaxAmsduSize;
}

void
HtConfiguration::SetBeMaxAmsduSize (uint16_t size)
{
  NS_LOG_FUNCTION (this << size);
  m_beMaxAmsduSize = size;
}

uint16_t
HtConfiguration::GetBeMaxAmsduSize (void) const
{
  return m_beMaxAmsduSize;
}

void
HtConfiguration::SetBkMaxAmsduSize (uint16_t size)
{
  NS_LOG_FUNCTION (this << size);
  m_bkMaxAmsduSize = size;
}

uint16_t
HtConfiguration::GetBkMaxAmsduSize (void) const
{
  return m_bkMaxAmsduSize;
}

void
HtConfiguration::SetVoMaxAmpduSize (uint32_t size)
{
  NS_LOG_FUNCTION (this << size);
  m_voMaxAmpduSize = size;
}

uint32_t
HtConfiguration::GetVoMaxAmpduSize (void) const
{
  return m_voMaxAmpduSize;
}

void
HtConfiguration::SetViMaxAmpduSize (uint32_t size)
{
  NS_LOG_FUNCTION (this << size);
  m_viMaxAmpduSize = size;
}

uint32_t
HtConfiguration::GetViMaxAmpduSize (void) const
{
  return m_viMaxAmpduSize;
}

void
HtConfiguration::SetBeMaxAmpduSize (uint32_t size)
{
  NS_LOG_FUNCTION (this << size);
  m_beMaxAmpduSize = size;
}

uint32_t
HtConfiguration::GetBeMaxAmpduSize (void) const
{
  return m_beMaxAmpduSize;
}

void
HtConfiguration::SetBkMaxAmpduSize (uint32_t size)
{
  NS_LOG_FUNCTION (this << size);
  m_bkMaxAmpduSize = size;
}

uint32_t
HtConfiguration::GetBkMaxAmpduSize (void) const
{
  return m_bkMaxAmpduSize;
}

} //namespace ns3




   *         false otherwise.
   */
  bool GetShortGuardIntervalSupported (void) const;

  /**
   * Enable or disable Greenfield support.
   *

   *         false otherwise.
   */
  bool GetGreenfieldSupported (void) const;

  /**
   * Enable or disable RIFS support.
   *

   *         false otherwise.
   */
  bool GetRifsSupported (void) const;
  /**
   * Set the maximum A-MSDU size for AC_VO.
   *
   * \param size the maximum A-MSDU size for AC_VO.
   */
  void SetVoMaxAmsduSize (uint16_t size);
  /**
   * \return the maximum A-MSDU size for AC_VO.
   */
  uint16_t GetVoMaxAmsduSize (void) const;
  /**
   * Set the maximum A-MSDU size for AC_VI.
   *
   * \param size the maximum A-MSDU size for AC_VI.
   */
  void SetViMaxAmsduSize (uint16_t size);
  /**
   * \return the maximum A-MSDU size for AC_VI.
   */
  uint16_t GetViMaxAmsduSize (void) const;
  /**
   * Set the maximum A-MSDU size for AC_BE.
   *
   * \param size the maximum A-MSDU size for AC_BE.
   */
  void SetBeMaxAmsduSize (uint16_t size);
  /**
   * \return the maximum A-MSDU size for AC_BE.
   */
  uint16_t GetBeMaxAmsduSize (void) const;
  /**
   * Set the maximum A-MSDU size for AC_BK.
   *
   * \param size the maximum A-MSDU size for AC_BK.
   */
  void SetBkMaxAmsduSize (uint16_t size);
  /**
   * \return the maximum A-MSDU size for AC_BK.
   */
  uint16_t GetBkMaxAmsduSize (void) const;
  /**
   * Set the maximum A-MPDU size for AC_VO.
   *
   * \param size the maximum A-MPDU size for AC_VO.
   */
  void SetVoMaxAmpduSize (uint32_t size);
  /**
   * \return the maximum A-MPDU size for AC_VO.
   */
  uint32_t GetVoMaxAmpduSize (void) const;
  /**
   * Set the maximum A-MPDU size for AC_VI.
   *
   * \param size the maximum A-MPDU size for AC_VI.
   */
  void SetViMaxAmpduSize (uint32_t size);
  /**
   * \return the maximum A-MPDU size for AC_VI.
   */
  uint32_t GetViMaxAmpduSize (void) const;
  /**
   * Set the maximum A-MPDU size for AC_BE.
   *
   * \param size the maximum A-MPDU size for AC_BE.
   */
  void SetBeMaxAmpduSize (uint32_t size);
  /**
   * \return the maximum A-MPDU size for AC_BE.
   */
  uint32_t GetBeMaxAmpduSize (void) const;
  /**
   * Set the maximum A-MPDU size for AC_BK.
   *
   * \param size the maximum A-MPDU size for AC_BK.
   */
  void SetBkMaxAmpduSize (uint32_t size);
  /**
   * \return the maximum A-MPDU size for AC_BK.
   */
  uint32_t GetBkMaxAmpduSize (void) const;


private:
  bool m_sgiSupported;        ///< flag whether short guard interval is supported
  bool m_rifsSupported;       ///< flag whether RIFS is supported
  bool m_greenfieldSupported; ///< flag whether Greenfield is supported

  uint16_t m_voMaxAmsduSize; ///< maximum A-MSDU size for AC_VO
  uint16_t m_viMaxAmsduSize; ///< maximum A-MSDU size for AC_VI
  uint16_t m_beMaxAmsduSize; ///< maximum A-MSDU size for AC_BE
  uint16_t m_bkMaxAmsduSize; ///< maximum A-MSDU size for AC_BK

  uint32_t m_voMaxAmpduSize; ///< maximum A-MPDU size for AC_VO
  uint32_t m_viMaxAmpduSize; ///< maximum A-MPDU size for AC_VI
  uint32_t m_beMaxAmpduSize; ///< maximum A-MPDU size for AC_BE
  uint32_t m_bkMaxAmpduSize; ///< maximum A-MPDU size for AC_BK
};

} //namespace ns3

(-)a/src/wifi/model/mac-low.cc (-8 / +174 lines)

Lines 39-44	Link Here

#include "wifi-mac-trailer.h"

#include "wifi-mac-trailer.h"

#include "wifi-phy.h"

#include "wifi-phy.h"

#include "wifi-net-device.h"

#include "wifi-net-device.h"

#include "wifi-mac.h"

#include "ht-configuration.h"

#include "vht-configuration.h"

#include "he-configuration.h"

#undef NS_LOG_APPEND_CONTEXT

#undef NS_LOG_APPEND_CONTEXT

#define NS_LOG_APPEND_CONTEXT std::clog << "[mac=" << m_self << "] "

#define NS_LOG_APPEND_CONTEXT std::clog << "[mac=" << m_self << "] "

Lines 271-276 MacLow::ResetPhy (void)	Link Here

271

275

272

276

273

void

277

void

278

MacLow::SetMac (const Ptr<WifiMac> mac)

279

280

  m_mac = mac;

281

282

283

void

274

MacLow::SetWifiRemoteStationManager (const Ptr<WifiRemoteStationManager> manager)

284

MacLow::SetWifiRemoteStationManager (const Ptr<WifiRemoteStationManager> manager)

275

285

276

  m_stationManager = manager;

286

  m_stationManager = manager;

Lines 555-561 MacLow::StartTransmission (Ptr<const Packet> packet,	Link Here

555

          Ptr<Packet> newPacket = (m_txPackets[GetTid (packet, *hdr)].at (i).packet)->Copy ();

565

          Ptr<Packet> newPacket = (m_txPackets[GetTid (packet, *hdr)].at (i).packet)->Copy ();

556

          newPacket->AddHeader (m_txPackets[GetTid (packet, *hdr)].at (i).hdr);

566

          newPacket->AddHeader (m_txPackets[GetTid (packet, *hdr)].at (i).hdr);

557

          AddWifiMacTrailer (newPacket);

567

          AddWifiMacTrailer (newPacket);

558

          edcaIt->second->GetMpduAggregator ()->Aggregate (newPacket, aggregatedPacket);

568

          edcaIt->second->GetMpduAggregator ()->Aggregate (newPacket, aggregatedPacket, GetMaxAmpduSize (ac));

559

569

560

      m_currentPacket = aggregatedPacket;

570

      m_currentPacket = aggregatedPacket;

561

      m_currentHdr = (m_txPackets[GetTid (packet, *hdr)].at (0).hdr);

571

      m_currentHdr = (m_txPackets[GetTid (packet, *hdr)].at (0).hdr);

Lines 2377-2383 MacLow::SendBlockAckAfterAmpdu (uint8_t tid, Mac48Address originator, Time durat	Link Here

2377

      blockAck.SetStartingSequence (seqNumber);

2387

      blockAck.SetStartingSequence (seqNumber);

2378

      blockAck.SetTidInfo (tid);

2388

      blockAck.SetTidInfo (tid);

2379

      immediate = (*it).second.first.IsImmediateBlockAck ();

2389

      immediate = (*it).second.first.IsImmediateBlockAck ();

2380

      if (nMpdus > 64)

2390

      if (nMpdus > 63)

2381

2391

2382

          blockAck.SetType (EXTENDED_COMPRESSED_BLOCK_ACK);

2392

          blockAck.SetType (EXTENDED_COMPRESSED_BLOCK_ACK);

2383

2393

Lines 2601-2607 MacLow::StopMpduAggregation (Ptr<const Packet> peekedPacket, WifiMacHeader peeke	Link Here

2601

      return true;

2611

      return true;

2602

2612

2603

2613

2604

  if (!edcaIt->second->GetMpduAggregator ()->CanBeAggregated (peekedPacket->GetSize () + peekedHdr.GetSize () + WIFI_MAC_FCS_LENGTH, aggregatedPacket, blockAckSize))

2614

  if (!edcaIt->second->GetMpduAggregator ()->CanBeAggregated (peekedPacket->GetSize () + peekedHdr.GetSize () + WIFI_MAC_FCS_LENGTH, aggregatedPacket, blockAckSize, GetMaxAmpduSize (ac)))

2605

2615

2606

      NS_LOG_DEBUG ("no more packets can be aggregated because the maximum A-MPDU size has been reached");

2616

      NS_LOG_DEBUG ("no more packets can be aggregated because the maximum A-MPDU size has been reached");

2607

      return true;

2617

      return true;

Lines 2670-2676 MacLow::AggregateToAmpdu (Ptr<const Packet> packet, const WifiMacHeader hdr)	Link Here

2670

                  newPacket->AddHeader (peekedHdr);

2680

                  newPacket->AddHeader (peekedHdr);

2671

                  AddWifiMacTrailer (newPacket);

2681

                  AddWifiMacTrailer (newPacket);

2672

2682

2673

                  aggregated = edcaIt->second->GetMpduAggregator ()->Aggregate (newPacket, currentAggregatedPacket);

2683

                  aggregated = edcaIt->second->GetMpduAggregator ()->Aggregate (newPacket, currentAggregatedPacket, GetMaxAmpduSize (ac));

2674

2684

2675

                  if (aggregated)

2685

                  if (aggregated)

2676

2686

Lines 2744-2750 MacLow::AggregateToAmpdu (Ptr<const Packet> packet, const WifiMacHeader hdr)	Link Here

2744

2754

2745

                  newPacket->AddHeader (peekedHdr);

2755

                  newPacket->AddHeader (peekedHdr);

2746

                  AddWifiMacTrailer (newPacket);

2756

                  AddWifiMacTrailer (newPacket);

2747

                  aggregated = edcaIt->second->GetMpduAggregator ()->Aggregate (newPacket, currentAggregatedPacket);

2757

                  aggregated = edcaIt->second->GetMpduAggregator ()->Aggregate (newPacket, currentAggregatedPacket, GetMaxAmpduSize (ac));

2748

                  if (aggregated)

2758

                  if (aggregated)

2749

2759

2750

                      m_aggregateQueue[tid]->Enqueue (Create<WifiMacQueueItem> (aggPacket, peekedHdr));

2760

                      m_aggregateQueue[tid]->Enqueue (Create<WifiMacQueueItem> (aggPacket, peekedHdr));

Lines 2852-2858 MacLow::AggregateToAmpdu (Ptr<const Packet> packet, const WifiMacHeader hdr)	Link Here

2852

                      m_aggregateQueue[tid]->Enqueue (Create<WifiMacQueueItem> (aggPacket, peekedHdr));

2862

                      m_aggregateQueue[tid]->Enqueue (Create<WifiMacQueueItem> (aggPacket, peekedHdr));

2853

                      newPacket->AddHeader (peekedHdr);

2863

                      newPacket->AddHeader (peekedHdr);

2854

                      AddWifiMacTrailer (newPacket);

2864

                      AddWifiMacTrailer (newPacket);

2855

                      edcaIt->second->GetMpduAggregator ()->Aggregate (newPacket, currentAggregatedPacket);

2865

                      edcaIt->second->GetMpduAggregator ()->Aggregate (newPacket, currentAggregatedPacket, GetMaxAmpduSize (ac));

2856

                      currentAggregatedPacket->AddHeader (blockAckReq);

2866

                      currentAggregatedPacket->AddHeader (blockAckReq);

2857

2867

2858

2868

Lines 2963-2969 MacLow::PerformMsduAggregation (Ptr<const Packet> packet, WifiMacHeader *hdr, Ti	Link Here

2963

2973

2964

  edcaIt->second->GetMsduAggregator ()->Aggregate (packet, currentAmsduPacket,

2974

  edcaIt->second->GetMsduAggregator ()->Aggregate (packet, currentAmsduPacket,

2965

                                                   edcaIt->second->MapSrcAddressForAggregation (*hdr),

2975

                                                   edcaIt->second->MapSrcAddressForAggregation (*hdr),

2966

                                                   edcaIt->second->MapDestAddressForAggregation (*hdr));

2976

                                                   edcaIt->second->MapDestAddressForAggregation (*hdr),

2977

                                                   GetMaxAmsduSize (ac));

2967

2978

2968

  peekedItem = queue->PeekByTidAndAddress (hdr->GetQosTid (), hdr->GetAddr1 ());

2979

  peekedItem = queue->PeekByTidAndAddress (hdr->GetQosTid (), hdr->GetAddr1 ());

2969

  while (peekedItem != 0)

2980

  while (peekedItem != 0)

Lines 2974-2980 MacLow::PerformMsduAggregation (Ptr<const Packet> packet, WifiMacHeader *hdr, Ti	Link Here

2974

2985

2975

      msduAggregation = edcaIt->second->GetMsduAggregator ()->Aggregate (peekedItem->GetPacket (), tempPacket,

2986

      msduAggregation = edcaIt->second->GetMsduAggregator ()->Aggregate (peekedItem->GetPacket (), tempPacket,

2976

                                                                         edcaIt->second->MapSrcAddressForAggregation (*hdr),

2987

                                                                         edcaIt->second->MapSrcAddressForAggregation (*hdr),

2977

                                                                         edcaIt->second->MapDestAddressForAggregation (*hdr));

2988

                                                                         edcaIt->second->MapDestAddressForAggregation (*hdr),

2989

                                                                         GetMaxAmsduSize (ac));

2978

2990

2979

      if (msduAggregation && !StopMpduAggregation (tempPacket, *hdr, currentAmpduPacket, blockAckSize))

2991

      if (msduAggregation && !StopMpduAggregation (tempPacket, *hdr, currentAmpduPacket, blockAckSize))

2980

2992

Lines 3035-3038 MacLow::CanTransmitNextCfFrame (void) const	Link Here

3035

  return ((GetRemainingCfpDuration () - nextTransmission).IsPositive ());

3047

  return ((GetRemainingCfpDuration () - nextTransmission).IsPositive ());

3036

3048

3037

3049

3050

uint16_t

3051

MacLow::GetMaxAmsduSize (AcIndex ac) const

3052

3053

  uint16_t size = 0;

3054

  WifiModulationClass modulation = GetDataTxVector (m_currentPacket, &m_currentHdr).GetMode ().GetModulationClass ();

3055

  if (modulation == WIFI_MOD_CLASS_HT)

3056

3057

      Ptr<HtConfiguration> htConfiguration = m_mac->GetHtConfiguration ();

3058

      NS_ASSERT (htConfiguration); //If modulation to transmit A-MSDU is HT, we should have a HT configuration attached

3059

      switch (ac)

3060

3061

          case AC_BE:

3062

            size = htConfiguration->GetBeMaxAmsduSize ();

3063

            break;

3064

          case AC_BK:

3065

            size = htConfiguration->GetBkMaxAmsduSize ();

3066

            break;

3067

          case AC_VI:

3068

            size = htConfiguration->GetViMaxAmsduSize ();

3069

            break;

3070

          case AC_VO:

3071

            size = htConfiguration->GetVoMaxAmsduSize ();

3072

            break;

3073

          default:

3074

            NS_ASSERT (false);

3075

            break;

3076

3077

3078

  else if (modulation == WIFI_MOD_CLASS_VHT)

3079

3080

      Ptr<VhtConfiguration> vhtConfiguration = m_mac->GetVhtConfiguration ();

3081

      NS_ASSERT (vhtConfiguration); //If modulation to transmit A-MSDU is VHT, we should have a VHT configuration attached

3082

      switch (ac)

3083

3084

          case AC_BE:

3085

            size = vhtConfiguration->GetBeMaxAmsduSize ();

3086

            break;

3087

          case AC_BK:

3088

            size = vhtConfiguration->GetBkMaxAmsduSize ();

3089

            break;

3090

          case AC_VI:

3091

            size = vhtConfiguration->GetViMaxAmsduSize ();

3092

            break;

3093

          case AC_VO:

3094

            size = vhtConfiguration->GetVoMaxAmsduSize ();

3095

            break;

3096

          default:

3097

            NS_ASSERT (false);

3098

            break;

3099

3100

3101

  else if (modulation == WIFI_MOD_CLASS_HE)

3102

3103

      Ptr<HeConfiguration> heConfiguration = m_mac->GetHeConfiguration ();

3104

      NS_ASSERT (heConfiguration); //If modulation to transmit A-MSDU is HE, we should have a HE configuration attached

3105

      switch (ac)

3106

3107

          case AC_BE:

3108

            size = heConfiguration->GetBeMaxAmsduSize ();

3109

            break;

3110

          case AC_BK:

3111

            size = heConfiguration->GetBkMaxAmsduSize ();

3112

            break;

3113

          case AC_VI:

3114

            size = heConfiguration->GetViMaxAmsduSize ();

3115

            break;

3116

          case AC_VO:

3117

            size = heConfiguration->GetVoMaxAmsduSize ();

3118

            break;

3119

          default:

3120

            NS_ASSERT (false);

3121

            break;

3122

3123

3124

  return size;

3125

3126

3127

uint32_t

3128

MacLow::GetMaxAmpduSize (AcIndex ac) const

3129

3130

  uint32_t size = 0;

3131

  WifiModulationClass modulation = GetDataTxVector (m_currentPacket, &m_currentHdr).GetMode ().GetModulationClass ();

3132

  if (modulation == WIFI_MOD_CLASS_HT)

3133

3134

      Ptr<HtConfiguration> htConfiguration = m_mac->GetHtConfiguration ();

3135

      NS_ASSERT (htConfiguration); //If modulation to transmit A-MPDU is HT, we should have a HT configuration attached

3136

      switch (ac)

3137

3138

          case AC_BE:

3139

            size = htConfiguration->GetBeMaxAmpduSize ();

3140

            break;

3141

          case AC_BK:

3142

            size = htConfiguration->GetBkMaxAmpduSize ();

3143

            break;

3144

          case AC_VI:

3145

            size = htConfiguration->GetViMaxAmpduSize ();

3146

            break;

3147

          case AC_VO:

3148

            size = htConfiguration->GetVoMaxAmpduSize ();

3149

            break;

3150

          default:

3151

            NS_ASSERT (false);

3152

            break;

3153

3154

3155

  else if (modulation == WIFI_MOD_CLASS_VHT)

3156

3157

      Ptr<VhtConfiguration> vhtConfiguration = m_mac->GetVhtConfiguration ();

3158

      NS_ASSERT (vhtConfiguration); //If modulation to transmit A-MPDU is VHT, we should have a VHT configuration attached

3159

      switch (ac)

3160

3161

          case AC_BE:

3162

            size = vhtConfiguration->GetBeMaxAmpduSize ();

3163

            break;

3164

          case AC_BK:

3165

            size = vhtConfiguration->GetBkMaxAmpduSize ();

3166

            break;

3167

          case AC_VI:

3168

            size = vhtConfiguration->GetViMaxAmpduSize ();

3169

            break;

3170

          case AC_VO:

3171

            size = vhtConfiguration->GetVoMaxAmpduSize ();

3172

            break;

3173

          default:

3174

            NS_ASSERT (false);

3175

            break;

3176

3177

3178

  else if (modulation == WIFI_MOD_CLASS_HE)

3179

3180

      Ptr<HeConfiguration> heConfiguration = m_mac->GetHeConfiguration ();

3181

      NS_ASSERT (heConfiguration); //If modulation to transmit A-MPDU is HE, we should have a HE configuration attached

3182

      switch (ac)

3183

3184

          case AC_BE:

3185

            size = heConfiguration->GetBeMaxAmpduSize ();

3186

            break;

3187

          case AC_BK:

3188

            size = heConfiguration->GetBkMaxAmpduSize ();

3189

            break;

3190

          case AC_VI:

3191

            size = heConfiguration->GetViMaxAmpduSize ();

3192

            break;

3193

          case AC_VO:

3194

            size = heConfiguration->GetVoMaxAmpduSize ();

3195

            break;

3196

          default:

3197

            NS_ASSERT (false);

3198

            break;

3199

3200

3201

  return size;

3202

3203

3038

} //namespace ns3

3204

} //namespace ns3

(-)a/src/wifi/model/mac-low.h (+12 lines)

Lines 41-46 class HeAggregationTest;	Link Here

namespace ns3 {

namespace ns3 {

class WifiMac;

class WifiPhy;

class WifiPhy;

class Txop;

class Txop;

class QosTxop;

class QosTxop;

Lines 93-98 public:	Link Here

*/

*/

  void ResetPhy (void);

  void ResetPhy (void);

/**

/**

   * Set up WifiMac associated with this MacLow.

   * \param mac WifiMac associated with this MacLow

100

*/

101

  void SetMac (const Ptr<WifiMac> mac);

102

/**

   * Set up WifiRemoteStationManager associated with this MacLow.

103

   * Set up WifiRemoteStationManager associated with this MacLow.

104

   * \param manager WifiRemoteStationManager associated with this MacLow

105

   * \param manager WifiRemoteStationManager associated with this MacLow

Lines 437-442 public:	Link Here

437

   * This function decides if a CF frame can be transmitted in the current CFP.

444

   * This function decides if a CF frame can be transmitted in the current CFP.

438

*/

445

*/

439

  bool CanTransmitNextCfFrame (void) const;

446

  bool CanTransmitNextCfFrame (void) const;

447

  //TODO

448

  uint16_t GetMaxAmsduSize (AcIndex ac) const;

449

  //TODO

450

  uint32_t GetMaxAmpduSize (AcIndex ac) const;

440

451

441

452

442

private:

453

private:

Lines 860-865 private:	Link Here

860

  Ptr<Packet> PerformMsduAggregation (Ptr<const Packet> packet, WifiMacHeader *hdr, Time *tstamp, Ptr<Packet> currentAmpduPacket, uint8_t blockAckSize);

871

  Ptr<Packet> PerformMsduAggregation (Ptr<const Packet> packet, WifiMacHeader *hdr, Time *tstamp, Ptr<Packet> currentAmpduPacket, uint8_t blockAckSize);

861

872

862

  Ptr<WifiPhy> m_phy; //!< Pointer to WifiPhy (actually send/receives frames)

873

  Ptr<WifiPhy> m_phy; //!< Pointer to WifiPhy (actually send/receives frames)

874

  Ptr<WifiMac> m_mac; //!< Pointer to WifiMac (to fetch configuration)

863

  Ptr<WifiRemoteStationManager> m_stationManager; //!< Pointer to WifiRemoteStationManager (rate control)

875

  Ptr<WifiRemoteStationManager> m_stationManager; //!< Pointer to WifiRemoteStationManager (rate control)

864

  MacLowRxCallback m_rxCallback; //!< Callback to pass packet up

876

  MacLowRxCallback m_rxCallback; //!< Callback to pass packet up

865

877




{
}

void
MpduAggregator::SetMaxAmpduSize (uint32_t maxSize)
{
  m_maxAmpduLength = maxSize;
}

uint32_t
MpduAggregator::GetMaxAmpduSize (void) const
{
  return m_maxAmpduLength;
}

bool
MpduAggregator::Aggregate (Ptr<const Packet> packet, Ptr<Packet> aggregatedPacket, uint32_t maxAmpduSize) const
{
  NS_LOG_FUNCTION (this);
  Ptr<Packet> currentPacket;

  uint8_t padding = CalculatePadding (aggregatedPacket);
  uint32_t actualSize = aggregatedPacket->GetSize ();

  if ((4 + packet->GetSize () + actualSize + padding) <= maxAmpduSize)
    {
      if (padding)
        {

}

bool
MpduAggregator::CanBeAggregated (uint32_t packetSize, Ptr<Packet> aggregatedPacket, uint8_t blockAckSize, uint32_t maxAmpduSize) const
{
  uint8_t padding = CalculatePadding (aggregatedPacket);
  uint32_t actualSize = aggregatedPacket->GetSize ();

    {
      blockAckSize = blockAckSize + 4 + padding;
    }
  if ((4 + packetSize + actualSize + padding + blockAckSize) <= maxAmpduSize)
    {
      return true;
    }




  virtual ~MpduAggregator ();

  /**
   * Sets the maximum A-MPDU size in bytes.
   * Value 0 means that MPDU aggregation is disabled.
   *
   * \param maxSize the maximum A-MPDU size in bytes.
   */
  void SetMaxAmpduSize (uint32_t maxSize);
  /**
   * Returns the maximum A-MPDU size in bytes.
   * Value 0 means that MPDU aggregation is disabled.
   *
   * \return the maximum A-MPDU size in bytes.
   */
  uint32_t GetMaxAmpduSize (void) const;

  /**
   * \param packet Packet we have to insert into <i>aggregatedPacket</i>.
   * \param aggregatedPacket Packet that will contain <i>packet</i>, if aggregation is possible.
   * \param maxAmpduSize the maximum A-MPDU size.
   *
   * \return true if <i>packet</i> can be aggregated to <i>aggregatedPacket</i>, false otherwise.
   *
   * Adds <i>packet</i> to <i>aggregatedPacket</i>. In concrete aggregator's implementation is
   * specified how and if <i>packet</i> can be added to <i>aggregatedPacket</i>.
   */
  bool Aggregate (Ptr<const Packet> packet, Ptr<Packet> aggregatedPacket, uint32_t maxAmpduSize) const;
  /**
   * \param packet the packet we want to insert into <i>aggregatedPacket</i>.
   * \param aggregatedPacket packet that will contain the packet of size <i>packetSize</i>, if aggregation is possible.

   * \param packetSize size of the packet we want to insert into <i>aggregatedPacket</i>.
   * \param aggregatedPacket packet that will contain the packet of size <i>packetSize</i>, if aggregation is possible.
   * \param blockAckSize size of the piggybacked block ack request
   * \param maxAmpduSize the maximum A-MPDU size.
   *
   * \return true if the packet of size <i>packetSize</i> can be aggregated to <i>aggregatedPacket</i>, false otherwise.
   *
   * This method is used to determine if a packet could be aggregated to an A-MPDU without exceeding the maximum packet size.
   */
  bool CanBeAggregated (uint32_t packetSize, Ptr<Packet> aggregatedPacket, uint8_t blockAckSize, uint32_t maxAmpduSize) const;

  /**
   * Deaggregates an A-MPDU by removing the A-MPDU subframe header and padding.

   * Each A-MPDU subframe is padded so that its length is multiple of 4 octets.
   */
  uint8_t CalculatePadding (Ptr<const Packet> packet) const;

  uint32_t m_maxAmpduLength; //!< Maximum length in bytes of A-MPDUs
};

}  //namespace ns3




{
}

void
MsduAggregator::SetMaxAmsduSize (uint16_t maxSize)
{
  m_maxAmsduLength = maxSize;
}

uint16_t
MsduAggregator::GetMaxAmsduSize (void) const
{
  return m_maxAmsduLength;
}

bool
MsduAggregator::Aggregate (Ptr<const Packet> packet, Ptr<Packet> aggregatedPacket,
                           Mac48Address src, Mac48Address dest, uint16_t maxAmsduSize) const
{
  NS_LOG_FUNCTION (this);
  Ptr<Packet> currentPacket;

  uint8_t padding = CalculatePadding (aggregatedPacket);
  uint32_t actualSize = aggregatedPacket->GetSize ();

  if ((14 + packet->GetSize () + actualSize + padding) <= maxAmsduSize)
    {
      if (padding)
        {




  virtual ~MsduAggregator ();

  /**
   * Sets the maximum A-MSDU size in bytes.
   * Value 0 means that MSDU aggregation is disabled.
   *
   * \param maxSize the maximum A-MSDU size in bytes.
   */
  void SetMaxAmsduSize (uint16_t maxSize);
  /**
   * Returns the maximum A-MSDU size in bytes.
   * Value 0 means that MSDU aggregation is disabled.
   *
   * \return the maximum A-MSDU size in bytes.
   */
  uint16_t GetMaxAmsduSize (void) const;

  /**
   * Adds <i>packet</i> to <i>aggregatedPacket</i>. In concrete aggregator's implementation is
   * specified how and if <i>packet</i> can be added to <i>aggregatedPacket</i>. If <i>packet</i>
   * can be added returns true, false otherwise.

   * \param aggregatedPacket the aggregated packet.
   * \param src the source address.
   * \param dest the destination address
   * \param maxAmsduSize the maximum A-MSDU size.
   * \return true if successful.
   */
  bool Aggregate (Ptr<const Packet> packet, Ptr<Packet> aggregatedPacket,
                  Mac48Address src, Mac48Address dest, uint16_t maxAmsduSize) const;

  /**
   *

   * \return the number of octets required for padding
   */
  uint8_t CalculatePadding (Ptr<const Packet> packet) const;

  uint16_t m_maxAmsduLength; ///< maximum AMSDU length
};

} //namespace ns3




              Ptr<Packet> currentAggregatedPacket = Create<Packet> ();
              m_msduAggregator->Aggregate (m_currentPacket, currentAggregatedPacket,
                                           MapSrcAddressForAggregation (peekedHdr),
                                           MapDestAddressForAggregation (peekedHdr),
                                           GetLow ()->GetMaxAmsduSize (QosUtilsMapTidToAc (m_currentHdr.GetQosTid ())));
              bool aggregated = false;
              bool isAmsdu = false;
              Ptr<const WifiMacQueueItem> peekedItem = m_queue->PeekByTidAndAddress (m_currentHdr.GetQosTid (),

                  peekedHdr = peekedItem->GetHeader ();
                  aggregated = m_msduAggregator->Aggregate (peekedItem->GetPacket (), currentAggregatedPacket,
                                                            MapSrcAddressForAggregation (peekedHdr),
                                                            MapDestAddressForAggregation (peekedHdr),
                                                            GetLow ()->GetMaxAmsduSize (QosUtilsMapTidToAc (m_currentHdr.GetQosTid ())));
                  if (aggregated)
                    {
                      isAmsdu = true;

      || (m_stationManager->GetHtSupported ()
          && m_currentHdr.IsQosData ()
          && GetBaAgreementExists (m_currentHdr.GetAddr1 (), GetTid (m_currentPacket, m_currentHdr))
          && GetLow ()->GetMaxAmpduSize (QosUtilsMapTidToAc (GetTid (m_currentPacket, m_currentHdr))) >= m_currentPacket->GetSize ()))
    {
      //MSDU is not fragmented when it is transmitted using an HT-immediate or
      //HT-delayed Block Ack agreement or when it is carried in an A-MPDU.

      m_baManager->SwitchToBlockAckIfNeeded (recipient, tid, sequence);
    }
  if ((m_baManager->ExistsAgreementInState (recipient, tid, OriginatorBlockAckAgreement::ESTABLISHED))
      && (GetMpduAggregator () == 0 || GetLow ()->GetMaxAmpduSize (QosUtilsMapTidToAc (tid)) == 0))
    {
      m_currentHdr.SetQosAckPolicy (WifiMacHeader::BLOCK_ACK);
    }

  Mac48Address recipient = m_currentHdr.GetAddr1 ();
  uint32_t packets = m_queue->GetNPacketsByTidAndAddress (tid, recipient);
  if ((GetBlockAckThreshold () > 0 && packets >= GetBlockAckThreshold ())
      || (m_mpduAggregator != 0 && GetLow ()->GetMaxAmpduSize (QosUtilsMapTidToAc (tid)) > 0 && packets > 1)
      || m_stationManager->GetVhtSupported ()
      || m_stationManager->GetHeSupported ())
    {





  m_low = CreateObject<MacLow> ();
  m_low->SetRxCallback (MakeCallback (&MacRxMiddle::Receive, m_rxMiddle));
  m_low->SetMac (this);

  m_channelAccessManager = CreateObject<ChannelAccessManager> ();
  m_channelAccessManager->SetupLow (m_low);

  HtCapabilities capabilities;
  if (GetHtSupported ())
    {
      Ptr<HtConfiguration> htConfiguration = GetHtConfiguration ();
      Ptr<HtConfiguration> htConfiguration = device->GetHtConfiguration ();
      bool greenfieldSupported = htConfiguration->GetGreenfieldSupported ();
      bool sgiSupported = htConfiguration->GetShortGuardIntervalSupported ();
      capabilities.SetHtSupported (1);

      uint32_t maxAmsduLength = std::max (std::max (m_beMaxAmsduSize, m_bkMaxAmsduSize), std::max (m_voMaxAmsduSize, m_viMaxAmsduSize));
      capabilities.SetMaxAmsduLength (maxAmsduLength > 3839); //0 if 3839 and 1 if 7935
      capabilities.SetLSigProtectionSupport (!greenfieldSupported);
      double maxAmpduLengthExponent = std::max (std::ceil ((std::log (std::max (std::max (htConfiguration->GetBeMaxAmpduSize (), htConfiguration->GetBkMaxAmpduSize ()), std::max (htConfiguration->GetVoMaxAmpduSize (), htConfiguration->GetViMaxAmpduSize ()))
                                                                      + 1.0)
                                                            / std::log (2.0))
                                                           - 13.0),

  VhtCapabilities capabilities;
  if (GetVhtSupported ())
    {
      Ptr<HtConfiguration> htConfiguration = GetHtConfiguration ();
      Ptr<VhtConfiguration> vhtConfiguration = GetVhtConfiguration ();
      bool sgiSupported = htConfiguration->GetShortGuardIntervalSupported ();
      capabilities.SetVhtSupported (1);
      if (m_phy->GetChannelWidth () == 160)

      capabilities.SetRxLdpc (0);
      capabilities.SetShortGuardIntervalFor80Mhz ((m_phy->GetChannelWidth () == 80) && sgiSupported);
      capabilities.SetShortGuardIntervalFor160Mhz ((m_phy->GetChannelWidth () == 160) && sgiSupported);
      double maxAmpduLengthExponent = std::max (std::ceil ((std::log (std::max (std::max (vhtConfiguration->GetBeMaxAmpduSize (), vhtConfiguration->GetBkMaxAmpduSize ()), std::max (vhtConfiguration->GetVoMaxAmpduSize (), vhtConfiguration->GetViMaxAmpduSize ())) + 1.0) / std::log (2.0)) - 13.0), 0.0);
      NS_ASSERT (maxAmpduLengthExponent >= 0 && maxAmpduLengthExponent <= 255);
      capabilities.SetMaxAmpduLengthExponent (std::max<uint8_t> (7, static_cast<uint8_t> (maxAmpduLengthExponent))); //0 to 7 for VHT
      uint8_t maxMcs = 0;

  HeCapabilities capabilities;
  if (GetHeSupported ())
    {
      Ptr<HeConfiguration> heConfiguration = GetHeConfiguration ();
      Ptr<HeConfiguration> heConfiguration = device->GetHeConfiguration ();
      capabilities.SetHeSupported (1);
      uint8_t channelWidthSet = 0;
      if (m_phy->GetChannelWidth () >= 40 && Is2_4Ghz (m_phy->GetFrequency ()))

          gi |= 0x02;
        }
      capabilities.SetHeLtfAndGiForHePpdus (gi);
      double maxAmpduLengthExponent = std::max (std::ceil ((std::log (std::max (std::max (heConfiguration->GetBeMaxAmpduSize (), heConfiguration->GetBkMaxAmpduSize ()), std::max (heConfiguration->GetVoMaxAmpduSize (), heConfiguration->GetViMaxAmpduSize ()))
                                                                      + 1.0)
                                                            / std::log (2.0))
                                                           - 20.0),
                                                0.0);
      NS_ASSERT (maxAmpduLengthExponent >= 0 && maxAmpduLengthExponent <= 255);
      capabilities.SetMaxAmpduLengthExponent (std::max<uint8_t> (7, static_cast<uint8_t> (maxAmpduLengthExponent))); //assume 0 to 7 for HE

RegularWifiMac::SetVoMaxAmsduSize (uint16_t size)
{
  NS_LOG_FUNCTION (this << size);
  Ptr<WifiNetDevice> device = DynamicCast<WifiNetDevice> (GetDevice ());
  if (device)
    {
      Ptr<HtConfiguration> htConfiguration = device->GetHtConfiguration ();
      if (htConfiguration)
        {
          htConfiguration->SetVoMaxAmsduSize (size);
        }
    }
  m_voMaxAmsduSize = size;
  ConfigureAggregation ();
}

void
RegularWifiMac::SetViMaxAmsduSize (uint16_t size)
{
  NS_LOG_FUNCTION (this << size);
  Ptr<WifiNetDevice> device = DynamicCast<WifiNetDevice> (GetDevice ());
  if (device)
    {
      Ptr<HtConfiguration> htConfiguration = device->GetHtConfiguration ();
      if (htConfiguration)
        {
          htConfiguration->SetViMaxAmsduSize (size);
        }
    }
  m_viMaxAmsduSize = size;
  ConfigureAggregation ();
}

void
RegularWifiMac::SetBeMaxAmsduSize (uint16_t size)
{
  NS_LOG_FUNCTION (this << size);
  Ptr<WifiNetDevice> device = DynamicCast<WifiNetDevice> (GetDevice ());
  if (device)
    {
      Ptr<HtConfiguration> htConfiguration = device->GetHtConfiguration ();
      if (htConfiguration)
        {
          htConfiguration->SetBeMaxAmsduSize (size);
        }
    }
  m_beMaxAmsduSize = size;
  ConfigureAggregation ();
}

void
RegularWifiMac::SetBkMaxAmsduSize (uint16_t size)
{
  NS_LOG_FUNCTION (this << size);
  Ptr<WifiNetDevice> device = DynamicCast<WifiNetDevice> (GetDevice ());
  if (device)
    {
      Ptr<HtConfiguration> htConfiguration = device->GetHtConfiguration ();
      if (htConfiguration)
        {
          htConfiguration->SetBkMaxAmsduSize (size);
        }
    }
  m_bkMaxAmsduSize = size;
  ConfigureAggregation ();
}

void
RegularWifiMac::SetVoMaxAmpduSize (uint32_t size)
{
  NS_LOG_FUNCTION (this << size);
  Ptr<WifiNetDevice> device = DynamicCast<WifiNetDevice> (GetDevice ());
  if (device)
    {
      Ptr<HtConfiguration> htConfiguration = device->GetHtConfiguration ();
      if (htConfiguration)
        {
          htConfiguration->SetVoMaxAmpduSize (size);
        }
    }
  m_voMaxAmpduSize = size;
  ConfigureAggregation ();
}

void
RegularWifiMac::SetViMaxAmpduSize (uint32_t size)
{
  NS_LOG_FUNCTION (this << size);
  Ptr<WifiNetDevice> device = DynamicCast<WifiNetDevice> (GetDevice ());
  if (device)
    {
      Ptr<HtConfiguration> htConfiguration = device->GetHtConfiguration ();
      if (htConfiguration)
        {
          htConfiguration->SetViMaxAmpduSize (size);
        }
    }
  m_viMaxAmpduSize = size;
  ConfigureAggregation ();
}

void
RegularWifiMac::SetBeMaxAmpduSize (uint32_t size)
{
  NS_LOG_FUNCTION (this << size);
  Ptr<WifiNetDevice> device = DynamicCast<WifiNetDevice> (GetDevice ());
  if (device)
    {
      Ptr<HtConfiguration> htConfiguration = device->GetHtConfiguration ();
      if (htConfiguration)
        {
          htConfiguration->SetBeMaxAmpduSize (size);
        }
    }
  m_beMaxAmpduSize = size;
  ConfigureAggregation ();
}

void
RegularWifiMac::SetBkMaxAmpduSize (uint32_t size)
{
  NS_LOG_FUNCTION (this << size);
  Ptr<WifiNetDevice> device = DynamicCast<WifiNetDevice> (GetDevice ());
  if (device)
    {
      Ptr<HtConfiguration> htConfiguration = device->GetHtConfiguration ();
      if (htConfiguration)
        {
          htConfiguration->SetBkMaxAmpduSize (size);
        }
    }
  m_bkMaxAmpduSize = size;
  ConfigureAggregation ();
}

void

bool
RegularWifiMac::GetHtSupported () const
{
  if (GetHtConfiguration ())
  if (device->GetHtConfiguration ())
    {
      return true;
    }

bool
RegularWifiMac::GetVhtSupported () const
{
  if (GetVhtConfiguration ())
  if (device->GetVhtConfiguration ())
    {
      return true;
    }

bool
RegularWifiMac::GetHeSupported () const
{
  if (GetHeConfiguration ())
  if (device->GetHeConfiguration ())
    {
      return true;
    }

    }
  respHdr.SetTid (reqHdr->GetTid ());

  Ptr<HeConfiguration> heConfiguration = GetHeConfiguration ();
  Ptr<HeConfiguration> heConfiguration = device->GetHeConfiguration ();
  if (heConfiguration && heConfiguration->GetMpduBufferSize () > 64)
    {
      respHdr.SetBufferSize (255);

    case WIFI_PHY_STANDARD_80211n_5GHZ:
      {
        EnableAggregation ();
        //To be removed once deprecated attributes are removed
        Ptr<HtConfiguration> htConfiguration = GetHtConfiguration ();
        Ptr<HtConfiguration> htConfiguration = device->GetHtConfiguration ();
        NS_ASSERT (htConfiguration);
        htConfiguration->SetRifsSupported (m_rifsSupported);
        htConfiguration->SetBeMaxAmpduSize (m_beMaxAmpduSize);
        htConfiguration->SetBkMaxAmpduSize (m_bkMaxAmpduSize);
        htConfiguration->SetViMaxAmpduSize (m_viMaxAmpduSize);
        htConfiguration->SetVoMaxAmpduSize (m_voMaxAmpduSize);
        htConfiguration->SetBeMaxAmsduSize (m_beMaxAmsduSize);
        htConfiguration->SetBkMaxAmsduSize (m_bkMaxAmsduSize);
        htConfiguration->SetViMaxAmsduSize (m_viMaxAmsduSize);
        htConfiguration->SetVoMaxAmsduSize (m_voMaxAmsduSize);
        SetQosSupported (true);
        cwmin = 15;
        cwmax = 1023;

      {
        EnableAggregation ();
        //To be removed once deprecated RifsSupported attribute is removed
        Ptr<HtConfiguration> htConfiguration = GetHtConfiguration ();
        Ptr<HtConfiguration> htConfiguration = device->GetHtConfiguration ();
        NS_ASSERT (htConfiguration);
        htConfiguration->SetRifsSupported (m_rifsSupported);
        htConfiguration->SetBeMaxAmpduSize (m_beMaxAmpduSize);
        htConfiguration->SetViMaxAmpduSize (m_viMaxAmpduSize);
        htConfiguration->SetVoMaxAmpduSize (m_voMaxAmpduSize);
        htConfiguration->SetBeMaxAmsduSize (m_beMaxAmsduSize);
        htConfiguration->SetBkMaxAmsduSize (m_bkMaxAmsduSize);
        htConfiguration->SetViMaxAmsduSize (m_viMaxAmsduSize);
        htConfiguration->SetVoMaxAmsduSize (m_voMaxAmsduSize);
        SetQosSupported (true);
      }
    case WIFI_PHY_STANDARD_80211g:

}

void
RegularWifiMac::ConfigureAggregation (void)
{
  NS_LOG_FUNCTION (this);
  if (GetVOQueue ()->GetMsduAggregator () != 0)
    {
      GetVOQueue ()->GetMsduAggregator ()->SetMaxAmsduSize (m_voMaxAmsduSize);
    }
  if (GetVIQueue ()->GetMsduAggregator () != 0)
    {
      GetVIQueue ()->GetMsduAggregator ()->SetMaxAmsduSize (m_viMaxAmsduSize);
    }
  if (GetBEQueue ()->GetMsduAggregator () != 0)
    {
      GetBEQueue ()->GetMsduAggregator ()->SetMaxAmsduSize (m_beMaxAmsduSize);
    }
  if (GetBKQueue ()->GetMsduAggregator () != 0)
    {
      GetBKQueue ()->GetMsduAggregator ()->SetMaxAmsduSize (m_bkMaxAmsduSize);
    }
  if (GetVOQueue ()->GetMpduAggregator () != 0)
    {
      GetVOQueue ()->GetMpduAggregator ()->SetMaxAmpduSize (m_voMaxAmpduSize);
    }
  if (GetVIQueue ()->GetMpduAggregator () != 0)
    {
      GetVIQueue ()->GetMpduAggregator ()->SetMaxAmpduSize (m_viMaxAmpduSize);
    }
  if (GetBEQueue ()->GetMpduAggregator () != 0)
    {
      GetBEQueue ()->GetMpduAggregator ()->SetMaxAmpduSize (m_beMaxAmpduSize);
    }
  if (GetBKQueue ()->GetMpduAggregator () != 0)
    {
      GetBKQueue ()->GetMpduAggregator ()->SetMaxAmpduSize (m_bkMaxAmpduSize);
    }
}

void
RegularWifiMac::EnableAggregation (void)
{
  NS_LOG_FUNCTION (this);

          i->second->SetMpduAggregator (mpduAggregator);
        }
    }
  ConfigureAggregation ();
}

void

(-)a/src/wifi/model/regular-wifi-mac.h (-2 lines)

Lines 660-667 private:	Link Here

660

*/

660

*/

661

  bool m_dsssSupported;

661

  bool m_dsssSupported;

662

663

  /// Configure aggregation function

664

  void ConfigureAggregation (void);

665

  /// Enable aggregation function

663

  /// Enable aggregation function

666

  void EnableAggregation (void);

664

  void EnableAggregation (void);

667

  /// Disable aggregation function

665

  /// Disable aggregation function




 */

#include "ns3/log.h"
#include "ns3/uinteger.h"
#include "vht-configuration.h"

namespace ns3 {

    .SetParent<Object> ()
    .SetGroupName ("Wifi")
    .AddConstructor<VhtConfiguration> ()
    .AddAttribute ("VO_MaxAmsduSize",
                   "Maximum length in bytes of an A-MSDU for AC_VO access class. "
                   "Value 0 means A-MSDU is disabled for that AC.",
                   UintegerValue (0),
                   MakeUintegerAccessor (&VhtConfiguration::SetVoMaxAmsduSize,
                                         &VhtConfiguration::GetVoMaxAmsduSize),
                   MakeUintegerChecker<uint16_t> (0, 11454))
    .AddAttribute ("VI_MaxAmsduSize",
                   "Maximum length in bytes of an A-MSDU for AC_VI access class."
                   "Value 0 means A-MSDU is disabled for that AC.",
                   UintegerValue (0),
                   MakeUintegerAccessor (&VhtConfiguration::SetViMaxAmsduSize,
                                         &VhtConfiguration::GetViMaxAmsduSize),
                   MakeUintegerChecker<uint16_t> (0, 11454))
    .AddAttribute ("BE_MaxAmsduSize",
                   "Maximum length in bytes of an A-MSDU for AC_BE access class."
                   "Value 0 means A-MSDU is disabled for that AC.",
                   UintegerValue (0),
                   MakeUintegerAccessor (&VhtConfiguration::SetBeMaxAmsduSize,
                                         &VhtConfiguration::GetBeMaxAmsduSize),
                   MakeUintegerChecker<uint16_t> (0, 11454))
    .AddAttribute ("BK_MaxAmsduSize",
                   "Maximum length in bytes of an A-MSDU for AC_BK access class."
                   "Value 0 means A-MSDU is disabled for that AC.",
                   UintegerValue (0),
                   MakeUintegerAccessor (&VhtConfiguration::SetBkMaxAmsduSize,
                                         &VhtConfiguration::GetBkMaxAmsduSize),
                   MakeUintegerChecker<uint16_t> (0, 11454))
    .AddAttribute ("VO_MaxAmpduSize",
                   "Maximum length in bytes of an A-MPDU for AC_VO access class."
                   "Value 0 means A-MPDU is disabled for that AC.",
                   UintegerValue (0),
                   MakeUintegerAccessor (&VhtConfiguration::SetVoMaxAmpduSize,
                                         &VhtConfiguration::GetVoMaxAmpduSize),
                   MakeUintegerChecker<uint32_t> (0, 1048575))
    .AddAttribute ("VI_MaxAmpduSize",
                   "Maximum length in bytes of an A-MPDU for AC_VI access class."
                   "Value 0 means A-MPDU is disabled for that AC.",
                   UintegerValue (1048575),
                   MakeUintegerAccessor (&VhtConfiguration::SetViMaxAmpduSize,
                                         &VhtConfiguration::GetViMaxAmpduSize),
                   MakeUintegerChecker<uint32_t> (0, 1048575))
    .AddAttribute ("BE_MaxAmpduSize",
                   "Maximum length in bytes of an A-MPDU for AC_BE access class."
                   "Value 0 means A-MPDU is disabled for that AC.",
                   UintegerValue (1048575),
                   MakeUintegerAccessor (&VhtConfiguration::SetBeMaxAmpduSize,
                                         &VhtConfiguration::GetBeMaxAmpduSize),
                   MakeUintegerChecker<uint32_t> (0, 1048575))
    .AddAttribute ("BK_MaxAmpduSize",
                   "Maximum length in bytes of an A-MPDU for AC_BK access class."
                   "Value 0 means A-MPDU is disabled for that AC.",
                   UintegerValue (0),
                   MakeUintegerAccessor (&VhtConfiguration::SetBkMaxAmpduSize,
                                         &VhtConfiguration::GetBkMaxAmpduSize),
                   MakeUintegerChecker<uint32_t> (0, 1048575))
    ;
    return tid;
}

void
VhtConfiguration::SetVoMaxAmsduSize (uint16_t size)
{
  NS_LOG_FUNCTION (this << size);
  m_voMaxAmsduSize = size;
}

uint16_t
VhtConfiguration::GetVoMaxAmsduSize (void) const
{
  return m_voMaxAmsduSize;
}

void
VhtConfiguration::SetViMaxAmsduSize (uint16_t size)
{
  NS_LOG_FUNCTION (this << size);
  m_viMaxAmsduSize = size;
}

uint16_t
VhtConfiguration::GetViMaxAmsduSize (void) const
{
  return m_viMaxAmsduSize;
}

void
VhtConfiguration::SetBeMaxAmsduSize (uint16_t size)
{
  NS_LOG_FUNCTION (this << size);
  m_beMaxAmsduSize = size;
}

uint16_t
VhtConfiguration::GetBeMaxAmsduSize (void) const
{
  return m_beMaxAmsduSize;
}

void
VhtConfiguration::SetBkMaxAmsduSize (uint16_t size)
{
  NS_LOG_FUNCTION (this << size);
  m_bkMaxAmsduSize = size;
}

uint16_t
VhtConfiguration::GetBkMaxAmsduSize (void) const
{
  return m_bkMaxAmsduSize;
}

void
VhtConfiguration::SetVoMaxAmpduSize (uint32_t size)
{
  NS_LOG_FUNCTION (this << size);
  m_voMaxAmpduSize = size;
}

uint32_t
VhtConfiguration::GetVoMaxAmpduSize (void) const
{
  return m_voMaxAmpduSize;
}

void
VhtConfiguration::SetViMaxAmpduSize (uint32_t size)
{
  NS_LOG_FUNCTION (this << size);
  m_viMaxAmpduSize = size;
}

uint32_t
VhtConfiguration::GetViMaxAmpduSize (void) const
{
  return m_viMaxAmpduSize;
}

void
VhtConfiguration::SetBeMaxAmpduSize (uint32_t size)
{
  NS_LOG_FUNCTION (this << size);
  m_beMaxAmpduSize = size;
}

uint32_t
VhtConfiguration::GetBeMaxAmpduSize (void) const
{
  return m_beMaxAmpduSize;
}

void
VhtConfiguration::SetBkMaxAmpduSize (uint32_t size)
{
  NS_LOG_FUNCTION (this << size);
  m_bkMaxAmpduSize = size;
}

uint32_t
VhtConfiguration::GetBkMaxAmpduSize (void) const
{
  return m_bkMaxAmpduSize;
}

} //namespace ns3




  virtual ~VhtConfiguration ();

  static TypeId GetTypeId (void);

  /**
   * Set the maximum A-MSDU size for AC_VO.
   *
   * \param size the maximum A-MSDU size for AC_VO.
   */
  void SetVoMaxAmsduSize (uint16_t size);
  /**
   * \return the maximum A-MSDU size for AC_VO.
   */
  uint16_t GetVoMaxAmsduSize (void) const;
  /**
   * Set the maximum A-MSDU size for AC_VI.
   *
   * \param size the maximum A-MSDU size for AC_VI.
   */
  void SetViMaxAmsduSize (uint16_t size);
  /**
   * \return the maximum A-MSDU size for AC_VI.
   */
  uint16_t GetViMaxAmsduSize (void) const;
  /**
   * Set the maximum A-MSDU size for AC_BE.
   *
   * \param size the maximum A-MSDU size for AC_BE.
   */
  void SetBeMaxAmsduSize (uint16_t size);
  /**
   * \return the maximum A-MSDU size for AC_BE.
   */
  uint16_t GetBeMaxAmsduSize (void) const;
  /**
   * Set the maximum A-MSDU size for AC_BK.
   *
   * \param size the maximum A-MSDU size for AC_BK.
   */
  void SetBkMaxAmsduSize (uint16_t size);
  /**
   * \return the maximum A-MSDU size for AC_BK.
   */
  uint16_t GetBkMaxAmsduSize (void) const;
  /**
   * Set the maximum A-MPDU size for AC_VO.
   *
   * \param size the maximum A-MPDU size for AC_VO.
   */
  void SetVoMaxAmpduSize (uint32_t size);
  /**
   * \return the maximum A-MPDU size for AC_VO.
   */
  uint32_t GetVoMaxAmpduSize (void) const;
  /**
   * Set the maximum A-MPDU size for AC_VI.
   *
   * \param size the maximum A-MPDU size for AC_VI.
   */
  void SetViMaxAmpduSize (uint32_t size);
  /**
   * \return the maximum A-MPDU size for AC_VI.
   */
  uint32_t GetViMaxAmpduSize (void) const;
  /**
   * Set the maximum A-MPDU size for AC_BE.
   *
   * \param size the maximum A-MPDU size for AC_BE.
   */
  void SetBeMaxAmpduSize (uint32_t size);
  /**
   * \return the maximum A-MPDU size for AC_BE.
   */
  uint32_t GetBeMaxAmpduSize (void) const;
  /**
   * Set the maximum A-MPDU size for AC_BK.
   *
   * \param size the maximum A-MPDU size for AC_BK.
   */
  void SetBkMaxAmpduSize (uint32_t size);
  /**
   * \return the maximum A-MPDU size for AC_BK.
   */
  uint32_t GetBkMaxAmpduSize (void) const;


private:
  uint16_t m_voMaxAmsduSize; ///< maximum A-MSDU size for AC_VO
  uint16_t m_viMaxAmsduSize; ///< maximum A-MSDU size for AC_VI
  uint16_t m_beMaxAmsduSize; ///< maximum A-MSDU size for AC_BE
  uint16_t m_bkMaxAmsduSize; ///< maximum A-MSDU size for AC_BK

  uint32_t m_voMaxAmpduSize; ///< maximum A-MPDU size for AC_VO
  uint32_t m_viMaxAmpduSize; ///< maximum A-MPDU size for AC_VI
  uint32_t m_beMaxAmpduSize; ///< maximum A-MPDU size for AC_BE
  uint32_t m_bkMaxAmpduSize; ///< maximum A-MPDU size for AC_BK
};

} //namespace ns3

(-)a/src/wifi/model/wifi-mac.cc (+8 lines)

Lines 25-30	Link Here

#include "ssid.h"

#include "ssid.h"

#include "wifi-net-device.h"

#include "wifi-net-device.h"

#include "ht-configuration.h"

#include "ht-configuration.h"

#include "vht-configuration.h"

#include "he-configuration.h"

#include "he-configuration.h"

namespace ns3 {

namespace ns3 {

Lines 480-485 WifiMac::GetHtConfiguration (void) const	Link Here

480

      return device->GetHtConfiguration ();

481

      return device->GetHtConfiguration ();

481

482

483

484

Ptr<VhtConfiguration>

485

WifiMac::GetVhtConfiguration (void) const

486

487

      Ptr<WifiNetDevice> device = DynamicCast<WifiNetDevice> (GetDevice ());

488

      return device->GetVhtConfiguration ();

489

490

483

Ptr<HeConfiguration>

491

Ptr<HeConfiguration>

484

WifiMac::GetHeConfiguration (void) const

492

WifiMac::GetHeConfiguration (void) const

485

493




class Ssid;
class Txop;
class HtConfiguration;
class VhtConfiguration;
class HeConfiguration;

/**

   */
  void ConfigureStandard (WifiPhyStandard standard);

  /**
   * \return pointer to HtConfiguration if it exists
   */
  Ptr<HtConfiguration> GetHtConfiguration (void) const;
  /**
   * \return pointer to VhtConfiguration if it exists
   */
  Ptr<VhtConfiguration> GetVhtConfiguration (void) const;
  /**
   * \return pointer to HeConfiguration if it exists
   */
  Ptr<HeConfiguration> GetHeConfiguration (void) const;


protected:
  /**

   */
  void ConfigureDcf (Ptr<Txop> dcf, uint32_t cwmin, uint32_t cwmax, bool isDsss, AcIndex ac);

  /**
   * \return pointer to HtConfiguration if it exists
   */
  Ptr<HtConfiguration> GetHtConfiguration (void) const;
  /**
   * \return pointer to HeConfiguration if it exists
   */
  Ptr<HeConfiguration> GetHeConfiguration (void) const;


private:
  /**




  /*
   * Configure MPDU aggregation.
   */
  htConfiguration->SetBeMaxAmpduSize (65535);

  /*
   * Create a dummy packet of 1500 bytes and fill mac header fields.

  /*
   * Configure aggregation.
   */
  htConfiguration->SetBeMaxAmsduSize (4095);
  htConfiguration->SetBeMaxAmpduSize (65535);

  /*
   * Create dummy packets of 1500 bytes and fill mac header fields that will be used for the tests.

   * It checks whether MSDU aggregation has been rejected because the maximum MPDU size is set to 0 (returned packet should be equal to 0).
   * This test is needed to ensure that no packets are removed from the queue in MacLow::PerformMsduAggregation, since aggregation will no occur in MacLow::AggregateToAmpdu.
   */
  htConfiguration->SetBeMaxAmpduSize (65535);

  m_mac->GetBEQueue ()->GetWifiMacQueue ()->Enqueue (Create<WifiMacQueueItem> (pkt, hdr));
  packet = m_mac->GetBEQueue ()->GetLow ()->PerformMsduAggregation (peekedPacket, &peekedHdr, &tstamp, currentAggregatedPacket, 0);

   * It checks whether MSDU aggregation has been rejected because there is no packets ready in the queue (returned packet should be equal to 0).
   * This test is needed to ensure that there is no issue when the queue is empty.
   */
  htConfiguration->SetBeMaxAmpduSize (4095);

  m_mac->GetBEQueue ()->GetWifiMacQueue ()->Remove (pkt);
  m_mac->GetBEQueue ()->GetWifiMacQueue ()->Remove (pkt);

  m_device->SetMac (m_mac);

  /*
   * Configure MPDU aggregation.
   */
  m_mac->GetBEQueue ()->GetMpduAggregator ()->SetMaxAmpduSize (4194304); //Maximum size allowed by 802.11ax

  /*
   * Create a dummy packet of 100 bytes and fill mac header fields.
   */
  Ptr<const Packet> pkt = Create<Packet> (100);

Return to bug 3010