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

(-)a/src/wifi/model/dcf-manager.cc (+6 lines)
 Lines 480-485    Link Here 
480 
    {
 480 
    {
481 
      return true;
 481 
      return true;
482 
    }
 482 
    }
483 
  // CCA busy
484 
  Time lastCCABusyEnd = m_lastBusyStart + m_lastBusyDuration;
485 
  if (lastCCABusyEnd > Simulator::Now ())
486 
    {
487 
      return true;
488 
    }
483 
  return false;
 489 
  return false;
484 
}
 490 
}
485 

          491
          

        



(-)a/src/wifi/model/dcf-manager.h
      (-1 / +1 lines)




  

    

    

       Lines 515-521
       
    
  Link Here 
    

  

        

          515
          
  void DoGrantAccess (void);

          515
          
  void DoGrantAccess (void);

        

        

          516
          
  /**

          516
          
  /**

        

        

          517
          
   * Check if the device is busy sending or receiving,

          517
          
   * Check if the device is busy sending or receiving,

        

          
            

              518
              
   * or NAV busy.


              518
              
   * or NAV or CCA busy.

            

        

          519
          
   *

          519
          
   *

        

        

          520
          
   * \return true if the device is busy,

          520
          
   * \return true if the device is busy,

        

        

          521
          
   *         false otherwise

          521
          
   *         false otherwise

        



(-)a/src/wifi/test/dcf-manager-test.cc
      (-3 / +4 lines)




  

    

    

       Lines 623-630
       
    
  Link Here 
    

  

        

          623
          
  AddAccessRequest (21, 1, 24, 0);

          623
          
  AddAccessRequest (21, 1, 24, 0);

        

        

          624
          
  EndTest ();

          624
          
  EndTest ();

        

        

          625
          

          625
          

        

          
            

              626
              
  //  20          40       50     53      54   55


              626
              
  //  20          40       50     53      54       55        56   57

            

            

              627
              
  //   | switching |  busy  | sifs | aifsn | tx |


              627
              
  //   | switching |  busy  | sifs | aifsn | bslot0 | bslot 1 | tx | 

            

        

          628
          
  //         |          |

          628
          
  //         |          |

        

        

          629
          
  //        30 busy.   45 access request.

          629
          
  //        30 busy.   45 access request.

        

        

          630
          
  //

          630
          
  //

        

  

    

    

       Lines 632-638
       
    
  Link Here 
    

  

        

          632
          
  AddDcfState (1);

          632
          
  AddDcfState (1);

        

        

          633
          
  AddSwitchingEvt (20,20);

          633
          
  AddSwitchingEvt (20,20);

        

        

          634
          
  AddCcaBusyEvt (30,20);

          634
          
  AddCcaBusyEvt (30,20);

        

          
            

              635
              
  AddAccessRequest (45, 1, 54, 0);


              635
              
  ExpectCollision (45, 2, 0); //backoff: 2 slots

            

            

              
              

              636
              
  AddAccessRequest (45, 1, 56, 0);

            

        

          636
          
  EndTest ();

          637
          
  EndTest ();

        

        

          637
          

          638
          

        

        

          638
          
  //  20     30          50     53      54   55

          639
          
  //  20     30          50     53      54   55

        






  

  Return to bug 2306