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

(-)a/src/devices/wifi/dca-txop.cc (+4 lines)
 Lines 33-38    Link Here 
33 
#include "wifi-mac-trailer.h"
 33 
#include "wifi-mac-trailer.h"
34 
#include "wifi-mac.h"
 34 
#include "wifi-mac.h"
35 
#include "random-stream.h"
 35 
#include "random-stream.h"
36 
#include "ns3/trace-source-accessor.h"
36 

          37
          

        

        

          37
          
NS_LOG_COMPONENT_DEFINE ("DcaTxop");

          38
          
NS_LOG_COMPONENT_DEFINE ("DcaTxop");

        

        

          38
          

          39
          

        

  

    

    

       Lines 114-119
       
    
  Link Here 
    

  

        

          114
          
                   MakeUintegerAccessor (&DcaTxop::SetAifsn,

          115
          
                   MakeUintegerAccessor (&DcaTxop::SetAifsn,

        

        

          115
          
                                         &DcaTxop::GetAifsn),

          116
          
                                         &DcaTxop::GetAifsn),

        

        

          116
          
                   MakeUintegerChecker<uint32_t> ())

          117
          
                   MakeUintegerChecker<uint32_t> ())

        

            

              
              
              118
              
.AddTraceSource ("MediumBusy", "The medium is sensed busy.",

            

            

              119
              
                     MakeTraceSourceAccessor (&DcaTxop::m_mediumBusyLogger))

            

        

          117
          
    ;

          120
          
    ;

        

        

          118
          
  return tid;

          121
          
  return tid;

        

        

          119
          
}

          122
          
}

        

  

    

    

       Lines 455-460
       
    
  Link Here 
    

  

        

          455
          
{

          458
          
{

        

        

          456
          
  NS_LOG_FUNCTION (this);

          459
          
  NS_LOG_FUNCTION (this);

        

        

          457
          
  MY_DEBUG ("collision");

          460
          
  MY_DEBUG ("collision");

        

            

              
              
              461
              
  m_mediumBusyLogger();

            

        

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

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

        

        

          459
          
  RestartAccessIfNeeded ();

          463
          
  RestartAccessIfNeeded ();

        

        

          460
          
}

          464
          
}

        



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




  

    

    

       Lines 29-34
       
    
  Link Here 
    

  

        

          29
          
#include "wifi-mac-header.h"

          29
          
#include "wifi-mac-header.h"

        

        

          30
          
#include "wifi-mode.h"

          30
          
#include "wifi-mode.h"

        

        

          31
          
#include "wifi-remote-station-manager.h"

          31
          
#include "wifi-remote-station-manager.h"

        

            

              
              
              32
              
#include "ns3/traced-callback.h"

            

        

          32
          

          33
          

        

        

          33
          
namespace ns3 {

          34
          
namespace ns3 {

        

        

          34
          

          35
          

        

  

    

    

       Lines 162-167
       
    
  Link Here 
    

  

        

          162
          
  Ptr<const Packet> m_currentPacket;

          163
          
  Ptr<const Packet> m_currentPacket;

        

        

          163
          
  WifiMacHeader m_currentHdr;

          164
          
  WifiMacHeader m_currentHdr;

        

        

          164
          
  uint8_t m_fragmentNumber;

          165
          
  uint8_t m_fragmentNumber;

        

            

              
              
              166
              

            

            

              167
              
  TracedCallback<> m_mediumBusyLogger;

            

        

          165
          
};

          168
          
};

        

        

          166
          

          169
          

        

        

          167
          
} //namespace ns3

          170
          
} //namespace ns3

        



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




  

    

    

       Lines 127-132
       
    
  Link Here 
    

  

        

          127
          
  Ssid m_ssid;

          127
          
  Ssid m_ssid;

        

        

          128
          
  EventId m_beaconEvent;

          128
          
  EventId m_beaconEvent;

        

        

          129
          
  Time m_eifsNoDifs;

          129
          
  Time m_eifsNoDifs;

        

            

              
              
              130
              

            

            

              131
              
  TracedCallback<> m_mediumBusyLogger;

            

        

          130
          
};

          132
          
};

        

        

          131
          

          133
          

        

        

          132
          
} // namespace ns3

          134
          
} // namespace ns3

        



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




  

    

    

       Lines 33-38
       
    
  Link Here 
    

  

        

          33
          
#include "mac-low.h"

          33
          
#include "mac-low.h"

        

        

          34
          
#include "dcf-manager.h"

          34
          
#include "dcf-manager.h"

        

        

          35
          
#include "mac-rx-middle.h"

          35
          
#include "mac-rx-middle.h"

        

            

              
              
              36
              
#include "ns3/trace-source-accessor.h"

            

            

              37
              
#include "ns3/pointer.h"

            

        

          36
          

          38
          

        

        

          37
          
NS_LOG_COMPONENT_DEFINE ("NqstaWifiMac");

          39
          
NS_LOG_COMPONENT_DEFINE ("NqstaWifiMac");

        

        

          38
          

          40
          

        

  

    

    

       Lines 83-88
       
    
  Link Here 
    

  

        

          83
          
                   BooleanValue (false),

          85
          
                   BooleanValue (false),

        

        

          84
          
                   MakeBooleanAccessor (&NqstaWifiMac::SetActiveProbing),

          86
          
                   MakeBooleanAccessor (&NqstaWifiMac::SetActiveProbing),

        

        

          85
          
                   MakeBooleanChecker ())

          87
          
                   MakeBooleanChecker ())

        

            

              
              
              88
              
    .AddAttribute ("DcaTxop", "The DcaTxop object",

            

            

              89
              
                   PointerValue (),

            

            

              90
              
                   MakePointerAccessor (&NqstaWifiMac::DoGetDcaTxop),

            

            

              91
              
                   MakePointerChecker<DcaTxop> ()) 

            

        

          86
          
    ;

          92
          
    ;

        

        

          87
          
  return tid;

          93
          
  return tid;

        

        

          88
          
}

          94
          
}

        

  

    

    

       Lines 194-200
       
    
  Link Here 
    

  

        

          194
          
{

          200
          
{

        

        

          195
          
  return m_low->GetPifs ();

          201
          
  return m_low->GetPifs ();

        

        

          196
          
}

          202
          
}

        

          
            

              197
              


              203
              
Ptr<DcaTxop>

            

            

              
              

              204
              
NqstaWifiMac::DoGetDcaTxop(void) const

            

            


              205
              
{

            

            


              206
              
  return m_dca;

            

            


              207
              
}

            

        

          198
          
void 

          208
          
void 

        

        

          199
          
NqstaWifiMac::SetWifiPhy (Ptr<WifiPhy> phy)

          209
          
NqstaWifiMac::SetWifiPhy (Ptr<WifiPhy> phy)

        

        

          200
          
{

          210
          
{

        



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




  

    

    

       Lines 156-161
       
    
  Link Here 
    

  

        

          156
          
  Ptr<MacLow> m_low;

          156
          
  Ptr<MacLow> m_low;

        

        

          157
          
  Ssid m_ssid;

          157
          
  Ssid m_ssid;

        

        

          158
          
  Time m_eifsNoDifs;

          158
          
  Time m_eifsNoDifs;

        

            

              
              
              159
              

            

            

              160
              
  Ptr<DcaTxop> DoGetDcaTxop(void) const;

            

        

          159
          
};

          161
          
};

        

        

          160
          

          162
          

        

        

          161
          
} // namespace ns3

          163
          
} // namespace ns3

        






  

  Return to bug 500