Attachment #126 for bug #167

View | Details | Raw Unified | Return to bug 167
Collapse All | Expand All




                              "Bounds", Rectangle (0, 1000, 0, 1000),
                              "Speed", ConstantVariable (2000),
                              "Pause", ConstantVariable (0.2));
  mobility.Install (backbone);

  /////////////////////////////////////////////////////////////////////////// 
  //                                                                       //

  // the "172.16 address space
  ipAddrs.SetBase ("172.16.0.0", "255.255.255.0");


  for (uint32_t i = 0; i < backboneNodes; ++i)
    {
      NS_LOG_INFO ("Configuring local area network for backbone node " << i);
      //
      // Create a container to manage the nodes of the LAN.  We need
      // two containers here; one with all of the new nodes, and one
      // with all of the nodes including new and existing nodes
      //
      NodeContainer newLanNodes;
      newLanNodes.Create (lanNodes - 1);
      // Now, create the container with all nodes on this link
      NodeContainer lan (backbone.Get (i), newLanNodes);
      //
      // Create the CSMA net devices and install them into the nodes in our 
      // collection.

      csma.SetChannelParameter ("Delay", MilliSeconds (2));
      NetDeviceContainer lanDevices = csma.Install (lan);
      //
      // Add the IPv4 protocol stack to the new LAN nodes
      //
      internet.Install (newLanNodes);
      //
      // Assign IPv4 addresses to the device drivers (actually to the 
      // associated IPv4 interfaces) we just created.

    {
      NS_LOG_INFO ("Configuring wireless network for backbone node " << i);
      //
      // Create a container to manage the nodes of the LAN.  We need
      // two containers here; one with all of the new nodes, and one
      // with all of the nodes including new and existing nodes
      //
      NodeContainer newInfraNodes;
      newInfraNodes.Create (infraNodes - 1);
      // Now, create the container with all nodes on this link
      NodeContainer infra (backbone.Get (i), newInfraNodes);
      //
      // Create another ad hoc network and devices
      //


      // Add the IPv4 protocol stack to the nodes in our container
      //
      internet.Install (newInfraNodes);
      //
      // Assign IPv4 addresses to the device drivers (actually to the associated
      // IPv4 interfaces) we just created.

                                 "Bounds", Rectangle (-25, 25, -25, 25),
                                 "Speed", ConstantVariable (30),
                                 "Pause", ConstantVariable (0.4));
      mobility.Install (infra);
    }
  /////////////////////////////////////////////////////////////////////////// 
  //                                                                       //


  NS_LOG_INFO ("Enabling OLSR routing on all backbone nodes");
  OlsrHelper olsr;
  olsr.Install (backbone);

  /////////////////////////////////////////////////////////////////////////// 
  //                                                                       //

(-)a/examples/simple-point-to-point-olsr.cc (-1 / +1 lines)

Lines 120-126 main (int argc, char *argv[])	Link Here

120

  // Enable OLSR

120

  // Enable OLSR

121

  NS_LOG_INFO ("Enabling OLSR Routing.");

121

  NS_LOG_INFO ("Enabling OLSR Routing.");

122

  OlsrHelper olsr;

122

  OlsrHelper olsr;

123

  olsr.EnableAll ();

123

  olsr.InstallAll ();

124

125

  // Create the OnOff application to send UDP datagrams of size

125

  // Create the OnOff application to send UDP datagrams of size

126

  // 210 bytes at a rate of 448 Kb/s

126

  // 210 bytes at a rate of 448 Kb/s

(-)a/examples/wifi-adhoc.cc (-1 / +1 lines)

Lines 126-132 Experiment::Run (const WifiHelper &wifi)	Link Here

126

  mobility.SetPositionAllocator (positionAlloc);

126

  mobility.SetPositionAllocator (positionAlloc);

127

  mobility.SetMobilityModel ("ns3::StaticMobilityModel");

127

  mobility.SetMobilityModel ("ns3::StaticMobilityModel");

128

129

  mobility.Layout (c);

129

  mobility.Install (c);

130

131

  PacketSocketAddress socket;

131

  PacketSocketAddress socket;

132

  socket.SetSingleDevice(devices.Get (0)->GetIfIndex ());

132

  socket.SetSingleDevice(devices.Get (0)->GetIfIndex ());

(-)a/examples/wifi-ap.cc (-2 / +2 lines)

Lines 151-158 int main (int argc, char *argv[])	Link Here

151

  wifi.Install (ap, channel);

151

  wifi.Install (ap, channel);

152

153

  // mobility.

153

  // mobility.

154

  mobility.Layout (stas);

154

  mobility.Install (stas);

155

  mobility.Layout (ap);

155

  mobility.Install (ap);

156

157

  Simulator::Schedule (Seconds (1.0), &AdvancePosition, ap.Get (0));

157

  Simulator::Schedule (Seconds (1.0), &AdvancePosition, ap.Get (0));

158

(-)a/samples/main-grid-topology.cc (-1 / +1 lines)

Lines 37-43 int main (int argc, char *argv[])	Link Here

  // finalize the setup by attaching to each object

  // finalize the setup by attaching to each object

  // in the input array a position and initializing

  // in the input array a position and initializing

  // this position with the calculated coordinates.

  // this position with the calculated coordinates.

  mobility.Layout (nodes);

  mobility.Install (nodes);

  // iterate our nodes and print their position.

  // iterate our nodes and print their position.

  for (NodeContainer::Iterator j = nodes.Begin ();

  for (NodeContainer::Iterator j = nodes.Begin ();

(-)a/samples/main-random-topology.cc (-1 / +1 lines)

Lines 31-37 int main (int argc, char *argv[])	Link Here

                                 "Y", String ("100.0"),

                                 "Y", String ("100.0"),

                                 "Rho", String ("Uniform:0:30"));

                                 "Rho", String ("Uniform:0:30"));

  mobility.SetMobilityModel ("ns3::StaticMobilityModel");

  mobility.SetMobilityModel ("ns3::StaticMobilityModel");

  mobility.Layout (c);

  mobility.Install (c);

  Config::Connect ("/NodeList/*/$ns3::MobilityModelNotifier/CourseChange",

  Config::Connect ("/NodeList/*/$ns3::MobilityModelNotifier/CourseChange",

                              MakeCallback (&CourseChange));

                              MakeCallback (&CourseChange));

(-)a/samples/main-random-walk.cc (-1 / +1 lines)

Lines 41-47 int main (int argc, char *argv[])	Link Here

                             "Time", String ("2s"),

                             "Time", String ("2s"),

                             "Speed", String ("Constant:1.0"),

                             "Speed", String ("Constant:1.0"),

                             "Bounds", String ("0:200:0:100"));

                             "Bounds", String ("0:200:0:100"));

  mobility.LayoutAll ();

  mobility.InstallAll ();

  Config::Connect ("/NodeList/*/$ns3::MobilityModelNotifier/CourseChange",

  Config::Connect ("/NodeList/*/$ns3::MobilityModelNotifier/CourseChange",

                              MakeCallback (&CourseChange));

                              MakeCallback (&CourseChange));

(-)a/src/helper/internet-stack-helper.cc (+10 lines)

Lines 17-22	Link Here

 * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>

 * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>

*/

*/

#include "ns3/assert.h"

#include "ns3/log.h"

#include "ns3/object.h"

#include "ns3/ipv4.h"

#include "internet-stack-helper.h"

#include "internet-stack-helper.h"

#include "ns3/internet-stack.h"

#include "ns3/internet-stack.h"

#include "ns3/packet-socket-factory.h"

#include "ns3/packet-socket-factory.h"

Lines 33-38 InternetStackHelper::Install (NodeContai	Link Here

  for (NodeContainer::Iterator i = c.Begin (); i != c.End (); ++i)

  for (NodeContainer::Iterator i = c.Begin (); i != c.End (); ++i)

      Ptr<Node> node = *i;

      Ptr<Node> node = *i;

      if (node->GetObject<Ipv4> () != 0)

          NS_FATAL_ERROR ("InternetStackHelper::Install(): Aggregating "

             "an InternetStack to a node with an existing Ipv4 object");

          return;

      AddInternetStack (node);

      AddInternetStack (node);

      Ptr<PacketSocketFactory> factory = CreateObject<PacketSocketFactory> ();

      Ptr<PacketSocketFactory> factory = CreateObject<PacketSocketFactory> ();

      node->AggregateObject (factory);

      node->AggregateObject (factory);

(-)a/src/helper/internet-stack-helper.h (-1 / +4 lines)

Lines 37-43 public:	Link Here

   * \param c the set of nodes

   * \param c the set of nodes

   * For each node in the input container, aggregate implementations

   * For each node in the input container, aggregate implementations

   * of the ns3::Ipv4, ns3::Udp, and, ns3::Tcp classes.

   * of the ns3::Ipv4, ns3::Udp, and, ns3::Tcp classes.  The program

   * will assert if this method is called on a container with a node

   * that already has an Ipv4 object aggregated to it.

*/

*/

  void Install (NodeContainer c);

  void Install (NodeContainer c);




}

void 
MobilityHelper::Install (NodeContainer c)
{
  for (NodeContainer::Iterator i = c.Begin (); i != c.End (); ++i)
    {

}

void 
MobilityHelper::InstallAll (void)
{
  Install (NodeContainer::GetGlobal ());
}

} // namespace ns3




/**
 * \brief assign positions and mobility models to nodes.
 *
 * MobilityHelper::Install is the most important method here.
 */
class MobilityHelper
{

  ~MobilityHelper ();

  /**
   * After this method is called, every call to MobilityHelper::Install
   * will also attach to the new ns3::MobilityModel an ns3::MobilityModelNotifier
   * which can be used to listen to CourseChange events.
   */
  void EnableNotifier (void);
  /**
   * After this method is called, no ns3::MobilityModelNotifier object will
   * be associated to any new ns3::MobilityModel created by MobilityHelper::Install.
   * This will make it impossible to listen to "CourseChange" events from these
   * new ns3::MobilityModel instances.
   */

   * \param allocator allocate initial node positions
   *
   * Set the position allocator which will be used to allocate
   * the initial position of every node in MobilityModel::Install.
   */
  void SetPositionAllocator (Ptr<PositionAllocator> allocator);


   * \param n9 the name of the attribute to set in the mobility model.
   * \param v9 the value of the attribute to set in the mobility model.
   *
   * Calls to MobilityHelper::Install will create an instance of a matching 
   * mobility model for each node.
   */
  void SetMobilityModel (std::string type,

   *
   * Push an item on the top of the stack of "reference mobility models".
   * The input item should be a node instance to which a mobility model
   * has already been aggregated (usually by a call to Install).
   *
   * If this this stack is not empty when MobilityHelper::Install
   * is called, the model from the top of the stack is used
   * to create a ns3::HierarchicalMobilityModel to make the
   * newly-created models define their positions relative to that

   * ns3::MobilityModelNotifier to generate 'CourseChange' events based on the 
   * boolean flag set by MobilityHelper::EnableNotifier and MobilityHelper::DisableNotifier.
   */
  void Install (NodeContainer container);

  /**
   * Perform the work of MobilityHelper::Install on _all_ nodes which
   * exist in the simulation.
   */
  void InstallAll (void);
private:

  std::vector<Ptr<MobilityModel> > m_mobilityStack;

(-)a/src/helper/ns2-mobility-helper.cc (-2 / +2 lines)

Lines 154-162 Ns2MobilityHelper::LayoutObjectStore (co	Link Here

154

155

156

void

156

void

157

Ns2MobilityHelper::Layout (void) const

157

Ns2MobilityHelper::Install (void) const

158

159

  Layout (NodeList::Begin (), NodeList::End ());

159

  Install (NodeList::Begin (), NodeList::End ());

160

161

162

} // namespace ns3

162

} // namespace ns3




   * whose nodeId is matches the nodeId of the nodes in the trace
   * file.
   */
  void Install (void) const;

  /**
   * \param begin an iterator which points to the start of the input

   * the index of the object in the input array.
   */
  template <typename T>
  void Install (T begin, T end) const;
private:
  class ObjectStore
  {


template <typename T>
void 
Ns2MobilityHelper::Install (T begin, T end) const
{
  class MyObjectStore : public ObjectStore
  {




}

void 
OlsrHelper::Install (NodeContainer container)
{
  for (NodeContainer::Iterator i = container.Begin (); i != container.End (); ++i)
    {
      Ptr<Node> node = *i;
      Install (node);
    }
}
void 
OlsrHelper::Install (Ptr<Node> node)
{
  if (node->GetObject<olsr::Agent> () != 0)
    {
      NS_FATAL_ERROR ("OlsrHelper::Install(): Aggregating "
         "an Olsr Agent to a node with an existing Olsr Agent");
      return;
    }
  Ptr<olsr::Agent> agent = m_agentFactory.Create<olsr::Agent> ();
  agent->SetNode (node);
  node->AggregateObject (agent);
  agent->Start ();
}
void 
OlsrHelper::InstallAll (void)
{
  Install (NodeContainer::GetGlobal ());
}

} // namespace ns3

(-)a/src/helper/olsr-helper.h (-3 / +3 lines)

Lines 41-49 public:	Link Here

		 std::string n6 = "", Attribute v6 = Attribute (),

		 std::string n6 = "", Attribute v6 = Attribute (),

		 std::string n7 = "", Attribute v7 = Attribute ());

		 std::string n7 = "", Attribute v7 = Attribute ());

  void Enable (NodeContainer container);

  void Install (NodeContainer container);

  void Enable (Ptr<Node> node);

  void Install (Ptr<Node> node);

  void EnableAll (void);

  void InstallAll (void);

private:

private:

  ObjectFactory m_agentFactory;

  ObjectFactory m_agentFactory;

};

};

(-)a/src/internet-node/internet-stack.cc (-5 lines)

Lines 36-46 void	Link Here

void

void

AddInternetStack (Ptr<Node> node)

AddInternetStack (Ptr<Node> node)

  // This may be called on a node with a previously added stack

  if (node->GetObject<Ipv4> ())

      return;

  Ptr<Ipv4L3Protocol> ipv4 = CreateObject<Ipv4L3Protocol> ();

  Ptr<Ipv4L3Protocol> ipv4 = CreateObject<Ipv4L3Protocol> ();

  Ptr<ArpL3Protocol> arp = CreateObject<ArpL3Protocol> ();

  Ptr<ArpL3Protocol> arp = CreateObject<ArpL3Protocol> ();

  ipv4->SetNode (node);

  ipv4->SetNode (node);

Return to bug 167