From 1731cd715c7ec2ad5e31b4e5bc768046510b03d8 Mon Sep 17 00:00:00 2001
From: Dean Armstrong <deanarm@gmail.com>
Date: Fri, 3 Sep 2010 08:58:04 +0100
Subject: [PATCH] Bug 979: Use LSB ordering for multi-octet fields in wifi
 module

---
 src/devices/wifi/amsdu-subframe-header.cc  |  4 ++--
 src/devices/wifi/capability-information.cc |  4 ++--
 src/devices/wifi/mgt-headers.cc            | 16 ++++++++--------
 src/devices/wifi/status-code.cc            |  4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/devices/wifi/amsdu-subframe-header.cc b/src/devices/wifi/amsdu-subframe-header.cc
index f30278bf3..f71b3973d 100644
--- a/src/devices/wifi/amsdu-subframe-header.cc
+++ b/src/devices/wifi/amsdu-subframe-header.cc
@@ -58,7 +58,7 @@ AmsduSubframeHeader::Serialize (Buffer::Iterator i) const
 {
   WriteTo (i, m_da);
   WriteTo (i, m_sa);
-  i.WriteHtonU16 (m_length);
+  i.WriteHtolsbU16 (m_length);
 }
 
 uint32_t
@@ -67,7 +67,7 @@ AmsduSubframeHeader::Deserialize (Buffer::Iterator start)
   Buffer::Iterator i = start;
   ReadFrom (i, m_da);
   ReadFrom (i, m_sa);
-  m_length = i.ReadNtohU16 ();
+  m_length = i.ReadLsbtohU16 ();
   return i.GetDistanceFrom (start);
 }
 
diff --git a/src/devices/wifi/capability-information.cc b/src/devices/wifi/capability-information.cc
index ba9137f7e..8e003605c 100644
--- a/src/devices/wifi/capability-information.cc
+++ b/src/devices/wifi/capability-information.cc
@@ -79,13 +79,13 @@ CapabilityInformation::GetSerializedSize (void) const
 Buffer::Iterator 
 CapabilityInformation::Serialize (Buffer::Iterator start) const
 {
-  start.WriteHtonU16 (m_capability);
+  start.WriteHtolsbU16 (m_capability);
   return start;
 }
 Buffer::Iterator 
 CapabilityInformation::Deserialize (Buffer::Iterator start)
 {
-  m_capability = start.ReadNtohU16 ();
+  m_capability = start.ReadLsbtohU16 ();
   return start;
 }
 
diff --git a/src/devices/wifi/mgt-headers.cc b/src/devices/wifi/mgt-headers.cc
index 74916d7fb..d69c2dc8a 100644
--- a/src/devices/wifi/mgt-headers.cc
+++ b/src/devices/wifi/mgt-headers.cc
@@ -197,8 +197,8 @@ MgtProbeResponseHeader::Serialize (Buffer::Iterator start) const
   // ibss parameter set
   //XXX
   Buffer::Iterator i = start;
-  i.WriteHtonU64 (Simulator::Now ().GetMicroSeconds ());
-  i.WriteHtonU16 (m_beaconInterval / 1024);
+  i.WriteHtolsbU64 (Simulator::Now ().GetMicroSeconds ());
+  i.WriteHtolsbU16 (m_beaconInterval / 1024);
   i = m_capability.Serialize (i);
   i = m_ssid.Serialize (i);
   i = m_rates.Serialize (i);
@@ -209,8 +209,8 @@ uint32_t
 MgtProbeResponseHeader::Deserialize (Buffer::Iterator start)
 {
   Buffer::Iterator i = start;
-  m_timestamp = i.ReadNtohU64();
-  m_beaconInterval = i.ReadNtohU16 ();
+  m_timestamp = i.ReadLsbtohU64();
+  m_beaconInterval = i.ReadLsbtohU16 ();
   m_beaconInterval *= 1024;
   i = m_capability.Deserialize (i);
   i = m_ssid.Deserialize (i);
@@ -299,7 +299,7 @@ MgtAssocRequestHeader::Serialize (Buffer::Iterator start) const
 {
   Buffer::Iterator i = start;
   i = m_capability.Serialize (i);
-  i.WriteHtonU16 (m_listenInterval);
+  i.WriteHtolsbU16 (m_listenInterval);
   i = m_ssid.Serialize (i);
   i = m_rates.Serialize (i);
   i = m_rates.extended.Serialize (i);
@@ -309,7 +309,7 @@ MgtAssocRequestHeader::Deserialize (Buffer::Iterator start)
 {
   Buffer::Iterator i = start;
   i = m_capability.Deserialize (i);
-  m_listenInterval = i.ReadNtohU16 ();
+  m_listenInterval = i.ReadLsbtohU16 ();
   i = m_ssid.Deserialize (i);
   i = m_rates.Deserialize (i);
   i = m_rates.extended.DeserializeIfPresent (i);
@@ -387,7 +387,7 @@ MgtAssocResponseHeader::Serialize (Buffer::Iterator start) const
   Buffer::Iterator i = start;
   i = m_capability.Serialize (i);
   i = m_code.Serialize (i);
-  i.WriteHtonU16 (m_aid);
+  i.WriteHtolsbU16 (m_aid);
   i = m_rates.Serialize (i);
   i = m_rates.extended.Serialize (i);
 }
@@ -397,7 +397,7 @@ MgtAssocResponseHeader::Deserialize (Buffer::Iterator start)
   Buffer::Iterator i = start;
   i = m_capability.Deserialize (i);
   i = m_code.Deserialize (i);
-  m_aid = i.ReadNtohU16 ();
+  m_aid = i.ReadLsbtohU16 ();
   i = m_rates.Deserialize (i);
   i = m_rates.extended.DeserializeIfPresent (i);
   return i.GetDistanceFrom (start);
diff --git a/src/devices/wifi/status-code.cc b/src/devices/wifi/status-code.cc
index a8939c35c..c2ac9f00a 100644
--- a/src/devices/wifi/status-code.cc
+++ b/src/devices/wifi/status-code.cc
@@ -50,13 +50,13 @@ StatusCode::GetSerializedSize (void) const
 Buffer::Iterator 
 StatusCode::Serialize (Buffer::Iterator start) const
 {
-  start.WriteHtonU16 (m_code);
+  start.WriteHtolsbU16 (m_code);
   return start;
 }
 Buffer::Iterator 
 StatusCode::Deserialize (Buffer::Iterator start)
 {
-  m_code = start.ReadNtohU16 ();
+  m_code = start.ReadLsbtohU16 ();
   return start;
 }