diff --git a/src/common/buffer.cc b/src/common/buffer.cc
index 5c5bc3bb5..e75156fed 100644
--- a/src/common/buffer.cc
+++ b/src/common/buffer.cc
@@ -236,6 +236,7 @@ Buffer::CheckInternalState (void) const
 void
 Buffer::Initialize (uint32_t zeroSize)
 {
+  NS_LOG_FUNCTION (this << zeroSize);
   m_data = Buffer::Create (0);
 #ifdef BUFFER_HEURISTICS
   m_start = std::min (m_data->m_size, g_recommendedStart);
@@ -336,6 +337,7 @@ Buffer::GetInternalEnd (void) const
 bool
 Buffer::AddAtStart (uint32_t start)
 {
+  NS_LOG_FUNCTION (this << start);
   bool dirty;
   NS_ASSERT (CheckInternalState ());
   bool isDirty = m_data->m_count > 1 && m_start > m_data->m_dirtyStart;
@@ -385,6 +387,7 @@ Buffer::AddAtStart (uint32_t start)
 bool
 Buffer::AddAtEnd (uint32_t end)
 {
+  NS_LOG_FUNCTION (this << end);
   bool dirty;
   NS_ASSERT (CheckInternalState ());
   bool isDirty = m_data->m_count > 1 && m_end < m_data->m_dirtyEnd;
@@ -438,6 +441,7 @@ Buffer::AddAtEnd (uint32_t end)
 void
 Buffer::AddAtEnd (const Buffer &o)
 {
+  NS_LOG_FUNCTION (this << &o);
   if (m_data->m_count == 1 &&
       m_end == m_zeroAreaEnd &&
       m_end == m_data->m_dirtyEnd &&
@@ -460,6 +464,7 @@ Buffer::AddAtEnd (const Buffer &o)
       Buffer::Iterator src = o.End ();
       src.Prev (endData);
       dst.Write (src, o.End ());
+      NS_ASSERT (CheckInternalState ());
       return;
     }
 
@@ -471,11 +476,13 @@ Buffer::AddAtEnd (const Buffer &o)
   destStart.Prev (src.GetSize ());
   destStart.Write (src.Begin (), src.End ());
   *this = dst;
+  NS_ASSERT (CheckInternalState ());
 }
 
 void 
 Buffer::RemoveAtStart (uint32_t start)
 {
+  NS_LOG_FUNCTION (this << start);
   NS_ASSERT (CheckInternalState ());
   uint32_t newStart = m_start + start;
   if (newStart <= m_zeroAreaStart)
@@ -520,6 +527,7 @@ Buffer::RemoveAtStart (uint32_t start)
 void 
 Buffer::RemoveAtEnd (uint32_t end)
 {
+  NS_LOG_FUNCTION (this << end);
   NS_ASSERT (CheckInternalState ());
   uint32_t newEnd = m_end - std::min (end, m_end - m_start);
   if (newEnd > m_zeroAreaEnd)
@@ -555,6 +563,7 @@ Buffer::RemoveAtEnd (uint32_t end)
 Buffer 
 Buffer::CreateFragment (uint32_t start, uint32_t length) const
 {
+  NS_LOG_FUNCTION (this << start << length);
   NS_ASSERT (CheckInternalState ());
   Buffer tmp = *this;
   tmp.RemoveAtStart (start);
@@ -566,6 +575,7 @@ Buffer::CreateFragment (uint32_t start, uint32_t length) const
 Buffer 
 Buffer::CreateFullCopy (void) const
 {
+  NS_LOG_FUNCTION (this);
   NS_ASSERT (CheckInternalState ());
   if (m_zeroAreaEnd - m_zeroAreaStart != 0) 
     {
@@ -580,6 +590,7 @@ Buffer::CreateFullCopy (void) const
       Buffer::Iterator i = tmp.End ();
       i.Prev (dataEnd);
       i.Write (m_data->m_data+m_zeroAreaStart,dataEnd);
+      NS_ASSERT (tmp.CheckInternalState ());
       return tmp;
     }
   NS_ASSERT (CheckInternalState ());
diff --git a/src/common/packet.cc b/src/common/packet.cc
index a79ac2a7e..9244689dd 100644
--- a/src/common/packet.cc
+++ b/src/common/packet.cc
@@ -19,6 +19,9 @@
  */
 #include "packet.h"
 #include "ns3/assert.h"
+#include "ns3/log.h"
+
+NS_LOG_COMPONENT_DEFINE ("Packet");
 
 namespace ns3 {
 
@@ -156,6 +159,7 @@ Packet::Packet (const Buffer &buffer,  const TagList &tagList, const PacketMetad
 Ptr<Packet>
 Packet::CreateFragment (uint32_t start, uint32_t length) const
 {
+  NS_LOG_FUNCTION (this << start << length);
   Buffer buffer = m_buffer.CreateFragment (start, length);
   NS_ASSERT (m_buffer.GetSize () >= start + length);
   uint32_t end = m_buffer.GetSize () - (start + length);
@@ -174,6 +178,7 @@ Packet::GetSize (void) const
 void
 Packet::AddHeader (const Header &header)
 {
+  NS_LOG_FUNCTION (this << &header);
   uint32_t size = header.GetSerializedSize ();
   uint32_t orgStart = m_buffer.GetCurrentStartOffset ();
   bool resized = m_buffer.AddAtStart (size);
@@ -188,6 +193,7 @@ Packet::AddHeader (const Header &header)
 uint32_t
 Packet::RemoveHeader (Header &header)
 {
+  NS_LOG_FUNCTION (this << &header);
   uint32_t deserialized = header.Deserialize (m_buffer.Begin ());
   m_buffer.RemoveAtStart (deserialized);
   m_metadata.RemoveHeader (header, deserialized);
@@ -196,6 +202,7 @@ Packet::RemoveHeader (Header &header)
 void
 Packet::AddTrailer (const Trailer &trailer)
 {
+  NS_LOG_FUNCTION (this << &trailer);
   uint32_t size = trailer.GetSerializedSize ();
   uint32_t orgEnd = m_buffer.GetCurrentEndOffset ();
   bool resized = m_buffer.AddAtEnd (size);
@@ -211,6 +218,7 @@ Packet::AddTrailer (const Trailer &trailer)
 uint32_t
 Packet::RemoveTrailer (Trailer &trailer)
 {
+  NS_LOG_FUNCTION (this << &trailer);
   uint32_t deserialized = trailer.Deserialize (m_buffer.End ());
   m_buffer.RemoveAtEnd (deserialized);
   m_metadata.RemoveTrailer (trailer, deserialized);
@@ -220,6 +228,7 @@ Packet::RemoveTrailer (Trailer &trailer)
 void 
 Packet::AddAtEnd (Ptr<const Packet> packet)
 {
+  NS_LOG_FUNCTION (this << packet);
   uint32_t aStart = m_buffer.GetCurrentStartOffset ();
   uint32_t bEnd = packet->m_buffer.GetCurrentEndOffset ();
   m_buffer.AddAtEnd (packet->m_buffer);
@@ -235,6 +244,7 @@ Packet::AddAtEnd (Ptr<const Packet> packet)
 void
 Packet::AddPaddingAtEnd (uint32_t size)
 {
+  NS_LOG_FUNCTION (this << size);
   uint32_t orgEnd = m_buffer.GetCurrentEndOffset ();
   bool resized = m_buffer.AddAtEnd (size);
   if (resized)
@@ -247,12 +257,14 @@ Packet::AddPaddingAtEnd (uint32_t size)
 void 
 Packet::RemoveAtEnd (uint32_t size)
 {
+  NS_LOG_FUNCTION (this << size);
   m_buffer.RemoveAtEnd (size);
   m_metadata.RemoveAtEnd (size);
 }
 void 
 Packet::RemoveAtStart (uint32_t size)
 {
+  NS_LOG_FUNCTION (this << size);
   m_buffer.RemoveAtStart (size);
   m_metadata.RemoveAtStart (size);
 }
@@ -260,6 +272,7 @@ Packet::RemoveAtStart (uint32_t size)
 void 
 Packet::RemoveAllTags (void)
 {
+  NS_LOG_FUNCTION (this);
   m_tagList.RemoveAll ();
 }
 
@@ -408,12 +421,14 @@ Packet::BeginItem (void) const
 void
 Packet::EnableMetadata (void)
 {
+  NS_LOG_FUNCTION_NOARGS ();
   PacketMetadata::Enable ();
 }
 
 Buffer 
 Packet::Serialize (void) const
 {
+  NS_LOG_FUNCTION (this);
   Buffer buffer;
   uint32_t reserve;
 
@@ -441,6 +456,7 @@ Packet::Serialize (void) const
 void 
 Packet::Deserialize (Buffer buffer)
 {
+  NS_LOG_FUNCTION (this);
   Buffer buf = buffer;
   // read size
   uint32_t packetSize = buf.Begin ().ReadU32 ();
@@ -466,6 +482,7 @@ Packet::Deserialize (Buffer buffer)
 void 
 Packet::AddTag (const Tag &tag) const
 {
+  NS_LOG_FUNCTION (this << &tag);
   TagList *list = const_cast<TagList *> (&m_tagList);
   TagBuffer buffer = list->Add (tag.GetInstanceTypeId (), tag.GetSerializedSize (), 
                                  m_buffer.GetCurrentStartOffset (),