Attachment #294 for bug #405

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

(-)a/src/devices/wifi/adhoc-wifi-mac.cc (+12 lines)

Lines 18-23	Link Here

 * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>

 * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>

*/

*/

#define NS_LOG_APPEND_CONTEXT if (m_netdevice) { std::clog << "[node " << \

      (m_netdevice->GetNode ()? m_netdevice->GetNode ()->GetId () : -1) \

      << " dev " << m_netdevice->GetIfIndex () << "] "; }

#include "adhoc-wifi-mac.h"

#include "adhoc-wifi-mac.h"

#include "dca-txop.h"

#include "dca-txop.h"

#include "mac-low.h"

#include "mac-low.h"

Lines 26-31	Link Here

#include "dcf-manager.h"

#include "dcf-manager.h"

#include "ns3/packet.h"

#include "ns3/packet.h"

#include "ns3/log.h"

#include "ns3/log.h"

#include "ns3/node.h"

NS_LOG_COMPONENT_DEFINE ("AdhocWifiMac");

NS_LOG_COMPONENT_DEFINE ("AdhocWifiMac");

Lines 74-79	Link Here

  m_dca = 0;

  m_dca = 0;

  m_stationManager = 0;

  m_stationManager = 0;

  WifiMac::DoDispose ();

  WifiMac::DoDispose ();

void

AdhocWifiMac::SetNetDevice (Ptr<NetDevice> netdevice)

  WifiMac::SetNetDevice (netdevice);

  m_low->SetNetDevice (netdevice);

void

void

(-)a/src/devices/wifi/adhoc-wifi-mac.h (+1 lines)

Lines 78-83	Link Here

  virtual void SetAddress (Mac48Address address);

  virtual void SetAddress (Mac48Address address);

  virtual void SetSsid (Ssid ssid);

  virtual void SetSsid (Ssid ssid);

  virtual Mac48Address GetBssid (void) const;

  virtual Mac48Address GetBssid (void) const;

  virtual void SetNetDevice (Ptr<NetDevice> netdevice);

private:

private:

  // inherited from Object base class.

  // inherited from Object base class.

(-)a/src/devices/wifi/mac-low.cc (+10 lines)

Lines 17-22	Link Here

 * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>

 * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>

*/

*/

#define NS_LOG_APPEND_CONTEXT if (m_netdevice) { std::clog << "[node " << \

      (m_netdevice->GetNode ()? m_netdevice->GetNode ()->GetId () : -1) \

      << " dev " << m_netdevice->GetIfIndex () << "] "; }

#include "ns3/assert.h"

#include "ns3/assert.h"

#include "ns3/packet.h"

#include "ns3/packet.h"

Lines 330-335	Link Here

330

      m_listener->Cancel ();

334

      m_listener->Cancel ();

331

      m_listener = 0;

335

      m_listener = 0;

332

336

337

338

339

void

340

MacLow::SetNetDevice (Ptr<NetDevice> netdevice)

341

342

  m_netdevice = netdevice;

333

343

334

344

335

void

345

void

(-)a/src/devices/wifi/mac-low.h (+4 lines)

Lines 33-38	Link Here

#include "ns3/event-id.h"

#include "ns3/event-id.h"

#include "ns3/packet.h"

#include "ns3/packet.h"

#include "ns3/nstime.h"

#include "ns3/nstime.h"

#include "ns3/net-device.h"

namespace ns3 {

namespace ns3 {

Lines 288-293	Link Here

288

  void SetSlotTime (Time slotTime);

289

  void SetSlotTime (Time slotTime);

289

  void SetPifs (Time pifs);

290

  void SetPifs (Time pifs);

290

  void SetBssid (Mac48Address ad);

291

  void SetBssid (Mac48Address ad);

292

  void SetNetDevice (Ptr<NetDevice> netdevice);

291

  Mac48Address GetAddress (void) const;

293

  Mac48Address GetAddress (void) const;

292

  Time GetAckTimeout (void) const;

294

  Time GetAckTimeout (void) const;

293

  Time GetCtsTimeout (void) const;

295

  Time GetCtsTimeout (void) const;

Lines 427-432	Link Here

427

429

428

  Time m_lastNavStart;

430

  Time m_lastNavStart;

429

  Time m_lastNavDuration;

431

  Time m_lastNavDuration;

432

433

  Ptr<NetDevice> m_netdevice;

430

};

434

};

431

435

432

} // namespace ns3

436

} // namespace ns3

(-)a/src/devices/wifi/nqap-wifi-mac.cc (+12 lines)

Lines 17-22	Link Here

 * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>

 * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>

*/

*/

#define NS_LOG_APPEND_CONTEXT if (m_netdevice) { std::clog << "[node " << \

      (m_netdevice->GetNode ()? m_netdevice->GetNode ()->GetId () : -1) \

      << " dev " << m_netdevice->GetIfIndex () << "] "; }

#include "ns3/assert.h"

#include "ns3/assert.h"

#include "ns3/log.h"

#include "ns3/log.h"

#include "ns3/simulator.h"

#include "ns3/simulator.h"

Lines 98-103	Link Here

  m_beaconDca = 0;

103

  m_beaconDca = 0;

  m_beaconEvent.Cancel ();

104

  m_beaconEvent.Cancel ();

100

  WifiMac::DoDispose ();

105

  WifiMac::DoDispose ();

106

107

108

void

109

NqapWifiMac::SetNetDevice (Ptr<NetDevice> netdevice)

110

111

  WifiMac::SetNetDevice (netdevice);

112

  m_low->SetNetDevice (netdevice);

101

113

102

114

103

void

115

void

(-)a/src/devices/wifi/nqap-wifi-mac.h (+1 lines)

Lines 84-89	Link Here

  virtual void SetAddress (Mac48Address address);

  virtual void SetAddress (Mac48Address address);

  virtual void SetSsid (Ssid ssid);

  virtual void SetSsid (Ssid ssid);

  virtual Mac48Address GetBssid (void) const;

  virtual Mac48Address GetBssid (void) const;

  virtual void SetNetDevice (Ptr<NetDevice> netdevice);

/**

/**

   * \param interval the interval between two beacon transmissions.

   * \param interval the interval between two beacon transmissions.

(-)a/src/devices/wifi/nqsta-wifi-mac.cc (+13 lines)

Lines 18-23	Link Here

 * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>

 * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>

*/

*/

#define NS_LOG_APPEND_CONTEXT if (m_netdevice) { std::clog << "[node " << \

      (m_netdevice->GetNode ()? m_netdevice->GetNode ()->GetId () : -1) \

      << " dev " << m_netdevice->GetIfIndex () << "] "; }

#include "ns3/packet.h"

#include "ns3/packet.h"

#include "ns3/simulator.h"

#include "ns3/simulator.h"

#include "ns3/assert.h"

#include "ns3/assert.h"

Lines 36-41	Link Here

#include "mac-rx-middle.h"

#include "mac-rx-middle.h"

NS_LOG_COMPONENT_DEFINE ("NqstaWifiMac");

NS_LOG_COMPONENT_DEFINE ("NqstaWifiMac");

/*

/*

 * The state machine for this NQSTA is:

 * The state machine for this NQSTA is:

Lines 131-136	Link Here

131

  m_phy = 0;

137

  m_phy = 0;

132

  m_dca = 0;

138

  m_dca = 0;

133

  WifiMac::DoDispose ();

139

  WifiMac::DoDispose ();

140

141

142

void

143

NqstaWifiMac::SetNetDevice (Ptr<NetDevice> netdevice)

144

145

  WifiMac::SetNetDevice (netdevice);

146

  m_low->SetNetDevice (netdevice);

134

147

135

148

136

void

149

void

(-)a/src/devices/wifi/nqsta-wifi-mac.h (+1 lines)

Lines 86-91	Link Here

  virtual void SetAddress (Mac48Address address);

  virtual void SetAddress (Mac48Address address);

  virtual void SetSsid (Ssid ssid);

  virtual void SetSsid (Ssid ssid);

  virtual Mac48Address GetBssid (void) const;

  virtual Mac48Address GetBssid (void) const;

  virtual void SetNetDevice (Ptr<NetDevice> netdevice);

/**

/**

   * \param missed the number of beacons which must be missed

   * \param missed the number of beacons which must be missed




void 
WifiMacHeader::PrintFrameControl (std::ostream &os) const
{
  os << "ToDS=" << int (m_ctrlToDs) << ", FromDS=" << int (m_ctrlFromDs) 
     << ", MoreFrag=" << int (m_ctrlMoreFrag) << ", Retry=" << int (m_ctrlRetry) 
     << ", MoreData=" << int (m_ctrlMoreData) 
    ;
}


      PrintFrameControl (os);
      os << " Duration/ID=" << m_duration << "us"
         << ", DA=" << m_addr1 << ", SA=" << m_addr2
         << ", BSSID=" << m_addr3 << ", FragNumber=" << int (m_seqFrag)
         << ", SeqNumber=" << int (m_seqSeq);
      break;
    case WIFI_MAC_DATA:
      PrintFrameControl (os);

        {
          NS_ASSERT (false);
        }
      os << ", FragNumber=" << int (m_seqFrag)
         << ", SeqNumber=" << int (m_seqSeq);
      break;
    case WIFI_MAC_DATA_CFACK:
    case WIFI_MAC_DATA_CFPOLL:

(-)a/src/devices/wifi/wifi-mac.cc (+6 lines)

Lines 23-28	Link Here

namespace ns3 {

namespace ns3 {

NS_OBJECT_ENSURE_REGISTERED (WifiMac);

NS_OBJECT_ENSURE_REGISTERED (WifiMac);

void

WifiMac::SetNetDevice (Ptr<NetDevice> netdevice)

  m_netdevice = netdevice;

Time

Time

WifiMac::GetDefaultMaxPropagationDelay (void)

WifiMac::GetDefaultMaxPropagationDelay (void)

(-)a/src/devices/wifi/wifi-mac.h (-1 / +7 lines)

Lines 22-27	Link Here

#include "ns3/packet.h"

#include "ns3/packet.h"

#include "ns3/mac48-address.h"

#include "ns3/mac48-address.h"

#include "ns3/net-device.h"

#include "ns3/wifi-channel.h"

#include "ns3/wifi-channel.h"

#include "wifi-phy.h"

#include "wifi-phy.h"

Lines 37-46	Link Here

 * DCA, EDCA, etc) and all the high-level MAC functionality

 * DCA, EDCA, etc) and all the high-level MAC functionality

 * (association/disassociation state machines).

 * (association/disassociation state machines).

*/

*/

class WifiMac : public Object

class WifiMac : public Object

public:

public:

  virtual void SetNetDevice (Ptr<NetDevice> netdevice);

  struct ScanningEntry

  struct ScanningEntry

Lines 149-154	Link Here

149

                                    ScanningCallback callback,

152

                                    ScanningCallback callback,

150

                                    Ptr<NetDevice> netdevice);

153

                                    Ptr<NetDevice> netdevice);

151

154

155

protected:

156

  Ptr<NetDevice> m_netdevice;

157

152

private:

158

private:

153

  friend class WifiNetDevice;

159

  friend class WifiNetDevice;

154

/**

160

/**

(-)a/src/devices/wifi/wifi-net-device.cc (+1 lines)

Lines 107-112	Link Here

107

      m_mac->SetForwardUpCallback (MakeCallback (&WifiNetDevice::ForwardUp, this));

107

      m_mac->SetForwardUpCallback (MakeCallback (&WifiNetDevice::ForwardUp, this));

108

      m_mac->SetLinkUpCallback (MakeCallback (&WifiNetDevice::LinkUp, this));

108

      m_mac->SetLinkUpCallback (MakeCallback (&WifiNetDevice::LinkUp, this));

109

      m_mac->SetLinkDownCallback (MakeCallback (&WifiNetDevice::LinkDown, this));

109

      m_mac->SetLinkDownCallback (MakeCallback (&WifiNetDevice::LinkDown, this));

110

      m_mac->SetNetDevice (this);

110

111

112

void

113

void

Return to bug 405