--- a/src/internet-stack/nsc-tcp-socket-impl.cc	Mon Jun 08 16:45:13 2009 +0200
+++ b/src/internet-stack/nsc-tcp-socket-impl.cc	Tue Jun 09 09:06:04 2009 +0200
@@ -448,7 +448,7 @@
     {
       SocketAddressTag tag;
       bool found;
-      found = packet->FindFirstMatchingTag (tag);
+      found = packet->FindFirstMatchingByteTag (tag);
       NS_ASSERT (found);
       fromAddress = tag.GetAddress ();
     }
@@ -600,7 +600,7 @@
   SocketAddressTag tag;
 
   tag.SetAddress (m_peerAddress);
-  p->AddTag (tag);
+  p->AddByteTag (tag);
   m_deliveryQueue.push (p);
   m_rxAvailable += p->GetSize ();