diff -r 1faf35545dfd examples/stats/wifi-example-sim.cc --- a/examples/stats/wifi-example-sim.cc Tue Jun 02 19:46:01 2009 +0200 +++ b/examples/stats/wifi-example-sim.cc Wed Jun 03 09:39:54 2009 +0200 @@ -54,9 +54,8 @@ void TxCallback(Ptr > datac, - std::string path, Ptr packet, - Mac48Address realto) { - NS_LOG_INFO("Sent frame to " << realto << "; counted in " << + std::string path, Ptr packet) { + NS_LOG_INFO("Sent frame counted in " << datac->GetKey()); datac->Update(); // end TxCallback @@ -201,7 +200,7 @@ Ptr > totalTx = CreateObject >(); totalTx->SetKey("wifi-tx-frames"); - Config::Connect("/NodeList/0/DeviceList/*/$ns3::WifiNetDevice/Tx", + Config::Connect("/NodeList/0/DeviceList/*/$ns3::WifiNetDevice/Mac/MacTx", MakeBoundCallback(&TxCallback, totalTx)); data.AddDataCalculator(totalTx); @@ -212,9 +211,9 @@ Ptr totalRx = CreateObject(); totalRx->SetKey("wifi-rx-frames"); - Config::Connect("/NodeList/1/DeviceList/*/$ns3::WifiNetDevice/Rx", - MakeCallback(&PacketCounterCalculator::FrameUpdate, - totalRx)); + Config::Connect("/NodeList/1/DeviceList/*/$ns3::WifiNetDevice/Mac/MacRx", + MakeCallback(&PacketCounterCalculator::PacketUpdate, + totalRx)); data.AddDataCalculator(totalRx);