--- a/src/internet/helper/ipv6-address-helper.cc	Wed May 23 12:03:11 2012 +0200
+++ b/src/internet/helper/ipv6-address-helper.cc	Sun May 20 15:19:52 2012 -0700
@@ -25,6 +25,7 @@
 #include "ns3/net-device.h"
 #include "ns3/mac48-address.h"
 #include "ns3/ipv6.h"
+#include "ns3/ipv6-address-generator.h"
 
 #include "ipv6-address-helper.h"
 
@@ -35,37 +36,73 @@
 
 Ipv6AddressHelper::Ipv6AddressHelper ()
 {
-  NS_LOG_FUNCTION_NOARGS ();
-  m_network = Ipv6Address ("2001::");
-  m_prefix = Ipv6Prefix (64);
+  NS_LOG_FUNCTION (this);
+  Ipv6AddressGenerator::Init (Ipv6Address ("2001:db8::"), Ipv6Prefix (64));
+}
+
+Ipv6AddressHelper::Ipv6AddressHelper (Ipv6Address network, Ipv6Prefix prefix,
+                                      Ipv6Address base)
+{
+  NS_LOG_FUNCTION (this << network << prefix << base);
+  Ipv6AddressGenerator::Init (network, prefix, base);
 }
 
+void Ipv6AddressHelper::SetBase (Ipv6Address network, Ipv6Prefix prefix,
+                            Ipv6Address base)
+{
+  NS_LOG_FUNCTION (this << network << prefix << base);
+  // XXX for now we do not enforce the prefix because the underlying
+  // Ipv6AddressGenerator does not handle prefixes well that are not 64 bits
+  Ipv6AddressGenerator::Init (network, Ipv6Prefix (64), base);
+}
+
+
 Ipv6Address Ipv6AddressHelper::NewAddress (Address addr)
 {
   NS_LOG_FUNCTION (this << addr);
-
-  switch (addr.GetLength ())
+  if (Mac48Address::IsMatchingType (addr))
     {
-    case 6:
-      return Ipv6Address::MakeAutoconfiguredAddress (Mac48Address::ConvertFrom (addr), m_network);
-    default:
-      return Ipv6Address ("::");
+      Ipv6Address network = Ipv6AddressGenerator::GetNetwork (Ipv6Prefix (64));
+      Ipv6Address address = Ipv6Address::MakeAutoconfiguredAddress (Mac48Address::ConvertFrom (addr), network);
+      Ipv6AddressGenerator::AddAllocated (address);
+      return address;
+    } 
+  else
+    {
+      NS_FATAL_ERROR ("Did not pass in a Mac48Address");
     }
   /* never reached */
   return Ipv6Address ("::");
 }
 
+Ipv6Address Ipv6AddressHelper::NewAddress (void)
+{
+  NS_LOG_FUNCTION (this);
+//
+// The way this is expected to be used is that an address and network number
+// are initialized, and then NewAddress() is called repeatedly to allocate and
+// get new addresses on a given subnet.  The client will expect that the first
+// address she gets back is the one she used to initialize the generator with.
+// This implies that this operation is a post-increment.
+//
+  return Ipv6AddressGenerator::NextAddress (Ipv6Prefix (64));
+}
+
 void Ipv6AddressHelper::NewNetwork (Ipv6Address network, Ipv6Prefix prefix)
 {
   NS_LOG_FUNCTION (this << network << prefix);
+  SetBase (network, Ipv6Prefix (64));
+}
 
-  m_network = network;
-  m_prefix = prefix;
+void Ipv6AddressHelper::NewNetwork (void)
+{
+  NS_LOG_FUNCTION (this);
+  Ipv6AddressGenerator::NextNetwork (Ipv6Prefix (64));
 }
 
 Ipv6InterfaceContainer Ipv6AddressHelper::Assign (const NetDeviceContainer &c)
 {
-  NS_LOG_FUNCTION_NOARGS ();
+  NS_LOG_FUNCTION (this);
   Ipv6InterfaceContainer retval;
 
   for (uint32_t i = 0; i < c.GetN (); ++i) 
@@ -87,10 +124,10 @@
       NS_ASSERT_MSG (ifIndex >= 0, "Ipv6AddressHelper::Allocate (): "
                      "Interface index not found");
 
-      Ipv6InterfaceAddress ipv6Addr = Ipv6InterfaceAddress (NewAddress (device->GetAddress ()), m_prefix);
+      Ipv6InterfaceAddress ipv6Addr = Ipv6InterfaceAddress (NewAddress (device->GetAddress ()), Ipv6Prefix (64));
       ipv6->SetMetric (ifIndex, 1);
+      ipv6->AddAddress (ifIndex, ipv6Addr);
       ipv6->SetUp (ifIndex);
-      ipv6->AddAddress (ifIndex, ipv6Addr);
 
       retval.Add (ipv6, ifIndex);
     }
@@ -99,7 +136,7 @@
 
 Ipv6InterfaceContainer Ipv6AddressHelper::Assign (const NetDeviceContainer &c, std::vector<bool> withConfiguration)
 {
-  NS_LOG_FUNCTION_NOARGS ();
+  NS_LOG_FUNCTION (this);
   Ipv6InterfaceContainer retval;
   for (uint32_t i = 0; i < c.GetN (); ++i) 
     {
@@ -120,47 +157,29 @@
                      "Interface index not found");
 
       ipv6->SetMetric (ifIndex, 1);
-      ipv6->SetUp (ifIndex);
 
       if (withConfiguration.at (i))
         {
-          Ipv6InterfaceAddress ipv6Addr = Ipv6InterfaceAddress (NewAddress (device->GetAddress ()), m_prefix);
+          Ipv6InterfaceAddress ipv6Addr = Ipv6InterfaceAddress (NewAddress (device->GetAddress ()), Ipv6Prefix (64));
           ipv6->AddAddress (ifIndex, ipv6Addr);
         }
 
+      ipv6->SetUp (ifIndex);
       retval.Add (ipv6, ifIndex);
     }
   return retval;
 }
 
+// Helper API that is redundant with Assign (c, false);
 Ipv6InterfaceContainer Ipv6AddressHelper::AssignWithoutAddress (const NetDeviceContainer &c)
 {
-  NS_LOG_FUNCTION_NOARGS ();
-  Ipv6InterfaceContainer retval;
+  NS_LOG_FUNCTION (this);
+  std::vector<bool> withConfiguration;
   for (uint32_t i = 0; i < c.GetN (); ++i) 
     {
-      Ptr<NetDevice> device = c.Get (i);
-
-      Ptr<Node> node = device->GetNode ();
-      NS_ASSERT_MSG (node, "Ipv6AddressHelper::Allocate (): Bad node");
-
-      Ptr<Ipv6> ipv6 = node->GetObject<Ipv6> ();
-      NS_ASSERT_MSG (ipv6, "Ipv6AddressHelper::Allocate (): Bad ipv6");
-
-      int32_t ifIndex = ipv6->GetInterfaceForDevice (device);
-      if (ifIndex == -1)
-        {
-          ifIndex = ipv6->AddInterface (device);
-        }
-      NS_ASSERT_MSG (ifIndex >= 0, "Ipv6AddressHelper::Allocate (): "
-                     "Interface index not found");
-
-      ipv6->SetMetric (ifIndex, 1);
-      ipv6->SetUp (ifIndex);
-
-      retval.Add (ipv6, ifIndex);
+      withConfiguration.push_back (false);
     }
-  return retval;
+  return Assign (c, withConfiguration);
 }
 
 } /* namespace ns3 */