merge with HEAD
authorMathieu Lacage <mathieu.lacage@sophia.inria.fr>
Thu Apr 17 16:24:43 2008 -0700 (22 months ago)
changeset 2923dbbe74916235
parent 2922 916de65f67bf
parent 2921 8a616a8b723a
child 2924 70a02c24d5eb
merge with HEAD
     1.1 --- a/src/internet-node/arp-l3-protocol.cc	Thu Apr 17 16:24:13 2008 -0700
     1.2 +++ b/src/internet-node/arp-l3-protocol.cc	Thu Apr 17 16:24:43 2008 -0700
     1.3 @@ -108,6 +108,11 @@
     1.4              arp.GetDestinationIpv4Address () << "; we have address " <<
     1.5              cache->GetInterface ()->GetAddress ());
     1.6  
     1.7 +  /**
     1.8 +   * Note: we do not update the ARP cache when we receive an ARP request
     1.9 +   * from an unknown node. See bug #107
    1.10 +   */
    1.11 +
    1.12    if (arp.IsRequest () && 
    1.13        arp.GetDestinationIpv4Address () == cache->GetInterface ()->GetAddress ()) 
    1.14      {
     2.1 --- a/src/simulator/nstime.h	Thu Apr 17 16:24:13 2008 -0700
     2.2 +++ b/src/simulator/nstime.h	Thu Apr 17 16:24:43 2008 -0700
     2.3 @@ -274,6 +274,7 @@
     2.4  template <int N1, int N2>
     2.5  TimeUnit<N1-N2> operator / (TimeUnit<N1> const &lhs, TimeUnit<N2> const &rhs)
     2.6  {
     2.7 +  NS_ASSERT (rhs.GetHighPrecision ().GetDouble () != 0);
     2.8    HighPrecision retval = lhs.GetHighPrecision ();
     2.9    retval.Div (rhs.GetHighPrecision ());
    2.10    return TimeUnit<N1-N2> (retval);