From e716bbe09d3f1658b764dc16a371a36c9ea98eb0 Mon Sep 17 00:00:00 2001 From: Mathieu Lacage Date: Thu, 13 Mar 2008 12:56:49 -0700 Subject: [PATCH] add back support for introspected doxygen. --- examples/csma-broadcast.cc | 6 +- examples/csma-multicast.cc | 4 +- examples/csma-one-subnet.cc | 4 +- examples/csma-packet-socket.cc | 4 +- examples/mixed-global-routing.cc | 2 +- examples/simple-alternate-routing.cc | 4 +- examples/simple-error-model.cc | 8 +- examples/simple-global-routing.cc | 8 +- examples/simple-point-to-point-olsr.cc | 8 +- examples/simple-point-to-point.cc | 12 +-- examples/tcp-large-transfer-errors.cc | 2 +- examples/tcp-large-transfer.cc | 2 +- examples/tcp-nonlistening-server.cc | 2 +- examples/tcp-small-transfer-oneloss.cc | 2 +- examples/tcp-small-transfer.cc | 2 +- samples/main-adhoc-wifi.cc | 30 +++--- samples/main-ap-wifi.cc | 10 +- samples/main-grid-topology.cc | 4 +- samples/main-random-topology.cc | 4 +- samples/main-random-walk.cc | 4 +- samples/main-simple.cc | 2 +- src/applications/onoff/onoff-application.cc | 2 +- src/applications/packet-sink/packet-sink.cc | 2 +- src/applications/udp-echo/udp-echo-client.cc | 4 +- src/applications/udp-echo/udp-echo-server.cc | 4 +- src/common/error-model.cc | 6 +- src/core/attribute-test.cc | 1 + src/core/object.cc | 36 ++++++- src/core/object.h | 4 + src/devices/csma/csma-channel.cc | 2 +- src/devices/csma/csma-net-device.cc | 2 +- src/devices/csma/csma-topology.h | 2 +- .../point-to-point/point-to-point-channel.cc | 2 +- .../point-to-point-net-device.cc | 2 +- src/devices/wifi/aarf-wifi-manager.cc | 2 +- src/devices/wifi/adhoc-wifi-mac.cc | 2 +- src/devices/wifi/amrr-wifi-manager.cc | 2 +- src/devices/wifi/arf-wifi-manager.cc | 4 +- .../wifi/constant-rate-wifi-manager.cc | 2 +- src/devices/wifi/ideal-wifi-manager.cc | 2 +- src/devices/wifi/nqap-wifi-mac.cc | 2 +- src/devices/wifi/nqsta-wifi-mac.cc | 2 +- src/devices/wifi/wifi-channel.cc | 2 +- src/devices/wifi/wifi-helper.cc | 6 +- src/devices/wifi/wifi-mac.cc | 2 +- src/devices/wifi/wifi-net-device.cc | 2 +- src/devices/wifi/wifi-phy.cc | 2 +- .../wifi/wifi-remote-station-manager.cc | 2 +- .../wifi/wifi-remote-station-manager.h | 8 ++ src/internet-node/arp-l3-protocol.cc | 2 +- src/internet-node/ipv4-l3-protocol.cc | 2 +- src/internet-node/ipv4-l4-demux.cc | 2 +- src/internet-node/ipv4-l4-protocol.cc | 2 +- src/internet-node/rtt-estimator.cc | 4 +- src/internet-node/tcp-l4-protocol.cc | 2 +- src/internet-node/udp-l4-protocol.cc | 2 +- src/mobility/hierarchical-mobility-model.cc | 2 +- src/mobility/mobility-helper.cc | 4 +- src/mobility/mobility-model.cc | 2 +- src/mobility/position-allocator.cc | 10 +- .../random-direction-2d-mobility-model.cc | 2 +- src/mobility/random-walk-2d-mobility-model.cc | 2 +- .../random-waypoint-mobility-model.cc | 2 +- src/mobility/static-mobility-model.cc | 2 +- src/mobility/static-speed-mobility-model.cc | 2 +- src/node/application.cc | 2 +- src/node/channel.cc | 2 +- src/node/drop-tail-queue.cc | 2 +- src/node/ipv4.cc | 2 +- src/node/net-device.cc | 2 +- src/node/node.cc | 2 +- src/node/packet-socket-factory.cc | 2 +- src/node/queue.cc | 2 +- src/node/socket-factory.cc | 2 +- src/node/tcp.cc | 2 +- src/node/udp.cc | 2 +- .../global-routing/global-router-interface.cc | 2 +- src/routing/olsr/olsr-agent-impl.cc | 2 +- src/routing/olsr/olsr-agent.cc | 2 +- src/routing/olsr/olsr-helper.cc | 2 +- utils/print-introspected-doxygen.cc | 99 +++++++++++++++---- 81 files changed, 259 insertions(+), 149 deletions(-) diff --git a/examples/csma-broadcast.cc b/examples/csma-broadcast.cc index 575cbcdbe..b6b1dcc44 100644 --- a/examples/csma-broadcast.cc +++ b/examples/csma-broadcast.cc @@ -150,7 +150,7 @@ main (int argc, char *argv[]) NS_LOG_INFO ("Create Applications."); Ptr ooff = CreateObject ("Remote", Address (InetSocketAddress ("255.255.255.255", port)), - "Protocol", TypeId::LookupByName ("Udp"), + "Protocol", TypeId::LookupByName ("ns3::Udp"), "OnTime", ConstantVariable(1), "OffTime", ConstantVariable(0)); n0->AddApplication (ooff); @@ -161,7 +161,7 @@ main (int argc, char *argv[]) // Create an optional packet sink to receive these packets Ptr sink = CreateObject ("Local", Address (InetSocketAddress (Ipv4Address::GetAny (), port)), - "Protocol", TypeId::LookupByName ("Udp")); + "Protocol", TypeId::LookupByName ("ns3::Udp")); n1->AddApplication (sink); // Start the sink sink->Start (Seconds (1.0)); @@ -169,7 +169,7 @@ main (int argc, char *argv[]) // Create an optional packet sink to receive these packets sink = CreateObject ("Local", Address (InetSocketAddress (Ipv4Address::GetAny (), port)), - "Protocol", TypeId::LookupByName ("Udp")); + "Protocol", TypeId::LookupByName ("ns3::Udp")); n2->AddApplication (sink); // Start the sink diff --git a/examples/csma-multicast.cc b/examples/csma-multicast.cc index 952d3a0b6..72d2f8d60 100644 --- a/examples/csma-multicast.cc +++ b/examples/csma-multicast.cc @@ -279,7 +279,7 @@ main (int argc, char *argv[]) // every few seconds Ptr ooff = CreateObject ("Remote", Address (InetSocketAddress (multicastGroup, port)), - "Protocol", TypeId::LookupByName ("Udp"), + "Protocol", TypeId::LookupByName ("ns3::Udp"), "OnTime", ConstantVariable(1), "OffTime", ConstantVariable(0), "DataRate", DataRate ("255b/s"), @@ -296,7 +296,7 @@ main (int argc, char *argv[]) // for every packet received Ptr sink = CreateObject ("Local", Address (InetSocketAddress (Ipv4Address::GetAny (), port)), - "Protocol", TypeId::LookupByName ("Udp")); + "Protocol", TypeId::LookupByName ("ns3::Udp")); n4->AddApplication (sink); // Start the sink sink->Start (Seconds (1.0)); diff --git a/examples/csma-one-subnet.cc b/examples/csma-one-subnet.cc index 04cbe8eb7..033a639ad 100644 --- a/examples/csma-one-subnet.cc +++ b/examples/csma-one-subnet.cc @@ -161,7 +161,7 @@ main (int argc, char *argv[]) uint16_t port = 9; // Discard port (RFC 863) Ptr ooff = CreateObject ("Remote", Address (InetSocketAddress ("10.1.1.2", port)), - "Protocol", TypeId::LookupByName ("Udp"), + "Protocol", TypeId::LookupByName ("ns3::Udp"), "OnTime", ConstantVariable(1), "OffTime", ConstantVariable(0)); n0->AddApplication (ooff); @@ -175,7 +175,7 @@ main (int argc, char *argv[]) // Create a similar flow from n3 to n0, starting at time 1.1 seconds // ooff = CreateObject ("Remote", Address (InetSocketAddress ("10.1.1.1", port)), - "Protocol", TypeId::LookupByName ("Udp"), + "Protocol", TypeId::LookupByName ("ns3::Udp"), "OnTime", ConstantVariable(1), "OffTime", ConstantVariable(0)); n3->AddApplication (ooff); diff --git a/examples/csma-packet-socket.cc b/examples/csma-packet-socket.cc index 534c8e007..da9a745b8 100644 --- a/examples/csma-packet-socket.cc +++ b/examples/csma-packet-socket.cc @@ -141,7 +141,7 @@ main (int argc, char *argv[]) NS_LOG_INFO ("Create Applications."); Ptr ooff = CreateObject ("Remote", Address (n0ToN1), - "Protocol", TypeId::LookupByName ("Packet"), + "Protocol", TypeId::LookupByName ("ns3::PacketSocketFactory"), "OnTime", ConstantVariable(1), "OffTime", ConstantVariable(0)); n0->AddApplication (ooff); @@ -151,7 +151,7 @@ main (int argc, char *argv[]) // Create a similar flow from n3 to n0, starting at time 1.1 seconds ooff = CreateObject ("Remote", Address (n3ToN0), - "Protocol", TypeId::LookupByName ("Packet"), + "Protocol", TypeId::LookupByName ("ns3::PacketSocketFactory"), "OnTime", ConstantVariable(1), "OffTime", ConstantVariable(0)); n3->AddApplication (ooff); diff --git a/examples/mixed-global-routing.cc b/examples/mixed-global-routing.cc index fe8b2ae52..d1688a757 100644 --- a/examples/mixed-global-routing.cc +++ b/examples/mixed-global-routing.cc @@ -187,7 +187,7 @@ main (int argc, char *argv[]) uint16_t port = 9; // Discard port (RFC 863) Ptr ooff = CreateObject ("Remote", Address (InetSocketAddress ("10.1.3.2", port)), - "Protocol", TypeId::LookupByName ("Udp"), + "Protocol", TypeId::LookupByName ("ns3::Udp"), "OnTime", ConstantVariable (1), "OffTime", ConstantVariable (0), "DataRate", DataRate("300bps"), diff --git a/examples/simple-alternate-routing.cc b/examples/simple-alternate-routing.cc index 4643fb282..e45b325a6 100644 --- a/examples/simple-alternate-routing.cc +++ b/examples/simple-alternate-routing.cc @@ -184,7 +184,7 @@ main (int argc, char *argv[]) // Create a flow from n3 to n1, starting at time 1.1 seconds Ptr ooff = CreateObject ("Remote", Address (InetSocketAddress ("10.1.1.1", port)), - "Protocol", TypeId::LookupByName ("Udp"), + "Protocol", TypeId::LookupByName ("ns3::Udp"), "OnTime", ConstantVariable (1), "OffTime", ConstantVariable (0)); n3->AddApplication (ooff); @@ -195,7 +195,7 @@ main (int argc, char *argv[]) // Create a packet sink to receive these packets Ptr sink = CreateObject ("Remote", Address (InetSocketAddress (Ipv4Address::GetAny (), port)), - "Protocol", TypeId::LookupByName ("Udp")); + "Protocol", TypeId::LookupByName ("ns3::Udp")); n1->AddApplication (sink); // Start the sink sink->Start (Seconds (1.1)); diff --git a/examples/simple-error-model.cc b/examples/simple-error-model.cc index 1c9b021dd..e3f36b8f5 100644 --- a/examples/simple-error-model.cc +++ b/examples/simple-error-model.cc @@ -144,7 +144,7 @@ main (int argc, char *argv[]) uint16_t port = 9; // Discard port (RFC 863) Ptr ooff = CreateObject ("Remote", Address (InetSocketAddress ("10.1.3.2", port)), - "Protocol", TypeId::LookupByName ("Udp"), + "Protocol", TypeId::LookupByName ("ns3::Udp"), "OnTime", ConstantVariable(1), "OffTime", ConstantVariable(0)); n0->AddApplication (ooff); @@ -154,7 +154,7 @@ main (int argc, char *argv[]) // Create an optional packet sink to receive these packets Ptr sink = CreateObject ("Local", Address (InetSocketAddress (Ipv4Address::GetAny (), port)), - "Protocol", TypeId::LookupByName ("Udp")); + "Protocol", TypeId::LookupByName ("ns3::Udp")); n3->AddApplication (sink); // Start the sink sink->Start (Seconds (1.0)); @@ -162,7 +162,7 @@ main (int argc, char *argv[]) // Create a similar flow from n3 to n1, starting at time 1.1 seconds ooff = CreateObject ("Remote", Address (InetSocketAddress ("10.1.2.1", port)), - "Protocol", TypeId::LookupByName ("Udp"), + "Protocol", TypeId::LookupByName ("ns3::Udp"), "OnTime", ConstantVariable(1), "OffTime", ConstantVariable(0)); n3->AddApplication (ooff); @@ -172,7 +172,7 @@ main (int argc, char *argv[]) // Create a packet sink to receive these packets sink = CreateObject ("Local", Address (InetSocketAddress (Ipv4Address::GetAny (), port)), - "Protocol", TypeId::LookupByName ("Udp")); + "Protocol", TypeId::LookupByName ("ns3::Udp")); n1->AddApplication (sink); // Start the sink sink->Start (Seconds (1.1)); diff --git a/examples/simple-global-routing.cc b/examples/simple-global-routing.cc index b2e2d4869..b269591ea 100644 --- a/examples/simple-global-routing.cc +++ b/examples/simple-global-routing.cc @@ -161,7 +161,7 @@ main (int argc, char *argv[]) uint16_t port = 9; // Discard port (RFC 863) Ptr ooff = CreateObject ("Remote", Address (InetSocketAddress ("10.1.3.2", port)), - "Protocol", TypeId::LookupByName ("Udp"), + "Protocol", TypeId::LookupByName ("ns3::Udp"), "OnTime", ConstantVariable (1), "OffTime", ConstantVariable (0)); n0->AddApplication (ooff); @@ -173,7 +173,7 @@ main (int argc, char *argv[]) // The last argument "true" disables output from the Receive callback Ptr sink = CreateObject ("Remote", Address (InetSocketAddress (Ipv4Address::GetAny (), port)), - "Protocol", TypeId::LookupByName ("Udp")); + "Protocol", TypeId::LookupByName ("ns3::Udp")); n3->AddApplication (sink); // Start the sink sink->Start (Seconds (1.0)); @@ -181,7 +181,7 @@ main (int argc, char *argv[]) // Create a similar flow from n3 to n1, starting at time 1.1 seconds ooff = CreateObject ("Remote", Address (InetSocketAddress ("10.1.2.1", port)), - "Protocol", TypeId::LookupByName ("Udp"), + "Protocol", TypeId::LookupByName ("ns3::Udp"), "OnTime", ConstantVariable (1), "OffTime", ConstantVariable (0)); n3->AddApplication (ooff); @@ -191,7 +191,7 @@ main (int argc, char *argv[]) // Create a packet sink to receive these packets sink = CreateObject ("Remote", Address (InetSocketAddress (Ipv4Address::GetAny (), port)), - "Protocol", TypeId::LookupByName ("Udp")); + "Protocol", TypeId::LookupByName ("ns3::Udp")); n1->AddApplication (sink); // Start the sink sink->Start (Seconds (1.1)); diff --git a/examples/simple-point-to-point-olsr.cc b/examples/simple-point-to-point-olsr.cc index d2d2876c1..0dd6599da 100644 --- a/examples/simple-point-to-point-olsr.cc +++ b/examples/simple-point-to-point-olsr.cc @@ -168,7 +168,7 @@ main (int argc, char *argv[]) uint16_t port = 9; // Discard port (RFC 863) Ptr ooff = CreateObject ("Remote", Address (InetSocketAddress ("10.1.4.2", port)), - "Protocol", TypeId::LookupByName ("Udp"), + "Protocol", TypeId::LookupByName ("ns3::Udp"), "OnTime", ConstantVariable(1), "OffTime", ConstantVariable(0)); n0->AddApplication (ooff); @@ -178,14 +178,14 @@ main (int argc, char *argv[]) // Create an optional packet sink to receive these packets Ptr sink = CreateObject ("Local", Address (InetSocketAddress (Ipv4Address::GetAny (), port)), - "Protocol", TypeId::LookupByName ("Udp")); + "Protocol", TypeId::LookupByName ("ns3::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 ("Remote", Address (InetSocketAddress ("10.1.2.1", port)), - "Protocol", TypeId::LookupByName ("Udp"), + "Protocol", TypeId::LookupByName ("ns3::Udp"), "OnTime", ConstantVariable(1), "OffTime", ConstantVariable(0)); n3->AddApplication (ooff); @@ -194,7 +194,7 @@ main (int argc, char *argv[]) // Create a packet sink to receive these packets sink = CreateObject ("Local", Address (InetSocketAddress (Ipv4Address::GetAny (), port)), - "Protocol", TypeId::LookupByName ("Udp")); + "Protocol", TypeId::LookupByName ("ns3::Udp")); n1->AddApplication (sink); // Start the sink sink->Start (Seconds (1.1)); diff --git a/examples/simple-point-to-point.cc b/examples/simple-point-to-point.cc index bb5d63b3a..a0f70a0fa 100644 --- a/examples/simple-point-to-point.cc +++ b/examples/simple-point-to-point.cc @@ -137,7 +137,7 @@ main (int argc, char *argv[]) uint16_t port = 9; // Discard port (RFC 863) Ptr ooff = CreateObject ("Remote", Address (InetSocketAddress ("10.1.3.2", port)), - "Protocol", TypeId::LookupByName ("Udp"), + "Protocol", TypeId::LookupByName ("ns3::Udp"), "OnTime", ConstantVariable(1), "OffTime", ConstantVariable(0)); n0->AddApplication (ooff); @@ -147,14 +147,14 @@ main (int argc, char *argv[]) // Create an optional packet sink to receive these packets Ptr sink = CreateObject ("Local", Address (InetSocketAddress (Ipv4Address::GetAny (), port)), - "Protocol", TypeId::LookupByName ("Udp")); + "Protocol", TypeId::LookupByName ("ns3::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 ("Remote", Address (InetSocketAddress ("10.1.2.1", port)), - "Protocol", TypeId::LookupByName ("Udp"), + "Protocol", TypeId::LookupByName ("ns3::Udp"), "OnTime", ConstantVariable(1), "OffTime", ConstantVariable(0)); n3->AddApplication (ooff); @@ -163,7 +163,7 @@ main (int argc, char *argv[]) // Create a packet sink to receive these packets sink = CreateObject ("Local", Address (InetSocketAddress (Ipv4Address::GetAny (), port)), - "Protocol", TypeId::LookupByName ("Udp")); + "Protocol", TypeId::LookupByName ("ns3::Udp")); n1->AddApplication (sink); // Start the sink sink->Start (Seconds (1.1)); @@ -173,7 +173,7 @@ main (int argc, char *argv[]) uint16_t servPort = 500; ooff = CreateObject ("Remote", Address (InetSocketAddress ("10.1.3.2", servPort)), - "Protocol", TypeId::LookupByName ("Tcp"), + "Protocol", TypeId::LookupByName ("ns3::Tcp"), "OnTime", ConstantVariable(1), "OffTime", ConstantVariable(0)); n0->AddApplication (ooff); @@ -183,7 +183,7 @@ main (int argc, char *argv[]) // Create a packet sink to receive these TCP packets sink = CreateObject ("Local", Address (InetSocketAddress (Ipv4Address::GetAny (), servPort)), - "Protocol", TypeId::LookupByName ("Tcp")); + "Protocol", TypeId::LookupByName ("ns3::Tcp")); n3->AddApplication (sink); sink->Start (Seconds (1.2)); diff --git a/examples/tcp-large-transfer-errors.cc b/examples/tcp-large-transfer-errors.cc index 4da88b941..a2e291e96 100644 --- a/examples/tcp-large-transfer-errors.cc +++ b/examples/tcp-large-transfer-errors.cc @@ -199,7 +199,7 @@ int main (int argc, char *argv[]) // Create a packet sink to receive these packets Ptr sink = CreateObject ("Local", Address (InetSocketAddress (Ipv4Address::GetAny (), servPort)), - "Protocol", TypeId::LookupByName ("Tcp")); + "Protocol", TypeId::LookupByName ("ns3::Tcp")); n2->AddApplication (sink); sink->Start (Seconds (0.0)); sink->Stop (Seconds (10000.0)); diff --git a/examples/tcp-large-transfer.cc b/examples/tcp-large-transfer.cc index 8946aa271..13be2ff7e 100644 --- a/examples/tcp-large-transfer.cc +++ b/examples/tcp-large-transfer.cc @@ -199,7 +199,7 @@ int main (int argc, char *argv[]) // Create a packet sink to receive these packets Ptr sink = CreateObject ("Local", Address (InetSocketAddress (Ipv4Address::GetAny (), servPort)), - "Protocol", TypeId::LookupByName ("Tcp")); + "Protocol", TypeId::LookupByName ("ns3::Tcp")); n2->AddApplication (sink); sink->Start (Seconds (0.0)); sink->Stop (Seconds (100.0)); diff --git a/examples/tcp-nonlistening-server.cc b/examples/tcp-nonlistening-server.cc index cc43a4054..8d99540eb 100644 --- a/examples/tcp-nonlistening-server.cc +++ b/examples/tcp-nonlistening-server.cc @@ -162,7 +162,7 @@ int main (int argc, char *argv[]) Ptr sink = Create ( n2, InetSocketAddress (Ipv4Address::GetAny (), servPort), - "Tcp"); + "ns3::Tcp"); // Start the sink sink->Start (Seconds (0.0)); sink->Stop (Seconds (10.0)); diff --git a/examples/tcp-small-transfer-oneloss.cc b/examples/tcp-small-transfer-oneloss.cc index e6d3a3433..4dc41c54f 100644 --- a/examples/tcp-small-transfer-oneloss.cc +++ b/examples/tcp-small-transfer-oneloss.cc @@ -181,7 +181,7 @@ int main (int argc, char *argv[]) // Create a packet sink to receive these packets Ptr sink = CreateObject ("Local", Address (InetSocketAddress (Ipv4Address::GetAny (), servPort)), - "Protocol", TypeId::LookupByName ("Tcp")); + "Protocol", TypeId::LookupByName ("ns3::Tcp")); n2->AddApplication (sink); sink->Start (Seconds (0.0)); sink->Stop (Seconds (100.0)); diff --git a/examples/tcp-small-transfer.cc b/examples/tcp-small-transfer.cc index ee10e2e1d..34dac1580 100644 --- a/examples/tcp-small-transfer.cc +++ b/examples/tcp-small-transfer.cc @@ -191,7 +191,7 @@ int main (int argc, char *argv[]) // Create a packet sink to receive these packets Ptr sink = CreateObject ("Local", Address (InetSocketAddress (Ipv4Address::GetAny (), servPort)), - "Protocol", TypeId::LookupByName ("Tcp")); + "Protocol", TypeId::LookupByName ("ns3::Tcp")); n2->AddApplication (sink); sink->Start (Seconds (0.0)); sink->Stop (Seconds (100.0)); diff --git a/samples/main-adhoc-wifi.cc b/samples/main-adhoc-wifi.cc index d91a40b92..1621217e4 100644 --- a/samples/main-adhoc-wifi.cc +++ b/samples/main-adhoc-wifi.cc @@ -117,7 +117,7 @@ Experiment::ReceivePacket (Ptr socket, Ptr packet, const Address Ptr Experiment::SetupPacketReceive (Ptr node) { - TypeId tid = TypeId::LookupByName ("Packet"); + TypeId tid = TypeId::LookupByName ("ns3::PacketSocketFactory"); Ptr socketFactory = node->GetObject (tid); Ptr sink = socketFactory->CreateSocket (); sink->Bind (); @@ -150,7 +150,7 @@ Experiment::Run (const WifiHelper &wifi) destination.SetPhysicalAddress (devices.Get (1)->GetAddress ()); Ptr app = CreateObject ("Remote", Address (destination), - "Protocol", TypeId::LookupByName ("Packet"), + "Protocol", TypeId::LookupByName ("ns3::PacketSocketFactory"), "OnTime", ConstantVariable (250), "OffTime", ConstantVariable (0), "DataRate", DataRate (60000000), @@ -185,61 +185,61 @@ int main (int argc, char *argv[]) WifiHelper wifi; GnuplotDataset dataset; - wifi.SetMac ("AdhocWifiMac"); - wifi.SetPhy ("WifiPhy"); + wifi.SetMac ("ns3::AdhocWifiMac"); + wifi.SetPhy ("ns3::WifiPhy"); NS_LOG_DEBUG ("54"); experiment = Experiment ("54mb"); - wifi.SetRemoteStationManager ("ConstantRateWifiManager", + wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager", "DataMode", String ("wifia-54mbs")); dataset = experiment.Run (wifi); gnuplot.AddDataset (dataset); NS_LOG_DEBUG ("48"); experiment = Experiment ("48mb"); - wifi.SetRemoteStationManager ("ConstantRateWifiManager", + wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager", "DataMode", String ("wifia-48mbs")); dataset = experiment.Run (wifi); gnuplot.AddDataset (dataset); NS_LOG_DEBUG ("36"); experiment = Experiment ("36mb"); - wifi.SetRemoteStationManager ("ConstantRateWifiManager", + wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager", "DataMode", String ("wifia-36mbs")); dataset = experiment.Run (wifi); gnuplot.AddDataset (dataset); NS_LOG_DEBUG ("24"); experiment = Experiment ("24mb"); - wifi.SetRemoteStationManager ("ConstantRateWifiManager", + wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager", "DataMode", String ("wifia-24mbs")); dataset = experiment.Run (wifi); gnuplot.AddDataset (dataset); NS_LOG_DEBUG ("18"); experiment = Experiment ("18mb"); - wifi.SetRemoteStationManager ("ConstantRateWifiManager", + wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager", "DataMode", String ("wifia-18mbs")); dataset = experiment.Run (wifi); gnuplot.AddDataset (dataset); NS_LOG_DEBUG ("12"); experiment = Experiment ("12mb"); - wifi.SetRemoteStationManager ("ConstantRateWifiManager", + wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager", "DataMode", String ("wifia-12mbs")); dataset = experiment.Run (wifi); gnuplot.AddDataset (dataset); NS_LOG_DEBUG ("9"); experiment = Experiment ("9mb"); - wifi.SetRemoteStationManager ("ConstantRateWifiManager", + wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager", "DataMode", String ("wifia-9mbs")); dataset = experiment.Run (wifi); gnuplot.AddDataset (dataset); NS_LOG_DEBUG ("6"); experiment = Experiment ("6mb"); - wifi.SetRemoteStationManager ("ConstantRateWifiManager", + wifi.SetRemoteStationManager ("ns3::ConstantRateWifiManager", "DataMode", String ("wifia-6mbs")); dataset = experiment.Run (wifi); gnuplot.AddDataset (dataset); @@ -254,19 +254,19 @@ int main (int argc, char *argv[]) NS_LOG_DEBUG ("arf"); experiment = Experiment ("arf"); - wifi.SetRemoteStationManager ("ArfWifiManager"); + wifi.SetRemoteStationManager ("ns3::ArfWifiManager"); dataset = experiment.Run (wifi); gnuplot.AddDataset (dataset); NS_LOG_DEBUG ("aarf"); experiment = Experiment ("aarf"); - wifi.SetRemoteStationManager ("AarfWifiManager"); + wifi.SetRemoteStationManager ("ns3::AarfWifiManager"); dataset = experiment.Run (wifi); gnuplot.AddDataset (dataset); NS_LOG_DEBUG ("ideal"); experiment = Experiment ("ideal"); - wifi.SetRemoteStationManager ("IdealWifiManager"); + wifi.SetRemoteStationManager ("ns3::IdealWifiManager"); dataset = experiment.Run (wifi); gnuplot.AddDataset (dataset); diff --git a/samples/main-ap-wifi.cc b/samples/main-ap-wifi.cc index 6cd32088f..fe01f5afe 100644 --- a/samples/main-ap-wifi.cc +++ b/samples/main-ap-wifi.cc @@ -121,14 +121,14 @@ int main (int argc, char *argv[]) Ptr channel = CreateObject (); Ssid ssid = Ssid ("wifi-default"); - wifi.SetPhy ("WifiPhy"); - wifi.SetRemoteStationManager ("ArfWifiManager"); + wifi.SetPhy ("ns3::WifiPhy"); + wifi.SetRemoteStationManager ("ns3::ArfWifiManager"); // setup ap. - wifi.SetMac ("NqstaWifiMac", "Ssid", ssid, + wifi.SetMac ("ns3::NqstaWifiMac", "Ssid", ssid, "ActiveProbing", Boolean (false)); staDevs = wifi.Build (stas, channel); // setup stas. - wifi.SetMac ("NqapWifiMac", "Ssid", ssid, + wifi.SetMac ("ns3::NqapWifiMac", "Ssid", ssid, "BeaconGeneration", Boolean (true), "BeaconInterval", Seconds (2.5)); wifi.Build (ap, channel); @@ -145,7 +145,7 @@ int main (int argc, char *argv[]) destination.SetPhysicalAddress (staDevs.Get(1)->GetAddress ()); Ptr app = CreateObject ("Remote", Address (destination), - "Protocol", TypeId::LookupByName ("Packet"), + "Protocol", TypeId::LookupByName ("ns3::PacketSocketFactory"), "OnTime", ConstantVariable (42), "OffTime", ConstantVariable (0)); stas.Get (0)->AddApplication (app); diff --git a/samples/main-grid-topology.cc b/samples/main-grid-topology.cc index 3eb56f7a7..88406210c 100644 --- a/samples/main-grid-topology.cc +++ b/samples/main-grid-topology.cc @@ -29,7 +29,7 @@ int main (int argc, char *argv[]) // 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 - mobility.SetPositionAllocator ("GridPositionAllocator", + mobility.SetPositionAllocator ("ns3::GridPositionAllocator", "MinX", Double (-100.0), "MinY", Double (-100.0), "DeltaX", Double (5.0), @@ -39,7 +39,7 @@ int main (int argc, char *argv[]) // each object will be attached a static position. // i.e., once set by the "position allocator", the // position will never change. - mobility.SetMobilityModel ("StaticMobilityModel"); + mobility.SetMobilityModel ("ns3::StaticMobilityModel"); // finalize the setup by attaching to each object // in the input array a position and initializing diff --git a/samples/main-random-topology.cc b/samples/main-random-topology.cc index 08e6edd54..3ba4db8ed 100644 --- a/samples/main-random-topology.cc +++ b/samples/main-random-topology.cc @@ -37,11 +37,11 @@ int main (int argc, char *argv[]) MobilityHelper mobility; mobility.EnableNotifier (); - mobility.SetPositionAllocator ("RandomDiscPositionAllocator", + mobility.SetPositionAllocator ("ns3::RandomDiscPositionAllocator", "X", String ("100.0"), "Y", String ("100.0"), "Rho", String ("Uniform:0:30")); - mobility.SetMobilityModel ("StaticMobilityModel"); + mobility.SetMobilityModel ("ns3::StaticMobilityModel"); mobility.Layout (objects.begin (), objects.end ()); Config::Connect ("/NodeList/*/$MobilityModelNotifier/CourseChange", diff --git a/samples/main-random-walk.cc b/samples/main-random-walk.cc index 1f09ce4ec..67452ea41 100644 --- a/samples/main-random-walk.cc +++ b/samples/main-random-walk.cc @@ -43,11 +43,11 @@ int main (int argc, char *argv[]) MobilityHelper mobility; mobility.EnableNotifier (); - mobility.SetPositionAllocator ("RandomDiscPositionAllocator", + mobility.SetPositionAllocator ("ns3::RandomDiscPositionAllocator", "X", String ("100.0"), "Y", String ("100.0"), "Rho", String ("Uniform:0:30")); - mobility.SetMobilityModel ("RandomWalk2dMobilityModel", + mobility.SetMobilityModel ("ns3::RandomWalk2dMobilityModel", "Mode", String ("Time"), "Time", String ("2s"), "Speed", String ("Constant:1.0"), diff --git a/samples/main-simple.cc b/samples/main-simple.cc index fedd173b3..a2c6ec501 100644 --- a/samples/main-simple.cc +++ b/samples/main-simple.cc @@ -42,7 +42,7 @@ RunSimulation (void) { Ptr a = CreateObject (); - TypeId tid = TypeId::LookupByName ("Udp"); + TypeId tid = TypeId::LookupByName ("ns3::Udp"); Ptr socketFactory = a->GetObject (tid); Ptr sink = socketFactory->CreateSocket (); diff --git a/src/applications/onoff/onoff-application.cc b/src/applications/onoff/onoff-application.cc index 4d1d0f779..a2aa02aeb 100644 --- a/src/applications/onoff/onoff-application.cc +++ b/src/applications/onoff/onoff-application.cc @@ -48,7 +48,7 @@ NS_OBJECT_ENSURE_REGISTERED (OnOffApplication); TypeId OnOffApplication::GetTypeId (void) { - static TypeId tid = TypeId ("OnOffApplication") + static TypeId tid = TypeId ("ns3::OnOffApplication") .SetParent () .AddConstructor () .AddAttribute ("DataRate", "The data rate in on state.", diff --git a/src/applications/packet-sink/packet-sink.cc b/src/applications/packet-sink/packet-sink.cc index d1f583e60..27594fe97 100644 --- a/src/applications/packet-sink/packet-sink.cc +++ b/src/applications/packet-sink/packet-sink.cc @@ -39,7 +39,7 @@ NS_OBJECT_ENSURE_REGISTERED (PacketSink); TypeId PacketSink::GetTypeId (void) { - static TypeId tid = TypeId ("PacketSink") + static TypeId tid = TypeId ("ns3::PacketSink") .SetParent () .AddAttribute ("Local", "The Address on which to Bind the rx socket.", Address (), diff --git a/src/applications/udp-echo/udp-echo-client.cc b/src/applications/udp-echo/udp-echo-client.cc index d60386967..7f6d00c87 100644 --- a/src/applications/udp-echo/udp-echo-client.cc +++ b/src/applications/udp-echo/udp-echo-client.cc @@ -34,7 +34,7 @@ NS_OBJECT_ENSURE_REGISTERED (UdpEchoClient); TypeId UdpEchoClient::GetTypeId (void) { - static TypeId tid = TypeId ("UdpEchoClient") + static TypeId tid = TypeId ("ns3::UdpEchoClient") .SetParent () .AddConstructor () .AddAttribute ("MaxPackets", "XXX", @@ -88,7 +88,7 @@ UdpEchoClient::StartApplication (void) if (!m_socket) { - TypeId tid = TypeId::LookupByName ("Udp"); + TypeId tid = TypeId::LookupByName ("ns3::Udp"); Ptr socketFactory = GetNode ()->GetObject (tid); m_socket = socketFactory->CreateSocket (); diff --git a/src/applications/udp-echo/udp-echo-server.cc b/src/applications/udp-echo/udp-echo-server.cc index 10797c529..e100bc967 100644 --- a/src/applications/udp-echo/udp-echo-server.cc +++ b/src/applications/udp-echo/udp-echo-server.cc @@ -36,7 +36,7 @@ NS_OBJECT_ENSURE_REGISTERED (UdpEchoServer); TypeId UdpEchoServer::GetTypeId (void) { - static TypeId tid = TypeId ("UdpEchoServer") + static TypeId tid = TypeId ("ns3::UdpEchoServer") .SetParent () .AddConstructor () .AddAttribute ("Port", "Client Port", @@ -71,7 +71,7 @@ UdpEchoServer::StartApplication (void) if (!m_socket) { - TypeId tid = TypeId::LookupByName ("Udp"); + TypeId tid = TypeId::LookupByName ("ns3::Udp"); Ptr socketFactory = GetNode ()->GetObject (tid); m_socket = socketFactory->CreateSocket (); diff --git a/src/common/error-model.cc b/src/common/error-model.cc index 274145baa..4796b473b 100644 --- a/src/common/error-model.cc +++ b/src/common/error-model.cc @@ -39,7 +39,7 @@ NS_OBJECT_ENSURE_REGISTERED (ErrorModel); TypeId ErrorModel::GetTypeId (void) { - static TypeId tid = TypeId ("ErrorModel") + static TypeId tid = TypeId ("ns3::ErrorModel") .SetParent () .AddAttribute ("IsEnabled", "Whether this ErrorModel is enabled or not.", Boolean (true), @@ -107,7 +107,7 @@ NS_OBJECT_ENSURE_REGISTERED (RateErrorModel); TypeId RateErrorModel::GetTypeId (void) { - static TypeId tid = TypeId ("RateErrorModel") + static TypeId tid = TypeId ("ns3::RateErrorModel") .SetParent () .AddConstructor () .AddAttribute ("ErrorUnit", "The error unit", @@ -237,7 +237,7 @@ NS_OBJECT_ENSURE_REGISTERED (ListErrorModel); TypeId ListErrorModel::GetTypeId (void) { - static TypeId tid = TypeId ("ListErrorModel") + static TypeId tid = TypeId ("ns3::ListErrorModel") .SetParent () .AddConstructor () ; diff --git a/src/core/attribute-test.cc b/src/core/attribute-test.cc index df2e04b8f..a416fa329 100644 --- a/src/core/attribute-test.cc +++ b/src/core/attribute-test.cc @@ -98,6 +98,7 @@ public: static TypeId GetTypeId (void) { static TypeId tid = TypeId ("AttributeObjectTest") .SetParent () + .HideFromDocumentation () .AddAttribute ("TestBoolName", "help text", Boolean (false), MakeBooleanAccessor (&AttributeObjectTest::m_boolTest), diff --git a/src/core/object.cc b/src/core/object.cc index bd7361d21..8207e1583 100644 --- a/src/core/object.cc +++ b/src/core/object.cc @@ -45,6 +45,7 @@ public: void SetTypeName (uint16_t uid, std::string typeName); void SetGroupName (uint16_t uid, std::string groupName); void AddConstructor (uint16_t uid, ns3::CallbackBase callback); + void HideFromDocumentation (uint16_t uid); uint16_t GetUid (std::string name) const; std::string GetName (uint16_t uid) const; uint16_t GetParent (uint16_t uid) const; @@ -76,6 +77,7 @@ public: std::string GetTraceSourceName (uint16_t uid, uint32_t i) const; std::string GetTraceSourceHelp (uint16_t uid, uint32_t i) const; ns3::Ptr GetTraceSourceAccessor (uint16_t uid, uint32_t i) const; + bool MustHideFromDocumentation (uint16_t uid) const; private: struct AttributeInformation { @@ -98,6 +100,7 @@ private: std::string groupName; bool hasConstructor; ns3::CallbackBase constructor; + bool mustHideFromDocumentation; std::vector attributes; std::vector traceSources; }; @@ -130,6 +133,7 @@ IidManager::AllocateUid (std::string name) information.typeName = ""; information.groupName = ""; information.hasConstructor = false; + information.mustHideFromDocumentation = false; m_information.push_back (information); uint32_t uid = m_information.size (); NS_ASSERT (uid <= 0xffff); @@ -162,6 +166,12 @@ IidManager::SetGroupName (uint16_t uid, std::string groupName) struct IidInformation *information = LookupInformation (uid); information->groupName = groupName; } +void +IidManager::HideFromDocumentation (uint16_t uid) +{ + struct IidInformation *information = LookupInformation (uid); + information->mustHideFromDocumentation = true; +} void IidManager::AddConstructor (uint16_t uid, ns3::CallbackBase callback) @@ -363,6 +373,12 @@ IidManager::GetTraceSourceAccessor (uint16_t uid, uint32_t i) const NS_ASSERT (i < information->traceSources.size ()); return information->traceSources[i].accessor; } +bool +IidManager::MustHideFromDocumentation (uint16_t uid) const +{ + struct IidInformation *information = LookupInformation (uid); + return information->mustHideFromDocumentation; +} } // anonymous namespace @@ -564,6 +580,13 @@ TypeId::CreateObject (const AttributeList &attributes) const return object; } +bool +TypeId::MustHideFromDocumentation (void) const +{ + bool mustHide = Singleton::Get ()->MustHideFromDocumentation (m_tid); + return mustHide; +} + uint32_t TypeId::GetAttributeListN (void) const { @@ -645,6 +668,13 @@ TypeId::AddTraceSource (std::string name, return *this; } +TypeId +TypeId::HideFromDocumentation (void) +{ + Singleton::Get ()->HideFromDocumentation (m_tid); + return *this; +} + Ptr TypeId::LookupTraceSourceByName (std::string name) const @@ -936,7 +966,7 @@ NS_OBJECT_ENSURE_REGISTERED (Object); static TypeId GetObjectIid (void) { - TypeId tid = TypeId ("Object"); + TypeId tid = TypeId ("ns3::Object"); tid.SetParent (tid); return tid; } @@ -1324,6 +1354,7 @@ public: static ns3::TypeId GetTypeId (void) { static ns3::TypeId tid = ns3::TypeId ("BaseA") .SetParent (Object::GetTypeId ()) + .HideFromDocumentation () .AddConstructor (); return tid; } @@ -1338,6 +1369,7 @@ public: static ns3::TypeId GetTypeId (void) { static ns3::TypeId tid = ns3::TypeId ("DerivedA") .SetParent (BaseA::GetTypeId ()) + .HideFromDocumentation () .AddConstructor (); return tid; } @@ -1354,6 +1386,7 @@ public: static ns3::TypeId GetTypeId (void) { static ns3::TypeId tid = ns3::TypeId ("BaseB") .SetParent (Object::GetTypeId ()) + .HideFromDocumentation () .AddConstructor (); return tid; } @@ -1368,6 +1401,7 @@ public: static ns3::TypeId GetTypeId (void) { static ns3::TypeId tid = ns3::TypeId ("DerivedB") .SetParent (BaseB::GetTypeId ()) + .HideFromDocumentation () .AddConstructor (); return tid; } diff --git a/src/core/object.h b/src/core/object.h index 3da94556a..8649021dc 100644 --- a/src/core/object.h +++ b/src/core/object.h @@ -180,6 +180,8 @@ public: Ptr CreateObject (const AttributeList &attributes) const; Ptr CreateObject (void) const; + bool MustHideFromDocumentation (void) const; + /** * \param tid the TypeId of the base class. * \return this TypeId instance. @@ -270,6 +272,8 @@ public: std::string help, Ptr accessor); + TypeId HideFromDocumentation (void); + /** * \brief store together a set of attribute properties. */ diff --git a/src/devices/csma/csma-channel.cc b/src/devices/csma/csma-channel.cc index 5d51c15a3..0528b4424 100644 --- a/src/devices/csma/csma-channel.cc +++ b/src/devices/csma/csma-channel.cc @@ -48,7 +48,7 @@ CsmaDeviceRec::IsActive() { TypeId CsmaChannel::GetTypeId (void) { - static TypeId tid = TypeId ("CsmaChannel") + static TypeId tid = TypeId ("ns3::CsmaChannel") .SetParent () .AddConstructor () .AddAttribute ("BitRate", "The maximum bitrate of the channel", diff --git a/src/devices/csma/csma-net-device.cc b/src/devices/csma/csma-net-device.cc index c613a90cd..87ed536d0 100644 --- a/src/devices/csma/csma-net-device.cc +++ b/src/devices/csma/csma-net-device.cc @@ -42,7 +42,7 @@ NS_OBJECT_ENSURE_REGISTERED (CsmaNetDevice); TypeId CsmaNetDevice::GetTypeId (void) { - static TypeId tid = TypeId ("CsmaNetDevice") + static TypeId tid = TypeId ("ns3::CsmaNetDevice") .SetParent () .AddConstructor () .AddAttribute ("Address", "The address of this device.", diff --git a/src/devices/csma/csma-topology.h b/src/devices/csma/csma-topology.h index e74338d88..e7e2fe065 100644 --- a/src/devices/csma/csma-topology.h +++ b/src/devices/csma/csma-topology.h @@ -106,7 +106,7 @@ static Ptr ConnectPacketSocket(Ptr app, /** * \param n1 Node from which socketfactory should be tested. - * \param tid_name Interface identifier ("Packet", in this case) + * \param tid_name Interface identifier ("ns3::PacketSocketFactory", in this case) * * This is a test function to make sure that a socket can be created * by using the socketfactory interface provided in the diff --git a/src/devices/point-to-point/point-to-point-channel.cc b/src/devices/point-to-point/point-to-point-channel.cc index 8a9c5a68c..c4a450ead 100644 --- a/src/devices/point-to-point/point-to-point-channel.cc +++ b/src/devices/point-to-point/point-to-point-channel.cc @@ -32,7 +32,7 @@ namespace ns3 { TypeId PointToPointChannel::GetTypeId (void) { - static TypeId tid = TypeId ("PointToPointChannel") + static TypeId tid = TypeId ("ns3::PointToPointChannel") .SetParent () .AddConstructor () .AddAttribute ("BitRate", "The maximum bitrate of the channel", diff --git a/src/devices/point-to-point/point-to-point-net-device.cc b/src/devices/point-to-point/point-to-point-net-device.cc index e8cde0956..c8d68d2c2 100644 --- a/src/devices/point-to-point/point-to-point-net-device.cc +++ b/src/devices/point-to-point/point-to-point-net-device.cc @@ -39,7 +39,7 @@ NS_OBJECT_ENSURE_REGISTERED (PointToPointNetDevice); TypeId PointToPointNetDevice::GetTypeId (void) { - static TypeId tid = TypeId ("PointToPointNetDevice") + static TypeId tid = TypeId ("ns3::PointToPointNetDevice") .SetParent () .AddConstructor () .AddAttribute ("Address", "The address of this device.", diff --git a/src/devices/wifi/aarf-wifi-manager.cc b/src/devices/wifi/aarf-wifi-manager.cc index 086df6c01..3f0f376f6 100644 --- a/src/devices/wifi/aarf-wifi-manager.cc +++ b/src/devices/wifi/aarf-wifi-manager.cc @@ -33,7 +33,7 @@ NS_OBJECT_ENSURE_REGISTERED (AarfWifiManager); TypeId AarfWifiManager::GetTypeId (void) { - static TypeId tid = TypeId ("AarfWifiManager") + static TypeId tid = TypeId ("ns3::AarfWifiManager") .SetParent () .AddConstructor () .AddAttribute ("SuccessK", "Multiplication factor for the success threshold in the AARF algorithm.", diff --git a/src/devices/wifi/adhoc-wifi-mac.cc b/src/devices/wifi/adhoc-wifi-mac.cc index 85dcf7646..35176fdf8 100644 --- a/src/devices/wifi/adhoc-wifi-mac.cc +++ b/src/devices/wifi/adhoc-wifi-mac.cc @@ -36,7 +36,7 @@ NS_OBJECT_ENSURE_REGISTERED (AdhocWifiMac); TypeId AdhocWifiMac::GetTypeId (void) { - static TypeId tid = TypeId ("AdhocWifiMac") + static TypeId tid = TypeId ("ns3::AdhocWifiMac") .SetParent () .AddConstructor () ; diff --git a/src/devices/wifi/amrr-wifi-manager.cc b/src/devices/wifi/amrr-wifi-manager.cc index 77fc41505..b0b465f23 100644 --- a/src/devices/wifi/amrr-wifi-manager.cc +++ b/src/devices/wifi/amrr-wifi-manager.cc @@ -33,7 +33,7 @@ NS_OBJECT_ENSURE_REGISTERED (AmrrWifiManager); TypeId AmrrWifiManager::GetTypeId (void) { - static TypeId tid = TypeId ("AmrrWifiManager") + static TypeId tid = TypeId ("ns3::AmrrWifiManager") .SetParent () .AddConstructor () .AddAttribute ("UpdatePeriod", diff --git a/src/devices/wifi/arf-wifi-manager.cc b/src/devices/wifi/arf-wifi-manager.cc index 0570db816..25475de19 100644 --- a/src/devices/wifi/arf-wifi-manager.cc +++ b/src/devices/wifi/arf-wifi-manager.cc @@ -23,7 +23,7 @@ #include "ns3/log.h" #include "ns3/uinteger.h" -NS_LOG_COMPONENT_DEFINE ("ArfWifiManager"); +NS_LOG_COMPONENT_DEFINE ("ns3::ArfWifiManager"); namespace ns3 { @@ -224,7 +224,7 @@ NS_OBJECT_ENSURE_REGISTERED (ArfWifiManager); TypeId ArfWifiManager::GetTypeId (void) { - static TypeId tid = TypeId ("ArfWifiManager") + static TypeId tid = TypeId ("ns3::ArfWifiManager") .SetParent () .AddConstructor () .AddAttribute ("TimerThreshold", "The 'timer' threshold in the ARF algorithm.", diff --git a/src/devices/wifi/constant-rate-wifi-manager.cc b/src/devices/wifi/constant-rate-wifi-manager.cc index a01cbcad4..2e40b80d6 100644 --- a/src/devices/wifi/constant-rate-wifi-manager.cc +++ b/src/devices/wifi/constant-rate-wifi-manager.cc @@ -74,7 +74,7 @@ NS_OBJECT_ENSURE_REGISTERED (ConstantRateWifiManager); TypeId ConstantRateWifiManager::GetTypeId (void) { - static TypeId tid = TypeId ("ConstantRateWifiManager") + static TypeId tid = TypeId ("ns3::ConstantRateWifiManager") .SetParent () .AddConstructor () .AddAttribute ("DataMode", "XXX", diff --git a/src/devices/wifi/ideal-wifi-manager.cc b/src/devices/wifi/ideal-wifi-manager.cc index 65f5ddd9c..3b04bd7e9 100644 --- a/src/devices/wifi/ideal-wifi-manager.cc +++ b/src/devices/wifi/ideal-wifi-manager.cc @@ -41,7 +41,7 @@ NS_OBJECT_ENSURE_REGISTERED (IdealWifiManager); TypeId IdealWifiManager::GetTypeId (void) { - static TypeId tid = TypeId ("IdealWifiManager") + static TypeId tid = TypeId ("ns3::IdealWifiManager") .SetParent () .AddConstructor () .AddAttribute ("BerThreshold", diff --git a/src/devices/wifi/nqap-wifi-mac.cc b/src/devices/wifi/nqap-wifi-mac.cc index 93da66bd3..90a434c7f 100644 --- a/src/devices/wifi/nqap-wifi-mac.cc +++ b/src/devices/wifi/nqap-wifi-mac.cc @@ -43,7 +43,7 @@ NS_OBJECT_ENSURE_REGISTERED (NqapWifiMac); TypeId NqapWifiMac::GetTypeId (void) { - static TypeId tid = TypeId ("NqapWifiMac") + static TypeId tid = TypeId ("ns3::NqapWifiMac") .SetParent () .AddConstructor () .AddAttribute ("BeaconInterval", "Delay between two beacons", diff --git a/src/devices/wifi/nqsta-wifi-mac.cc b/src/devices/wifi/nqsta-wifi-mac.cc index 77768ada2..7a54bb491 100644 --- a/src/devices/wifi/nqsta-wifi-mac.cc +++ b/src/devices/wifi/nqsta-wifi-mac.cc @@ -62,7 +62,7 @@ NS_OBJECT_ENSURE_REGISTERED (NqstaWifiMac); TypeId NqstaWifiMac::GetTypeId (void) { - static TypeId tid = TypeId ("NqstaWifiMac") + static TypeId tid = TypeId ("ns3::NqstaWifiMac") .SetParent () .AddConstructor () .AddAttribute ("ProbeRequestTimeout", "XXX", diff --git a/src/devices/wifi/wifi-channel.cc b/src/devices/wifi/wifi-channel.cc index 3dd4213ff..aa8301c97 100644 --- a/src/devices/wifi/wifi-channel.cc +++ b/src/devices/wifi/wifi-channel.cc @@ -34,7 +34,7 @@ namespace ns3 { TypeId WifiChannel::GetTypdId (void) { - static TypeId tid = TypeId ("WifiChannel") + static TypeId tid = TypeId ("ns3::WifiChannel") .SetParent () .AddConstructor () .AddAttribute ("PropagationLossModel", "XXX", diff --git a/src/devices/wifi/wifi-helper.cc b/src/devices/wifi/wifi-helper.cc index 69c373c41..4a0d5a616 100644 --- a/src/devices/wifi/wifi-helper.cc +++ b/src/devices/wifi/wifi-helper.cc @@ -15,9 +15,9 @@ namespace ns3 { WifiHelper::WifiHelper () { - m_stationManager.SetTypeId ("ArfWifiManager"); - m_phy.SetTypeId ("WifiPhy"); - m_mac.SetTypeId ("AdhocWifiMac"); + m_stationManager.SetTypeId ("ns3::ArfWifiManager"); + m_phy.SetTypeId ("ns3::WifiPhy"); + m_mac.SetTypeId ("ns3::AdhocWifiMac"); } void diff --git a/src/devices/wifi/wifi-mac.cc b/src/devices/wifi/wifi-mac.cc index 79e95c710..a8bb73ae1 100644 --- a/src/devices/wifi/wifi-mac.cc +++ b/src/devices/wifi/wifi-mac.cc @@ -52,7 +52,7 @@ WifiMac::GetDefaultCtsAckTimeout (void) TypeId WifiMac::GetTypeId (void) { - static TypeId tid = TypeId ("WifiMac") + static TypeId tid = TypeId ("ns3::WifiMac") .SetParent () .AddAttribute ("CtsTimeout", "XXX", GetDefaultCtsAckTimeout (), diff --git a/src/devices/wifi/wifi-net-device.cc b/src/devices/wifi/wifi-net-device.cc index 8dbb572c6..27242a72e 100644 --- a/src/devices/wifi/wifi-net-device.cc +++ b/src/devices/wifi/wifi-net-device.cc @@ -33,7 +33,7 @@ namespace ns3 { TypeId WifiNetDevice::GetTypeId (void) { - static TypeId tid = TypeId ("WifiNetDevice") + static TypeId tid = TypeId ("ns3::WifiNetDevice") .SetParent () .AddAttribute ("Channel", "XXX", Ptr (0), diff --git a/src/devices/wifi/wifi-phy.cc b/src/devices/wifi/wifi-phy.cc index 5acbea7ae..43e598380 100644 --- a/src/devices/wifi/wifi-phy.cc +++ b/src/devices/wifi/wifi-phy.cc @@ -182,7 +182,7 @@ NS_OBJECT_ENSURE_REGISTERED (WifiPhy); TypeId WifiPhy::GetTypeId (void) { - static TypeId tid = TypeId ("WifiPhy") + static TypeId tid = TypeId ("ns3::WifiPhy") .SetParent () .AddConstructor () .AddAttribute ("EnergyDetectionThreshold", diff --git a/src/devices/wifi/wifi-remote-station-manager.cc b/src/devices/wifi/wifi-remote-station-manager.cc index 1c08f0f17..d8cd04ce4 100644 --- a/src/devices/wifi/wifi-remote-station-manager.cc +++ b/src/devices/wifi/wifi-remote-station-manager.cc @@ -123,7 +123,7 @@ NS_OBJECT_ENSURE_REGISTERED (WifiRemoteStationManager); TypeId WifiRemoteStationManager::GetTypeId (void) { - static TypeId tid = TypeId ("WifiRemoteStationManager") + static TypeId tid = TypeId ("ns3::WifiRemoteStationManager") .SetParent () .AddAttribute ("IsLowLatency", "XXX", Boolean (true), diff --git a/src/devices/wifi/wifi-remote-station-manager.h b/src/devices/wifi/wifi-remote-station-manager.h index 93de9a993..39a0d10c0 100644 --- a/src/devices/wifi/wifi-remote-station-manager.h +++ b/src/devices/wifi/wifi-remote-station-manager.h @@ -33,6 +33,14 @@ class WifiRemoteStation; class NonUnicastWifiRemoteStation; class WifiPhy; +/** + * \brief hold per-remote-station state. + * + * The state in this class is used to keep track + * of association status if we are in an infrastructure + * network and to perform the selection of tx parameters + * on a per-packet basis. + */ class WifiRemoteStationManager : public Object { private: diff --git a/src/internet-node/arp-l3-protocol.cc b/src/internet-node/arp-l3-protocol.cc index 05b3d4f26..b1ee3c691 100644 --- a/src/internet-node/arp-l3-protocol.cc +++ b/src/internet-node/arp-l3-protocol.cc @@ -40,7 +40,7 @@ NS_OBJECT_ENSURE_REGISTERED (ArpL3Protocol); TypeId ArpL3Protocol::GetTypeId (void) { - static TypeId tid = TypeId ("ArpL3Protocol") + static TypeId tid = TypeId ("ns3::ArpL3Protocol") .SetParent () ; return tid; diff --git a/src/internet-node/ipv4-l3-protocol.cc b/src/internet-node/ipv4-l3-protocol.cc index c8c1db6fc..840b67d75 100644 --- a/src/internet-node/ipv4-l3-protocol.cc +++ b/src/internet-node/ipv4-l3-protocol.cc @@ -49,7 +49,7 @@ NS_OBJECT_ENSURE_REGISTERED (Ipv4L3Protocol); TypeId Ipv4L3Protocol::GetTypeId (void) { - static TypeId tid = TypeId ("Ipv4L3Protocol") + static TypeId tid = TypeId ("ns3::Ipv4L3Protocol") .SetParent () .AddConstructor () .AddAttribute ("DefaultTtl", "The TTL value set by default on all outgoing packets generated on this node.", diff --git a/src/internet-node/ipv4-l4-demux.cc b/src/internet-node/ipv4-l4-demux.cc index 7258246a0..510f520f3 100644 --- a/src/internet-node/ipv4-l4-demux.cc +++ b/src/internet-node/ipv4-l4-demux.cc @@ -35,7 +35,7 @@ NS_OBJECT_ENSURE_REGISTERED (Ipv4L4Demux); TypeId Ipv4L4Demux::GetTypeId (void) { - static TypeId tid = TypeId ("Ipv4L4Demux") + static TypeId tid = TypeId ("ns3::Ipv4L4Demux") .SetParent () .AddAttribute ("Protocols", "The set of protocols registered with this demux.", ObjectVector (), diff --git a/src/internet-node/ipv4-l4-protocol.cc b/src/internet-node/ipv4-l4-protocol.cc index 22e11c704..518fd09a1 100644 --- a/src/internet-node/ipv4-l4-protocol.cc +++ b/src/internet-node/ipv4-l4-protocol.cc @@ -32,7 +32,7 @@ NS_OBJECT_ENSURE_REGISTERED (Ipv4L4Protocol); TypeId Ipv4L4Protocol::GetTypeId (void) { - static TypeId tid = TypeId ("Ipv4L4Protocol") + static TypeId tid = TypeId ("ns3::Ipv4L4Protocol") .SetParent () .AddAttribute ("ProtocolNumber", "The Ipv4 protocol number.", Uinteger (0), diff --git a/src/internet-node/rtt-estimator.cc b/src/internet-node/rtt-estimator.cc index 0e7801ac5..9bfe63a09 100644 --- a/src/internet-node/rtt-estimator.cc +++ b/src/internet-node/rtt-estimator.cc @@ -39,7 +39,7 @@ NS_OBJECT_ENSURE_REGISTERED (RttEstimator); TypeId RttEstimator::GetTypeId (void) { - static TypeId tid = TypeId ("RttEstimator") + static TypeId tid = TypeId ("ns3::RttEstimator") .SetParent () .AddAttribute ("MaxMultiplier", "XXX", @@ -172,7 +172,7 @@ NS_OBJECT_ENSURE_REGISTERED (RttMeanDeviation); TypeId RttMeanDeviation::GetTypeId (void) { - static TypeId tid = TypeId ("RttMeanDeviation") + static TypeId tid = TypeId ("ns3::RttMeanDeviation") .SetParent () .AddConstructor () .AddAttribute ("Gain", diff --git a/src/internet-node/tcp-l4-protocol.cc b/src/internet-node/tcp-l4-protocol.cc index 863281e9e..9164fb44a 100644 --- a/src/internet-node/tcp-l4-protocol.cc +++ b/src/internet-node/tcp-l4-protocol.cc @@ -322,7 +322,7 @@ TcpL4Protocol::GetDefaultRttEstimatorFactory (void) TypeId TcpL4Protocol::GetTypeId (void) { - static TypeId tid = TypeId ("TcpL4Protocol") + static TypeId tid = TypeId ("ns3::TcpL4Protocol") .SetParent () .AddAttribute ("RttEstimatorFactory", "How RttEstimator objects are created.", diff --git a/src/internet-node/udp-l4-protocol.cc b/src/internet-node/udp-l4-protocol.cc index 3c0c82176..dfd21bc2b 100644 --- a/src/internet-node/udp-l4-protocol.cc +++ b/src/internet-node/udp-l4-protocol.cc @@ -43,7 +43,7 @@ const uint8_t UdpL4Protocol::PROT_NUMBER = 17; TypeId UdpL4Protocol::GetTypeId (void) { - static TypeId tid = TypeId ("UdpL4Protocol") + static TypeId tid = TypeId ("ns3::UdpL4Protocol") .SetParent () .AddConstructor () ; diff --git a/src/mobility/hierarchical-mobility-model.cc b/src/mobility/hierarchical-mobility-model.cc index 922ebdbe6..5c25afb0c 100644 --- a/src/mobility/hierarchical-mobility-model.cc +++ b/src/mobility/hierarchical-mobility-model.cc @@ -27,7 +27,7 @@ NS_OBJECT_ENSURE_REGISTERED (HierarchicalMobilityModel); TypeId HierarchicalMobilityModel::GetTypeId (void) { - static TypeId tid = TypeId ("HierarchicalMobilityModel") + static TypeId tid = TypeId ("ns3::HierarchicalMobilityModel") .SetParent () .AddConstructor () .AddAttribute ("Child", "The child mobility model.", diff --git a/src/mobility/mobility-helper.cc b/src/mobility/mobility-helper.cc index 54dfc9fae..32667c82d 100644 --- a/src/mobility/mobility-helper.cc +++ b/src/mobility/mobility-helper.cc @@ -14,7 +14,7 @@ MobilityHelper::MobilityHelper () { m_position = CreateObject ("X", ConstantVariable (0.0), "Y", ConstantVariable (0.0)); - m_mobility.SetTypeId ("StaticMobilityModel"); + m_mobility.SetTypeId ("ns3::StaticMobilityModel"); } void MobilityHelper::EnableNotifier (void) @@ -126,7 +126,7 @@ MobilityHelper::Layout (const std::vector > &objects) Ptr parent = m_mobilityStack.back (); Ptr hierarchical = CreateObject ("Child", model, - "Parent", parent); + "Parent", parent); object->AggregateObject (hierarchical); NS_LOG_DEBUG ("node="< () .AddAttribute ("Position", "The current position of the mobility model.", TypeId::ATTR_SGC, diff --git a/src/mobility/position-allocator.cc b/src/mobility/position-allocator.cc index 843278668..c4794497c 100644 --- a/src/mobility/position-allocator.cc +++ b/src/mobility/position-allocator.cc @@ -34,7 +34,7 @@ NS_OBJECT_ENSURE_REGISTERED (PositionAllocator); TypeId PositionAllocator::GetTypeId (void) { - static TypeId tid = TypeId ("PositionAllocator") + static TypeId tid = TypeId ("ns3::PositionAllocator") .SetParent (); return tid; } @@ -51,7 +51,7 @@ NS_OBJECT_ENSURE_REGISTERED (ListPositionAllocator); TypeId ListPositionAllocator::GetTypeId (void) { - static TypeId tid = TypeId ("ListPositionAllocator") + static TypeId tid = TypeId ("ns3::ListPositionAllocator") .SetParent () .AddConstructor () ; @@ -78,7 +78,7 @@ NS_OBJECT_ENSURE_REGISTERED (GridPositionAllocator); TypeId GridPositionAllocator::GetTypeId (void) { - static TypeId tid = TypeId ("GridPositionAllocator") + static TypeId tid = TypeId ("ns3::GridPositionAllocator") .SetParent () .SetGroupName ("Mobility") .AddConstructor () @@ -138,7 +138,7 @@ NS_OBJECT_ENSURE_REGISTERED (RandomRectanglePositionAllocator); TypeId RandomRectanglePositionAllocator::GetTypeId (void) { - static TypeId tid = TypeId ("RandomRectanglePositionAllocator") + static TypeId tid = TypeId ("ns3::RandomRectanglePositionAllocator") .SetParent () .SetGroupName ("Mobility") .AddConstructor () @@ -172,7 +172,7 @@ NS_OBJECT_ENSURE_REGISTERED (RandomDiscPositionAllocator); TypeId RandomDiscPositionAllocator::GetTypeId (void) { - static TypeId tid = TypeId ("RandomDiscPositionAllocator") + static TypeId tid = TypeId ("ns3::RandomDiscPositionAllocator") .SetParent () .SetGroupName ("Mobility") .AddConstructor () diff --git a/src/mobility/random-direction-2d-mobility-model.cc b/src/mobility/random-direction-2d-mobility-model.cc index 7c8da2ea2..ad9633bc6 100644 --- a/src/mobility/random-direction-2d-mobility-model.cc +++ b/src/mobility/random-direction-2d-mobility-model.cc @@ -36,7 +36,7 @@ NS_OBJECT_ENSURE_REGISTERED (RandomDirection2dMobilityModel); TypeId RandomDirection2dMobilityModel::GetTypeId (void) { - static TypeId tid = TypeId ("RandomDirection2dMobilityModel") + static TypeId tid = TypeId ("ns3::RandomDirection2dMobilityModel") .SetParent () .SetGroupName ("Mobility") .AddConstructor () diff --git a/src/mobility/random-walk-2d-mobility-model.cc b/src/mobility/random-walk-2d-mobility-model.cc index 602546890..274b8b101 100644 --- a/src/mobility/random-walk-2d-mobility-model.cc +++ b/src/mobility/random-walk-2d-mobility-model.cc @@ -33,7 +33,7 @@ NS_OBJECT_ENSURE_REGISTERED (RandomWalk2dMobilityModel); TypeId RandomWalk2dMobilityModel::GetTypeId (void) { - static TypeId tid = TypeId ("RandomWalk2dMobilityModel") + static TypeId tid = TypeId ("ns3::RandomWalk2dMobilityModel") .SetParent () .SetGroupName ("Mobility") .AddConstructor () diff --git a/src/mobility/random-waypoint-mobility-model.cc b/src/mobility/random-waypoint-mobility-model.cc index 241545edd..d5d98e299 100644 --- a/src/mobility/random-waypoint-mobility-model.cc +++ b/src/mobility/random-waypoint-mobility-model.cc @@ -30,7 +30,7 @@ NS_OBJECT_ENSURE_REGISTERED (RandomWaypointMobilityModel); TypeId RandomWaypointMobilityModel::GetTypeId (void) { - static TypeId tid = TypeId ("RandomWaypointMobilityModel") + static TypeId tid = TypeId ("ns3::RandomWaypointMobilityModel") .SetParent () .SetGroupName ("Mobility") .AddConstructor () diff --git a/src/mobility/static-mobility-model.cc b/src/mobility/static-mobility-model.cc index 239e0000a..142cd379c 100644 --- a/src/mobility/static-mobility-model.cc +++ b/src/mobility/static-mobility-model.cc @@ -26,7 +26,7 @@ NS_OBJECT_ENSURE_REGISTERED (StaticMobilityModel); TypeId StaticMobilityModel::GetTypeId (void) { - static TypeId tid = TypeId ("StaticMobilityModel") + static TypeId tid = TypeId ("ns3::StaticMobilityModel") .SetParent () .AddConstructor () ; diff --git a/src/mobility/static-speed-mobility-model.cc b/src/mobility/static-speed-mobility-model.cc index 720f05bd4..4dcc77012 100644 --- a/src/mobility/static-speed-mobility-model.cc +++ b/src/mobility/static-speed-mobility-model.cc @@ -26,7 +26,7 @@ NS_OBJECT_ENSURE_REGISTERED (StaticSpeedMobilityModel); TypeId StaticSpeedMobilityModel::GetTypeId (void) { - static TypeId tid = TypeId ("StaticSpeedMobilityModel") + static TypeId tid = TypeId ("ns3::StaticSpeedMobilityModel") .SetParent () .AddConstructor (); return tid; diff --git a/src/node/application.cc b/src/node/application.cc index 75e4f6fd4..ef7b37291 100644 --- a/src/node/application.cc +++ b/src/node/application.cc @@ -38,7 +38,7 @@ NS_OBJECT_ENSURE_REGISTERED (Application); TypeId Application::GetTypeId (void) { - static TypeId tid = TypeId ("Application") + static TypeId tid = TypeId ("ns3::Application") .SetParent () ; return tid; diff --git a/src/node/channel.cc b/src/node/channel.cc index f6cc4b66a..715faf0ff 100644 --- a/src/node/channel.cc +++ b/src/node/channel.cc @@ -29,7 +29,7 @@ NS_OBJECT_ENSURE_REGISTERED (Channel); TypeId Channel::GetTypeId (void) { - static TypeId tid = TypeId ("Channel") + static TypeId tid = TypeId ("ns3::Channel") .SetParent (); return tid; } diff --git a/src/node/drop-tail-queue.cc b/src/node/drop-tail-queue.cc index 1bbad60d6..85bcf0009 100644 --- a/src/node/drop-tail-queue.cc +++ b/src/node/drop-tail-queue.cc @@ -29,7 +29,7 @@ NS_OBJECT_ENSURE_REGISTERED (DropTailQueue); TypeId DropTailQueue::GetTypeId (void) { - static TypeId tid = TypeId ("DropTailQueue") + static TypeId tid = TypeId ("ns3::DropTailQueue") .SetParent () .AddConstructor () .AddAttribute ("MaxPackets", "The maximum number of packets accepted by this DropTailQueue.", diff --git a/src/node/ipv4.cc b/src/node/ipv4.cc index 41c9f28fa..d30c1b5de 100644 --- a/src/node/ipv4.cc +++ b/src/node/ipv4.cc @@ -30,7 +30,7 @@ NS_OBJECT_ENSURE_REGISTERED (Ipv4); TypeId Ipv4::GetTypeId (void) { - static TypeId tid = TypeId ("Ipv4") + static TypeId tid = TypeId ("ns3::Ipv4") .SetParent (); return tid; } diff --git a/src/node/net-device.cc b/src/node/net-device.cc index 97a5dfdf3..dee14b84e 100644 --- a/src/node/net-device.cc +++ b/src/node/net-device.cc @@ -31,7 +31,7 @@ NS_OBJECT_ENSURE_REGISTERED (NetDevice); TypeId NetDevice::GetTypeId (void) { - static TypeId tid = TypeId ("NetDevice") + static TypeId tid = TypeId ("ns3::NetDevice") .SetParent (); return tid; } diff --git a/src/node/node.cc b/src/node/node.cc index ba5ca8d4a..74280132c 100644 --- a/src/node/node.cc +++ b/src/node/node.cc @@ -35,7 +35,7 @@ NS_OBJECT_ENSURE_REGISTERED (Node); TypeId Node::GetTypeId (void) { - static TypeId tid = TypeId ("Node") + static TypeId tid = TypeId ("ns3::Node") .SetParent () .AddAttribute ("DeviceList", "The list of devices associated to this Node.", ObjectVector (), diff --git a/src/node/packet-socket-factory.cc b/src/node/packet-socket-factory.cc index 7b025e6cb..8bc3cbb1c 100644 --- a/src/node/packet-socket-factory.cc +++ b/src/node/packet-socket-factory.cc @@ -29,7 +29,7 @@ NS_OBJECT_ENSURE_REGISTERED (PacketSocketFactory); TypeId PacketSocketFactory::GetTypeId (void) { - static TypeId tid = TypeId ("Packet") + static TypeId tid = TypeId ("ns3::PacketSocketFactory") .SetParent (); return tid; } diff --git a/src/node/queue.cc b/src/node/queue.cc index f71d9af75..bb7dc16b4 100644 --- a/src/node/queue.cc +++ b/src/node/queue.cc @@ -30,7 +30,7 @@ NS_OBJECT_ENSURE_REGISTERED (Queue); TypeId Queue::GetTypeId (void) { - static TypeId tid = TypeId ("Queue") + static TypeId tid = TypeId ("ns3::Queue") .SetParent () .AddTraceSource ("Enqueue", "XXX", MakeTraceSourceAccessor (&Queue::m_traceEnqueue)) diff --git a/src/node/socket-factory.cc b/src/node/socket-factory.cc index 2a2057dcf..5ff15aacc 100644 --- a/src/node/socket-factory.cc +++ b/src/node/socket-factory.cc @@ -26,7 +26,7 @@ NS_OBJECT_ENSURE_REGISTERED (SocketFactory); TypeId SocketFactory::GetTypeId (void) { - static TypeId tid = TypeId ("SocketFactory") + static TypeId tid = TypeId ("ns3::SocketFactory") .SetParent (); return tid; } diff --git a/src/node/tcp.cc b/src/node/tcp.cc index 6bc15e884..fc7887a5f 100644 --- a/src/node/tcp.cc +++ b/src/node/tcp.cc @@ -27,7 +27,7 @@ NS_OBJECT_ENSURE_REGISTERED (Tcp); TypeId Tcp::GetTypeId (void) { - static TypeId tid = TypeId ("Tcp") + static TypeId tid = TypeId ("ns3::Tcp") .SetParent () .AddAttribute ("TcpDefaultSegmentSize", "Default TCP maximum segment size in bytes (may be adjusted based on MTU discovery)", diff --git a/src/node/udp.cc b/src/node/udp.cc index 217f08d6f..4f9a6959b 100644 --- a/src/node/udp.cc +++ b/src/node/udp.cc @@ -26,7 +26,7 @@ NS_OBJECT_ENSURE_REGISTERED (Udp); TypeId Udp::GetTypeId (void) { - static TypeId tid = TypeId ("Udp") + static TypeId tid = TypeId ("ns3::Udp") .SetParent (); return tid; } diff --git a/src/routing/global-routing/global-router-interface.cc b/src/routing/global-routing/global-router-interface.cc index c7fc4996b..088865cfd 100644 --- a/src/routing/global-routing/global-router-interface.cc +++ b/src/routing/global-routing/global-router-interface.cc @@ -436,7 +436,7 @@ NS_OBJECT_ENSURE_REGISTERED (GlobalRouter); TypeId GlobalRouter::GetTypeId (void) { - static TypeId tid = TypeId ("GlobalRouter") + static TypeId tid = TypeId ("ns3::GlobalRouter") .SetParent (); return tid; } diff --git a/src/routing/olsr/olsr-agent-impl.cc b/src/routing/olsr/olsr-agent-impl.cc index db6481acd..32cef29e1 100644 --- a/src/routing/olsr/olsr-agent-impl.cc +++ b/src/routing/olsr/olsr-agent-impl.cc @@ -154,7 +154,7 @@ NS_OBJECT_ENSURE_REGISTERED (AgentImpl); TypeId AgentImpl::GetTypeId (void) { - static TypeId tid = TypeId ("olsr::AgentImpl") + static TypeId tid = TypeId ("ns3::olsr::AgentImpl") .SetParent () .AddConstructor () .AddAttribute ("HelloInterval", "XXX", diff --git a/src/routing/olsr/olsr-agent.cc b/src/routing/olsr/olsr-agent.cc index 885f05d40..7b3c200a3 100644 --- a/src/routing/olsr/olsr-agent.cc +++ b/src/routing/olsr/olsr-agent.cc @@ -28,7 +28,7 @@ NS_OBJECT_ENSURE_REGISTERED (Agent); TypeId Agent::GetTypeId (void) { - static TypeId tid = TypeId ("OlsrAgent") + static TypeId tid = TypeId ("ns3::olsr::Agent") .SetParent (); return tid; } diff --git a/src/routing/olsr/olsr-helper.cc b/src/routing/olsr/olsr-helper.cc index 9a08131ff..952b1ae59 100644 --- a/src/routing/olsr/olsr-helper.cc +++ b/src/routing/olsr/olsr-helper.cc @@ -6,7 +6,7 @@ namespace ns3 { OlsrHelper::OlsrHelper () { - m_agentFactory.SetTypeId ("olsr::AgentImpl"); + m_agentFactory.SetTypeId ("ns3::olsr::AgentImpl"); } void diff --git a/utils/print-introspected-doxygen.cc b/utils/print-introspected-doxygen.cc index 9f8c267fa..06553201c 100644 --- a/utils/print-introspected-doxygen.cc +++ b/utils/print-introspected-doxygen.cc @@ -1,29 +1,92 @@ -#include "ns3/internet-node.h" -#include "ns3/ptr.h" -#include "ns3/node-list.h" -#include "ns3/point-to-point-net-device.h" -#include "ns3/csma-net-device.h" -#include "ns3/queue.h" -#include "ns3/drop-tail-queue.h" -#include "ns3/mobility-model-notifier.h" -#include "ns3/string.h" +#include +#include "ns3/object.h" using namespace ns3; +void +PrintAttributes (TypeId tid, std::ostream &os) +{ + os << "
    "<" << tid.GetAttributeName (j) << ": " + << tid.GetAttributeHelp (j) << std::endl; + Ptr checker = tid.GetAttributeChecker (j); + os << "
      " << std::endl << "
    • Type: " << checker->GetType (); + if (checker->HasTypeConstraints ()) + { + os << " -> " << checker->GetTypeConstraints (); + } + os << "
      • " << std::endl; + uint32_t flags = tid.GetAttributeFlags (j); + os << "
    • Flags: "; + if (flags & TypeId::ATTR_SET) + { + os << "write "; + } + if (flags & TypeId::ATTR_GET) + { + os << "read "; + } + if (flags & TypeId::ATTR_CONSTRUCT) + { + os << "construct "; + } + os << "
    " << std::endl; + + } + os << "
" << std::endl; +} int main (int argc, char *argv[]) { - Ptr node = CreateObject (); - node->AggregateObject (CreateObject ()); - Ptr p2p = CreateObject ("Address", Mac48Address::Allocate ()); - node->AddDevice (p2p); - p2p->AddQueue (CreateObject ()); - Ptr csma = CreateObject ("Address", Mac48Address::Allocate (), - "EncapsulationMode", String ("Llc")); - node->AddDevice (csma); - csma->AddQueue (CreateObject ()); + for (uint32_t i = 0; i < TypeId::GetRegisteredN (); i++) + { + std::cout << "/*!" << std::endl; + TypeId tid = TypeId::GetRegistered (i); + if (tid.MustHideFromDocumentation ()) + { + continue; + } + std::cout << "\\fn static TypeId " << tid.GetName () << "::GetTypeId (void)" << std::endl; + std::cout << "\\brief This method returns the TypeId associated to \\ref " << tid.GetName () << std::endl << std::endl; + if (tid.GetAttributeListN () == 0) + { + std::cout << "No Attributes defined for this type." << std::endl; + } + else + { + std::cout << "Attributes defined for this type:" << std::endl; + PrintAttributes (tid, std::cout); + } + bool hasAttributesInParent = false; + TypeId tmp = tid.GetParent (); + while (tmp.GetParent () != tmp) + { + if (tmp.GetAttributeListN () != 0) + { + hasAttributesInParent = true; + } + tmp = tmp.GetParent (); + } + if (hasAttributesInParent) + { + std::cout << "Attributes defined in parent classes:
" << std::endl; + tmp = tid.GetParent (); + while (tmp.GetParent () != tmp) + { + if (tmp.GetAttributeListN () != 0) + { + std::cout << tmp.GetName () << std::endl; + PrintAttributes (tmp, std::cout); + } + tmp = tmp.GetParent (); + } + } + std::cout << "*/" << std::endl; + } return 0;