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

(-)a/src/devices/wifi/nqsta-wifi-mac.cc (-3 / +9 lines)
 Lines 453-461    Link Here 
453 
    }
 453 
    }
454 
}
 454 
}
455 
bool
 455 
bool
456 
NqstaWifiMac::IsAssociated (void)
 456 
NqstaWifiMac::IsAssociated (void) const
457 
{
 457 
{
458 
  return (m_state == ASSOCIATED)?true:false;
 458 
  return m_state == ASSOCIATED;
459 
}
460 

            

            


              461
              
bool 

            

            


              462
              
NqstaWifiMac::IsWaitAssocResp (void) const

            

            


              463
              
{

            

            


              464
              
  return m_state == WAIT_ASSOC_RESP;

            

        

          459
          
}

          465
          
}

        

        

          460
          

          466
          

        

        

          461
          
void 

          467
          
void 

        

  

    

    

       Lines 553-559
       
    
  Link Here 
    

  

        

          553
          
        {

          559
          
        {

        

        

          554
          
          goodBeacon = true;

          560
          
          goodBeacon = true;

        

        

          555
          
        }

          561
          
        }

        

          
            

              556
              
      if (IsAssociated () && hdr->GetAddr3 () != GetBssid ())


              562
              
      if ((IsWaitAssocResp () || IsAssociated ()) && hdr->GetAddr3 () != GetBssid ())

            

        

          557
          
        {

          563
          
        {

        

        

          558
          
          goodBeacon = false;

          564
          
          goodBeacon = false;

        

        

          559
          
        }

          565
          
        }

        



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




  

    

    

       Lines 130-136
       
    
  Link Here 
    

  

        

          130
          
  void TryToEnsureAssociated (void);

          130
          
  void TryToEnsureAssociated (void);

        

        

          131
          
  void AssocRequestTimeout (void);

          131
          
  void AssocRequestTimeout (void);

        

        

          132
          
  void ProbeRequestTimeout (void);

          132
          
  void ProbeRequestTimeout (void);

        

          
            

              133
              
  bool IsAssociated (void);


              133
              
  bool IsAssociated (void) const;

            

            

              
              

              134
              
  bool IsWaitAssocResp (void) const;

            

        

          134
          
  void MissedBeacons (void);

          135
          
  void MissedBeacons (void);

        

        

          135
          
  void RestartBeaconWatchdog (Time delay);

          136
          
  void RestartBeaconWatchdog (Time delay);

        

        

          136
          
  SupportedRates GetSupportedRates (void) const;

          137
          
  SupportedRates GetSupportedRates (void) const;

        



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




  

    

    

       Lines 484-492
       
    
  Link Here 
    

  

        

          484
          
}

          484
          
}

        

        

          485
          

          485
          

        

        

          486
          
bool

          486
          
bool

        

          
            

              487
              
QstaWifiMac::IsAssociated ()


              487
              
QstaWifiMac::IsAssociated (void) const

            

        

          488
          
{

          488
          
{

        

          
            

              489
              
  return (m_state == ASSOCIATED)?true:false;


              489
              
  return m_state == ASSOCIATED;

            

            

              
              

              490
              
}

            

            


              491
              

            

            


              492
              
bool 

            

            


              493
              
QstaWifiMac::IsWaitAssocResp (void) const

            

            


              494
              
{

            

            


              495
              
  return m_state == WAIT_ASSOC_RESP;

            

        

          490
          
}

          496
          
}

        

        

          491
          

          497
          

        

        

          492
          
void

          498
          
void

        

  

    

    

       Lines 593-599
       
    
  Link Here 
    

  

        

          593
          
        {

          599
          
        {

        

        

          594
          
          goodBeacon = true;

          600
          
          goodBeacon = true;

        

        

          595
          
        }

          601
          
        }

        

          
            

              596
              
      if (IsAssociated () && hdr->GetAddr3 () != GetBssid ())


              602
              
      if ((IsWaitAssocResp () || IsAssociated ()) && hdr->GetAddr3 () != GetBssid ())

            

        

          597
          
        {

          603
          
        {

        

        

          598
          
          goodBeacon = false;

          604
          
          goodBeacon = false;

        

        

          599
          
        }

          605
          
        }

        



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




  

    

    

       Lines 101-107
       
    
  Link Here 
    

  

        

          101
          
  void SendAssociationRequest (void);

          101
          
  void SendAssociationRequest (void);

        

        

          102
          
  void SendProbeRequest (void);

          102
          
  void SendProbeRequest (void);

        

        

          103
          
  void TryToEnsureAssociated (void);

          103
          
  void TryToEnsureAssociated (void);

        

          
            

              104
              
  bool IsAssociated (void);


              104
              
  bool IsAssociated (void) const;

            

            

              
              

              105
              
  bool IsWaitAssocResp (void) const;

            

        

          105
          
  virtual void DoDispose (void);

          106
          
  virtual void DoDispose (void);

        

        

          106
          

          107
          

        

        

          107
          
 /**

          108
          
 /**

        






  

  Return to bug 605