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

Use PacketTagList::TagData::MAX_SIZE in DeviceNameTag

Browse Source
This commit is contained in:
Peter D. Barnes, Jr.
2013-05-22 12:57:58 -07:00
parent a1a1c6d36d
commit 4fc79291b9
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/network/utils/packet-socket.cc
View File

@@ -617,19 +617,20 @@ DeviceNameTag::GetInstanceTypeId (void) const
uint32_t
DeviceNameTag::GetSerializedSize (void) const
{
uint32_t s = 1 + m_deviceName.size();
return ( s >= PACKET_TAG_MAX_SIZE)?PACKET_TAG_MAX_SIZE:s;
uint32_t s = 1 + m_deviceName.size(); // +1 for name length field
s = std::min (s, (uint32_t)PacketTagList::TagData::MAX_SIZE);
return s;
}
void
DeviceNameTag::Serialize (TagBuffer i) const
{
const char *n = m_deviceName.c_str();
uint8_t l = (uint8_t) strlen (n);
uint8_t l = (uint8_t) m_deviceName.size ();
if ( ( 1 + l ) > PACKET_TAG_MAX_SIZE ) l = PACKET_TAG_MAX_SIZE - 1;
l = std::min ((uint32_t)l, (uint32_t)PacketTagList::TagData::MAX_SIZE - 1);
i.WriteU8 (l);
i.Write ( (uint8_t*) n , (uint32_t) l );
i.Write ( (uint8_t*) n , (uint32_t) l);
}
void
DeviceNameTag::Deserialize (TagBuffer i)