# HG changeset patch # User Mathieu Lacage # Date 1204147179 -3600 # Node ID e667dc0f350e2e13afa434068d0184edec56e4ae # Parent d64b1561b1c25cba03252c1156e6950d1584b23f# Parent 50d0da37f02f80090d3fbffeba02eb2559b252f9 merge with HEAD diff -r d64b1561b1c2 -r e667dc0f350e examples/csma-broadcast.cc --- a/examples/csma-broadcast.cc Tue Feb 26 01:39:59 2008 +0100 +++ b/examples/csma-broadcast.cc Wed Feb 27 22:19:39 2008 +0100 @@ -154,30 +154,36 @@ // Create the OnOff application to send UDP datagrams of size // 512 bytes (default) at a rate of 500 Kb/s (default) from n0 NS_LOG_INFO ("Create Applications."); - Ptr ooff = CreateObject ( - n0, - InetSocketAddress ("255.255.255.255", port), - "Udp", - ConstantVariable(1), - ConstantVariable(0)); + Ptr ooff = + CreateObjectWith ( + "Node", n0, + "Remote", Address (InetSocketAddress ("255.255.255.255", port)), + "Protocol", TypeId::LookupByName ("Udp"), + "OnTime", ConstantVariable(1), + "OffTime", ConstantVariable(0)); + n0->AddApplication (ooff); // Start the application ooff->Start(Seconds(1.0)); ooff->Stop (Seconds(10.0)); // Create an optional packet sink to receive these packets - Ptr sink = CreateObject ( - n1, - InetSocketAddress (Ipv4Address::GetAny (), port), - "Udp"); + Ptr sink = + CreateObjectWith ( + "Node", n1, + "Local", Address (InetSocketAddress (Ipv4Address::GetAny (), port)), + "Protocol", TypeId::LookupByName ("Udp")); + n1->AddApplication (sink); // Start the sink sink->Start (Seconds (1.0)); sink->Stop (Seconds (10.0)); // Create an optional packet sink to receive these packets - sink = CreateObject ( - n2, - InetSocketAddress (Ipv4Address::GetAny (), port), - "Udp"); + sink = CreateObjectWith ( + "Node", n2, + "Local", Address (InetSocketAddress (Ipv4Address::GetAny (), port)), + "Protocol", TypeId::LookupByName ("Udp")); + n2->AddApplication (sink); + // Start the sink sink->Start (Seconds (1.0)); sink->Stop (Seconds (10.0)); diff -r d64b1561b1c2 -r e667dc0f350e examples/csma-multicast.cc --- a/examples/csma-multicast.cc Tue Feb 26 01:39:59 2008 +0100 +++ b/examples/csma-multicast.cc Wed Feb 27 22:19:39 2008 +0100 @@ -52,6 +52,7 @@ #include "ns3/ipv4-route.h" #include "ns3/onoff-application.h" #include "ns3/packet-sink.h" +#include "ns3/uinteger.h" using namespace ns3; @@ -281,14 +282,16 @@ // Configure a multicast packet generator that generates a packet // every few seconds - Ptr ooff = CreateObject ( - n0, - InetSocketAddress (multicastGroup, port), - "Udp", - ConstantVariable(1), - ConstantVariable(0), - DataRate ("255b/s"), - 128); + Ptr ooff = + CreateObjectWith ( + "Node", n0, + "Remote", Address (InetSocketAddress (multicastGroup, port)), + "Protocol", TypeId::LookupByName ("Udp"), + "OnTime", ConstantVariable(1), + "OffTime", ConstantVariable(0), + "DataRate", DataRate ("255b/s"), + "PacketSize", Uinteger (128)); + n0->AddApplication (ooff); // // Tell the application when to start and stop. // @@ -298,10 +301,12 @@ // Create an optional packet sink to receive these packets // If you enable logging on this (above) it will print a log statement // for every packet received - Ptr sink = CreateObject ( - n4, - InetSocketAddress (Ipv4Address::GetAny (), port), - "Udp"); + Ptr sink = + CreateObjectWith ( + "Node", n4, + "Local", Address (InetSocketAddress (Ipv4Address::GetAny (), port)), + "Protocol", TypeId::LookupByName ("Udp")); + n4->AddApplication (sink); // Start the sink sink->Start (Seconds (1.0)); sink->Stop (Seconds (10.0)); diff -r d64b1561b1c2 -r e667dc0f350e examples/csma-one-subnet.cc --- a/examples/csma-one-subnet.cc Tue Feb 26 01:39:59 2008 +0100 +++ b/examples/csma-one-subnet.cc Wed Feb 27 22:19:39 2008 +0100 @@ -165,12 +165,15 @@ // NS_LOG_INFO ("Create Applications."); uint16_t port = 9; // Discard port (RFC 863) - Ptr ooff = CreateObject ( - n0, - InetSocketAddress ("10.1.1.2", port), - "Udp", - ConstantVariable(1), - ConstantVariable(0)); + Ptr ooff = + CreateObjectWith ( + "Node", n0, + "Remote", Address (InetSocketAddress ("10.1.1.2", port)), + "Protocol", TypeId::LookupByName ("Udp"), + "OnTime", ConstantVariable(1), + "OffTime", ConstantVariable(0)); + n0->AddApplication (ooff); + // // Tell the application when to start and stop. // @@ -179,12 +182,13 @@ // // Create a similar flow from n3 to n0, starting at time 1.1 seconds // - ooff = CreateObject ( - n3, - InetSocketAddress ("10.1.1.1", port), - "Udp", - ConstantVariable(1), - ConstantVariable(0)); + ooff = CreateObjectWith ( + "Node", n3, + "Remote", Address (InetSocketAddress ("10.1.1.1", port)), + "Protocol", TypeId::LookupByName ("Udp"), + "OnTime", ConstantVariable(1), + "OffTime", ConstantVariable(0)); + n3->AddApplication (ooff); ooff->Start(Seconds(1.1)); ooff->Stop (Seconds(10.0)); diff -r d64b1561b1c2 -r e667dc0f350e examples/csma-packet-socket.cc --- a/examples/csma-packet-socket.cc Tue Feb 26 01:39:59 2008 +0100 +++ b/examples/csma-packet-socket.cc Wed Feb 27 22:19:39 2008 +0100 @@ -38,6 +38,7 @@ #include "ns3/ptr.h" #include "ns3/random-variable.h" #include "ns3/log.h" +#include "ns3/string.h" #include "ns3/simulator.h" #include "ns3/nstime.h" @@ -61,7 +62,10 @@ static Ptr CreateCsmaDevice (Ptr node, Ptr channel) { - Ptr device = CreateObject (node); + Ptr device = CreateObjectWith ("Node", node, + "Address", Mac48Address::Allocate (), + "EncapsulationMode", String ("Llc")); + node->AddDevice (device); device->Attach (channel); Ptr queue = Queue::CreateDefault (); device->AddQueue (queue); @@ -134,23 +138,26 @@ // 210 bytes at a rate of 448 Kb/s // from n0 to n1 NS_LOG_INFO ("Create Applications."); - Ptr ooff = CreateObject ( - n0, - n0ToN1, - "Packet", - ConstantVariable(1), - ConstantVariable(0)); + Ptr ooff = + CreateObjectWith ( + "Node", n0, + "Remote", Address (n0ToN1), + "Protocol", TypeId::LookupByName ("Packet"), + "OnTime", ConstantVariable(1), + "OffTime", ConstantVariable(0)); + n0->AddApplication (ooff); // Start the application ooff->Start(Seconds(1.0)); ooff->Stop (Seconds(10.0)); // Create a similar flow from n3 to n0, starting at time 1.1 seconds - ooff = CreateObject ( - n3, - n3ToN0, - "Packet", - ConstantVariable(1), - ConstantVariable(0)); + ooff = CreateObjectWith ( + "Node", n3, + "Remote", Address (n3ToN0), + "Protocol", TypeId::LookupByName ("Packet"), + "OnTime", ConstantVariable(1), + "OffTime", ConstantVariable(0)); + n3->AddApplication (ooff); // Start the application ooff->Start(Seconds(1.1)); ooff->Stop (Seconds(10.0)); diff -r d64b1561b1c2 -r e667dc0f350e examples/mixed-global-routing.cc --- a/examples/mixed-global-routing.cc Tue Feb 26 01:39:59 2008 +0100 +++ b/examples/mixed-global-routing.cc Wed Feb 27 22:19:39 2008 +0100 @@ -42,6 +42,7 @@ #include "ns3/default-value.h" #include "ns3/ptr.h" #include "ns3/random-variable.h" +#include "ns3/config.h" #include "ns3/simulator.h" #include "ns3/nstime.h" @@ -65,6 +66,7 @@ #include "ns3/point-to-point-topology.h" #include "ns3/onoff-application.h" #include "ns3/global-route-manager.h" +#include "ns3/uinteger.h" using namespace ns3; @@ -110,10 +112,8 @@ // topology code DefaultValue::Bind ("Queue", "DropTailQueue"); - DefaultValue::Bind ("OnOffApplicationPacketSize", "210"); - DefaultValue::Bind ("OnOffApplicationDataRate", "448kb/s"); - - //DefaultValue::Bind ("DropTailQueue::m_maxPackets", 30); + Config::SetDefault ("OnOffApplication::PacketSize", Uinteger (210)); + Config::SetDefault ("OnOffApplication::DataRate", DataRate ("448kb/s")); // Allow the user to override any of the defaults and the above // Bind ()s at run-time, via command-line arguments @@ -191,14 +191,16 @@ // 210 bytes at a rate of 448 Kb/s NS_LOG_INFO ("Create Applications."); uint16_t port = 9; // Discard port (RFC 863) - Ptr ooff = CreateObject ( - n0, - InetSocketAddress ("10.1.3.2", port), - "Udp", - ConstantVariable (1), - ConstantVariable (0), - DataRate("300bps"), - 50); + Ptr ooff = + CreateObjectWith ( + "Node", n0, + "Remote", Address (InetSocketAddress ("10.1.3.2", port)), + "Protocol", TypeId::LookupByName ("Udp"), + "OnTime", ConstantVariable (1), + "OffTime", ConstantVariable (0), + "DataRate", DataRate("300bps"), + "PacketSize", Uinteger (50)); + n0->AddApplication (ooff); // Start the application ooff->Start (Seconds (1.0)); ooff->Stop (Seconds (10.0)); diff -r d64b1561b1c2 -r e667dc0f350e examples/simple-alternate-routing.cc --- a/examples/simple-alternate-routing.cc Tue Feb 26 01:39:59 2008 +0100 +++ b/examples/simple-alternate-routing.cc Wed Feb 27 22:19:39 2008 +0100 @@ -43,6 +43,8 @@ #include "ns3/default-value.h" #include "ns3/ptr.h" #include "ns3/random-variable.h" +#include "ns3/config.h" +#include "ns3/uinteger.h" #include "ns3/simulator.h" #include "ns3/nstime.h" @@ -105,8 +107,8 @@ // instantiate, when the queue factory is invoked in the topology code DefaultValue::Bind ("Queue", "DropTailQueue"); - DefaultValue::Bind ("OnOffApplicationPacketSize", "210"); - DefaultValue::Bind ("OnOffApplicationDataRate", "300b/s"); + Config::SetDefault ("OnOffApplication::PacketSize", Uinteger (210)); + Config::SetDefault ("OnOffApplication::DataRate", DataRate ("300b/s")); // The below metric, if set to 3 or higher, will cause packets between // n1 and n3 to take the 2-hop route through n2 @@ -182,21 +184,25 @@ uint16_t port = 9; // Discard port (RFC 863) // Create a flow from n3 to n1, starting at time 1.1 seconds - Ptr ooff = CreateObject ( - n3, - InetSocketAddress ("10.1.1.1", port), - "Udp", - ConstantVariable (1), - ConstantVariable (0)); + Ptr ooff = + CreateObjectWith ( + "Node", n3, + "Remote", Address (InetSocketAddress ("10.1.1.1", port)), + "Protocol", TypeId::LookupByName ("Udp"), + "OnTime", ConstantVariable (1), + "OffTime", ConstantVariable (0)); + n3->AddApplication (ooff); // Start the application ooff->Start (Seconds (1.1)); ooff->Stop (Seconds (10.0)); // Create a packet sink to receive these packets - Ptr sink = CreateObject ( - n1, - InetSocketAddress (Ipv4Address::GetAny (), port), - "Udp"); + Ptr sink = + CreateObjectWith ( + "Node", n1, + "Remote", Address (InetSocketAddress (Ipv4Address::GetAny (), port)), + "Protocol", TypeId::LookupByName ("Udp")); + n1->AddApplication (sink); // Start the sink sink->Start (Seconds (1.1)); sink->Stop (Seconds (10.0)); diff -r d64b1561b1c2 -r e667dc0f350e examples/simple-error-model.cc --- a/examples/simple-error-model.cc Tue Feb 26 01:39:59 2008 +0100 +++ b/examples/simple-error-model.cc Wed Feb 27 22:19:39 2008 +0100 @@ -43,6 +43,9 @@ #include "ns3/command-line.h" #include "ns3/default-value.h" #include "ns3/ptr.h" +#include "ns3/config.h" +#include "ns3/uinteger.h" +#include "ns3/string.h" #include "ns3/simulator.h" #include "ns3/nstime.h" @@ -64,6 +67,7 @@ #include "ns3/onoff-application.h" #include "ns3/packet-sink.h" #include "ns3/error-model.h" +#include "ns3/double.h" using namespace ns3; @@ -78,15 +82,12 @@ LogComponentEnable ("SimplePointToPointExample", LOG_LEVEL_INFO); #endif - // Set up some default values for the simulation. Use the Bind() - // technique to tell the system what subclass of ErrorModel to use - DefaultValue::Bind ("ErrorModel", "RateErrorModel"); // Set a few parameters - DefaultValue::Bind ("RateErrorModelErrorRate", "0.01"); - DefaultValue::Bind ("RateErrorModelErrorUnit", "EU_PKT"); - - DefaultValue::Bind ("OnOffApplicationPacketSize", "210"); - DefaultValue::Bind ("OnOffApplicationDataRate", "448kb/s"); + Config::SetDefault ("RateErrorModel::ErrorRate", Double (0.01)); + Config::SetDefault ("RateErrorModel::ErrorUnit", String ("EU_PKT")); + + Config::SetDefault ("OnOffApplication::PacketSize", Uinteger (210)); + Config::SetDefault ("OnOffApplication::DataRate", DataRate ("448kb/s")); // Allow the user to override any of the defaults and the above @@ -142,41 +143,46 @@ // 210 bytes at a rate of 448 Kb/s NS_LOG_INFO ("Create Applications."); uint16_t port = 9; // Discard port (RFC 863) - Ptr ooff = CreateObject ( - n0, - InetSocketAddress ("10.1.3.2", port), - "Udp", - ConstantVariable(1), - ConstantVariable(0)); + Ptr ooff = + CreateObjectWith ( + "Node", n0, + "Remote", Address (InetSocketAddress ("10.1.3.2", port)), + "Protocol", TypeId::LookupByName ("Udp"), + "OnTime", ConstantVariable(1), + "OffTime", ConstantVariable(0)); + n0->AddApplication (ooff); // Start the application ooff->Start(Seconds(1.0)); ooff->Stop (Seconds(10.0)); // Create an optional packet sink to receive these packets - Ptr sink = CreateObject ( - n3, - InetSocketAddress (Ipv4Address::GetAny (), port), - "Udp"); + Ptr sink = CreateObjectWith ( + "Node", n3, + "Local", Address (InetSocketAddress (Ipv4Address::GetAny (), port)), + "Protocol", TypeId::LookupByName ("Udp")); + n3->AddApplication (sink); // Start the sink sink->Start (Seconds (1.0)); sink->Stop (Seconds (10.0)); // Create a similar flow from n3 to n1, starting at time 1.1 seconds - ooff = CreateObject ( - n3, - InetSocketAddress ("10.1.2.1", port), - "Udp", - ConstantVariable(1), - ConstantVariable(0)); + ooff = CreateObjectWith ( + "Node", n3, + "Remote", Address (InetSocketAddress ("10.1.2.1", port)), + "Protocol", TypeId::LookupByName ("Udp"), + "OnTime", ConstantVariable(1), + "OffTime", ConstantVariable(0)); + n3->AddApplication (ooff); // Start the application ooff->Start(Seconds(1.1)); ooff->Stop (Seconds(10.0)); // Create a packet sink to receive these packets - sink = CreateObject ( - n1, - InetSocketAddress (Ipv4Address::GetAny (), port), - "Udp"); + sink = CreateObjectWith ( + "Node", n1, + "Local", Address (InetSocketAddress (Ipv4Address::GetAny (), port)), + "Protocol", TypeId::LookupByName ("Udp")); + n1->AddApplication (sink); // Start the sink sink->Start (Seconds (1.1)); sink->Stop (Seconds (10.0)); @@ -200,16 +206,8 @@ (n3, channel2); // Create an ErrorModel based on the implementation (constructor) // specified by the default classId - Ptr em = ErrorModel::CreateDefault (); - NS_ASSERT (em != 0); - // Now, query interface on the resulting em pointer to see if a - // RateErrorModel interface exists. If so, set the packet error rate - Ptr bem = em->GetObject (); - if (bem) - { - bem->SetRandomVariable (UniformVariable ()); - bem->SetRate (0.001); - } + Ptr em = CreateObjectWith ("RanVar", UniformVariable (0.0, 1.0), + "Rate", Double (0.001)); nd3->AddReceiveErrorModel (em); // Now, let's use the ListErrorModel and explicitly force a loss diff -r d64b1561b1c2 -r e667dc0f350e examples/simple-global-routing.cc --- a/examples/simple-global-routing.cc Tue Feb 26 01:39:59 2008 +0100 +++ b/examples/simple-global-routing.cc Wed Feb 27 22:19:39 2008 +0100 @@ -48,6 +48,8 @@ #include "ns3/default-value.h" #include "ns3/ptr.h" #include "ns3/random-variable.h" +#include "ns3/config.h" +#include "ns3/uinteger.h" #include "ns3/simulator.h" #include "ns3/nstime.h" @@ -110,8 +112,8 @@ // instantiate, when the queue factory is invoked in the topology code DefaultValue::Bind ("Queue", "DropTailQueue"); - DefaultValue::Bind ("OnOffApplicationPacketSize", "210"); - DefaultValue::Bind ("OnOffApplicationDataRate", "448kb/s"); + Config::SetDefault ("OnOffApplication::PacketSize", Uinteger (210)); + Config::SetDefault ("OnOffApplication::DataRate", DataRate ("448kb/s")); //DefaultValue::Bind ("DropTailQueue::m_maxPackets", 30); @@ -163,42 +165,45 @@ // 210 bytes at a rate of 448 Kb/s NS_LOG_INFO ("Create Applications."); uint16_t port = 9; // Discard port (RFC 863) - Ptr ooff = CreateObject ( - n0, - InetSocketAddress ("10.1.3.2", port), - "Udp", - ConstantVariable (1), - ConstantVariable (0)); + Ptr ooff = + CreateObjectWith ("Node", n0, + "Remote", Address (InetSocketAddress ("10.1.3.2", port)), + "Protocol", TypeId::LookupByName ("Udp"), + "OnTime", ConstantVariable (1), + "OffTime", ConstantVariable (0)); + n0->AddApplication (ooff); // Start the application ooff->Start (Seconds (1.0)); ooff->Stop (Seconds (10.0)); // Create a packet sink to receive these packets // The last argument "true" disables output from the Receive callback - Ptr sink = CreateObject ( - n3, - InetSocketAddress (Ipv4Address::GetAny (), port), - "Udp"); + Ptr sink = + CreateObjectWith ("Node", n3, + "Remote", Address (InetSocketAddress (Ipv4Address::GetAny (), port)), + "Protocol", TypeId::LookupByName ("Udp")); + n3->AddApplication (sink); // Start the sink sink->Start (Seconds (1.0)); sink->Stop (Seconds (10.0)); // Create a similar flow from n3 to n1, starting at time 1.1 seconds - ooff = CreateObject ( - n3, - InetSocketAddress ("10.1.2.1", port), - "Udp", - ConstantVariable (1), - ConstantVariable (0)); + ooff = CreateObjectWith ( + "Node", n3, + "Remote", Address (InetSocketAddress ("10.1.2.1", port)), + "Protocol", TypeId::LookupByName ("Udp"), + "OnTime", ConstantVariable (1), + "OffTime", ConstantVariable (0)); + n3->AddApplication (ooff); // Start the application ooff->Start (Seconds (1.1)); ooff->Stop (Seconds (10.0)); // Create a packet sink to receive these packets - sink = CreateObject ( - n1, - InetSocketAddress (Ipv4Address::GetAny (), port), - "Udp"); + sink = CreateObjectWith ("Node", n1, + "Remote", Address (InetSocketAddress (Ipv4Address::GetAny (), port)), + "Protocol", TypeId::LookupByName ("Udp")); + n1->AddApplication (sink); // Start the sink sink->Start (Seconds (1.1)); sink->Stop (Seconds (10.0)); diff -r d64b1561b1c2 -r e667dc0f350e examples/simple-point-to-point-olsr.cc --- a/examples/simple-point-to-point-olsr.cc Tue Feb 26 01:39:59 2008 +0100 +++ b/examples/simple-point-to-point-olsr.cc Wed Feb 27 22:19:39 2008 +0100 @@ -43,6 +43,8 @@ #include "ns3/default-value.h" #include "ns3/ptr.h" #include "ns3/random-variable.h" +#include "ns3/config.h" +#include "ns3/string.h" #include "ns3/simulator.h" #include "ns3/nstime.h" @@ -61,7 +63,7 @@ #include "ns3/point-to-point-topology.h" #include "ns3/onoff-application.h" #include "ns3/packet-sink.h" -#include "ns3/olsr.h" +#include "ns3/olsr-helper.h" using namespace ns3; @@ -98,16 +100,10 @@ LogComponentEnable("UdpEchoServerApplication", LOG_LEVEL_ALL); #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 + // Set up some default values for the simulation. - // The below Bind command tells the queue factory which class to - // instantiate, when the queue factory is invoked in the topology code - DefaultValue::Bind ("Queue", "DropTailQueue"); - - DefaultValue::Bind ("OnOffApplicationPacketSize", "210"); - DefaultValue::Bind ("OnOffApplicationDataRate", "448kb/s"); + Config::SetDefault ("OnOffApplication::PacketSize", String ("210")); + Config::SetDefault ("OnOffApplication::DataRate", String ("448kb/s")); //DefaultValue::Bind ("DropTailQueue::m_maxPackets", 30); @@ -162,45 +158,52 @@ // Enable OLSR NS_LOG_INFO ("Enabling OLSR Routing."); - olsr::EnableAllNodes (); + OlsrHelper olsr; + olsr.EnableAll (); // Create the OnOff application to send UDP datagrams of size // 210 bytes at a rate of 448 Kb/s NS_LOG_INFO ("Create Applications."); uint16_t port = 9; // Discard port (RFC 863) - Ptr ooff = CreateObject ( - n0, - InetSocketAddress ("10.1.4.2", port), - "Udp", - ConstantVariable(1), - ConstantVariable(0)); + Ptr ooff = + CreateObjectWith ( + "Node", n0, + "Remote", Address (InetSocketAddress ("10.1.4.2", port)), + "Protocol", TypeId::LookupByName ("Udp"), + "OnTime", ConstantVariable(1), + "OffTime", ConstantVariable(0)); + n0->AddApplication (ooff); // Start the application ooff->Start(Seconds(1.0)); // Create an optional packet sink to receive these packets - Ptr sink = CreateObject ( - n4, - InetSocketAddress (Ipv4Address::GetAny (), port), - "Udp"); + Ptr sink = + CreateObjectWith ( + "Node", n4, + "Local", Address (InetSocketAddress (Ipv4Address::GetAny (), port)), + "Protocol", TypeId::LookupByName ("Udp")); + n3->AddApplication (sink); // Start the sink sink->Start (Seconds (1.0)); - // Create a similar flow from n4 to n1, starting at time 1.1 seconds - ooff = CreateObject ( - n4, - InetSocketAddress ("10.1.2.1", port), - "Udp", - ConstantVariable(1), - ConstantVariable(0)); + // Create a similar flow from n3 to n1, starting at time 1.1 seconds + ooff = CreateObjectWith ( + "Node", n4, + "Remote", Address (InetSocketAddress ("10.1.2.1", port)), + "Protocol", TypeId::LookupByName ("Udp"), + "OnTime", ConstantVariable(1), + "OffTime", ConstantVariable(0)); + n3->AddApplication (ooff); // Start the application ooff->Start (Seconds(1.1)); // Create a packet sink to receive these packets - sink = CreateObject ( - n1, - InetSocketAddress (Ipv4Address::GetAny (), port), - "Udp"); + sink = CreateObjectWith ( + "Node", n1, + "Local", Address (InetSocketAddress (Ipv4Address::GetAny (), port)), + "Protocol", TypeId::LookupByName ("Udp")); + n1->AddApplication (sink); // Start the sink sink->Start (Seconds (1.1)); diff -r d64b1561b1c2 -r e667dc0f350e examples/simple-point-to-point.cc --- a/examples/simple-point-to-point.cc Tue Feb 26 01:39:59 2008 +0100 +++ b/examples/simple-point-to-point.cc Wed Feb 27 22:19:39 2008 +0100 @@ -43,6 +43,8 @@ #include "ns3/default-value.h" #include "ns3/ptr.h" #include "ns3/random-variable.h" +#include "ns3/config.h" +#include "ns3/string.h" #include "ns3/simulator.h" #include "ns3/nstime.h" @@ -75,16 +77,10 @@ LogComponentEnable ("SimplePointToPointExample", LOG_LEVEL_ALL); #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 + // Set up some default values for the simulation. - // The below Bind command tells the queue factory which class to - // instantiate, when the queue factory is invoked in the topology code - DefaultValue::Bind ("Queue", "DropTailQueue"); - - DefaultValue::Bind ("OnOffApplicationPacketSize", "210"); - DefaultValue::Bind ("OnOffApplicationDataRate", "448kb/s"); + Config::SetDefault ("OnOffApplication::PacketSize", String ("210")); + Config::SetDefault ("OnOffApplication::DataRate", String ("448kb/s")); // Allow the user to override any of the defaults and the above // Bind()s at run-time, via command-line arguments @@ -139,38 +135,44 @@ // 210 bytes at a rate of 448 Kb/s NS_LOG_INFO ("Create Applications."); uint16_t port = 9; // Discard port (RFC 863) - Ptr ooff = CreateObject ( - n0, - InetSocketAddress ("10.1.3.2", port), - "Udp", - ConstantVariable(1), - ConstantVariable(0)); + Ptr ooff = + CreateObjectWith ( + "Node", n0, + "Remote", Address (InetSocketAddress ("10.1.3.2", port)), + "Protocol", TypeId::LookupByName ("Udp"), + "OnTime", ConstantVariable(1), + "OffTime", ConstantVariable(0)); + n0->AddApplication (ooff); // Start the application ooff->Start (Seconds(1.0)); // Create an optional packet sink to receive these packets - Ptr sink = CreateObject ( - n3, - InetSocketAddress (Ipv4Address::GetAny (), port), - "Udp"); + Ptr sink = + CreateObjectWith ( + "Node", n3, + "Local", Address (InetSocketAddress (Ipv4Address::GetAny (), port)), + "Protocol", TypeId::LookupByName ("Udp")); + n3->AddApplication (sink); // Start the sink sink->Start (Seconds (1.0)); // Create a similar flow from n3 to n1, starting at time 1.1 seconds - ooff = CreateObject ( - n3, - InetSocketAddress ("10.1.2.1", port), - "Udp", - ConstantVariable(1), - ConstantVariable(0)); + ooff = CreateObjectWith ( + "Node", n3, + "Remote", Address (InetSocketAddress ("10.1.2.1", port)), + "Protocol", TypeId::LookupByName ("Udp"), + "OnTime", ConstantVariable(1), + "OffTime", ConstantVariable(0)); + n3->AddApplication (ooff); // Start the application ooff->Start(Seconds(1.1)); // Create a packet sink to receive these packets - sink = CreateObject ( - n1, - InetSocketAddress (Ipv4Address::GetAny (), port), - "Udp"); + sink = CreateObjectWith ( + "Node", n1, + "Local", Address (InetSocketAddress (Ipv4Address::GetAny (), port)), + "Protocol", TypeId::LookupByName ("Udp")); + n1->AddApplication (sink); // Start the sink sink->Start (Seconds (1.1)); @@ -178,21 +180,23 @@ // Create a file transfer from n0 to n3, starting at time 1.2 uint16_t servPort = 500; - ooff = CreateObject ( - n0, - InetSocketAddress ("10.1.3.2", servPort), - "Tcp", - ConstantVariable(1), - ConstantVariable(0)); + ooff = CreateObjectWith ( + "Node", n0, + "Remote", Address (InetSocketAddress ("10.1.3.2", servPort)), + "Protocol", TypeId::LookupByName ("Tcp"), + "OnTime", ConstantVariable(1), + "OffTime", ConstantVariable(0)); + n0->AddApplication (ooff); // Start the application ooff->Start (Seconds(1.2)); ooff->Stop (Seconds(1.35)); // Create a packet sink to receive these TCP packets - sink = Create ( - n3, - InetSocketAddress (Ipv4Address::GetAny (), servPort), - "Tcp"); + sink = CreateObjectWith ( + "Node", n3, + "Local", Address (InetSocketAddress (Ipv4Address::GetAny (), servPort)), + "Protocol", TypeId::LookupByName ("Tcp")); + n3->AddApplication (sink); sink->Start (Seconds (1.2)); // Here, finish off packet routing configuration diff -r d64b1561b1c2 -r e667dc0f350e examples/tcp-large-transfer-errors.cc --- a/examples/tcp-large-transfer-errors.cc Tue Feb 26 01:39:59 2008 +0100 +++ b/examples/tcp-large-transfer-errors.cc Wed Feb 27 22:19:39 2008 +0100 @@ -196,10 +196,12 @@ localSocket->Bind (); // Create a packet sink to receive these packets - Ptr sink = Create ( - n2, - InetSocketAddress (Ipv4Address::GetAny (), servPort), - "Tcp"); + Ptr sink = + CreateObjectWith ( + "Node", n2, + "Local", Address (InetSocketAddress (Ipv4Address::GetAny (), servPort)), + "Protocol", TypeId::LookupByName ("Tcp")); + n2->AddApplication (sink); sink->Start (Seconds (0.0)); sink->Stop (Seconds (10000.0)); diff -r d64b1561b1c2 -r e667dc0f350e examples/tcp-large-transfer.cc --- a/examples/tcp-large-transfer.cc Tue Feb 26 01:39:59 2008 +0100 +++ b/examples/tcp-large-transfer.cc Wed Feb 27 22:19:39 2008 +0100 @@ -196,10 +196,12 @@ localSocket->Bind (); // Create a packet sink to receive these packets - Ptr sink = Create ( - n2, - InetSocketAddress (Ipv4Address::GetAny (), servPort), - "Tcp"); + Ptr sink = + CreateObjectWith ( + "Node", n2, + "Local", Address (InetSocketAddress (Ipv4Address::GetAny (), servPort)), + "Protocol", TypeId::LookupByName ("Tcp")); + n2->AddApplication (sink); sink->Start (Seconds (0.0)); sink->Stop (Seconds (100.0)); diff -r d64b1561b1c2 -r e667dc0f350e examples/tcp-small-transfer-oneloss.cc --- a/examples/tcp-small-transfer-oneloss.cc Tue Feb 26 01:39:59 2008 +0100 +++ b/examples/tcp-small-transfer-oneloss.cc Wed Feb 27 22:19:39 2008 +0100 @@ -178,10 +178,12 @@ localSocket->Bind (); // Create a packet sink to receive these packets - Ptr sink = Create ( - n2, - InetSocketAddress (Ipv4Address::GetAny (), servPort), - "Tcp"); + Ptr sink = + CreateObjectWith ( + "Node", n2, + "Local", Address (InetSocketAddress (Ipv4Address::GetAny (), servPort)), + "Protocol", TypeId::LookupByName ("Tcp")); + n2->AddApplication (sink); sink->Start (Seconds (0.0)); sink->Stop (Seconds (100.0)); diff -r d64b1561b1c2 -r e667dc0f350e examples/tcp-small-transfer.cc --- a/examples/tcp-small-transfer.cc Tue Feb 26 01:39:59 2008 +0100 +++ b/examples/tcp-small-transfer.cc Wed Feb 27 22:19:39 2008 +0100 @@ -188,10 +188,12 @@ localSocket->Bind (); // Create a packet sink to receive these packets - Ptr sink = Create ( - n2, - InetSocketAddress (Ipv4Address::GetAny (), servPort), - "Tcp"); + Ptr sink = + CreateObjectWith ( + "Node", n2, + "Local", Address (InetSocketAddress (Ipv4Address::GetAny (), servPort)), + "Protocol", TypeId::LookupByName ("Tcp")); + n2->AddApplication (sink); sink->Start (Seconds (0.0)); sink->Stop (Seconds (100.0)); diff -r d64b1561b1c2 -r e667dc0f350e examples/udp-echo.cc --- a/examples/udp-echo.cc Tue Feb 26 01:39:59 2008 +0100 +++ b/examples/udp-echo.cc Wed Feb 27 22:19:39 2008 +0100 @@ -47,6 +47,7 @@ #include "ns3/ipv4-route.h" #include "ns3/udp-echo-client.h" #include "ns3/udp-echo-server.h" +#include "ns3/uinteger.h" using namespace ns3; @@ -167,7 +168,9 @@ // uint16_t port = 9; // well-known echo port number - Ptr server = CreateObject (n1, port); + Ptr server = CreateObjectWith ("Node", n1, + "Port", Uinteger (port)); + n1->AddApplication (server); // // Create a UdpEchoClient application to send UDP datagrams from node zero to // node one. @@ -176,8 +179,14 @@ uint32_t maxPacketCount = 1; Time interPacketInterval = Seconds (1.); - Ptr client = CreateObject (n0, "10.1.1.2", port, - maxPacketCount, interPacketInterval, packetSize); + Ptr client = + CreateObjectWith ("Node", n0, + "RemoteIpv4", Ipv4Address ("10.1.1.2"), + "RemotePort", Uinteger (port), + "MaxPackets", Uinteger (maxPacketCount), + "Interval", interPacketInterval, + "PacketSize", Uinteger (packetSize)); + n0->AddApplication (client); // // Tell the applications when to start and stop. // diff -r d64b1561b1c2 -r e667dc0f350e samples/main-adhoc-wifi.cc --- a/samples/main-adhoc-wifi.cc Tue Feb 26 01:39:59 2008 +0100 +++ b/samples/main-adhoc-wifi.cc Wed Feb 27 22:19:39 2008 +0100 @@ -33,6 +33,7 @@ #include "ns3/socket-factory.h" #include "ns3/command-line.h" #include "ns3/gnuplot.h" +#include "ns3/uinteger.h" #include @@ -47,6 +48,7 @@ { Ptr node = CreateObject (); Ptr device = CreateObject (node, Mac48Address (address)); + node->AddDevice (device); device->Attach (channel); Ptr mobility = CreateObject (); mobility->SetPosition (position); @@ -121,12 +123,15 @@ destination.SetProtocol (1); destination.SetSingleDevice (0); destination.SetPhysicalAddress (Mac48Address ("00:00:00:00:00:02")); - Ptr app = CreateObject (a, destination, - "Packet", - ConstantVariable (250), - ConstantVariable (0), - DataRate (60000000), - 2000); + Ptr app = + CreateObjectWith ("Node", a, + "Remote", Address (destination), + "Protocol", TypeId::LookupByName ("Packet"), + "OnTime", ConstantVariable (250), + "OffTime", ConstantVariable (0), + "DataRate", DataRate (60000000), + "PacketSize", Uinteger (2000)); + a->AddApplication (app); app->Start (Seconds (0.5)); app->Stop (Seconds (250.0)); diff -r d64b1561b1c2 -r e667dc0f350e samples/main-ap-wifi.cc --- a/samples/main-ap-wifi.cc Tue Feb 26 01:39:59 2008 +0100 +++ b/samples/main-ap-wifi.cc Wed Feb 27 22:19:39 2008 +0100 @@ -73,6 +73,7 @@ { Ptr node = CreateObject (); Ptr device = CreateObject (node, Mac48Address (macAddress)); + node->AddDevice (device); device->SetSsid (ssid); Simulator::Schedule (at, &NqapWifiNetDevice::StartBeaconing, device); device->Attach (channel); @@ -90,6 +91,7 @@ { Ptr node = CreateObject (); Ptr device = CreateObject (node, Mac48Address (macAddress)); + node->AddDevice (device); Simulator::ScheduleNow (&NqstaWifiNetDevice::StartActiveAssociation, device, ssid); device->Attach (channel); @@ -170,10 +172,13 @@ destination.SetProtocol (1); destination.SetSingleDevice (0); destination.SetPhysicalAddress (Mac48Address ("00:00:00:00:00:03")); - Ptr app = CreateObject (b, destination, - "Packet", - ConstantVariable (42), - ConstantVariable (0)); + Ptr app = + CreateObjectWith ("Node", b, + "Remote", Address (destination), + "Protocol", TypeId::LookupByName ("Packet"), + "OnTime", ConstantVariable (42), + "OffTime", ConstantVariable (0)); + b->AddApplication (app); app->Start (Seconds (0.5)); app->Stop (Seconds (43.0)); diff -r d64b1561b1c2 -r e667dc0f350e samples/main-grid-topology.cc --- a/samples/main-grid-topology.cc Tue Feb 26 01:39:59 2008 +0100 +++ b/samples/main-grid-topology.cc Wed Feb 27 22:19:39 2008 +0100 @@ -1,10 +1,13 @@ /* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */ #include "ns3/ptr.h" -#include "ns3/grid-topology.h" -#include "ns3/static-mobility-model.h" -#include "ns3/internet-node.h" +#include "ns3/node.h" #include "ns3/command-line.h" +#include "ns3/mobility-model.h" +#include "ns3/mobility-helper.h" +#include "ns3/uinteger.h" +#include "ns3/double.h" +#include "ns3/string.h" using namespace ns3; @@ -17,22 +20,30 @@ // create an array of empty nodes for testing purposes for (uint32_t i = 0; i < 120; i++) { - nodes.push_back (CreateObject ()); + nodes.push_back (CreateObject ()); } + MobilityHelper mobility; // setup the grid itself: objects are layed out // started from (-100,-100) with 20 objects per row, // the x interval between each object is 5 meters // and the y interval between each object is 20 meters - GridTopology grid (-100, -100, 20, 5, 20); - + mobility.SetPositionAllocator ("GridPositionAllocator", + "MinX", Double (-100.0), + "MinY", Double (-100.0), + "DeltaX", Double (5.0), + "DeltaY", Double (20.0), + "GridWidth", Uinteger (20), + "LayoutType", String ("RowFirst")); // each object will be attached a static position. - grid.SetMobilityModel (StaticMobilityModel::GetTypeId ()); + // i.e., once set by the "position allocator", the + // position will never change. + mobility.SetMobilityModel ("StaticMobilityModel"); // finalize the setup by attaching to each object // in the input array a position and initializing // this position with the calculated coordinates. - grid.LayoutRowFirst (nodes.begin (), nodes.end ()); + mobility.Layout (nodes.begin (), nodes.end ()); // iterate our nodes and print their position. for (std::vector >::const_iterator j = nodes.begin (); diff -r d64b1561b1c2 -r e667dc0f350e samples/main-random-topology.cc --- a/samples/main-random-topology.cc Tue Feb 26 01:39:59 2008 +0100 +++ b/samples/main-random-topology.cc Wed Feb 27 22:19:39 2008 +0100 @@ -4,13 +4,14 @@ #include "ns3/ptr.h" #include "ns3/mobility-model.h" -#include "ns3/mobility-model-notifier.h" -#include "ns3/static-mobility-model.h" -#include "ns3/random-topology.h" #include "ns3/default-value.h" #include "ns3/command-line.h" #include "ns3/simulator.h" #include "ns3/nstime.h" +#include "ns3/node.h" +#include "ns3/mobility-helper.h" +#include "ns3/node-list.h" +#include "ns3/string.h" using namespace ns3; @@ -24,26 +25,27 @@ int main (int argc, char *argv[]) { - DefaultValue::Bind ("RandomDiscPositionX", "100"); - DefaultValue::Bind ("RandomDiscPositionY", "50"); - DefaultValue::Bind ("RandomDiscPositionRho", "Uniform:0:30"); - - DefaultValue::Bind ("RandomTopologyPositionType", "RandomDiscPosition"); - DefaultValue::Bind ("RandomTopologyMobilityType", "StaticMobilityModel"); CommandLine::Parse (argc, argv); - RandomTopology topology; std::vector > objects; for (uint32_t i = 0; i < 10000; i++) { - Ptr notifier = CreateObject (); - notifier->TraceConnect ("/course-change", MakeCallback (&CourseChange)); - objects.push_back (notifier); + objects.push_back (CreateObject ()); } - topology.Layout (objects.begin (), objects.end ()); + MobilityHelper mobility; + mobility.EnableNotifier (); + mobility.SetPositionAllocator ("RandomDiscPositionAllocator", + "X", String ("100.0"), + "Y", String ("100.0"), + "Rho", String ("Uniform:0:30")); + mobility.SetMobilityModel ("StaticMobilityModel"); + mobility.Layout (objects.begin (), objects.end ()); + + NodeList::Connect ("/nodes/*/$MobilityModelNotifier/course-change", + MakeCallback (&CourseChange)); Simulator::StopAt (Seconds (100.0)); diff -r d64b1561b1c2 -r e667dc0f350e samples/main-random-walk.cc --- a/samples/main-random-walk.cc Tue Feb 26 01:39:59 2008 +0100 +++ b/samples/main-random-walk.cc Wed Feb 27 22:19:39 2008 +0100 @@ -4,14 +4,15 @@ #include "ns3/ptr.h" #include "ns3/mobility-model.h" -#include "ns3/mobility-model-notifier.h" -#include "ns3/random-topology.h" +#include "ns3/position-allocator.h" #include "ns3/default-value.h" #include "ns3/command-line.h" #include "ns3/simulator.h" #include "ns3/nstime.h" #include "ns3/node.h" #include "ns3/node-list.h" +#include "ns3/mobility-helper.h" +#include "ns3/string.h" using namespace ns3; @@ -32,24 +33,27 @@ DefaultValue::Bind ("RandomWalk2dSpeed", "Constant:1.0"); DefaultValue::Bind ("RandomWalk2dBounds", "0:200:0:100"); - DefaultValue::Bind ("RandomDiscPositionX", "100"); - DefaultValue::Bind ("RandomDiscPositionY", "50"); - DefaultValue::Bind ("RandomDiscPositionRho", "Uniform:0:30"); - - DefaultValue::Bind ("RandomTopologyPositionType", "RandomDiscPosition"); DefaultValue::Bind ("RandomTopologyMobilityType", "RandomWalk2dMobilityModel"); CommandLine::Parse (argc, argv); - RandomTopology topology; - for (uint32_t i = 0; i < 100; i++) { Ptr node = CreateObject (); - node->AggregateObject (CreateObject ()); } - topology.Layout (NodeList::Begin (), NodeList::End ()); + MobilityHelper mobility; + mobility.EnableNotifier (); + mobility.SetPositionAllocator ("RandomDiscPositionAllocator", + "X", String ("100.0"), + "Y", String ("100.0"), + "Rho", String ("Uniform:0:30")); + mobility.SetMobilityModel ("RandomWalk2dMobilityModel", + "Mode", String ("Time"), + "Time", String ("2s"), + "Speed", String ("Constant:1.0"), + "Bounds", String ("0:200:0:100")); + mobility.Layout (NodeList::Begin (), NodeList::End ()); NodeList::Connect ("/nodes/*/$MobilityModelNotifier/course-change", MakeCallback (&CourseChange)); diff -r d64b1561b1c2 -r e667dc0f350e samples/wscript --- a/samples/wscript Tue Feb 26 01:39:59 2008 +0100 +++ b/samples/wscript Wed Feb 27 22:19:39 2008 +0100 @@ -4,9 +4,6 @@ obj = bld.create_ns3_program('main-callback') obj.source = 'main-callback.cc' - obj = bld.create_ns3_program('main-ptr') - obj.source = 'main-ptr.cc' - obj = bld.create_ns3_program('main-simulator') obj.source = 'main-simulator.cc' diff -r d64b1561b1c2 -r e667dc0f350e src/applications/onoff/onoff-application.cc --- a/src/applications/onoff/onoff-application.cc Tue Feb 26 01:39:59 2008 +0100 +++ b/src/applications/onoff/onoff-application.cc Wed Feb 27 22:19:39 2008 +0100 @@ -31,10 +31,11 @@ #include "ns3/socket.h" #include "ns3/simulator.h" #include "ns3/socket-factory.h" -#include "ns3/default-value.h" #include "ns3/packet.h" -#include "ns3/composite-trace-resolver.h" +#include "ns3/uinteger.h" +#include "ns3/trace-source-accessor.h" #include "onoff-application.h" +#include "ns3/udp.h" NS_LOG_COMPONENT_DEFINE ("OnOffApplication"); @@ -42,63 +43,54 @@ namespace ns3 { -// Defaults for rate/size -static DataRateDefaultValue g_defaultRate ("OnOffApplicationDataRate", - "The data rate in on state for OnOffApplication", - DataRate ("500kb/s")); -static NumericDefaultValue g_defaultSize ("OnOffApplicationPacketSize", - "The size of packets sent in on state for OnOffApplication", - 512, 1); -// Constructors +NS_OBJECT_ENSURE_REGISTERED (OnOffApplication); -OnOffApplication::OnOffApplication(Ptr n, - const Address &remote, - std::string tid, - const RandomVariable& ontime, - const RandomVariable& offtime) - : Application(n), - m_cbrRate (g_defaultRate.GetValue ()) +TypeId +OnOffApplication::GetTypeId (void) { - Construct (n, remote, tid, - ontime, offtime, - g_defaultSize.GetValue ()); + static TypeId tid = TypeId ("OnOffApplication") + .SetParent () + .AddConstructor () + .AddAttribute ("DataRate", "The data rate in on state.", + DataRate ("500kb/s"), + MakeDataRateAccessor (&OnOffApplication::m_cbrRate), + MakeDataRateChecker ()) + .AddAttribute ("PacketSize", "The size of packets sent in on state", + Uinteger (512), + MakeUintegerAccessor (&OnOffApplication::m_pktSize), + MakeUintegerChecker (1)) + .AddAttribute ("Remote", "The address of the destination", + Address (), + MakeAddressAccessor (&OnOffApplication::m_peer), + MakeAddressChecker ()) + .AddAttribute ("OnTime", "A RandomVariable used to pick the duration of the 'On' state.", + ConstantVariable (1.0), + MakeRandomVariableAccessor (&OnOffApplication::m_onTime), + MakeRandomVariableChecker ()) + .AddAttribute ("OffTime", "A RandomVariable used to pick the duration of the 'Off' state.", + ConstantVariable (1.0), + MakeRandomVariableAccessor (&OnOffApplication::m_offTime), + MakeRandomVariableChecker ()) + .AddAttribute ("Protocol", "The type of protocol to use.", + Udp::GetTypeId (), + MakeTypeIdAccessor (&OnOffApplication::m_tid), + MakeTypeIdChecker ()) + .AddTraceSource ("Tx", "A new packet is created and is sent", + MakeTraceSourceAccessor (&OnOffApplication::m_txTrace)) + ; + return tid; } -OnOffApplication::OnOffApplication(Ptr n, - const Address &remote, - std::string tid, - const RandomVariable& ontime, - const RandomVariable& offtime, - DataRate rate, - uint32_t size) - : Application(n), - m_cbrRate (rate) + +OnOffApplication::OnOffApplication () { NS_LOG_FUNCTION; - Construct (n, remote, tid, ontime, offtime, size); -} - -void -OnOffApplication::Construct (Ptr n, - const Address &remote, - std::string tid, - const RandomVariable& onTime, - const RandomVariable& offTime, - uint32_t size) -{ - NS_LOG_FUNCTION; - m_socket = 0; - m_peer = remote; m_connected = false; - m_onTime = onTime; - m_offTime = offTime; - m_pktSize = size; m_residualBits = 0; m_lastStartTime = Seconds (0); m_maxBytes = 0; m_totBytes = 0; - m_tid = tid; } OnOffApplication::~OnOffApplication() @@ -114,21 +106,6 @@ m_maxBytes = maxBytes; } -void -OnOffApplication::SetDefaultRate (const DataRate &rate) -{ - NS_LOG_FUNCTION; - NS_LOG_PARAMS (&rate); - g_defaultRate.SetValue (rate); -} - -void -OnOffApplication::SetDefaultSize (uint32_t size) -{ - NS_LOG_FUNCTION; - NS_LOG_PARAMS (size); - g_defaultSize.SetValue (size); -} void OnOffApplication::DoDispose (void) @@ -148,8 +125,7 @@ // Create the socket if not already if (!m_socket) { - TypeId tid = TypeId::LookupByName (m_tid); - Ptr socketFactory = GetNode ()->GetObject (tid); + Ptr socketFactory = GetNode ()->GetObject (m_tid); m_socket = socketFactory->CreateSocket (); m_socket->Bind (); m_socket->Connect (m_peer); @@ -189,7 +165,6 @@ NS_LOG_FUNCTION; Simulator::Cancel(m_sendEvent); - m_socket->Close (); } // Private helpers @@ -259,17 +234,4 @@ cout << "OnOffApplication, Connection Failed" << endl; } -Ptr -OnOffApplication::GetTraceResolver (void) const -{ - Ptr resolver = Create (); - resolver->AddSource ("tx", - TraceDoc ("A new packet is created and is sent", - "Ptr", - "The newly-created packet."), - m_txTrace); - resolver->SetParentResolver (Application::GetTraceResolver ()); - return resolver; -} - } // Namespace ns3 diff -r d64b1561b1c2 -r e667dc0f350e src/applications/onoff/onoff-application.h --- a/src/applications/onoff/onoff-application.h Tue Feb 26 01:39:59 2008 +0100 +++ b/src/applications/onoff/onoff-application.h Wed Feb 27 22:19:39 2008 +0100 @@ -29,8 +29,8 @@ #include "ns3/event-id.h" #include "ns3/ptr.h" #include "ns3/data-rate.h" -#include "ns3/callback-trace-source.h" #include "ns3/random-variable.h" +#include "ns3/traced-callback.h" namespace ns3 { @@ -52,60 +52,14 @@ class OnOffApplication : public Application { public: - /** - * \param n node associated to this application - * \param remote remote ip address - * \param tid TypeId of the socket factory to use. Note this - * factory should create sockets compatible with the specified - * remote address. - * \param ontime on time random variable - * \param offtime off time random variable - */ - OnOffApplication(Ptr n, - const Address &remote, - std::string tid, - const RandomVariable& ontime, - const RandomVariable& offtime); + static TypeId GetTypeId (void); - /** - * \param n node associated to this application - * \param remote remote ip address - * \param tid TypeId of the socket factory to use. Note this - * factory should create sockets compatible with the specified - * remote address. - * \param ontime on time random variable - * \param offtime off time random variable - * \param rate data rate when on - * \param size size of packets when sending data. - */ - OnOffApplication(Ptr n, - const Address &remote, - std::string tid, - const RandomVariable& ontime, - const RandomVariable& offtime, - DataRate rate, - uint32_t size); + OnOffApplication (); virtual ~OnOffApplication(); void SetMaxBytes(uint32_t maxBytes); - /** - * \param r the data rate - * - * Set the data rate to use for every OnOffApplication for which - * the user does not specify an explicit data rate. - */ - static void SetDefaultRate(const DataRate & r); - - /** - * \param size the packet size - * - * Set the packet size to use for every OnOffApplication for - * which the user does not specify an explicit packet size. - */ - static void SetDefaultSize (uint32_t size); - protected: virtual void DoDispose (void); private: @@ -129,8 +83,8 @@ Ptr m_socket; // Associated socket Address m_peer; // Peer address bool m_connected; // True if connected - RandomVariable m_onTime; // rng for On Time - RandomVariable m_offTime; // rng for Off Time + RandomVariable m_onTime; // rng for On Time + RandomVariable m_offTime; // rng for Off Time DataRate m_cbrRate; // Rate that data is generated uint32_t m_pktSize; // Size of packets uint32_t m_residualBits; // Number of generated, but not sent, bits @@ -140,11 +94,10 @@ EventId m_startStopEvent; // Event id for next start or stop event EventId m_sendEvent; // Eventid of pending "send packet" event bool m_sending; // True if currently in sending state - std::string m_tid; - CallbackTraceSource > m_txTrace; + TypeId m_tid; + TracedCallback > m_txTrace; private: - virtual Ptr GetTraceResolver (void) const; void ScheduleNextTx(); void ScheduleStartEvent(); void ScheduleStopEvent(); diff -r d64b1561b1c2 -r e667dc0f350e src/applications/packet-sink/packet-sink.cc --- a/src/applications/packet-sink/packet-sink.cc Tue Feb 26 01:39:59 2008 +0100 +++ b/src/applications/packet-sink/packet-sink.cc Wed Feb 27 22:19:39 2008 +0100 @@ -25,7 +25,8 @@ #include "ns3/simulator.h" #include "ns3/socket-factory.h" #include "ns3/packet.h" -#include "ns3/composite-trace-resolver.h" +#include "ns3/trace-source-accessor.h" +#include "ns3/udp.h" #include "packet-sink.h" using namespace std; @@ -33,25 +34,30 @@ namespace ns3 { NS_LOG_COMPONENT_DEFINE ("PacketSinkApplication"); - -// Constructors +NS_OBJECT_ENSURE_REGISTERED (PacketSink); -PacketSink::PacketSink (Ptr n, - const Address &local, - std::string tid) - : Application(n) +TypeId +PacketSink::GetTypeId (void) { - Construct (n, local, tid); + static TypeId tid = TypeId ("PacketSink") + .SetParent () + .AddAttribute ("Local", "The Address on which to Bind the rx socket.", + Address (), + MakeAddressAccessor (&PacketSink::m_local), + MakeAddressChecker ()) + .AddAttribute ("Protocol", "The type id of the protocol to use for the rx socket.", + Udp::GetTypeId (), + MakeTypeIdAccessor (&PacketSink::m_tid), + MakeTypeIdChecker ()) + .AddTraceSource ("Rx", "A packet has been received", + MakeTraceSourceAccessor (&PacketSink::m_rxTrace)) + ; + return tid; } -void -PacketSink::Construct (Ptr n, - const Address &local, - std::string tid) +PacketSink::PacketSink () { m_socket = 0; - m_local = local; - m_tid = tid; } PacketSink::~PacketSink() @@ -73,9 +79,8 @@ // Create the socket if not already if (!m_socket) { - TypeId tid = TypeId::LookupByName (m_tid); Ptr socketFactory = - GetNode ()->GetObject (tid); + GetNode ()->GetObject (m_tid); m_socket = socketFactory->CreateSocket (); m_socket->Bind (m_local); m_socket->Listen (0); @@ -116,19 +121,4 @@ socket->Close (); } -Ptr -PacketSink::GetTraceResolver (void) const -{ - Ptr resolver = Create (); - resolver->AddSource ("rx", - TraceDoc ("A new packet has been received", - "Ptr", - "The newly-received packet.", - "const Address &", - "The source address of the received packet."), - m_rxTrace); - resolver->SetParentResolver (Application::GetTraceResolver ()); - return resolver; -} - } // Namespace ns3 diff -r d64b1561b1c2 -r e667dc0f350e src/applications/packet-sink/packet-sink.h --- a/src/applications/packet-sink/packet-sink.h Tue Feb 26 01:39:59 2008 +0100 +++ b/src/applications/packet-sink/packet-sink.h Wed Feb 27 22:19:39 2008 +0100 @@ -24,7 +24,7 @@ #include "ns3/application.h" #include "ns3/event-id.h" #include "ns3/ptr.h" -#include "ns3/callback-trace-source.h" +#include "ns3/traced-callback.h" #include "ns3/address.h" namespace ns3 { @@ -53,14 +53,13 @@ class PacketSink : public Application { public: + static TypeId GetTypeId (void); /** * \param n node associated to this application * \param local local address to bind to * \param tid string to identify transport protocol of interest */ - PacketSink (Ptr n, - const Address &local, - std::string tid); + PacketSink (); virtual ~PacketSink (); @@ -70,20 +69,14 @@ // inherited from Application base class. virtual void StartApplication (void); // Called at time specified by Start virtual void StopApplication (void); // Called at time specified by Stop - // inherited from Object base class. - virtual Ptr GetTraceResolver (void) const; - - void Construct (Ptr n, - const Address &local, - std::string tid); virtual void Receive (Ptr socket, Ptr packet, const Address& from); virtual void CloseConnection (Ptr socket); Ptr m_socket; // Associated socket Address m_local; // Local address to bind to - std::string m_tid; // Protocol name (e.g., "Udp") - CallbackTraceSource, const Address &> m_rxTrace; + TypeId m_tid; // Protocol TypeId + TracedCallback, const Address &> m_rxTrace; }; diff -r d64b1561b1c2 -r e667dc0f350e src/applications/udp-echo/udp-echo-client.cc --- a/src/applications/udp-echo/udp-echo-client.cc Tue Feb 26 01:39:59 2008 +0100 +++ b/src/applications/udp-echo/udp-echo-client.cc Wed Feb 27 22:19:39 2008 +0100 @@ -23,27 +23,50 @@ #include "ns3/simulator.h" #include "ns3/socket-factory.h" #include "ns3/packet.h" +#include "ns3/uinteger.h" #include "udp-echo-client.h" namespace ns3 { NS_LOG_COMPONENT_DEFINE ("UdpEchoClientApplication"); +NS_OBJECT_ENSURE_REGISTERED (UdpEchoClient); -UdpEchoClient::UdpEchoClient ( - Ptr n, - Ipv4Address serverAddress, - uint16_t serverPort, - uint32_t count, - Time interval, - uint32_t size) -: - Application(n) +TypeId +UdpEchoClient::GetTypeId (void) +{ + static TypeId tid = TypeId ("UdpEchoClient") + .SetParent () + .AddConstructor () + .AddAttribute ("MaxPackets", "XXX", + Uinteger (100), + MakeUintegerAccessor (&UdpEchoClient::m_count), + MakeUintegerChecker ()) + .AddAttribute ("Interval", "XXX", + Seconds (1.0), + MakeTimeAccessor (&UdpEchoClient::m_interval), + MakeTimeChecker ()) + .AddAttribute ("RemoteIpv4", "XXX", + Ipv4Address (), + MakeIpv4AddressAccessor (&UdpEchoClient::m_peerAddress), + MakeIpv4AddressChecker ()) + .AddAttribute ("RemotePort", "XXX", + Uinteger (0), + MakeUintegerAccessor (&UdpEchoClient::m_peerPort), + MakeUintegerChecker ()) + .AddAttribute ("PacketSize", "Size of packets generated", + Uinteger (100), + MakeUintegerAccessor (&UdpEchoClient::m_size), + MakeUintegerChecker ()) + ; + return tid; +} + +UdpEchoClient::UdpEchoClient () { NS_LOG_FUNCTION; - NS_LOG_PARAMS (this << n << serverAddress << serverPort << count - << interval << size); - - Construct (n, serverAddress, serverPort, count, interval, size); + m_sent = 0; + m_socket = 0; + m_sendEvent = EventId (); } UdpEchoClient::~UdpEchoClient() @@ -52,32 +75,6 @@ } void -UdpEchoClient::Construct ( - Ptr n, - Ipv4Address serverAddress, - uint16_t serverPort, - uint32_t count, - Time interval, - uint32_t size) -{ - NS_LOG_FUNCTION; - NS_LOG_PARAMS (this << n << serverAddress << serverPort - << count << interval << size); - - m_node = n; - m_serverAddress = serverAddress; - m_serverPort = serverPort; - m_count = count; - m_interval = interval; - m_size = size; - - m_sent = 0; - m_socket = 0; - m_peer = InetSocketAddress (serverAddress, serverPort); - m_sendEvent = EventId (); -} - -void UdpEchoClient::DoDispose (void) { NS_LOG_FUNCTION; @@ -96,7 +93,7 @@ GetNode ()->GetObject (tid); m_socket = socketFactory->CreateSocket (); m_socket->Bind (); - m_socket->Connect (m_peer); + m_socket->Connect (InetSocketAddress (m_peerAddress, m_peerPort)); } m_socket->SetRecvCallback(MakeCallback(&UdpEchoClient::Receive, this)); @@ -136,7 +133,7 @@ m_socket->Send (p); ++m_sent; - NS_LOG_INFO ("Sent " << m_size << " bytes to " << m_serverAddress); + NS_LOG_INFO ("Sent " << m_size << " bytes to " << m_peerAddress); if (m_sent < m_count) { diff -r d64b1561b1c2 -r e667dc0f350e src/applications/udp-echo/udp-echo-client.h --- a/src/applications/udp-echo/udp-echo-client.h Tue Feb 26 01:39:59 2008 +0100 +++ b/src/applications/udp-echo/udp-echo-client.h Wed Feb 27 22:19:39 2008 +0100 @@ -32,8 +32,9 @@ class UdpEchoClient : public Application { public: - UdpEchoClient (Ptr n, Ipv4Address serverAddr, uint16_t serverPort, - uint32_t count, Time interval, uint32_t size); + static TypeId GetTypeId (void); + + UdpEchoClient (); virtual ~UdpEchoClient (); @@ -41,8 +42,6 @@ virtual void DoDispose (void); private: - void Construct (Ptr n, Ipv4Address serverAddr, uint16_t serverPort, - uint32_t count, Time interval, uint32_t size); virtual void StartApplication (void); virtual void StopApplication (void); @@ -52,16 +51,14 @@ void Receive(Ptr socket, Ptr packet, const Address &from); - Ptr m_node; - Ipv4Address m_serverAddress; - uint16_t m_serverPort; uint32_t m_count; Time m_interval; uint32_t m_size; uint32_t m_sent; Ptr m_socket; - Address m_peer; + Ipv4Address m_peerAddress; + uint16_t m_peerPort; EventId m_sendEvent; }; diff -r d64b1561b1c2 -r e667dc0f350e src/applications/udp-echo/udp-echo-server.cc --- a/src/applications/udp-echo/udp-echo-server.cc Tue Feb 26 01:39:59 2008 +0100 +++ b/src/applications/udp-echo/udp-echo-server.cc Wed Feb 27 22:19:39 2008 +0100 @@ -24,23 +24,32 @@ #include "ns3/simulator.h" #include "ns3/socket-factory.h" #include "ns3/packet.h" +#include "ns3/uinteger.h" #include "udp-echo-server.h" namespace ns3 { NS_LOG_COMPONENT_DEFINE ("UdpEchoServerApplication"); +NS_OBJECT_ENSURE_REGISTERED (UdpEchoServer); -UdpEchoServer::UdpEchoServer ( - Ptr n, - uint16_t port) -: - Application(n) +TypeId +UdpEchoServer::GetTypeId (void) +{ + static TypeId tid = TypeId ("UdpEchoServer") + .SetParent () + .AddConstructor () + .AddAttribute ("Port", "Client Port", + Uinteger (0), + MakeUintegerAccessor (&UdpEchoServer::m_port), + MakeUintegerChecker ()) + ; + return tid; +} + +UdpEchoServer::UdpEchoServer () { NS_LOG_FUNCTION; - NS_LOG_PARAMS (this << n << port); - - Construct (n, port); } UdpEchoServer::~UdpEchoServer() @@ -49,21 +58,6 @@ } void -UdpEchoServer::Construct ( - Ptr n, - uint16_t port) -{ - NS_LOG_FUNCTION; - NS_LOG_PARAMS (this << n << port); - - m_node = n; - m_port = port; - - m_socket = 0; - m_local = InetSocketAddress (Ipv4Address::GetAny (), port); -} - -void UdpEchoServer::DoDispose (void) { NS_LOG_FUNCTION; @@ -81,7 +75,8 @@ Ptr socketFactory = GetNode ()->GetObject (tid); m_socket = socketFactory->CreateSocket (); - m_socket->Bind (m_local); + InetSocketAddress local = InetSocketAddress (Ipv4Address::GetAny (), m_port); + m_socket->Bind (local); } m_socket->SetRecvCallback(MakeCallback(&UdpEchoServer::Receive, this)); diff -r d64b1561b1c2 -r e667dc0f350e src/applications/udp-echo/udp-echo-server.h --- a/src/applications/udp-echo/udp-echo-server.h Tue Feb 26 01:39:59 2008 +0100 +++ b/src/applications/udp-echo/udp-echo-server.h Wed Feb 27 22:19:39 2008 +0100 @@ -32,23 +32,21 @@ class UdpEchoServer : public Application { public: - UdpEchoServer (Ptr n, uint16_t clientPort); + static TypeId GetTypeId (void); + UdpEchoServer (); virtual ~UdpEchoServer (); protected: virtual void DoDispose (void); private: - void Construct (Ptr n, uint16_t clientPort); virtual void StartApplication (void); virtual void StopApplication (void); void Receive(Ptr socket, Ptr packet, const Address &from); - Ptr m_node; uint16_t m_port; - Ptr m_socket; Address m_local; }; diff -r d64b1561b1c2 -r e667dc0f350e src/common/data-rate.cc --- a/src/common/data-rate.cc Tue Feb 26 01:39:59 2008 +0100 +++ b/src/common/data-rate.cc Wed Feb 27 22:19:39 2008 +0100 @@ -125,25 +125,15 @@ namespace ns3 { +VALUE_HELPER_CPP (DataRate); + +DataRate::DataRate () + : m_bps (0) +{} + DataRate::DataRate(uint64_t bps) :m_bps(bps) -{ -} - -DataRate::DataRate (const std::string s) - : m_bps(DataRate::Parse(s)) -{ -} - -uint64_t DataRate::Parse(const std::string s) -{ - uint64_t v; - if (!DoParse (s, &v)) - { - NS_FATAL_ERROR("Can't Parse data rate "<> (std::istream &is, DataRate &rate) +{ + std::string value; + is >> value; + uint64_t v; + bool ok = DoParse (value, &v); + if (!ok) + { + is.setstate (std::ios_base::failbit); + } + rate = DataRate (v); + return is; +} + + + double operator*(const DataRate& lhs, const Time& rhs) { return rhs.GetSeconds()*lhs.GetBitRate(); diff -r d64b1561b1c2 -r e667dc0f350e src/common/data-rate.h --- a/src/common/data-rate.h Tue Feb 26 01:39:59 2008 +0100 +++ b/src/common/data-rate.h Wed Feb 27 22:19:39 2008 +0100 @@ -27,6 +27,8 @@ #include #include "ns3/nstime.h" #include "ns3/default-value.h" +#include "ns3/attribute.h" +#include "ns3/attribute-helper.h" namespace ns3 { @@ -46,7 +48,8 @@ */ class DataRate { - public: +public: + DataRate (); /** * \brief Integer constructor * @@ -55,23 +58,8 @@ * non-trivial bitrate availiable. */ DataRate (uint64_t bps); - - /** - * \brief String constructor - * - * Construct a DataRate from a string. The supported strings have a - * numerical portion, followed by units in the following format: - * - Prefix: nothing, "k", "M", "G" - * - Data Unit: "b, "B" - * - Time Suffix: "ps", "/s" \n - * The prefixes are SI powers of 10 (10^0,10^3,10^6,10^9 respectively).\n - * The units are the bit, and the (8-bit) byte respectively.\n - * Both time suffixes denote "per second". Some supported examples include - * "20B/s", "56kbps", "4.4MB/s", and "100Gb/s". Any malformed string causes - * a fatal error. - */ - DataRate (const std::string s); - + DataRate (std::string rate); + bool operator < (const DataRate& rhs) const; bool operator <= (const DataRate& rhs) const; bool operator > (const DataRate& rhs) const; @@ -93,11 +81,18 @@ * \return The underlying bitrate in bits per second */ uint64_t GetBitRate() const; - - private: + + VALUE_HELPER_HEADER_1 (DataRate); +private: uint64_t m_bps; static uint64_t Parse(const std::string); }; + +std::ostream &operator << (std::ostream &os, const DataRate &rate); +std::istream &operator >> (std::istream &is, DataRate &rate); + +VALUE_HELPER_HEADER_2 (DataRate); + /** * \param lhs * \param rhs @@ -122,6 +117,6 @@ DataRate m_value; }; -};//namespace ns3 +} //namespace ns3 #endif /* DATA_RATE_H */ diff -r d64b1561b1c2 -r e667dc0f350e src/common/error-model.cc --- a/src/common/error-model.cc Tue Feb 26 01:39:59 2008 +0100 +++ b/src/common/error-model.cc Wed Feb 27 22:19:39 2008 +0100 @@ -27,24 +27,25 @@ #include "ns3/assert.h" #include "ns3/log.h" #include "ns3/random-variable.h" -#include "ns3/default-value.h" -#include "ns3/type-id-default-value.h" +#include "ns3/boolean.h" +#include "ns3/enum.h" +#include "ns3/double.h" NS_LOG_COMPONENT_DEFINE ("ErrorModel"); namespace ns3 { -static TypeIdDefaultValue g_interfaceIdErrorModelDefaultValue ("ErrorModel", - "Error Model", - ErrorModel::GetTypeId (), - "RateErrorModel"); - NS_OBJECT_ENSURE_REGISTERED (ErrorModel); TypeId ErrorModel::GetTypeId (void) { static TypeId tid = TypeId ("ErrorModel") - .SetParent