diff -r 37b316422064 src/devices/wifi/nqap-wifi-mac.cc --- a/src/devices/wifi/nqap-wifi-mac.cc Mon Oct 27 15:12:00 2008 -0400 +++ b/src/devices/wifi/nqap-wifi-mac.cc Tue Oct 28 17:13:05 2008 +0000 @@ -424,13 +424,17 @@ void NqapWifiMac::Receive (Ptr packet, WifiMacHeader const *hdr) { - NS_LOG_FUNCTION (this << packet << hdr); + NS_LOG_FUNCTION (this << *packet << *hdr); Mac48Address from = hdr->GetAddr2 (); WifiRemoteStation *fromStation = m_stationManager->Lookup (from); if (hdr->IsData ()) { + if (!fromStation->IsAssociated ()) + { + NS_LOG_DEBUG ("data from a station that is not associated"); + } Mac48Address bssid = hdr->GetAddr1 (); if (!hdr->IsFromDs () && hdr->IsToDs () && diff -r 37b316422064 src/devices/wifi/wifi-mac-header.cc --- a/src/devices/wifi/wifi-mac-header.cc Mon Oct 27 15:12:00 2008 -0400 +++ b/src/devices/wifi/wifi-mac-header.cc Tue Oct 28 17:13:05 2008 +0000 @@ -779,9 +779,9 @@ void WifiMacHeader::PrintFrameControl (std::ostream &os) const { - os << "ToDS=" << m_ctrlToDs << ", FromDS=" << m_ctrlFromDs - << ", MoreFrag=" << m_ctrlMoreFrag << ", Retry=" << m_ctrlRetry - << ", MoreData=" << m_ctrlMoreData + os << "ToDS=" << int (m_ctrlToDs) << ", FromDS=" << int (m_ctrlFromDs) + << ", MoreFrag=" << int (m_ctrlMoreFrag) << ", Retry=" << int (m_ctrlRetry) + << ", MoreData=" << int (m_ctrlMoreData) ; } @@ -818,12 +818,12 @@ PrintFrameControl (os); os << " Duration/ID=" << m_duration << "us" << ", DA=" << m_addr1 << ", SA=" << m_addr2 - << ", BSSID=" << m_addr3 << ", FragNumber=" << m_seqFrag + << ", BSSID=" << m_addr3 << ", FragNumber=" << int (m_seqFrag) << ", SeqNumber=" << m_seqSeq; break; case WIFI_MAC_DATA: PrintFrameControl (os); - os << " Duration/ID=" << m_duration << "us"; + os << " Duration/ID=" << m_duration << "us "; if (!m_ctrlToDs && !m_ctrlFromDs) { os << "DA=" << m_addr1 << ", SA=" << m_addr2 << ", BSSID=" << m_addr3; @@ -844,7 +844,7 @@ { NS_ASSERT (false); } - os << ", FragNumber=" << m_seqFrag + os << ", FragNumber=" << int (m_seqFrag) << ", SeqNumber=" << m_seqSeq; break; case WIFI_MAC_DATA_CFACK: