From ef462dbb5e4e03862b0b6ed64c853d74c5517e98 Mon Sep 17 00:00:00 2001 From: Craig Dowell Date: Fri, 27 Jul 2007 14:09:02 -0700 Subject: [PATCH] copywrongs --- examples/simple-static-routing.cc | 190 ------------------ .../global/global-route-manager-impl.h | 1 + src/routing/global/global-router-interface.h | 1 - src/routing/global/routing-environment.cc | 2 - src/routing/global/routing-environment.h | 1 + 5 files changed, 2 insertions(+), 193 deletions(-) delete mode 100644 examples/simple-static-routing.cc diff --git a/examples/simple-static-routing.cc b/examples/simple-static-routing.cc deleted file mode 100644 index 9a7d66dcf..000000000 --- a/examples/simple-static-routing.cc +++ /dev/null @@ -1,190 +0,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 - * - * ns-2 simple.tcl script (ported from ns-2) - * Originally authored by Steve McCanne, 12/19/1996 - */ - -// Port of ns-2/tcl/ex/simple.tcl to ns-3 -// -// Network topology -// -// n0 -// \ 5 Mb/s, 2ms -// \ 1.5Mb/s, 10ms -// n2 -------------------------n3 -// / -// / 5 Mb/s, 2ms -// n1 -// -// - all links are point-to-point links with indicated one-way BW/delay -// - CBR/UDP flows from n0 to n3, and from n3 to n1 -// - FTP/TCP flow from n0 to n3, starting at time 1.2 to time 1.35 sec. -// - UDP packet size of 210 bytes, with per-packet interval 0.00375 sec. -// (i.e., DataRate of 448,000 bps) -// - DropTail queues -// - Tracing of queues and packet receptions to file "simple-static-routing.tr" - -#include -#include -#include -#include - -#include "ns3/debug.h" - -#include "ns3/command-line.h" -#include "ns3/default-value.h" -#include "ns3/ptr.h" -#include "ns3/random-variable.h" - -#include "ns3/simulator.h" -#include "ns3/nstime.h" -#include "ns3/data-rate.h" - -#include "ns3/ascii-trace.h" -#include "ns3/pcap-trace.h" -#include "ns3/internet-node.h" -#include "ns3/p2p-channel.h" -#include "ns3/p2p-net-device.h" -#include "ns3/mac-address.h" -#include "ns3/ipv4-address.h" -#include "ns3/ipv4.h" -#include "ns3/socket.h" -#include "ns3/ipv4-route.h" -#include "ns3/p2p-topology.h" -#include "ns3/onoff-application.h" -#include "ns3/routing-environment.h" -#include "ns3/static-route-manager.h" - -using namespace ns3; - -int main (int argc, char *argv[]) -{ - - // Users may find it convenient to turn on explicit debugging - // for selected modules; the below lines suggest how to do this -#if 0 - DebugComponentEnable ("Object"); - DebugComponentEnable ("Queue"); - DebugComponentEnable ("DropTailQueue"); - DebugComponentEnable ("Channel"); - DebugComponentEnable ("PointToPointChannel"); - DebugComponentEnable ("PointToPointNetDevice"); - DebugComponentEnable ("StaticRouter"); - DebugComponentEnable ("StaticRouteManager"); -#endif - - // Set up some default values for the simulation. Use the Bind () - // technique to tell the system what subclass of Queue to use, - // and what the queue limit is - - // The below Bind command tells the queue factory which class to - // instantiate, when the queue factory is invoked in the topology code - Bind ("Queue", "DropTailQueue"); - - // This bind tells the system to use global static routing. It results in - // a StaticRouter interface being aggregated to the internet nodes and the - // creation of a Route Manager component to oversee the route generation. - Bind ("DoStaticRouting", "true"); - - Bind ("OnOffApplicationPacketSize", "210"); - Bind ("OnOffApplicationDataRate", "448kb/s"); - - //Bind ("DropTailQueue::m_maxPackets", 30); - - // Allow the user to override any of the defaults and the above - // Bind ()s at run-time, via command-line arguments - CommandLine::Parse (argc, argv); - - // Here, we will explicitly create four nodes. In more sophisticated - // topologies, we could configure a node factory. - Ptr n0 = Create (); - Ptr n1 = Create (); - Ptr n2 = Create (); - Ptr n3 = Create (); - - // We create the channels first without any IP addressing information - Ptr channel0 = - PointToPointTopology::AddPointToPointLink ( - n0, n2, DataRate (5000000), MilliSeconds (2)); - - Ptr channel1 = - PointToPointTopology::AddPointToPointLink ( - n1, n2, DataRate (5000000), MilliSeconds (2)); - - Ptr channel2 = - PointToPointTopology::AddPointToPointLink ( - n2, n3, DataRate (1500000), MilliSeconds (10)); - - // Later, we add IP addresses. - PointToPointTopology::AddIpv4Addresses ( - channel0, n0, Ipv4Address ("10.1.1.1"), - n2, Ipv4Address ("10.1.1.2")); - - PointToPointTopology::AddIpv4Addresses ( - channel1, n1, Ipv4Address ("10.1.2.1"), - n2, Ipv4Address ("10.1.2.2")); - - PointToPointTopology::AddIpv4Addresses ( - channel2, n2, Ipv4Address ("10.1.3.1"), - n3, Ipv4Address ("10.1.3.2")); - - if (RoutingEnvironment::StaticRoutingEnabled ()) - { - StaticRouteManager::PopulateRoutingTables (); - } - - // Create the OnOff application to send UDP datagrams of size - // 210 bytes at a rate of 448 Kb/s - Ptr ooff = Create ( - n0, - Ipv4Address ("10.1.3.2"), - 80, - "Udp", - ConstantVariable (1), - ConstantVariable (0)); - // Start the application - ooff->Start (Seconds (1.0)); - ooff->Stop (Seconds (10.0)); - - // Create a similar flow from n3 to n1, starting at time 1.1 seconds - ooff = Create ( - n3, - Ipv4Address ("10.1.2.1"), - 80, - "Udp", - ConstantVariable (1), - ConstantVariable (0)); - // Start the application - ooff->Start (Seconds (1.1)); - ooff->Stop (Seconds (10.0)); - - // Configure tracing of all enqueue, dequeue, and NetDevice receive events - // Trace output will be sent to the simple-static-routing.tr file - AsciiTrace asciitrace ("simple-static-routing.tr"); - asciitrace.TraceAllQueues (); - asciitrace.TraceAllNetDeviceRx (); - - // Also configure some tcpdump traces; each interface will be traced - // The output files will be named simple-p2p.pcap-- - // and can be read by the "tcpdump -r" command (use "-tt" option to - // display timestamps correctly) - PcapTrace pcaptrace ("simple-static-routing.pcap"); - pcaptrace.TraceAllIp (); - - Simulator::Run (); - - Simulator::Destroy (); -} diff --git a/src/routing/global/global-route-manager-impl.h b/src/routing/global/global-route-manager-impl.h index a355cdfb0..ee9ad5b3b 100644 --- a/src/routing/global/global-route-manager-impl.h +++ b/src/routing/global/global-route-manager-impl.h @@ -13,6 +13,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + #ifndef GLOBAL_ROUTE_MANAGER_IMPL_H #define GLOBAL_ROUTE_MANAGER_IMPL_H diff --git a/src/routing/global/global-router-interface.h b/src/routing/global/global-router-interface.h index fed346b49..c1d2f5bad 100644 --- a/src/routing/global/global-router-interface.h +++ b/src/routing/global/global-router-interface.h @@ -1,4 +1,3 @@ - /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* * This program is free software; you can redistribute it and/or modify diff --git a/src/routing/global/routing-environment.cc b/src/routing/global/routing-environment.cc index ca075512c..cea926fc1 100644 --- a/src/routing/global/routing-environment.cc +++ b/src/routing/global/routing-environment.cc @@ -1,7 +1,5 @@ /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */ /* - * All rights reserved. - * * 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; diff --git a/src/routing/global/routing-environment.h b/src/routing/global/routing-environment.h index 5b305a0e3..24c4450df 100644 --- a/src/routing/global/routing-environment.h +++ b/src/routing/global/routing-environment.h @@ -13,6 +13,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + #ifndef ROUTING_ENVIRONMENT_H #define ROUTING_ENVIRONMENT_H