1.1 --- a/src/internet-node/tcp-socket.cc	Wed Apr 16 10:52:26 2008 -0700
     1.2 +++ b/src/internet-node/tcp-socket.cc	Wed Apr 16 10:52:38 2008 -0700
     1.3 @@ -695,6 +695,7 @@
     1.4        // TCP SYN consumes one byte
     1.5        m_nextRxSequence = tcpHeader.GetSequenceNumber() + SequenceNumber(1);
     1.6        m_nextTxSequence = tcpHeader.GetAckNumber ();
     1.7 +      m_firstPendingSequence = m_nextTxSequence;  //bug 166
     1.8        NS_LOG_DEBUG ("TcpSocket " << this << " ACK_TX_1" <<
     1.9                      " nextRxSeq " << m_nextRxSequence);
    1.10        SendEmptyPacket (TcpHeader::ACK);

     2.1 --- a/src/node/address.cc	Wed Apr 16 10:52:26 2008 -0700
     2.2 +++ b/src/node/address.cc	Wed Apr 16 10:52:38 2008 -0700
     2.3 @@ -111,9 +111,10 @@
     2.4  
     2.5  bool operator == (const Address &a, const Address &b)
     2.6  {
     2.7 -  NS_ASSERT (a.m_type == b.m_type || 
     2.8 -	     a.m_type == 0 || 
     2.9 -	     b.m_type == 0);
    2.10 +  if (a.m_type != b.m_type)
    2.11 +    {
    2.12 +      return false;
    2.13 +    }
    2.14    NS_ASSERT (a.GetLength() == b.GetLength());  
    2.15    return memcmp (a.m_data, b.m_data, a.m_len) == 0;
    2.16  }