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

(-)a/src/internet-apps/model/v4ping.cc (-3 / +16 lines)
 Lines 46-52    Link Here 
46
                   MakeIpv4AddressChecker ())
46
                   MakeIpv4AddressChecker ())
47
    .AddAttribute ("Verbose",
47
    .AddAttribute ("Verbose",
48
                   "Produce usual output.",
48
                   "Produce usual output.",
49
                   BooleanValue (false),
49
                   BooleanValue (true),
50
                   MakeBooleanAccessor (&V4Ping::m_verbose),
50
                   MakeBooleanAccessor (&V4Ping::m_verbose),
51
                   MakeBooleanChecker ())
51
                   MakeBooleanChecker ())
52
    .AddAttribute ("Interval", "Wait  interval  seconds between sending each packet.",
52
    .AddAttribute ("Interval", "Wait  interval  seconds between sending each packet.",
 Lines 84-89    Link Here 
84
V4Ping::DoDispose (void)
84
V4Ping::DoDispose (void)
85
{
85
{
86
  NS_LOG_FUNCTION (this);
86
  NS_LOG_FUNCTION (this);
87
88
  if (m_next.IsRunning ())
89
    {
90
      StopApplication ();
91
    }
92
87
  m_socket = 0;
93
  m_socket = 0;
88
  Application::DoDispose ();
94
  Application::DoDispose ();
89
}
95
}
 Lines 261-268    Link Here 
261
V4Ping::StopApplication (void)
267
V4Ping::StopApplication (void)
262
{
268
{
263
  NS_LOG_FUNCTION (this);
269
  NS_LOG_FUNCTION (this);
264
  m_next.Cancel ();
270
265
  m_socket->Close ();
271
  if (m_next.IsRunning ())
272
    {
273
      m_next.Cancel ();
274
    }
275
  if (m_socket)
276
    {
277
      m_socket->Close ();
278
    }
266
279
267
  if (m_verbose)
280
  if (m_verbose)
268
    {
281
    {

Return to bug 1977