--- a/src/routing/olsr/olsr-routing-protocol.cc	Tue Nov 24 10:45:08 2009 +0100
+++ b/src/routing/olsr/olsr-routing-protocol.cc	Tue Nov 24 11:48:06 2009 +0000
@@ -72,7 +72,7 @@
 /********** Holding times **********/
 
 /// Neighbor holding time.
-#define OLSR_NEIGHB_HOLD_TIME	(Scalar (3) * OLSR_REFRESH_INTERVAL)
+#define OLSR_NEIGHB_HOLD_TIME	(Scalar (3) * m_helloInterval)
 /// Top holding time.
 #define OLSR_TOP_HOLD_TIME	(Scalar (3) * m_tcInterval)
 /// Dup holding time.
@@ -1458,7 +1458,7 @@
   msg.SetMessageSequenceNumber (GetMessageSequenceNumber ());
   olsr::MessageHeader::Hello &hello = msg.GetHello ();
 
-  hello.SetHTime (Scalar (3) * m_helloInterval);
+  hello.SetHTime (m_helloInterval);
   hello.willingness = m_willingness;
 
   std::vector<olsr::MessageHeader::Hello::LinkMessage>

Binary file src/routing/olsr/test/olsr-hello-regression-test-0-1.pcap has changed

Binary file src/routing/olsr/test/olsr-hello-regression-test-1-1.pcap has changed