Attachment #168 for bug #205

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

(-)a/examples/tcp-large-transfer.cc (-3 / +2 lines)

Lines 87-93 int main (int argc, char *argv[])	Link Here

  // Users may find it convenient to turn on explicit debugging

  // Users may find it convenient to turn on explicit debugging

  // for selected modules; the below lines suggest how to do this

  // for selected modules; the below lines suggest how to do this

  //  LogComponentEnable("TcpL4Protocol", LOG_LEVEL_ALL);

  //  LogComponentEnable("TcpL4Protocol", LOG_LEVEL_ALL);

  //  LogComponentEnable("TcpSocket", LOG_LEVEL_ALL);

  //  LogComponentEnable("TcpSocketImpl", LOG_LEVEL_ALL);

  //  LogComponentEnable("PacketSink", LOG_LEVEL_ALL);

  //  LogComponentEnable("PacketSink", LOG_LEVEL_ALL);

  //  LogComponentEnable("TcpLargeTransfer", LOG_LEVEL_ALL);

  //  LogComponentEnable("TcpLargeTransfer", LOG_LEVEL_ALL);

Lines 182-189 void StartFlow(Ptr<Socket> localSocket,	Link Here

182

 // NS_LOG_LOGIC("Starting flow at time " <<  Simulator::Now ().GetSeconds ());

182

 // NS_LOG_LOGIC("Starting flow at time " <<  Simulator::Now ().GetSeconds ());

183

  localSocket->Connect (InetSocketAddress (servAddress, servPort));//connect

183

  localSocket->Connect (InetSocketAddress (servAddress, servPort));//connect

184

  localSocket->SetConnectCallback (MakeCallback (&CloseConnection),

184

  localSocket->SetConnectCallback (MakeCallback (&CloseConnection),

185

                                   Callback<void, Ptr<Socket> > (),

185

                                   Callback<void, Ptr<Socket> > ());

186

                                       Callback<void, Ptr<Socket> > ());

187

  //we want to close as soon as the connection is established

186

  //we want to close as soon as the connection is established

188

  //the tcp state machine and outgoing buffer will assure that

187

  //the tcp state machine and outgoing buffer will assure that

189

  //all of the data is delivered

188

  //all of the data is delivered

(-)a/src/applications/packet-sink/packet-sink.cc (-7 / +5 lines)

Lines 67-72 void	Link Here

void

void

PacketSink::DoDispose (void)

PacketSink::DoDispose (void)

  if (m_socket != 0)

      m_socket->Close ();

  m_socket = 0;

  m_socket = 0;

  // chain up

  // chain up

Lines 88-95 void PacketSink::StartApplication() /	Link Here

  m_socket->SetRecvCallback (MakeCallback(&PacketSink::HandleRead, this));

  m_socket->SetRecvCallback (MakeCallback(&PacketSink::HandleRead, this));

  m_socket->SetAcceptCallback (

  m_socket->SetAcceptCallback (

            MakeNullCallback<bool, Ptr<Socket>, const Address &> (),

            MakeNullCallback<bool, Ptr<Socket>, const Address &> (),

            MakeNullCallback<void, Ptr<Socket>, const Address&> (),

            MakeNullCallback<void, Ptr<Socket>, const Address&> ());

            MakeCallback(&PacketSink::CloseConnection, this) );

void PacketSink::StopApplication()     // Called at time specified by Stop

void PacketSink::StopApplication()     // Called at time specified by Stop

Lines 117-125 void PacketSink::HandleRead (Ptr<Socket>	Link Here

117

120

118

121

119

122

120

void PacketSink::CloseConnection (Ptr<Socket> socket)

121

122

  socket->Close ();

123

124

125

} // Namespace ns3

123

} // Namespace ns3

(-)a/src/applications/packet-sink/packet-sink.h (-3 / +1 lines)

Lines 80-88 private:	Link Here

  virtual void StartApplication (void);    // Called at time specified by Start

  virtual void StartApplication (void);    // Called at time specified by Start

  virtual void StopApplication (void);     // Called at time specified by Stop

  virtual void StopApplication (void);     // Called at time specified by Stop

  virtual void HandleRead (Ptr<Socket> socket);

  void HandleRead (Ptr<Socket> socket);

  virtual void CloseConnection (Ptr<Socket> socket);

  Ptr<Socket>     m_socket;       // Associated socket

  Ptr<Socket>     m_socket;       // Associated socket

  Address         m_local;        // Local address to bind to

  Address         m_local;        // Local address to bind to




      NS_LOG_LOGIC ("TcpSocketImpl " << this << " transition to CLOSED from " 
               << m_state << " event " << e << " closeNot " << m_closeNotified
               << " action " << stateAction.action);
      NotifyCloseCompleted ();
      m_closeNotified = true;
      NS_LOG_LOGIC ("TcpSocketImpl " << this << " calling Closed from PE"
              << " origState " << saveState

        {
          NS_LOG_LOGIC ("TCP " << this 
              << " calling AppCloseRequest");
          NotifyCloseRequested(); 
          m_closeRequestNotified = true;
        }
      NS_LOG_LOGIC ("TcpSocketImpl " << this 

    } 
  if (!m_pendingData)
    {
      if (m_state == FIN_WAIT_1)
        { // Must have lost FIN, re-send
          SendEmptyPacket (TcpHeader::FIN);
        }

(-)a/src/internet-stack/udp-socket-impl.cc (-1 lines)

Lines 199-205 UdpSocketImpl::Close(void)	Link Here

199

UdpSocketImpl::Close(void)

199

UdpSocketImpl::Close(void)

200

201

  NS_LOG_FUNCTION_NOARGS ();

201

  NS_LOG_FUNCTION_NOARGS ();

202

  NotifyCloseCompleted ();

203

  return 0;

202

  return 0;

204

203

205

204

(-)a/src/node/packet-socket.cc (-1 lines)

Lines 184-190 PacketSocket::Close(void)	Link Here

184

      return -1;

184

      return -1;

185

186

  m_state = STATE_CLOSED;

186

  m_state = STATE_CLOSED;

187

  NotifyCloseCompleted ();

188

  return 0;

187

  return 0;

189

188

190

189




}

void 
Socket::SetCloseCallback (Callback<void,Ptr<Socket> > closeCompleted)
{
  NS_LOG_FUNCTION_NOARGS ();
  m_closeCompleted = closeCompleted;
}

void 
Socket::SetConnectCallback (
  Callback<void, Ptr<Socket> > connectionSucceeded,
  Callback<void, Ptr<Socket> > connectionFailed)
  Callback<void, Ptr<Socket> > halfClose)
{
  NS_LOG_FUNCTION_NOARGS ();
  m_connectionSucceeded = connectionSucceeded;
  m_connectionFailed = connectionFailed;
  m_halfClose = halfClose;
}

void 
Socket::SetAcceptCallback (
  Callback<bool, Ptr<Socket>, const Address &> connectionRequest,
  Callback<void, Ptr<Socket>, const Address&> newConnectionCreated)
  Callback<void, Ptr<Socket> > closeRequested)
{
  NS_LOG_FUNCTION_NOARGS ();
  m_connectionRequest = connectionRequest;
  m_newConnectionCreated = newConnectionCreated;
  m_closeRequested = closeRequested;
}

bool 

  return Send (p, 0);
}

void
Socket::NotifyCloseUnblocks (void)
{
  NS_LOG_FUNCTION_NOARGS ();
  if (!m_closeUnblocks.IsNull ())
  {
    m_closeUnblocks (this);
  }
}

int Socket::Listen (uint32_t queueLimit)
{

  return p->GetSize ();
}

void 
Socket::NotifyCloseCompleted (void)
{
  NS_LOG_FUNCTION_NOARGS ();
  if (!m_closeCompleted.IsNull ())
    {
      m_closeCompleted (this);
    }
}

void 
Socket::NotifyConnectionSucceeded (void)

  if (!m_connectionFailed.IsNull ())
    {
      m_connectionFailed (this);
    }
}

void 
Socket::NotifyHalfClose (void)
{
  NS_LOG_FUNCTION_NOARGS ();
  if (!m_halfClose.IsNull ())
    {
      m_halfClose (this);
    }
}


}

void 
Socket::NotifyCloseRequested (void)
{
  NS_LOG_FUNCTION_NOARGS ();
  if (!m_closeRequested.IsNull ())
    {
      m_closeRequested (this);
    }
}

void 
Socket::NotifyDataSent (uint32_t size)
{
  NS_LOG_FUNCTION_NOARGS ();




   * \returns the node this socket is associated with.
   */
  virtual Ptr<Node> GetNode (void) const = 0;

  /**
   * \param closeCompleted Callback invoked when the close operation is
   *        completed.
   */
  void SetCloseCallback (Callback<void, Ptr<Socket> > closeCompleted);
  /**
   * \param connectionSucceeded this callback is invoked when the 
   *        connection request initiated by the user is successfully 

   *        connection request initiated by the user is unsuccessfully 
   *        completed. The callback is passed back a pointer to the 
   *        same socket object. 
   * \param halfClose XXX When exactly is this callback invoked? If 
   *        it invoked when the other side closes the connection ? 
   *        Or when I call Close ?
   */
  void SetConnectCallback (Callback<void, Ptr<Socket> > connectionSucceeded,
                           Callback<void,  Ptr<Socket> > connectionFailed);
                           Callback<void,  Ptr<Socket> > halfClose);
  /**
   * \brief Accept connection requests from remote hosts
   * \param connectionRequest Callback for connection request from peer. 

   *        back to the user through this callback. This user callback is 
   *        passed a pointer to the new socket, and the ip address and 
   *        port number of the connection originator.
   * \param closeRequested Callback for connection close request from peer.
   *        XXX: when is this callback invoked ?
   */
  void SetAcceptCallback (Callback<bool, Ptr<Socket>, 
                            const Address &> connectionRequest,
                          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)

                Address &fromAddress);
 
protected:
  void NotifyCloseUnblocks (void);
  void NotifyCloseCompleted (void);
  void NotifyConnectionSucceeded (void);
  void NotifyConnectionFailed (void);
  void NotifyHalfClose (void);
  bool NotifyConnectionRequest (const Address &from);
  void NotifyNewConnectionCreated (Ptr<Socket> socket, const Address &from);
  void NotifyCloseRequested (void);
  void NotifyDataSent (uint32_t size);
  void NotifySend (uint32_t spaceAvailable);
  void NotifyDataRecv (void);

  Callback<void, Ptr<Socket> >   m_closeUnblocks;
  Callback<void,Ptr<Socket> >    m_closeCompleted;
  Callback<void, Ptr<Socket> >   m_connectionSucceeded;
  Callback<void, Ptr<Socket> >   m_connectionFailed;
  Callback<void, Ptr<Socket> >   m_halfClose;
  Callback<void, Ptr<Socket> >   m_closeRequested;
  Callback<bool, Ptr<Socket>, const Address &>   m_connectionRequest;
  Callback<void, Ptr<Socket>, const Address&>    m_newConnectionCreated;
  Callback<void, Ptr<Socket>, uint32_t>          m_dataSent;

Return to bug 205