1.1 --- a/src/common/packet.cc	Tue Jun 02 16:23:39 2009 +0200
     1.2 +++ b/src/common/packet.cc	Tue Jun 02 16:37:41 2009 +0200
     1.3 @@ -178,8 +178,8 @@
     1.4  void
     1.5  Packet::AddHeader (const Header &header)
     1.6  {
     1.7 -  NS_LOG_FUNCTION (this << &header);
     1.8    uint32_t size = header.GetSerializedSize ();
     1.9 +  NS_LOG_FUNCTION (this << header.GetInstanceTypeId ().GetName () << size);
    1.10    uint32_t orgStart = m_buffer.GetCurrentStartOffset ();
    1.11    bool resized = m_buffer.AddAtStart (size);
    1.12    if (resized)
    1.13 @@ -193,8 +193,8 @@
    1.14  uint32_t
    1.15  Packet::RemoveHeader (Header &header)
    1.16  {
    1.17 -  NS_LOG_FUNCTION (this << &header);
    1.18    uint32_t deserialized = header.Deserialize (m_buffer.Begin ());
    1.19 +  NS_LOG_FUNCTION (this << header.GetInstanceTypeId ().GetName () << deserialized);
    1.20    m_buffer.RemoveAtStart (deserialized);
    1.21    m_metadata.RemoveHeader (header, deserialized);
    1.22    return deserialized;
    1.23 @@ -202,15 +202,15 @@
    1.24  uint32_t
    1.25  Packet::PeekHeader (Header &header) const
    1.26  {
    1.27 -  NS_LOG_FUNCTION (this << &header);
    1.28    uint32_t deserialized = header.Deserialize (m_buffer.Begin ());
    1.29 +  NS_LOG_FUNCTION (this << header.GetInstanceTypeId ().GetName () << deserialized);
    1.30    return deserialized;
    1.31  }
    1.32  void
    1.33  Packet::AddTrailer (const Trailer &trailer)
    1.34  {
    1.35 -  NS_LOG_FUNCTION (this << &trailer);
    1.36    uint32_t size = trailer.GetSerializedSize ();
    1.37 +  NS_LOG_FUNCTION (this << trailer.GetInstanceTypeId ().GetName () << size);
    1.38    uint32_t orgStart = m_buffer.GetCurrentStartOffset ();
    1.39    bool resized = m_buffer.AddAtEnd (size);
    1.40    if (resized)
    1.41 @@ -225,8 +225,8 @@
    1.42  uint32_t
    1.43  Packet::RemoveTrailer (Trailer &trailer)
    1.44  {
    1.45 -  NS_LOG_FUNCTION (this << &trailer);
    1.46    uint32_t deserialized = trailer.Deserialize (m_buffer.End ());
    1.47 +  NS_LOG_FUNCTION (this << trailer.GetInstanceTypeId ().GetName () << deserialized);
    1.48    m_buffer.RemoveAtEnd (deserialized);
    1.49    m_metadata.RemoveTrailer (trailer, deserialized);
    1.50    return deserialized;
    1.51 @@ -234,15 +234,15 @@
    1.52  uint32_t
    1.53  Packet::PeekTrailer (Trailer &trailer)
    1.54  {
    1.55 -  NS_LOG_FUNCTION (this << &trailer);
    1.56    uint32_t deserialized = trailer.Deserialize (m_buffer.End ());
    1.57 +  NS_LOG_FUNCTION (this << trailer.GetInstanceTypeId ().GetName () << deserialized);
    1.58    return deserialized;
    1.59  }
    1.60  
    1.61  void 
    1.62  Packet::AddAtEnd (Ptr<const Packet> packet)
    1.63  {
    1.64 -  NS_LOG_FUNCTION (this << packet);
    1.65 +  NS_LOG_FUNCTION (this << packet << packet->GetSize ());
    1.66    uint32_t aStart = m_buffer.GetCurrentStartOffset ();
    1.67    uint32_t bEnd = packet->m_buffer.GetCurrentEndOffset ();
    1.68    m_buffer.AddAtEnd (packet->m_buffer);
    1.69 @@ -540,7 +540,7 @@
    1.70  void 
    1.71  Packet::AddTag (const Tag &tag) const
    1.72  {
    1.73 -  NS_LOG_FUNCTION (this << &tag);
    1.74 +  NS_LOG_FUNCTION (this << tag.GetInstanceTypeId ().GetName () << tag.GetSerializedSize ());
    1.75    TagList *list = const_cast<TagList *> (&m_tagList);
    1.76    TagBuffer buffer = list->Add (tag.GetInstanceTypeId (), tag.GetSerializedSize (), 
    1.77                                   m_buffer.GetCurrentStartOffset (),