1.1 --- a/doc/tutorial/introduction.texi Mon Feb 04 12:27:18 2008 -0800
1.2 +++ b/doc/tutorial/introduction.texi Mon Feb 04 12:56:08 2008 -0800
1.3 @@ -1845,11 +1845,11 @@
1.4 }
1.5 @end verbatim
1.6
1.7 -@cindex csma-echo.cc
1.8 +@cindex tutorial-csma-echo.cc
1.9 Just to make sure you don't get caught up in debugging typographical errors
1.10 we have provided this source code for you (along with a copyright header) in
1.11 the @code{tutorial} subdirectory of the @command{ns-3} distribution as
1.12 -@code{csma-echo.cc}. We used this opportunity to do some ``clean up''
1.13 +@code{tutorial-csma-echo.cc}. We used this opportunity to do some ``clean up''
1.14 of some of our example cases by passing parameters using implicit conversion
1.15 sequences and removing some of the named parameters. [These were used for
1.16 pedagogic purposes and were not actually necessary.]
1.17 @@ -1891,28 +1891,28 @@
1.18
1.19 All that needed to be done in order to build the new simulation using the new
1.20 source file was to copy the two lines describing the @code{hello-simulator}
1.21 -program and change the names to @code{csma-echo}. You can see these lines
1.22 -in the @code{wscript} file,
1.23 +program and change the names to @code{tutorial-csma-echo}. You can see these
1.24 +lines in the @code{wscript} file,
1.25
1.26 @verbatim
1.27 def build(bld):
1.28 obj = bld.create_ns3_program('hello-simulator')
1.29 obj.source = 'hello-simulator.cc'
1.30
1.31 - obj = bld.create_ns3_program('csma-echo')
1.32 - obj.source = 'csma-echo.cc'
1.33 + obj = bld.create_ns3_program('tutorial-csma-echo')
1.34 + obj.source = 'tutorial-csma-echo.cc'
1.35
1.36 ...
1.37 @end verbatim
1.38
1.39 When you built the system above, you actually already built this new
1.40 simulation and a number of other examples. Since you have already configured
1.41 -@code{Waf} and built the @code{csma-echo} script, you can run the simulation
1.42 -in the same way as you ran the @code{hello-simulator} script using the
1.43 -@code{waf --run} command:
1.44 +@code{Waf} and built the @code{tutorial-csma-echo} script, you can run the
1.45 +simulation in the same way as you ran the @code{hello-simulator} script using
1.46 +the @code{waf --run} command:
1.47
1.48 @verbatim
1.49 -~/repos/ns-3-dev/tutorial > waf --run csma-echo
1.50 +~/repos/ns-3-dev/tutorial > waf --run tutorial-csma-echo
1.51 Entering directory `~/repos/ns-3-dev/build'
1.52 Compilation finished successfully
1.53 UDP Echo Simulation
2.1 --- a/doc/tutorial/other.texi Mon Feb 04 12:27:18 2008 -0800
2.2 +++ b/doc/tutorial/other.texi Mon Feb 04 12:56:08 2008 -0800
2.3 @@ -37,13 +37,13 @@
2.4 @center @image{pp,,,,png}
2.5
2.6 We have provided a file for you in the @code{tutorial}
2.7 -directory called @code{point-to-point.cc}. You should now be familiar enough
2.8 -with the system to pick out fairly easily what has been changed. Let's focus
2.9 -on the following lines:
2.10 +directory called @code{tutorial-point-to-point.cc}. You should now be
2.11 +familiar enough with the system to pick out fairly easily what has been
2.12 +changed. Let's focus on the following lines:
2.13
2.14 @verbatim
2.15 - Ptr<Node> n0 = Create<InternetNode> ();
2.16 - Ptr<Node> n1 = Create<InternetNode> ();
2.17 + Ptr<Node> n0 = CreateObject<InternetNode> ();
2.18 + Ptr<Node> n1 = CreateObject<InternetNode> ();
2.19
2.20 Ptr<PointToPointChannel> link = PointToPointTopology::AddPointToPointLink (
2.21 n0, n1, DataRate (38400), MilliSeconds (20));
2.22 @@ -79,7 +79,7 @@
2.23 to build and run this example and to locate and interpret the ASCII trace
2.24 file. This is left as an exercise for you.
2.25
2.26 -The file @code{point-to-point.cc} is reproduced here for your
2.27 +The file @code{tutorial-point-to-point.cc} is reproduced here for your
2.28 convenience:
2.29
2.30 @verbatim
2.31 @@ -132,8 +132,8 @@
2.32
2.33 NS_LOG_INFO ("Point to Point Topology Simulation");
2.34
2.35 - Ptr<Node> n0 = Create<InternetNode> ();
2.36 - Ptr<Node> n1 = Create<InternetNode> ();
2.37 + Ptr<Node> n0 = CreateObject<InternetNode> ();
2.38 + Ptr<Node> n1 = CreateObject<InternetNode> ();
2.39
2.40 Ptr<PointToPointChannel> link = PointToPointTopology::AddPointToPointLink (
2.41 n0, n1, DataRate (38400), MilliSeconds (20));
2.42 @@ -143,10 +143,10 @@
2.43
2.44 uint16_t port = 7;
2.45
2.46 - Ptr<UdpEchoClient> client = Create<UdpEchoClient> (n0, "10.1.1.2", port,
2.47 - 1, Seconds(1.), 1024);
2.48 + Ptr<UdpEchoClient> client = CreateObject<UdpEchoClient> (n0, "10.1.1.2",
2.49 + port, 1, Seconds(1.), 1024);
2.50
2.51 - Ptr<UdpEchoServer> server = Create<UdpEchoServer> (n1, port);
2.52 + Ptr<UdpEchoServer> server = CreateObject<UdpEchoServer> (n1, port);
2.53
2.54 server->Start(Seconds(1.));
2.55 client->Start(Seconds(2.));
2.56 @@ -167,7 +167,7 @@
2.57 A point-to-point network is considered a special case of a star network. As
2.58 you might expect, the process of constructing a star network is an extension
2.59 of the very simple process used for a point-to-point link. We have provided
2.60 -a file for you in the @code{tutorial} directory called @code{star.cc}
2.61 +a file for you in the @code{tutorial} directory called @code{tutorial-star.cc}
2.62 that implements a simple star network as seen below.
2.63
2.64 @sp 1
2.65 @@ -190,13 +190,13 @@
2.66 find and understand the code that creates these nodes.
2.67
2.68 @verbatim
2.69 - Ptr<Node> n0 = Create<InternetNode> ();
2.70 - Ptr<Node> n1 = Create<InternetNode> ();
2.71 - Ptr<Node> n2 = Create<InternetNode> ();
2.72 - Ptr<Node> n3 = Create<InternetNode> ();
2.73 - Ptr<Node> n4 = Create<InternetNode> ();
2.74 - Ptr<Node> n5 = Create<InternetNode> ();
2.75 - Ptr<Node> n6 = Create<InternetNode> ();
2.76 + Ptr<Node> n0 = CreateObject<InternetNode> ();
2.77 + Ptr<Node> n1 = CreateObject<InternetNode> ();
2.78 + Ptr<Node> n2 = CreateObject<InternetNode> ();
2.79 + Ptr<Node> n3 = CreateObject<InternetNode> ();
2.80 + Ptr<Node> n4 = CreateObject<InternetNode> ();
2.81 + Ptr<Node> n5 = CreateObject<InternetNode> ();
2.82 + Ptr<Node> n6 = CreateObject<InternetNode> ();
2.83 @end verbatim
2.84
2.85 Next, we get into the differences between the @code{PointToPointTopology}
2.86 @@ -290,7 +290,7 @@
2.87 to build and run this example and to locate and interpret the ASCII trace
2.88 file. This is left as an exercise for you.
2.89
2.90 -The file @code{star.cc} is reproduced here for your convenience:
2.91 +The file @code{tutorial-star.cc} is reproduced here for your convenience:
2.92
2.93 @verbatim
2.94 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
2.95 @@ -345,13 +345,13 @@
2.96
2.97 NS_LOG_INFO ("Star Topology Simulation");
2.98
2.99 - Ptr<Node> n0 = Create<InternetNode> ();
2.100 - Ptr<Node> n1 = Create<InternetNode> ();
2.101 - Ptr<Node> n2 = Create<InternetNode> ();
2.102 - Ptr<Node> n3 = Create<InternetNode> ();
2.103 - Ptr<Node> n4 = Create<InternetNode> ();
2.104 - Ptr<Node> n5 = Create<InternetNode> ();
2.105 - Ptr<Node> n6 = Create<InternetNode> ();
2.106 + Ptr<Node> n0 = CreateObject<InternetNode> ();
2.107 + Ptr<Node> n1 = CreateObject<InternetNode> ();
2.108 + Ptr<Node> n2 = CreateObject<InternetNode> ();
2.109 + Ptr<Node> n3 = CreateObject<InternetNode> ();
2.110 + Ptr<Node> n4 = CreateObject<InternetNode> ();
2.111 + Ptr<Node> n5 = CreateObject<InternetNode> ();
2.112 + Ptr<Node> n6 = CreateObject<InternetNode> ();
2.113
2.114 Ptr<PointToPointChannel> link01 =
2.115 PointToPointIpv4Topology::CreateChannel (DataRate (38400),
2.116 @@ -439,10 +439,10 @@
2.117
2.118 uint16_t port = 7;
2.119
2.120 - Ptr<UdpEchoClient> client = Create<UdpEchoClient> (n0, "10.1.1.2", port,
2.121 - 1, Seconds(1.), 1024);
2.122 + Ptr<UdpEchoClient> client = CreateObject<UdpEchoClient> (n0, "10.1.1.2",
2.123 + port, 1, Seconds(1.), 1024);
2.124
2.125 - Ptr<UdpEchoServer> server = Create<UdpEchoServer> (n1, port);
2.126 + Ptr<UdpEchoServer> server = CreateObject<UdpEchoServer> (n1, port);
2.127
2.128 server->Start(Seconds(1.));
2.129 client->Start(Seconds(2.));
2.130 @@ -470,7 +470,7 @@
2.131 enable internetwork routing.
2.132
2.133 We have provided a file for you in the @code{tutorial} directory called
2.134 -@code{star-routing.cc} to show you how this is done. This extremely
2.135 +@code{tutorial-star-routing.cc} to show you how this is done. This extremely
2.136 tricky and difficult change is shown below:
2.137
2.138 @verbatim
2.139 @@ -483,11 +483,11 @@
2.140 We changed the client application so that it runs on node four:
2.141
2.142 @verbatim
2.143 - Ptr<UdpEchoClient> client = Create<UdpEchoClient> (n4, "10.1.1.2", port,
2.144 - 1, Seconds(1.), 1024);
2.145 + Ptr<UdpEchoClient> client = CreateObject<UdpEchoClient> (n4, "10.1.1.2",
2.146 + port, 1, Seconds(1.), 1024);
2.147 @end verbatim
2.148
2.149 -Now if you build and run @code{star-routing.cc} you can examine the
2.150 +Now if you build and run @code{tutorial-star-routing.cc} you can examine the
2.151 @code{tutorial.tr} file and see that your UDP echo packets are now correctly
2.152 routed through the topology.
2.153
2.154 @@ -508,7 +508,7 @@
2.155
2.156 We have provided a file that constructs this dumbbell network and creates
2.157 enough data flowing across the choke point that some packets will be dropped.
2.158 -The file is called @code{linear-dumbbell.cc} and is located in the
2.159 +The file is called @code{tutorial-linear-dumbbell.cc} and is located in the
2.160 @code{tutorial} directory. We have already covered all of the code used to
2.161 create this network, so we will just quickly go over the main sections of the
2.162 script.
2.163 @@ -521,10 +521,10 @@
2.164 //
2.165 // Create the lan on the left side of the dumbbell.
2.166 //
2.167 - Ptr<Node> n0 = Create<InternetNode> ();
2.168 - Ptr<Node> n1 = Create<InternetNode> ();
2.169 - Ptr<Node> n2 = Create<InternetNode> ();
2.170 - Ptr<Node> n3 = Create<InternetNode> ();
2.171 + Ptr<Node> n0 = CreateObject<InternetNode> ();
2.172 + Ptr<Node> n1 = CreateObject<InternetNode> ();
2.173 + Ptr<Node> n2 = CreateObject<InternetNode> ();
2.174 + Ptr<Node> n3 = CreateObject<InternetNode> ();
2.175
2.176 Ptr<CsmaChannel> lan1 =
2.177 CsmaTopology::CreateCsmaChannel (DataRate (10000000), MilliSeconds (2));
2.178 @@ -554,10 +554,10 @@
2.179 //
2.180 // Create the lan on the right side of the dumbbell.
2.181 //
2.182 - Ptr<Node> n4 = Create<InternetNode> ();
2.183 - Ptr<Node> n5 = Create<InternetNode> ();
2.184 - Ptr<Node> n6 = Create<InternetNode> ();
2.185 - Ptr<Node> n7 = Create<InternetNode> ();
2.186 + Ptr<Node> n4 = CreateObject<InternetNode> ();
2.187 + Ptr<Node> n5 = CreateObject<InternetNode> ();
2.188 + Ptr<Node> n6 = CreateObject<InternetNode> ();
2.189 + Ptr<Node> n7 = CreateObject<InternetNode> ();
2.190
2.191 Ptr<CsmaChannel> lan2 =
2.192 CsmaTopology::CreateCsmaChannel (DataRate (10000000), MilliSeconds (2));
2.193 @@ -615,19 +615,19 @@
2.194 //
2.195 uint16_t port = 7;
2.196
2.197 - Ptr<UdpEchoClient> client0 = Create<UdpEchoClient> (n0, "10.1.2.1", port,
2.198 - 100, Seconds(.01), 1024);
2.199 - Ptr<UdpEchoClient> client1 = Create<UdpEchoClient> (n1, "10.1.2.2", port,
2.200 - 100, Seconds(.01), 1024);
2.201 - Ptr<UdpEchoClient> client2 = Create<UdpEchoClient> (n2, "10.1.2.3", port,
2.202 - 100, Seconds(.01), 1024);
2.203 - Ptr<UdpEchoClient> client3 = Create<UdpEchoClient> (n3, "10.1.2.4", port,
2.204 - 100, Seconds(.01), 1024);
2.205 + Ptr<UdpEchoClient> client0 = CreateObject<UdpEchoClient> (n0, "10.1.2.1",
2.206 + port, 100, Seconds(.01), 1024);
2.207 + Ptr<UdpEchoClient> client1 = CreateObject<UdpEchoClient> (n1, "10.1.2.2",
2.208 + port, 100, Seconds(.01), 1024);
2.209 + Ptr<UdpEchoClient> client2 = CreateObject<UdpEchoClient> (n2, "10.1.2.3",
2.210 + port, 100, Seconds(.01), 1024);
2.211 + Ptr<UdpEchoClient> client3 = CreateObject<UdpEchoClient> (n3, "10.1.2.4",
2.212 + port, 100, Seconds(.01), 1024);
2.213
2.214 - Ptr<UdpEchoServer> server4 = Create<UdpEchoServer> (n4, port);
2.215 - Ptr<UdpEchoServer> server5 = Create<UdpEchoServer> (n5, port);
2.216 - Ptr<UdpEchoServer> server6 = Create<UdpEchoServer> (n6, port);
2.217 - Ptr<UdpEchoServer> server7 = Create<UdpEchoServer> (n7, port);
2.218 + Ptr<UdpEchoServer> server4 = CreateObject<UdpEchoServer> (n4, port);
2.219 + Ptr<UdpEchoServer> server5 = CreateObject<UdpEchoServer> (n5, port);
2.220 + Ptr<UdpEchoServer> server6 = CreateObject<UdpEchoServer> (n6, port);
2.221 + Ptr<UdpEchoServer> server7 = CreateObject<UdpEchoServer> (n7, port);
2.222
2.223 server4->Start(Seconds(1.));
2.224 server5->Start(Seconds(1.));
2.225 @@ -651,10 +651,10 @@
2.226 @end verbatim
2.227
2.228 The remainder of the file should be quite familiar to you. Go ahead and
2.229 -run @code{linear-dumbbell}. Now take a look at the trace (@code{tutorial.tr})
2.230 -file. You will now see trace lines that begin with @code{d}. Alternatively
2.231 -you can search for the string ``queue-drop'' which is the expansion of the
2.232 -drop code.
2.233 +run @code{tutorial-linear-dumbbell}. Now take a look at the trace
2.234 +(@code{tutorial.tr}) file. You will now see trace lines that begin with
2.235 +@code{d}. Alternatively you can search for the string ``queue-drop'' which
2.236 +is the expansion of the drop code ('d').
2.237
2.238 Interpretation of a dropped packet is straightforward. We have expanded
2.239 the first @code{queue-drop} trace for you below. See the section on ASCII
2.240 @@ -699,7 +699,7 @@
2.241 We have written a number of @command{ns-3} scripts in C++. Although we have
2.242 been perfectly linear in our script implementations, just like any other C++
2.243 program, an @command{ns-3} script can use any features of the language you
2.244 -desire. If you will look back at the @code{linear-dumbbell.cc}
2.245 +desire. If you will look back at the @code{tutorial-linear-dumbbell.cc}
2.246 example, you may notice that the code to create the left and right sides of
2.247 the dumbbell is operationally identical --- only the names change. An obvious
2.248 improvement of this program would be to use subroutines to create the sides.
2.249 @@ -841,12 +841,12 @@
2.250 @end verbatim
2.251
2.252 That's it. We have actually already walked through almost all of the code
2.253 -required to construct a bus network in our @code{csma-echo.cc}
2.254 +required to construct a bus network in our @code{tutorial-csma-echo.cc}
2.255 example, so let's just jump forward and take a look at an implementation
2.256 of this thing. We provide an implementation for you in the files
2.257 @code{ipv4-bus-network.h} and @code{ipv4-bus-network.cc} located in the
2.258 @code{tutorial} directory. We also provide an example that uses the new
2.259 -class in the file @code{bus-network.cc}.
2.260 +class in the file @code{tutorial-bus-network.cc}.
2.261
2.262 The interesting method from our current perspective is the Ipv4BusNetwork
2.263 constructor, shown below:
2.264 @@ -869,7 +869,7 @@
2.265
2.266 for (uint32_t i = 0; i < n; ++i)
2.267 {
2.268 - Ptr<Node> node = Create<InternetNode> ();
2.269 + Ptr<Node> node = CreateObject<InternetNode> ();
2.270 uint32_t nd = CsmaIpv4Topology::AddIpv4CsmaNetDevice (node, m_channel,
2.271 Mac48Address::Allocate ());
2.272 Ipv4Address address = Ipv4AddressGenerator::AllocateAddress (mask,
2.273 @@ -978,7 +978,7 @@
2.274
2.275 for (uint32_t i = 0; i < n; ++i)
2.276 {
2.277 - Ptr<Node> node = Create<InternetNode> ();
2.278 + Ptr<Node> node = CreateObject<InternetNode> ();
2.279 uint32_t nd = CsmaIpv4Topology::AddIpv4CsmaNetDevice (node, m_channel,
2.280 Mac48Address::Allocate ());
2.281 Ipv4Address address = Ipv4AddressGenerator::AllocateAddress (mask,
2.282 @@ -1125,7 +1125,7 @@
2.283 @code{Create} as in the following example:
2.284
2.285 @verbatim
2.286 - Ptr<Node> n0 = Create<InternetNode> ();
2.287 + Ptr<Node> n0 = CreateObject<InternetNode> ();
2.288 @end verbatim
2.289
2.290 This line of code, while it may be unfamiliar to some, is pure C++. If you
2.291 @@ -1393,9 +1393,9 @@
2.292 following code should be obvious to you by now:
2.293
2.294 @verbatim
2.295 - Ptr<A> a = Create<A> ();
2.296 - Ptr<B> b = Create<B> ();
2.297 - Ptr<C> c = Create<C> ();
2.298 + Ptr<A> a = CreateObject<A> ();
2.299 + Ptr<B> b = CreateObject<B> ();
2.300 + Ptr<C> c = CreateObject<C> ();
2.301 @end verbatim
2.302
2.303 When you create an aggregation, you pick one of the Interfaces to act as
2.304 @@ -1588,8 +1588,8 @@
2.305 as we usually do,
2.306
2.307 @verbatim
2.308 -Ptr<Base> base = Create<Base> ();
2.309 -Ptr<Derived> derived = Create<Derived> ();
2.310 +Ptr<Base> base = CreateObject<Base> ();
2.311 +Ptr<Derived> derived = CreateObject<Derived> ();
2.312 @end verbatim
2.313
2.314 The derived and base @code{InterfaceIds} are either present or not present
2.315 @@ -1621,7 +1621,7 @@
2.316 find code like the following in @code{samples/simple-point-to-point.cc}:
2.317
2.318 @verbatim
2.319 - Ptr<Node> n = Create<InternetNode> ();
2.320 + Ptr<Node> n = CreateObject<InternetNode> ();
2.321 @end verbatim
2.322
2.323 This code is described in detail in previous sections, but the important thing
2.324 @@ -1696,7 +1696,7 @@
2.325 from class @code{Node}):
2.326
2.327 @verbatim
2.328 - Ptr<Ipv4Impl> ipv4Impl = Create<Ipv4Impl> (ipv4);
2.329 + Ptr<Ipv4Impl> ipv4Impl = CreateObject<Ipv4Impl> (ipv4);
2.330 ...
2.331 Object::AddInterface (ipv4Impl);
2.332 @end verbatim
2.333 @@ -1727,7 +1727,7 @@
2.334 following code:
2.335
2.336 @verbatim
2.337 - Ptr<Node> n0 = Create<InternetNode> ();
2.338 + Ptr<Node> n0 = CreateObject<InternetNode> ();
2.339 ...
2.340 Ptr<Ipv4> ipv4;
2.341 ipv4 = n0->QueryInterface<Ipv4> (Ipv4::iid);
3.1 --- a/doc/tutorial/output.texi Mon Feb 04 12:27:18 2008 -0800
3.2 +++ b/doc/tutorial/output.texi Mon Feb 04 12:56:08 2008 -0800
3.3 @@ -108,7 +108,7 @@
3.4
3.5 Try running the following program from the command line:
3.6 @verbatim
3.7 - ./waf --run csma-echo-ascii-trace
3.8 + ./waf --run tutorial-csma-echo-ascii-trace
3.9 @end verbatim
3.10
3.11 @cindex tutorial.tr
3.12 @@ -391,12 +391,12 @@
3.13 many tools available for analyzing pcap traces; below, we show how
3.14 tcpdump and Wireshark can be used..
3.15
3.16 -@cindex csma-echo-ascii-trace.cc
3.17 -@cindex csma-echo-pcap-trace.cc
3.18 +@cindex tutorial-csma-echo-ascii-trace.cc
3.19 +@cindex tutorial-csma-echo-pcap-trace.cc
3.20 The code used to enable pcap tracing is similar to that for ASCII tracing.
3.21 -We have provided another file, @code{csma-echo-pcap-trace.cc} that uses the
3.22 -pcap trace wrapper. We have added the code to include the pcap trace wrapper
3.23 -defintions:
3.24 +We have provided another file, @code{tutorial-csma-echo-pcap-trace.cc} that
3.25 +uses the pcap trace wrapper. We have added the code to include the pcap
3.26 +trace wrapper defintions:
3.27
3.28 @verbatim
3.29 #include "ns3/pcap-trace.h"
3.30 @@ -432,7 +432,7 @@
3.31
3.32 @cindex Waf
3.33 @verbatim
3.34 - ./waf --run csma-echo-pcap-trace
3.35 + ./waf --run tutorial-csma-echo-pcap-trace
3.36 @end verbatim
3.37
3.38 If you look at the top level directory of your distribution, you should now
4.1 --- a/tutorial/energy.cc Mon Feb 04 12:27:18 2008 -0800
4.2 +++ b/tutorial/energy.cc Mon Feb 04 12:56:08 2008 -0800
4.3 @@ -64,8 +64,8 @@
4.4 NS_LOG_INFO ("Creating Applications");
4.5 uint16_t port = 7;
4.6
4.7 - Ptr<UdpEchoClient> client =
4.8 - CreateObject<UdpEchoClient> (n0, "10.1.1.2", port, 1, Seconds(1.), 1024);
4.9 + Ptr<UdpEchoClient> client = CreateObject<UdpEchoClient> (n0, "10.1.1.2",
4.10 + port, 1, Seconds(1.), 1024);
4.11
4.12 Ptr<UdpEchoServer> server = CreateObject<UdpEchoServer> (n1, port);
4.13
5.1 --- a/tutorial/tutorial-bus-network.cc Mon Feb 04 12:27:18 2008 -0800
5.2 +++ b/tutorial/tutorial-bus-network.cc Mon Feb 04 12:56:08 2008 -0800
5.3 @@ -41,8 +41,8 @@
5.4 uint32_t port = 7;
5.5
5.6 Ptr<Node> n0 = bus.GetNode (0);
5.7 - Ptr<UdpEchoClient> client = CreateObject<UdpEchoClient> (n0, "10.1.0.1", port,
5.8 - 1, Seconds(1.), 1024);
5.9 + Ptr<UdpEchoClient> client = CreateObject<UdpEchoClient> (n0, "10.1.0.1",
5.10 + port, 1, Seconds(1.), 1024);
5.11
5.12 Ptr<Node> n1 = bus.GetNode (1);
5.13 Ptr<UdpEchoServer> server = CreateObject<UdpEchoServer> (n1, port);
6.1 --- a/tutorial/tutorial-csma-echo-ascii-trace.cc Mon Feb 04 12:27:18 2008 -0800
6.2 +++ b/tutorial/tutorial-csma-echo-ascii-trace.cc Mon Feb 04 12:56:08 2008 -0800
6.3 @@ -66,8 +66,8 @@
6.4
6.5 uint16_t port = 7;
6.6
6.7 - Ptr<UdpEchoClient> client = CreateObject<UdpEchoClient> (n0, "10.1.1.2", port,
6.8 - 1, Seconds(1.), 1024);
6.9 + Ptr<UdpEchoClient> client = CreateObject<UdpEchoClient> (n0, "10.1.1.2",
6.10 + port, 1, Seconds(1.), 1024);
6.11
6.12 Ptr<UdpEchoServer> server = CreateObject<UdpEchoServer> (n1, port);
6.13
7.1 --- a/tutorial/tutorial-csma-echo-pcap-trace.cc Mon Feb 04 12:27:18 2008 -0800
7.2 +++ b/tutorial/tutorial-csma-echo-pcap-trace.cc Mon Feb 04 12:56:08 2008 -0800
7.3 @@ -67,8 +67,8 @@
7.4
7.5 uint16_t port = 7;
7.6
7.7 - Ptr<UdpEchoClient> client = CreateObject<UdpEchoClient> (n0, "10.1.1.2", port,
7.8 - 1, Seconds(1.), 1024);
7.9 + Ptr<UdpEchoClient> client = CreateObject<UdpEchoClient> (n0, "10.1.1.2",
7.10 + port, 1, Seconds(1.), 1024);
7.11
7.12 Ptr<UdpEchoServer> server = CreateObject<UdpEchoServer> (n1, port);
7.13
8.1 --- a/tutorial/tutorial-csma-echo.cc Mon Feb 04 12:27:18 2008 -0800
8.2 +++ b/tutorial/tutorial-csma-echo.cc Mon Feb 04 12:56:08 2008 -0800
8.3 @@ -65,8 +65,8 @@
8.4
8.5 uint16_t port = 7;
8.6
8.7 - Ptr<UdpEchoClient> client = CreateObject<UdpEchoClient> (n0, "10.1.1.2", port,
8.8 - 1, Seconds(1.), 1024);
8.9 + Ptr<UdpEchoClient> client = CreateObject<UdpEchoClient> (n0, "10.1.1.2",
8.10 + port, 1, Seconds(1.), 1024);
8.11
8.12 Ptr<UdpEchoServer> server = CreateObject<UdpEchoServer> (n1, port);
8.13
9.1 --- a/tutorial/tutorial-linear-dumbbell.cc Mon Feb 04 12:27:18 2008 -0800
9.2 +++ b/tutorial/tutorial-linear-dumbbell.cc Mon Feb 04 12:56:08 2008 -0800
9.3 @@ -124,14 +124,14 @@
9.4 //
9.5 uint16_t port = 7;
9.6
9.7 - Ptr<UdpEchoClient> client0 = CreateObject<UdpEchoClient> (n0, "10.1.2.1", port,
9.8 - 100, Seconds(.01), 1024);
9.9 - Ptr<UdpEchoClient> client1 = CreateObject<UdpEchoClient> (n1, "10.1.2.2", port,
9.10 - 100, Seconds(.01), 1024);
9.11 - Ptr<UdpEchoClient> client2 = CreateObject<UdpEchoClient> (n2, "10.1.2.3", port,
9.12 - 100, Seconds(.01), 1024);
9.13 - Ptr<UdpEchoClient> client3 = CreateObject<UdpEchoClient> (n3, "10.1.2.4", port,
9.14 - 100, Seconds(.01), 1024);
9.15 + Ptr<UdpEchoClient> client0 = CreateObject<UdpEchoClient> (n0, "10.1.2.1",
9.16 + port, 100, Seconds(.01), 1024);
9.17 + Ptr<UdpEchoClient> client1 = CreateObject<UdpEchoClient> (n1, "10.1.2.2",
9.18 + port, 100, Seconds(.01), 1024);
9.19 + Ptr<UdpEchoClient> client2 = CreateObject<UdpEchoClient> (n2, "10.1.2.3",
9.20 + port, 100, Seconds(.01), 1024);
9.21 + Ptr<UdpEchoClient> client3 = CreateObject<UdpEchoClient> (n3, "10.1.2.4",
9.22 + port, 100, Seconds(.01), 1024);
9.23
9.24 Ptr<UdpEchoServer> server4 = CreateObject<UdpEchoServer> (n4, port);
9.25 Ptr<UdpEchoServer> server5 = CreateObject<UdpEchoServer> (n5, port);
10.1 --- a/tutorial/tutorial-point-to-point.cc Mon Feb 04 12:27:18 2008 -0800
10.2 +++ b/tutorial/tutorial-point-to-point.cc Mon Feb 04 12:56:08 2008 -0800
10.3 @@ -58,8 +58,8 @@
10.4
10.5 uint16_t port = 7;
10.6
10.7 - Ptr<UdpEchoClient> client = CreateObject<UdpEchoClient> (n0, "10.1.1.2", port,
10.8 - 1, Seconds(1.), 1024);
10.9 + Ptr<UdpEchoClient> client = CreateObject<UdpEchoClient> (n0, "10.1.1.2",
10.10 + port, 1, Seconds(1.), 1024);
10.11
10.12 Ptr<UdpEchoServer> server = CreateObject<UdpEchoServer> (n1, port);
10.13
11.1 --- a/tutorial/tutorial-star-routing.cc Mon Feb 04 12:27:18 2008 -0800
11.2 +++ b/tutorial/tutorial-star-routing.cc Mon Feb 04 12:56:08 2008 -0800
11.3 @@ -145,8 +145,8 @@
11.4
11.5 uint16_t port = 7;
11.6
11.7 - Ptr<UdpEchoClient> client = CreateObject<UdpEchoClient> (n4, "10.1.1.2", port,
11.8 - 1, Seconds(1.), 1024);
11.9 + Ptr<UdpEchoClient> client = CreateObject<UdpEchoClient> (n4, "10.1.1.2",
11.10 + port, 1, Seconds(1.), 1024);
11.11
11.12 Ptr<UdpEchoServer> server = CreateObject<UdpEchoServer> (n1, port);
11.13
12.1 --- a/tutorial/tutorial-star.cc Mon Feb 04 12:27:18 2008 -0800
12.2 +++ b/tutorial/tutorial-star.cc Mon Feb 04 12:56:08 2008 -0800
12.3 @@ -145,8 +145,8 @@
12.4
12.5 uint16_t port = 7;
12.6
12.7 - Ptr<UdpEchoClient> client = CreateObject<UdpEchoClient> (n0, "10.1.1.2", port,
12.8 - 1, Seconds(1.), 1024);
12.9 + Ptr<UdpEchoClient> client = CreateObject<UdpEchoClient> (n0, "10.1.1.2",
12.10 + port, 1, Seconds(1.), 1024);
12.11
12.12 Ptr<UdpEchoServer> server = CreateObject<UdpEchoServer> (n1, port);
12.13