Attachment #1041 for bug #1072

View | Details | Raw Unified | Return to bug 1072
Collapse All | Expand All

(-)a/src/common/packet-metadata-test.cc (+9 lines)

Lines 774-779	Link Here

774

  CHECK_HISTORY (p, 1, 500);

774

  CHECK_HISTORY (p, 1, 500);

775

  p->RemoveAtStart (10);

775

  p->RemoveAtStart (10);

776

  CHECK_HISTORY (p, 1, 490);

776

  CHECK_HISTORY (p, 1, 490);

777

778

  p = Create<Packet> (500);

779

  ADD_HEADER (p, 10);

780

  ADD_HEADER (p, 20);

781

  ADD_HEADER (p, 5);

782

  CHECK_HISTORY (p, 4, 5, 20, 10, 500);

783

  p1 = p->CreateFragment (0,6);

784

  p2 = p->CreateFragment (6,535-6);

785

  p1->AddAtEnd(p2);

777

786

778

//-----------------------------------------------------------------------------

787

//-----------------------------------------------------------------------------

779

class PacketMetadataTestSuite : public TestSuite

788

class PacketMetadataTestSuite : public TestSuite




    }
}

bool
PacketMetadata::IsSharedPointerOk (uint16_t pointer) const
{
  bool ok = pointer == 0xffff || pointer <= m_data->m_size;
  return ok;
}
bool
PacketMetadata::IsPointerOk (uint16_t pointer) const
{
  bool ok = pointer == 0xffff || pointer <= m_used;
  return ok;
}

bool
PacketMetadata::IsStateOk (void) const
{
  bool ok = m_used <= m_data->m_size;
  ok &= IsPointerOk (m_head);
  ok &= IsPointerOk (m_tail);
  uint16_t current = m_head;
  while (ok && current != 0xffff)
    {
      struct PacketMetadata::SmallItem item;
      PacketMetadata::ExtraItem extraItem;
      ReadItems (current, &item, &extraItem);
      ok &= IsSharedPointerOk (item.next);
      ok &= IsSharedPointerOk (item.prev);
      if (current != m_head)
        {
          ok &= IsPointerOk (item.prev);
        }
      if (current != m_tail)
        {
          ok &= IsPointerOk (item.next);
        }
      if (current == m_tail)
        {
          break;
        }
      current = item.next;
    }
  return ok;
}

uint32_t 
PacketMetadata::GetUleb128Size (uint32_t value) const
{

      AppendValue (extraItem->fragmentEnd, buffer);
      buffer += fragEndSize;
      Append32 (extraItem->packetUid, buffer);
      m_used = std::max (m_used, (uint16_t)(buffer - &m_data->m_data[0]));
      //m_used = buffer - &m_data->m_data[0];
      m_data->m_dirtyEnd = m_used;
      return;
    }

                           struct PacketMetadata::ExtraItem *extraItem) const
{
  NS_LOG_FUNCTION (this << current);
  NS_ASSERT (current <= m_data->m_size);
  const uint8_t *buffer = &m_data->m_data[current];
  item->next = buffer[0];
  item->next |= (buffer[1]) << 8;

void 
PacketMetadata::AddHeader (const Header &header, uint32_t size)
{
  NS_ASSERT (IsStateOk ());
  uint32_t uid = header.GetInstanceTypeId ().GetUid () << 1;
  DoAddHeader (uid, size);
  NS_ASSERT (IsStateOk ());
}
void
PacketMetadata::DoAddHeader (uint32_t uid, uint32_t size)

{
  uint32_t uid = header.GetInstanceTypeId ().GetUid () << 1;
  NS_LOG_FUNCTION (this << uid << size);
  NS_ASSERT (IsStateOk ());
  if (!m_enable) 
    {
      m_metadataSkipped = true;

    {
      m_head = item.next;
    }
  NS_ASSERT (IsStateOk ());
}
void 
PacketMetadata::AddTrailer (const Trailer &trailer, uint32_t size)
{
  uint32_t uid = trailer.GetInstanceTypeId ().GetUid () << 1;
  NS_LOG_FUNCTION (this << uid << size);
  NS_ASSERT (IsStateOk ());
  if (!m_enable)
    {
      m_metadataSkipped = true;

  m_chunkUid++;
  uint16_t written = AddSmall (&item);
  UpdateTail (written);
  NS_ASSERT (IsStateOk ());
}
void 
PacketMetadata::RemoveTrailer (const Trailer &trailer, uint32_t size)
{
  uint32_t uid = trailer.GetInstanceTypeId ().GetUid () << 1;
  NS_LOG_FUNCTION (this << uid << size);
  NS_ASSERT (IsStateOk ());
  if (!m_enable) 
    {
      m_metadataSkipped = true;

    {
      m_tail = item.prev;
    }
  NS_ASSERT (IsStateOk ());
}
void
PacketMetadata::AddAtEnd (PacketMetadata const&o)
{
  NS_LOG_FUNCTION (this << &o);
  NS_ASSERT (IsStateOk ());
  if (!m_enable) 
    {
      m_metadataSkipped = true;

      // We have no items so 'AddAtEnd' is 
      // equivalent to self-assignment.
      *this = o;
      NS_ASSERT (IsStateOk ());
      return;
    }
  if (o.m_head == 0xffff)

        }
      current = item.next;
    }
  NS_ASSERT (IsStateOk ());
}
void
PacketMetadata::AddPaddingAtEnd (uint32_t end)

PacketMetadata::RemoveAtStart (uint32_t start)
{
  NS_LOG_FUNCTION (this << start);
  NS_ASSERT (IsStateOk ());
  if (!m_enable) 
    {
      m_metadataSkipped = true;

      current = item.next;
    }
  NS_ASSERT (leftToRemove == 0);
  NS_ASSERT (IsStateOk ());
}
void 
PacketMetadata::RemoveAtEnd (uint32_t end)
{
  NS_LOG_FUNCTION (this << end);
  NS_ASSERT (IsStateOk ());
  if (!m_enable) 
    {
      m_metadataSkipped = true;

      current = item.prev;
    }
  NS_ASSERT (leftToRemove == 0);
  NS_ASSERT (IsStateOk ());
}
uint32_t
PacketMetadata::GetTotalSize (void) const

(-)a/src/common/packet-metadata.h (+3 lines)

Lines 317-322	Link Here

317

                      struct PacketMetadata::SmallItem *item,

317

                      struct PacketMetadata::SmallItem *item,

318

                      struct PacketMetadata::ExtraItem *extraItem) const;

318

                      struct PacketMetadata::ExtraItem *extraItem) const;

319

  void DoAddHeader (uint32_t uid, uint32_t size);

319

  void DoAddHeader (uint32_t uid, uint32_t size);

320

  bool IsStateOk (void) const;

321

  bool IsPointerOk (uint16_t pointer) const;

322

  bool IsSharedPointerOk (uint16_t pointer) const;

320

323

321

324

322

  static struct PacketMetadata::Data *Create (uint32_t size);

325

  static struct PacketMetadata::Data *Create (uint32_t size);

Return to bug 1072