F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 979: Use LSB ordering for multi-octet fields in wifi module

Browse Source
This commit is contained in:
Dean Armstrong
2010-09-03 08:58:04 +01:00
parent fc769b5331
commit 1731cd715c
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/devices/wifi/amsdu-subframe-header.cc
View File

@@ -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);
}

4
src/devices/wifi/capability-information.cc
View File

@@ -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;
}

16
src/devices/wifi/mgt-headers.cc
View File

@@ -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);

4
src/devices/wifi/status-code.cc
View File

@@ -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;
}