From 3a8d684c9efb808d18a34a3cdaabbb9f20f289f8 Mon Sep 17 00:00:00 2001
From: Tom Henderson <tomh@tomh.org>
Date: Sat, 11 May 2013 11:08:52 -0700
Subject: [PATCH] update changes.html and release notes for FdNetDevice changes

---
 CHANGES.html  | 14 ++++++++++++++
 RELEASE_NOTES |  5 +++++
 2 files changed, 19 insertions(+)

diff --git a/CHANGES.html b/CHANGES.html
index 6f16e0247..1d6e01b33 100644
--- a/CHANGES.html
+++ b/CHANGES.html
@@ -56,6 +56,20 @@ us a note on ns-developers mailing list.</p>
 <h2>New API:</h2>
 <ul>
   <li>New TCP Westwood and Westwood+ models
+  <li>New FdNetDevice class providing a special NetDevice that is able to read
+      and write traffic from a file descriptor.  Three helpers are provided
+      to associate the file descriptor with different underlying devices:  
+    <ul> 
+    <li> EmuFdNetDeviceHelper (to associate the |ns3| device with a physical 
+         device in the host machine).  This helper is intended to
+         eventually replace the EmuNetDevice in src/emu. </li>
+    <li> TapFdNetDeviceHelper (to associate the ns-3 device with the file 
+         descriptor from a tap device in the host machine) </li>
+    <li> PlanteLabFdNetDeviceHelper (to automate the creation of tap devices 
+         in PlanetLab nodes, enabling |ns3| simulations that can send and 
+         receive traffic though the Internet using PlanetLab resource.</li>
+    </ul> 
+  </li>
   <li>In Ipv4ClickRouting, the following APIs were added:
     <ul>
       <li>Ipv4ClickRouting::SetDefines(), accessible through ClickInternetStackHelper::SetDefines(), for the user to set Click defines from the ns-3 simulation file.</li>
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 6d57205d7..dc442dc9a 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -31,6 +31,11 @@ These platforms have been tested; others may work also:
 New user-visible features
 -------------------------
 - new TCP Westwood and Westwood+ models
+- new FdNetDevice model and associated helpers.  The FdNetDevice is able
+  to read and write from a file descriptor.  Various helpers are provided
+  to associate this descriptor with underlying devices or sockets on the 
+  host operating system, including a packet socket for emulation, and
+  tap devices including a version specialized for use on PlanetLab.
 - ns-3-click: it's now possible to (i) have Click pull random numbers from
   ns-3 and (ii) have ns-3 set "defines" in Click via the simulation file 
   (see src/click/examples/nsclick-defines.cc).