Attachment #2030 for bug #2106

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

(-)a/src/applications/model/bulk-send-application.cc (-25 / +37 lines)

Lines 109-114 BulkSendApplication::DoDispose (void)	Link Here

109

  Application::DoDispose ();

109

  Application::DoDispose ();

110

111

112

void

113

BulkSendApplication::SetSocket(Ptr<Socket> socket)

114

115

  m_socket = socket;

116

117

112

// Application Methods

118

// Application Methods

113

void BulkSendApplication::StartApplication (void) // Called at time specified by Start

119

void BulkSendApplication::StartApplication (void) // Called at time specified by Start

114

120

Lines 118-150 void BulkSendApplication::StartApplication (void) // Called at time specified by	Link Here

118

  if (!m_socket)

124

  if (!m_socket)

119

125

120

      m_socket = Socket::CreateSocket (GetNode (), m_tid);

126

      m_socket = Socket::CreateSocket (GetNode (), m_tid);

127

128

  // Fatal error if socket type is not NS3_SOCK_STREAM or NS3_SOCK_SEQPACKET

129

  if (m_socket->GetSocketType () != Socket::NS3_SOCK_STREAM &&

130

      m_socket->GetSocketType () != Socket::NS3_SOCK_SEQPACKET)

131

132

      NS_FATAL_ERROR ("Using BulkSend with an incompatible socket type. "

133

                      "BulkSend requires SOCK_STREAM or SOCK_SEQPACKET. "

134

                      "In other words, use TCP instead of UDP.");

135

121

136

122

      // Fatal error if socket type is not NS3_SOCK_STREAM or NS3_SOCK_SEQPACKET

137

  if (Inet6SocketAddress::IsMatchingType (m_peer))

123

      if (m_socket->GetSocketType () != Socket::NS3_SOCK_STREAM &&

138

124

          m_socket->GetSocketType () != Socket::NS3_SOCK_SEQPACKET)

139

      m_socket->Bind6 ();

125

140

126

          NS_FATAL_ERROR ("Using BulkSend with an incompatible socket type. "

141

  else if (InetSocketAddress::IsMatchingType (m_peer))

127

                          "BulkSend requires SOCK_STREAM or SOCK_SEQPACKET. "

142

128

                          "In other words, use TCP instead of UDP.");

143

      m_socket->Bind ();

129

144

130

145

131

      if (Inet6SocketAddress::IsMatchingType (m_peer))

146

  m_socket->Connect (m_peer);

132

147

  m_socket->ShutdownRecv ();

133

          m_socket->Bind6 ();

148

  m_socket->SetConnectCallback (

134

149

              MakeCallback (&BulkSendApplication::ConnectionSucceeded, this),

135

      else if (InetSocketAddress::IsMatchingType (m_peer))

150

              MakeCallback (&BulkSendApplication::ConnectionFailed, this));

136

151

  m_socket->SetSendCallback (

137

          m_socket->Bind ();

152

              MakeCallback (&BulkSendApplication::DataSend, this));

138

139

153

140

      m_socket->Connect (m_peer);

141

      m_socket->ShutdownRecv ();

142

      m_socket->SetConnectCallback (

143

        MakeCallback (&BulkSendApplication::ConnectionSucceeded, this),

144

        MakeCallback (&BulkSendApplication::ConnectionFailed, this));

145

      m_socket->SetSendCallback (

146

        MakeCallback (&BulkSendApplication::DataSend, this));

147

148

  if (m_connected)

154

  if (m_connected)

149

155

150

      SendData ();

156

      SendData ();

Lines 200-205 void BulkSendApplication::SendData (void)	Link Here

200

  // Check if time to close (all sent)

206

  // Check if time to close (all sent)

201

  if (m_totBytes == m_maxBytes && m_connected)

207

  if (m_totBytes == m_maxBytes && m_connected)

202

208

209

      if (! m_dataTransferred.IsNull ())

210

        m_dataTransferred (m_node);

211

203

      m_socket->Close ();

212

      m_socket->Close ();

204

      m_connected = false;

213

      m_connected = false;

205

214

Lines 229-234 void BulkSendApplication::DataSend (Ptr<Socket>, uint32_t)	Link Here

229

238

230

239

231

240

232

241

void BulkSendApplication::SetDataTransferredCallback (Callback<void, Ptr<Node> > dataTransferred)

242

243

  m_dataTransferred = dataTransferred;

244

233

245

234

} // Namespace ns3

246

} // Namespace ns3




  void SetMaxBytes (uint32_t maxBytes);

  /**
   * \brief Get the socket of this application
   *
   * \return pointer to the socket
   */
  Ptr<Socket> GetSocket (void) const;

  /**
   * \brief (Optional) Set the application socket
   *
   * The socket will be created by the application if this
   * method is not called.
   *
   * \param socket Socket pointer
   */
  void SetSocket (Ptr<Socket> socket);

  /**
   * \brief Set the callback to call when all data has been transmitted
   * \param cbDataTransferred Callback
   */
  void SetDataTransferredCallback (Callback<void, Ptr<Node> >
                                   cbDataTransferred);

protected:
  virtual void DoDispose (void);
private:

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

  Callback<void, Ptr<Node> > m_dataTransferred;  //!< callback to call when all
                                                 // data has been transmitted
  /**
   * \brief Send data until the L4 transmission buffer is full.
   */




  Application::DoDispose ();
}

void
OnOffApplication::SetSocket(Ptr<Socket> socket)
{
  m_socket = socket;
}

// Application Methods
void OnOffApplication::StartApplication () // Called at time specified by Start
{

  if (!m_socket)
    {
      m_socket = Socket::CreateSocket (GetNode (), m_tid);
    }
  if (Inet6SocketAddress::IsMatchingType (m_peer))
    {
      m_socket->Bind6 ();
    }
  else if (InetSocketAddress::IsMatchingType (m_peer) ||
           PacketSocketAddress::IsMatchingType (m_peer))
    {
      m_socket->Bind ();
    }
  m_socket->Connect (m_peer);
  m_socket->SetAllowBroadcast (true);
  m_socket->ShutdownRecv ();

  m_socket->SetConnectCallback (
        MakeCallback (&OnOffApplication::ConnectionSucceeded, this),
        MakeCallback (&OnOffApplication::ConnectionFailed, this));

  m_cbrRateFailSafe = m_cbrRate;

  // Insure no pending event

                   << " port " << Inet6SocketAddress::ConvertFrom (m_peer).GetPort ()
                   << " total Tx " << m_totBytes << " bytes");
    }

  m_lastStartTime = Simulator::Now ();
  m_residualBits = 0;
  ScheduleNextTx ();

(-)a/src/applications/model/onoff-application.h (+2 lines)

Lines 112-117 public:	Link Here

112

*/

112

*/

113

  Ptr<Socket> GetSocket (void) const;

113

  Ptr<Socket> GetSocket (void) const;

114

115

  void SetSocket (Ptr<Socket> socket);

116

115

/**

117

/**

116

  * \brief Assign a fixed random variable stream number to the random variables

118

  * \brief Assign a fixed random variable stream number to the random variables

117

  * used by this model.

119

  * used by this model.




  Application::DoDispose ();
}


// Application Methods
void PacketSink::StartApplication ()    // Called at time specified by Start
{

  if (!m_socket)
    {
      m_socket = Socket::CreateSocket (GetNode (), m_tid);
    }

  m_socket->Bind (m_local);
  m_socket->Listen ();
  m_socket->ShutdownSend ();
  if (addressUtils::IsMulticast (m_local))
    {
      Ptr<UdpSocket> udpSocket = DynamicCast<UdpSocket> (m_socket);
      if (udpSocket)
        {
          // equivalent to setsockopt (MCAST_JOIN_GROUP)
          udpSocket->MulticastJoinGroup (0, m_local);
        }
      else
        {
          NS_FATAL_ERROR ("Error: joining multicast on a non-UDP socket");
          else
            {
              NS_FATAL_ERROR ("Error: joining multicast on a non-UDP socket");
            }
        }
    }


    MakeCallback (&PacketSink::HandlePeerError, this));
}

void
PacketSink::SetSocket(Ptr<Socket> socket)
{
  m_socket = socket;
}

void PacketSink::StopApplication ()     // Called at time specified by Stop
{
  NS_LOG_FUNCTION (this);

(-)a/src/applications/model/packet-sink.h (+2 lines)

Lines 91-96 public:	Link Here

   * \return list of pointers to accepted sockets

   * \return list of pointers to accepted sockets

*/

*/

  std::list<Ptr<Socket> > GetAcceptedSockets (void) const;

  std::list<Ptr<Socket> > GetAcceptedSockets (void) const;

  void SetSocket (Ptr<Socket> socket);

protected:

protected:

  virtual void DoDispose (void);

  virtual void DoDispose (void);

Return to bug 2106