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

Bug 881: Add missing rename of SerializeIE to Serialize.

Browse Source
This commit is contained in:
Dean Armstrong
2010-06-28 09:19:21 +01:00
parent 5afa1764af
commit 682a93ca39
5 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/devices/mesh/dot11s/peer-link-frame.cc
View File

@@ -140,7 +140,7 @@ PeerLinkFrameStart::Serialize (Buffer::Iterator start) const
{
Buffer::Iterator i = start;
NS_ASSERT (m_subtype < 3);
i = m_protocol.SerializeIE (i);
i = m_protocol.Serialize (i);
if ((uint8_t) (WifiActionHeader::PEER_LINK_CLOSE) != m_subtype)
{
i.WriteHtolsbU16 (m_capability);
@@ -151,15 +151,15 @@ PeerLinkFrameStart::Serialize (Buffer::Iterator start) const
}
if ((uint8_t) (WifiActionHeader::PEER_LINK_CLOSE) != m_subtype)
{
i = m_rates.SerializeIE (i);
i = m_rates.Serialize (i);
}
if ((uint8_t) (WifiActionHeader::PEER_LINK_CONFIRM) != m_subtype)
{
i = m_meshId.SerializeIE (i);
i = m_meshId.Serialize (i);
}
if ((uint8_t) (WifiActionHeader::PEER_LINK_CLOSE) != m_subtype)
{
i = m_config.SerializeIE (i);
i = m_config.Serialize (i);
}
else
{

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

@@ -87,8 +87,8 @@ void
MgtProbeRequestHeader::Serialize (Buffer::Iterator start) const
{
Buffer::Iterator i = start;
i = m_ssid.SerializeIE (i);
i = m_rates.SerializeIE (i);
i = m_ssid.Serialize (i);
i = m_rates.Serialize (i);
}
uint32_t
MgtProbeRequestHeader::Deserialize (Buffer::Iterator start)
@@ -196,8 +196,8 @@ MgtProbeResponseHeader::Serialize (Buffer::Iterator start) const
i.WriteHtonU64 (Simulator::Now ().GetMicroSeconds ());
i.WriteHtonU16 (m_beaconInterval / 1024);
i = m_capability.Serialize (i);
i = m_ssid.SerializeIE (i);
i = m_rates.SerializeIE (i);
i = m_ssid.Serialize (i);
i = m_rates.Serialize (i);
//i.WriteU8 (0, 3); // ds parameter set.
}
uint32_t
@@ -293,8 +293,8 @@ MgtAssocRequestHeader::Serialize (Buffer::Iterator start) const
Buffer::Iterator i = start;
i = m_capability.Serialize (i);
i.WriteHtonU16 (m_listenInterval);
i = m_ssid.SerializeIE (i);
i = m_rates.SerializeIE (i);
i = m_ssid.Serialize (i);
i = m_rates.Serialize (i);
}
uint32_t
MgtAssocRequestHeader::Deserialize (Buffer::Iterator start)
@@ -378,7 +378,7 @@ MgtAssocResponseHeader::Serialize (Buffer::Iterator start) const
i = m_capability.Serialize (i);
i = m_code.Serialize (i);
i.WriteHtonU16 (m_aid);
i = m_rates.SerializeIE (i);
i = m_rates.Serialize (i);
}
uint32_t
MgtAssocResponseHeader::Deserialize (Buffer::Iterator start)

2
src/devices/wifi/wifi-information-element-vector.cc
View File

@@ -59,7 +59,7 @@ WifiInformationElementVector::Serialize (Buffer::Iterator start) const
{
for(IE_VECTOR::const_iterator i = m_elements.begin (); i != m_elements.end (); i ++)
{
start = (*i)->SerializeIE (start);
start = (*i)->Serialize (start);
}
}
uint32_t

2
src/devices/wifi/wifi-information-element.cc
View File

@@ -36,7 +36,7 @@ WifiInformationElement::GetSerializedSize () const
}
Buffer::Iterator
WifiInformationElement::SerializeIE (Buffer::Iterator i) const
WifiInformationElement::Serialize (Buffer::Iterator i) const
{
i.WriteU8 (ElementId ());
i.WriteU8 (GetInformationFieldSize ());

2
src/devices/wifi/wifi-information-element.h
View File

@@ -137,7 +137,7 @@ class WifiInformationElement : public SimpleRefCount<WifiInformationElement>
public:
virtual ~WifiInformationElement ();
/// Serialize entire IE including Element ID and length fields
Buffer::Iterator SerializeIE (Buffer::Iterator i) const;
Buffer::Iterator Serialize (Buffer::Iterator i) const;
/// Deserialize entire IE, which must be present. The iterator
/// passed in must be pointing at the Element ID (i.e., the very
/// first octet) of the correct type of information element,