--- a/src/common/packet.cc Wed Nov 01 13:00:34 2006 +0100
+++ b/src/common/packet.cc Wed Nov 01 13:11:30 2006 +0100
@@ -1,4 +1,4 @@
-/* -*- Mode:NS3; -*- */
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
* Copyright (c) 2005,2006 INRIA
* All rights reserved.
@@ -26,135 +26,135 @@
uint32_t Packet::m_global_uid = 0;
Packet::Packet ()
- : m_buffer (),
- m_uid (m_global_uid)
+ : m_buffer (),
+ m_uid (m_global_uid)
{
- m_global_uid++;
+ m_global_uid++;
}
Packet::Packet (uint32_t size)
- : m_buffer (size),
- m_uid (m_global_uid)
+ : m_buffer (size),
+ m_uid (m_global_uid)
{
- m_global_uid++;
+ m_global_uid++;
}
Packet::Packet (Buffer buffer, Tags tags, uint32_t uid)
- : m_buffer (buffer),
- m_tags (tags),
- m_uid (uid)
+ : m_buffer (buffer),
+ m_tags (tags),
+ m_uid (uid)
{}
Packet
Packet::CreateFragment (uint32_t start, uint32_t length) const
{
- Buffer tmp = m_buffer.CreateFragment (start, length);
- return Packet (tmp, m_tags, m_uid);
+ Buffer tmp = m_buffer.CreateFragment (start, length);
+ return Packet (tmp, m_tags, m_uid);
}
uint32_t
Packet::GetSize (void) const
{
- return m_buffer.GetSize ();
+ return m_buffer.GetSize ();
}
void
Packet::Add (Header const &header)
{
- m_buffer.AddAtStart (header.GetSize ());
- header.Serialize (m_buffer.Begin ());
+ m_buffer.AddAtStart (header.GetSize ());
+ header.Serialize (m_buffer.Begin ());
}
void
Packet::Peek (Header &header)
{
- header.Deserialize (m_buffer.Begin ());
+ header.Deserialize (m_buffer.Begin ());
}
void
Packet::Remove (Header const &header)
{
- assert (header.IsDeserialized ());
- m_buffer.RemoveAtStart (header.GetSize ());
+ assert (header.IsDeserialized ());
+ m_buffer.RemoveAtStart (header.GetSize ());
}
void
Packet::Add (Trailer const &trailer)
{
- m_buffer.AddAtEnd (trailer.GetSize ());
- Buffer::Iterator start = m_buffer.End ();
- start.Prev (trailer.GetSize ());
- trailer.Serialize (start);
+ m_buffer.AddAtEnd (trailer.GetSize ());
+ Buffer::Iterator start = m_buffer.End ();
+ start.Prev (trailer.GetSize ());
+ trailer.Serialize (start);
}
void
Packet::Peek (Trailer &trailer)
{
- Buffer::Iterator start = m_buffer.End ();
- start.Prev (trailer.GetSize ());
- trailer.Deserialize (start);
+ Buffer::Iterator start = m_buffer.End ();
+ start.Prev (trailer.GetSize ());
+ trailer.Deserialize (start);
}
void
Packet::Remove (Trailer const &trailer)
{
- assert (trailer.IsDeserialized ());
- m_buffer.RemoveAtEnd (trailer.GetSize ());
+ assert (trailer.IsDeserialized ());
+ m_buffer.RemoveAtEnd (trailer.GetSize ());
}
void
Packet::AddAtEnd (Packet packet)
{
- Buffer src = packet.m_buffer;
- m_buffer.AddAtEnd (src.GetSize ());
- Buffer::Iterator destStart = m_buffer.End ();
- destStart.Prev (src.GetSize ());
- destStart.Write (src.Begin (), src.End ());
- /**
- * XXX: we might need to merge the tag list of the
- * other packet into the current packet.
- */
+ Buffer src = packet.m_buffer;
+ m_buffer.AddAtEnd (src.GetSize ());
+ Buffer::Iterator destStart = m_buffer.End ();
+ destStart.Prev (src.GetSize ());
+ destStart.Write (src.Begin (), src.End ());
+ /**
+ * XXX: we might need to merge the tag list of the
+ * other packet into the current packet.
+ */
}
void
Packet::AddAtEnd (Packet packet, uint32_t start, uint32_t size)
{
- assert (packet.GetSize () <= start + size);
- Buffer src = packet.m_buffer;
- m_buffer.AddAtEnd (src.GetSize ());
- Buffer::Iterator destStart = m_buffer.End ();
- destStart.Prev (size);
- Buffer::Iterator srcStart = src.Begin ();
- srcStart.Next (start);
- Buffer::Iterator srcEnd = srcStart;
- srcEnd.Next (size);
- destStart.Write (srcStart, srcEnd);
- /**
- * XXX: we might need to merge the tag list of the
- * other packet into the current packet.
- */
+ assert (packet.GetSize () <= start + size);
+ Buffer src = packet.m_buffer;
+ m_buffer.AddAtEnd (src.GetSize ());
+ Buffer::Iterator destStart = m_buffer.End ();
+ destStart.Prev (size);
+ Buffer::Iterator srcStart = src.Begin ();
+ srcStart.Next (start);
+ Buffer::Iterator srcEnd = srcStart;
+ srcEnd.Next (size);
+ destStart.Write (srcStart, srcEnd);
+ /**
+ * XXX: we might need to merge the tag list of the
+ * other packet into the current packet.
+ */
}
void
Packet::RemoveAtEnd (uint32_t size)
{
- m_buffer.RemoveAtEnd (size);
+ m_buffer.RemoveAtEnd (size);
}
void
Packet::RemoveAtStart (uint32_t size)
{
- m_buffer.RemoveAtStart (size);
+ m_buffer.RemoveAtStart (size);
}
void
Packet::RemoveAllTags (void)
{
- m_tags.RemoveAll ();
+ m_tags.RemoveAll ();
}
uint8_t const *
Packet::PeekData (void) const
{
- return m_buffer.PeekData ();
+ return m_buffer.PeekData ();
}
uint32_t
Packet::GetUid (void) const
{
- return m_uid;
+ return m_uid;
}
}; // namespace ns3