Merge 802.11s code.

examples/mesh.cc

@@ -0,0 +1,108 @@
+/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2008,2009 IITP RAS
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as 
+ * published by the Free Software Foundation;
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Authors: Kirill Andreev <andreev@iitp.ru>
+ *          Evgeny Khorov <horov@frtk.ru>
+ */
+
+
+#include "ns3/core-module.h"
+#include "ns3/simulator-module.h"
+#include "ns3/node-module.h"
+#include "ns3/helper-module.h"
+#include "ns3/global-routing-module.h"
+#include "ns3/wifi-module.h"
+#include "ns3/mobility-module.h"
+
+using namespace ns3;
+
+NS_LOG_COMPONENT_DEFINE ("TestMeshScript");
+
+int
+main(int argc, char *argv[])
+{
+	// Creating square topology with nNodes x nNodes grid:
+	int			xSize		=	5;
+	int         ySize       =   5;
+	double			step		=	100.0;	//Grid with one-hop edge
+	double			randomStart	=	0.1;	//One beacon interval
+	NodeContainer		nodes;
+	CommandLine		cmd;
+	MobilityHelper		mobility;
+	MeshWifiHelper		wifi;
+	NetDeviceContainer	meshDevices;
+	// Defining a size of our network:
+	cmd.AddValue("x-size", "Number of nodes in a row grid", xSize);
+	cmd.AddValue("y-size", "Number of rows in a grid", ySize);
+	cmd.AddValue("step", "Size of edge in our grid", step);
+	cmd.AddValue("start", "Random start parameter", randomStart);
+        cmd.Parse (argc, argv);
+	NS_LOG_DEBUG("Grid:"<<xSize<<"*"<<ySize);
+	// Creating nodes:
+	nodes.Create (ySize*xSize);
+
+	// Setting channel:
+	YansWifiPhyHelper wifiPhy = YansWifiPhyHelper::Default ();
+	YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();
+	wifiPhy.SetChannel (wifiChannel.Create ());
+	// Setting Wifi:
+	//wifi.SetPhy("ns3::WifiPhy");
+	wifi.SetRemoteStationManager("ns3::AarfWifiManager");
+	Ssid ssid	=	Ssid("MyMeSH");
+	wifi.SetMac ("ns3::MeshWifiMac",
+			"Ssid", SsidValue (ssid),
+			"RandomStart", TimeValue (Seconds (randomStart))
+			);
+        wifi.SetPeerLinkManager ("ns3::WifiPeerManager");
+        wifi.SetL2RoutingProtocol ("ns3::Hwmp");
+        wifi.SetL2RoutingNetDevice ("ns3::L2RoutingNetDevice");
+	meshDevices	=	wifi.Install (wifiPhy,nodes,1);
+	// Installing Mobility.
+	mobility.SetPositionAllocator
+		("ns3::GridPositionAllocator",
+		 "MinX", DoubleValue (0.0),
+		 "MinY", DoubleValue (0.0),
+		 "DeltaX", DoubleValue (step),
+                 "DeltaY", DoubleValue (step),
+		 "GridWidth", UintegerValue (xSize),
+		 "LayoutType", StringValue("RowFirst"));
+	mobility.SetMobilityModel ("ns3::StaticMobilityModel");
+	mobility.Install (nodes);
+
+	// Setting Internet Stack:
+	InternetStackHelper stack;
+	stack.Install(nodes);
+	Ipv4AddressHelper address;
+	address.SetBase ("10.1.1.0", "255.255.255.0");
+	Ipv4InterfaceContainer interfaces = address.Assign (meshDevices);
+	UdpEchoServerHelper echoServer (9);
+	ApplicationContainer serverApps = echoServer.Install (nodes.Get (0));
+	serverApps.Start (Seconds (1.0));
+	serverApps.Stop (Seconds (10.0));
+	UdpEchoClientHelper echoClient (interfaces.GetAddress (0), 9);
+	echoClient.SetAttribute ("MaxPackets", UintegerValue (1000));
+	echoClient.SetAttribute ("Interval", TimeValue (Seconds (0.001)));
+	echoClient.SetAttribute ("PacketSize", UintegerValue (1024));
+	ApplicationContainer clientApps = echoClient.Install (nodes.Get (1));
+	clientApps.Start (Seconds (2.0));
+	clientApps.Stop (Seconds (10.0));
+	//end
+	Simulator::Stop (Seconds (10.0));
+	Simulator::Run();
+	Simulator::Destroy();
+	return 0;
+}

examples/wscript

@@ -120,6 +120,10 @@ def build(bld):
                                  ['core', 'simulator', 'mobility', 'wifi'])
     obj.source = 'wifi-ap.cc'
 
+    obj = bld.create_ns3_program('mesh',
+                                 ['core', 'simulator', 'mobility', 'wifi'])
+    obj.source = 'mesh.cc'
+
     bld.add_subdirs('stats')
 
     obj = bld.create_ns3_program('wifi-wired-bridging',