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

(-)a/src/devices/wifi/amsdu-subframe-header.cc (-2 / +2 lines)
 Lines 58-64    Link Here 
58 
{
 58 
{
59 
  WriteTo (i, m_da);
 59 
  WriteTo (i, m_da);
60 
  WriteTo (i, m_sa);
 60 
  WriteTo (i, m_sa);
61 
  i.WriteHtonU16 (m_length);
 61 
  i.WriteHtolsbU16 (m_length);
62 
}
 62 
}
63 

          63
          

        

        

          64
          
uint32_t

          64
          
uint32_t

        

  

    

    

       Lines 67-73
       
    
  Link Here 
    

  

        

          67
          
  Buffer::Iterator i = start;

          67
          
  Buffer::Iterator i = start;

        

        

          68
          
  ReadFrom (i, m_da);

          68
          
  ReadFrom (i, m_da);

        

        

          69
          
  ReadFrom (i, m_sa);

          69
          
  ReadFrom (i, m_sa);

        

          
            

              70
              
  m_length = i.ReadNtohU16 ();


              70
              
  m_length = i.ReadLsbtohU16 ();

            

        

          71
          
  return i.GetDistanceFrom (start);

          71
          
  return i.GetDistanceFrom (start);

        

        

          72
          
}

          72
          
}

        

        

          73
          

          73
          

        



(-)a/src/devices/wifi/capability-information.cc
      (-2 / +2 lines)




  

    

    

       Lines 79-91
       
    
  Link Here 
    

  

        

          79
          
Buffer::Iterator 

          79
          
Buffer::Iterator 

        

        

          80
          
CapabilityInformation::Serialize (Buffer::Iterator start) const

          80
          
CapabilityInformation::Serialize (Buffer::Iterator start) const

        

        

          81
          
{

          81
          
{

        

          
            

              82
              
  start.WriteHtonU16 (m_capability);


              82
              
  start.WriteHtolsbU16 (m_capability);

            

        

          83
          
  return start;

          83
          
  return start;

        

        

          84
          
}

          84
          
}

        

        

          85
          
Buffer::Iterator 

          85
          
Buffer::Iterator 

        

        

          86
          
CapabilityInformation::Deserialize (Buffer::Iterator start)

          86
          
CapabilityInformation::Deserialize (Buffer::Iterator start)

        

        

          87
          
{

          87
          
{

        

          
            

              88
              
  m_capability = start.ReadNtohU16 ();


              88
              
  m_capability = start.ReadLsbtohU16 ();

            

        

          89
          
  return start;

          89
          
  return start;

        

        

          90
          
}

          90
          
}

        

        

          91
          

          91
          

        



(-)a/src/devices/wifi/mgt-headers.cc
      (-8 / +8 lines)




  

    

    

       Lines 193-200
       
    
  Link Here 
    

  

        

          193
          
  // ibss parameter set

          193
          
  // ibss parameter set

        

        

          194
          
  //XXX

          194
          
  //XXX

        

        

          195
          
  Buffer::Iterator i = start;

          195
          
  Buffer::Iterator i = start;

        

          
            

              196
              
  i.WriteHtonU64 (Simulator::Now ().GetMicroSeconds ());


              196
              
  i.WriteHtolsbU64 (Simulator::Now ().GetMicroSeconds ());

            

            

              197
              
  i.WriteHtonU16 (m_beaconInterval / 1024);


              197
              
  i.WriteHtolsbU16 (m_beaconInterval / 1024);

            

        

          198
          
  i = m_capability.Serialize (i);

          198
          
  i = m_capability.Serialize (i);

        

        

          199
          
  i = m_ssid.Serialize (i);

          199
          
  i = m_ssid.Serialize (i);

        

        

          200
          
  i = m_rates.Serialize (i);

          200
          
  i = m_rates.Serialize (i);

        

  

    

    

       Lines 204-211
       
    
  Link Here 
    

  

        

          204
          
MgtProbeResponseHeader::Deserialize (Buffer::Iterator start)

          204
          
MgtProbeResponseHeader::Deserialize (Buffer::Iterator start)

        

        

          205
          
{

          205
          
{

        

        

          206
          
  Buffer::Iterator i = start;

          206
          
  Buffer::Iterator i = start;

        

          
            

              207
              
  m_timestamp = i.ReadNtohU64();


              207
              
  m_timestamp = i.ReadLsbtohU64();

            

            

              208
              
  m_beaconInterval = i.ReadNtohU16 ();


              208
              
  m_beaconInterval = i.ReadLsbtohU16 ();

            

        

          209
          
  m_beaconInterval *= 1024;

          209
          
  m_beaconInterval *= 1024;

        

        

          210
          
  i = m_capability.Deserialize (i);

          210
          
  i = m_capability.Deserialize (i);

        

        

          211
          
  i = m_ssid.Deserialize (i);

          211
          
  i = m_ssid.Deserialize (i);

        

  

    

    

       Lines 292-298
       
    
  Link Here 
    

  

        

          292
          
{

          292
          
{

        

        

          293
          
  Buffer::Iterator i = start;

          293
          
  Buffer::Iterator i = start;

        

        

          294
          
  i = m_capability.Serialize (i);

          294
          
  i = m_capability.Serialize (i);

        

          
            

              295
              
  i.WriteHtonU16 (m_listenInterval);


              295
              
  i.WriteHtolsbU16 (m_listenInterval);

            

        

          296
          
  i = m_ssid.Serialize (i);

          296
          
  i = m_ssid.Serialize (i);

        

        

          297
          
  i = m_rates.Serialize (i);

          297
          
  i = m_rates.Serialize (i);

        

        

          298
          
}

          298
          
}

        

  

    

    

       Lines 301-307
       
    
  Link Here 
    

  

        

          301
          
{

          301
          
{

        

        

          302
          
  Buffer::Iterator i = start;

          302
          
  Buffer::Iterator i = start;

        

        

          303
          
  i = m_capability.Deserialize (i);

          303
          
  i = m_capability.Deserialize (i);

        

          
            

              304
              
  m_listenInterval = i.ReadNtohU16 ();


              304
              
  m_listenInterval = i.ReadLsbtohU16 ();

            

        

          305
          
  i = m_ssid.Deserialize (i);

          305
          
  i = m_ssid.Deserialize (i);

        

        

          306
          
  i = m_rates.Deserialize (i);

          306
          
  i = m_rates.Deserialize (i);

        

        

          307
          
  return i.GetDistanceFrom (start);

          307
          
  return i.GetDistanceFrom (start);

        

  

    

    

       Lines 377-383
       
    
  Link Here 
    

  

        

          377
          
  Buffer::Iterator i = start;

          377
          
  Buffer::Iterator i = start;

        

        

          378
          
  i = m_capability.Serialize (i);

          378
          
  i = m_capability.Serialize (i);

        

        

          379
          
  i = m_code.Serialize (i);

          379
          
  i = m_code.Serialize (i);

        

          
            

              380
              
  i.WriteHtonU16 (m_aid);


              380
              
  i.WriteHtolsbU16 (m_aid);

            

        

          381
          
  i = m_rates.Serialize (i);

          381
          
  i = m_rates.Serialize (i);

        

        

          382
          
}

          382
          
}

        

        

          383
          
uint32_t

          383
          
uint32_t

        

  

    

    

       Lines 386-392
       
    
  Link Here 
    

  

        

          386
          
  Buffer::Iterator i = start;

          386
          
  Buffer::Iterator i = start;

        

        

          387
          
  i = m_capability.Deserialize (i);

          387
          
  i = m_capability.Deserialize (i);

        

        

          388
          
  i = m_code.Deserialize (i);

          388
          
  i = m_code.Deserialize (i);

        

          
            

              389
              
  m_aid = i.ReadNtohU16 ();


              389
              
  m_aid = i.ReadLsbtohU16 ();

            

        

          390
          
  i = m_rates.Deserialize (i);

          390
          
  i = m_rates.Deserialize (i);

        

        

          391
          
  return i.GetDistanceFrom (start);

          391
          
  return i.GetDistanceFrom (start);

        

        

          392
          
}

          392
          
}

        



(-)a/src/devices/wifi/status-code.cc
      (-2 / +2 lines)




  

    

    

       Lines 50-62
       
    
  Link Here 
    

  

        

          50
          
Buffer::Iterator 

          50
          
Buffer::Iterator 

        

        

          51
          
StatusCode::Serialize (Buffer::Iterator start) const

          51
          
StatusCode::Serialize (Buffer::Iterator start) const

        

        

          52
          
{

          52
          
{

        

          
            

              53
              
  start.WriteHtonU16 (m_code);


              53
              
  start.WriteHtolsbU16 (m_code);

            

        

          54
          
  return start;

          54
          
  return start;

        

        

          55
          
}

          55
          
}

        

        

          56
          
Buffer::Iterator 

          56
          
Buffer::Iterator 

        

        

          57
          
StatusCode::Deserialize (Buffer::Iterator start)

          57
          
StatusCode::Deserialize (Buffer::Iterator start)

        

        

          58
          
{

          58
          
{

        

          
            

              59
              
  m_code = start.ReadNtohU16 ();


              59
              
  m_code = start.ReadLsbtohU16 ();

            

        

          60
          
  return start;

          60
          
  return start;

        

        

          61
          
}

          61
          
}

        

        

          62
          

          62
          

        






  

  Return to bug 979