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

(-)a/src/wifi/model/sta-wifi-mac.cc (+5 lines)
 Lines 75-80    Link Here 
75
    .AddTraceSource ("DeAssoc", "Association with an access point lost.",
75
    .AddTraceSource ("DeAssoc", "Association with an access point lost.",
76
                     MakeTraceSourceAccessor (&StaWifiMac::m_deAssocLogger),
76
                     MakeTraceSourceAccessor (&StaWifiMac::m_deAssocLogger),
77
                     "ns3::Mac48Address::TracedCallback")
77
                     "ns3::Mac48Address::TracedCallback")
78
    .AddTraceSource ("BeaconArrival",
79
                     "Time of beacons arrival from associated AP",
80
                     MakeTraceSourceAccessor (&StaWifiMac::m_beaconArrival),
81
                     "ns3::Time::TracedCallback")
78
  ;
82
  ;
79
  return tid;
83
  return tid;
80
}
84
}
 Lines 604-609    Link Here 
604
        }
608
        }
605
      if (goodBeacon && m_state == ASSOCIATED)
609
      if (goodBeacon && m_state == ASSOCIATED)
606
        {
610
        {
611
          m_beaconArrival (Simulator::Now ());
607
          Time delay = MicroSeconds (beacon.GetBeaconIntervalUs () * m_maxMissedBeacons);
612
          Time delay = MicroSeconds (beacon.GetBeaconIntervalUs () * m_maxMissedBeacons);
608
          RestartBeaconWatchdog (delay);
613
          RestartBeaconWatchdog (delay);
609
          UpdateApInfoFromBeacon (beacon, hdr->GetAddr2 (), hdr->GetAddr3 ());
614
          UpdateApInfoFromBeacon (beacon, hdr->GetAddr2 (), hdr->GetAddr3 ());
(-)a/src/wifi/model/sta-wifi-mac.h (+1 lines)
 Lines 318-323    Link Here 
318
318
319
  TracedCallback<Mac48Address> m_assocLogger;   ///< assoc logger
319
  TracedCallback<Mac48Address> m_assocLogger;   ///< assoc logger
320
  TracedCallback<Mac48Address> m_deAssocLogger; ///< deassoc logger
320
  TracedCallback<Mac48Address> m_deAssocLogger; ///< deassoc logger
321
  TracedCallback<Time>         m_beaconArrival; ///< beacon arrival logger
321
};
322
};
322
323
323
} //namespace ns3
324
} //namespace ns3

Return to bug 2957