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

(-)a/src/devices/wifi/nqap-wifi-mac.cc (-1 / +5 lines)
 Lines 424-436    Link Here 
424
void 
424
void 
425
NqapWifiMac::Receive (Ptr<Packet> packet, WifiMacHeader const *hdr)
425
NqapWifiMac::Receive (Ptr<Packet> packet, WifiMacHeader const *hdr)
426
{
426
{
427
  NS_LOG_FUNCTION (this << packet << hdr);
427
  NS_LOG_FUNCTION (this << *packet << *hdr);
428
428
429
  Mac48Address from = hdr->GetAddr2 ();
429
  Mac48Address from = hdr->GetAddr2 ();
430
  WifiRemoteStation *fromStation = m_stationManager->Lookup (from);
430
  WifiRemoteStation *fromStation = m_stationManager->Lookup (from);
431
431
432
  if (hdr->IsData ()) 
432
  if (hdr->IsData ()) 
433
    {
433
    {
434
      if (!fromStation->IsAssociated ())
435
        {
436
          NS_LOG_DEBUG ("data from a station that is not associated");
437
        }
434
      Mac48Address bssid = hdr->GetAddr1 ();
438
      Mac48Address bssid = hdr->GetAddr1 ();
435
      if (!hdr->IsFromDs () && 
439
      if (!hdr->IsFromDs () && 
436
          hdr->IsToDs () &&
440
          hdr->IsToDs () &&
(-)a/src/devices/wifi/wifi-mac-header.cc (-6 / +6 lines)
 Lines 779-787    Link Here 
779
void 
779
void 
780
WifiMacHeader::PrintFrameControl (std::ostream &os) const
780
WifiMacHeader::PrintFrameControl (std::ostream &os) const
781
{
781
{
782
  os << "ToDS=" << m_ctrlToDs << ", FromDS=" << m_ctrlFromDs 
782
  os << "ToDS=" << int (m_ctrlToDs) << ", FromDS=" << int (m_ctrlFromDs)
783
     << ", MoreFrag=" << m_ctrlMoreFrag << ", Retry=" << m_ctrlRetry 
783
     << ", MoreFrag=" << int (m_ctrlMoreFrag) << ", Retry=" << int (m_ctrlRetry)
784
     << ", MoreData=" << m_ctrlMoreData 
784
     << ", MoreData=" << int (m_ctrlMoreData)
785
    ;
785
    ;
786
}
786
}
787
787
 Lines 818-829    Link Here 
818
      PrintFrameControl (os);
818
      PrintFrameControl (os);
819
      os << " Duration/ID=" << m_duration << "us"
819
      os << " Duration/ID=" << m_duration << "us"
820
         << ", DA=" << m_addr1 << ", SA=" << m_addr2
820
         << ", DA=" << m_addr1 << ", SA=" << m_addr2
821
         << ", BSSID=" << m_addr3 << ", FragNumber=" << m_seqFrag
821
         << ", BSSID=" << m_addr3 << ", FragNumber=" << int (m_seqFrag)
822
         << ", SeqNumber=" << m_seqSeq;
822
         << ", SeqNumber=" << m_seqSeq;
823
      break;
823
      break;
824
    case WIFI_MAC_DATA:
824
    case WIFI_MAC_DATA:
825
      PrintFrameControl (os);
825
      PrintFrameControl (os);
826
      os << " Duration/ID=" << m_duration << "us";
826
      os << " Duration/ID=" << m_duration << "us ";
827
      if (!m_ctrlToDs && !m_ctrlFromDs)
827
      if (!m_ctrlToDs && !m_ctrlFromDs)
828
        {
828
        {
829
          os << "DA=" << m_addr1 << ", SA=" << m_addr2 << ", BSSID=" << m_addr3;
829
          os << "DA=" << m_addr1 << ", SA=" << m_addr2 << ", BSSID=" << m_addr3;
 Lines 844-850    Link Here 
844
        {
844
        {
845
          NS_ASSERT (false);
845
          NS_ASSERT (false);
846
        }
846
        }
847
      os << ", FragNumber=" << m_seqFrag
847
      os << ", FragNumber=" << int (m_seqFrag)
848
         << ", SeqNumber=" << m_seqSeq;
848
         << ", SeqNumber=" << m_seqSeq;
849
      break;
849
      break;
850
    case WIFI_MAC_DATA_CFACK:
850
    case WIFI_MAC_DATA_CFACK:

Return to bug 396