diff --git a/doc/tutorial/introduction.texi b/doc/tutorial/introduction.texi index 7d654a2c5..248120e3f 100644 --- a/doc/tutorial/introduction.texi +++ b/doc/tutorial/introduction.texi @@ -1272,14 +1272,14 @@ files. Put the following code after the include statement in @code{simple.cc}. @verbatim #include "ns3/ptr.h" - #include "ns3/internet-node.h" + #include "ns3/internet-stack.h" @end verbatim @cindex include files The ns-3 build system places the core include files it needs into a directory called @code{ns-3} and so whenever you need to include one of the core files you need to explicitly code this. The file @code{ptr.h} defines -the generic smart pointer that we use. The file @code{internet-node.h} +the generic smart pointer that we use. The file @code{internet-stack.h} defines the class InternetNode which, as described above, represents an IP version 4-based computing element in the simulator. @@ -1455,7 +1455,7 @@ something like the following, @verbatim #include "ns3/log.h" #include "ns3/ptr.h" - #include "ns3/internet-node.h" + #include "ns3/internet-stack.h" #include "ns3/csma-channel.h" #include "ns3/mac48-address.h" #include "ns3/csma-net-device.h" @@ -1632,7 +1632,7 @@ following (let's change the log component name and program banner from @verbatim #include "ns3/log.h" #include "ns3/ptr.h" - #include "ns3/internet-node.h" + #include "ns3/internet-stack.h" #include "ns3/csma-channel.h" #include "ns3/mac48-address.h" #include "ns3/csma-net-device.h" @@ -1883,7 +1883,7 @@ source code for the script should look like the following: @verbatim #include "ns3/log.h" #include "ns3/ptr.h" - #include "ns3/internet-node.h" + #include "ns3/internet-stack.h" #include "ns3/csma-channel.h" #include "ns3/mac48-address.h" #include "ns3/csma-net-device.h" diff --git a/doc/tutorial/other.texi b/doc/tutorial/other.texi index 3e4a63a7b..7b24e7809 100644 --- a/doc/tutorial/other.texi +++ b/doc/tutorial/other.texi @@ -103,7 +103,7 @@ convenience: #include "ns3/log.h" #include "ns3/ptr.h" -#include "ns3/internet-node.h" +#include "ns3/internet-stack.h" #include "ns3/point-to-point-channel.h" #include "ns3/mac48-address.h" #include "ns3/point-to-point-net-device.h" @@ -313,7 +313,7 @@ The file @code{tutorial-star.cc} is reproduced here for your convenience: #include "ns3/log.h" #include "ns3/ptr.h" -#include "ns3/internet-node.h" +#include "ns3/internet-stack.h" #include "ns3/point-to-point-channel.h" #include "ns3/mac48-address.h" #include "ns3/point-to-point-net-device.h" @@ -1846,7 +1846,7 @@ provided to the template function @code{CreateObject} means that call @code{GetObject} on the resulting smart pointer. Well, I'm afraid that's not entirely true. It's slightly more complicated. -Take a look at @code{src/internet-node/internet-node.h} and find the class +Take a look at @code{src/internet-stack/internet-stack.h} and find the class declaration for @code{InternetNode}. @verbatim @@ -1956,7 +1956,7 @@ immediately cast to an @code{Ipv4} pointer. Clients will then use the methods specified in the @code{Ipv4} class to access the @code{Ipv4 Object} methods which are, in turn, implemented in the @code{Ipv4Impl} object. -If you now look in the file, @code{src/internet-node/internet-node.cc} you +If you now look in the file, @code{src/internet-stack/internet-stack.cc} you will see the following code in @code{InternetNode::Construct} that creates the @code{Ipv4} Interface and aggregates it. @@ -2013,7 +2013,7 @@ of course). In the case of @code{Ipv4Impl}, you know that the class inherits somehow from @code{Object} since there is a call to @code{AggregateObject} that refers to an instance of an @code{Ipv4Impl}. You will have to go to -the header file @code{src/internet-node/ipv4-impl.h} and find that +the header file @code{src/internet-stack/ipv4-impl.h} and find that @code{Ipv4Impl} inherits from class @code{Ipv4}. You will then have go to the file @code{src/node/ipv4.h} and see that it inherits from @code{Object} and defines a @code{GetTypeId}. Thus the @code{Object} for which you can diff --git a/doc/tutorial/routing.texi b/doc/tutorial/routing.texi index 1c1afb1d7..d8250ee24 100644 --- a/doc/tutorial/routing.texi +++ b/doc/tutorial/routing.texi @@ -2,7 +2,7 @@ @chapter ns-3 routing overview This chapter describes the overall design of routing in the -@code{src/internet-node} +@code{src/internet-stack} module, and some details about the routing approachs currently implemented. @@ -97,7 +97,7 @@ method that allows one to add a routing protocol: void AddRoutingProtocol (Ptr routingProtocol, int16_t priority); @end verbatim -This method is implemented by class Ipv4L3Protocol in the internet-node +This method is implemented by class Ipv4L3Protocol in the internet-stack module. The priority variable above governs the priority in which the routing @@ -174,7 +174,7 @@ There are presently no roadmap plans for IPv6. @node Static routing @section Static routing -The internet-node module provides one routing protocol (Ipv4StaticRouting) +The internet-stack module provides one routing protocol (Ipv4StaticRouting) by default. This routing protocol allows one to add unicast or multicast static routes to a node. @@ -193,7 +193,7 @@ Ipv4Route Ipv4::GetRoute () @uref{http://www.nsnam.org/doxygen/index.html,,Doxygen} documentation provides full documentation of these methods. These methods are forwarding functions to the actual implementation in Ipv4StaticRouting, when using -the internet-node module. +the internet-stack module. @node Multicast routing @section Multicast routing