1.1 --- a/examples/csma-broadcast.cc Sun Apr 06 21:57:11 2008 +0100
1.2 +++ b/examples/csma-broadcast.cc Mon Apr 07 10:38:37 2008 -0700
1.3 @@ -70,13 +70,13 @@
1.4 csma.SetChannelParameter ("BitRate", DataRate(5000000));
1.5 csma.SetChannelParameter ("Delay", MilliSeconds(2));
1.6
1.7 - NetDeviceContainer n0 = csma.Build (c0);
1.8 - NetDeviceContainer n1 = csma.Build (c1);
1.9 + NetDeviceContainer n0 = csma.Install (c0);
1.10 + NetDeviceContainer n1 = csma.Install (c1);
1.11
1.12
1.13 InternetStackHelper internet;
1.14 - internet.Build (c0);
1.15 - internet.Build (c1);
1.16 + internet.Install (c0);
1.17 + internet.Install (c1);
1.18
1.19 NS_LOG_INFO ("Assign IP Addresses.");
1.20 Ipv4AddressHelper ipv4;
1.21 @@ -99,7 +99,7 @@
1.22 onoff.SetAppAttribute ("OnTime", ConstantVariable (1));
1.23 onoff.SetAppAttribute ("OffTime", ConstantVariable (0));
1.24
1.25 - ApplicationContainer app = onoff.Build (c0.Get (0));
1.26 + ApplicationContainer app = onoff.Install (c0.Get (0));
1.27 // Start the application
1.28 app.Start (Seconds (1.0));
1.29 app.Stop (Seconds (10.0));
1.30 @@ -107,8 +107,8 @@
1.31 // Create an optional packet sink to receive these packets
1.32 PacketSinkHelper sink;
1.33 sink.SetupUdp (Ipv4Address::GetAny (), port);
1.34 - sink.Build (c0.Get (1));
1.35 - sink.Build (c1.Get (1));
1.36 + sink.Install (c0.Get (1));
1.37 + sink.Install (c1.Get (1));
1.38
1.39
1.40 // Also configure some tcpdump traces; each interface will be traced
2.1 --- a/examples/csma-multicast.cc Sun Apr 06 21:57:11 2008 +0100
2.2 +++ b/examples/csma-multicast.cc Mon Apr 07 10:38:37 2008 -0700
2.3 @@ -78,13 +78,13 @@
2.4 csma.SetChannelParameter ("Delay", MilliSeconds (2));
2.5
2.6 // We will use these NetDevice containers later, for IP addressing
2.7 - NetDeviceContainer nd0 = csma.Build (c0); // First LAN
2.8 - NetDeviceContainer nd1 = csma.Build (c1); // Second LAN
2.9 + NetDeviceContainer nd0 = csma.Install (c0); // First LAN
2.10 + NetDeviceContainer nd1 = csma.Install (c1); // Second LAN
2.11
2.12 NS_LOG_INFO ("Add IP Stack.");
2.13 InternetStackHelper internet;
2.14 - internet.Build (c0);
2.15 - internet.Build (c1);
2.16 + internet.Install (c0);
2.17 + internet.Install (c1);
2.18
2.19 NS_LOG_INFO ("Assign IP Addresses.");
2.20 Ipv4AddressHelper ipv4Addr;
2.21 @@ -147,7 +147,7 @@
2.22 onoff.SetAppAttribute ("DataRate", DataRate ("255b/s"));
2.23 onoff.SetAppAttribute ("PacketSize", Uinteger (128));
2.24
2.25 - ApplicationContainer srcC = onoff.Build (c0.Get (0));
2.26 + ApplicationContainer srcC = onoff.Install (c0.Get (0));
2.27
2.28 //
2.29 // Tell the application when to start and stop.
2.30 @@ -158,7 +158,7 @@
2.31 // Create an optional packet sink to receive these packets
2.32 PacketSinkHelper sink;
2.33 sink.SetupUdp (Ipv4Address::GetAny(), multicastPort);
2.34 - ApplicationContainer sinkC = sink.Build (c1.Get (2)); // Node n4
2.35 + ApplicationContainer sinkC = sink.Install (c1.Get (2)); // Node n4
2.36 // Start the sink
2.37 sinkC.Start (Seconds (1.0));
2.38 sinkC.Stop (Seconds (10.0));
3.1 --- a/examples/csma-one-subnet.cc Sun Apr 06 21:57:11 2008 +0100
3.2 +++ b/examples/csma-one-subnet.cc Mon Apr 07 10:38:37 2008 -0700
3.3 @@ -76,10 +76,10 @@
3.4 // created on the node. Interpret nd0 as the net device we created for node
3.5 // zero.
3.6 //
3.7 - NetDeviceContainer nd0 = csma.Build (c);
3.8 + NetDeviceContainer nd0 = csma.Install (c);
3.9
3.10 InternetStackHelper internet;
3.11 - internet.Build (c);
3.12 + internet.Install (c);
3.13
3.14 // We've got the "hardware" in place. Now we need to add IP addresses.
3.15 //
3.16 @@ -99,7 +99,7 @@
3.17 onoff.SetAppAttribute ("OnTime", ConstantVariable (1));
3.18 onoff.SetAppAttribute ("OffTime", ConstantVariable (0));
3.19
3.20 - ApplicationContainer app = onoff.Build (c.Get (0));
3.21 + ApplicationContainer app = onoff.Install (c.Get (0));
3.22 // Start the application
3.23 app.Start (Seconds (1.0));
3.24 app.Stop (Seconds (10.0));
3.25 @@ -107,15 +107,15 @@
3.26 // Create an optional packet sink to receive these packets
3.27 PacketSinkHelper sink;
3.28 sink.SetupUdp (Ipv4Address::GetAny (), port);
3.29 - sink.Build (c.Get (1));
3.30 + sink.Install (c.Get (1));
3.31
3.32 //
3.33 // Create a similar flow from n3 to n0, starting at time 1.1 seconds
3.34 //
3.35 onoff.SetUdpRemote (Ipv4Address("10.1.1.1"), port);
3.36 - ApplicationContainer app2 = onoff.Build (c.Get (3));
3.37 + ApplicationContainer app2 = onoff.Install (c.Get (3));
3.38
3.39 - sink.Build (c.Get (0));
3.40 + sink.Install (c.Get (0));
3.41
3.42 app2.Start(Seconds (1.1));
3.43 app2.Stop (Seconds (10.0));
4.1 --- a/examples/csma-packet-socket.cc Sun Apr 06 21:57:11 2008 +0100
4.2 +++ b/examples/csma-packet-socket.cc Mon Apr 07 10:38:37 2008 -0700
4.3 @@ -65,7 +65,7 @@
4.4 c.Create (4);
4.5
4.6 PacketSocketHelper packetSocket;
4.7 - packetSocket.Build (c);
4.8 + packetSocket.Install (c);
4.9
4.10 // create the shared medium used by all csma devices.
4.11 NS_LOG_INFO ("Create channels.");
4.12 @@ -76,7 +76,7 @@
4.13 NS_LOG_INFO ("Build Topology.");
4.14 CsmaHelper csma;
4.15 csma.SetDeviceParameter ("EncapsulationMode", String ("Llc"));
4.16 - NetDeviceContainer devs = csma.Build (c, channel);
4.17 + NetDeviceContainer devs = csma.Install (c, channel);
4.18
4.19 NS_LOG_INFO ("Create Applications.");
4.20 // Create the OnOff application to send raw datagrams
4.21 @@ -84,13 +84,13 @@
4.22 onoff.SetAppAttribute ("OnTime", ConstantVariable (1.0));
4.23 onoff.SetAppAttribute ("OffTime", ConstantVariable (0.0));
4.24 onoff.SetPacketRemote (devs.Get (0), devs.Get (1)->GetAddress (), 2);
4.25 - ApplicationContainer apps = onoff.Build (c.Get (0));
4.26 + ApplicationContainer apps = onoff.Install (c.Get (0));
4.27 apps.Start (Seconds (1.0));
4.28 apps.Stop (Seconds (10.0));
4.29
4.30
4.31 onoff.SetPacketRemote (devs.Get (3), devs.Get (0)->GetAddress (), 3);
4.32 - apps = onoff.Build (c.Get (3));
4.33 + apps = onoff.Install (c.Get (3));
4.34 apps.Start (Seconds (1.0));
4.35 apps.Stop (Seconds (10.0));
4.36
5.1 --- a/examples/mixed-global-routing.cc Sun Apr 06 21:57:11 2008 +0100
5.2 +++ b/examples/mixed-global-routing.cc Mon Apr 07 10:38:37 2008 -0700
5.3 @@ -98,26 +98,26 @@
5.4 NodeContainer n2345 = NodeContainer (c.Get (2), c.Get (3), c.Get (4), c.Get (5));
5.5
5.6 InternetStackHelper internet;
5.7 - internet.Build (c);
5.8 + internet.Install (c);
5.9
5.10 // We create the channels first without any IP addressing information
5.11 NS_LOG_INFO ("Create channels.");
5.12 PointToPointHelper p2p;
5.13 p2p.SetChannelParameter ("BitRate", DataRate (5000000));
5.14 p2p.SetChannelParameter ("Delay", MilliSeconds (2));
5.15 - NetDeviceContainer d0d2 = p2p.Build (n0n2);
5.16 + NetDeviceContainer d0d2 = p2p.Install (n0n2);
5.17
5.18 - NetDeviceContainer d1d2 = p2p.Build (n1n2);
5.19 + NetDeviceContainer d1d2 = p2p.Install (n1n2);
5.20
5.21 p2p.SetChannelParameter ("BitRate", DataRate (1500000));
5.22 p2p.SetChannelParameter ("Delay", MilliSeconds (10));
5.23 - NetDeviceContainer d5d6 = p2p.Build (n5n6);
5.24 + NetDeviceContainer d5d6 = p2p.Install (n5n6);
5.25
5.26 // We create the channels first without any IP addressing information
5.27 CsmaHelper csma;
5.28 csma.SetChannelParameter ("BitRate", DataRate (5000000));
5.29 csma.SetChannelParameter ("Delay", MilliSeconds (2));
5.30 - NetDeviceContainer d2345 = csma.Build (n2345);
5.31 + NetDeviceContainer d2345 = csma.Install (n2345);
5.32
5.33 // Later, we add IP addresses.
5.34 NS_LOG_INFO ("Assign IP Addresses.");
5.35 @@ -148,7 +148,7 @@
5.36 onoff.SetAppAttribute ("DataRate", DataRate("300bps"));
5.37 onoff.SetAppAttribute ("PacketSize", Uinteger (50));
5.38 onoff.SetUdpRemote (i5i6.GetAddress (1), port);
5.39 - ApplicationContainer apps = onoff.Build (c.Get (0));
5.40 + ApplicationContainer apps = onoff.Install (c.Get (0));
5.41 apps.Start (Seconds (1.0));
5.42 apps.Stop (Seconds (10.0));
5.43
6.1 --- a/examples/simple-alternate-routing.cc Sun Apr 06 21:57:11 2008 +0100
6.2 +++ b/examples/simple-alternate-routing.cc Mon Apr 07 10:38:37 2008 -0700
6.3 @@ -98,19 +98,19 @@
6.4 PointToPointHelper p2p;
6.5 p2p.SetChannelParameter ("BitRate", DataRate (5000000));
6.6 p2p.SetChannelParameter ("Delay", MilliSeconds (2));
6.7 - NetDeviceContainer d0d2 = p2p.Build (n0n2);
6.8 + NetDeviceContainer d0d2 = p2p.Install (n0n2);
6.9
6.10 - NetDeviceContainer d1d2 = p2p.Build (n1n2);
6.11 + NetDeviceContainer d1d2 = p2p.Install (n1n2);
6.12
6.13 p2p.SetChannelParameter ("BitRate", DataRate(1500000));
6.14 p2p.SetChannelParameter ("Delay", MilliSeconds (10));
6.15 - NetDeviceContainer d3d2 = p2p.Build (n3n2);
6.16 + NetDeviceContainer d3d2 = p2p.Install (n3n2);
6.17
6.18 p2p.SetChannelParameter ("Delay", MilliSeconds (100));
6.19 - NetDeviceContainer d1d3 = p2p.Build (n1n3);
6.20 + NetDeviceContainer d1d3 = p2p.Install (n1n3);
6.21
6.22 InternetStackHelper internet;
6.23 - internet.Build (c);
6.24 + internet.Install (c);
6.25
6.26 // Later, we add IP addresses. The middle two octets correspond to
6.27 // the channel number.
6.28 @@ -144,14 +144,14 @@
6.29 onoff.SetAppAttribute ("OnTime", ConstantVariable (1));
6.30 onoff.SetAppAttribute ("OffTime", ConstantVariable (0));
6.31 onoff.SetUdpRemote (i1i2.GetAddress (0), port);
6.32 - ApplicationContainer apps = onoff.Build (c.Get (3));
6.33 + ApplicationContainer apps = onoff.Install (c.Get (3));
6.34 apps.Start (Seconds (1.1));
6.35 apps.Start (Seconds (10.0));
6.36
6.37 // Create a packet sink to receive these packets
6.38 PacketSinkHelper sink;
6.39 sink.SetupUdp (Ipv4Address::GetAny (), port);
6.40 - apps = sink.Build (c.Get (1));
6.41 + apps = sink.Install (c.Get (1));
6.42 apps.Start (Seconds (1.1));
6.43 apps.Stop (Seconds (10.0));
6.44
7.1 --- a/examples/simple-error-model.cc Sun Apr 06 21:57:11 2008 +0100
7.2 +++ b/examples/simple-error-model.cc Mon Apr 07 10:38:37 2008 -0700
7.3 @@ -86,20 +86,20 @@
7.4 NodeContainer n3n2 = NodeContainer (c.Get (3), c.Get (2));
7.5
7.6 InternetStackHelper internet;
7.7 - internet.Build (c);
7.8 + internet.Install (c);
7.9
7.10 // We create the channels first without any IP addressing information
7.11 NS_LOG_INFO ("Create channels.");
7.12 PointToPointHelper p2p;
7.13 p2p.SetChannelParameter ("BitRate", DataRate (5000000));
7.14 p2p.SetChannelParameter ("Delay", MilliSeconds (2));
7.15 - NetDeviceContainer d0d2 = p2p.Build (n0n2);
7.16 + NetDeviceContainer d0d2 = p2p.Install (n0n2);
7.17
7.18 - NetDeviceContainer d1d2 = p2p.Build (n1n2);
7.19 + NetDeviceContainer d1d2 = p2p.Install (n1n2);
7.20
7.21 p2p.SetChannelParameter ("BitRate", DataRate (1500000));
7.22 p2p.SetChannelParameter ("Delay", MilliSeconds (10));
7.23 - NetDeviceContainer d3d2 = p2p.Build (n3n2);
7.24 + NetDeviceContainer d3d2 = p2p.Install (n3n2);
7.25
7.26 // Later, we add IP addresses.
7.27 NS_LOG_INFO ("Assign IP Addresses.");
7.28 @@ -124,26 +124,26 @@
7.29 onoff.SetUdpRemote (i3i2.GetAddress (1), port);
7.30 onoff.SetAppAttribute ("OnTime", ConstantVariable(1));
7.31 onoff.SetAppAttribute ("OffTime", ConstantVariable(0));
7.32 - ApplicationContainer apps = onoff.Build (c.Get (0));
7.33 + ApplicationContainer apps = onoff.Install (c.Get (0));
7.34 apps.Start(Seconds(1.0));
7.35 apps.Stop (Seconds(10.0));
7.36
7.37 // Create an optional packet sink to receive these packets
7.38 PacketSinkHelper sink;
7.39 sink.SetupUdp (Ipv4Address::GetAny (), port);
7.40 - apps = sink.Build (c.Get (3));
7.41 + apps = sink.Install (c.Get (3));
7.42 apps.Start (Seconds (1.0));
7.43 apps.Stop (Seconds (10.0));
7.44
7.45 // Create a similar flow from n3 to n1, starting at time 1.1 seconds
7.46 onoff.SetUdpRemote (i1i2.GetAddress (0), port);
7.47 - apps = onoff.Build (c.Get (3));
7.48 + apps = onoff.Install (c.Get (3));
7.49 apps.Start(Seconds(1.1));
7.50 apps.Stop (Seconds(10.0));
7.51
7.52 // Create a packet sink to receive these packets
7.53 sink.SetupUdp (Ipv4Address::GetAny (), port);
7.54 - apps = sink.Build (c.Get (1));
7.55 + apps = sink.Install (c.Get (1));
7.56 apps.Start (Seconds (1.1));
7.57 apps.Stop (Seconds (10.0));
7.58
8.1 --- a/examples/simple-global-routing.cc Sun Apr 06 21:57:11 2008 +0100
8.2 +++ b/examples/simple-global-routing.cc Mon Apr 07 10:38:37 2008 -0700
8.3 @@ -86,20 +86,20 @@
8.4 NodeContainer n3n2 = NodeContainer (c.Get(3), c.Get (2));
8.5
8.6 InternetStackHelper internet;
8.7 - internet.Build (c);
8.8 + internet.Install (c);
8.9
8.10 // We create the channels first without any IP addressing information
8.11 NS_LOG_INFO ("Create channels.");
8.12 PointToPointHelper p2p;
8.13 p2p.SetChannelParameter ("BitRate", DataRate (5000000));
8.14 p2p.SetChannelParameter ("Delay", MilliSeconds (2));
8.15 - NetDeviceContainer d0d2 = p2p.Build (n0n2);
8.16 + NetDeviceContainer d0d2 = p2p.Install (n0n2);
8.17
8.18 - NetDeviceContainer d1d2 = p2p.Build (n1n2);
8.19 + NetDeviceContainer d1d2 = p2p.Install (n1n2);
8.20
8.21 p2p.SetChannelParameter ("BitRate", DataRate (1500000));
8.22 p2p.SetChannelParameter ("Delay", MilliSeconds (10));
8.23 - NetDeviceContainer d3d2 = p2p.Build (n3n2);
8.24 + NetDeviceContainer d3d2 = p2p.Install (n3n2);
8.25
8.26 // Later, we add IP addresses.
8.27 NS_LOG_INFO ("Assign IP Addresses.");
8.28 @@ -125,25 +125,25 @@
8.29 onoff.SetAppAttribute ("OnTime", ConstantVariable (1));
8.30 onoff.SetAppAttribute ("OffTime", ConstantVariable (0));
8.31 onoff.SetUdpRemote (i3i2.GetAddress (0), port);
8.32 - ApplicationContainer apps = onoff.Build (c.Get (0));
8.33 + ApplicationContainer apps = onoff.Install (c.Get (0));
8.34 apps.Start (Seconds (1.0));
8.35 apps.Stop (Seconds (10.0));
8.36
8.37 // Create a packet sink to receive these packets
8.38 PacketSinkHelper sink;
8.39 sink.SetupUdp (Ipv4Address::GetAny (), port);
8.40 - apps = sink.Build (c.Get (3));
8.41 + apps = sink.Install (c.Get (3));
8.42 apps.Start (Seconds (1.0));
8.43 apps.Stop (Seconds (10.0));
8.44
8.45 // Create a similar flow from n3 to n1, starting at time 1.1 seconds
8.46 onoff.SetUdpRemote (i1i2.GetAddress (0), port);
8.47 - apps = onoff.Build (c.Get (3));
8.48 + apps = onoff.Install (c.Get (3));
8.49 apps.Start (Seconds (1.1));
8.50 apps.Stop (Seconds (10.0));
8.51
8.52 // Create a packet sink to receive these packets
8.53 - apps = sink.Build (c.Get (1));
8.54 + apps = sink.Install (c.Get (1));
8.55 apps.Start (Seconds (1.1));
8.56 apps.Stop (Seconds (10.0));
8.57
9.1 --- a/examples/simple-point-to-point-olsr.cc Sun Apr 06 21:57:11 2008 +0100
9.2 +++ b/examples/simple-point-to-point-olsr.cc Mon Apr 07 10:38:37 2008 -0700
9.3 @@ -87,19 +87,19 @@
9.4 NodeContainer n34 = NodeContainer (c.Get (3), c.Get (4));
9.5
9.6 InternetStackHelper internet;
9.7 - internet.Build (c);
9.8 + internet.Install (c);
9.9
9.10 // We create the channels first without any IP addressing information
9.11 NS_LOG_INFO ("Create channels.");
9.12 PointToPointHelper p2p;
9.13 p2p.SetChannelParameter ("BitRate", DataRate (5000000));
9.14 p2p.SetChannelParameter ("Delay", MilliSeconds (2));
9.15 - NetDeviceContainer nd02 = p2p.Build (n02);
9.16 - NetDeviceContainer nd12 = p2p.Build (n12);
9.17 + NetDeviceContainer nd02 = p2p.Install (n02);
9.18 + NetDeviceContainer nd12 = p2p.Install (n12);
9.19 p2p.SetChannelParameter ("BitRate", DataRate (1500000));
9.20 p2p.SetChannelParameter ("Delay", MilliSeconds (10));
9.21 - NetDeviceContainer nd32 = p2p.Build (n32);
9.22 - NetDeviceContainer nd34 = p2p.Build (n34);
9.23 + NetDeviceContainer nd32 = p2p.Install (n32);
9.24 + NetDeviceContainer nd34 = p2p.Install (n34);
9.25
9.26 // Later, we add IP addresses.
9.27 NS_LOG_INFO ("Assign IP Addresses.");
9.28 @@ -129,25 +129,25 @@
9.29 onoff.SetAppAttribute ("OnTime", ConstantVariable (1));
9.30 onoff.SetAppAttribute ("OffTime", ConstantVariable (0));
9.31 onoff.SetUdpRemote (i34.GetAddress (1), port);
9.32 - ApplicationContainer apps = onoff.Build (c.Get (0));
9.33 + ApplicationContainer apps = onoff.Install (c.Get (0));
9.34 apps.Start (Seconds (1.0));
9.35 apps.Stop (Seconds (10.0));
9.36
9.37 // Create a packet sink to receive these packets
9.38 PacketSinkHelper sink;
9.39 sink.SetupUdp (Ipv4Address::GetAny (), port);
9.40 - apps = sink.Build (c.Get (3));
9.41 + apps = sink.Install (c.Get (3));
9.42 apps.Start (Seconds (1.0));
9.43 apps.Stop (Seconds (10.0));
9.44
9.45 // Create a similar flow from n3 to n1, starting at time 1.1 seconds
9.46 onoff.SetUdpRemote (i12.GetAddress (0), port);
9.47 - apps = onoff.Build (c.Get (3));
9.48 + apps = onoff.Install (c.Get (3));
9.49 apps.Start (Seconds (1.1));
9.50 apps.Stop (Seconds (10.0));
9.51
9.52 // Create a packet sink to receive these packets
9.53 - apps = sink.Build (c.Get (1));
9.54 + apps = sink.Install (c.Get (1));
9.55 apps.Start (Seconds (1.1));
9.56 apps.Stop (Seconds (10.0));
9.57
10.1 --- a/examples/tcp-large-transfer.cc Sun Apr 06 21:57:11 2008 +0100
10.2 +++ b/examples/tcp-large-transfer.cc Mon Apr 07 10:38:37 2008 -0700
10.3 @@ -139,13 +139,13 @@
10.4 PointToPointHelper p2p;
10.5 p2p.SetChannelParameter ("BitRate", DataRate(10000000));
10.6 p2p.SetChannelParameter ("Delay", MilliSeconds(10));
10.7 - NetDeviceContainer dev0 = p2p.Build (c0);
10.8 - NetDeviceContainer dev1 = p2p.Build (c1);
10.9 + NetDeviceContainer dev0 = p2p.Install (c0);
10.10 + NetDeviceContainer dev1 = p2p.Install (c1);
10.11
10.12 // add ip/tcp stack to nodes.
10.13 NodeContainer c = NodeContainer (c0, c1.Get (1));
10.14 InternetStackHelper internet;
10.15 - internet.Build (c);
10.16 + internet.Install (c);
10.17
10.18 // Later, we add IP addresses.
10.19 Ipv4AddressHelper ipv4;
10.20 @@ -171,7 +171,7 @@
10.21 // Create a packet sink to receive these packets
10.22 PacketSinkHelper sink;
10.23 sink.SetupTcp (Ipv4Address::GetAny (), servPort);
10.24 - ApplicationContainer apps = sink.Build (c1.Get (1));
10.25 + ApplicationContainer apps = sink.Install (c1.Get (1));
10.26 apps.Start (Seconds (0.0));
10.27
10.28 // and generate traffic to remote sink.
11.1 --- a/examples/udp-echo.cc Sun Apr 06 21:57:11 2008 +0100
11.2 +++ b/examples/udp-echo.cc Mon Apr 07 10:38:37 2008 -0700
11.3 @@ -80,7 +80,7 @@
11.4 n.Create (4);
11.5
11.6 InternetStackHelper internet;
11.7 - internet.Build (n);
11.8 + internet.Install (n);
11.9
11.10 NS_LOG_INFO ("Create channels.");
11.11 //
11.12 @@ -89,7 +89,7 @@
11.13 CsmaHelper csma;
11.14 csma.SetChannelParameter ("BitRate", DataRate(5000000));
11.15 csma.SetChannelParameter ("Delay", MilliSeconds (2));
11.16 - NetDeviceContainer d = csma.Build (n);
11.17 + NetDeviceContainer d = csma.Install (n);
11.18
11.19 Ipv4AddressHelper ipv4;
11.20 //
11.21 @@ -106,7 +106,7 @@
11.22 uint16_t port = 9; // well-known echo port number
11.23 UdpEchoServerHelper server;
11.24 server.SetPort (port);
11.25 - ApplicationContainer apps = server.Build (n.Get(1));
11.26 + ApplicationContainer apps = server.Install (n.Get(1));
11.27 apps.Start (Seconds (1.0));
11.28 apps.Stop (Seconds (10.0));
11.29
11.30 @@ -122,7 +122,7 @@
11.31 client.SetAppAttribute ("MaxPackets", Uinteger (maxPacketCount));
11.32 client.SetAppAttribute ("Interval", interPacketInterval);
11.33 client.SetAppAttribute ("PacketSize", Uinteger (packetSize));
11.34 - apps = client.Build (n.Get (0));
11.35 + apps = client.Install (n.Get (0));
11.36 apps.Start (Seconds (2.0));
11.37 apps.Stop (Seconds (10.0));
11.38
12.1 --- a/examples/wifi-adhoc.cc Sun Apr 06 21:57:11 2008 +0100
12.2 +++ b/examples/wifi-adhoc.cc Mon Apr 07 10:38:37 2008 -0700
12.3 @@ -115,9 +115,9 @@
12.4 c.Create (2);
12.5
12.6 PacketSocketHelper packetSocket;
12.7 - packetSocket.Build (c);
12.8 + packetSocket.Install (c);
12.9
12.10 - NetDeviceContainer devices = wifi.Build (c);
12.11 + NetDeviceContainer devices = wifi.Install (c);
12.12
12.13 MobilityHelper mobility;
12.14 Ptr<ListPositionAllocator> positionAlloc = CreateObject<ListPositionAllocator> ();
12.15 @@ -134,7 +134,7 @@
12.16 onoff.SetAppAttribute ("DataRate", DataRate (60000000));
12.17 onoff.SetAppAttribute ("PacketSize", Uinteger (2000));
12.18 onoff.SetPacketRemote (devices.Get (0), devices.Get (1)->GetAddress (), 1);
12.19 - ApplicationContainer apps = onoff.Build (c.Get (0));
12.20 + ApplicationContainer apps = onoff.Install (c.Get (0));
12.21 apps.Start (Seconds (0.5));
12.22 apps.Stop (Seconds (250.0));
12.23
13.1 --- a/examples/wifi-ap.cc Sun Apr 06 21:57:11 2008 +0100
13.2 +++ b/examples/wifi-ap.cc Mon Apr 07 10:38:37 2008 -0700
13.3 @@ -128,8 +128,8 @@
13.4 ap.Create (1);
13.5
13.6 // give packet socket powers to nodes.
13.7 - packetSocket.Build (stas);
13.8 - packetSocket.Build (ap);
13.9 + packetSocket.Install (stas);
13.10 + packetSocket.Install (ap);
13.11
13.12 Ptr<WifiChannel> channel = CreateObject<WifiChannel> ();
13.13 channel->SetPropagationDelayModel (CreateObject<ConstantSpeedPropagationDelayModel> ());
13.14 @@ -143,12 +143,12 @@
13.15 // setup stas.
13.16 wifi.SetMac ("ns3::NqstaWifiMac", "Ssid", ssid,
13.17 "ActiveProbing", Boolean (false));
13.18 - staDevs = wifi.Build (stas, channel);
13.19 + staDevs = wifi.Install (stas, channel);
13.20 // setup ap.
13.21 wifi.SetMac ("ns3::NqapWifiMac", "Ssid", ssid,
13.22 "BeaconGeneration", Boolean (true),
13.23 "BeaconInterval", Seconds (2.5));
13.24 - wifi.Build (ap, channel);
13.25 + wifi.Install (ap, channel);
13.26
13.27 // mobility.
13.28 mobility.Layout (stas);
13.29 @@ -160,7 +160,7 @@
13.30 onoff.SetAppAttribute ("OnTime", ConstantVariable (42));
13.31 onoff.SetAppAttribute ("OffTime", ConstantVariable (0));
13.32 onoff.SetPacketRemote (staDevs.Get (0), staDevs.Get (1)->GetAddress (), 1);
13.33 - ApplicationContainer apps = onoff.Build (stas.Get (0));
13.34 + ApplicationContainer apps = onoff.Install (stas.Get (0));
13.35 apps.Start (Seconds (0.5));
13.36 apps.Stop (Seconds (43.0));
13.37
14.1 --- a/samples/main-simple.cc Sun Apr 06 21:57:11 2008 +0100
14.2 +++ b/samples/main-simple.cc Mon Apr 07 10:38:37 2008 -0700
14.3 @@ -41,7 +41,7 @@
14.4 c.Create (1);
14.5
14.6 InternetStackHelper internet;
14.7 - internet.Build (c);
14.8 + internet.Install (c);
14.9
14.10
14.11 TypeId tid = TypeId::LookupByName ("ns3::Udp");
15.1 --- a/src/helper/csma-helper.cc Sun Apr 06 21:57:11 2008 +0100
15.2 +++ b/src/helper/csma-helper.cc Mon Apr 07 10:38:37 2008 -0700
15.3 @@ -157,14 +157,14 @@
15.4
15.5
15.6 NetDeviceContainer
15.7 -CsmaHelper::Build (const NodeContainer &c)
15.8 +CsmaHelper::Install (const NodeContainer &c)
15.9 {
15.10 Ptr<CsmaChannel> channel = m_channelFactory.Create ()->GetObject<CsmaChannel> ();
15.11 - return Build (c, channel);
15.12 + return Install (c, channel);
15.13 }
15.14
15.15 NetDeviceContainer
15.16 -CsmaHelper::Build (const NodeContainer &c, Ptr<CsmaChannel> channel)
15.17 +CsmaHelper::Install (const NodeContainer &c, Ptr<CsmaChannel> channel)
15.18 {
15.19 NetDeviceContainer container;
15.20 for (NodeContainer::Iterator i = c.Begin (); i != c.End (); i++)
16.1 --- a/src/helper/csma-helper.h Sun Apr 06 21:57:11 2008 +0100
16.2 +++ b/src/helper/csma-helper.h Mon Apr 07 10:38:37 2008 -0700
16.3 @@ -53,7 +53,7 @@
16.4 * \param v4 the value of the attribute to set on the queue
16.5 *
16.6 * Set the type of queue to create and associated to each
16.7 - * CsmaNetDevice created through CsmaHelper::Build.
16.8 + * CsmaNetDevice created through CsmaHelper::Install.
16.9 */
16.10 void SetQueue (std::string type,
16.11 std::string n1 = "", Attribute v1 = Attribute (),
16.12 @@ -66,7 +66,7 @@
16.13 * \param v1 the value of the attribute to set
16.14 *
16.15 * Set these parameters on each ns3::CsmaNetDevice created
16.16 - * by CsmaHelper::Build
16.17 + * by CsmaHelper::Install
16.18 */
16.19 void SetDeviceParameter (std::string n1, Attribute v1);
16.20
16.21 @@ -75,7 +75,7 @@
16.22 * \param v1 the value of the attribute to set
16.23 *
16.24 * Set these parameters on each ns3::CsmaChannel created
16.25 - * by CsmaHelper::Build
16.26 + * by CsmaHelper::Install
16.27 */
16.28 void SetChannelParameter (std::string n1, Attribute v1);
16.29
16.30 @@ -161,9 +161,9 @@
16.31 *
16.32 * This method creates a simple ns3::CsmaChannel with the
16.33 * attributes configured by CsmaHelper::SetChannelParameter and
16.34 - * then calls CsmaHelper::Build.
16.35 + * then calls CsmaHelper::Install.
16.36 */
16.37 - NetDeviceContainer Build (const NodeContainer &c);
16.38 + NetDeviceContainer Install (const NodeContainer &c);
16.39
16.40 /**
16.41 * \param c a set of nodes
16.42 @@ -173,7 +173,7 @@
16.43 * the requested parameters, a queue for this NetDevice, and associate
16.44 * the resulting ns3::NetDevice with the ns3::Node and ns3::CsmaChannel.
16.45 */
16.46 - NetDeviceContainer Build (const NodeContainer &c, Ptr<CsmaChannel> channel);
16.47 + NetDeviceContainer Install (const NodeContainer &c, Ptr<CsmaChannel> channel);
16.48
16.49 private:
16.50 static void RxEvent (Ptr<PcapWriter> writer, Ptr<const Packet> packet);
17.1 --- a/src/helper/internet-stack-helper.cc Sun Apr 06 21:57:11 2008 +0100
17.2 +++ b/src/helper/internet-stack-helper.cc Mon Apr 07 10:38:37 2008 -0700
17.3 @@ -28,7 +28,7 @@
17.4 std::string InternetStackHelper::m_pcapBaseFilename;
17.5
17.6 void
17.7 -InternetStackHelper::Build (NodeContainer c)
17.8 +InternetStackHelper::Install (NodeContainer c)
17.9 {
17.10 for (NodeContainer::Iterator i = c.Begin (); i != c.End (); ++i)
17.11 {
18.1 --- a/src/helper/internet-stack-helper.h Sun Apr 06 21:57:11 2008 +0100
18.2 +++ b/src/helper/internet-stack-helper.h Mon Apr 07 10:38:37 2008 -0700
18.3 @@ -39,7 +39,7 @@
18.4 * For each node in the input container, aggregate implementations
18.5 * of the ns3::Ipv4, ns3::Udp, and, ns3::Tcp classes.
18.6 */
18.7 - void Build (NodeContainer c);
18.8 + void Install (NodeContainer c);
18.9
18.10 /**
18.11 * \param filename filename prefix to use for pcap files.
19.1 --- a/src/helper/on-off-helper.cc Sun Apr 06 21:57:11 2008 +0100
19.2 +++ b/src/helper/on-off-helper.cc Mon Apr 07 10:38:37 2008 -0700
19.3 @@ -59,7 +59,7 @@
19.4 }
19.5
19.6 ApplicationContainer
19.7 -OnOffHelper::Build (NodeContainer c)
19.8 +OnOffHelper::Install (NodeContainer c)
19.9 {
19.10 ApplicationContainer apps;
19.11 for (NodeContainer::Iterator i = c.Begin (); i != c.End (); ++i)
20.1 --- a/src/helper/on-off-helper.h Sun Apr 06 21:57:11 2008 +0100
20.2 +++ b/src/helper/on-off-helper.h Mon Apr 07 10:38:37 2008 -0700
20.3 @@ -42,7 +42,7 @@
20.4
20.5 void SetAppAttribute (std::string name, Attribute value);
20.6
20.7 - ApplicationContainer Build (NodeContainer c);
20.8 + ApplicationContainer Install (NodeContainer c);
20.9
20.10 private:
20.11 std::string m_protocol;
21.1 --- a/src/helper/packet-sink-helper.cc Sun Apr 06 21:57:11 2008 +0100
21.2 +++ b/src/helper/packet-sink-helper.cc Mon Apr 07 10:38:37 2008 -0700
21.3 @@ -42,7 +42,7 @@
21.4 }
21.5
21.6 ApplicationContainer
21.7 -PacketSinkHelper::Build (NodeContainer c)
21.8 +PacketSinkHelper::Install (NodeContainer c)
21.9 {
21.10 ApplicationContainer apps;
21.11 for (NodeContainer::Iterator i = c.Begin (); i != c.End (); ++i)
22.1 --- a/src/helper/packet-sink-helper.h Sun Apr 06 21:57:11 2008 +0100
22.2 +++ b/src/helper/packet-sink-helper.h Mon Apr 07 10:38:37 2008 -0700
22.3 @@ -35,7 +35,7 @@
22.4 void SetupUdp (Ipv4Address ip, uint16_t port);
22.5 void SetupTcp (Ipv4Address ip, uint16_t port);
22.6
22.7 - ApplicationContainer Build (NodeContainer c);
22.8 + ApplicationContainer Install (NodeContainer c);
22.9 private:
22.10 ObjectFactory m_factory;
22.11 };
23.1 --- a/src/helper/packet-socket-helper.cc Sun Apr 06 21:57:11 2008 +0100
23.2 +++ b/src/helper/packet-socket-helper.cc Mon Apr 07 10:38:37 2008 -0700
23.3 @@ -4,7 +4,7 @@
23.4 namespace ns3 {
23.5
23.6 void
23.7 -PacketSocketHelper::Build (NodeContainer c)
23.8 +PacketSocketHelper::Install (NodeContainer c)
23.9 {
23.10 for (NodeContainer::Iterator i = c.Begin (); i != c.End (); ++i)
23.11 {
24.1 --- a/src/helper/packet-socket-helper.h Sun Apr 06 21:57:11 2008 +0100
24.2 +++ b/src/helper/packet-socket-helper.h Mon Apr 07 10:38:37 2008 -0700
24.3 @@ -17,7 +17,7 @@
24.4 * For each node in the input container, aggregate a ns3::PacketSocketFactory
24.5 * object instance.
24.6 */
24.7 - void Build (NodeContainer c);
24.8 + void Install (NodeContainer c);
24.9 };
24.10
24.11 } // namespace ns3
25.1 --- a/src/helper/point-to-point-helper.cc Sun Apr 06 21:57:11 2008 +0100
25.2 +++ b/src/helper/point-to-point-helper.cc Mon Apr 07 10:38:37 2008 -0700
25.3 @@ -156,13 +156,13 @@
25.4 }
25.5
25.6 NetDeviceContainer
25.7 -PointToPointHelper::Build (NodeContainer c)
25.8 +PointToPointHelper::Install (NodeContainer c)
25.9 {
25.10 NS_ASSERT (c.GetN () == 2);
25.11 - return Build (c.Get (0), c.Get (1));
25.12 + return Install (c.Get (0), c.Get (1));
25.13 }
25.14 NetDeviceContainer
25.15 -PointToPointHelper::Build (Ptr<Node> a, Ptr<Node> b)
25.16 +PointToPointHelper::Install (Ptr<Node> a, Ptr<Node> b)
25.17 {
25.18 NetDeviceContainer container;
25.19
26.1 --- a/src/helper/point-to-point-helper.h Sun Apr 06 21:57:11 2008 +0100
26.2 +++ b/src/helper/point-to-point-helper.h Mon Apr 07 10:38:37 2008 -0700
26.3 @@ -53,7 +53,7 @@
26.4 * \param v4 the value of the attribute to set on the queue
26.5 *
26.6 * Set the type of queue to create and associated to each
26.7 - * PointToPointNetDevice created through PointToPointHelper::Build.
26.8 + * PointToPointNetDevice created through PointToPointHelper::Install.
26.9 */
26.10 void SetQueue (std::string type,
26.11 std::string n1 = "", Attribute v1 = Attribute (),
26.12 @@ -66,7 +66,7 @@
26.13 * \param value the value of the attribute to set
26.14 *
26.15 * Set these parameters on each ns3::PointToPointNetDevice created
26.16 - * by PointToPointHelper::Build
26.17 + * by PointToPointHelper::Install
26.18 */
26.19 void SetDeviceParameter (std::string name, Attribute value);
26.20 /**
26.21 @@ -74,7 +74,7 @@
26.22 * \param value the value of the attribute to set
26.23 *
26.24 * Set these parameters on each ns3::PointToPointChannel created
26.25 - * by PointToPointHelper::Build
26.26 + * by PointToPointHelper::Install
26.27 */
26.28 void SetChannelParameter (std::string name, Attribute value);
26.29
26.30 @@ -165,14 +165,14 @@
26.31 * a queue for this ns3::NetDevice, and associate the resulting
26.32 * ns3::NetDevice with the ns3::Node and ns3::PointToPointChannel.
26.33 */
26.34 - NetDeviceContainer Build (NodeContainer c);
26.35 + NetDeviceContainer Install (NodeContainer c);
26.36 /**
26.37 * \param a first node
26.38 * \param b second node
26.39 *
26.40 * Saves you from having to construct a temporary NodeContainer.
26.41 */
26.42 - NetDeviceContainer Build (Ptr<Node> a, Ptr<Node> b);
26.43 + NetDeviceContainer Install (Ptr<Node> a, Ptr<Node> b);
26.44
26.45 private:
26.46 void EnablePcap (Ptr<Node> node, Ptr<NetDevice> device, Ptr<Queue> queue);
27.1 --- a/src/helper/udp-echo-helper.cc Sun Apr 06 21:57:11 2008 +0100
27.2 +++ b/src/helper/udp-echo-helper.cc Mon Apr 07 10:38:37 2008 -0700
27.3 @@ -34,7 +34,7 @@
27.4 m_port = port;
27.5 }
27.6 ApplicationContainer
27.7 -UdpEchoServerHelper::Build (NodeContainer c)
27.8 +UdpEchoServerHelper::Install (NodeContainer c)
27.9 {
27.10 ApplicationContainer apps;
27.11 for (NodeContainer::Iterator i = c.Begin (); i != c.End (); ++i)
27.12 @@ -64,7 +64,7 @@
27.13 }
27.14
27.15 ApplicationContainer
27.16 -UdpEchoClientHelper::Build (NodeContainer c)
27.17 +UdpEchoClientHelper::Install (NodeContainer c)
27.18 {
27.19 ApplicationContainer apps;
27.20 for (NodeContainer::Iterator i = c.Begin (); i != c.End (); ++i)
28.1 --- a/src/helper/udp-echo-helper.h Sun Apr 06 21:57:11 2008 +0100
28.2 +++ b/src/helper/udp-echo-helper.h Mon Apr 07 10:38:37 2008 -0700
28.3 @@ -33,7 +33,7 @@
28.4 public:
28.5 UdpEchoServerHelper ();
28.6 void SetPort (uint16_t port);
28.7 - ApplicationContainer Build (NodeContainer c);
28.8 + ApplicationContainer Install (NodeContainer c);
28.9 private:
28.10 uint16_t m_port;
28.11 };
28.12 @@ -45,7 +45,7 @@
28.13
28.14 void SetRemote (Ipv4Address ip, uint16_t port);
28.15 void SetAppAttribute (std::string name, Attribute value);
28.16 - ApplicationContainer Build (NodeContainer c);
28.17 + ApplicationContainer Install (NodeContainer c);
28.18 private:
28.19 ObjectFactory m_factory;
28.20 Ipv4Address m_remoteIp;
29.1 --- a/src/helper/wifi-helper.cc Sun Apr 06 21:57:11 2008 +0100
29.2 +++ b/src/helper/wifi-helper.cc Mon Apr 07 10:38:37 2008 -0700
29.3 @@ -231,17 +231,17 @@
29.4 }
29.5
29.6 NetDeviceContainer
29.7 -WifiHelper::Build (NodeContainer c) const
29.8 +WifiHelper::Install (NodeContainer c) const
29.9 {
29.10 Ptr<WifiChannel> channel = CreateObject<WifiChannel> ();
29.11 channel->SetPropagationDelayModel (CreateObject<ConstantSpeedPropagationDelayModel> ());
29.12 Ptr<LogDistancePropagationLossModel> log = CreateObject<LogDistancePropagationLossModel> ();
29.13 log->SetReferenceModel (CreateObject<FriisPropagationLossModel> ());
29.14 channel->SetPropagationLossModel (log);
29.15 - return Build (c, channel);
29.16 + return Install (c, channel);
29.17 }
29.18 NetDeviceContainer
29.19 -WifiHelper::Build (NodeContainer c, Ptr<WifiChannel> channel) const
29.20 +WifiHelper::Install (NodeContainer c, Ptr<WifiChannel> channel) const
29.21 {
29.22 NetDeviceContainer devices;
29.23 for (NodeContainer::Iterator i = c.Begin (); i != c.End (); i++)
30.1 --- a/src/helper/wifi-helper.h Sun Apr 06 21:57:11 2008 +0100
30.2 +++ b/src/helper/wifi-helper.h Mon Apr 07 10:38:37 2008 -0700
30.3 @@ -229,7 +229,7 @@
30.4 * attributes specified in WifiHelper::SetRemoteStationManager,
30.5 * WifiHelper::SetMac, and, WifiHelper::SetPhy.
30.6 */
30.7 - NetDeviceContainer Build (NodeContainer c) const;
30.8 + NetDeviceContainer Install (NodeContainer c) const;
30.9 /**
30.10 * \param channel a channel to use
30.11 * \param c a set of nodes
30.12 @@ -244,7 +244,7 @@
30.13 * The user is expected to attach to the input channel a proper
30.14 * ns3::PropagationLossModel, and ns3::PropagationDelayModel.
30.15 */
30.16 - NetDeviceContainer Build (NodeContainer c, Ptr<WifiChannel> channel) const;
30.17 + NetDeviceContainer Install (NodeContainer c, Ptr<WifiChannel> channel) const;
30.18
30.19 private:
30.20 ObjectFactory m_stationManager;
31.1 --- a/tutorial/tutorial-bus-network.cc Sun Apr 06 21:57:11 2008 +0100
31.2 +++ b/tutorial/tutorial-bus-network.cc Mon Apr 07 10:38:37 2008 -0700
31.3 @@ -37,12 +37,12 @@
31.4 n.Create (10);
31.5
31.6 InternetStackHelper internet;
31.7 - internet.Build (n);
31.8 + internet.Install (n);
31.9
31.10 CsmaHelper csma;
31.11 csma.SetChannelParameter ("BitRate", DataRate(10000000));
31.12 csma.SetChannelParameter ("Delay", MilliSeconds(20));
31.13 - NetDeviceContainer nd = csma.Build (n);
31.14 + NetDeviceContainer nd = csma.Install (n);
31.15
31.16 Ipv4AddressHelper ipv4;
31.17 ipv4.SetBase ("10.1.0.0", "255.255.0.0", "0.0.0.3");
31.18 @@ -54,13 +54,13 @@
31.19 client.SetAppAttribute ("MaxPackets", Uinteger (1));
31.20 client.SetAppAttribute ("Interval", Seconds (1.0));
31.21 client.SetAppAttribute ("PacketSize", Uinteger (1024));
31.22 - ApplicationContainer apps = client.Build (n.Get (0));
31.23 + ApplicationContainer apps = client.Install (n.Get (0));
31.24 apps.Start (Seconds (2.0));
31.25 apps.Stop (Seconds (10.0));
31.26
31.27 UdpEchoServerHelper server;
31.28 server.SetPort (port);
31.29 - apps = server.Build (n.Get (1));
31.30 + apps = server.Install (n.Get (1));
31.31 apps.Start (Seconds (1.0));
31.32 apps.Stop (Seconds (10.0));
31.33
32.1 --- a/tutorial/tutorial-csma-echo-ascii-trace.cc Sun Apr 06 21:57:11 2008 +0100
32.2 +++ b/tutorial/tutorial-csma-echo-ascii-trace.cc Mon Apr 07 10:38:37 2008 -0700
32.3 @@ -35,12 +35,12 @@
32.4 n.Create (4);
32.5
32.6 InternetStackHelper internet;
32.7 - internet.Build (n);
32.8 + internet.Install (n);
32.9
32.10 CsmaHelper csma;
32.11 csma.SetChannelParameter ("BitRate", DataRate (5000000));
32.12 csma.SetChannelParameter ("Delay", MilliSeconds (2));
32.13 - NetDeviceContainer nd = csma.Build (n);
32.14 + NetDeviceContainer nd = csma.Install (n);
32.15
32.16 Ipv4AddressHelper ipv4;
32.17 ipv4.SetBase ("10.1.1.0", "255.255.255.0");
32.18 @@ -53,13 +53,13 @@
32.19 client.SetAppAttribute ("MaxPackets", Uinteger (1));
32.20 client.SetAppAttribute ("Interval", Seconds (1.0));
32.21 client.SetAppAttribute ("PacketSize", Uinteger (1024));
32.22 - ApplicationContainer apps = client.Build (n.Get (0));
32.23 + ApplicationContainer apps = client.Install (n.Get (0));
32.24 apps.Start (Seconds (2.0));
32.25 apps.Stop (Seconds (10.0));
32.26
32.27 UdpEchoServerHelper server;
32.28 server.SetPort (port);
32.29 - apps = server.Build (n.Get (1));
32.30 + apps = server.Install (n.Get (1));
32.31 apps.Start (Seconds (1.0));
32.32 apps.Stop (Seconds (10.0));
32.33
33.1 --- a/tutorial/tutorial-csma-echo-pcap-trace.cc Sun Apr 06 21:57:11 2008 +0100
33.2 +++ b/tutorial/tutorial-csma-echo-pcap-trace.cc Mon Apr 07 10:38:37 2008 -0700
33.3 @@ -33,12 +33,12 @@
33.4 n.Create (4);
33.5
33.6 InternetStackHelper internet;
33.7 - internet.Build (n);
33.8 + internet.Install (n);
33.9
33.10 CsmaHelper csma;
33.11 csma.SetChannelParameter ("BitRate", DataRate (5000000));
33.12 csma.SetChannelParameter ("Delay", MilliSeconds (2));
33.13 - NetDeviceContainer nd = csma.Build (n);
33.14 + NetDeviceContainer nd = csma.Install (n);
33.15
33.16 Ipv4AddressHelper ipv4;
33.17 ipv4.SetBase ("10.1.1.0", "255.255.255.0");
33.18 @@ -51,13 +51,13 @@
33.19 client.SetAppAttribute ("MaxPackets", Uinteger (1));
33.20 client.SetAppAttribute ("Interval", Seconds (1.0));
33.21 client.SetAppAttribute ("PacketSize", Uinteger (1024));
33.22 - ApplicationContainer apps = client.Build (n.Get (0));
33.23 + ApplicationContainer apps = client.Install (n.Get (0));
33.24 apps.Start (Seconds (2.0));
33.25 apps.Stop (Seconds (10.0));
33.26
33.27 UdpEchoServerHelper server;
33.28 server.SetPort (port);
33.29 - apps = server.Build (n.Get (1));
33.30 + apps = server.Install (n.Get (1));
33.31 apps.Start (Seconds (1.0));
33.32 apps.Stop (Seconds (10.0));
33.33
34.1 --- a/tutorial/tutorial-csma-echo.cc Sun Apr 06 21:57:11 2008 +0100
34.2 +++ b/tutorial/tutorial-csma-echo.cc Mon Apr 07 10:38:37 2008 -0700
34.3 @@ -33,12 +33,12 @@
34.4 n.Create (4);
34.5
34.6 InternetStackHelper internet;
34.7 - internet.Build (n);
34.8 + internet.Install (n);
34.9
34.10 CsmaHelper csma;
34.11 csma.SetChannelParameter ("BitRate", DataRate (5000000));
34.12 csma.SetChannelParameter ("Delay", MilliSeconds (2));
34.13 - NetDeviceContainer nd = csma.Build (n);
34.14 + NetDeviceContainer nd = csma.Install (n);
34.15
34.16 Ipv4AddressHelper ipv4;
34.17 ipv4.SetBase ("10.1.1.0", "255.255.255.0");
34.18 @@ -51,13 +51,13 @@
34.19 client.SetAppAttribute ("MaxPackets", Uinteger (1));
34.20 client.SetAppAttribute ("Interval", Seconds (1.0));
34.21 client.SetAppAttribute ("PacketSize", Uinteger (1024));
34.22 - ApplicationContainer apps = client.Build (n.Get (0));
34.23 + ApplicationContainer apps = client.Install (n.Get (0));
34.24 apps.Start (Seconds (2.0));
34.25 apps.Stop (Seconds (10.0));
34.26
34.27 UdpEchoServerHelper server;
34.28 server.SetPort (port);
34.29 - apps = server.Build (n.Get (1));
34.30 + apps = server.Install (n.Get (1));
34.31 apps.Start (Seconds (1.0));
34.32 apps.Stop (Seconds (10.0));
34.33
35.1 --- a/tutorial/tutorial-linear-dumbbell.cc Sun Apr 06 21:57:11 2008 +0100
35.2 +++ b/tutorial/tutorial-linear-dumbbell.cc Mon Apr 07 10:38:37 2008 -0700
35.3 @@ -50,12 +50,12 @@
35.4 lan1.Create (4);
35.5
35.6 InternetStackHelper internet;
35.7 - internet.Build (lan1);
35.8 + internet.Install (lan1);
35.9
35.10 CsmaHelper csma;
35.11 csma.SetChannelParameter ("BitRate", DataRate (10000000));
35.12 csma.SetChannelParameter ("Delay", MilliSeconds (2));
35.13 - NetDeviceContainer dev1 = csma.Build (lan1);
35.14 + NetDeviceContainer dev1 = csma.Install (lan1);
35.15 Ipv4AddressHelper ipv4;
35.16 ipv4.SetBase ("10.1.1.0", "255.255.255.0");
35.17 Ipv4InterfaceContainer i1 = ipv4.Allocate (dev1);
35.18 @@ -66,9 +66,9 @@
35.19 //
35.20 NodeContainer lan2;
35.21 lan2.Create (4);
35.22 - internet.Build (lan2);
35.23 + internet.Install (lan2);
35.24
35.25 - NetDeviceContainer dev2 = csma.Build (lan2);
35.26 + NetDeviceContainer dev2 = csma.Install (lan2);
35.27 ipv4.SetBase ("10.1.2.0", "255.255.255.0");
35.28 Ipv4InterfaceContainer i2 = ipv4.Allocate (dev2);
35.29
35.30 @@ -80,7 +80,7 @@
35.31 PointToPointHelper p2p;
35.32 p2p.SetChannelParameter ("BitRate", DataRate (38400));
35.33 p2p.SetChannelParameter ("Delay", MilliSeconds (20));
35.34 - NetDeviceContainer dev3 = p2p.Build (backbone);
35.35 + NetDeviceContainer dev3 = p2p.Install (backbone);
35.36 ipv4.SetBase ("10.1.3.0", "255.255.255.0");
35.37 ipv4.Allocate (dev3);
35.38
35.39 @@ -98,38 +98,38 @@
35.40 client.SetAppAttribute ("MaxPackets", Uinteger (100));
35.41 client.SetAppAttribute ("Interval", Seconds (0.01));
35.42 client.SetAppAttribute ("PacketSize", Uinteger (1024));
35.43 - ApplicationContainer apps = client.Build (lan1.Get (0));
35.44 + ApplicationContainer apps = client.Install (lan1.Get (0));
35.45 apps.Start (Seconds(2.));
35.46 apps.Stop (Seconds (10.0));
35.47
35.48 client.SetRemote (i2.GetAddress (1), port);
35.49 - apps = client.Build (lan1.Get (1));
35.50 + apps = client.Install (lan1.Get (1));
35.51 apps.Start (Seconds(2.1));
35.52 apps.Stop (Seconds (10.0));
35.53
35.54 client.SetRemote (i2.GetAddress (2), port);
35.55 - apps = client.Build (lan1.Get (2));
35.56 + apps = client.Install (lan1.Get (2));
35.57 apps.Start (Seconds(2.2));
35.58 apps.Stop (Seconds (10.0));
35.59
35.60 client.SetRemote (i2.GetAddress (3), port);
35.61 - apps = client.Build (lan1.Get (3));
35.62 + apps = client.Install (lan1.Get (3));
35.63 apps.Start (Seconds(2.3));
35.64 apps.Stop (Seconds (10.0));
35.65
35.66
35.67 UdpEchoServerHelper server;
35.68 server.SetPort (port);
35.69 - apps = server.Build (lan2.Get (0));
35.70 + apps = server.Install (lan2.Get (0));
35.71 apps.Start (Seconds (1.0));
35.72 apps.Stop (Seconds (10.0));
35.73 - apps = server.Build (lan2.Get (1));
35.74 + apps = server.Install (lan2.Get (1));
35.75 apps.Start (Seconds (1.0));
35.76 apps.Stop (Seconds (10.0));
35.77 - apps = server.Build (lan2.Get (2));
35.78 + apps = server.Install (lan2.Get (2));
35.79 apps.Start (Seconds (1.0));
35.80 apps.Stop (Seconds (10.0));
35.81 - apps = server.Build (lan2.Get (3));
35.82 + apps = server.Install (lan2.Get (3));
35.83 apps.Start (Seconds (1.0));
35.84 apps.Stop (Seconds (10.0));
35.85
36.1 --- a/tutorial/tutorial-point-to-point.cc Sun Apr 06 21:57:11 2008 +0100
36.2 +++ b/tutorial/tutorial-point-to-point.cc Mon Apr 07 10:38:37 2008 -0700
36.3 @@ -42,12 +42,12 @@
36.4 n.Create (2);
36.5
36.6 InternetStackHelper internet;
36.7 - internet.Build (n);
36.8 + internet.Install (n);
36.9
36.10 PointToPointHelper p2p;
36.11 p2p.SetChannelParameter ("BitRate", DataRate (38400));
36.12 p2p.SetChannelParameter ("Delay", MilliSeconds (20));
36.13 - NetDeviceContainer nd = p2p.Build (n);
36.14 + NetDeviceContainer nd = p2p.Install (n);
36.15
36.16 Ipv4AddressHelper ipv4;
36.17 ipv4.SetBase ("10.1.1.0", "255.255.255.252");
36.18 @@ -59,13 +59,13 @@
36.19 client.SetAppAttribute ("MaxPackets", Uinteger (1));
36.20 client.SetAppAttribute ("Interval", Seconds (1.0));
36.21 client.SetAppAttribute ("PacketSize", Uinteger (1024));
36.22 - ApplicationContainer apps = client.Build (n.Get (0));
36.23 + ApplicationContainer apps = client.Install (n.Get (0));
36.24 apps.Start (Seconds (2.0));
36.25 apps.Stop (Seconds (10.0));
36.26
36.27 UdpEchoServerHelper server;
36.28 server.SetPort (port);
36.29 - apps = server.Build (n.Get (1));
36.30 + apps = server.Install (n.Get (1));
36.31 apps.Start (Seconds (1.0));
36.32 apps.Stop (Seconds (10.0));
36.33
37.1 --- a/tutorial/tutorial-star-routing.cc Sun Apr 06 21:57:11 2008 +0100
37.2 +++ b/tutorial/tutorial-star-routing.cc Mon Apr 07 10:38:37 2008 -0700
37.3 @@ -53,18 +53,18 @@
37.4 NodeContainer n06 = NodeContainer (n.Get (0), n.Get (6));
37.5
37.6 InternetStackHelper internet;
37.7 - internet.Build (n);
37.8 + internet.Install (n);
37.9
37.10 PointToPointHelper p2p;
37.11 p2p.SetChannelParameter ("BitRate", DataRate (38400));
37.12 p2p.SetChannelParameter ("Delay", MilliSeconds (20));
37.13
37.14 - NetDeviceContainer d01 = p2p.Build (n01);
37.15 - NetDeviceContainer d02 = p2p.Build (n02);
37.16 - NetDeviceContainer d03 = p2p.Build (n03);
37.17 - NetDeviceContainer d04 = p2p.Build (n04);
37.18 - NetDeviceContainer d05 = p2p.Build (n05);
37.19 - NetDeviceContainer d06 = p2p.Build (n06);
37.20 + NetDeviceContainer d01 = p2p.Install (n01);
37.21 + NetDeviceContainer d02 = p2p.Install (n02);
37.22 + NetDeviceContainer d03 = p2p.Install (n03);
37.23 + NetDeviceContainer d04 = p2p.Install (n04);
37.24 + NetDeviceContainer d05 = p2p.Install (n05);
37.25 + NetDeviceContainer d06 = p2p.Install (n06);
37.26
37.27 Ipv4AddressHelper ipv4;
37.28 ipv4.SetBase ("10.1.1.0", "255.255.255.252");
37.29 @@ -84,7 +84,7 @@
37.30
37.31 UdpEchoServerHelper server;
37.32 server.SetPort (port);
37.33 - ApplicationContainer apps = server.Build (n.Get (1));
37.34 + ApplicationContainer apps = server.Install (n.Get (1));
37.35 apps.Start (Seconds (1.0));
37.36 apps.Stop (Seconds (10.0));
37.37
37.38 @@ -93,7 +93,7 @@
37.39 client.SetAppAttribute ("MaxPackets", Uinteger (1));
37.40 client.SetAppAttribute ("Interval", Seconds (1.0));
37.41 client.SetAppAttribute ("PacketSize", Uinteger (1024));
37.42 - apps = client.Build (n.Get (0));
37.43 + apps = client.Install (n.Get (0));
37.44 apps.Start (Seconds (2.0));
37.45 apps.Stop (Seconds (10.0));
37.46
38.1 --- a/tutorial/tutorial-star.cc Sun Apr 06 21:57:11 2008 +0100
38.2 +++ b/tutorial/tutorial-star.cc Mon Apr 07 10:38:37 2008 -0700
38.3 @@ -52,18 +52,18 @@
38.4 NodeContainer n06 = NodeContainer (n.Get (0), n.Get (6));
38.5
38.6 InternetStackHelper internet;
38.7 - internet.Build (n);
38.8 + internet.Install (n);
38.9
38.10 PointToPointHelper p2p;
38.11 p2p.SetChannelParameter ("BitRate", DataRate (38400));
38.12 p2p.SetChannelParameter ("Delay", MilliSeconds (20));
38.13
38.14 - NetDeviceContainer d01 = p2p.Build (n01);
38.15 - NetDeviceContainer d02 = p2p.Build (n02);
38.16 - NetDeviceContainer d03 = p2p.Build (n03);
38.17 - NetDeviceContainer d04 = p2p.Build (n04);
38.18 - NetDeviceContainer d05 = p2p.Build (n05);
38.19 - NetDeviceContainer d06 = p2p.Build (n06);
38.20 + NetDeviceContainer d01 = p2p.Install (n01);
38.21 + NetDeviceContainer d02 = p2p.Install (n02);
38.22 + NetDeviceContainer d03 = p2p.Install (n03);
38.23 + NetDeviceContainer d04 = p2p.Install (n04);
38.24 + NetDeviceContainer d05 = p2p.Install (n05);
38.25 + NetDeviceContainer d06 = p2p.Install (n06);
38.26
38.27 Ipv4AddressHelper ipv4;
38.28 ipv4.SetBase ("10.1.1.0", "255.255.255.252");
38.29 @@ -83,7 +83,7 @@
38.30
38.31 UdpEchoServerHelper server;
38.32 server.SetPort (port);
38.33 - ApplicationContainer apps = server.Build (n.Get (1));
38.34 + ApplicationContainer apps = server.Install (n.Get (1));
38.35 apps.Start (Seconds (1.0));
38.36 apps.Stop (Seconds (10.0));
38.37
38.38 @@ -92,7 +92,7 @@
38.39 client.SetAppAttribute ("MaxPackets", Uinteger (1));
38.40 client.SetAppAttribute ("Interval", Seconds (1.0));
38.41 client.SetAppAttribute ("PacketSize", Uinteger (1024));
38.42 - apps = client.Build (n.Get (0));
38.43 + apps = client.Install (n.Get (0));
38.44 apps.Start (Seconds (2.0));
38.45 apps.Stop (Seconds (10.0));
38.46