Attachment #684 for bug #706

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




      break;
    }
}
void
MeshWifiInterfaceMac::DoStart ()
{
  m_beaconDca->Start ();
  for (Queues::iterator i = m_queues.begin (); i != m_queues.end (); i ++)
  {
    i->second->Start ();
  }
  WifiMac::DoStart ();
}

} // namespace ns3


(-)a/src/devices/mesh/mesh-wifi-interface-mac.h (+2 lines)

Lines 178-183	Link Here

178

  bool GetBeaconGeneration () const;

178

  bool GetBeaconGeneration () const;

179

  /// Real d-tor

179

  /// Real d-tor

180

  virtual void DoDispose ();

180

  virtual void DoDispose ();

181

  ///Initiator at t=0

182

  void DoStart ();

181

183

182

private:

184

private:

183

  typedef std::map<AccessClass, Ptr<DcaTxop> > Queues;

185

  typedef std::map<AccessClass, Ptr<DcaTxop> > Queues;

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

Lines 298-301	Link Here

298

299

  m_txErrCallback (hdr);

299

  m_txErrCallback (hdr);

300

301

void

302

AdhocWifiMac::DoStart ()

303

304

  m_dca->Start ();

305

  WifiMac::DoStart ();

306

307

301

} // namespace ns3

308

} // namespace ns3

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

Lines 82-87	Link Here

private:

private:

  // inherited from Object base class.

  // inherited from Object base class.

  virtual void DoDispose (void);

  virtual void DoDispose (void);

  void DoStart ();

  /* invoked by the MacLows. */

  /* invoked by the MacLows. */

  void ForwardUp (Ptr<Packet> packet, const WifiMacHeader *hdr);

  void ForwardUp (Ptr<Packet> packet, const WifiMacHeader *hdr);

  AdhocWifiMac (const AdhocWifiMac & ctor_arg);

  AdhocWifiMac (const AdhocWifiMac & ctor_arg);

(-)a/src/devices/wifi/dca-txop.cc (+8 lines)

Lines 268-273	Link Here

268

  return m_low;

268

  return m_low;

269

270

271

void

272

DcaTxop::DoStart ()

273

274

  m_dcf->ResetCw ();

275

  m_dcf->StartBackoffNow (m_rng->GetNext (0, m_dcf->GetCw ()));

276

  NS_LOG_UNCOND ("Starting backoff!");

277

  ns3::Dcf::DoStart ();

278

271

bool

279

bool

272

DcaTxop::NeedRts (void)

280

DcaTxop::NeedRts (void)

273

281

(-)a/src/devices/wifi/dca-txop.h (-1 / +1 lines)

Lines 121-127	Link Here

121

122

  // Inherited from ns3::Object

122

  // Inherited from ns3::Object

123

  Ptr<MacLow> Low (void);

123

  Ptr<MacLow> Low (void);

124

  void DoStart ();

125

  /* dcf notifications forwarded here */

125

  /* dcf notifications forwarded here */

126

  bool NeedsAccess (void) const;

126

  bool NeedsAccess (void) const;

127

  void NotifyAccessGranted (void);

127

  void NotifyAccessGranted (void);

(-)a/src/devices/wifi/edca-txop-n.cc (-1 / +7 lines)

Lines 686-690	Link Here

686

687

  m_aggregator = aggr;

687

  m_aggregator = aggr;

688

689

void

690

EdcaTxopN::DoStart ()

691

692

  m_dcf->ResetCw ();

693

  m_dcf->StartBackoffNow (m_rng->GetNext (0, m_dcf->GetCw ()));

694

  ns3::Dcf::DoStart ();

695

690

} //namespace ns3

696

} //namespace ns3

(-)a/src/devices/wifi/edca-txop-n.h (+1 lines)

Lines 132-137	Link Here

132

  void SetMsduAggregator (Ptr<MsduAggregator> aggr);

132

  void SetMsduAggregator (Ptr<MsduAggregator> aggr);

133

134

private:

134

private:

135

  void DoStart ();

135

/**

136

/**

136

   * This functions are used only to correctly set addresses in a-msdu subframe.

137

   * This functions are used only to correctly set addresses in a-msdu subframe.

137

   * If aggregating sta is a STA (in an infrastructured network):

138

   * If aggregating sta is a STA (in an infrastructured network):

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

Lines 606-611	Link Here

606

607

      m_beaconEvent = Simulator::ScheduleNow (&NqapWifiMac::SendOneBeacon, this);

607

      m_beaconEvent = Simulator::ScheduleNow (&NqapWifiMac::SendOneBeacon, this);

608

609

  m_dca->Start ();

610

  m_beaconDca->Start ();

609

  WifiMac::DoStart ();

611

  WifiMac::DoStart ();

610

612

611

613

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

Lines 686-690	Link Here

686

      break;

686

      break;

687

688

689

void

690

NqstaWifiMac::DoStart ()

691

692

  m_dca->Start ();

693

  WifiMac::DoStart ();

694

690

} // namespace ns3

695

} // namespace ns3

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

Lines 119-124	Link Here

119

    BEACON_MISSED,

119

    BEACON_MISSED,

120

    REFUSED

120

    REFUSED

121

};

121

};

122

  void DoStart ();

122

  void SetBssid (Mac48Address bssid);

123

  void SetBssid (Mac48Address bssid);

123

  void SetActiveProbing (bool enable);

124

  void SetActiveProbing (bool enable);

124

  bool GetActiveProbing (void) const;

125

  bool GetActiveProbing (void) const;




  m_dcfManager = 0;
  m_low = 0;
  m_phy = 0;
  m_voEdca = 0;
  m_viEdca = 0;
  m_beEdca = 0;
  m_bkEdca = 0;
  m_stationManager = 0;
  for (Queues::iterator i = m_queues.begin (); i != m_queues.end (); ++i)
    {

      break;
    }
}
void
QadhocWifiMac::DoStart ()
{
  for (Queues::iterator i = m_queues.begin (); i != m_queues.end (); ++i)
    {
      i->second->Start ();
    }
  WifiMac::DoStart ();
}

} //namespace ns3




private:
  Callback<void, Ptr<Packet>, Mac48Address, Mac48Address> m_forwardUp;
  virtual void DoDispose (void);
  void DoStart ();
  void Receive (Ptr<Packet> packet, const WifiMacHeader *hdr);
  void ForwardUp (Ptr<Packet> packet, Mac48Address from, Mac48Address to);
  QadhocWifiMac &operator = (const QadhocWifiMac &);

  Ptr<EdcaTxopN> GetBKQueue (void) const;

  Queues m_queues;
  Ptr<EdcaTxopN> m_voEdca;
  Ptr<EdcaTxopN> m_viEdca;
  Ptr<EdcaTxopN> m_beEdca;
  Ptr<EdcaTxopN> m_bkEdca;
  Ptr<MacLow> m_low;
  Ptr<WifiPhy> m_phy;
  Ptr<WifiRemoteStationManager> m_stationManager;

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

Lines 791-796	Link Here

791

void

791

void

792

QapWifiMac::DoStart (void)

792

QapWifiMac::DoStart (void)

793

794

  m_beaconDca->Start ();

795

  for (Queues::iterator i = m_queues.begin (); i != m_queues.end (); ++i)

796

797

      i->second->Start ();

798

794

  m_beaconEvent.Cancel ();

799

  m_beaconEvent.Cancel ();

795

  if (m_enableBeaconGeneration)

800

  if (m_enableBeaconGeneration)

796

801

(-)a/src/devices/wifi/qsta-wifi-mac.cc (-1 / +9 lines)

Lines 775-779	Link Here

775

776

777

778

void

779

QstaWifiMac::DoStart ()

780

781

  for (Queues::iterator i = m_queues.begin (); i != m_queues.end (); ++i)

782

783

      i->second->Start ();

784

785

  WifiMac::DoStart ();

786

779

}  //namespace ns3

787

}  //namespace ns3

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

Lines 87-92	Link Here

  void StartActiveAssociation (void);

  void StartActiveAssociation (void);

private:

private:

  void DoStart ();

  void SetBssid (Mac48Address bssid);

  void SetBssid (Mac48Address bssid);

  Mac48Address GetBroadcastBssid (void);

  Mac48Address GetBroadcastBssid (void);

  void Receive (Ptr<Packet> p, const WifiMacHeader *hdr);

  void Receive (Ptr<Packet> p, const WifiMacHeader *hdr);

Return to bug 706