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

new test and fix to make it pass

Mathieu Lacage 2007-06-01 12:46:23 +02:00
parent 438e58cc1c
commit 99c235760e
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -145,10 +145,11 @@ ItemList::RemAtStart (uint32_t toRemove)
while (!m_itemList.empty () && leftToRemove > 0)
{
struct Item &item = m_itemList.front ();
if (item.m_fragmentEnd - item.m_fragmentStart <= leftToRemove)
uint32_t itemRealSize = item.m_fragmentEnd - item.m_fragmentStart;
if (itemRealSize <= leftToRemove)
{
m_itemList.pop_front ();
leftToRemove -= item.m_size;
leftToRemove -= itemRealSize;
}
else
{
@ -167,10 +168,11 @@ ItemList::RemAtEnd (uint32_t toRemove)
while (!m_itemList.empty () && leftToRemove > 0)
{
struct Item &item = m_itemList.back ();
if (item.m_fragmentEnd - item.m_fragmentStart <= leftToRemove)
uint32_t itemRealSize = item.m_fragmentEnd - item.m_fragmentStart;
if (itemRealSize <= leftToRemove)
{
m_itemList.pop_back ();
leftToRemove -= item.m_size;
leftToRemove -= itemRealSize;
}
else
{
@ -900,6 +902,7 @@ template <int N>
void
HistoryTrailer<N>::SerializeTo (Buffer::Iterator start) const
{
start.Prev (N);
start.WriteU8 (N, N);
}
template <int N>
@ -1242,7 +1245,6 @@ PacketHistoryTest::RunTests (void)
p.RemoveAtStart (8+10+8);
CHECK_HISTORY (p, 1, 8);
p = Packet (10);
ADD_HEADER (p, 10);
ADD_HEADER (p, 8);
@ -1253,6 +1255,17 @@ PacketHistoryTest::RunTests (void)
p.RemoveAtEnd (12);
CHECK_HISTORY (p, 5, 3, 10, 10, 6, 4);
p = Packet (10);
ADD_HEADER (p, 10);
ADD_TRAILER (p, 6);
p.RemoveAtEnd (18);
ADD_TRAILER (p, 5);
ADD_HEADER (p, 3);
CHECK_HISTORY (p, 3, 3, 8, 5);
p.RemoveAtStart (12);
CHECK_HISTORY (p, 1, 4);
return ok;
}