Attachment #109 for bug #131

View | Details | Raw Unified | Return to bug 131
Collapse All | Expand All

(-)a/src/internet-node/tcp-socket.cc (-5 / +7 lines)

Lines 752-762 bool TcpSocket::SendPendingData (bool wi	Link Here

752

      m_tcp->SendPacket (p, header,

752

      m_tcp->SendPacket (p, header,

753

                         m_endPoint->GetLocalAddress (),

753

                         m_endPoint->GetLocalAddress (),

754

                         m_defaultAddress);

754

                         m_defaultAddress);

755

      m_rtt->SentSeq(m_nextTxSequence, sz);           // notify the RTT

755

      m_rtt->SentSeq(m_nextTxSequence, sz);       // notify the RTT

756

      NotifyDataSent (p->GetSize () );                // notify the application

756

      // Notify the application

757

      nPacketsSent++;                                 // Count sent this loop

757

      Simulator::ScheduleNow(&TcpSocket::NotifyDataSent, this, p->GetSize ());

758

      m_nextTxSequence += sz;                         // Advance next tx sequence

758

      nPacketsSent++;                             // Count sent this loop

759

      m_highTxMark = std::max (m_nextTxSequence, m_highTxMark);// Note the high water mark

759

      m_nextTxSequence += sz;                     // Advance next tx sequence

760

      // Note the high water mark

761

      m_highTxMark = std::max (m_nextTxSequence, m_highTxMark);

760

762

761

  NS_LOG_LOGIC ("Sent "<<nPacketsSent<<" packets");

763

  NS_LOG_LOGIC ("Sent "<<nPacketsSent<<" packets");

762

  NS_LOG_LOGIC("RETURN SendPendingData");

764

  NS_LOG_LOGIC("RETURN SendPendingData");

(-)a/src/node/socket.cc (-2 / +20 lines)

Lines 64-74 Socket::SetAcceptCallback (	Link Here

  m_closeRequested = closeRequested;

  m_closeRequested = closeRequested;

void

bool

Socket::SetSendCallback (Callback<void, Ptr<Socket>, uint32_t> dataSent)

Socket::SetDataSentCallback (Callback<void, Ptr<Socket>, uint32_t> dataSent)

  NS_LOG_FUNCTION;

  NS_LOG_FUNCTION;

  m_dataSent = dataSent;

  m_dataSent = dataSent;

  return true;

void

Socket::SetSendCallback (Callback<void, Ptr<Socket> > sendCb)

  NS_LOG_FUNCTION;

  m_sendCb = sendCb;

void

void

Lines 200-205 Socket::NotifyDataSent (uint32_t size)	Link Here

200

208

201

209

202

void

210

void

211

Socket::NotifySend (void)

212

213

  NS_LOG_FUNCTION;

214

  if (!m_sendCb.IsNull ())

215

216

      m_sendCb (this);

217

218

219

220

void

203

Socket::NotifyDataReceived (Ptr<Packet> p, const Address &from)

221

Socket::NotifyDataReceived (Ptr<Packet> p, const Address &from)

204

222

205

  NS_LOG_FUNCTION;

223

  NS_LOG_FUNCTION;




                          Callback<void, Ptr<Socket>, 
                            const Address&> newConnectionCreated,
                          Callback<void, Ptr<Socket> > closeRequested);
  /**
   * \brief Notify application when a packet has been sent from transport 
   *        protocol (non-standard socket call)
   * \param dataSent Callback for the event that data is sent from the
   *        underlying transport protocol.  This callback is passed a
   *        pointer to the socket, and the number of bytes sent.
   *        
   * \returns whether or not this socket supports this callback.  Note 
   *        that this is a non-standard socket call.  Some socket 
   *        implementations in ns-3 may not support this call, so the
   *        user should check this return value to confirm that the
   *        callback is supported.
   */
  virtual bool SetDataSentCallback (Callback<void, Ptr<Socket>, uint32_t> dataSent);
  /**
   * \brief Notify application when a previously blocked socket (blocked
   *        for writing) has unblocked and has space available
   * \param sendCb Callback for the event that the socket becomes
   *        unblocked for sending
   */
  void SetSendCallback (Callback<void, Ptr<Socket> > sendCb);
  /**
   * \brief Receive data
   * \param receivedData Invoked whenever new data is received.

  void NotifyNewConnectionCreated (Ptr<Socket> socket, const Address &from);
  void NotifyCloseRequested (void);
  void NotifyDataSent (uint32_t size);
  void NotifySend (void);
  void NotifyDataReceived (Ptr<Packet> p, const Address &from);

  Callback<void,Ptr<Socket> >    m_closeCompleted;

  Callback<bool, Ptr<Socket>, const Address &>   m_connectionRequest;
  Callback<void, Ptr<Socket>, const Address&>    m_newConnectionCreated;
  Callback<void, Ptr<Socket>, uint32_t>          m_dataSent;
  Callback<void, Ptr<Socket> >   m_sendCb;
  Callback<void, Ptr<Socket>, Ptr<Packet>,const Address&> m_receivedData;
};


Return to bug 131