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

Bug 1568 - Deserialized Addresses are implicitly marked as Mac48Address

Browse Source
This commit is contained in:
Tommaso Pecorella
2013-03-11 23:06:41 +01:00
parent 67735b8043
commit 5e2d3e7604
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/network/model/address.cc
View File

@@ -123,7 +123,8 @@ Address::CheckCompatible (uint8_t type, uint8_t len) const
{
NS_LOG_FUNCTION (this << static_cast<uint32_t> (type) << static_cast<uint32_t> (len));
NS_ASSERT (len <= MAX_SIZE);
return m_len == len && (m_type == type || m_type == 0);
// Mac address type/length detection is discussed in bug 1568
return (m_len == len && m_type == type) || (m_len >= len && m_type == 0);
}
bool
Address::IsMatchingType (uint8_t type) const