Attachment #2179 for bug #2213

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

(-)a/examples/wireless/ht-wifi-network.cc (-2 / +2 lines)

Lines 108-115	Link Here

108

                  return 0;

108

                  return 0;

109

110

111

              HtWifiMacHelper mac = HtWifiMacHelper::Default ();

111

              QosWifiMacHelper mac = QosWifiMacHelper::Default ();

112

              StringValue DataRate = HtWifiMacHelper::DataRateForMcs (i);

112

              StringValue DataRate = McsHelper::DataRateForHtMcs (i);

113

              wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager","DataMode", DataRate,

113

              wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager","DataMode", DataRate,

114

                                            "ControlMode", DataRate);

114

                                            "ControlMode", DataRate);

115

(-)a/examples/wireless/simple-ht-hidden-stations.cc (-1 / +1 lines)

Lines 90-96	Link Here

  WifiHelper wifi = WifiHelper::Default ();

  WifiHelper wifi = WifiHelper::Default ();

  wifi.SetStandard (WIFI_PHY_STANDARD_80211n_5GHZ);

  wifi.SetStandard (WIFI_PHY_STANDARD_80211n_5GHZ);

  wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager", "DataMode", StringValue ("HtMcs7"), "ControlMode", StringValue ("HtMcs0"));

  wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager", "DataMode", StringValue ("HtMcs7"), "ControlMode", StringValue ("HtMcs0"));

  HtWifiMacHelper mac = HtWifiMacHelper::Default ();

  QosWifiMacHelper mac = QosWifiMacHelper::Default ();

  Ssid ssid = Ssid ("simple-mpdu-aggregation");

  Ssid ssid = Ssid ("simple-mpdu-aggregation");

  mac.SetType ("ns3::StaWifiMac",

  mac.SetType ("ns3::StaWifiMac",

(-)a/examples/wireless/simple-mpdu-aggregation.cc (-1 / +1 lines)

Lines 88-94	Link Here

  WifiHelper wifi = WifiHelper::Default ();

  WifiHelper wifi = WifiHelper::Default ();

  wifi.SetStandard (WIFI_PHY_STANDARD_80211n_5GHZ);

  wifi.SetStandard (WIFI_PHY_STANDARD_80211n_5GHZ);

  wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager", "DataMode", StringValue ("HtMcs7"), "ControlMode", StringValue ("HtMcs0"));

  wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager", "DataMode", StringValue ("HtMcs7"), "ControlMode", StringValue ("HtMcs0"));

  HtWifiMacHelper mac = HtWifiMacHelper::Default ();

  QosWifiMacHelper mac = QosWifiMacHelper::Default ();

  Ssid ssid = Ssid ("simple-mpdu-aggregation");

  Ssid ssid = Ssid ("simple-mpdu-aggregation");

  mac.SetType ("ns3::StaWifiMac",

  mac.SetType ("ns3::StaWifiMac",

(-)a/examples/wireless/simple-msdu-aggregation.cc (-1 / +1 lines)

Lines 88-94	Link Here

  WifiHelper wifi = WifiHelper::Default ();

  WifiHelper wifi = WifiHelper::Default ();

  wifi.SetStandard (WIFI_PHY_STANDARD_80211n_5GHZ);

  wifi.SetStandard (WIFI_PHY_STANDARD_80211n_5GHZ);

  wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager", "DataMode", StringValue ("HtMcs7"), "ControlMode", StringValue ("HtMcs0"));

  wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager", "DataMode", StringValue ("HtMcs7"), "ControlMode", StringValue ("HtMcs0"));

  HtWifiMacHelper mac = HtWifiMacHelper::Default ();

  QosWifiMacHelper mac = QosWifiMacHelper::Default ();

  Ssid ssid = Ssid ("simple-msdu-aggregation");

  Ssid ssid = Ssid ("simple-msdu-aggregation");

  mac.SetType ("ns3::StaWifiMac",

  mac.SetType ("ns3::StaWifiMac",

(-)a/examples/wireless/simple-two-level-aggregation.cc (-1 / +1 lines)

Lines 104-110	Link Here

104

  wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager",

104

  wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager",

105

                                "DataMode", StringValue ("HtMcs7"),

105

                                "DataMode", StringValue ("HtMcs7"),

106

                                "ControlMode", StringValue ("HtMcs0"));

106

                                "ControlMode", StringValue ("HtMcs0"));

107

  HtWifiMacHelper mac = HtWifiMacHelper::Default ();

107

  QosWifiMacHelper mac = QosWifiMacHelper::Default ();

108

109

  Ssid ssid = Ssid ("simple-two-level-aggregation");

109

  Ssid ssid = Ssid ("simple-two-level-aggregation");

110

  mac.SetType ("ns3::StaWifiMac",

110

  mac.SetType ("ns3::StaWifiMac",

(-)a/examples/wireless/vht-wifi-network.cc (-2 / +2 lines)

Lines 96-104	Link Here

              WifiHelper wifi = WifiHelper::Default ();

              WifiHelper wifi = WifiHelper::Default ();

              wifi.SetStandard (WIFI_PHY_STANDARD_80211ac);

              wifi.SetStandard (WIFI_PHY_STANDARD_80211ac);

              VhtWifiMacHelper mac = VhtWifiMacHelper::Default ();

              QosWifiMacHelper mac = QosWifiMacHelper::Default ();

100

101

              StringValue DataRate = VhtWifiMacHelper::DataRateForMcs (i);

101

              StringValue DataRate = McsHelper::DataRateForVhtMcs (i);

102

              wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager","DataMode", DataRate,

102

              wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager","DataMode", DataRate,

103

                                            "ControlMode", DataRate);

103

                                            "ControlMode", DataRate);

104

(-)a/examples/wireless/wifi-timing-attributes.cc (-1 / +1 lines)

Lines 87-93	Link Here

  wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager",

  wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager",

                                "DataMode", StringValue("OfdmRate65MbpsBW20MHz"),

                                "DataMode", StringValue("OfdmRate65MbpsBW20MHz"),

                                "ControlMode", StringValue("OfdmRate6_5MbpsBW20MHz"));

                                "ControlMode", StringValue("OfdmRate6_5MbpsBW20MHz"));

  HtWifiMacHelper mac = HtWifiMacHelper::Default ();

  QosWifiMacHelper mac = QosWifiMacHelper::Default ();

  //Install PHY and MAC

  //Install PHY and MAC

  Ssid ssid = Ssid ("ns3-wifi");

  Ssid ssid = Ssid ("ns3-wifi");




#include "ns3/string.h"
#include "ns3/uinteger.h"
#include "ns3/double.h"
#include "ns3/boolean.h"
#include "ns3/data-rate.h"
#include "ns3/inet-socket-address.h"
#include "ns3/internet-stack-helper.h"

  wifiChannel.AddPropagationLoss ("ns3::LogDistancePropagationLossModel");
  wifiPhy.SetChannel (wifiChannel.Create ());

  // Add an upper mac, and disable rate control
  NqosWifiMacHelper wifiMac = NqosWifiMacHelper::Default ();
  wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager",
                                "DataMode",StringValue (phyMode),
                                "ControlMode",StringValue (phyMode));

  // Set it to adhoc mode (and enable QOS for HT/VHT stations)
  if (wifiStandard == WIFI_PHY_STANDARD_80211n_2_4GHZ
      || wifiStandard == WIFI_PHY_STANDARD_80211n_5GHZ
      || wifiStandard == WIFI_PHY_STANDARD_80211ac)
    {
      wifiMac.SetType ("ns3::AdhocWifiMac",
                       "QosSupported", BooleanValue (true));
    }
  else
    {
      wifiMac.SetType ("ns3::AdhocWifiMac");
    }
  NetDeviceContainer devices = wifi.Install (wifiPhy, wifiMac, c.Get (0));

  // This will disable these sending devices from detecting a signal 
  // so that they do not backoff
  wifiPhy.Set ("EnergyDetectionThreshold", DoubleValue (0.0) );

  NS_TEST_ASSERT_MSG_EQ (PERDiff1, PERDiff2, 
                         "The PER difference due to 1 microsecond difference in arrival shouldn't depend on absolute arrival");
  //Now rerun for 11n
  wifiStandard = WIFI_PHY_STANDARD_80211n_2_4GHZ;
  // Compute the packet error rate (PER) when delta=0 microseconds.  This
  // means that the interferer arrives at exactly the same time as the
  // intended packet




/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
 * Copyright (c) 2009 MIRKO BANCHI
 *
 * 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 "ht-wifi-mac-helper.h"
#include "ns3/wifi-mac.h"
#include "ns3/edca-txop-n.h"
#include "ns3/pointer.h"
#include "ns3/boolean.h"
#include "ns3/uinteger.h"

namespace ns3 {

HtWifiMacHelper::HtWifiMacHelper ()
{
}

HtWifiMacHelper::~HtWifiMacHelper ()
{
}

HtWifiMacHelper
HtWifiMacHelper::Default (void)
{
  HtWifiMacHelper helper;

  helper.SetType ("ns3::StaWifiMac",
                  "QosSupported", BooleanValue (true),
                  "HtSupported", BooleanValue (true));

  return helper;
}

StringValue
HtWifiMacHelper::DataRateForMcs (int mcs)
{
  std::stringstream sstmp;
  std::string strtmp, dataRate;

  sstmp << mcs;
  sstmp >> strtmp;
  dataRate = "HtMcs" + strtmp;
  
  return StringValue (dataRate);
}

} //namespace ns3




/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
 * Copyright (c) 2009 MIRKO BANCHI
 *
 * 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>
 */

#ifndef HT_WIFI_MAC_HELPER_H
#define HT_WIFI_MAC_HELPER_H

#include "ns3/string.h"
#include "wifi-helper.h"
#include "ns3/qos-utils.h"
#include "qos-wifi-mac-helper.h"
#include <map>

namespace ns3 {

/**
 * \brief create HT-enabled MAC layers for a ns3::WifiNetDevice.
 *
 * This class can create MACs of type ns3::ApWifiMac, ns3::StaWifiMac,
 * and, ns3::AdhocWifiMac, with QosSupported and HTSupported attributes set to True.
 */
class HtWifiMacHelper : public QosWifiMacHelper
{
public:
  /**
   * Create a HtWifiMacHelper that is used to make life easier when working
   * with Wifi devices using a QOS MAC layer.
   */
  HtWifiMacHelper ();

  /**
   * Destroy a HtWifiMacHelper
   */
  virtual ~HtWifiMacHelper ();

  /**
   * Create a mac helper in a default working state.
   */
  static HtWifiMacHelper Default (void);

  /**
   * Converts a HT MCS value into a DataRate value
   */
  static StringValue DataRateForMcs (int mcs);
};

} //namespace ns3

#endif /* HT_WIFI_MAC_HELPER_H */




/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
 * Copyright (c) 2014 SEBASTIEN DERONNE
 *
 * 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: Sébastien Deronne <sebastien.deronne@gmail.com>
 */

#include "mcs-helper.h"

namespace ns3 {

McsHelper::McsHelper ()
{
}

McsHelper::~McsHelper ()
{
}

StringValue
McsHelper::DataRateForHtMcs (int mcs)
{
  std::stringstream sstmp;
  std::string strtmp, dataRate;

  sstmp << mcs;
  sstmp >> strtmp;
  dataRate = "HtMcs" + strtmp;
  
  return StringValue (dataRate);
}

StringValue
McsHelper::DataRateForVhtMcs (int mcs)
{
  std::stringstream sstmp;
  std::string strtmp, dataRate;

  sstmp << mcs;
  sstmp >> strtmp;
  dataRate = "VhtMcs" + strtmp;
  
  return StringValue (dataRate);
}

} //namespace ns3




/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
 * Copyright (c) 2014 SEBASTIEN DERONNE
 *
 * 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: Sébastien Deronne <sebastien.deronne@gmail.com>
 */

#ifndef MCS_HELPER_H
#define MCS_HELPER_H

#include "ns3/string.h"

namespace ns3 {

class McsHelper
{
public:
  McsHelper ();
  ~McsHelper ();
  /**
   * Converts a HT MCS value into a DataRate value
   */
  static StringValue DataRateForHtMcs (int mcs);
  /**
   * Converts a VHT MCS value into a DataRate value
   */
  static StringValue DataRateForVhtMcs (int mcs);
};

} //namespace ns3

#endif /* MCS_HELPER_H */




/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
 * Copyright (c) 2014 SEBASTIEN DERONNE
 *
 * 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: Sébastien Deronne <sebastien.deronne@gmail.com>
 */

#include "vht-wifi-mac-helper.h"
#include "ns3/wifi-mac.h"
#include "ns3/edca-txop-n.h"
#include "ns3/pointer.h"
#include "ns3/boolean.h"
#include "ns3/uinteger.h"

namespace ns3 {

VhtWifiMacHelper::VhtWifiMacHelper ()
{
}

VhtWifiMacHelper::~VhtWifiMacHelper ()
{
}

VhtWifiMacHelper
VhtWifiMacHelper::Default (void)
{
  VhtWifiMacHelper helper;

  helper.SetType ("ns3::StaWifiMac",
                  "QosSupported", BooleanValue (true),
                  "HtSupported", BooleanValue (true), //by default, it also supports HT features
                  "VhtSupported", BooleanValue (true));

  //MPDU aggregation is always supported
  helper.SetMpduAggregatorForAc (AC_VO, "ns3::MpduStandardAggregator");
  helper.SetMpduAggregatorForAc (AC_VI, "ns3::MpduStandardAggregator");
  helper.SetMpduAggregatorForAc (AC_BE, "ns3::MpduStandardAggregator");
  helper.SetMpduAggregatorForAc (AC_BK, "ns3::MpduStandardAggregator");

  return helper;
}

StringValue
VhtWifiMacHelper::DataRateForMcs (int mcs)
{
  std::stringstream sstmp;
  std::string strtmp, dataRate;

  sstmp << mcs;
  sstmp >> strtmp;
  dataRate = "VhtMcs" + strtmp;
  
  return StringValue (dataRate);
}

} //namespace ns3




/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
 * Copyright (c) 2014 SEBASTIEN DERONNE
 *
 * 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: Sébastien Deronne <sebastien.deronne@gmail.com>
 */

#ifndef VHT_WIFI_MAC_HELPER_H
#define VHT_WIFI_MAC_HELPER_H

#include "ns3/string.h"
#include "wifi-helper.h"
#include "ns3/qos-utils.h"
#include "qos-wifi-mac-helper.h"
#include <map>

namespace ns3 {

/**
 * \brief create VHT-enabled MAC layers for a ns3::WifiNetDevice.
 *
 * This class can create MACs of type ns3::ApWifiMac, ns3::StaWifiMac,
 * and, ns3::AdhocWifiMac, with QosSupported, HTSupported and VHTSupported attributes set to True.
 */
class VhtWifiMacHelper : public QosWifiMacHelper
{
public:
  /**
   * Create a VhtWifiMacHelper that is used to make life easier when working
   * with Wifi devices using a QOS MAC layer.
   */
  VhtWifiMacHelper ();

  /**
   * \internal
   * Destroy a VhtWifiMacHelper
   */
  virtual ~VhtWifiMacHelper ();

  /**
   * Create a mac helper in a default working state.
   */
  static VhtWifiMacHelper Default (void);

  /**
   * Converts a VHT MCS value into a DataRate value
   */
  static StringValue DataRateForMcs (int mcs);
};

} //namespace ns3

#endif /* VHT_WIFI_MAC_HELPER_H */





  switch (standard)
    {
    case WIFI_PHY_STANDARD_80211ac:
      SetVhtSupported (true);
    case WIFI_PHY_STANDARD_80211n_5GHZ:
    case WIFI_PHY_STANDARD_80211n_2_4GHZ:
      NS_ASSERT (GetQosSupported ());
      SetHtSupported (true);
    case WIFI_PHY_STANDARD_holland:
    case WIFI_PHY_STANDARD_80211a:
    case WIFI_PHY_STANDARD_80211g:
    case WIFI_PHY_STANDARD_80211_10MHZ:
    case WIFI_PHY_STANDARD_80211_5MHZ:
    case WIFI_PHY_STANDARD_80211n_5GHZ:
    case WIFI_PHY_STANDARD_80211n_2_4GHZ:
    case WIFI_PHY_STANDARD_80211ac:
      cwmin = 15;
      cwmax = 1023;
      break;




        'model/wifi-tx-current-model.cc',
	'model/vht-capabilities.cc',
        'helper/wifi-radio-energy-model-helper.cc',
        'helper/vht-wifi-mac-helper.cc',
        'helper/ht-wifi-mac-helper.cc',
        'helper/athstats-helper.cc',
        'helper/wifi-helper.cc',
        'helper/yans-wifi-helper.cc',
        'helper/nqos-wifi-mac-helper.cc',
        'helper/qos-wifi-mac-helper.cc',
        'helper/mcs-helper.cc',
        ]

    obj_test = bld.create_ns3_module_test_library('wifi')

        'model/ampdu-tag.h',
        'model/wifi-radio-energy-model.h',
        'model/wifi-tx-current-model.h',
        'model/vht-capabilities.h',
        'helper/wifi-radio-energy-model-helper.h',
        'helper/vht-wifi-mac-helper.h',
        'helper/ht-wifi-mac-helper.h',
        'helper/athstats-helper.h',
        'helper/wifi-helper.h',
        'helper/yans-wifi-helper.h',
        'helper/nqos-wifi-mac-helper.h',
        'helper/qos-wifi-mac-helper.h',
        'helper/mcs-helper.h',
        ]

    if bld.env['ENABLE_GSL']:

Return to bug 2213