equal
deleted
inserted
replaced
205 m_stationManager = stationManager; |
205 m_stationManager = stationManager; |
206 m_dca->SetWifiRemoteStationManager (stationManager); |
206 m_dca->SetWifiRemoteStationManager (stationManager); |
207 m_low->SetWifiRemoteStationManager (stationManager); |
207 m_low->SetWifiRemoteStationManager (stationManager); |
208 } |
208 } |
209 void |
209 void |
210 NqstaWifiMac::SetForwardUpCallback (Callback<void,Ptr<Packet>, const Mac48Address &> upCallback) |
210 NqstaWifiMac::SetForwardUpCallback (Callback<void,Ptr<Packet>, Mac48Address, Mac48Address> upCallback) |
211 { |
211 { |
212 m_forwardUp = upCallback; |
212 m_forwardUp = upCallback; |
213 } |
213 } |
214 void |
214 void |
215 NqstaWifiMac::SetLinkUpCallback (Callback<void> linkUp) |
215 NqstaWifiMac::SetLinkUpCallback (Callback<void> linkUp) |
299 { |
299 { |
300 m_probeRequestEvent.Cancel (); |
300 m_probeRequestEvent.Cancel (); |
301 } |
301 } |
302 } |
302 } |
303 void |
303 void |
304 NqstaWifiMac::ForwardUp (Ptr<Packet> packet, const Mac48Address &address) |
304 NqstaWifiMac::ForwardUp (Ptr<Packet> packet, Mac48Address from, Mac48Address to) |
305 { |
305 { |
306 NS_LOG_FUNCTION (this << packet << address); |
306 NS_LOG_FUNCTION (this << packet << from << to); |
307 m_forwardUp (packet, address); |
307 m_forwardUp (packet, from, to); |
308 } |
308 } |
309 void |
309 void |
310 NqstaWifiMac::SendProbeRequest (void) |
310 NqstaWifiMac::SendProbeRequest (void) |
311 { |
311 { |
312 NS_LOG_FUNCTION (this); |
312 NS_LOG_FUNCTION (this); |
478 { |
478 { |
479 // packet is not for us |
479 // packet is not for us |
480 } |
480 } |
481 else if (hdr->IsData ()) |
481 else if (hdr->IsData ()) |
482 { |
482 { |
483 ForwardUp (packet, hdr->GetAddr2 ()); |
483 ForwardUp (packet, hdr->GetAddr2 (), hdr->GetAddr1 ()); |
484 } |
484 } |
485 else if (hdr->IsProbeReq () || |
485 else if (hdr->IsProbeReq () || |
486 hdr->IsAssocReq ()) |
486 hdr->IsAssocReq ()) |
487 { |
487 { |
488 /* this is a frame aimed at an AP. |
488 /* this is a frame aimed at an AP. |