merge

CHANGES.html

@@ -43,6 +43,21 @@ the cracks, unfortunately.  If you, as a user, can suggest improvements
 to this file based on your experience, please contribute a patch or drop
 us a note on ns-developers mailing list.  </p>
 
+<hr>
+<h1>Changes from ns-3.8 to ns-3.9</h1>
+
+<h2>Changes to build system:</h2>
+
+<h2>New API:</h2>
+
+<h2>Changes to existing API:</h2>
+
+<h2>Changed behavior:</h2>
+<ul>
+<li><b>Drop trace logged for Ipv4/6 forwarding failure:</b> Fixed bug 861; this 
+will add ascii traces (drops) in Ipv4 and Ipv6 traces for forwarding failures
+</ul>
+
 <hr>
 <h1>Changes from ns-3.7 to ns-3.8</h1>
 

RELEASE_NOTES

@@ -9,6 +9,35 @@ http://www.nsnam.org including tutorials: http://www.nsnam.org/tutorials.html
 Consult the file CHANGES.html for more detailed information about changed
 API and behavior across ns-3 releases.
 
+Release 3.9
+===========
+
+Availability
+------------
+This release is not yet available.
+
+Supported platforms
+-------------------
+ns-3.9 has been tested on the following platforms:
+
+Not all ns-3 options are available on all platforms; consult the
+wiki for more information:
+http://www.nsnam.org/wiki/index.php/Installation
+
+New user-visible features
+-------------------------
+
+Bugs fixed
+----------
+The following lists many of the bugs that were fixed since ns-3.7, in
+many cases referencing the Bugzilla bug number
+
+   - bug 861 - Forwarding drops (due to no route found) were not being logged 
+               in IPv4 or IPv6 ascii traces
+
+Known issues
+------------
+
 Release 3.8
 ===========
 

src/internet-stack/ipv4-l3-protocol.cc

@@ -484,12 +484,17 @@ Ipv4L3Protocol::Receive( Ptr<NetDevice> device, Ptr<const Packet> p, uint16_t pr
     }
 
   NS_ASSERT_MSG (m_routingProtocol != 0, "Need a routing protocol object to process packets");
-  m_routingProtocol->RouteInput (packet, ipHeader, device, 
+  if (! m_routingProtocol->RouteInput (packet, ipHeader, device, 
     MakeCallback (&Ipv4L3Protocol::IpForward, this),
     MakeCallback (&Ipv4L3Protocol::IpMulticastForward, this),
     MakeCallback (&Ipv4L3Protocol::LocalDeliver, this),
     MakeCallback (&Ipv4L3Protocol::RouteInputError, this)
-  );
+  ))
+    {
+      NS_LOG_WARN ("No route found for forwarding packet.  Drop.");
+      m_dropTrace (ipHeader, packet, DROP_NO_ROUTE, m_node->GetObject<Ipv4> (), interface);
+    }
+
 
 }
 

src/internet-stack/ipv6-l3-protocol.cc

@@ -728,12 +728,15 @@ void Ipv6L3Protocol::Receive (Ptr<NetDevice> device, Ptr<const Packet> p, uint16
         }
     }
 
-  m_routingProtocol->RouteInput (packet, hdr, device,
+  if (! m_routingProtocol->RouteInput (packet, hdr, device,
                                  MakeCallback (&Ipv6L3Protocol::IpForward, this),
                                  MakeCallback (&Ipv6L3Protocol::IpMulticastForward, this),
                                  MakeCallback (&Ipv6L3Protocol::LocalDeliver, this),
-                                 MakeCallback (&Ipv6L3Protocol::RouteInputError, this)
-  );
+                                 MakeCallback (&Ipv6L3Protocol::RouteInputError, this)))
+    {
+      NS_LOG_WARN ("No route found for forwarding packet.  Drop.");
+      m_dropTrace (hdr, packet, DROP_NO_ROUTE, interface);
+    }
 }
 
 void Ipv6L3Protocol::SendRealOut (Ptr<Ipv6Route> route, Ptr<Packet> packet, Ipv6Header const& ipHeader)