merge with HEAD
authorMathieu Lacage <mathieu.lacage@sophia.inria.fr>
Wed Jun 04 16:59:58 2008 -0700 (20 months ago)
changeset 32311fcae004ca01
parent 3230 e59680767a04
parent 3229 ec45f705b9ca
child 3232 de35ec84811a
merge with HEAD
     1.1 --- a/src/internet-node/tcp-socket-impl.cc	Wed Jun 04 16:59:41 2008 -0700
     1.2 +++ b/src/internet-node/tcp-socket-impl.cc	Wed Jun 04 16:59:58 2008 -0700
     1.3 @@ -126,7 +126,8 @@
     1.4      m_cnTimeout (sock.m_cnTimeout),
     1.5      m_cnCount (sock.m_cnCount),
     1.6      m_rxAvailable (0),
     1.7 -    m_wouldBlock (false) 
     1.8 +    m_wouldBlock (false),
     1.9 +    m_sndBufSize (sock.m_sndBufSize)
    1.10  {
    1.11    NS_LOG_FUNCTION_NOARGS ();
    1.12    NS_LOG_LOGIC("Invoked the copy constructor");