From 5168309a666eaae433c9f87caf87e46e6e158e90 Mon Sep 17 00:00:00 2001 From: Craig Dowell Date: Tue, 9 Dec 2008 10:28:44 -0800 Subject: [PATCH] Remove stray ^M that snuck into examples --- examples/second.cc | 204 +++++++++++++-------------- examples/third.cc | 344 ++++++++++++++++++++++----------------------- 2 files changed, 274 insertions(+), 274 deletions(-) diff --git a/examples/second.cc b/examples/second.cc index a54205f58..791b8a9d1 100644 --- a/examples/second.cc +++ b/examples/second.cc @@ -1,102 +1,102 @@ -/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ -/* - * 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 - */ - -#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" - -// Default Network Topology -// -// 10.1.1.0 -// n0 -------------- n1 n2 n3 n4 -// point-to-point | | | | -// ================ -// LAN 10.1.2.0 - - -using namespace ns3; - -NS_LOG_COMPONENT_DEFINE ("SecondScriptExample"); - -int -main (int argc, char *argv[]) -{ - LogComponentEnable("UdpEchoClientApplication", LOG_LEVEL_INFO); - LogComponentEnable("UdpEchoServerApplication", LOG_LEVEL_INFO); - - uint32_t nCsma = 3; - CommandLine cmd; - cmd.AddValue ("nCsma", "Number of \"extra\" CSMA nodes/devices", nCsma); - cmd.Parse (argc,argv); - - NodeContainer p2pNodes; - p2pNodes.Create (2); - - NodeContainer csmaNodes; - csmaNodes.Add (p2pNodes.Get (1)); - csmaNodes.Create (nCsma); - - PointToPointHelper pointToPoint; - pointToPoint.SetDeviceAttribute ("DataRate", StringValue ("5Mbps")); - pointToPoint.SetChannelAttribute ("Delay", StringValue ("2ms")); - - NetDeviceContainer p2pDevices; - p2pDevices = pointToPoint.Install (p2pNodes); - - CsmaHelper csma; - - NetDeviceContainer csmaDevices; - csmaDevices = csma.Install (csmaNodes); - - InternetStackHelper stack; - stack.Install (p2pNodes.Get (0)); - stack.Install (csmaNodes); - - Ipv4AddressHelper address; - address.SetBase ("10.1.1.0", "255.255.255.0"); - Ipv4InterfaceContainer p2pInterfaces; - p2pInterfaces = address.Assign (p2pDevices); - - address.SetBase ("10.1.2.0", "255.255.255.0"); - Ipv4InterfaceContainer csmaInterfaces; - csmaInterfaces = address.Assign (csmaDevices); - - UdpEchoServerHelper echoServer (9); - - ApplicationContainer serverApps = echoServer.Install (csmaNodes.Get (nCsma)); - serverApps.Start (Seconds (1.0)); - serverApps.Stop (Seconds (10.0)); - - UdpEchoClientHelper echoClient (csmaInterfaces.GetAddress (nCsma), 9); - echoClient.SetAttribute ("MaxPackets", UintegerValue (1)); - echoClient.SetAttribute ("Interval", TimeValue (Seconds (1.))); - echoClient.SetAttribute ("PacketSize", UintegerValue (1024)); - - ApplicationContainer clientApps = echoClient.Install (p2pNodes.Get (0)); - clientApps.Start (Seconds (2.0)); - clientApps.Stop (Seconds (10.0)); - - GlobalRouteManager::PopulateRoutingTables (); - - PointToPointHelper::EnablePcapAll ("second"); - CsmaHelper::EnablePcapAll ("second"); - - Simulator::Run (); - Simulator::Destroy (); - return 0; -} +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ +/* + * 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 + */ + +#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" + +// Default Network Topology +// +// 10.1.1.0 +// n0 -------------- n1 n2 n3 n4 +// point-to-point | | | | +// ================ +// LAN 10.1.2.0 + + +using namespace ns3; + +NS_LOG_COMPONENT_DEFINE ("SecondScriptExample"); + +int +main (int argc, char *argv[]) +{ + LogComponentEnable("UdpEchoClientApplication", LOG_LEVEL_INFO); + LogComponentEnable("UdpEchoServerApplication", LOG_LEVEL_INFO); + + uint32_t nCsma = 3; + CommandLine cmd; + cmd.AddValue ("nCsma", "Number of \"extra\" CSMA nodes/devices", nCsma); + cmd.Parse (argc,argv); + + NodeContainer p2pNodes; + p2pNodes.Create (2); + + NodeContainer csmaNodes; + csmaNodes.Add (p2pNodes.Get (1)); + csmaNodes.Create (nCsma); + + PointToPointHelper pointToPoint; + pointToPoint.SetDeviceAttribute ("DataRate", StringValue ("5Mbps")); + pointToPoint.SetChannelAttribute ("Delay", StringValue ("2ms")); + + NetDeviceContainer p2pDevices; + p2pDevices = pointToPoint.Install (p2pNodes); + + CsmaHelper csma; + + NetDeviceContainer csmaDevices; + csmaDevices = csma.Install (csmaNodes); + + InternetStackHelper stack; + stack.Install (p2pNodes.Get (0)); + stack.Install (csmaNodes); + + Ipv4AddressHelper address; + address.SetBase ("10.1.1.0", "255.255.255.0"); + Ipv4InterfaceContainer p2pInterfaces; + p2pInterfaces = address.Assign (p2pDevices); + + address.SetBase ("10.1.2.0", "255.255.255.0"); + Ipv4InterfaceContainer csmaInterfaces; + csmaInterfaces = address.Assign (csmaDevices); + + UdpEchoServerHelper echoServer (9); + + ApplicationContainer serverApps = echoServer.Install (csmaNodes.Get (nCsma)); + serverApps.Start (Seconds (1.0)); + serverApps.Stop (Seconds (10.0)); + + UdpEchoClientHelper echoClient (csmaInterfaces.GetAddress (nCsma), 9); + echoClient.SetAttribute ("MaxPackets", UintegerValue (1)); + echoClient.SetAttribute ("Interval", TimeValue (Seconds (1.))); + echoClient.SetAttribute ("PacketSize", UintegerValue (1024)); + + ApplicationContainer clientApps = echoClient.Install (p2pNodes.Get (0)); + clientApps.Start (Seconds (2.0)); + clientApps.Stop (Seconds (10.0)); + + GlobalRouteManager::PopulateRoutingTables (); + + PointToPointHelper::EnablePcapAll ("second"); + CsmaHelper::EnablePcapAll ("second"); + + Simulator::Run (); + Simulator::Destroy (); + return 0; +} diff --git a/examples/third.cc b/examples/third.cc index 2c561c2e2..3fb9b5b8d 100644 --- a/examples/third.cc +++ b/examples/third.cc @@ -1,172 +1,172 @@ -/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ -/* - * 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 - */ - -#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" - -// Default Network Topology -// -// Wifi 10.1.3.0 -// AP -// * * * * -// | | | | 10.1.1.0 -// n5 n6 n7 n0 -------------- n1 n2 n3 n4 -// point-to-point | | | | -// ================ -// LAN 10.1.2.0 - -using namespace ns3; - -NS_LOG_COMPONENT_DEFINE ("ThirdScriptExample"); - -int -main (int argc, char *argv[]) -{ - LogComponentEnable("UdpEchoClientApplication", LOG_LEVEL_INFO); - LogComponentEnable("UdpEchoServerApplication", LOG_LEVEL_INFO); - - uint32_t nCsma = 3; - uint32_t nWifi = 3; - CommandLine cmd; - cmd.AddValue ("nCsma", "Number of \"extra\" CSMA nodes/devices", nCsma); - cmd.AddValue ("nWifi", "Number of wifi STA devices", nWifi); - cmd.Parse (argc,argv); - - NodeContainer p2pNodes; - p2pNodes.Create (2); - - PointToPointHelper pointToPoint; - pointToPoint.SetDeviceAttribute ("DataRate", StringValue ("5Mbps")); - pointToPoint.SetChannelAttribute ("Delay", StringValue ("2ms")); - - NetDeviceContainer p2pDevices; - p2pDevices = pointToPoint.Install (p2pNodes); - - NodeContainer csmaNodes; - csmaNodes.Add (p2pNodes.Get (1)); - csmaNodes.Create (nCsma); - - CsmaHelper csma; - - NetDeviceContainer csmaDevices; - csmaDevices = csma.Install (csmaNodes); - - NodeContainer wifiStaNodes; - wifiStaNodes.Create (nWifi); - NodeContainer wifiApNode = p2pNodes.Get (0); - - Ptr channel = CreateObject (); - - channel->SetPropagationDelayModel ( - CreateObject ()); - - Ptr log = - CreateObject (); - - log->SetReferenceModel (CreateObject ()); - - channel->SetPropagationLossModel (log); - - WifiHelper wifi; - wifi.SetPhy ("ns3::WifiPhy"); - wifi.SetRemoteStationManager ("ns3::ArfWifiManager"); - - Ssid ssid = Ssid ("ns-3-ssid"); - wifi.SetMac ("ns3::NqstaWifiMac", - "Ssid", SsidValue (ssid), - "ActiveProbing", BooleanValue (false)); - - NetDeviceContainer staDevices; - staDevices = wifi.Install (wifiStaNodes, channel); - - wifi.SetMac ("ns3::NqapWifiMac", - "Ssid", SsidValue (ssid), - "BeaconGeneration", BooleanValue (true), - "BeaconInterval", TimeValue (Seconds (2.5))); - - NetDeviceContainer apDevices; - apDevices = wifi.Install (wifiApNode, channel); - - MobilityHelper mobility; - - mobility.SetPositionAllocator ("ns3::GridPositionAllocator", - "MinX", DoubleValue (0.0), - "MinY", DoubleValue (0.0), - "DeltaX", DoubleValue (5.0), - "DeltaY", DoubleValue (10.0), - "GridWidth", UintegerValue (3), - "LayoutType", StringValue ("RowFirst")); - - mobility.SetMobilityModel ("ns3::RandomWalk2dMobilityModel", - "Bounds", RectangleValue (Rectangle (-50, 50, -50, 50))); - mobility.Install (wifiStaNodes); - - mobility.SetMobilityModel ("ns3::StaticMobilityModel"); - mobility.Install (wifiApNode); - - InternetStackHelper stack; - stack.Install (csmaNodes); - stack.Install (wifiApNode); - stack.Install (wifiStaNodes); - - Ipv4AddressHelper address; - - address.SetBase ("10.1.1.0", "255.255.255.0"); - Ipv4InterfaceContainer p2pInterfaces; - p2pInterfaces = address.Assign (p2pDevices); - - address.SetBase ("10.1.2.0", "255.255.255.0"); - Ipv4InterfaceContainer csmaInterfaces; - csmaInterfaces = address.Assign (csmaDevices); - - address.SetBase ("10.1.3.0", "255.255.255.0"); - address.Assign (staDevices); - address.Assign (apDevices); - - UdpEchoServerHelper echoServer (9); - - ApplicationContainer serverApps = echoServer.Install (csmaNodes.Get (nCsma)); - serverApps.Start (Seconds (1.0)); - serverApps.Stop (Seconds (10.0)); - - UdpEchoClientHelper echoClient (csmaInterfaces.GetAddress (nCsma), 9); - echoClient.SetAttribute ("MaxPackets", UintegerValue (1)); - echoClient.SetAttribute ("Interval", TimeValue (Seconds (1.))); - echoClient.SetAttribute ("PacketSize", UintegerValue (1024)); - - ApplicationContainer clientApps = - echoClient.Install (wifiStaNodes.Get (nWifi - 1)); - clientApps.Start (Seconds (2.0)); - clientApps.Stop (Seconds (10.0)); - - GlobalRouteManager::PopulateRoutingTables (); - - Simulator::Stop (Seconds (10.0)); - - WifiHelper::EnablePcap ("third", - wifiStaNodes.Get (nWifi - 1)->GetId (), 0); - CsmaHelper::EnablePcap ("third", - csmaNodes.Get (nCsma)->GetId (), 0); - - Simulator::Run (); - Simulator::Destroy (); - return 0; -} +/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ +/* + * 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 + */ + +#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" + +// Default Network Topology +// +// Wifi 10.1.3.0 +// AP +// * * * * +// | | | | 10.1.1.0 +// n5 n6 n7 n0 -------------- n1 n2 n3 n4 +// point-to-point | | | | +// ================ +// LAN 10.1.2.0 + +using namespace ns3; + +NS_LOG_COMPONENT_DEFINE ("ThirdScriptExample"); + +int +main (int argc, char *argv[]) +{ + LogComponentEnable("UdpEchoClientApplication", LOG_LEVEL_INFO); + LogComponentEnable("UdpEchoServerApplication", LOG_LEVEL_INFO); + + uint32_t nCsma = 3; + uint32_t nWifi = 3; + CommandLine cmd; + cmd.AddValue ("nCsma", "Number of \"extra\" CSMA nodes/devices", nCsma); + cmd.AddValue ("nWifi", "Number of wifi STA devices", nWifi); + cmd.Parse (argc,argv); + + NodeContainer p2pNodes; + p2pNodes.Create (2); + + PointToPointHelper pointToPoint; + pointToPoint.SetDeviceAttribute ("DataRate", StringValue ("5Mbps")); + pointToPoint.SetChannelAttribute ("Delay", StringValue ("2ms")); + + NetDeviceContainer p2pDevices; + p2pDevices = pointToPoint.Install (p2pNodes); + + NodeContainer csmaNodes; + csmaNodes.Add (p2pNodes.Get (1)); + csmaNodes.Create (nCsma); + + CsmaHelper csma; + + NetDeviceContainer csmaDevices; + csmaDevices = csma.Install (csmaNodes); + + NodeContainer wifiStaNodes; + wifiStaNodes.Create (nWifi); + NodeContainer wifiApNode = p2pNodes.Get (0); + + Ptr channel = CreateObject (); + + channel->SetPropagationDelayModel ( + CreateObject ()); + + Ptr log = + CreateObject (); + + log->SetReferenceModel (CreateObject ()); + + channel->SetPropagationLossModel (log); + + WifiHelper wifi; + wifi.SetPhy ("ns3::WifiPhy"); + wifi.SetRemoteStationManager ("ns3::ArfWifiManager"); + + Ssid ssid = Ssid ("ns-3-ssid"); + wifi.SetMac ("ns3::NqstaWifiMac", + "Ssid", SsidValue (ssid), + "ActiveProbing", BooleanValue (false)); + + NetDeviceContainer staDevices; + staDevices = wifi.Install (wifiStaNodes, channel); + + wifi.SetMac ("ns3::NqapWifiMac", + "Ssid", SsidValue (ssid), + "BeaconGeneration", BooleanValue (true), + "BeaconInterval", TimeValue (Seconds (2.5))); + + NetDeviceContainer apDevices; + apDevices = wifi.Install (wifiApNode, channel); + + MobilityHelper mobility; + + mobility.SetPositionAllocator ("ns3::GridPositionAllocator", + "MinX", DoubleValue (0.0), + "MinY", DoubleValue (0.0), + "DeltaX", DoubleValue (5.0), + "DeltaY", DoubleValue (10.0), + "GridWidth", UintegerValue (3), + "LayoutType", StringValue ("RowFirst")); + + mobility.SetMobilityModel ("ns3::RandomWalk2dMobilityModel", + "Bounds", RectangleValue (Rectangle (-50, 50, -50, 50))); + mobility.Install (wifiStaNodes); + + mobility.SetMobilityModel ("ns3::StaticMobilityModel"); + mobility.Install (wifiApNode); + + InternetStackHelper stack; + stack.Install (csmaNodes); + stack.Install (wifiApNode); + stack.Install (wifiStaNodes); + + Ipv4AddressHelper address; + + address.SetBase ("10.1.1.0", "255.255.255.0"); + Ipv4InterfaceContainer p2pInterfaces; + p2pInterfaces = address.Assign (p2pDevices); + + address.SetBase ("10.1.2.0", "255.255.255.0"); + Ipv4InterfaceContainer csmaInterfaces; + csmaInterfaces = address.Assign (csmaDevices); + + address.SetBase ("10.1.3.0", "255.255.255.0"); + address.Assign (staDevices); + address.Assign (apDevices); + + UdpEchoServerHelper echoServer (9); + + ApplicationContainer serverApps = echoServer.Install (csmaNodes.Get (nCsma)); + serverApps.Start (Seconds (1.0)); + serverApps.Stop (Seconds (10.0)); + + UdpEchoClientHelper echoClient (csmaInterfaces.GetAddress (nCsma), 9); + echoClient.SetAttribute ("MaxPackets", UintegerValue (1)); + echoClient.SetAttribute ("Interval", TimeValue (Seconds (1.))); + echoClient.SetAttribute ("PacketSize", UintegerValue (1024)); + + ApplicationContainer clientApps = + echoClient.Install (wifiStaNodes.Get (nWifi - 1)); + clientApps.Start (Seconds (2.0)); + clientApps.Stop (Seconds (10.0)); + + GlobalRouteManager::PopulateRoutingTables (); + + Simulator::Stop (Seconds (10.0)); + + WifiHelper::EnablePcap ("third", + wifiStaNodes.Get (nWifi - 1)->GetId (), 0); + CsmaHelper::EnablePcap ("third", + csmaNodes.Get (nCsma)->GetId (), 0); + + Simulator::Run (); + Simulator::Destroy (); + return 0; +}