merge
authorMathieu Lacage <mathieu.lacage@sophia.inria.fr>
Tue Jun 09 09:06:04 2009 +0200 (8 months ago)
changeset 4537092556b2c176
parent 4536 981e2f0b696b
parent 4531 c03a34ba9e4e
child 4538 b8bdc36a3355
merge
     1.1 --- a/src/internet-stack/nsc-tcp-socket-impl.cc	Mon Jun 08 16:45:13 2009 +0200
     1.2 +++ b/src/internet-stack/nsc-tcp-socket-impl.cc	Tue Jun 09 09:06:04 2009 +0200
     1.3 @@ -448,7 +448,7 @@
     1.4      {
     1.5        SocketAddressTag tag;
     1.6        bool found;
     1.7 -      found = packet->FindFirstMatchingTag (tag);
     1.8 +      found = packet->FindFirstMatchingByteTag (tag);
     1.9        NS_ASSERT (found);
    1.10        fromAddress = tag.GetAddress ();
    1.11      }
    1.12 @@ -600,7 +600,7 @@
    1.13    SocketAddressTag tag;
    1.14  
    1.15    tag.SetAddress (m_peerAddress);
    1.16 -  p->AddTag (tag);
    1.17 +  p->AddByteTag (tag);
    1.18    m_deliveryQueue.push (p);
    1.19    m_rxAvailable += p->GetSize ();
    1.20