F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tutorial

Browse Source
This commit is contained in:
Craig Dowell
2007-10-02 15:34:00 -07:00
parent cd21a5ed8a
commit ef9c8a4716
11 changed files with 24 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/applications/udp-echo/udp-echo-server.cc
View File

@@ -84,8 +84,7 @@ UdpEchoServer::StartApplication (void)
m_socket->Bind (m_local);
}
m_socket->SetRecvCallback((Callback<void, Ptr<Socket>, 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<void, Ptr<Socket>, const Packet &,
const Address &>) NULL);
m_socket->SetRecvCallback (MakeNullCallback<void, Ptr<Socket>,
const Packet &, const Address &> ());
}
}

0
tutorial/tutorial-2.cc → tutorial/tutorial-csma-echo-ascii-trace.cc
View File

0
tutorial/tutorial-3.cc → tutorial/tutorial-csma-echo-pcap-trace.cc
View File

0
tutorial/tutorial-1.cc → tutorial/tutorial-csma-echo.cc
View File

25
tutorial/tutorial-4.cc → tutorial/tutorial-naive-dumbbell.cc
View File

@@ -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<Node> n0 = Create<InternetNode> ();
Ptr<Node> n1 = Create<InternetNode> ();
Ptr<Node> n2 = Create<InternetNode> ();
Ptr<Node> n3 = Create<InternetNode> ();
Ptr<Node> n4 = Create<InternetNode> ();
Ptr<Node> n5 = Create<InternetNode> ();
Ptr<Node> n6 = Create<InternetNode> ();
Ptr<Node> n7 = Create<InternetNode> ();
Ptr<CsmaChannel> 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<Node> n4 = Create<InternetNode> ();
Ptr<Node> n5 = Create<InternetNode> ();
Ptr<Node> n6 = Create<InternetNode> ();
Ptr<Node> n7 = Create<InternetNode> ();
Ptr<CsmaChannel> 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<PointToPointChannel> 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");

16
tutorial/wscript
View File

@@ -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'

6
tutorial/wscript-0
View File

@@ -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'

10
tutorial/wscript-1
View File

@@ -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'

14
tutorial/wscript-2
View File

@@ -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'

18
tutorial/wscript-3
View File

@@ -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'

22
tutorial/wscript-4
View File

@@ -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'