Attachment #2949 for bug #2817

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

(-)a/src/applications/model/onoff-application.cc (+7 lines)

Lines 91-96	Link Here

    .AddTraceSource ("Tx", "A new packet is created and is sent",

    .AddTraceSource ("Tx", "A new packet is created and is sent",

                     MakeTraceSourceAccessor (&OnOffApplication::m_txTrace),

                     MakeTraceSourceAccessor (&OnOffApplication::m_txTrace),

                     "ns3::Packet::TracedCallback")

                     "ns3::Packet::TracedCallback")

    .AddTraceSource ("TxWithAddresses", "A new packet is created and is sent",

                     MakeTraceSourceAccessor (&OnOffApplication::m_txTraceWithAddresses),

                     "ns3::Packet::TwoAddressTracedCallback")

  return tid;

  return tid;

Lines 283-288	Link Here

283

  m_txTrace (packet);

286

  m_txTrace (packet);

284

  m_socket->Send (packet);

287

  m_socket->Send (packet);

285

  m_totBytes += m_pktSize;

288

  m_totBytes += m_pktSize;

289

  Address localAddress;

290

  m_socket->GetSockName (localAddress);

286

  if (InetSocketAddress::IsMatchingType (m_peer))

291

  if (InetSocketAddress::IsMatchingType (m_peer))

287

292

288

      NS_LOG_INFO ("At time " << Simulator::Now ().GetSeconds ()

293

      NS_LOG_INFO ("At time " << Simulator::Now ().GetSeconds ()

Lines 291-296	Link Here

291

                   << InetSocketAddress::ConvertFrom(m_peer).GetIpv4 ()

296

                   << InetSocketAddress::ConvertFrom(m_peer).GetIpv4 ()

292

                   << " port " << InetSocketAddress::ConvertFrom (m_peer).GetPort ()

297

                   << " port " << InetSocketAddress::ConvertFrom (m_peer).GetPort ()

293

                   << " total Tx " << m_totBytes << " bytes");

298

                   << " total Tx " << m_totBytes << " bytes");

299

      m_txTraceWithAddresses (packet, localAddress, InetSocketAddress::ConvertFrom (m_peer));

294

300

295

  else if (Inet6SocketAddress::IsMatchingType (m_peer))

301

  else if (Inet6SocketAddress::IsMatchingType (m_peer))

296

302

Lines 300-305	Link Here

300

                   << Inet6SocketAddress::ConvertFrom(m_peer).GetIpv6 ()

306

                   << Inet6SocketAddress::ConvertFrom(m_peer).GetIpv6 ()

301

                   << " port " << Inet6SocketAddress::ConvertFrom (m_peer).GetPort ()

307

                   << " port " << Inet6SocketAddress::ConvertFrom (m_peer).GetPort ()

302

                   << " total Tx " << m_totBytes << " bytes");

308

                   << " total Tx " << m_totBytes << " bytes");

309

      m_txTraceWithAddresses (packet, localAddress, Inet6SocketAddress::ConvertFrom(m_peer));

303

310

304

  m_lastStartTime = Simulator::Now ();

311

  m_lastStartTime = Simulator::Now ();

305

  m_residualBits = 0;

312

  m_residualBits = 0;

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

Lines 167-172	Link Here

167

  /// Traced Callback: transmitted packets.

167

  /// Traced Callback: transmitted packets.

168

  TracedCallback<Ptr<const Packet> > m_txTrace;

168

  TracedCallback<Ptr<const Packet> > m_txTrace;

169

170

  /// Callbacks for tracing the packet Tx events, includes source and destination addresses

171

  TracedCallback<Ptr<const Packet>, const Address &, const Address &> m_txTraceWithAddresses;

172

170

private:

173

private:

171

/**

174

/**

172

   * \brief Schedule the next packet transmission

175

   * \brief Schedule the next packet transmission

(-)a/src/applications/model/packet-sink.cc (+6 lines)

Lines 59-64	Link Here

                     "A packet has been received",

                     "A packet has been received",

                     MakeTraceSourceAccessor (&PacketSink::m_rxTrace),

                     MakeTraceSourceAccessor (&PacketSink::m_rxTrace),

                     "ns3::Packet::AddressTracedCallback")

                     "ns3::Packet::AddressTracedCallback")

    .AddTraceSource ("RxWithAddresses", "A packet has been received",

                     MakeTraceSourceAccessor (&PacketSink::m_rxTraceWithAddresses),

                     "ns3::Packet::TwoAddressTracedCallback")

  return tid;

  return tid;

Lines 165-170	Link Here

165

  NS_LOG_FUNCTION (this << socket);

168

  NS_LOG_FUNCTION (this << socket);

166

  Ptr<Packet> packet;

169

  Ptr<Packet> packet;

167

  Address from;

170

  Address from;

171

  Address localAddress;

168

  while ((packet = socket->RecvFrom (from)))

172

  while ((packet = socket->RecvFrom (from)))

169

173

170

      if (packet->GetSize () == 0)

174

      if (packet->GetSize () == 0)

Lines 190-196	Link Here

190

                       << " port " << Inet6SocketAddress::ConvertFrom (from).GetPort ()

194

                       << " port " << Inet6SocketAddress::ConvertFrom (from).GetPort ()

191

                       << " total Rx " << m_totalRx << " bytes");

195

                       << " total Rx " << m_totalRx << " bytes");

192

196

197

      socket->GetSockName (localAddress);

193

      m_rxTrace (packet, from);

198

      m_rxTrace (packet, from);

199

      m_rxTraceWithAddresses (packet, from, localAddress);

194

200

195

201

196

202

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

Lines 133-138	Link Here

133

  /// Traced Callback: received packets, source address.

133

  /// Traced Callback: received packets, source address.

134

  TracedCallback<Ptr<const Packet>, const Address &> m_rxTrace;

134

  TracedCallback<Ptr<const Packet>, const Address &> m_rxTrace;

135

136

  /// Callback for tracing the packet Rx events, includes source and destination addresses

137

  TracedCallback<Ptr<const Packet>, const Address &, const Address &> m_rxTraceWithAddresses;

138

136

};

139

};

137

140

138

} // namespace ns3

141

} // namespace ns3

(-)a/src/applications/model/udp-echo-client.cc (-1 / +23 lines)

Lines 70-75	Link Here

    .AddTraceSource ("Tx", "A new packet is created and is sent",

    .AddTraceSource ("Tx", "A new packet is created and is sent",

                     MakeTraceSourceAccessor (&UdpEchoClient::m_txTrace),

                     MakeTraceSourceAccessor (&UdpEchoClient::m_txTrace),

                     "ns3::Packet::TracedCallback")

                     "ns3::Packet::TracedCallback")

    .AddTraceSource ("Rx", "A packet has been received",

                     MakeTraceSourceAccessor (&UdpEchoClient::m_rxTrace),

                     "ns3::Packet::TracedCallback")

    .AddTraceSource ("TxWithAddresses", "A new packet is created and is sent",

                     MakeTraceSourceAccessor (&UdpEchoClient::m_txTraceWithAddresses),

                     "ns3::Packet::TwoAddressTracedCallback")

    .AddTraceSource ("RxWithAddresses", "A packet has been received",

                     MakeTraceSourceAccessor (&UdpEchoClient::m_rxTraceWithAddresses),

                     "ns3::Packet::TwoAddressTracedCallback")

  return tid;

  return tid;

Lines 324-334	Link Here

324

//

333

//

325

      p = Create<Packet> (m_size);

334

      p = Create<Packet> (m_size);

326

335

336

  Address localAddress;

337

  m_socket->GetSockName (localAddress);

327

  // call to the trace sinks before the packet is actually sent,

338

  // call to the trace sinks before the packet is actually sent,

328

  // so that tags added to the packet can be sent as well

339

  // so that tags added to the packet can be sent as well

329

  m_txTrace (p);

340

  m_txTrace (p);

341

  if (Ipv4Address::IsMatchingType (m_peerAddress))

342

343

      m_txTraceWithAddresses (p, localAddress, InetSocketAddress (Ipv4Address::ConvertFrom (m_peerAddress), m_peerPort));

344

345

  else if (Ipv6Address::IsMatchingType (m_peerAddress))

346

347

      m_txTraceWithAddresses (p, localAddress, Inet6SocketAddress (Ipv6Address::ConvertFrom (m_peerAddress), m_peerPort));

348

330

  m_socket->Send (p);

349

  m_socket->Send (p);

331

332

  ++m_sent;

350

  ++m_sent;

333

351

334

  if (Ipv4Address::IsMatchingType (m_peerAddress))

352

  if (Ipv4Address::IsMatchingType (m_peerAddress))

Lines 364-369	Link Here

364

  NS_LOG_FUNCTION (this << socket);

382

  NS_LOG_FUNCTION (this << socket);

365

  Ptr<Packet> packet;

383

  Ptr<Packet> packet;

366

  Address from;

384

  Address from;

385

  Address localAddress;

367

  while ((packet = socket->RecvFrom (from)))

386

  while ((packet = socket->RecvFrom (from)))

368

387

369

      if (InetSocketAddress::IsMatchingType (from))

388

      if (InetSocketAddress::IsMatchingType (from))

Lines 378-383	Link Here

378

                       Inet6SocketAddress::ConvertFrom (from).GetIpv6 () << " port " <<

397

                       Inet6SocketAddress::ConvertFrom (from).GetIpv6 () << " port " <<

379

                       Inet6SocketAddress::ConvertFrom (from).GetPort ());

398

                       Inet6SocketAddress::ConvertFrom (from).GetPort ());

380

399

400

      socket->GetSockName (localAddress);

401

      m_rxTrace (packet);

402

      m_rxTraceWithAddresses (packet, from, localAddress);

381

403

382

404

383

405





  /// Callbacks for tracing the packet Tx events
  TracedCallback<Ptr<const Packet> > m_txTrace;

  /// Callbacks for tracing the packet Rx events
  TracedCallback<Ptr<const Packet> > m_rxTrace;
  
  /// Callbacks for tracing the packet Tx events, includes source and destination addresses
  TracedCallback<Ptr<const Packet>, const Address &, const Address &> m_txTraceWithAddresses;
  
  /// Callbacks for tracing the packet Rx events, includes source and destination addresses
  TracedCallback<Ptr<const Packet>, const Address &, const Address &> m_rxTraceWithAddresses;

};

} // namespace ns3

(-)a/src/applications/model/udp-echo-server.cc (+10 lines)

Lines 49-54	Link Here

                   UintegerValue (9),

                   UintegerValue (9),

                   MakeUintegerAccessor (&UdpEchoServer::m_port),

                   MakeUintegerAccessor (&UdpEchoServer::m_port),

                   MakeUintegerChecker<uint16_t> ())

                   MakeUintegerChecker<uint16_t> ())

    .AddTraceSource ("Rx", "A packet has been received",

                     MakeTraceSourceAccessor (&UdpEchoServer::m_rxTrace),

                     "ns3::Packet::TracedCallback")

    .AddTraceSource ("RxWithAddresses", "A packet has been received",

                     MakeTraceSourceAccessor (&UdpEchoServer::m_rxTraceWithAddresses),

                     "ns3::Packet::TwoAddressTracedCallback")

  return tid;

  return tid;

Lines 153-160	Link Here

153

159

154

  Ptr<Packet> packet;

160

  Ptr<Packet> packet;

155

  Address from;

161

  Address from;

162

  Address localAddress;

156

  while ((packet = socket->RecvFrom (from)))

163

  while ((packet = socket->RecvFrom (from)))

157

164

165

      socket->GetSockName (localAddress);

166

      m_rxTrace (packet);

167

      m_rxTraceWithAddresses (packet, from, localAddress);

158

      if (InetSocketAddress::IsMatchingType (from))

168

      if (InetSocketAddress::IsMatchingType (from))

159

169

160

          NS_LOG_INFO ("At time " << Simulator::Now ().GetSeconds () << "s server received " << packet->GetSize () << " bytes from " <<

170

          NS_LOG_INFO ("At time " << Simulator::Now ().GetSeconds () << "s server received " << packet->GetSize () << " bytes from " <<

(-)a/src/applications/model/udp-echo-server.h (+7 lines)

Lines 23-28	Link Here

#include "ns3/event-id.h"

#include "ns3/event-id.h"

#include "ns3/ptr.h"

#include "ns3/ptr.h"

#include "ns3/address.h"

#include "ns3/address.h"

#include "ns3/traced-callback.h"

namespace ns3 {

namespace ns3 {

Lines 72-77	Link Here

  Ptr<Socket> m_socket; //!< IPv4 Socket

  Ptr<Socket> m_socket; //!< IPv4 Socket

  Ptr<Socket> m_socket6; //!< IPv6 Socket

  Ptr<Socket> m_socket6; //!< IPv6 Socket

  Address m_local; //!< local multicast address

  Address m_local; //!< local multicast address

  /// Callbacks for tracing the packet Rx events

  TracedCallback<Ptr<const Packet> > m_rxTrace;

  /// Callbacks for tracing the packet Rx events, includes source and destination addresses

  TracedCallback<Ptr<const Packet>, const Address &, const Address &> m_rxTraceWithAddresses;

};

};

} // namespace ns3

} // namespace ns3

(-)a/src/applications/model/udp-server.cc (+10 lines)

Lines 59-64	Link Here

                   MakeUintegerAccessor (&UdpServer::GetPacketWindowSize,

                   MakeUintegerAccessor (&UdpServer::GetPacketWindowSize,

                                         &UdpServer::SetPacketWindowSize),

                                         &UdpServer::SetPacketWindowSize),

                   MakeUintegerChecker<uint16_t> (8,256))

                   MakeUintegerChecker<uint16_t> (8,256))

    .AddTraceSource ("Rx", "A packet has been received",

                     MakeTraceSourceAccessor (&UdpServer::m_rxTrace),

                     "ns3::Packet::TracedCallback")

    .AddTraceSource ("RxWithAddresses", "A packet has been received",

                     MakeTraceSourceAccessor (&UdpServer::m_rxTraceWithAddresses),

                     "ns3::Packet::TwoAddressTracedCallback")

  return tid;

  return tid;

Lines 162-169	Link Here

162

  NS_LOG_FUNCTION (this << socket);

168

  NS_LOG_FUNCTION (this << socket);

163

  Ptr<Packet> packet;

169

  Ptr<Packet> packet;

164

  Address from;

170

  Address from;

171

  Address localAddress;

165

  while ((packet = socket->RecvFrom (from)))

172

  while ((packet = socket->RecvFrom (from)))

166

173

174

      socket->GetSockName (localAddress);

175

      m_rxTrace (packet);

176

      m_rxTraceWithAddresses (packet, from, localAddress);

167

      if (packet->GetSize () > 0)

177

      if (packet->GetSize () > 0)

168

178

169

          SeqTsHeader seqTs;

179

          SeqTsHeader seqTs;

(-)a/src/applications/model/udp-server.h (+9 lines)

Lines 27-33	Link Here

#include "ns3/event-id.h"

#include "ns3/event-id.h"

#include "ns3/ptr.h"

#include "ns3/ptr.h"

#include "ns3/address.h"

#include "ns3/address.h"

#include "ns3/traced-callback.h"

#include "packet-loss-counter.h"

#include "packet-loss-counter.h"

namespace ns3 {

namespace ns3 {

/**

/**

 * \ingroup applications

 * \ingroup applications

Lines 100-105	Link Here

100

  Ptr<Socket> m_socket6; //!< IPv6 Socket

102

  Ptr<Socket> m_socket6; //!< IPv6 Socket

101

  uint64_t m_received; //!< Number of received packets

103

  uint64_t m_received; //!< Number of received packets

102

  PacketLossCounter m_lossCounter; //!< Lost packet counter

104

  PacketLossCounter m_lossCounter; //!< Lost packet counter

105

106

  /// Callbacks for tracing the packet Rx events

107

  TracedCallback<Ptr<const Packet> > m_rxTrace;

108

109

  /// Callbacks for tracing the packet Rx events, includes source and destination addresses

110

  TracedCallback<Ptr<const Packet>, const Address &, const Address &> m_rxTraceWithAddresses;

111

103

};

112

};

104

113

105

} // namespace ns3

114

} // namespace ns3




  typedef void (* AddressTracedCallback)
    (Ptr<const Packet> packet, const Address &address);
  
   /**
    * TracedCallback signature for packet and source/destination addresses.
    *
    * \param [in] packet The packet.
    * \param [in] srcAddress The source address.
    * \param [in] destAddress The destination address.
    */
  typedef void (* TwoAddressTracedCallback)
    (const Ptr<const Packet> packet, const Address &srcAddress, const Address &destAddress);

  /**
   * TracedCallback signature for packet and Mac48Address.
   *

Return to bug 2817