equal
deleted
inserted
replaced
152 m_stationManager = stationManager; |
152 m_stationManager = stationManager; |
153 m_dca->SetWifiRemoteStationManager (stationManager); |
153 m_dca->SetWifiRemoteStationManager (stationManager); |
154 m_low->SetWifiRemoteStationManager (stationManager); |
154 m_low->SetWifiRemoteStationManager (stationManager); |
155 } |
155 } |
156 void |
156 void |
157 AdhocWifiMac::SetForwardUpCallback (Callback<void,Ptr<Packet>, const Mac48Address &> upCallback) |
157 AdhocWifiMac::SetForwardUpCallback (Callback<void,Ptr<Packet>, Mac48Address, Mac48Address> upCallback) |
158 { |
158 { |
159 m_upCallback = upCallback; |
159 m_upCallback = upCallback; |
160 } |
160 } |
161 void |
161 void |
162 AdhocWifiMac::SetLinkUpCallback (Callback<void> linkUp) |
162 AdhocWifiMac::SetLinkUpCallback (Callback<void> linkUp) |
235 |
235 |
236 void |
236 void |
237 AdhocWifiMac::ForwardUp (Ptr<Packet> packet, WifiMacHeader const *hdr) |
237 AdhocWifiMac::ForwardUp (Ptr<Packet> packet, WifiMacHeader const *hdr) |
238 { |
238 { |
239 NS_LOG_DEBUG ("received size="<<packet->GetSize ()<<", from="<<hdr->GetAddr2 ()); |
239 NS_LOG_DEBUG ("received size="<<packet->GetSize ()<<", from="<<hdr->GetAddr2 ()); |
240 if (hdr->GetAddr1 ().IsBroadcast () || hdr->GetAddr1 () == GetAddress ()) |
240 m_upCallback (packet, hdr->GetAddr2 (), hdr->GetAddr1 ()); |
241 { |
|
242 m_upCallback (packet, hdr->GetAddr2 ()); |
|
243 } |
|
244 } |
241 } |
245 |
242 |
246 } // namespace ns3 |
243 } // namespace ns3 |