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

get rid of CreateObjectWith

Browse Source
This commit is contained in:
Mathieu Lacage
2008-03-11 13:30:12 -07:00
parent 7a1c14372c
commit b5a8d46096
74 changed files with 399 additions and 412 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tutorial/point-to-point-ipv4-topology.cc
View File

@@ -34,7 +34,7 @@ PointToPointIpv4Topology::CreateChannel (
const DataRate& bps,
const Time& delay)
{
return CreateObject<PointToPointChannel> (bps, delay);
return CreateObject<PointToPointChannel> ("BitRate", bps, "Delay", delay);
}
uint32_t
@@ -45,7 +45,7 @@ PointToPointIpv4Topology::AddNetDevice (
NS_ASSERT (channel->GetNDevices () <= 1);
Ptr<PointToPointNetDevice> nd =
CreateObjectWith<PointToPointNetDevice> ("Node", node,
CreateObject<PointToPointNetDevice> ("Node", node,
"Address", Mac48Address::Allocate ());
node->AddDevice (nd);
Ptr<Queue> q = CreateObject<DropTailQueue> ();

4
tutorial/tutorial-bus-network.cc
View File

@@ -44,7 +44,7 @@ main (int argc, char *argv[])
Ptr<Node> n0 = bus.GetNode (0);
Ptr<UdpEchoClient> client =
CreateObjectWith<UdpEchoClient> ("Node", n0,
CreateObject<UdpEchoClient> ("Node", n0,
"RemoteIpv4", Ipv4Address ("10.1.0.1"),
"RemotePort", Uinteger (port),
"MaxPackets", Uinteger (1),
@@ -54,7 +54,7 @@ main (int argc, char *argv[])
Ptr<Node> n1 = bus.GetNode (1);
Ptr<UdpEchoServer> server =
CreateObjectWith<UdpEchoServer> ("Node", n1, "Port", Uinteger (port));
CreateObject<UdpEchoServer> ("Node", n1, "Port", Uinteger (port));
n1->AddApplication (server);
server->Start(Seconds(1.));

4
tutorial/tutorial-csma-echo-ascii-trace.cc
View File

@@ -69,7 +69,7 @@ main (int argc, char *argv[])
uint16_t port = 7;
Ptr<UdpEchoClient> client =
CreateObjectWith<UdpEchoClient> ("Node", n0,
CreateObject<UdpEchoClient> ("Node", n0,
"RemoteIpv4", Ipv4Address ("10.1.1.2"),
"RemotePort", Uinteger (port),
"MaxPackets", Uinteger (1),
@@ -78,7 +78,7 @@ main (int argc, char *argv[])
n0->AddApplication (client);
Ptr<UdpEchoServer> server =
CreateObjectWith<UdpEchoServer> ("Node", n1,
CreateObject<UdpEchoServer> ("Node", n1,
"Port", Uinteger (port));
n1->AddApplication (server);

4
tutorial/tutorial-csma-echo-pcap-trace.cc
View File

@@ -70,7 +70,7 @@ main (int argc, char *argv[])
uint16_t port = 7;
Ptr<UdpEchoClient> client =
CreateObjectWith<UdpEchoClient> ("Node", n0,
CreateObject<UdpEchoClient> ("Node", n0,
"RemoteIpv4", Ipv4Address ("10.1.1.2"),
"RemotePort", Uinteger (port),
"MaxPackets", Uinteger (1),
@@ -79,7 +79,7 @@ main (int argc, char *argv[])
n0->AddApplication (client);
Ptr<UdpEchoServer> server =
CreateObjectWith<UdpEchoServer> ("Node", n1,
CreateObject<UdpEchoServer> ("Node", n1,
"Port", Uinteger (port));
n1->AddApplication (server);

4
tutorial/tutorial-csma-echo.cc
View File

@@ -68,7 +68,7 @@ main (int argc, char *argv[])
uint16_t port = 7;
Ptr<UdpEchoClient> client =
CreateObjectWith<UdpEchoClient> ("Node", n0,
CreateObject<UdpEchoClient> ("Node", n0,
"RemoteIpv4", Ipv4Address ("10.1.1.2"),
"RemotePort", Uinteger (port),
"MaxPackets", Uinteger (1),
@@ -77,7 +77,7 @@ main (int argc, char *argv[])
n0->AddApplication (client);
Ptr<UdpEchoServer> server =
CreateObjectWith<UdpEchoServer> ("Node", n1,
CreateObject<UdpEchoServer> ("Node", n1,
"Port", Uinteger (port));
n1->AddApplication (server);

16
tutorial/tutorial-linear-dumbbell.cc
View File

@@ -127,7 +127,7 @@ main (int argc, char *argv[])
uint16_t port = 7;
Ptr<UdpEchoClient> client0 =
CreateObjectWith<UdpEchoClient> (
CreateObject<UdpEchoClient> (
"Node", n0,
"RemoteIpv4", Ipv4Address ("10.1.2.1"),
"RemotePort", Uinteger (port),
@@ -136,7 +136,7 @@ main (int argc, char *argv[])
"PacketSize", Uinteger (1024));
n0->AddApplication (client0);
Ptr<UdpEchoClient> client1 =
CreateObjectWith<UdpEchoClient> (
CreateObject<UdpEchoClient> (
"Node", n1,
"RemoteIpv4", Ipv4Address ("10.1.2.2"),
"RemotePort", Uinteger (port),
@@ -145,7 +145,7 @@ main (int argc, char *argv[])
"PacketSize", Uinteger (1024));
n1->AddApplication (client1);
Ptr<UdpEchoClient> client2 =
CreateObjectWith<UdpEchoClient> (
CreateObject<UdpEchoClient> (
"Node", n2,
"RemoteIpv4", Ipv4Address ("10.1.2.3"),
"RemotePort", Uinteger (port),
@@ -154,7 +154,7 @@ main (int argc, char *argv[])
"PacketSize", Uinteger (1024));
n2->AddApplication (client2);
Ptr<UdpEchoClient> client3 =
CreateObjectWith<UdpEchoClient> (
CreateObject<UdpEchoClient> (
"Node", n3,
"RemoteIpv4", Ipv4Address ("10.1.2.4"),
"RemotePort", Uinteger (port),
@@ -164,16 +164,16 @@ main (int argc, char *argv[])
n3->AddApplication (client3);
Ptr<UdpEchoServer> server4 =
CreateObjectWith<UdpEchoServer> ("Node", n4, "Port", Uinteger (port));
CreateObject<UdpEchoServer> ("Node", n4, "Port", Uinteger (port));
n4->AddApplication (server4);
Ptr<UdpEchoServer> server5 =
CreateObjectWith<UdpEchoServer> ("Node", n5, "Port", Uinteger (port));
CreateObject<UdpEchoServer> ("Node", n5, "Port", Uinteger (port));
n5->AddApplication (server5);
Ptr<UdpEchoServer> server6 =
CreateObjectWith<UdpEchoServer> ("Node", n6, "Port", Uinteger (port));
CreateObject<UdpEchoServer> ("Node", n6, "Port", Uinteger (port));
n6->AddApplication (server6);
Ptr<UdpEchoServer> server7 =
CreateObjectWith<UdpEchoServer> ("Node", n7, "Port", Uinteger (port));
CreateObject<UdpEchoServer> ("Node", n7, "Port", Uinteger (port));
n7->AddApplication (server7);
server4->Start(Seconds(1.));

4
tutorial/tutorial-point-to-point.cc
View File

@@ -61,7 +61,7 @@ main (int argc, char *argv[])
uint16_t port = 7;
Ptr<UdpEchoClient> client =
CreateObjectWith<UdpEchoClient> ("Node", n0,
CreateObject<UdpEchoClient> ("Node", n0,
"RemoteIpv4", Ipv4Address ("10.1.1.2"),
"RemotePort", Uinteger (port),
"MaxPackets", Uinteger (1),
@@ -70,7 +70,7 @@ main (int argc, char *argv[])
n0->AddApplication (client);
Ptr<UdpEchoServer> server =
CreateObjectWith<UdpEchoServer> ("Node", n1,
CreateObject<UdpEchoServer> ("Node", n1,
"Port", Uinteger (port));
n1->AddApplication (server);

4
tutorial/tutorial-star-routing.cc
View File

@@ -148,7 +148,7 @@ main (int argc, char *argv[])
uint16_t port = 7;
Ptr<UdpEchoClient> client =
CreateObjectWith<UdpEchoClient> ("Node", n4,
CreateObject<UdpEchoClient> ("Node", n4,
"RemoteIpv4", Ipv4Address ("10.1.1.2"),
"RemotePort", Uinteger (port),
"MaxPackets", Uinteger (1),
@@ -157,7 +157,7 @@ main (int argc, char *argv[])
n0->AddApplication (client);
Ptr<UdpEchoServer> server =
CreateObjectWith<UdpEchoServer> ("Node", n1,
CreateObject<UdpEchoServer> ("Node", n1,
"Port", Uinteger (port));
n1->AddApplication (server);

4
tutorial/tutorial-star.cc
View File

@@ -148,7 +148,7 @@ main (int argc, char *argv[])
uint16_t port = 7;
Ptr<UdpEchoClient> client =
CreateObjectWith<UdpEchoClient> ("Node", n0,
CreateObject<UdpEchoClient> ("Node", n0,
"RemoteIpv4", Ipv4Address ("10.1.1.2"),
"RemotePort", Uinteger (port),
"MaxPackets", Uinteger (1),
@@ -157,7 +157,7 @@ main (int argc, char *argv[])
n0->AddApplication (client);
Ptr<UdpEchoServer> server =
CreateObjectWith<UdpEchoServer> ("Node", n1,
CreateObject<UdpEchoServer> ("Node", n1,
"Port", Uinteger (port));
n1->AddApplication (server);