# HG changeset patch
# User Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
# Date 1207590081 25200
# Node ID 872dc84663521db5977fedc9b997a6d5874e72c9
# Parent  9a637e6daee0c6726f9275ad7fabb9033d5a8109
Ipv4AddressHelper::Allocate -> Ipv4AddressHelper::Assign

diff -r 9a637e6daee0 -r 872dc8466352 examples/csma-broadcast.cc
--- a/examples/csma-broadcast.cc	Mon Apr 07 10:38:37 2008 -0700
+++ b/examples/csma-broadcast.cc	Mon Apr 07 10:41:21 2008 -0700
@@ -81,9 +81,9 @@
   NS_LOG_INFO ("Assign IP Addresses.");
   Ipv4AddressHelper ipv4;
   ipv4.SetBase ("10.1.0.0", "255.255.255.0");
-  ipv4.Allocate (n0);
+  ipv4.Assign (n0);
   ipv4.SetBase ("192.168.1.0", "255.255.255.0");
-  ipv4.Allocate (n1);
+  ipv4.Assign (n1);
 
 
   // RFC 863 discard port ("9") indicates packet should be thrown away
diff -r 9a637e6daee0 -r 872dc8466352 examples/csma-multicast.cc
--- a/examples/csma-multicast.cc	Mon Apr 07 10:38:37 2008 -0700
+++ b/examples/csma-multicast.cc	Mon Apr 07 10:41:21 2008 -0700
@@ -89,9 +89,9 @@
   NS_LOG_INFO ("Assign IP Addresses.");
   Ipv4AddressHelper ipv4Addr;
   ipv4Addr.SetBase ("10.1.1.0", "255.255.255.0");
-  ipv4Addr.Allocate (nd0);
+  ipv4Addr.Assign (nd0);
   ipv4Addr.SetBase ("10.1.2.0", "255.255.255.0");
-  ipv4Addr.Allocate (nd1);
+  ipv4Addr.Assign (nd1);
 
   NS_LOG_INFO ("Configure multicasting.");
   //
diff -r 9a637e6daee0 -r 872dc8466352 examples/csma-one-subnet.cc
--- a/examples/csma-one-subnet.cc	Mon Apr 07 10:38:37 2008 -0700
+++ b/examples/csma-one-subnet.cc	Mon Apr 07 10:41:21 2008 -0700
@@ -86,7 +86,7 @@
   NS_LOG_INFO ("Assign IP Addresses.");
   Ipv4AddressHelper ipv4;
   ipv4.SetBase ("10.1.1.0", "255.255.255.0");
-  ipv4.Allocate (nd0);
+  ipv4.Assign (nd0);
 
 //
 // Create an OnOff application to send UDP datagrams from node zero to node 1.
diff -r 9a637e6daee0 -r 872dc8466352 examples/mixed-global-routing.cc
--- a/examples/mixed-global-routing.cc	Mon Apr 07 10:38:37 2008 -0700
+++ b/examples/mixed-global-routing.cc	Mon Apr 07 10:41:21 2008 -0700
@@ -123,16 +123,16 @@
   NS_LOG_INFO ("Assign IP Addresses.");
   Ipv4AddressHelper ipv4;
   ipv4.SetBase ("10.1.1.0", "255.255.255.0");
-  ipv4.Allocate (d0d2);
+  ipv4.Assign (d0d2);
 
   ipv4.SetBase ("10.1.2.0", "255.255.255.0");
-  ipv4.Allocate (d1d2);
+  ipv4.Assign (d1d2);
 
   ipv4.SetBase ("10.1.3.0", "255.255.255.0");
-  Ipv4InterfaceContainer i5i6 = ipv4.Allocate (d5d6);
+  Ipv4InterfaceContainer i5i6 = ipv4.Assign (d5d6);
 
   ipv4.SetBase ("10.250.1.0", "255.255.255.0");
-  ipv4.Allocate (d2345);
+  ipv4.Assign (d2345);
 
   // Create router nodes, initialize routing database and set up the routing
   // tables in the nodes.
diff -r 9a637e6daee0 -r 872dc8466352 examples/simple-alternate-routing.cc
--- a/examples/simple-alternate-routing.cc	Mon Apr 07 10:38:37 2008 -0700
+++ b/examples/simple-alternate-routing.cc	Mon Apr 07 10:41:21 2008 -0700
@@ -117,16 +117,16 @@
   NS_LOG_INFO ("Assign IP Addresses.");
   Ipv4AddressHelper ipv4;
   ipv4.SetBase ("10.0.0.0", "255.255.255.0");
-  ipv4.Allocate (d0d2);
+  ipv4.Assign (d0d2);
   
   ipv4.SetBase ("10.1.1.0", "255.255.255.0");
-  Ipv4InterfaceContainer i1i2 = ipv4.Allocate (d1d2);
+  Ipv4InterfaceContainer i1i2 = ipv4.Assign (d1d2);
   
   ipv4.SetBase ("10.2.2.0", "255.255.255.0");
-  ipv4.Allocate (d3d2);
+  ipv4.Assign (d3d2);
 
   ipv4.SetBase ("10.3.3.0", "255.255.255.0");
-  Ipv4InterfaceContainer i1i3 = ipv4.Allocate (d1d3);
+  Ipv4InterfaceContainer i1i3 = ipv4.Assign (d1d3);
 
   i1i3.SetMetric (0, sampleMetric);
   i1i3.SetMetric (1, sampleMetric);
diff -r 9a637e6daee0 -r 872dc8466352 examples/simple-error-model.cc
--- a/examples/simple-error-model.cc	Mon Apr 07 10:38:37 2008 -0700
+++ b/examples/simple-error-model.cc	Mon Apr 07 10:41:21 2008 -0700
@@ -105,13 +105,13 @@
   NS_LOG_INFO ("Assign IP Addresses.");
   Ipv4AddressHelper ipv4;
   ipv4.SetBase ("10.1.1.0", "255.255.255.0");
-  ipv4.Allocate (d0d2);
+  ipv4.Assign (d0d2);
   
   ipv4.SetBase ("10.1.2.0", "255.255.255.0");
-  Ipv4InterfaceContainer i1i2 = ipv4.Allocate (d1d2);
+  Ipv4InterfaceContainer i1i2 = ipv4.Assign (d1d2);
 
   ipv4.SetBase ("10.1.3.0", "255.255.255.0");
-  Ipv4InterfaceContainer i3i2 = ipv4.Allocate (d3d2);
+  Ipv4InterfaceContainer i3i2 = ipv4.Assign (d3d2);
 
   NS_LOG_INFO ("Use global routing.");
   GlobalRouteManager::PopulateRoutingTables ();
diff -r 9a637e6daee0 -r 872dc8466352 examples/simple-global-routing.cc
--- a/examples/simple-global-routing.cc	Mon Apr 07 10:38:37 2008 -0700
+++ b/examples/simple-global-routing.cc	Mon Apr 07 10:41:21 2008 -0700
@@ -105,13 +105,13 @@
   NS_LOG_INFO ("Assign IP Addresses.");
   Ipv4AddressHelper ipv4;
   ipv4.SetBase ("10.1.1.0", "255.255.255.0");
-  Ipv4InterfaceContainer i0i2 = ipv4.Allocate (d0d2);
+  Ipv4InterfaceContainer i0i2 = ipv4.Assign (d0d2);
 
   ipv4.SetBase ("10.1.2.0", "255.255.255.0");
-  Ipv4InterfaceContainer i1i2 = ipv4.Allocate (d1d2);
+  Ipv4InterfaceContainer i1i2 = ipv4.Assign (d1d2);
   
   ipv4.SetBase ("10.1.3.0", "255.255.255.0");
-  Ipv4InterfaceContainer i3i2 = ipv4.Allocate (d3d2);
+  Ipv4InterfaceContainer i3i2 = ipv4.Assign (d3d2);
 
   // Create router nodes, initialize routing database and set up the routing
   // tables in the nodes.
diff -r 9a637e6daee0 -r 872dc8466352 examples/simple-point-to-point-olsr.cc
--- a/examples/simple-point-to-point-olsr.cc	Mon Apr 07 10:38:37 2008 -0700
+++ b/examples/simple-point-to-point-olsr.cc	Mon Apr 07 10:41:21 2008 -0700
@@ -105,16 +105,16 @@
   NS_LOG_INFO ("Assign IP Addresses.");
   Ipv4AddressHelper ipv4;
   ipv4.SetBase ("10.1.1.0", "255.255.255.0");
-  Ipv4InterfaceContainer i02 = ipv4.Allocate (nd02);
+  Ipv4InterfaceContainer i02 = ipv4.Assign (nd02);
 
   ipv4.SetBase ("10.1.2.0", "255.255.255.0");
-  Ipv4InterfaceContainer i12 = ipv4.Allocate (nd12);
+  Ipv4InterfaceContainer i12 = ipv4.Assign (nd12);
   
   ipv4.SetBase ("10.1.3.0", "255.255.255.0");
-  Ipv4InterfaceContainer i32 = ipv4.Allocate (nd32);
+  Ipv4InterfaceContainer i32 = ipv4.Assign (nd32);
 
   ipv4.SetBase ("10.1.4.0", "255.255.255.0");
-  Ipv4InterfaceContainer i34 = ipv4.Allocate (nd34);
+  Ipv4InterfaceContainer i34 = ipv4.Assign (nd34);
 
   // Enable OLSR
   NS_LOG_INFO ("Enabling OLSR Routing.");
diff -r 9a637e6daee0 -r 872dc8466352 examples/tcp-large-transfer.cc
--- a/examples/tcp-large-transfer.cc	Mon Apr 07 10:38:37 2008 -0700
+++ b/examples/tcp-large-transfer.cc	Mon Apr 07 10:41:21 2008 -0700
@@ -150,9 +150,9 @@
   // Later, we add IP addresses.  
   Ipv4AddressHelper ipv4;
   ipv4.SetBase ("10.1.3.0", "255.255.255.0");
-  ipv4.Allocate (dev0);
+  ipv4.Assign (dev0);
   ipv4.SetBase ("10.1.2.0", "255.255.255.0");
-  Ipv4InterfaceContainer ipInterfs = ipv4.Allocate (dev1);
+  Ipv4InterfaceContainer ipInterfs = ipv4.Assign (dev1);
 
   // and setup ip routing tables to get total ip-level connectivity.
   GlobalRouteManager::PopulateRoutingTables ();
diff -r 9a637e6daee0 -r 872dc8466352 examples/udp-echo.cc
--- a/examples/udp-echo.cc	Mon Apr 07 10:38:37 2008 -0700
+++ b/examples/udp-echo.cc	Mon Apr 07 10:41:21 2008 -0700
@@ -97,7 +97,7 @@
 //
   NS_LOG_INFO ("Assign IP Addresses.");
   ipv4.SetBase ("10.1.1.0", "255.255.255.0");
-  Ipv4InterfaceContainer i = ipv4.Allocate (d);
+  Ipv4InterfaceContainer i = ipv4.Assign (d);
 
   NS_LOG_INFO ("Create Applications.");
 //
diff -r 9a637e6daee0 -r 872dc8466352 src/helper/ipv4-address-helper.cc
--- a/src/helper/ipv4-address-helper.cc	Mon Apr 07 10:38:37 2008 -0700
+++ b/src/helper/ipv4-address-helper.cc	Mon Apr 07 10:41:21 2008 -0700
@@ -121,7 +121,7 @@
 }
 
 Ipv4InterfaceContainer
-Ipv4AddressHelper::Allocate (const NetDeviceContainer &c)
+Ipv4AddressHelper::Assign (const NetDeviceContainer &c)
 {
   NS_LOG_FUNCTION;
   Ipv4InterfaceContainer retval;
diff -r 9a637e6daee0 -r 872dc8466352 src/helper/ipv4-address-helper.h
--- a/src/helper/ipv4-address-helper.h	Mon Apr 07 10:38:37 2008 -0700
+++ b/src/helper/ipv4-address-helper.h	Mon Apr 07 10:41:21 2008 -0700
@@ -165,7 +165,7 @@
  * @see SetBase
  * @see NewNetwork
  */
-  Ipv4InterfaceContainer Allocate (const NetDeviceContainer &c);
+  Ipv4InterfaceContainer Assign (const NetDeviceContainer &c);
 
 private:
   uint32_t NumAddressBits (uint32_t maskbits) const;
diff -r 9a637e6daee0 -r 872dc8466352 tutorial/tutorial-bus-network.cc
--- a/tutorial/tutorial-bus-network.cc	Mon Apr 07 10:38:37 2008 -0700
+++ b/tutorial/tutorial-bus-network.cc	Mon Apr 07 10:41:21 2008 -0700
@@ -46,7 +46,7 @@
 
   Ipv4AddressHelper ipv4;
   ipv4.SetBase ("10.1.0.0", "255.255.0.0", "0.0.0.3");
-  Ipv4InterfaceContainer i = ipv4.Allocate (nd);
+  Ipv4InterfaceContainer i = ipv4.Assign (nd);
 
   uint32_t port = 7;
   UdpEchoClientHelper client;
diff -r 9a637e6daee0 -r 872dc8466352 tutorial/tutorial-csma-echo-ascii-trace.cc
--- a/tutorial/tutorial-csma-echo-ascii-trace.cc	Mon Apr 07 10:38:37 2008 -0700
+++ b/tutorial/tutorial-csma-echo-ascii-trace.cc	Mon Apr 07 10:41:21 2008 -0700
@@ -44,7 +44,7 @@
 
   Ipv4AddressHelper ipv4;
   ipv4.SetBase ("10.1.1.0", "255.255.255.0");
-  Ipv4InterfaceContainer i = ipv4.Allocate (nd);
+  Ipv4InterfaceContainer i = ipv4.Assign (nd);
 
   uint16_t port = 7;
 
diff -r 9a637e6daee0 -r 872dc8466352 tutorial/tutorial-csma-echo-pcap-trace.cc
--- a/tutorial/tutorial-csma-echo-pcap-trace.cc	Mon Apr 07 10:38:37 2008 -0700
+++ b/tutorial/tutorial-csma-echo-pcap-trace.cc	Mon Apr 07 10:41:21 2008 -0700
@@ -42,7 +42,7 @@
 
   Ipv4AddressHelper ipv4;
   ipv4.SetBase ("10.1.1.0", "255.255.255.0");
-  Ipv4InterfaceContainer i = ipv4.Allocate (nd);
+  Ipv4InterfaceContainer i = ipv4.Assign (nd);
 
   uint16_t port = 7;
 
diff -r 9a637e6daee0 -r 872dc8466352 tutorial/tutorial-csma-echo.cc
--- a/tutorial/tutorial-csma-echo.cc	Mon Apr 07 10:38:37 2008 -0700
+++ b/tutorial/tutorial-csma-echo.cc	Mon Apr 07 10:41:21 2008 -0700
@@ -42,7 +42,7 @@
 
   Ipv4AddressHelper ipv4;
   ipv4.SetBase ("10.1.1.0", "255.255.255.0");
-  Ipv4InterfaceContainer i = ipv4.Allocate (nd);
+  Ipv4InterfaceContainer i = ipv4.Assign (nd);
 
   uint16_t port = 7;
 
diff -r 9a637e6daee0 -r 872dc8466352 tutorial/tutorial-linear-dumbbell.cc
--- a/tutorial/tutorial-linear-dumbbell.cc	Mon Apr 07 10:38:37 2008 -0700
+++ b/tutorial/tutorial-linear-dumbbell.cc	Mon Apr 07 10:41:21 2008 -0700
@@ -58,7 +58,7 @@
   NetDeviceContainer dev1 = csma.Install (lan1);
   Ipv4AddressHelper ipv4;
   ipv4.SetBase ("10.1.1.0", "255.255.255.0");
-  Ipv4InterfaceContainer i1 = ipv4.Allocate (dev1);
+  Ipv4InterfaceContainer i1 = ipv4.Assign (dev1);
 
 
 //
@@ -70,7 +70,7 @@
 
   NetDeviceContainer dev2 = csma.Install (lan2);
   ipv4.SetBase ("10.1.2.0", "255.255.255.0");
-  Ipv4InterfaceContainer i2 = ipv4.Allocate (dev2);
+  Ipv4InterfaceContainer i2 = ipv4.Assign (dev2);
 
 
 //
@@ -82,7 +82,7 @@
   p2p.SetChannelParameter ("Delay", MilliSeconds (20));
   NetDeviceContainer dev3 = p2p.Install (backbone);
   ipv4.SetBase ("10.1.3.0", "255.255.255.0");
-  ipv4.Allocate (dev3);
+  ipv4.Assign (dev3);
 
 //
 // Create data flows across the link:
diff -r 9a637e6daee0 -r 872dc8466352 tutorial/tutorial-point-to-point.cc
--- a/tutorial/tutorial-point-to-point.cc	Mon Apr 07 10:38:37 2008 -0700
+++ b/tutorial/tutorial-point-to-point.cc	Mon Apr 07 10:41:21 2008 -0700
@@ -51,7 +51,7 @@
 
   Ipv4AddressHelper ipv4;
   ipv4.SetBase ("10.1.1.0", "255.255.255.252");
-  Ipv4InterfaceContainer i = ipv4.Allocate (nd);
+  Ipv4InterfaceContainer i = ipv4.Assign (nd);
 
   uint16_t port = 7;
   UdpEchoClientHelper client;
diff -r 9a637e6daee0 -r 872dc8466352 tutorial/tutorial-star-routing.cc
--- a/tutorial/tutorial-star-routing.cc	Mon Apr 07 10:38:37 2008 -0700
+++ b/tutorial/tutorial-star-routing.cc	Mon Apr 07 10:41:21 2008 -0700
@@ -68,17 +68,17 @@
 
   Ipv4AddressHelper ipv4;
   ipv4.SetBase ("10.1.1.0", "255.255.255.252");
-  Ipv4InterfaceContainer i01 = ipv4.Allocate (d01);
+  Ipv4InterfaceContainer i01 = ipv4.Assign (d01);
   ipv4.SetBase ("10.1.2.0", "255.255.255.252");
-  Ipv4InterfaceContainer i02 = ipv4.Allocate (d02);
+  Ipv4InterfaceContainer i02 = ipv4.Assign (d02);
   ipv4.SetBase ("10.1.3.0", "255.255.255.252");
-  Ipv4InterfaceContainer i03 = ipv4.Allocate (d03);
+  Ipv4InterfaceContainer i03 = ipv4.Assign (d03);
   ipv4.SetBase ("10.1.4.0", "255.255.255.252");
-  Ipv4InterfaceContainer i04 = ipv4.Allocate (d04);
+  Ipv4InterfaceContainer i04 = ipv4.Assign (d04);
   ipv4.SetBase ("10.1.5.0", "255.255.255.252");
-  Ipv4InterfaceContainer i05 = ipv4.Allocate (d05);
+  Ipv4InterfaceContainer i05 = ipv4.Assign (d05);
   ipv4.SetBase ("10.1.6.0", "255.255.255.252");
-  Ipv4InterfaceContainer i06 = ipv4.Allocate (d06);
+  Ipv4InterfaceContainer i06 = ipv4.Assign (d06);
 
   uint16_t port = 7;
 
diff -r 9a637e6daee0 -r 872dc8466352 tutorial/tutorial-star.cc
--- a/tutorial/tutorial-star.cc	Mon Apr 07 10:38:37 2008 -0700
+++ b/tutorial/tutorial-star.cc	Mon Apr 07 10:41:21 2008 -0700
@@ -67,17 +67,17 @@
 
   Ipv4AddressHelper ipv4;
   ipv4.SetBase ("10.1.1.0", "255.255.255.252");
-  Ipv4InterfaceContainer i01 = ipv4.Allocate (d01);
+  Ipv4InterfaceContainer i01 = ipv4.Assign (d01);
   ipv4.SetBase ("10.1.2.0", "255.255.255.252");
-  Ipv4InterfaceContainer i02 = ipv4.Allocate (d02);
+  Ipv4InterfaceContainer i02 = ipv4.Assign (d02);
   ipv4.SetBase ("10.1.3.0", "255.255.255.252");
-  Ipv4InterfaceContainer i03 = ipv4.Allocate (d03);
+  Ipv4InterfaceContainer i03 = ipv4.Assign (d03);
   ipv4.SetBase ("10.1.4.0", "255.255.255.252");
-  Ipv4InterfaceContainer i04 = ipv4.Allocate (d04);
+  Ipv4InterfaceContainer i04 = ipv4.Assign (d04);
   ipv4.SetBase ("10.1.5.0", "255.255.255.252");
-  Ipv4InterfaceContainer i05 = ipv4.Allocate (d05);
+  Ipv4InterfaceContainer i05 = ipv4.Assign (d05);
   ipv4.SetBase ("10.1.6.0", "255.255.255.252");
-  Ipv4InterfaceContainer i06 = ipv4.Allocate (d06);
+  Ipv4InterfaceContainer i06 = ipv4.Assign (d06);
 
   uint16_t port = 7;