EmaMaker
/
tc-homework2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

the mask to filter out the low bit is 0xfe, not 0xfd

Mathieu Lacage 2007-06-05 18:28:37 +02:00
parent 3634046dc7
commit 969ff1267e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/packet-history.cc
View File

@ -773,7 +773,7 @@ PacketHistory::RemoveHeader (uint32_t uid, Chunk const & header, uint32_t size)
const uint8_t *buffer = &m_data->m_data[m_head]; const uint8_t *buffer = &m_data->m_data[m_head];
ReadSmall (&item, &buffer); ReadSmall (&item, &buffer);
NS_ASSERT (buffer <= &m_data->m_data[m_data->m_size]); NS_ASSERT (buffer <= &m_data->m_data[m_data->m_size]);
if ((item.typeUid & 0xfffffffd) != uid || if ((item.typeUid & 0xfffffffe) != uid ||
item.size != size) item.size != size)
{ {
NS_FATAL_ERROR ("Removing unexpected header."); NS_FATAL_ERROR ("Removing unexpected header.");
@ -820,7 +820,7 @@ PacketHistory::RemoveTrailer (uint32_t uid, Chunk const & trailer, uint32_t size
const uint8_t *buffer = &m_data->m_data[m_tail]; const uint8_t *buffer = &m_data->m_data[m_tail];
ReadSmall (&item, &buffer); ReadSmall (&item, &buffer);
NS_ASSERT (buffer <= &m_data->m_data[m_data->m_size]); NS_ASSERT (buffer <= &m_data->m_data[m_data->m_size]);
if ((item.typeUid & 0xfffffffd) != uid || if ((item.typeUid & 0xfffffffe) != uid ||
item.size != size) item.size != size)
{ {
NS_FATAL_ERROR ("Removing unexpected trailer."); NS_FATAL_ERROR ("Removing unexpected trailer.");
@ -875,7 +875,7 @@ PacketHistory::RemoveAtStart (uint32_t start)
uint8_t *buffer = &m_data->m_data[m_head]; uint8_t *buffer = &m_data->m_data[m_head];
bool ok = ReadSmall (&item, &buffer); bool ok = ReadSmall (&item, &buffer);
NS_ASSERT (ok); NS_ASSERT (ok);
if ((item.typeUid & 0xfffffffd) != uid || if ((item.typeUid & 0xfffffffe) != uid ||
item.size != size) item.size != size)
{ {
NS_FATAL_ERROR ("Removing unexpected header."); NS_FATAL_ERROR ("Removing unexpected header.");
@ -936,7 +936,7 @@ PacketHistory::DoPrint (struct PacketHistory::SmallItem *item, uint8_t const*buf
{ {
ReadSmall (item, &buffer); ReadSmall (item, &buffer);
bool isExtra = (item->typeUid & 0x1) == 0x1; bool isExtra = (item->typeUid & 0x1) == 0x1;
uint32_t uid = item->typeUid & 0xfffffffd; uint32_t uid = item->typeUid & 0xfffffffe;
uint32_t fragmentStart, fragmentEnd; uint32_t fragmentStart, fragmentEnd;
uint32_t packetUid; uint32_t packetUid;
if (isExtra) if (isExtra)