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

(-)a/src/aodv/model/aodv-routing-protocol.cc (-7 / +16 lines)
 Lines 580-591    Link Here 
580
  NS_ASSERT (ipv4 != 0);
580
  NS_ASSERT (ipv4 != 0);
581
  NS_ASSERT (m_ipv4 == 0);
581
  NS_ASSERT (m_ipv4 == 0);
582
582
583
  if (EnableHello)
584
    {
585
      m_htimer.SetFunction (&RoutingProtocol::HelloTimerExpire, this);
586
      m_htimer.Schedule (MilliSeconds (m_uniformRandomVariable->GetInteger (0, 100)));
587
    }
588
589
  m_ipv4 = ipv4;
583
  m_ipv4 = ipv4;
590
584
591
  // Create lo route. It is asserted that the only one interface up for now is loopback
585
  // Create lo route. It is asserted that the only one interface up for now is loopback
 Lines 1928-1932    Link Here 
1928
  return socket;
1922
  return socket;
1929
}
1923
}
1930
1924
1925
void
1926
RoutingProtocol::DoInitialize (void)
1927
{
1928
  NS_LOG_FUNCTION (this);
1929
  uint32_t startTime;
1930
  if (EnableHello)
1931
    {
1932
      m_htimer.SetFunction (&RoutingProtocol::HelloTimerExpire, this);
1933
      startTime = m_uniformRandomVariable->GetInteger (0, 100);
1934
      NS_LOG_DEBUG ("Starting at time " << startTime << "ms");
1935
      m_htimer.Schedule (MilliSeconds (startTime));
1936
    }
1937
  Ipv4RoutingProtocol::DoInitialize ();
1931
}
1938
}
1932
}
1939
1940
} //namespace aodv
1941
} //namespace ns3
(-)a/src/aodv/model/aodv-routing-protocol.h (+2 lines)
 Lines 97-102    Link Here 
97
  */
97
  */
98
  int64_t AssignStreams (int64_t stream);
98
  int64_t AssignStreams (int64_t stream);
99
99
100
protected:
101
  virtual void DoInitialize (void);
100
private:
102
private:
101
  
103
  
102
  // Protocol parameters.
104
  // Protocol parameters.
(-)a/src/internet/model/ipv4-list-routing.h (-2 / +2 lines)
 Lines 93-100    Link Here 
93
  virtual void PrintRoutingTable (Ptr<OutputStreamWrapper> stream) const;
93
  virtual void PrintRoutingTable (Ptr<OutputStreamWrapper> stream) const;
94
94
95
protected:
95
protected:
96
  void DoDispose (void);
96
  virtual void DoDispose (void);
97
  void DoInitialize (void);
97
  virtual void DoInitialize (void);
98
private:
98
private:
99
  /**
99
  /**
100
   * \brief Container identifying an IPv4 Routing Protocol entry in the list.
100
   * \brief Container identifying an IPv4 Routing Protocol entry in the list.

Return to bug 1982