From 6908fb3840efaa179b626e583ad99b2ca2f2c4b8 Mon Sep 17 00:00:00 2001
From: Tom Henderson <tomh@tomh.org>
Date: Thu, 23 Dec 2010 12:40:48 -0800
Subject: [PATCH] Update release notes and changelog

---
 CHANGES.html  | 21 +++++++++++++++++++--
 RELEASE_NOTES | 10 +++++++++-
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/CHANGES.html b/CHANGES.html
index e3a6ea10f..902be314e 100644
--- a/CHANGES.html
+++ b/CHANGES.html
@@ -120,7 +120,18 @@ longer, with a RegularWifiMac attribute "QosSupported" allowing
 selection between these two modes of operation. QosWifiMacHelper and
 NqosWifiMacHelper continue to work as previously, with a
 behind-the-scenes manipulation of the 'afore-mentioned attribute.
-</p>
+</p></li>
+
+<li><b>New TCP architecture</b>
+<p>TcpSocketImpl was replaced by a new base class TcpSocketBase and
+several subclasses implementing different congestion control.  From 
+a user-level API perspective, the main change is that a new attribute
+"SocketType" is available in TcpL4Protocol, to which a TypeIdValue
+of a specific Tcp variant can be passed.  In the same class, the attribute 
+"RttEstimatorFactory" was also renamed "RttEstimatorType" since it now
+takes a TypeIdValue instead of an ObjectFactoryValue.  In most cases, 
+however, no change to existing user programs should be needed.
+</p></li>
 </ul>
 
 <h2>Changed behavior:</h2>
@@ -128,7 +139,13 @@ behind-the-scenes manipulation of the 'afore-mentioned attribute.
 <li><b>EmuNetDevice uses DIX instead of LLC encapsulation by default</b>
 <p>bug 984 in ns-3 tracker:  real devices don't usually understand LLC/SNAP
 so the default of DIX makes more sense.
-</p>
+</p></li>
+<li><b>TCP defaults to NewReno congestion control</b>
+<p>As part of the TCP socket refactoring, a new TCP implementation provides
+slightly different behavior than the previous TcpSocketImpl that provided
+only fast retransmit.  The default behavior now is NewReno which provides
+fast retransmit and fast recovery with window inflation during recovery.
+</p></li>
 </ul>
 
 <hr>
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index e7518a178..c9665599b 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -79,6 +79,11 @@ New user-visible features
 
    - New methods to print IPv4 routing tables to an output stream.
 
+   - A replacement implementation for TCP for IPv4.  TcpSocketBase
+     now replaces TcpSocketImpl.  There are subclasses defined for
+     TCP Tahoe, Reno, NewReno, and the original RFC793 without
+     congestion control.
+
    - Energy support for UAN module and Li-Ion energy model.
      Now each network node can have an associated energy source
      from which it consumes energy. The user can specify a custom
@@ -97,14 +102,17 @@ Bugs fixed
 The following lists many of the bugs fixed or small feature additions
 since ns-3.9, in many cases referencing the Bugzilla bug number
 
-   - bug 978 - Consolidate Wi-Fi MAC high functionality
+   - bug 824 - TCP should implement FastRecovery by default
    - bug 852 - Add support for 802.11g devices
    - bug 892 - WaypointMobilityModel incompatible with MobilityHelper::Install
    - bug 893 - Lazy CourseChange notification for WaypointMobilityModel
+   - bug 967 - Need to decouple Ipv4L4Protocols from Ipv4L3Protocol
+   - bug 978 - Consolidate Wi-Fi MAC high functionality
    - bug 979 - Multi-octet fields in Wi-Fi headers have wrong endianness
    - bug 984 - EmuNetDevice should use DIX encapsulation by default
    - bug 988 - MacRxMiddle::SequenceControlSmaller method
    - bug 993 - MinstrelWifiManager::UpdateStats useless if clause
+   - bug 1012 - UAN Throp propagation model bug
    - bug 1015 - GetChannelFrequencyMhz() does not match with standard
    - bug 1022 - inappropriate ASSERT in tcp-socket-impl.cc
    - bug 1027 - RocketfuelTopologyReader is not working at all