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

branch merge

Browse Source
This commit is contained in:
Craig Dowell
2008-03-26 11:42:12 -07:00
parent 0a3da46adc 83dea96517
commit 3d0e59cd05
7 changed files with 68 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
examples/csma-broadcast.cc
View File

@@ -33,26 +33,8 @@
#include <cassert>
#include "ns3/core-module.h"
#include "ns3/common-module.h"
#include "ns3/simulator-module.h"
#include "ns3/helper-module.h"
#include "ns3/ascii-trace.h"
#include "ns3/pcap-trace.h"
#include "ns3/internet-node.h"
#include "ns3/csma-channel.h"
#include "ns3/csma-net-device.h"
#include "ns3/csma-topology.h"
#include "ns3/csma-ipv4-topology.h"
#include "ns3/mac48-address.h"
#include "ns3/ipv4-address.h"
#include "ns3/inet-socket-address.h"
#include "ns3/ipv4.h"
#include "ns3/socket.h"
#include "ns3/ipv4-route.h"
#include "ns3/onoff-application.h"
#include "ns3/packet-sink.h"
#include "ns3/internet-node-module.h"
using namespace ns3;

118
examples/tcp-large-transfer.cc
View File

@@ -34,33 +34,13 @@
#include <string>
#include <cassert>
#include "ns3/command-line.h"
#include "ns3/ptr.h"
#include "ns3/random-variable.h"
#include "ns3/log.h"
#include "ns3/simulator.h"
#include "ns3/nstime.h"
#include "ns3/data-rate.h"
#include "ns3/core-module.h"
#include "ns3/helper-module.h"
#include "ns3/ascii-trace.h"
#include "ns3/pcap-trace.h"
#include "ns3/internet-node.h"
#include "ns3/point-to-point-channel.h"
#include "ns3/point-to-point-net-device.h"
#include "ns3/ipv4-address.h"
#include "ns3/inet-socket-address.h"
#include "ns3/ipv4.h"
#include "ns3/socket.h"
#include "ns3/ipv4-route.h"
#include "ns3/point-to-point-topology.h"
#include "ns3/onoff-application.h"
#include "ns3/packet-sink.h"
#include "ns3/error-model.h"
#include "ns3/node-list.h"
#include "ns3/config.h"
#include "ns3/tcp.h"
#include "ns3/internet-node-module.h"
using namespace ns3;
@@ -101,10 +81,11 @@ void CloseConnection (Ptr<Socket> localSocket)
}
void StartFlow(Ptr<Socket> localSocket, uint32_t nBytes,
uint16_t servPort)
Ipv4Address servAddress,
uint16_t servPort)
{
// NS_LOG_LOGIC("Starting flow at time " << Simulator::Now ().GetSeconds ());
localSocket->Connect (InetSocketAddress ("10.1.2.2", servPort));//connect
localSocket->Connect (InetSocketAddress (servAddress, servPort));//connect
localSocket->SetConnectCallback (MakeCallback (&CloseConnection),
Callback<void, Ptr<Socket> > (),
Callback<void, Ptr<Socket> > ());
@@ -133,52 +114,45 @@ 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
// LogComponentEnable("TcpL4Protocol", LOG_LEVEL_ALL);
// LogComponentEnable("TcpSocket", LOG_LEVEL_ALL);
// LogComponentEnable("PacketSink", LOG_LEVEL_ALL);
//LogComponentEnable("TcpLargeTransfer", LOG_LEVEL_ALL);
// LogComponentEnable("TcpL4Protocol", LOG_LEVEL_ALL);
// LogComponentEnable("TcpSocket", LOG_LEVEL_ALL);
// LogComponentEnable("PacketSink", LOG_LEVEL_ALL);
// LogComponentEnable("TcpLargeTransfer", LOG_LEVEL_ALL);
// Allow the user to override any of the defaults and the above
// Bind()s at run-time, via command-line arguments
CommandLine cmd;
cmd.Parse (argc, argv);
// Here, we will explicitly create three nodes. In more sophisticated
// topologies, we could configure a node factory.
Ptr<Node> n0 = Create<InternetNode> ();
Ptr<Node> n1 = Create<InternetNode> ();
Ptr<Node> n2 = Create<InternetNode> ();
// Here, we will explicitly create three nodes.
NodeContainer c0;
c0.Create (2);
NodeContainer c1;
c1.Add (c0.Get (1));
c1.Create (1);
// We create the channels first without any IP addressing information
Ptr<PointToPointChannel> channel0 =
PointToPointTopology::AddPointToPointLink (
n0, n1, DataRate(10000000), MilliSeconds(10));
PointToPointHelper p2p;
p2p.SetChannelParameter ("BitRate", DataRate(10000000));
p2p.SetChannelParameter ("Delay", MilliSeconds(10));
NetDeviceContainer dev0 = p2p.Build (c0);
NetDeviceContainer dev1 = p2p.Build (c1);
// add ip/tcp stack to nodes.
NodeContainer c = NodeContainer (c0, c1.Get (1));
InternetStackHelper internet;
internet.Build (c);
// Later, we add IP addresses.
PointToPointTopology::AddIpv4Addresses (
channel0, n0, Ipv4Address("10.1.3.1"),
n1, Ipv4Address("10.1.3.2"));
Ptr<PointToPointChannel> channel1 =
PointToPointTopology::AddPointToPointLink (
n1, n2, DataRate(10000000), MilliSeconds(10));
PointToPointTopology::AddIpv4Addresses (
channel1, n1, Ipv4Address("10.1.2.1"),
n2, Ipv4Address("10.1.2.2"));
// Finally, we add static routes. These three steps (Channel and
// NetDevice creation, IP Address assignment, and routing) are
// separated because there may be a need to postpone IP Address
// assignment (emulation) or modify to use dynamic routing
PointToPointTopology::AddIpv4Routes(n0, n1, channel0);
PointToPointTopology::AddIpv4Routes(n1, n2, channel1);
Ptr<Ipv4> ipv4;
ipv4 = n0->GetObject<Ipv4> ();
ipv4->SetDefaultRoute (Ipv4Address ("10.1.3.2"), 1);
ipv4 = n2->GetObject<Ipv4> ();
ipv4->SetDefaultRoute (Ipv4Address ("10.1.2.1"), 1);
Ipv4AddressHelper ipv4;
ipv4.SetBase ("10.1.3.0", "255.255.255.0");
ipv4.Allocate (dev0);
ipv4.SetBase ("10.1.2.0", "255.255.255.0");
ipv4.Allocate (dev1);
// and setup ip routing tables to get total ip-level connectivity.
GlobalRouteManager::PopulateRoutingTables ();
///////////////////////////////////////////////////////////////////////////
// Simulation 1
@@ -191,21 +165,19 @@ int main (int argc, char *argv[])
int nBytes = 2000000;
uint16_t servPort = 50000;
// Create a packet sink to receive these packets
PacketSinkHelper sink;
sink.SetupTcp (Ipv4Address::GetAny (), servPort);
ApplicationContainer apps = sink.Build (c1.Get (1));
apps.Start (Seconds (0.0));
// and generate traffic to remote sink.
Ptr<SocketFactory> socketFactory =
n0->GetObject<SocketFactory> ();
c0.Get (0)->GetObject<Tcp> ();
Ptr<Socket> localSocket = socketFactory->CreateSocket ();
localSocket->Bind ();
// Create a packet sink to receive these packets
Ptr<PacketSink> sink =
CreateObject<PacketSink> ("Local", Address (InetSocketAddress (Ipv4Address::GetAny (), servPort)),
"Protocol", TypeId::LookupByName ("ns3::Tcp"));
n2->AddApplication (sink);
sink->Start (Seconds (0.0));
sink->Stop (Seconds (100.0));
Simulator::Schedule(Seconds(0), &StartFlow, localSocket, nBytes,
servPort);
Simulator::ScheduleNow (&StartFlow, localSocket, nBytes,
Ipv4Address ("10.1.2.2"), servPort);
// Configure tracing of all enqueue, dequeue, and NetDevice receive events
// Trace output will be sent to the simple-examples.tr file

8
src/applications/onoff/onoff-application.cc
View File

@@ -71,6 +71,13 @@ OnOffApplication::GetTypeId (void)
ConstantVariable (1.0),
MakeRandomVariableAccessor (&OnOffApplication::m_offTime),
MakeRandomVariableChecker ())
.AddAttribute ("MaxBytes",
"The total number of bytes to send. Once these bytes are sent, "
"no packet is sent again, even in on state. The value zero means "
"that there is no limit.",
Uinteger (0),
MakeUintegerAccessor (&OnOffApplication::m_maxBytes),
MakeUintegerChecker<uint32_t> ())
.AddAttribute ("Protocol", "The type of protocol to use.",
Udp::GetTypeId (),
MakeTypeIdAccessor (&OnOffApplication::m_tid),
@@ -89,7 +96,6 @@ OnOffApplication::OnOffApplication ()
m_connected = false;
m_residualBits = 0;
m_lastStartTime = Seconds (0);
m_maxBytes = 0;
m_totBytes = 0;
}

2
src/devices/csma/csma-channel.cc
View File

@@ -358,7 +358,7 @@ CsmaChannel::GetState(void)
Ptr<NetDevice>
CsmaChannel::GetDevice (uint32_t i) const
{
return GetDevice (i);
return GetCsmaDevice (i);
}
} // namespace ns3

2
src/devices/point-to-point/point-to-point-channel.cc
View File

@@ -29,6 +29,8 @@ NS_LOG_COMPONENT_DEFINE ("PointToPointChannel");
namespace ns3 {
NS_OBJECT_ENSURE_REGISTERED (PointToPointChannel);
TypeId
PointToPointChannel::GetTypeId (void)
{

12
src/helper/point-to-point-helper.cc
View File

@@ -7,7 +7,11 @@ namespace ns3 {
PointToPointHelper::PointToPointHelper ()
{}
{
m_queueFactory.SetTypeId ("ns3::DropTailQueue");
m_deviceFactory.SetTypeId ("ns3::PointToPointNetDevice");
m_channelFactory.SetTypeId ("ns3::PointToPointChannel");
}
void
PointToPointHelper::SetQueue (std::string type,
@@ -47,17 +51,17 @@ PointToPointHelper::Build (Ptr<Node> a, Ptr<Node> b)
{
NetDeviceContainer container;
Ptr<PointToPointNetDevice> devA = CreateObject<PointToPointNetDevice> ();
Ptr<PointToPointNetDevice> devA = m_deviceFactory.Create<PointToPointNetDevice> ();
devA->SetAddress (Mac48Address::Allocate ());
a->AddDevice (devA);
Ptr<Queue> queueA = m_queueFactory.Create<Queue> ();
devA->AddQueue (queueA);
Ptr<PointToPointNetDevice> devB = CreateObject<PointToPointNetDevice> ();
Ptr<PointToPointNetDevice> devB = m_deviceFactory.Create<PointToPointNetDevice> ();
devB->SetAddress (Mac48Address::Allocate ());
b->AddDevice (devB);
Ptr<Queue> queueB = m_queueFactory.Create<Queue> ();
devB->AddQueue (queueB);
Ptr<PointToPointChannel> channel = CreateObject<PointToPointChannel> ();
Ptr<PointToPointChannel> channel = m_channelFactory.Create<PointToPointChannel> ();
devA->Attach (channel);
devB->Attach (channel);
container.Add (devA);

8
src/wscript
View File

@@ -153,10 +153,10 @@ def gen_ns3_module_header(task):
#ifndef NS3_MODULE_%s
""" % (task.module.upper().replace('-', '_'),)
if task.module_deps:
print >> outfile, "// Module dependencies:"
for dep in task.module_deps:
print >> outfile, "#include \"%s-module.h\"" % dep
# if task.module_deps:
# print >> outfile, "// Module dependencies:"
# for dep in task.module_deps:
# print >> outfile, "#include \"%s-module.h\"" % dep
print >> outfile
print >> outfile, "// Module headers:"