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

(-)a/src/devices/wifi/wifi-mac-header.cc (-7 / +7 lines)
 Lines 896-904    Link Here 
896
void 
896
void 
897
WifiMacHeader::PrintFrameControl (std::ostream &os) const
897
WifiMacHeader::PrintFrameControl (std::ostream &os) const
898
{
898
{
899
  os << "ToDS=" << m_ctrlToDs << ", FromDS=" << m_ctrlFromDs 
899
  os << "ToDS=" << std::hex << (int) m_ctrlToDs << ", FromDS=" << std::hex << (int) m_ctrlFromDs 
900
     << ", MoreFrag=" << m_ctrlMoreFrag << ", Retry=" << m_ctrlRetry 
900
     << ", MoreFrag=" << std::hex << (int) m_ctrlMoreFrag << ", Retry=" << std::hex << (int) m_ctrlRetry 
901
     << ", MoreData=" << m_ctrlMoreData 
901
     << ", MoreData=" << std::hex << (int) m_ctrlMoreData 
902
    ;
902
    ;
903
}
903
}
904
904
 Lines 935-941    Link Here 
935
      PrintFrameControl (os);
935
      PrintFrameControl (os);
936
      os << " Duration/ID=" << m_duration << "us"
936
      os << " Duration/ID=" << m_duration << "us"
937
         << ", DA=" << m_addr1 << ", SA=" << m_addr2
937
         << ", DA=" << m_addr1 << ", SA=" << m_addr2
938
         << ", BSSID=" << m_addr3 << ", FragNumber=" << m_seqFrag
938
         << ", BSSID=" << m_addr3 << ", FragNumber=" << std::hex << (int) m_seqFrag
939
         << ", SeqNumber=" << m_seqSeq;
939
         << ", SeqNumber=" << m_seqSeq;
940
      break;
940
      break;
941
    case WIFI_MAC_MGT_ACTION:
941
    case WIFI_MAC_MGT_ACTION:
 Lines 943-953    Link Here 
943
      PrintFrameControl (os);
943
      PrintFrameControl (os);
944
      os << " Duration/ID=" << m_duration << "us"
944
      os << " Duration/ID=" << m_duration << "us"
945
         << "DA=" << m_addr1 << ", SA=" << m_addr2 << ", BSSID=" << m_addr3
945
         << "DA=" << m_addr1 << ", SA=" << m_addr2 << ", BSSID=" << m_addr3
946
         << ", FragNumber=" << m_seqFrag << ", SeqNumber=" << m_seqSeq;
946
         << ", FragNumber=" << std::hex << (int) m_seqFrag << ", SeqNumber=" << m_seqSeq;
947
    case WIFI_MAC_MGT_MULTIHOP_ACTION:
947
    case WIFI_MAC_MGT_MULTIHOP_ACTION:
948
      os << " Duration/ID=" << m_duration << "us"
948
      os << " Duration/ID=" << m_duration << "us"
949
         << "RA=" << m_addr1 << ", TA=" << m_addr2 << ", DA=" << m_addr3
949
         << "RA=" << m_addr1 << ", TA=" << m_addr2 << ", DA=" << m_addr3
950
         << ", FragNumber=" << m_seqFrag << ", SeqNumber=" << m_seqSeq;
950
         << ", FragNumber=" << std::hex << (int) m_seqFrag << ", SeqNumber=" << m_seqSeq;
951
    case WIFI_MAC_DATA:
951
    case WIFI_MAC_DATA:
952
      PrintFrameControl (os);
952
      PrintFrameControl (os);
953
      os << " Duration/ID=" << m_duration << "us";
953
      os << " Duration/ID=" << m_duration << "us";
 Lines 971-977    Link Here 
971
        {
971
        {
972
          NS_FATAL_ERROR ("Impossible ToDs and FromDs flags combination");
972
          NS_FATAL_ERROR ("Impossible ToDs and FromDs flags combination");
973
        }
973
        }
974
      os << ", FragNumber=" << m_seqFrag
974
      os << ", FragNumber=" << std::hex << (int) m_seqFrag
975
         << ", SeqNumber=" << m_seqSeq;
975
         << ", SeqNumber=" << m_seqSeq;
976
      break;
976
      break;
977
    case WIFI_MAC_DATA_CFACK:
977
    case WIFI_MAC_DATA_CFACK:

Return to bug 661