merge with HEAD
authorMathieu Lacage <mathieu.lacage@sophia.inria.fr>
Thu, 17 Apr 2008 16:24:43 -0700
changeset 2923 dbbe74916235
parent 2922 916de65f67bf (current diff)
parent 2921 8a616a8b723a (diff)
child 2924 70a02c24d5eb
merge with HEAD
--- a/src/internet-node/arp-l3-protocol.cc	Thu Apr 17 16:24:13 2008 -0700
+++ b/src/internet-node/arp-l3-protocol.cc	Thu Apr 17 16:24:43 2008 -0700
@@ -108,6 +108,11 @@
             arp.GetDestinationIpv4Address () << "; we have address " <<
             cache->GetInterface ()->GetAddress ());
 
+  /**
+   * Note: we do not update the ARP cache when we receive an ARP request
+   * from an unknown node. See bug #107
+   */
+
   if (arp.IsRequest () && 
       arp.GetDestinationIpv4Address () == cache->GetInterface ()->GetAddress ()) 
     {
--- a/src/simulator/nstime.h	Thu Apr 17 16:24:13 2008 -0700
+++ b/src/simulator/nstime.h	Thu Apr 17 16:24:43 2008 -0700
@@ -274,6 +274,7 @@
 template <int N1, int N2>
 TimeUnit<N1-N2> operator / (TimeUnit<N1> const &lhs, TimeUnit<N2> const &rhs)
 {
+  NS_ASSERT (rhs.GetHighPrecision ().GetDouble () != 0);
   HighPrecision retval = lhs.GetHighPrecision ();
   retval.Div (rhs.GetHighPrecision ());
   return TimeUnit<N1-N2> (retval);