1.1 --- a/src/devices/wifi/wifi-mac-header.cc	Mon Aug 24 18:31:59 2009 -0700
     1.2 +++ b/src/devices/wifi/wifi-mac-header.cc	Mon Aug 24 19:03:58 2009 -0700
     1.3 @@ -896,9 +896,9 @@
     1.4  void 
     1.5  WifiMacHeader::PrintFrameControl (std::ostream &os) const
     1.6  {
     1.7 -  os << "ToDS=" << m_ctrlToDs << ", FromDS=" << m_ctrlFromDs 
     1.8 -     << ", MoreFrag=" << m_ctrlMoreFrag << ", Retry=" << m_ctrlRetry 
     1.9 -     << ", MoreData=" << m_ctrlMoreData 
    1.10 +  os << "ToDS=" << std::hex << (int) m_ctrlToDs << ", FromDS=" << std::hex << (int) m_ctrlFromDs 
    1.11 +     << ", MoreFrag=" <<  std::hex << (int) m_ctrlMoreFrag << ", Retry=" << std::hex << (int) m_ctrlRetry 
    1.12 +     << ", MoreData=" <<  std::hex << (int) m_ctrlMoreData << std::dec 
    1.13      ;
    1.14  }
    1.15  
    1.16 @@ -935,7 +935,7 @@
    1.17        PrintFrameControl (os);
    1.18        os << " Duration/ID=" << m_duration << "us"
    1.19           << ", DA=" << m_addr1 << ", SA=" << m_addr2
    1.20 -         << ", BSSID=" << m_addr3 << ", FragNumber=" << m_seqFrag
    1.21 +         << ", BSSID=" << m_addr3 << ", FragNumber=" << std::hex << (int) m_seqFrag << std::dec
    1.22           << ", SeqNumber=" << m_seqSeq;
    1.23        break;
    1.24      case WIFI_MAC_MGT_ACTION:
    1.25 @@ -943,11 +943,11 @@
    1.26        PrintFrameControl (os);
    1.27        os << " Duration/ID=" << m_duration << "us"
    1.28           << "DA=" << m_addr1 << ", SA=" << m_addr2 << ", BSSID=" << m_addr3
    1.29 -         << ", FragNumber=" << m_seqFrag << ", SeqNumber=" << m_seqSeq;
    1.30 +         << ", FragNumber=" << std::hex << (int) m_seqFrag << std::dec << ", SeqNumber=" << m_seqSeq;
    1.31      case WIFI_MAC_MGT_MULTIHOP_ACTION:
    1.32        os << " Duration/ID=" << m_duration << "us"
    1.33           << "RA=" << m_addr1 << ", TA=" << m_addr2 << ", DA=" << m_addr3
    1.34 -         << ", FragNumber=" << m_seqFrag << ", SeqNumber=" << m_seqSeq;
    1.35 +         << ", FragNumber=" << std::hex << (int) m_seqFrag << std::dec << ", SeqNumber=" << m_seqSeq;
    1.36      case WIFI_MAC_DATA:
    1.37        PrintFrameControl (os);
    1.38        os << " Duration/ID=" << m_duration << "us";
    1.39 @@ -971,7 +971,7 @@
    1.40          {
    1.41            NS_FATAL_ERROR ("Impossible ToDs and FromDs flags combination");
    1.42          }
    1.43 -      os << ", FragNumber=" << m_seqFrag
    1.44 +      os << ", FragNumber=" << std::hex << (int) m_seqFrag << std::dec
    1.45           << ", SeqNumber=" << m_seqSeq;
    1.46        break;
    1.47      case WIFI_MAC_DATA_CFACK: