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

(-)a/ns3/ns-allinone-3.14.1/ns-3.14.1/src/wifi/model/ap-wifi-mac.cc (+1 lines)
 Lines 74-79   ApWifiMac::ApWifiMac () Link Here 
74 
  m_beaconDca->SetMaxCw (0);
 74 
  m_beaconDca->SetMaxCw (0);
75 
  m_beaconDca->SetLow (m_low);
 75 
  m_beaconDca->SetLow (m_low);
76 
  m_beaconDca->SetManager (m_dcfManager);
 76 
  m_beaconDca->SetManager (m_dcfManager);
77 
  m_beaconDca->SetTxMiddle(m_txMiddle);
77 

          78
          

        

        

          78
          
  // Let the lower layers know that we are acting as an AP.

          79
          
  // Let the lower layers know that we are acting as an AP.

        

        

          79
          
  SetTypeOfStation (AP);

          80
          
  SetTypeOfStation (AP);

        



(-)a/ns3/ns-allinone-3.14.1/ns-3.14.1/src/wifi/model/dca-txop.cc
      (-3 / +4 lines)




  

    

    

       Lines 137-143
      DcaTxop::DcaTxop () 
    
  Link Here 
    

  

        

          137
          
  m_dcf = new DcaTxop::Dcf (this);

          137
          
  m_dcf = new DcaTxop::Dcf (this);

        

        

          138
          
  m_queue = CreateObject<WifiMacQueue> ();

          138
          
  m_queue = CreateObject<WifiMacQueue> ();

        

        

          139
          
  m_rng = new RealRandomStream ();

          139
          
  m_rng = new RealRandomStream ();

        

            

              140
              
  m_txMiddle = new MacTxMiddle ();

              
              
            

        

          141
          
}

          140
          
}

        

        

          142
          

          141
          

        

        

          143
          
DcaTxop::~DcaTxop ()

          142
          
DcaTxop::~DcaTxop ()

        

  

    

    

       Lines 155-165
      DcaTxop::DoDispose (void) 
    
  Link Here 
    

  

        

          155
          
  delete m_transmissionListener;

          154
          
  delete m_transmissionListener;

        

        

          156
          
  delete m_dcf;

          155
          
  delete m_dcf;

        

        

          157
          
  delete m_rng;

          156
          
  delete m_rng;

        

            

              158
              
  delete m_txMiddle;

              
              
            

        

          159
          
  m_transmissionListener = 0;

          157
          
  m_transmissionListener = 0;

        

        

          160
          
  m_dcf = 0;

          158
          
  m_dcf = 0;

        

        

          161
          
  m_rng = 0;

          159
          
  m_rng = 0;

        

            

              162
              
  m_txMiddle = 0;

              
              
            

        

          163
          
}

          160
          
}

        

        

          164
          

          161
          

        

        

          165
          
void

          162
          
void

        

  

    

    

       Lines 169-174
      DcaTxop::SetManager (DcfManager *manager) 
    
  Link Here 
    

  

        

          169
          
  m_manager = manager;

          166
          
  m_manager = manager;

        

        

          170
          
  m_manager->Add (m_dcf);

          167
          
  m_manager->Add (m_dcf);

        

        

          171
          
}

          168
          
}

        

            

              
              
              169
              
  

            

            

              170
              
void DcaTxop::SetTxMiddle (MacTxMiddle *txMiddle){

            

            

              171
              
  m_txMiddle = txMiddle;

            

            

              172
              
}

            

        

          172
          

          173
          

        

        

          173
          
void

          174
          
void

        

        

          174
          
DcaTxop::SetLow (Ptr<MacLow> low)

          175
          
DcaTxop::SetLow (Ptr<MacLow> low)

        



(-)a/ns3/ns-allinone-3.14.1/ns-3.14.1/src/wifi/model/dca-txop.h
      (+1 lines)




  

    

    

       Lines 80-85
      public: 
    
  Link Here 
    

  

        

          80
          
  void SetLow (Ptr<MacLow> low);

          80
          
  void SetLow (Ptr<MacLow> low);

        

        

          81
          
  void SetManager (DcfManager *manager);

          81
          
  void SetManager (DcfManager *manager);

        

        

          82
          
  void SetWifiRemoteStationManager (Ptr<WifiRemoteStationManager> remoteManager);

          82
          
  void SetWifiRemoteStationManager (Ptr<WifiRemoteStationManager> remoteManager);

        

            

              
              
              83
              
  void SetTxMiddle (MacTxMiddle *txMiddle);

            

        

          83
          

          84
          

        

        

          84
          
  /**

          85
          
  /**

        

        

          85
          
   * \param callback the callback to invoke when a

          86
          
   * \param callback the callback to invoke when a

        



(-)a/ns3/ns-allinone-3.14.1/ns-3.14.1/src/wifi/model/regular-wifi-mac.cc
      (+1 lines)




  

    

    

       Lines 61-66
      NS_OBJECT_ENSURE_REGISTERED (RegularWifiMac); 
    
  Link Here 
    

  

        

          61
          
  m_dca = CreateObject<DcaTxop> ();

          61
          
  m_dca = CreateObject<DcaTxop> ();

        

        

          62
          
  m_dca->SetLow (m_low);

          62
          
  m_dca->SetLow (m_low);

        

        

          63
          
  m_dca->SetManager (m_dcfManager);

          63
          
  m_dca->SetManager (m_dcfManager);

        

            

              
              
              64
              
  m_dca->SetTxMiddle(m_txMiddle);

            

        

          64
          
  m_dca->SetTxOkCallback (MakeCallback (&RegularWifiMac::TxOk, this));

          65
          
  m_dca->SetTxOkCallback (MakeCallback (&RegularWifiMac::TxOk, this));

        

        

          65
          
  m_dca->SetTxFailedCallback (MakeCallback (&RegularWifiMac::TxFailed, this));

          66
          
  m_dca->SetTxFailedCallback (MakeCallback (&RegularWifiMac::TxFailed, this));

        

        

          66
          

          67
          

        






  

  Return to bug 1912