From ef9c8a4716fc2598bfe6ee2619591027b1087ac8 Mon Sep 17 00:00:00 2001 From: Craig Dowell Date: Tue, 2 Oct 2007 15:34:00 -0700 Subject: [PATCH] tutorial --- src/applications/udp-echo/udp-echo-server.cc | 7 +++--- ...2.cc => tutorial-csma-echo-ascii-trace.cc} | 0 ...-3.cc => tutorial-csma-echo-pcap-trace.cc} | 0 .../{tutorial-1.cc => tutorial-csma-echo.cc} | 0 ...torial-4.cc => tutorial-naive-dumbbell.cc} | 25 ++++++++++--------- tutorial/wscript | 16 ++++++------ tutorial/wscript-0 | 6 ----- tutorial/wscript-1 | 10 -------- tutorial/wscript-2 | 14 ----------- tutorial/wscript-3 | 18 ------------- tutorial/wscript-4 | 22 ---------------- 11 files changed, 24 insertions(+), 94 deletions(-) rename tutorial/{tutorial-2.cc => tutorial-csma-echo-ascii-trace.cc} (100%) rename tutorial/{tutorial-3.cc => tutorial-csma-echo-pcap-trace.cc} (100%) rename tutorial/{tutorial-1.cc => tutorial-csma-echo.cc} (100%) rename tutorial/{tutorial-4.cc => tutorial-naive-dumbbell.cc} (89%) delete mode 100644 tutorial/wscript-0 delete mode 100644 tutorial/wscript-1 delete mode 100644 tutorial/wscript-2 delete mode 100644 tutorial/wscript-3 delete mode 100644 tutorial/wscript-4 diff --git a/src/applications/udp-echo/udp-echo-server.cc b/src/applications/udp-echo/udp-echo-server.cc index 11654ed8d..2538013cf 100644 --- a/src/applications/udp-echo/udp-echo-server.cc +++ b/src/applications/udp-echo/udp-echo-server.cc @@ -84,8 +84,7 @@ UdpEchoServer::StartApplication (void) m_socket->Bind (m_local); } - m_socket->SetRecvCallback((Callback, const Packet &, - const Address &>) MakeCallback(&UdpEchoServer::Receive, this)); + m_socket->SetRecvCallback(MakeCallback(&UdpEchoServer::Receive, this)); } void @@ -95,8 +94,8 @@ UdpEchoServer::StopApplication () if (!m_socket) { - m_socket->SetRecvCallback((Callback, const Packet &, - const Address &>) NULL); + m_socket->SetRecvCallback (MakeNullCallback, + const Packet &, const Address &> ()); } } diff --git a/tutorial/tutorial-2.cc b/tutorial/tutorial-csma-echo-ascii-trace.cc similarity index 100% rename from tutorial/tutorial-2.cc rename to tutorial/tutorial-csma-echo-ascii-trace.cc diff --git a/tutorial/tutorial-3.cc b/tutorial/tutorial-csma-echo-pcap-trace.cc similarity index 100% rename from tutorial/tutorial-3.cc rename to tutorial/tutorial-csma-echo-pcap-trace.cc diff --git a/tutorial/tutorial-1.cc b/tutorial/tutorial-csma-echo.cc similarity index 100% rename from tutorial/tutorial-1.cc rename to tutorial/tutorial-csma-echo.cc diff --git a/tutorial/tutorial-4.cc b/tutorial/tutorial-naive-dumbbell.cc similarity index 89% rename from tutorial/tutorial-4.cc rename to tutorial/tutorial-naive-dumbbell.cc index 173aa202c..e203ef9f3 100644 --- a/tutorial/tutorial-4.cc +++ b/tutorial/tutorial-naive-dumbbell.cc @@ -33,7 +33,7 @@ #include "ns3/pcap-trace.h" #include "ns3/global-route-manager.h" -NS_LOG_COMPONENT_DEFINE ("UdpEchoSimulation"); +NS_LOG_COMPONENT_DEFINE ("DumbbellSimulation"); using namespace ns3; @@ -45,27 +45,23 @@ using namespace ns3; // n0 n1 n2 n3 n4 n5 n6 n7 // | | | | | | | | // ================ ================ -// lan0 lan1 +// lan1 lan2 // int main (int argc, char *argv[]) { - LogComponentEnable ("UdpEchoSimulation", LOG_LEVEL_INFO); + LogComponentEnable ("DumbbellSimulation", LOG_LEVEL_INFO); +// LogComponentEnableAll (LOG_LEVEL_ALL, LOG_DECORATE_ALL); - NS_LOG_INFO ("UDP Echo Simulation"); + NS_LOG_INFO ("Dumbbell Topology Simulation"); Ptr n0 = Create (); Ptr n1 = Create (); Ptr n2 = Create (); Ptr n3 = Create (); - Ptr n4 = Create (); - Ptr n5 = Create (); - Ptr n6 = Create (); - Ptr n7 = Create (); - Ptr lan1 = - CsmaTopology::CreateCsmaChannel (DataRate (5000000), MilliSeconds (2)); + CsmaTopology::CreateCsmaChannel (DataRate (10000000), MilliSeconds (2)); uint32_t nd0 = CsmaIpv4Topology::AddIpv4CsmaNetDevice (n0, lan1, "08:00:2e:00:00:00"); @@ -84,8 +80,13 @@ main (int argc, char *argv[]) CsmaIpv4Topology::AddIpv4Address (n2, nd2, "10.1.1.3", "255.255.255.0"); CsmaIpv4Topology::AddIpv4Address (n3, nd3, "10.1.1.4", "255.255.255.0"); + Ptr n4 = Create (); + Ptr n5 = Create (); + Ptr n6 = Create (); + Ptr n7 = Create (); + Ptr lan2 = - CsmaTopology::CreateCsmaChannel (DataRate (5000000), MilliSeconds (2)); + CsmaTopology::CreateCsmaChannel (DataRate (10000000), MilliSeconds (2)); uint32_t nd4 = CsmaIpv4Topology::AddIpv4CsmaNetDevice (n4, lan2, "08:00:2e:00:00:04"); @@ -105,7 +106,7 @@ main (int argc, char *argv[]) CsmaIpv4Topology::AddIpv4Address (n7, nd7, "10.1.2.4", "255.255.255.0"); Ptr link = PointToPointTopology::AddPointToPointLink ( - n3, n4, DataRate (500000), MilliSeconds (20)); + n3, n4, DataRate (38400), MilliSeconds (20)); PointToPointTopology::AddIpv4Addresses (link, n3, "10.1.3.1", n4, "10.1.3.2"); diff --git a/tutorial/wscript b/tutorial/wscript index 965b8196e..b7d90bdf5 100644 --- a/tutorial/wscript +++ b/tutorial/wscript @@ -5,18 +5,18 @@ def build(bld): ['core']) obj.source = 'hello-simulator.cc' - obj = bld.create_ns3_program('tutorial-1', + obj = bld.create_ns3_program('tutorial-csma-echo', ['core']) - obj.source = 'tutorial-1.cc' + obj.source = 'tutorial-csma-echo.cc' - obj = bld.create_ns3_program('tutorial-2', + obj = bld.create_ns3_program('tutorial-csma-echo-ascii-trace', ['core']) - obj.source = 'tutorial-2.cc' + obj.source = 'tutorial-csma-echo-ascii-trace.cc' - obj = bld.create_ns3_program('tutorial-3', + obj = bld.create_ns3_program('tutorial-csma-echo-pcap-trace', ['core']) - obj.source = 'tutorial-3.cc' + obj.source = 'tutorial-csma-echo-pcap-trace.cc' - obj = bld.create_ns3_program('tutorial-4', + obj = bld.create_ns3_program('tutorial-naive-dumbbell', ['core']) - obj.source = 'tutorial-4.cc' + obj.source = 'tutorial-naive-dumbbell.cc' diff --git a/tutorial/wscript-0 b/tutorial/wscript-0 deleted file mode 100644 index abd2df7b9..000000000 --- a/tutorial/wscript-0 +++ /dev/null @@ -1,6 +0,0 @@ -## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- - -def build(bld): - obj = bld.create_ns3_program('hello-simulator', - ['core']) - obj.source = 'hello-simulator.cc' diff --git a/tutorial/wscript-1 b/tutorial/wscript-1 deleted file mode 100644 index 724d86fb7..000000000 --- a/tutorial/wscript-1 +++ /dev/null @@ -1,10 +0,0 @@ -## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- - -def build(bld): - obj = bld.create_ns3_program('hello-simulator', - ['core']) - obj.source = 'hello-simulator.cc' - - obj = bld.create_ns3_program('tutorial-1', - ['core']) - obj.source = 'tutorial-1.cc' diff --git a/tutorial/wscript-2 b/tutorial/wscript-2 deleted file mode 100644 index 64ddd44dd..000000000 --- a/tutorial/wscript-2 +++ /dev/null @@ -1,14 +0,0 @@ -## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- - -def build(bld): - obj = bld.create_ns3_program('hello-simulator', - ['core']) - obj.source = 'hello-simulator.cc' - - obj = bld.create_ns3_program('tutorial-1', - ['core']) - obj.source = 'tutorial-1.cc' - - obj = bld.create_ns3_program('tutorial-2', - ['core']) - obj.source = 'tutorial-2.cc' diff --git a/tutorial/wscript-3 b/tutorial/wscript-3 deleted file mode 100644 index 1021c3aa9..000000000 --- a/tutorial/wscript-3 +++ /dev/null @@ -1,18 +0,0 @@ -## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- - -def build(bld): - obj = bld.create_ns3_program('hello-simulator', - ['core']) - obj.source = 'hello-simulator.cc' - - obj = bld.create_ns3_program('tutorial-1', - ['core']) - obj.source = 'tutorial-1.cc' - - obj = bld.create_ns3_program('tutorial-2', - ['core']) - obj.source = 'tutorial-2.cc' - - obj = bld.create_ns3_program('tutorial-3', - ['core']) - obj.source = 'tutorial-3.cc' diff --git a/tutorial/wscript-4 b/tutorial/wscript-4 deleted file mode 100644 index 965b8196e..000000000 --- a/tutorial/wscript-4 +++ /dev/null @@ -1,22 +0,0 @@ -## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*- - -def build(bld): - obj = bld.create_ns3_program('hello-simulator', - ['core']) - obj.source = 'hello-simulator.cc' - - obj = bld.create_ns3_program('tutorial-1', - ['core']) - obj.source = 'tutorial-1.cc' - - obj = bld.create_ns3_program('tutorial-2', - ['core']) - obj.source = 'tutorial-2.cc' - - obj = bld.create_ns3_program('tutorial-3', - ['core']) - obj.source = 'tutorial-3.cc' - - obj = bld.create_ns3_program('tutorial-4', - ['core']) - obj.source = 'tutorial-4.cc'